summaryrefslogtreecommitdiff
path: root/net/netlabel/netlabel_mgmt.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-02-02 12:39:10 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-02 12:39:10 -0800
commite4178c75049c581114998a850ecdfa5a2811cde6 (patch)
tree30ad09d949e58d32a4c0aa0a70bc1819a26d820d /net/netlabel/netlabel_mgmt.h
parentf2557779e1a9cfbf69c99b74da26cc1b2b10e752 (diff)
parent4b3e6f2ef3722f1a6a97b6034ed492c1a21fd4ae (diff)
Merge tag 'xtensa-20170202' of git://github.com/jcmvbkbc/linux-xtensa
Pull Xtensa fix from Max Filippov: "A for an Xtensa build error introduced in reset code refactoring series in v4.9: - fix noMMU build on cores with MMU" * tag 'xtensa-20170202' of git://github.com/jcmvbkbc/linux-xtensa: xtensa: fix noMMU build on cores with MMU
Diffstat (limited to 'net/netlabel/netlabel_mgmt.h')
0 files changed, 0 insertions, 0 deletions
we need a proper way to unbreak LTTNG, which iscurrently non functional due to the removal of the notifiers. Surely it's out of tree, but it's widely used by distros. The simple solution would have been to reserve a state for LTTNG, but I'm not fond about unused crap in the kernel and the dynamic range, which we admittedly should have done right away, allows us to remove quite some of the hardcoded states, i.e. those which have no ordering requirements. So doing the right thing now is better than having an smaller intermediate solution which needs to be reworked anyway" * 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: cpu/hotplug: Provide dynamic range for prepare stage perf/x86/amd/ibs: Fix typo after cleanup state names in cpu/hotplug
Diffstat (limited to 'include/uapi/misc/Kbuild')