linux-kernel - linux-next: manual merge of the akpm-current tree with the security tree

lists.openwall.net		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 linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20190111135524.5e3cceda@canb.auug.org.au>
Date:   Fri, 11 Jan 2019 13:55:24 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        James Morris <jmorris@...ei.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Casey Schaufler <casey@...aufler-ca.com>,
        Kees Cook <keescook@...omium.org>,
        Kent Overstreet <kent.overstreet@...il.com>
Subject: linux-next: manual merge of the akpm-current tree with the security
 tree

Hi all,

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

  security/selinux/ss/services.c

between commit:

  3d252529480c ("SELinux: Remove unused selinux_is_enabled")

from the security tree and commit:

  dd4c293d6d4d ("selinux: convert to kvmalloc")

from the akpm-current 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 security/selinux/ss/services.c
index d6e7b4856d93,fac47b306b6b..000000000000
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@@ -49,7 -49,7 +49,6 @@@
  #include <linux/sched.h>
  #include <linux/audit.h>
  #include <linux/mutex.h>
- #include <linux/flex_array.h>
 -#include <linux/selinux.h>
  #include <linux/vmalloc.h>
  #include <net/netlabel.h>
  

Content of type "application/pgp-signature" skipped