linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jiri Slaby <jslaby@suse.cz>
Subject: Re: linux-next: manual merge of the char-misc tree with the tty tree
Date: Thu, 17 Jan 2013 10:40:36 +0100	[thread overview]
Message-ID: <20130117093958.GA10117@fourier.local.igalia.com> (raw)
In-Reply-To: <20130117135420.8575233a25bdeb64c4b38d9d@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 703 bytes --]

On Thu, Jan 17, 2013 at 01:54:20PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in
> drivers/ipack/devices/ipoctal.c between commit 2e124b4a390c ("TTY: switch
> tty_flip_buffer_push") from the tty tree and commits 7e5730d7c222
> ("ipack/devices/ipoctal: fix kernel bug when using pppd"),
> e7e664fd688a ("ipack/devices/ipoctal: protect the channel data processing
> with a spinlock") and b06073f963b7 ("ipack/devices/ipoctal: remove
> redundant tty_flip_buffer_push()") from the char-misc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me.

Thanks!

Sam

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

  reply	other threads:[~2013-01-17  9:50 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-17  2:54 linux-next: manual merge of the char-misc tree with the tty tree Stephen Rothwell
2013-01-17  9:40 ` Samuel Iglesias Gonsalvez [this message]
2013-02-11  5:37 Stephen Rothwell
2013-02-11 14:37 ` Greg KH
2021-01-29  4:53 Stephen Rothwell
2021-01-29  7:34 ` Greg KH
2021-02-14 22:03 ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130117093958.GA10117@fourier.local.igalia.com \
    --to=siglesias@igalia.com \
    --cc=arnd@arndb.de \
    --cc=greg@kroah.com \
    --cc=jslaby@suse.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).