diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-08 10:50:04 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-08 10:50:04 -0700 |
commit | dc0cf5a77db9d200284f54a60994c1f6d2fbfc5f (patch) | |
tree | 82f761dec31ba814a3e7833db9ab9d663142c1bc /mm/memory.c | |
parent | d0aab7d4e93e0fd5df3e892e0f2087d7a5371b1a (diff) | |
parent | dac8bbbae1d0ccba96402d25deeed3a2e87992c6 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk
Pull printk fix from Petr Mladek:
"This reverts a fix added into 4.12-rc1. It caused the kernel log to be
printed on another console when two consoles of the same type were
defined, e.g. console=ttyS0 console=ttyS1.
This configuration was never supported by kernel itself, but it
started to make sense with systemd. In other words, the commit broke
userspace"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
Revert "printk: fix double printing with earlycon"
Diffstat (limited to 'mm/memory.c')
0 files changed, 0 insertions, 0 deletions