* linux-next: manual merge of the tty tree with the trivial tree
@ 2009-12-09 5:28 Stephen Rothwell
2009-12-09 14:38 ` Jiri Kosina
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2009-12-09 5:28 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Thadeu Lima de Souza Cascardo, Jiri Kosina
[-- 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 --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the tty tree with the trivial tree
2009-12-09 5:28 linux-next: manual merge of the tty tree with the trivial tree Stephen Rothwell
@ 2009-12-09 14:38 ` Jiri Kosina
2009-12-09 15:11 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Jiri Kosina @ 2009-12-09 14:38 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next, linux-kernel, Thadeu Lima de Souza Cascardo
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the tty tree with the trivial tree
2009-12-09 14:38 ` Jiri Kosina
@ 2009-12-09 15:11 ` Stephen Rothwell
2009-12-09 20:28 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2009-12-09 15:11 UTC (permalink / raw)
To: Jiri Kosina
Cc: Greg KH, linux-next, linux-kernel, Thadeu Lima de Souza Cascardo
[-- 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 --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the tty tree with the trivial tree
2009-12-09 15:11 ` Stephen Rothwell
@ 2009-12-09 20:28 ` Greg KH
2009-12-10 11:21 ` Jiri Kosina
0 siblings, 1 reply; 6+ messages in thread
From: Greg KH @ 2009-12-09 20:28 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jiri Kosina, linux-next, linux-kernel, Thadeu Lima de Souza Cascardo
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the tty tree with the trivial tree
2009-12-09 20:28 ` Greg KH
@ 2009-12-10 11:21 ` Jiri Kosina
2009-12-10 14:39 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Jiri Kosina @ 2009-12-10 11:21 UTC (permalink / raw)
To: Greg KH
Cc: Stephen Rothwell, linux-next, linux-kernel,
Thadeu Lima de Souza Cascardo
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the tty tree with the trivial tree
2009-12-10 11:21 ` Jiri Kosina
@ 2009-12-10 14:39 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2009-12-10 14:39 UTC (permalink / raw)
To: Jiri Kosina
Cc: Stephen Rothwell, linux-next, linux-kernel,
Thadeu Lima de Souza Cascardo
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-12-10 14:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-12-09 5:28 linux-next: manual merge of the tty tree with the trivial tree Stephen Rothwell
2009-12-09 14:38 ` Jiri Kosina
2009-12-09 15:11 ` Stephen Rothwell
2009-12-09 20:28 ` Greg KH
2009-12-10 11:21 ` Jiri Kosina
2009-12-10 14:39 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.