From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 29 Jan 2020 18:13:27 +0000 (-0800)
Subject: Merge tag 'tty-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: v5.15~4625
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca9b5b6283984f67434cee810f3b08e19630226d;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'tty-5.6-rc1' of git://git./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
  ...
---

ca9b5b6283984f67434cee810f3b08e19630226d
diff --cc scripts/Makefile
index b0e9626,96f155b..4d41f48
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@@ -11,9 -9,8 +9,8 @@@ HOST_EXTRACFLAGS += -I$(srctree)/tools/
  
  hostprogs-$(CONFIG_BUILD_BIN2C)  += bin2c
  hostprogs-$(CONFIG_KALLSYMS)     += kallsyms
- hostprogs-$(CONFIG_VT)           += conmakehash
  hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount
 -hostprogs-$(CONFIG_BUILDTIME_EXTABLE_SORT) += sortextable
 +hostprogs-$(CONFIG_BUILDTIME_TABLE_SORT) += sorttable
  hostprogs-$(CONFIG_ASN1)	 += asn1_compiler
  hostprogs-$(CONFIG_MODULE_SIG_FORMAT) += sign-file
  hostprogs-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += extract-cert