From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Martin K. Petersen" <martin.petersen@oracle•com>,
Jens Axboe <axboe@kernel•dk>
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>,
Christoph Hellwig <hch@lst•de>
Subject: linux-next: manual merge of the scsi-mkp tree with the block tree
Date: Wed, 26 Apr 2017 15:47:22 +1000 [thread overview]
Message-ID: <20170426154722.757ba483@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the scsi-mkp tree got a conflict in:
drivers/scsi/sd.c
between commit:
81d926e8b552 ("sd: split sd_setup_discard_cmnd")
from the block tree and commit:
7529fbb0080d ("scsi: sd: Fix function descriptions")
from the scsi-mkp tree.
I fixed it up (I just used the former 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
next reply other threads:[~2017-04-26 5:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-26 5:47 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-18 4:55 linux-next: manual merge of the scsi-mkp tree with the block tree Stephen Rothwell
2024-04-18 5:57 ` Christoph Hellwig
2024-04-26 6:01 ` Stephen Rothwell
2022-02-21 22:06 broonie
2022-03-01 7:29 ` Stephen Rothwell
2022-02-21 21:59 broonie
2022-02-22 5:57 ` Jinpu Wang
2022-03-01 7:31 ` Stephen Rothwell
2021-01-27 6:58 Stephen Rothwell
2019-02-11 4:23 Stephen Rothwell
2016-11-09 2:54 Stephen Rothwell
2016-11-11 19:55 ` Martin K. Petersen
2016-11-17 2:44 ` 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=20170426154722.757ba483@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=damien.lemoal@wdc$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=martin.petersen@oracle$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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