Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8476049 authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android-4.14.160 (0f543a02) into msm-4.14 



* refs/heads/tmp-0f543a02:
  Linux 4.14.160
  net: stmmac: don't stop NAPI processing when dropping a packet
  net: stmmac: use correct DMA buffer size in the RX descriptor
  xhci: fix USB3 device initiated resume race with roothub autosuspend
  drm/radeon: fix r1xx/r2xx register checker for POT textures
  scsi: iscsi: Fix a potential deadlock in the timeout handler
  dm btree: increase rebalance threshold in __rebalance2()
  dma-buf: Fix memory leak in sync_file_merge()
  vfio/pci: call irq_bypass_unregister_producer() before freeing irq
  ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume()
  ARM: dts: s3c64xx: Fix init order of clock providers
  CIFS: Respect O_SYNC and O_DIRECT flags during reconnect
  rpmsg: glink: Free pending deferred work on remove
  rpmsg: glink: Don't send pending rx_done during remove
  rpmsg: glink: Fix rpmsg_register_device err handling
  rpmsg: glink: Put an extra reference during cleanup
  rpmsg: glink: Fix use after free in open_ack TIMEOUT case
  rpmsg: glink: Fix reuse intents memory leak issue
  rpmsg: glink: Set tail pointer to 0 at end of FIFO
  xtensa: fix TLB sanity checker
  PCI: Apply Cavium ACS quirk to ThunderX2 and ThunderX3
  PCI/MSI: Fix incorrect MSI-X masking on resume
  PCI: Fix Intel ACS quirk UPDCR register address
  PCI/PM: Always return devices to D0 when thawing
  Revert "regulator: Defer init completion for a while after late_initcall"
  nvme: host: core: fix precedence of ternary operator
  inet: protect against too small mtu values.
  tcp: Protect accesses to .ts_recent_stamp with {READ,WRITE}_ONCE()
  tcp: tighten acceptance of ACKs not matching a child socket
  tcp: fix rejected syncookies due to stale timestamps
  tipc: fix ordering of tipc module init and exit routine
  tcp: md5: fix potential overestimation of TCP option space
  openvswitch: support asymmetric conntrack
  net: thunderx: start phy before starting autonegotiation
  net: ethernet: ti: cpsw: fix extra rx interrupt
  net: dsa: fix flow dissection on Tx path
  net: bridge: deny dev_set_mac_address() when unregistering
  ANDROID: cuttlefish_defconfig: Enable CONFIG_GNSS_CMDLINE_SERIAL
  ANDROID: gnss: Add command line test driver
  ANDROID: serdev: add platform device support
  ANDROID: cuttlefish_defconfig: set BINFMT_MISC
  UPSTREAM: binder: fix incorrect calculation for num_valid
  ANDROID: kbuild: disable clang-specific configs with other compilers

Conflicts:
	drivers/rpmsg/qcom_glink_native.c
	drivers/rpmsg/qcom_glink_smem.c
	net/ipv4/ip_output.c

Change-Id: I5a153d5632311789c3d2a24522a8fa3696b06850
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 8241b06f 0f543a02

Makefile

+19 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 159

SUBLEVEL = 160

EXTRAVERSION =

NAME = Petit Gorille
@@ -616,6 +616,8 @@ ifeq ($(dot-config),1) 
-include include/config/auto.conf



ifeq ($(KBUILD_EXTMOD),)

include/config/auto.conf.cmd: check-clang-specific-options



# Read in dependencies to all Kconfig* files, make sure to run

# oldconfig if changes are detected.

-include include/config/auto.conf.cmd
@@ -1253,6 +1255,22 @@ else 
endif

endif



# Disable clang-specific config options when using a different compiler

clang-specific-configs := LTO_CLANG CFI_CLANG SHADOW_CALL_STACK



PHONY += check-clang-specific-options

check-clang-specific-options: $(KCONFIG_CONFIG) FORCE

ifneq ($(cc-name),clang)

ifneq ($(findstring y,$(shell $(CONFIG_SHELL) \

	$(srctree)/scripts/config --file $(KCONFIG_CONFIG) \

		$(foreach c,$(clang-specific-configs),-s $(c)))),)

	@echo WARNING: Disabling clang-specific options with $(cc-name) >&2

	$(Q)$(srctree)/scripts/config --file $(KCONFIG_CONFIG) \

		$(foreach c,$(clang-specific-configs),-d $(c)) && \

	$(MAKE) -f $(srctree)/Makefile olddefconfig

endif

endif



# Check for CONFIG flags that require compiler support. Abort the build

# after .config has been processed, but before the kernel build starts.

#

arch/arm/boot/dts/s3c6410-mini6410.dts

+4 −0
Original line number Diff line number Diff line
@@ -167,6 +167,10 @@ 
	};

};



&clocks {

	clocks = <&fin_pll>;

};



&sdhci0 {

	pinctrl-names = "default";

	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;

arch/arm/boot/dts/s3c6410-smdk6410.dts

+4 −0
Original line number Diff line number Diff line
@@ -71,6 +71,10 @@ 
	};

};



&clocks {

	clocks = <&fin_pll>;

};



&sdhci0 {

	pinctrl-names = "default";

	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;

arch/arm/mach-tegra/reset-handler.S

+3 −3
Original line number Diff line number Diff line
@@ -56,16 +56,16 @@ ENTRY(tegra_resume) 
	cmp	r6, #TEGRA20

	beq	1f				@ Yes

	/* Clear the flow controller flags for this CPU. */

	cpu_to_csr_reg r1, r0

	cpu_to_csr_reg r3, r0

	mov32	r2, TEGRA_FLOW_CTRL_BASE

	ldr	r1, [r2, r1]

	ldr	r1, [r2, r3]

	/* Clear event & intr flag */

	orr	r1, r1, \

		#FLOW_CTRL_CSR_INTR_FLAG | FLOW_CTRL_CSR_EVENT_FLAG

	movw	r0, #0x3FFD	@ enable, cluster_switch, immed, bitmaps

				@ & ext flags for CPU power mgnt

	bic	r1, r1, r0

	str	r1, [r2]

	str	r1, [r2, r3]

1:



	mov32	r9, 0xc09

arch/arm64/configs/cuttlefish_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ CONFIG_ARM64_LSE_ATOMICS=y 
CONFIG_RANDOMIZE_BASE=y

# CONFIG_EFI is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=y

CONFIG_COMPAT=y

CONFIG_PM_DEBUG=y

CONFIG_CPU_IDLE=y
@@ -207,6 +208,7 @@ CONFIG_RFKILL=y 
# CONFIG_ALLOW_DEV_COREDUMP is not set

CONFIG_DEBUG_DEVRES=y

CONFIG_GNSS=y

CONFIG_GNSS_CMDLINE_SERIAL=m

CONFIG_OF_UNITTEST=y

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=y