From: Linus Torvalds Date: Wed, 16 Dec 2020 18:45:11 +0000 (-0800) Subject: Merge tag 'printk-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/printk... X-Git-Tag: microblaze-v5.12~128 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=d3eb52113d162cc88975fbd03c9e6f9cf2f8a771;p=linux-2.6-microblaze.git Merge tag 'printk-for-5.11' of git://git./linux/kernel/git/printk/linux Pull printk updates from Petr Mladek: - Finally allow parallel writes and reads into/from the lockless ringbuffer. But it is not a complete solution. Readers are still serialized against each other. And nested writes are still prevented by printk_safe per-CPU buffers. - Use ttynull as the ultimate fallback for /dev/console. - Officially allow disabling console output by using console="" or console=null - A few code cleanups * tag 'printk-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux: printk: remove logbuf_lock writer-protection of ringbuffer printk: inline log_output(),log_store() in vprintk_store() printk: remove obsolete dead assignment printk/console: Allow to disable console output by using console="" or console=null init/console: Use ttynull as a fallback when there is no console printk: ringbuffer: Reference text_data_ring directly in callees. --- d3eb52113d162cc88975fbd03c9e6f9cf2f8a771 diff --cc drivers/tty/Makefile index b3ccae932660,f6b6bee0422d..3c1c5a9240a7 --- a/drivers/tty/Makefile +++ b/drivers/tty/Makefile @@@ -25,9 -25,10 +25,8 @@@ obj-$(CONFIG_ISI) += isicom. obj-$(CONFIG_MOXA_INTELLIO) += moxa.o obj-$(CONFIG_MOXA_SMARTIO) += mxser.o obj-$(CONFIG_NOZOMI) += nozomi.o - obj-$(CONFIG_NULL_TTY) += ttynull.o obj-$(CONFIG_ROCKETPORT) += rocket.o obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o -obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o -obj-$(CONFIG_SYNCLINK) += synclink.o obj-$(CONFIG_PPC_EPAPR_HV_BYTECHAN) += ehv_bytechan.o obj-$(CONFIG_GOLDFISH_TTY) += goldfish.o obj-$(CONFIG_MIPS_EJTAG_FDC_TTY) += mips_ejtag_fdc.o