aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-11-21 15:27:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-11-21 15:27:41 -0800
commit3b404a519815b9820f73f1ecf404e5546c9270ba (patch)
treeaaa2975ab06a0f6f24bf21906577f5f065c48d98 /drivers/net/ethernet/marvell
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff)
parentapparmor: fix change_hat not finding hat after policy replacement (diff)
downloadlinux-dev-3b404a519815b9820f73f1ecf404e5546c9270ba.tar.xz
linux-dev-3b404a519815b9820f73f1ecf404e5546c9270ba.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull apparmor bugfix from James Morris: "This has a fix for a policy replacement bug that is fairly serious for apache mod_apparmor users, as it results in the wrong policy being applied on an network facing service" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: apparmor: fix change_hat not finding hat after policy replacement
Diffstat (limited to 'drivers/net/ethernet/marvell')
0 files changed, 0 insertions, 0 deletions