linux-kernel - Re: [PATCH] scsi: osd

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-prev] [day] [month] [year] [list]

Message-ID: <20170420092925.400cb477@canb.auug.org.au>
Date:   Thu, 20 Apr 2017 09:29:25 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Bart Van Assche <Bart.VanAssche@...disk.com>
Cc:     "arnd@...db.de" <arnd@...db.de>,
        "jejb@...ux.vnet.ibm.com" <jejb@...ux.vnet.ibm.com>,
        "linux-scsi@...r.kernel.org" <linux-scsi@...r.kernel.org>,
        "ooo@...ctrozaur.com" <ooo@...ctrozaur.com>,
        "dan.carpenter@...cle.com" <dan.carpenter@...cle.com>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        "bhalevy@...marydata.com" <bhalevy@...marydata.com>,
        "martin.petersen@...cle.com" <martin.petersen@...cle.com>,
        Greg KH <greg@...ah.com>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: [PATCH] scsi: osd_uld: fix mismerge

Hi Bart,

On Wed, 19 Apr 2017 17:46:43 +0000 Bart Van Assche <Bart.VanAssche@...disk.com> wrote:
>
> On Wed, 2017-04-19 at 19:44 +0200, Arnd Bergmann wrote:
> > Fixes: c02465fa13b6 ("scsi: osd_uld: Check scsi_device_get() return value")
> > Fixes: ac1ddc584e98 ("scsi: utilize new cdev_device_add helper function")  
> 
> Both these patches are fine as far as I can tell. Shouldn't the
> "Fixes" tag refer to the merge commit instead of to the commits
> that have been merged?

Unfortunately, the merge commit is redone every day and will be redone
by Linus during the merge window.  This fix should be incorporated into
the merge commit itself.  I should have done it originally, but the
conflict was such a mess that I took the easy way out :-)
-- 
Cheers,
Stephen Rothwell