lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [day] [month] [year] [list]
Date:   Thu, 2 Nov 2017 13:02:02 +1100
From:   Stephen Rothwell <>
To:     Mimi Zohar <>,
        Dmitry Kasatkin <>,
        James Morris <>
Cc:     Linux-Next Mailing List <>,
        Linux Kernel Mailing List <>,
        Eric Biggers <>
Subject: linux-next: manual merge of the integrity tree with the security

Hi all,

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


between commit:

  e28aa8aeab43 ("MAINTAINERS: remove David Safford as maintainer for encrypted+trusted keys")

from the security tree and commit:

  46d6c35e6882 ("MAINTAINERS: update the IMA, EVM, trusted-keys, encrypted-keys entries")

from the integrity 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.

Stephen Rothwell

index df4a2519b306,80023acd6a7c..000000000000
@@@ -7680,7 -7623,8 +7677,7 @@@ F:	kernel/kexec
  M:	Mimi Zohar <>
- L:
 -M:	David Safford <>
+ L:
  S:	Supported
  F:	Documentation/security/keys/trusted-encrypted.rst
@@@ -7688,8 -7632,9 +7685,8 @@@ F:	include/keys/encrypted-type.
  F:	security/keys/encrypted-keys/
 -M:	David Safford <>
  M:	Mimi Zohar <>
- L:
+ L:
  S:	Supported
  F:	Documentation/security/keys/trusted-encrypted.rst

Powered by blists - more mailing lists