Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1626866

Re: [PATCH] scsi: osd_uld: fix mismerge

From Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups linux.kernel
Subject Re: [PATCH] scsi: osd_uld: fix mismerge
Date 2017-04-20 01:30 +0200
Message-ID <ty7cR-1dY-1@gated-at.bofh.it> (permalink)
References <ty1TQ-6kT-23@gated-at.bofh.it> <ty1TQ-6kT-21@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


Hi Bart,

On Wed, 19 Apr 2017 17:46:43 +0000 Bart Van Assche <Bart.VanAssche@sandisk.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

Back to linux.kernel | Previous | NextPrevious in thread | Find similar | Unroll thread


Thread

Re: [PATCH] scsi: osd_uld: fix mismerge Bart Van Assche <Bart.VanAssche@sandisk.com> - 2017-04-19 19:50 +0200
  Re: [PATCH] scsi: osd_uld: fix mismerge Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-20 01:30 +0200

csiph-web