Commit ca9b5b62 authored Jan 29, 2020 by Linus Torvalds

Merge tag 'tty-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial driver updates from Greg KH:
 "Here are the big set of tty and serial driver updates for 5.6-rc1

  Included in here are:
   - dummy_con cleanups (touches lots of arch code)
   - sysrq logic cleanups (touches lots of serial drivers)
   - samsung driver fixes (wasn't really being built)
   - conmakeshash move to tty subdir out of scripts
   - lots of small tty/serial driver updates

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'tty-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (140 commits)
  tty: n_hdlc: Use flexible-array member and struct_size() helper
  tty: baudrate: SPARC supports few more baud rates
  tty: baudrate: Synchronise baud_table[] and baud_bits[]
  tty: serial: meson_uart: Add support for kernel debugger
  serial: imx: fix a race condition in receive path
  serial: 8250_bcm2835aux: Document struct bcm2835aux_data
  serial: 8250_bcm2835aux: Use generic remapping code
  serial: 8250_bcm2835aux: Allocate uart_8250_port on stack
  serial: 8250_bcm2835aux: Suppress register_port error on -EPROBE_DEFER
  serial: 8250_bcm2835aux: Suppress clk_get error on -EPROBE_DEFER
  serial: 8250_bcm2835aux: Fix line mismatch on driver unbind
  serial_core: Remove unused member in uart_port
  vt: Correct comment documenting do_take_over_console()
  vt: Delete comment referencing non-existent unbind_con_driver()
  arch/xtensa/setup: Drop dummy_con initialization
  arch/x86/setup: Drop dummy_con initialization
  arch/unicore32/setup: Drop dummy_con initialization
  arch/sparc/setup: Drop dummy_con initialization
  arch/sh/setup: Drop dummy_con initialization
  arch/s390/setup: Drop dummy_con initialization
  ...

parents aac96626 85f4c951

MAINTAINERS

+6 −0

Original line number	Diff line number	Diff line
		@@ -6181,6 +6181,12 @@ M: Maxim Levitsky <maximlevitsky@gmail.com>
		S: Maintained
		F: drivers/media/rc/ene_ir.*

		EPAPR HYPERVISOR BYTE CHANNEL DEVICE DRIVER
		M: Laurentiu Tudor <laurentiu.tudor@nxp.com>
		L: linuxppc-dev@lists.ozlabs.org
		S: Maintained
		F: drivers/tty/ehv_bytechan.c

		EPSON S1D13XXX FRAMEBUFFER DRIVER
		M: Kristoffer Ericson <kristoffer.ericson@gmail.com>
		S: Maintained

arch/alpha/kernel/setup.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -655,8 +655,6 @@ setup_arch(char **cmdline_p)
		#ifdef CONFIG_VT
		#if defined(CONFIG_VGA_CONSOLE)
		conswitchp = &vga_con;
		#elif defined(CONFIG_DUMMY_CONSOLE)
		conswitchp = &dummy_con;
		#endif
		#endif

arch/arc/kernel/setup.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -572,10 +572,6 @@ void __init setup_arch(char **cmdline_p)
		*/
		root_mountflags &= ~MS_RDONLY;

		#if defined(CONFIG_VT) && defined(CONFIG_DUMMY_CONSOLE)
		conswitchp = &dummy_con;
		#endif

		arc_unwind_init();
		}

arch/arm/kernel/setup.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1164,8 +1164,6 @@ void __init setup_arch(char **cmdline_p)
		#ifdef CONFIG_VT
		#if defined(CONFIG_VGA_CONSOLE)
		conswitchp = &vga_con;
		#elif defined(CONFIG_DUMMY_CONSOLE)
		conswitchp = &dummy_con;
		#endif
		#endif

arch/arm64/kernel/setup.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -360,9 +360,6 @@ void __init setup_arch(char **cmdline_p)
		init_task.thread_info.ttbr0 = __pa_symbol(empty_zero_page);
		#endif

		#ifdef CONFIG_VT
		conswitchp = &dummy_con;
		#endif
		if (boot_args[1] \|\| boot_args[2] \|\| boot_args[3]) {
		pr_err("WARNING: x1-x3 nonzero in violation of boot protocol:\n"
		"\tx1: %016llx\n\tx2: %016llx\n\tx3: %016llx\n"

Admin message