diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-22 09:30:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-22 09:30:34 -0700 |
| commit | 7b5cf701ea9c395c792e2a7e3b7caf4c68b87721 (patch) | |
| tree | 6c7a2d6bd1369e732a297fd402a79ee8eed30850 /drivers/ide/siimage.c | |
| parent | 44b912cd0b55777796c5ae8ae857bd1d5ff83ed5 (diff) | |
| parent | b8d3349803ba34afda429e87a837fd95a99b2349 (diff) | |
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/ide/siimage.c')
0 files changed, 0 insertions, 0 deletions