From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
"Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Darren Trapp <darren.trapp@cavium.com>,
Himanshu Madhani <himanshu.madhani@cavium.com>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with the scsi tree
Date: Thu, 25 Jan 2018 15:18:19 -0800 [thread overview]
Message-ID: <1516922299.3044.55.camel@HansenPartnership.com> (raw)
In-Reply-To: <20180126093914.4afaed4c@canb.auug.org.au>
On Fri, 2018-01-26 at 09:39 +1100, Stephen Rothwell wrote:
> Hi Martin,
>
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
>
> drivers/scsi/qla2xxx/qla_init.c
>
> between commit:
>
> 07a21872cf2b ("scsi: qla2xxx: Fix queue ID for async abort with
> Multiqueue")
>
> from the scsi tree and commit:
>
> b027a5ace443 ("scsi: qla2xxx: Fix queue ID for async abort with
> Multiqueue")
>
> from the scsi-mkp tree.
>
> Looks like you have updated your tree after James has merged it :-(
OK, I pulled my tree into sync now. I also added the postmerge tree,
which I can rebase if it causes you similar problems (it's based on the
block tree).
James
next prev parent reply other threads:[~2018-01-25 23:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-25 22:39 linux-next: manual merge of the scsi-mkp tree with the scsi tree Stephen Rothwell
2018-01-25 23:18 ` James Bottomley [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-03 6:40 Stephen Rothwell
2016-11-09 2:57 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=1516922299.3044.55.camel@HansenPartnership.com \
--to=james.bottomley@hansenpartnership.com \
--cc=darren.trapp@cavium.com \
--cc=himanshu.madhani@cavium.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.