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

Commit fd1d80da authored by jianzhou's avatar jianzhou
Browse files

Merge android-4.9.224(5791e89d) into msm-4.9 



* refs/heads/tmp-5791e89d:
  Linux 4.9.224
  Makefile: disallow data races on gcc-10 as well
  KVM: x86: Fix off-by-one error in kvm_vcpu_ioctl_x86_setup_mce
  ARM: dts: r8a7740: Add missing extal2 to CPG node
  ARM: dts: r8a73a4: Add missing CMT1 interrupts
  Revert "ALSA: hda/realtek: Fix pop noise on ALC225"
  usb: gadget: legacy: fix error return code in cdc_bind()
  usb: gadget: legacy: fix error return code in gncm_bind()
  usb: gadget: audio: Fix a missing error return value in audio_bind()
  usb: gadget: net2272: Fix a memory leak in an error handling path in 'net2272_plat_probe()'
  exec: Move would_dump into flush_old_exec
  x86: Fix early boot crash on gcc-10, third try
  ARM: dts: imx27-phytec-phycard-s-rdk: Fix the I2C1 pinctrl entries
  usb: xhci: Fix NULL pointer dereference when enqueuing trbs from urb sg list
  USB: gadget: fix illegal array access in binding with UDC
  ALSA: usb-audio: Add control message quirk delay for Kingston HyperX headset
  ALSA: rawmidi: Fix racy buffer resize under concurrent accesses
  ALSA: rawmidi: Initialize allocated buffers
  ALSA: hda/realtek - Limit int mic boost for Thinkpad T530
  netprio_cgroup: Fix unlimited memory leak of v2 cgroups
  net: ipv4: really enforce backoff for redirects
  Revert "ipv6: add mtu lock check in __ip6_rt_update_pmtu"
  netlabel: cope with NULL catmap
  net: fix a potential recursive NETDEV_FEAT_CHANGE
  gcc-10: disable 'restrict' warning for now
  gcc-10: disable 'stringop-overflow' warning for now
  gcc-10: disable 'array-bounds' warning for now
  gcc-10: disable 'zero-length-bounds' warning for now
  gcc-10: avoid shadowing standard library 'free()' in crypto
  net: phy: micrel: Use strlcpy() for ethtool::get_strings
  Stop the ad-hoc games with -Wno-maybe-initialized
  kbuild: compute false-positive -Wmaybe-uninitialized cases in Kconfig
  gcc-10 warnings: fix low-hanging fruit
  pnp: Use list_for_each_entry() instead of open coding
  IB/mlx4: Test return value of calls to ib_get_cached_pkey
  netfilter: conntrack: avoid gcc-10 zero-length-bounds warning
  i40iw: Fix error handling in i40iw_manage_arp_cache()
  pinctrl: cherryview: Add missing spinlock usage in chv_gpio_irq_handler
  ipc/util.c: sysvipc_find_ipc() incorrectly updates position index
  drm/qxl: lost qxl_bo_kunmap_atomic_page in qxl_image_init_helper()
  ALSA: hda/hdmi: fix race in monitor detection during probe
  dmaengine: mmp_tdma: Reset channel error on release
  dmaengine: pch_dma.c: Avoid data race between probe and irq handler
  cifs: Fix a race condition with cifs_echo_request
  cifs: Check for timeout on Negotiate stage
  spi: spi-dw: Add lock protect dw_spi rx/tx to prevent concurrent calls
  scsi: sg: add sg_remove_request in sg_write
  drop_monitor: work around gcc-10 stringop-overflow warning
  net: moxa: Fix a potential double 'free_irq()'
  net/sonic: Fix a resource leak in an error handling path in 'jazz_sonic_probe()'
  shmem: fix possible deadlocks on shmlock_user_lock
  ptp: free ptp device pin descriptors properly
  ptp: fix the race between the release of ptp_clock and cdev
  ptp: Fix pass zero to ERR_PTR() in ptp_clock_register
  chardev: add helper function to register char devs with a struct device
  ptp: create "pins" together with the rest of attributes
  ptp: use is_visible method to hide unused attributes
  ptp: do not explicitly set drvdata in ptp_clock_register()
  blktrace: fix dereference after null check
  blktrace: Protect q->blk_trace with RCU
  blktrace: fix trace mutex deadlock
  blktrace: fix unlocked access to init/start-stop/teardown
  blktrace: Fix potential deadlock between delete & sysfs ops
  net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup
  net: ipv6: add net argument to ip6_dst_lookup_flow
  ext4: add cond_resched() to ext4_protect_reserved_inode
  binfmt_elf: Do not move brk for INTERP-less ET_EXEC
  scripts/decodecode: fix trapping instruction formatting
  objtool: Fix stack offset tracking for indirect CFAs
  batman-adv: Fix refcnt leak in batadv_v_ogm_process
  batman-adv: Fix refcnt leak in batadv_store_throughput_override
  batman-adv: Fix refcnt leak in batadv_show_throughput_override
  batman-adv: fix batadv_nc_random_weight_tq
  mm/page_alloc: fix watchdog soft lockups during set_zone_contiguous()
  tracing: Add a vmalloc_sync_mappings() for safe measure
  USB: serial: garmin_gps: add sanity checking for data length
  USB: uas: add quirk for LaCie 2Big Quadra
  binfmt_elf: move brk out of mmap when doing direct loader exec
  Revert "ACPI / video: Add force_native quirk for HP Pavilion dv6"
  bnxt_en: Improve AER slot reset.
  net/mlx5: Fix command entry leak in Internal Error State
  net/mlx5: Fix forced completion access non initialized command entry
  bnxt_en: Fix VLAN acceleration handling in bnxt_fix_features().
  sch_sfq: validate silly quantum values
  sch_choke: avoid potential panic in choke_reset()
  net: usb: qmi_wwan: add support for DW5816e
  net/mlx4_core: Fix use of ENOSPC around mlx4_counter_alloc()
  net: macsec: preserve ingress frame ordering
  fq_codel: fix TCA_FQ_CODEL_DROP_BATCH_SIZE sanity checks
  dp83640: reverse arguments to list_add_tail
  USB: serial: qcserial: Add DW5816e support
  ANDROID: hid: steam: remove BT controller matching
  UPSTREAM: HID: steam: Fix input device disappearing

 Conflicts:
	sound/core/rawmidi.c

