linux-kernel - linux-next: manual merge of the osd 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20091127143229.108298c6.sfr@canb.auug.org.au>
Date:	Fri, 27 Nov 2009 14:32:29 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Boaz Harrosh <bharrosh@...asas.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	James Bottomley <James.Bottomley@...senPartnership.com>
Subject: linux-next: manual merge of the osd tree with the scsi tree

Hi Boaz,

Today's linux-next merge of the osd tree got a conflict in
drivers/scsi/osd/osd_uld.c between commit
f89b9ee4a722721ed205b8c29555ac75fbe8c2cc ("[SCSI] osduld: Use
device->release instead of internal kref") from the scsi tree and commit
9b579fe8588b861dcf0c9b620757729643db4557 ("osduld: Use device->release
instead of internal kref") from the osd tree.

These are slightly different versions of the same patch ...

And commit 01e4c32c668251e74eb179ee1207c075466c4ef8 ("osduld: No need to
use dev_set_drvdata on embedded devices") from the osd also contributes
to the conflict.

I fixed it up (the obvious way) and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped