linux-next: manual merge of the arm64 tree with the dma-mapping tree

linux-next: manual merge of the arm64 tree with the dma-mapping tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm64 tree got a conflict in:

  include/linux/dma-direct.h

between commit:

  b0817901ba21 ("dma-direct: check for overflows on 32 bit DMA addresses")

from the dma-mapping tree and commit:

  8b5369ea5809 ("dma/direct: turn ARCH_ZONE_DMA_BITS into a variable")

from the arm64 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 include/linux/dma-direct.h
index 6db863c3eb93,d03af3605460..000000000000
--- a/include/linux/dma-direct.h
+++ b/include/linux/dma-direct.h
@@@ -3,11 -3,10 +3,13 @@@
  #define _LINUX_DMA_DIRECT_H 1
  
  #include <linux/dma-mapping.h>
 +#include <linux/memblock.h> /* for min_low_pfn */
  #include <linux/mem_encrypt.h>
  
+ extern unsigned int zone_dma_bits;
+ 
 +static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr);
 +
  #ifdef CONFIG_ARCH_HAS_PHYS_TO_DMA
  #include <asm/dma-direct.h>
  #else

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

Re: linux-next: manual merge of the arm64 tree with the dma-mapping tree

[Catalin Marinas]

On Fri, Nov 08, 2019 at 08:11:09AM +1100, Stephen Rothwell wrote:
> diff --cc include/linux/dma-direct.h
> index 6db863c3eb93,d03af3605460..000000000000
> --- a/include/linux/dma-direct.h
> +++ b/include/linux/dma-direct.h
> @@@ -3,11 -3,10 +3,13 @@@
>   #define _LINUX_DMA_DIRECT_H 1
>   
>   #include <linux/dma-mapping.h>
>  +#include <linux/memblock.h> /* for min_low_pfn */
>   #include <linux/mem_encrypt.h>
>   
> + extern unsigned int zone_dma_bits;
> + 
>  +static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr);
>  +
>   #ifdef CONFIG_ARCH_HAS_PHYS_TO_DMA
>   #include <asm/dma-direct.h>
>   #else

The resolution is fine. Thanks Stephen.

-- 
Catalin

Re: linux-next: manual merge of the arm64 tree with the dma-mapping tree

[Will Deacon]

Hi Stephen,

On Thu, Sep 12, 2019 at 09:55:58PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the arm64 tree got a conflict in:
> 
>   arch/arm64/include/asm/dma-mapping.h
> 
> between commit:
> 
>   5489c8e0cf03 ("arm64: use asm-generic/dma-mapping.h")
> 
> from the dma-mapping tree and commit:
> 
>   b907b80d7ae7 ("arm64: remove pointless __KERNEL__ guards")
> 
> from the arm64 tree.
> 
> I fixed it up (I just removed the file) 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.

Thanks. Killing the file is the right thing to do.

Will

linux-next: manual merge of the arm64 tree with the dma-mapping tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm64 tree got a conflict in:

  arch/arm64/include/asm/dma-mapping.h

between commit:

  5489c8e0cf03 ("arm64: use asm-generic/dma-mapping.h")

from the dma-mapping tree and commit:

  b907b80d7ae7 ("arm64: remove pointless __KERNEL__ guards")

from the arm64 tree.

I fixed it up (I just removed the file) 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

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