[lkml]   [2009]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the trivial tree with the net-current tree
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.


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


Jiri Kosina
SUSE Labs, Novell Inc.

 \ /
  Last update: 2009-12-10 09:47    [W:0.031 / U:2.244 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site