linux-kernel - linux-next: manual merge of the akpm tree with the scsi 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: Windows password security audit tool. GUI, reports in PDF.

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

Date:	Mon, 8 Apr 2013 17:02:31 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Saurav Kashyap <saurav.kashyap@...gic.com>,
	Giridhar Malavali <giridhar.malavali@...gic.com>,
	James Bottomley <JBottomley@...allels.com>,
	Akinobu Mita <akinobu.mita@...il.com>
Subject: linux-next: manual merge of the akpm tree with the scsi tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/scsi/qla2xxx/qla_attr.c between commit 4a9fa41bd404 ("[SCSI]
qla2xxx: Remove debug code that msleeps for random duration") from the
scsi tree and commit "scsi: rename random32() to prandom_u32()" from the
akpm tree.

The former removed the code in this file that was updated by the latter,
so I did that (and dropped the next patch ("scsi: fix the wrong position
of the comment") and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped