linux-next: manual merge of the tty tree with the trivial tree

linux-next: manual merge of the tty tree with the trivial tree

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in drivers/mmc/card/sdio_uart.c between commit 1e04b7ae709d19d5c9f69c64e1e30253018ce102 ("sdio_uart: coding style fixes") from the trivial tree and various commits from the tty tree.

I just used the tty tree version where they clashed.  Jiri, you might
consider sending that patch to Greg for the tty tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the tty tree with the trivial tree

[Jiri Kosina]

On Wed, 9 Dec 2009, Stephen Rothwell wrote:

> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in 
> drivers/mmc/card/sdio_uart.c between commit 
> 1e04b7ae709d19d5c9f69c64e1e30253018ce102 ("sdio_uart: coding style 
> fixes") from the trivial tree and various commits from the tty tree.
> 
> I just used the tty tree version where they clashed.  Jiri, you might
> consider sending that patch to Greg for the tty tree.

Hi,

the trivial tree pull request has already been sent to Linus a day ago. I 
am now waiting whether it will be merged or missed.

In the latter case, I will split the tty hunk out and send to Greg. In the 
former case the conflict would have to be solved either by Greg or Linus.

Thanks,

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

Re: linux-next: manual merge of the tty tree with the trivial tree

[Stephen Rothwell]

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

Hi Jiri,

On Wed, 9 Dec 2009 15:38:19 +0100 (CET) Jiri Kosina <jkosina@suse.cz> wrote:
>
> On Wed, 9 Dec 2009, Stephen Rothwell wrote:
> 
> > I just used the tty tree version where they clashed.  Jiri, you might
> > consider sending that patch to Greg for the tty tree.
> 
> the trivial tree pull request has already been sent to Linus a day ago. I 
> am now waiting whether it will be merged or missed.
> 
> In the latter case, I will split the tty hunk out and send to Greg. In the 
> former case the conflict would have to be solved either by Greg or Linus.

OK, that's fine, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the tty tree with the trivial tree

[Greg KH]

On Thu, Dec 10, 2009 at 02:11:00AM +1100, Stephen Rothwell wrote:
> Hi Jiri,
> 
> On Wed, 9 Dec 2009 15:38:19 +0100 (CET) Jiri Kosina <jkosina@suse.cz> wrote:
> >
> > On Wed, 9 Dec 2009, Stephen Rothwell wrote:
> > 
> > > I just used the tty tree version where they clashed.  Jiri, you might
> > > consider sending that patch to Greg for the tty tree.
> > 
> > the trivial tree pull request has already been sent to Linus a day ago. I 
> > am now waiting whether it will be merged or missed.
> > 
> > In the latter case, I will split the tty hunk out and send to Greg. In the 
> > former case the conflict would have to be solved either by Greg or Linus.
> 
> OK, that's fine, thanks.

Sounds good to me as well.

thanks,

greg k-h

Re: linux-next: manual merge of the tty tree with the trivial tree

[Jiri Kosina]

On Wed, 9 Dec 2009, Greg KH wrote:

> > > > I just used the tty tree version where they clashed.  Jiri, you might
> > > > consider sending that patch to Greg for the tty tree.
> > > 
> > > the trivial tree pull request has already been sent to Linus a day ago. I 
> > > am now waiting whether it will be merged or missed.
> > > 
> > > In the latter case, I will split the tty hunk out and send to Greg. In the 
> > > former case the conflict would have to be solved either by Greg or Linus.
> > 
> > OK, that's fine, thanks.
> 
> Sounds good to me as well.

Linus has merged my tree, so either you or Linus will have to fix the 
conflict.

Thanks,

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

Re: linux-next: manual merge of the tty tree with the trivial tree

[Greg KH]

On Thu, Dec 10, 2009 at 12:21:00PM +0100, Jiri Kosina wrote:
> On Wed, 9 Dec 2009, Greg KH wrote:
> 
> > > > > I just used the tty tree version where they clashed.  Jiri, you might
> > > > > consider sending that patch to Greg for the tty tree.
> > > > 
> > > > the trivial tree pull request has already been sent to Linus a day ago. I 
> > > > am now waiting whether it will be merged or missed.
> > > > 
> > > > In the latter case, I will split the tty hunk out and send to Greg. In the 
> > > > former case the conflict would have to be solved either by Greg or Linus.
> > > 
> > > OK, that's fine, thanks.
> > 
> > Sounds good to me as well.
> 
> Linus has merged my tree, so either you or Linus will have to fix the 
> conflict.

Thanks, I'll fix it up in my tree.

greg k-h