On Mon, 30 Nov 2009, Stephen Rothwell wrote: > 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. Dropped the falcon.c hunk from the pile, so the conflict should be gone. Thanks, -- Jiri Kosina SUSE Labs, Novell Inc. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html