diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-09 15:09:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-09 15:09:52 -0700 |
| commit | 96784de59fb35077c2bb33c39328992b836d87d3 (patch) | |
| tree | eba46707fce39a89130872c58781630d745e356a /kernel | |
| parent | 0d10c2c170e3384dd63f40216d7af4673d5ebb50 (diff) | |
| parent | 942ba3646543aeb3e5729c35d10ac43424bf0b68 (diff) | |
| download | linux-96784de59fb35077c2bb33c39328992b836d87d3.tar.bz2 | |
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 'kernel')
0 files changed, 0 insertions, 0 deletions