From: Linus Torvalds Date: Thu, 8 Jun 2017 17:50:04 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dc0cf5a77db9d200284f54a60994c1f6d2fbfc5f;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'for-linus' of git://git./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" --- dc0cf5a77db9d200284f54a60994c1f6d2fbfc5f