aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-07-22 09:30:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-07-22 09:30:34 -0700
commit7b5cf701ea9c395c792e2a7e3b7caf4c68b87721 (patch)
tree6c7a2d6bd1369e732a297fd402a79ee8eed30850 /drivers/net/bonding
parentMerge tag 'for-linus-20190722' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux (diff)
parentsched/rt, Kconfig: Unbreak def/oldconfig with CONFIG_PREEMPT=y (diff)
downloadlinux-dev-7b5cf701ea9c395c792e2a7e3b7caf4c68b87721.tar.xz
linux-dev-7b5cf701ea9c395c792e2a7e3b7caf4c68b87721.zip
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull preemption Kconfig fix from Thomas Gleixner: "The PREEMPT_RT stub config renamed PREEMPT to PREEMPT_LL and defined PREEMPT outside of the menu and made it selectable by both PREEMPT_LL and PREEMPT_RT. Stupid me missed that 114 defconfigs select CONFIG_PREEMPT which obviously can't work anymore. oldconfig builds are affected as well, but it's more obvious as the user gets asked. [old]defconfig silently fixes it up and selects PREEMPT_NONE. Unbreak it by undoing the rename and adding a intermediate config symbol which is selected by both PREEMPT and PREEMPT_RT. That requires to chase down a few #ifdefs, but it's better than tweaking 114 defconfigs and annoying users" * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched/rt, Kconfig: Unbreak def/oldconfig with CONFIG_PREEMPT=y
Diffstat (limited to 'drivers/net/bonding')
0 files changed, 0 insertions, 0 deletions