From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Vinod Koul <vkoul@kernel.org>, Olof Johansson <olof@lixom.net>,
Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Randy Dunlap <rdunlap@infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the slave-dma tree with the arm-soc tree
Date: Wed, 4 Sep 2019 20:44:27 +1000 [thread overview]
Message-ID: <20190904204427.1e1a064f@canb.auug.org.au> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 1572 bytes --]
Hi all,
Today's linux-next merge of the slave-dma tree got a conflict in:
drivers/dma/iop-adma.c
between commit:
00c9755524fb ("dmaengine: iop-adma: use correct printk format strings")
from the arm-soc tree and commit:
d17d9ea95727 ("dmaengine: iop-adma.c: fix printk format warning")
from the slave-dma 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 drivers/dma/iop-adma.c
index 03f4a588cf7f,003b753e4604..000000000000
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@@ -116,9 -116,9 +116,9 @@@ static void __iop_adma_slot_cleanup(str
list_for_each_entry_safe(iter, _iter, &iop_chan->chain,
chain_node) {
pr_debug("\tcookie: %d slot: %d busy: %d "
- "this_desc: %#x next_desc: %#llx ack: %d\n",
- "this_desc: %pad next_desc: %#x ack: %d\n",
++ "this_desc: %pad next_desc: %#llx ack: %d\n",
iter->async_tx.cookie, iter->idx, busy,
- iter->async_tx.phys, (u64)iop_desc_get_next_desc(iter),
- &iter->async_tx.phys, iop_desc_get_next_desc(iter),
++ &iter->async_tx.phys, (u64)iop_desc_get_next_desc(iter),
async_tx_test_ack(&iter->async_tx));
prefetch(_iter);
prefetch(&_iter->async_tx);
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2019-09-04 10:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-04 10:44 Stephen Rothwell [this message]
2019-09-04 21:34 ` linux-next: manual merge of the slave-dma tree with the arm-soc tree Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2015-03-18 1:03 Stephen Rothwell
2015-03-19 1:10 ` Simon Horman
2011-12-21 1:20 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=20190904204427.1e1a064f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=rdunlap@infradead.org \
--cc=vkoul@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