From: Stephen Rothwell <sfr@canb.auug.org.au>
To: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Luis Chamberlain <mcgrof@kernel.org>,
Christoph Hellwig <hch@lst.de>,
Ching Huang <ching2048@areca.com.tw>,
"Martin K. Petersen" <martin.petersen@oracle.com>
Subject: linux-next: manual merge of the scsi tree with Linus' tree
Date: Thu, 24 Jan 2019 14:58:21 +1100 [thread overview]
Message-ID: <20190124145821.6e747c25@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 778 bytes --]
Hi James,
Today's linux-next merge of the scsi tree got a conflict in:
drivers/scsi/arcmsr/arcmsr_hba.c
between commit:
750afb08ca71 ("cross-tree: phase out dma_zalloc_coherent()")
from Linus' tree and commit:
3e3153b050fc ("scsi: arcmsr: Use dma_alloc_coherent to replace dma_zalloc_coherent")
from the scsi tree.
I fixed it up (I just used the scsi 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 --]
next reply other threads:[~2019-01-24 3:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-24 3:58 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-05-22 0:11 linux-next: manual merge of the scsi tree with Linus' tree Stephen Rothwell
2019-05-22 0:08 Stephen Rothwell
2019-05-28 1:43 ` Stephen Rothwell
2019-06-20 23:59 ` Stephen Rothwell
2019-06-21 0:07 ` Linus Torvalds
2019-06-21 0:34 ` Martin K. Petersen
2019-06-21 0:35 ` James Bottomley
2019-06-21 0:47 ` Linus Torvalds
2019-06-21 1:14 ` Martin K. Petersen
2019-06-21 6:21 ` Greg Kroah-Hartman
2019-01-14 2:48 Stephen Rothwell
2019-01-14 5:42 ` 黃清隆
2017-11-06 3:48 Stephen Rothwell
[not found] <20140124130547.323ce38edc8dedfd653534b7@canb.auug.org.au>
2014-01-24 2:22 ` James Bottomley
2012-07-20 0:32 Stephen Rothwell
2012-07-20 7:29 ` James Bottomley
2012-07-20 16:31 ` Linus Torvalds
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=20190124145821.6e747c25@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=James.Bottomley@HansenPartnership.com \
--cc=ching2048@areca.com.tw \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mcgrof@kernel.org \
/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).