Hi all, Just adding a couple of more Cc's
On Wed, 21 Aug 2019 13:01:06 +1000 Stephen Rothwell <s...@canb.auug.org.au>
wrote:
>
> Today's linux-next merge of the security tree got conflicts in:
>
> arch/s390/configs/debug_defconfig
> arch/s390/configs/defconfig
>
> between commit:
>
> 3361f3193c74 ("s390: update configs")
>
> from Linus' tree and commit:
>
> 99d5cadfde2b ("kexec_file: split KEXEC_VERIFY_SIG into KEXEC_SIG and
> KEXEC_SIG_FORCE")
>
> from the security tree.
>
> I fixed it up (the former removed the CONFIG option updated by the latter)
> 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
pgp6y7Eibt40a.pgp
Description: OpenPGP digital signature
