linux-next: manual merge of the slave-dma tree with the arm-soc tree

linux-next: manual merge of the slave-dma tree with the arm-soc tree

[Stephen Rothwell]

[-- 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 --]

linux-next: manual merge of the slave-dma tree with the arm-soc tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: manual merge of the slave-dma tree with the arm-soc tree

[Simon Horman]

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.

linux-next: manual merge of the slave-dma tree with the arm-soc tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: manual merge of the slave-dma tree with the arm-soc tree

[Arnd Bergmann]

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