From: Stephen Rothwell <sfr@canb•auug.org.au>
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: Thu, 5 Sep 2019 10:06:54 +1000 [thread overview]
Message-ID: <20190905100654.6aaee8fe@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1803 bytes --]
Hi all,
Today's linux-next merge of the ia64 tree got a conflict in:
arch/ia64/hp/common/sba_iommu.c
arch/ia64/sn/pci/pci_dma.c
between commit:
f9f3232a7d0a ("dma-mapping: explicitly wire up ->mmap and ->get_sgtable")
from the dma-mapping tree and commits:
974f83ec1e5a ("ia64: rework iommu probing")
cf07cb1ff4ea ("ia64: remove support for the SGI SN2 platform")
from the ia64 tree.
I fixed it up (I removed the second file and see below) 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
diff --cc arch/ia64/hp/common/sba_iommu.c
index 4c0ea6c2833d,a7eff5e6d260..000000000000
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@@ -2062,6 -2055,22 +2055,24 @@@ static int __init acpi_sba_ioc_init_acp
/* This has to run before acpi_scan_init(). */
arch_initcall(acpi_sba_ioc_init_acpi);
+ static int sba_dma_supported (struct device *dev, u64 mask)
+ {
+ /* make sure it's at least 32bit capable */
+ return ((mask & 0xFFFFFFFFUL) == 0xFFFFFFFFUL);
+ }
+
+ static const struct dma_map_ops sba_dma_ops = {
+ .alloc = sba_alloc_coherent,
+ .free = sba_free_coherent,
+ .map_page = sba_map_page,
+ .unmap_page = sba_unmap_page,
+ .map_sg = sba_map_sg_attrs,
+ .unmap_sg = sba_unmap_sg_attrs,
+ .dma_supported = sba_dma_supported,
++ .mmap = dma_common_mmap,
++ .get_sgtable = dma_common_get_sgtable,
+ };
+
static int __init
sba_init(void)
{
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-09-05 0:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-05 0:06 Stephen Rothwell [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-16 11:20 Mark Brown
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=20190905100654.6aaee8fe@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--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