Messages in this thread | ![/](/images/icornerl.gif) | | Date | Mon, 15 Nov 2010 13:40:38 +0100 (CET) | From | Jiri Kosina <> | Subject | Re: linux-next: manual merge of the trivial tree with Linus' tree |
| |
On Tue, 9 Nov 2010, Stephen Rothwell wrote:
> Hi Jiri, > > Today's linux-next merge of the trivial tree got a conflict in > drivers/scsi/bfa/bfa_fcpim.c between commit > 5fbe25c7a664601666895e8f95eaa59bd9741392 ("[SCSI] bfa: fix comments for c > files") from Linus' tree and commit > b595076a180a56d1bb170e6eceda6eb9d76f4cd3 ("tree-wide: fix comment/printk > typos") from the trivial tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary.
Thank you Stephen, I think that's probably best thing to do here.
-- Jiri Kosina SUSE Labs, Novell Inc.
| ![\](/images/icornerr.gif) |