Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the slave-dma tree with the arm-soc tree
@ 2019-09-04 10:44 Stephen Rothwell
  2019-09-04 21:34 ` Arnd Bergmann
  0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2019-09-04 10:44 UTC (permalink / raw)
  To: Vinod Koul, Olof Johansson, Arnd Bergmann, ARM
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Randy Dunlap

[-- Attachment #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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: linux-next: manual merge of the slave-dma tree with the arm-soc tree
  2019-09-04 10:44 linux-next: manual merge of the slave-dma tree with the arm-soc tree Stephen Rothwell
@ 2019-09-04 21:34 ` Arnd Bergmann
  0 siblings, 0 replies; 5+ messages in thread
From: Arnd Bergmann @ 2019-09-04 21:34 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Vinod Koul, Olof Johansson, ARM, Linux Next Mailing List,
	Linux Kernel Mailing List, Randy Dunlap

On Wed, Sep 4, 2019 at 12:44 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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);

The resolution looks correct to me. I had to research how I missed this,
and it turns out that the problem is me testing with clang-9 rather than gcc
at the moment. While clang is perfectly capable of warning about this
issue, the kernel turns off -Wno-format when building with clang.

       Arnd

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: linux-next: manual merge of the slave-dma tree with the arm-soc tree
  2015-03-18  1:03 Stephen Rothwell
@ 2015-03-19  1:10 ` Simon Horman
  0 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2015-03-19  1:10 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Vinod Koul, Olof Johansson, Arnd Bergmann, linux-arm-kernel,
	linux-next, linux-kernel, Magnus Damm, Kuninori Morimoto

On Wed, Mar 18, 2015 at 12:03:47PM +1100, Stephen Rothwell wrote:
> Hi Vinod,
> 
> Today's linux-next merge of the slave-dma tree got a conflict in
> arch/arm/mach-shmobile/board-mackerel.c between commit a521422ea4ae
> ("ARM: shmobile: mackerel: Remove Legacy C board code") from the
> arm-soc tree and commit c078c62a7528 ("mmc: sh_mobile_sdhi: remove
> sh_mobile_sdhi_info v2") from the slave-dma tree.
> 
> I fixed it up (the former removed the file, so I did that) and can
> carry the fix as necessary (no action is required).

Thanks Stephen,

my understanding is that the plan is to correct the file in Vinod's tree
even thought it is removed in mine. Your fix is correct from my point of view.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* linux-next: manual merge of the slave-dma tree with the arm-soc tree
@ 2015-03-18  1:03 Stephen Rothwell
  2015-03-19  1:10 ` Simon Horman
  0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2015-03-18  1:03 UTC (permalink / raw)
  To: Vinod Koul, Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Magnus Damm, Simon Horman, Kuninori Morimoto

[-- Attachment #1: Type: text/plain, Size: 530 bytes --]

Hi Vinod,

Today's linux-next merge of the slave-dma tree got a conflict in
arch/arm/mach-shmobile/board-mackerel.c between commit a521422ea4ae
("ARM: shmobile: mackerel: Remove Legacy C board code") from the
arm-soc tree and commit c078c62a7528 ("mmc: sh_mobile_sdhi: remove
sh_mobile_sdhi_info v2") from the slave-dma tree.

I fixed it up (the former removed the file, so I did that) and can
carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* linux-next: manual merge of the slave-dma tree with the arm-soc tree
@ 2011-12-21  1:20 Stephen Rothwell
  0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2011-12-21  1:20 UTC (permalink / raw)
  To: Vinod Koul
  Cc: linux-next, linux-kernel, \"Eric Bénard\,
	Sascha Hauer, Olof Johansson, Arnd Bergmann, linux-arm-kernel

[-- Attachment #1: Type: text/plain, Size: 451 bytes --]

Hi Vinod,

Today's linux-next merge of the slave-dma tree got a conflict in
drivers/dma/Kconfig between commit eb444fee9289 ("dma: MX3_IPU fix
depends") from the arm-soc tree and commit 8e2d41f8c856 ("dma i.MX:
remove individual SOC dependency") from the slave-dma tree.

The latter seems to be a superset of the former, so I used that
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, back to index

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-04 10:44 linux-next: manual merge of the slave-dma tree with the arm-soc tree Stephen Rothwell
2019-09-04 21:34 ` 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

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org linux-next@archiver.kernel.org
	public-inbox-index linux-next


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/ public-inbox