From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Bart Van Assche <Bart.VanAssche@sandisk.com>
Cc: "arnd@arndb.de" <arnd@arndb.de>,
"jejb@linux.vnet.ibm.com" <jejb@linux.vnet.ibm.com>,
"linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
"ooo@electrozaur.com" <ooo@electrozaur.com>,
"dan.carpenter@oracle.com" <dan.carpenter@oracle.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"bhalevy@primarydata.com" <bhalevy@primarydata.com>,
"martin.petersen@oracle.com" <martin.petersen@oracle.com>,
Greg KH <greg@kroah.com>,
Linux-Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: [PATCH] scsi: osd_uld: fix mismerge
Date: Thu, 20 Apr 2017 09:29:25 +1000 [thread overview]
Message-ID: <20170420092925.400cb477@canb.auug.org.au> (raw)
In-Reply-To: <1492624001.2543.9.camel@sandisk.com>
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
next prev parent reply other threads:[~2017-04-19 23:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-19 17:44 [PATCH] scsi: osd_uld: fix mismerge Arnd Bergmann
2017-04-19 17:46 ` Bart Van Assche
2017-04-19 23:29 ` Stephen Rothwell [this message]
2017-04-19 23:26 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170420092925.400cb477@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Bart.VanAssche@sandisk.com \
--cc=arnd@arndb.de \
--cc=bhalevy@primarydata.com \
--cc=dan.carpenter@oracle.com \
--cc=greg@kroah.com \
--cc=jejb@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ooo@electrozaur.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).