* linux-next: manual merge of the trivial tree with the net-current tree
@ 2009-12-10 3:37 Stephen Rothwell
2009-12-10 8:45 ` Jiri Kosina
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2009-12-10 3:37 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Damian Lukowski, David Miller, netdev,
"André Goddard Rosa"
[-- Attachment #1: Type: text/plain, Size: 655 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
include/net/tcp.h between commit 2f7de5710a4d394920405febc2a9937c69e16dda
("tcp: Stalling connections: Move timeout calculation routine") from the
net-current tree and commit af901ca181d92aac3a7dc265144a9081a86d8f39
("tree-wide: fix assorted typos all over the place") from the trivial
tree.
The former moves the comment that the latter corrects to
net/ipv4/tcp_timer.c. I just used the net-current version and didn't
bother fixing it up in its new location.
--
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] 4+ messages in thread* Re: linux-next: manual merge of the trivial tree with the net-current tree
2009-12-10 3:37 linux-next: manual merge of the trivial tree with the net-current tree Stephen Rothwell
@ 2009-12-10 8:45 ` Jiri Kosina
2009-12-10 11:14 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Jiri Kosina @ 2009-12-10 8:45 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Damian Lukowski, David Miller, netdev,
"André Goddard Rosa"
On Thu, 10 Dec 2009, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> include/net/tcp.h between commit 2f7de5710a4d394920405febc2a9937c69e16dda
> ("tcp: Stalling connections: Move timeout calculation routine") from the
> net-current tree and commit af901ca181d92aac3a7dc265144a9081a86d8f39
> ("tree-wide: fix assorted typos all over the place") from the trivial
> tree.
>
> The former moves the comment that the latter corrects to
> net/ipv4/tcp_timer.c. I just used the net-current version and didn't
> bother fixing it up in its new location.
Hi,
Linus has merged trivial tree into his tree tonight, so I am afraid that
davem will have to fix the conflict when pulling Linus tree into
net-current.
Thanks,
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the trivial tree with the net-current tree
2009-12-10 8:45 ` Jiri Kosina
@ 2009-12-10 11:14 ` Stephen Rothwell
2009-12-10 22:41 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2009-12-10 11:14 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Damian Lukowski, David Miller, netdev,
"André Goddard Rosa"
[-- Attachment #1: Type: text/plain, Size: 415 bytes --]
Hi Jiri,
On Thu, 10 Dec 2009 09:45:27 +0100 (CET) Jiri Kosina <jkosina@suse.cz> wrote:
>
> Linus has merged trivial tree into his tree tonight, so I am afraid that
> davem will have to fix the conflict when pulling Linus tree into
> net-current.
Yep, or Linus can fix it if he feels inclined.
--
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] 4+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the net-current tree
2009-12-10 11:14 ` Stephen Rothwell
@ 2009-12-10 22:41 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2009-12-10 22:41 UTC (permalink / raw)
To: sfr; +Cc: jkosina, linux-next, linux-kernel, damian, netdev, andre.goddard
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 10 Dec 2009 22:14:06 +1100
> Hi Jiri,
>
> On Thu, 10 Dec 2009 09:45:27 +0100 (CET) Jiri Kosina <jkosina@suse.cz> wrote:
>>
>> Linus has merged trivial tree into his tree tonight, so I am afraid that
>> davem will have to fix the conflict when pulling Linus tree into
>> net-current.
>
> Yep, or Linus can fix it if he feels inclined.
Nah, I'll do a pull into net-2.6 to resolve the conflict first.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-12-10 22:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-12-10 3:37 linux-next: manual merge of the trivial tree with the net-current tree Stephen Rothwell
2009-12-10 8:45 ` Jiri Kosina
2009-12-10 11:14 ` Stephen Rothwell
2009-12-10 22:41 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®