tree 82f761dec31ba814a3e7833db9ab9d663142c1bc
parent d0aab7d4e93e0fd5df3e892e0f2087d7a5371b1a
parent dac8bbbae1d0ccba96402d25deeed3a2e87992c6
author Linus Torvalds <torvalds@linux-foundation.org> 1496944204 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1496944204 -0700

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"