Merge tag 'selinux-pr-20190429' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Apr 2019 15:38:02 +0000 (08:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Apr 2019 15:38:02 +0000 (08:38 -0700)
commitfea27bc7ff43a8beb6bebe6d4fe9eb889e185d4a
tree060f6deb9eb907bff65c8118fb2cba09f79c8da0
parent83a50840e72a5a964b4704fcdc2fbb2d771015ab
parentdfbd199a7cfe3e3cd8531e1353cdbd7175bfbc5e
Merge tag 'selinux-pr-20190429' of git://git./linux/kernel/git/pcmoore/selinux

Pull selinux fix from Paul Moore:
 "One small patch for the stable folks to fix a problem when building
  against the latest glibc.

  I'll be honest and say that I'm not really thrilled with the idea of
  sending this up right now, but Greg is a little annoyed so here I
  figured I would at least send this"

* tag 'selinux-pr-20190429' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  selinux: use kernel linux/socket.h for genheaders and mdp