lkml.org 
[lkml]   [2009]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the trivial tree with the net tree
Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/net/sfc/falcon.c between commit
127e6e10ad17585c48cba8e1dcf30d98b90ee583 ("sfc: Fix bugs in RX queue
flushing") from the net tree and commit
4e5cf22a6f45b6489f84de03d3a1dfa60cc4b4e4 ("tree-wide: fix assorted typos
all over the place") from the trivial tree.

The former removed the comment that the latter was fixing.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2009-11-30 03:55    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site