Messages in this thread | | | Subject | Re: [GIT PULL] SCSI fixes for 4.16-rc2 | From | James Bottomley <> | Date | Thu, 22 Feb 2018 22:21:33 -0500 |
| |
On Thu, 2018-02-22 at 16:37 -0800, Linus Torvalds wrote: > On Thu, Feb 22, 2018 at 11:28 AM, James Bottomley > <James.Bottomley@hansenpartnership.com> wrote: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi- > > fixes > > When I pull that, I get something completely different from what you > claim I should get. Much bigger, and a lot more commits. > > Hmm? > > Dropped.
OK, I see the problem, but I don't currently have an explanation for how it happened. The scsi-fixes tag somehow became attached to a push of the misc tree for the next merge window instead of the fixes branch.
I've reset it to where it should be
commit 1bc5ad3a6acdcf56f83272f2de1cd2389ea9e9e2 Author: Manish Rangankar <manish.rangankar@cavium.com> Date: Sun Feb 11 22:48:41 2018 -0800
scsi: qla4xxx: skip error recovery in case of register disconnect.
So it should all be correct if you re-pull.
I suppose it's good that the checks and balances of changelog + diffstat caught this; I'll poke about in my current preparation scripts to see if I can find out what went wrong.
James
| |