Change-Id: Idabcac94d95f9c060d788c3fe13392ed29e5d9df
Signed-off-by: default avatarjianzhou <jianzhou@codeaurora.org>
parents e3ff9b31 5791e89d

Makefile

+14 −9
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 223

SUBLEVEL = 224

EXTRAVERSION =

NAME = Roaring Lionus
@@ -763,20 +763,14 @@ export DISABLE_CFI 
endif



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE

KBUILD_CFLAGS	+= -Os $(call cc-disable-warning,maybe-uninitialized,)

else

ifdef CONFIG_PROFILE_ALL_BRANCHES

KBUILD_CFLAGS	+= -O2 $(call cc-disable-warning,maybe-uninitialized,)

KBUILD_CFLAGS   += -Os

else

KBUILD_CFLAGS   += -O2

endif

endif



KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0409, \

			$(call cc-disable-warning,maybe-uninitialized,))



# Tell gcc to never replace conditional load with a non-conditional one

KBUILD_CFLAGS	+= $(call cc-option,--param=allow-store-data-races=0)

KBUILD_CFLAGS	+= $(call cc-option,-fno-allow-store-data-races)



# check for 'asm goto'

ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)
@@ -910,6 +904,17 @@ KBUILD_CFLAGS += $(call cc-disable-warning, pointer-sign) 
# disable stringop warnings in gcc 8+

KBUILD_CFLAGS += $(call cc-disable-warning, stringop-truncation)



# We'll want to enable this eventually, but it's not going away for 5.7 at least

KBUILD_CFLAGS += $(call cc-disable-warning, zero-length-bounds)

KBUILD_CFLAGS += $(call cc-disable-warning, array-bounds)

KBUILD_CFLAGS += $(call cc-disable-warning, stringop-overflow)



# Another good warning that we'll want to enable eventually

KBUILD_CFLAGS += $(call cc-disable-warning, restrict)



# Enabled with W=2, disabled by default as noisy

KBUILD_CFLAGS += $(call cc-disable-warning, maybe-uninitialized)



# disable invalid "can't wrap" optimizations for signed / pointers

KBUILD_CFLAGS	+= $(call cc-option,-fno-strict-overflow)

arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts

+2 −2
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ 
	imx27-phycard-s-rdk {

		pinctrl_i2c1: i2c1grp {

			fsl,pins = <

				MX27_PAD_I2C2_SDA__I2C2_SDA 0x0

				MX27_PAD_I2C2_SCL__I2C2_SCL 0x0

				MX27_PAD_I2C_DATA__I2C_DATA 0x0

				MX27_PAD_I2C_CLK__I2C_CLK 0x0

			>;

		};

arch/arm/boot/dts/r8a73a4.dtsi

+8 −1
Original line number Diff line number Diff line
@@ -135,7 +135,14 @@ 
	cmt1: timer@e6130000 {

		compatible = "renesas,cmt-48-r8a73a4", "renesas,cmt-48-gen2";

		reg = <0 0xe6130000 0 0x1004>;

		interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp3_clks R8A73A4_CLK_CMT1>;

		clock-names = "fck";

		power-domains = <&pd_c5>;

arch/arm/boot/dts/r8a7740.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ 
		cpg_clocks: cpg_clocks@e6150000 {

			compatible = "renesas,r8a7740-cpg-clocks";

			reg = <0xe6150000 0x10000>;

			clocks = <&extal1_clk>, <&extalr_clk>;

			clocks = <&extal1_clk>, <&extal2_clk>, <&extalr_clk>;

			#clock-cells = <1>;

			clock-output-names = "system", "pllc0", "pllc1",

					     "pllc2", "r",

arch/x86/include/asm/stackprotector.h

+6 −1
Original line number Diff line number Diff line
@@ -54,8 +54,13 @@ 
/*

 * Initialize the stackprotector canary value.

 *

 * NOTE: this must only be called from functions that never return,

 * NOTE: this must only be called from functions that never return

 * and it must always be inlined.

 *

 * In addition, it should be called from a compilation unit for which

 * stack protector is disabled. Alternatively, the caller should not end

 * with a function call which gets tail-call optimized as that would

 * lead to checking a modified canary value.

 */

static __always_inline void boot_init_stack_canary(void)

{