diff options

author	Linus Torvalds <torvalds@linux-foundation.org>	2017-01-18 11:13:41 -0800
committer	Linus Torvalds <torvalds@linux-foundation.org>	2017-01-18 11:13:41 -0800
commit	ca92e6c7e6329029d7188487a5c32e86ef471977 (patch)
tree	704fb5c2ca533cdb569826522eed0dbbcf31f316 /fs/xfs/libxfs/xfs_btree.h
parent	0b75f821ec8be459dd4dec77be39595d989d77ac (diff)
parent	4205e4786d0b9fc3b4fec7b1910cf645a0468307 (diff)

Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull SMP hotplug update from Thomas Gleixner: "This contains a trivial typo fix and an extension to the core code for dynamically allocating states in the prepare stage. The extension is necessary right now because 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 'fs/xfs/libxfs/xfs_btree.h')


context:
space:
mode: