Hi all,
Today's linux-next merge of the akpm tree got a conflict in:
lib/Kconfig.debug
between commit:
dfd402a4c4ba ("kcsan: Add Kernel Concurrency Sanitizer infrastructure")
from the rcu tree and commit:
fa95a0eadaa7 ("kernel-hacking: group sysrq/kgdb/ubsan into 'Generic Kernel Debugging Instruments'")
from the akpm tree.
I fixed it up (I added kcsan into the above) 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
On Tue, 19 Nov 2019 at 08:30, Stephen Rothwell <[email protected]> wrote:
>
> Hi all,
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
> lib/Kconfig.debug
>
> between commit:
>
> dfd402a4c4ba ("kcsan: Add Kernel Concurrency Sanitizer infrastructure")
>
> from the rcu tree and commit:
>
> fa95a0eadaa7 ("kernel-hacking: group sysrq/kgdb/ubsan into 'Generic Kernel Debugging Instruments'")
>
> from the akpm tree.
>
> I fixed it up (I added kcsan into the above) 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, looks good to me -- makes sense to also move this into the
'Generic Kernel Debugging Instruments' section.
Many thanks,
-- Marco
> --
> Cheers,
> Stephen Rothwell