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

[Jiri Kosina]

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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/