From: Mark Brown <broonie@kernel•org>
To: "Luck, Tony" <tony.luck@intel•com>, Christoph Hellwig <hch@lst•de>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: linux-next: manual merge of the ia64 tree with the dma-mapping tree
Date: Mon, 16 Sep 2019 12:20:42 +0100 [thread overview]
Message-ID: <20190916112042.GZ4352@sirena.co.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 743 bytes --]
Hi all,
Today's linux-next merge of the ia64 tree got a conflict in:
arch/ia64/sn/pci/pci_dma.c
between commit:
f9f3232a7d0ab73a3 ("dma-mapping: explicitly wire up ->mmap and ->get_sgtable")
from the dma-mapping tree and commit:
cf07cb1ff4ea008ab ("ia64: remove support for the SGI SN2 platform")
from the ia64 tree.
I fixed it up by taking the delete from ia64 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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-09-16 11:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-16 11:20 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-09-15 17:05 linux-next: manual merge of the ia64 tree with the dma-mapping tree Mark Brown
2019-09-05 0:06 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=20190916112042.GZ4352@sirena.co.uk \
--to=broonie@kernel$(echo .)org \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tony.luck@intel$(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