linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "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>,
	Damien Le Moal <damien.lemoal@wdc.com>,
	Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>,
	Jens Axboe <axboe@kernel.dk>
Subject: linux-next: manual merge of the scsi-fixes tree with Linus' tree
Date: Wed, 6 Nov 2019 08:22:39 +1100	[thread overview]
Message-ID: <20191106082239.5c4d139c@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 846 bytes --]

Hi all,

Today's linux-next merge of the scsi-fixes tree got a conflict in:

  drivers/scsi/sd_zbc.c

between commit:

  d81e9d494354 ("scsi: implement REQ_OP_ZONE_RESET_ALL")

from Linus' tree and commit:

  8437bb81853e ("scsi: sd_zbc: Fix sd_zbc_complete()")

from the scsi-fixes tree.

8437bb81853e claims to fix d81e9d494354, however the latter is not an
ancestor of the former ...

I fixed it up (I just used the scsi-fixes tree version) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging.  You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2019-11-05 21:22 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-05 21:22 Stephen Rothwell [this message]
2019-11-07  1:56 ` linux-next: manual merge of the scsi-fixes tree with Linus' tree Martin K. Petersen

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=20191106082239.5c4d139c@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=axboe@kernel.dk \
    --cc=chaitanya.kulkarni@wdc.com \
    --cc=damien.lemoal@wdc.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=martin.petersen@oracle.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).