linux-next: manual merge of the security tree with the bpf-next tree

linux-next: manual merge of the security tree with the bpf-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1093 bytes --]

Hi all,

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

  include/linux/security.h

between commit:

  d734ca7b33db ("bpf,lsm: add BPF token LSM hooks")

from the bpf-next tree and commit:

  e1ca7129db2c ("LSM: Helpers for attribute names and filling lsm_ctx")

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

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/security.h
index 00809d2d5c38,750130a7b9dd..000000000000
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@@ -32,7 -32,7 +32,8 @@@
  #include <linux/string.h>
  #include <linux/mm.h>
  #include <linux/sockptr.h>
 +#include <linux/bpf.h>
+ #include <uapi/linux/lsm.h>
  
  struct linux_binprm;
  struct cred;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]