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

[Stephen Rothwell]

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>

Attachment: pgpNwt0Q2WR4q.pgp
Description: OpenPGP digital signature