Commit 0fce515e authored Aug 07, 2019 by jianzhou

Merge android-4.9.186 (cd46375d) into msm-4.9



* refs/heads/tmp-cd46375d:
  Linux 4.9.186
  s390/qdio: don't touch the dsci in tiqdio_add_input_queues()
  s390/qdio: (re-)initialize tiqdio list entries
  s390: fix stfle zero padding
  ARC: hide unused function unw_hdr_alloc
  dm verity: use message limit for data block corruption message
  ARM: dts: imx6ul: fix PWM[1-4] interrupts
  sis900: fix TX completion
  ppp: mppe: Add softdep to arc4
  be2net: fix link failure after ethtool offline test
  ARM: omap2: remove incorrect __init annotation
  perf/core: Fix perf_sample_regs_user() mm check
  arm64: crypto: remove accidentally backported files
  nilfs2: do not use unexported cpu_to_le32()/le32_to_cpu() in uapi header
  e1000e: start network tx queue only when link is up
  Revert "e1000e: fix cyclic resets at link up with active tx"
  MIPS: Remove superfluous check for __linux__
  VMCI: Fix integer overflow in VMCI handle arrays
  carl9170: fix misuse of device driver API
  staging: comedi: amplc_pci230: fix null pointer deref on interrupt
  staging: comedi: dt282x: fix a null pointer deref on interrupt
  usb: renesas_usbhs: add a workaround for a race condition of workqueue
  usb: gadget: ether: Fix race between gether_disconnect and rx_submit
  p54usb: Fix race between disconnect and firmware loading
  Revert "serial: 8250: Don't service RX FIFO if interrupts are disabled"
  USB: serial: option: add support for GosunCn ME3630 RNDIS mode
  USB: serial: ftdi_sio: add ID for isodebug v1
  mwifiex: Don't abort on small, spec-compliant vendor IEs
  fscrypt: don't set policy for a dead directory
  mwifiex: Fix heap overflow in mwifiex_uap_parse_tail_ies()
  mwifiex: Abort at too short BSS descriptor element
  x86/tls: Fix possible spectre-v1 in do_get_thread_area()
  x86/ptrace: Fix possible spectre-v1 in ptrace_get_debugreg()
  udf: Fix incorrect final NOT_ALLOCATED (hole) extent length
  net :sunrpc :clnt :Fix xps refcount imbalance on the error path
  ip6_tunnel: allow not to count pkts on tstats by passing dev as NULL
  bnx2x: Check if transceiver implements DDM before access
  md: fix for divide error in status_resync
  mac80211: only warn once on chanctx_conf being NULL
  ARM: davinci: da8xx: specify dma_coherent_mask for lcdc
  ARM: davinci: da850-evm: call regulator_has_full_constraints()
  mlxsw: spectrum: Disallow prio-tagged packets when PVID is removed
  KVM: arm/arm64: vgic: Fix kvm_device leak in vgic_its_destroy
  Input: imx_keypad - make sure keyboard can always wake up system
  can: mcp251x: add support for mcp25625
  dt-bindings: can: mcp251x: add mcp25625 support
  netfilter: ipv6: nf_defrag: accept duplicate fragments again
  netfilter: ipv6: nf_defrag: fix leakage of unqueued fragments
  mwifiex: Fix possible buffer overflows at parsing bss descriptor
  mac80211: free peer keys before vif down in mesh
  mac80211: mesh: fix RCU warning
  staging:iio:ad7150: fix threshold mode config bit
  samples, bpf: fix to change the buffer size for read()
  Input: elantech - enable middle button support on 2 ThinkPads
  crypto: talitos - rename alternative AEAD algos.
  ANDROID: f2fs: add android fsync tracepoint
  ANDROID: f2fs: fix wrong android tracepoint

Change-Id: I3ac6d3a6fc910b1beccf1553a0c8bca6eec13fcc
Signed-off-by: jianzhou <jianzhou@codeaurora.org>

parents dd975756 cd46375d

Documentation/devicetree/bindings/net/can/microchip,mcp251x.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ Required properties:
		- compatible: Should be one of the following:
		- "microchip,mcp2510" for MCP2510.
		- "microchip,mcp2515" for MCP2515.
		- "microchip,mcp25625" for MCP25625.
		- reg: SPI chip select.
		- clocks: The clock feeding the CAN controller.
		- interrupt-parent: The parent interrupt controller.

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 185
		SUBLEVEL = 186
		EXTRAVERSION =
		NAME = Roaring Lionus

arch/arc/kernel/unwind.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -185,11 +185,6 @@ static void *__init unw_hdr_alloc_early(unsigned long sz)
		MAX_DMA_ADDRESS);
		}

		static void *unw_hdr_alloc(unsigned long sz)
		{
		return kmalloc(sz, GFP_KERNEL);
		}

		static void init_unwind_table(struct unwind_table table, const char name,
		const void *core_start, unsigned long core_size,
		const void *init_start, unsigned long init_size,
		@@ -370,6 +365,10 @@ static void init_unwind_hdr(struct unwind_table *table,
		}

		#ifdef CONFIG_MODULES
		static void *unw_hdr_alloc(unsigned long sz)
		{
		return kmalloc(sz, GFP_KERNEL);
		}

		static struct unwind_table *last_table;

arch/arm/boot/dts/imx6ul.dtsi

+4 −4

Original line number	Diff line number	Diff line
		@@ -332,7 +332,7 @@
		pwm1: pwm@02080000 {
		compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
		reg = <0x02080000 0x4000>;
		interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;
		interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&clks IMX6UL_CLK_PWM1>,
		<&clks IMX6UL_CLK_PWM1>;
		clock-names = "ipg", "per";
		@@ -343,7 +343,7 @@
		pwm2: pwm@02084000 {
		compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
		reg = <0x02084000 0x4000>;
		interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
		interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&clks IMX6UL_CLK_PWM2>,
		<&clks IMX6UL_CLK_PWM2>;
		clock-names = "ipg", "per";
		@@ -354,7 +354,7 @@
		pwm3: pwm@02088000 {
		compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
		reg = <0x02088000 0x4000>;
		interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
		interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&clks IMX6UL_CLK_PWM3>,
		<&clks IMX6UL_CLK_PWM3>;
		clock-names = "ipg", "per";
		@@ -365,7 +365,7 @@
		pwm4: pwm@0208c000 {
		compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
		reg = <0x0208c000 0x4000>;
		interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
		interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&clks IMX6UL_CLK_PWM4>,
		<&clks IMX6UL_CLK_PWM4>;
		clock-names = "ipg", "per";

arch/arm/mach-davinci/board-da850-evm.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1479,6 +1479,8 @@ static __init void da850_evm_init(void)
		if (ret)
		pr_warn("%s: dsp/rproc registration failed: %d\n",
		__func__, ret);

		regulator_has_full_constraints();
		}

		#ifdef CONFIG_SERIAL_8250_CONSOLE