From: "Martin K. Petersen" <martin.petersen@oracle.com>
To: Martin Wilck <mwilck@suse.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>,
"James E.J. Bottomley" <jejb@linux.vnet.ibm.com>,
Hannes Reinecke <hare@suse.de>,
linux-scsi@vger.kernel.org
Subject: Re: hpsa patches in mkp/4.12/scsi-queue and mkp/4.11/scsi-fixes
Date: Thu, 06 Apr 2017 13:05:30 -0400 [thread overview]
Message-ID: <yq1ziftpiud.fsf@oracle.com> (raw)
In-Reply-To: <1491481189.5348.12.camel@suse.com> (Martin Wilck's message of "Thu, 06 Apr 2017 14:19:49 +0200")
Martin Wilck <mwilck@suse.com> writes:
Martin,
> I noticed that the following commits
>
> eb94588dabec scsi: hpsa: fix volume offline state
> 2ef288498087 scsi: hpsa: do not timeout reset operations
> 87b9e6aa87d9 scsi: hpsa: limit outstanding rescans
> 85b29008d8af scsi: hpsa: update check for logical volume status
>
> are included in mkp/4.11/scsi-fixes but not in mkp/4.12/scsi-queue.
> Is there a specific reason for that?
scsi-fixes and scsi-queue are usually forked from linus/master at the
about same time after the merge window closes.
- Bugfixes for the current release go into scsi-fixes.
- New features for next release go into scsi-queue.
Consequently, it's perfectly normal for fixes to be more "recent" than
queue. I only rebase the queue if I absolutely have to (i.e. a new
feature depends on something that happened in Linus' tree after the
merge window closed).
--
Martin K. Petersen Oracle Linux Engineering
prev parent reply other threads:[~2017-04-06 17:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-06 12:19 hpsa patches in mkp/4.12/scsi-queue and mkp/4.11/scsi-fixes Martin Wilck
2017-04-06 17:05 ` Martin K. Petersen [this message]
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=yq1ziftpiud.fsf@oracle.com \
--to=martin.petersen@oracle.com \
--cc=hare@suse.de \
--cc=jejb@linux.vnet.ibm.com \
--cc=linux-scsi@vger.kernel.org \
--cc=mwilck@suse.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