summaryrefslogtreecommitdiffstats
path: root/fs/cachefiles
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-10 00:09:52 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-10 00:09:52 +0200
commit96784de59fb35077c2bb33c39328992b836d87d3 (patch)
treeeba46707fce39a89130872c58781630d745e356a /fs/cachefiles
parentMerge branch 'for-3.17' of git://linux-nfs.org/~bfields/linux (diff)
parentselinux: remove unused variabled in the netport, netnode, and netif caches (diff)
downloadlinux-96784de59fb35077c2bb33c39328992b836d87d3.tar.xz
linux-96784de59fb35077c2bb33c39328992b836d87d3.zip
Merge branch 'stable-3.17' of git://git.infradead.org/users/pcmoore/selinux
Pull SElinux fixes from Paul Moore: "Two small patches to fix a couple of build warnings in SELinux and NetLabel. The patches are obvious enough that I don't think any additional explanation is necessary, but it basically boils down to the usual: I was stupid, and these patches fix some of the stupid. Both patches were posted earlier this week to the SELinux list, and that is where they sat as I didn't think there were noteworthy enough to go upstream at this point in time, but DaveM would rather see them upstream now so who am I to argue. As the patches are both very small" * 'stable-3.17' of git://git.infradead.org/users/pcmoore/selinux: selinux: remove unused variabled in the netport, netnode, and netif caches netlabel: fix the netlbl_catmap_setlong() dummy function
Diffstat (limited to 'fs/cachefiles')
0 files changed, 0 insertions, 0 deletions