From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jiri Kosina <jkosina@suse.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"\"Uwe Kleine-König\"" <u.kleine-koenig@pengutronix.de>,
"Jing Huang" <huangj@brocade.com>
Subject: linux-next: manual merge of the trivial tree with Linus' tree
Date: Tue, 9 Nov 2010 13:31:55 +1100 [thread overview]
Message-ID: <20101109133155.e979a39b.sfr@canb.auug.org.au> (raw)
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/scsi/bfa/bfa_fcpim.c
index 135c442,aabbf3d..0000000
--- a/drivers/scsi/bfa/bfa_fcpim.c
+++ b/drivers/scsi/bfa/bfa_fcpim.c
@@@ -2091,8 -2091,8 +2091,8 @@@ bfa_ioim_sm_cleanup_qfull(struct bfa_io
break;
case BFA_IOIM_SM_ABORT:
- /**
+ /*
- * IO is alraedy being cleaned up implicitly
+ * IO is already being cleaned up implicitly
*/
ioim->io_cbfn = __bfa_cb_ioim_abort;
break;
next reply other threads:[~2010-11-09 2:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-09 2:31 Stephen Rothwell [this message]
2010-11-15 12:40 ` linux-next: manual merge of the trivial tree with Linus' tree Jiri Kosina
-- strict thread matches above, loose matches on Subject: below --
2014-08-26 4:29 Stephen Rothwell
2014-05-06 3:52 Stephen Rothwell
2013-12-24 2:49 Stephen Rothwell
2013-07-03 5:29 Stephen Rothwell
2012-06-29 4:36 Stephen Rothwell
2012-06-29 12:48 ` Jiri Kosina
2012-04-04 2:03 Stephen Rothwell
2012-03-29 1:48 Stephen Rothwell
2011-02-28 4:21 Stephen Rothwell
2010-08-10 2:11 Stephen Rothwell
2010-08-10 11:22 ` Jiri Kosina
2010-03-08 2:20 Stephen Rothwell
2010-03-08 2:41 ` Mulyadi Santosa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101109133155.e979a39b.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=huangj@brocade.com \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).