From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <axboe@kernel•dk>, Christoph Hellwig <hch@lst•de>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Bart Van Assche <bart.vanassche@wdc•com>
Subject: linux-next: manual merge of the block tree with the dma-mapping tree
Date: Wed, 17 Jan 2018 13:38:17 +1100 [thread overview]
Message-ID: <20180117133817.739d6751@canb.auug.org.au> (raw)
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
lib/Kconfig
between commit:
002e67454f61 ("dma-direct: rename dma_noop to dma_direct")
from the dma-mapping tree and commit:
e80a0af4759a ("lib/scatterlist: Introduce sgl_alloc() and sgl_free()")
from the block tree.
I fixed it up (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 lib/Kconfig
index 9d3d649c9dc9,4dd5c11366f9..000000000000
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@@ -409,7 -409,11 +409,11 @@@ config HAS_DM
depends on !NO_DMA
default y
+ config SGL_ALLOC
+ bool
+ default n
+
-config DMA_NOOP_OPS
+config DMA_DIRECT_OPS
bool
depends on HAS_DMA && (!64BIT || ARCH_DMA_ADDR_T_64BIT)
default n
next reply other threads:[~2018-01-17 2:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-17 2:38 Stephen Rothwell [this message]
2018-01-17 16:18 ` linux-next: manual merge of the block tree with the dma-mapping tree Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2019-09-15 22:44 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=20180117133817.739d6751@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=bart.vanassche@wdc$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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