[lkml]   [2019]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the security tree with Linus' tree
Hi all,

Just adding a couple of more Cc's

On Wed, 21 Aug 2019 13:01:06 +1000 Stephen Rothwell <> 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.

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2019-08-21 05:18    [W:0.028 / U:1.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site