linux-kernel - linux-next: manual merge of the trivial tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20101109133155.e979a39b.sfr@canb.auug.org.au>
Date:	Tue, 9 Nov 2010 13:31:55 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Uwe Kleine-König" 
	<u.kleine-koenig@...gutronix.de>, Jing Huang <huangj@...cade.com>
Subject: linux-next: manual merge of the trivial tree with Linus' tree

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@...b.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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/