* linux-next: manual merge of the samsung-krzk tree with the dma-mapping tree
@ 2018-05-09 23:16 Stephen Rothwell
2018-05-14 23:09 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2018-05-09 23:16 UTC (permalink / raw)
To: Krzysztof Kozlowski, Christoph Hellwig
Cc: Linux-Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 860 bytes --]
Hi Krzysztof,
Today's linux-next merge of the samsung-krzk tree got a conflict in:
arch/arm/mach-exynos/Kconfig
between commit:
4965a68780c5 ("arch: define the ARCH_DMA_ADDR_T_64BIT config symbol in lib/Kconfig")
from the dma-mapping tree and commit:
c5deb598089c ("ARM: exynos: Remove support for Exynos5440")
from the samsung-krzk tree.
I fixed it up (the latter removed the whole section modified by
the former, so I just removed the section) 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 --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the samsung-krzk tree with the dma-mapping tree
2018-05-09 23:16 linux-next: manual merge of the samsung-krzk tree with the dma-mapping tree Stephen Rothwell
@ 2018-05-14 23:09 ` Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2018-05-14 23:09 UTC (permalink / raw)
To: Christoph Hellwig, Olof Johansson, Arnd Bergmann, ARM
Cc: Krzysztof Kozlowski, Linux-Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 1059 bytes --]
Hi all,
On Thu, 10 May 2018 09:16:34 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the samsung-krzk tree got a conflict in:
>
> arch/arm/mach-exynos/Kconfig
>
> between commit:
>
> 4965a68780c5 ("arch: define the ARCH_DMA_ADDR_T_64BIT config symbol in lib/Kconfig")
>
> from the dma-mapping tree and commit:
>
> c5deb598089c ("ARM: exynos: Remove support for Exynos5440")
>
> from the samsung-krzk tree.
>
> I fixed it up (the latter removed the whole section modified by
> the former, so I just removed the section) 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.
This is now a conflict between the arm-soc tree and the dma-mapping tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* linux-next: manual merge of the samsung-krzk tree with the dma-mapping tree
@ 2018-05-14 23:09 ` Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2018-05-14 23:09 UTC (permalink / raw)
To: linux-arm-kernel
Hi all,
On Thu, 10 May 2018 09:16:34 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the samsung-krzk tree got a conflict in:
>
> arch/arm/mach-exynos/Kconfig
>
> between commit:
>
> 4965a68780c5 ("arch: define the ARCH_DMA_ADDR_T_64BIT config symbol in lib/Kconfig")
>
> from the dma-mapping tree and commit:
>
> c5deb598089c ("ARM: exynos: Remove support for Exynos5440")
>
> from the samsung-krzk tree.
>
> I fixed it up (the latter removed the whole section modified by
> the former, so I just removed the section) 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.
This is now a conflict between the arm-soc tree and the dma-mapping tree.
--
Cheers,
Stephen Rothwell
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20180515/e2b00e44/attachment.sig>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the samsung-krzk tree with the dma-mapping tree
2018-05-14 23:09 ` Stephen Rothwell
@ 2018-05-15 6:10 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 5+ messages in thread
From: Krzysztof Kozlowski @ 2018-05-15 6:10 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Christoph Hellwig, Olof Johansson, Arnd Bergmann, ARM,
Linux-Next Mailing List, Linux Kernel Mailing List
On Tue, May 15, 2018 at 1:09 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Thu, 10 May 2018 09:16:34 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the samsung-krzk tree got a conflict in:
>>
>> arch/arm/mach-exynos/Kconfig
>>
>> between commit:
>>
>> 4965a68780c5 ("arch: define the ARCH_DMA_ADDR_T_64BIT config symbol in lib/Kconfig")
>>
>> from the dma-mapping tree and commit:
>>
>> c5deb598089c ("ARM: exynos: Remove support for Exynos5440")
>>
>> from the samsung-krzk tree.
>>
>> I fixed it up (the latter removed the whole section modified by
>> the former, so I just removed the section) 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.
>
> This is now a conflict between the arm-soc tree and the dma-mapping tree.
Yes, this is expected. Thanks for letting us know. I mentioned this
also in my pull request to arm-soc.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 5+ messages in thread* linux-next: manual merge of the samsung-krzk tree with the dma-mapping tree
@ 2018-05-15 6:10 ` Krzysztof Kozlowski
0 siblings, 0 replies; 5+ messages in thread
From: Krzysztof Kozlowski @ 2018-05-15 6:10 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, May 15, 2018 at 1:09 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Thu, 10 May 2018 09:16:34 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the samsung-krzk tree got a conflict in:
>>
>> arch/arm/mach-exynos/Kconfig
>>
>> between commit:
>>
>> 4965a68780c5 ("arch: define the ARCH_DMA_ADDR_T_64BIT config symbol in lib/Kconfig")
>>
>> from the dma-mapping tree and commit:
>>
>> c5deb598089c ("ARM: exynos: Remove support for Exynos5440")
>>
>> from the samsung-krzk tree.
>>
>> I fixed it up (the latter removed the whole section modified by
>> the former, so I just removed the section) 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.
>
> This is now a conflict between the arm-soc tree and the dma-mapping tree.
Yes, this is expected. Thanks for letting us know. I mentioned this
also in my pull request to arm-soc.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-05-15 6:10 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-09 23:16 linux-next: manual merge of the samsung-krzk tree with the dma-mapping tree Stephen Rothwell
2018-05-14 23:09 ` Stephen Rothwell
2018-05-14 23:09 ` Stephen Rothwell
2018-05-15 6:10 ` Krzysztof Kozlowski
2018-05-15 6:10 ` Krzysztof Kozlowski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.