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

Commit 9aec3ce1 authored by jianzhou's avatar jianzhou
Browse files

Merge android-4.9.198(dd32e92a) into msm-4.9 



* refs/heads/tmp-dd32e92a:
  Linux 4.9.198
  RDMA/cxgb4: Do not dma memory off of the stack
  Revert "net: sit: fix memory leak in sit_init_net()"
  PCI: PM: Fix pci_power_up()
  xen/netback: fix error path of xenvif_connect_data()
  cpufreq: Avoid cpufreq_suspend() deadlock on system shutdown
  memstick: jmb38x_ms: Fix an error handling path in 'jmb38x_ms_probe()'
  btrfs: block-group: Fix a memory leak due to missing btrfs_put_block_group()
  CIFS: avoid using MID 0xFFFF
  parisc: Fix vmap memory leak in ioremap()/iounmap()
  xtensa: drop EXPORT_SYMBOL for outs*/ins*
  mm/slub: fix a deadlock in show_slab_objects()
  scsi: zfcp: fix reaction on bit error threshold notification
  drm/edid: Add 6 bpc quirk for SDC panel in Lenovo G50
  mac80211: Reject malformed SSID elements
  cfg80211: wext: avoid copying malformed SSIDs
  ASoC: rsnd: Reinitialize bit clock inversion flag for every format setting
  Input: da9063 - fix capability and drop KEY_SLEEP
  scsi: core: try to get module before removing device
  staging: wlan-ng: fix exit return when sme->key_idx >= NUM_WEPKEYS
  MIPS: tlbex: Fix build_restore_pagemask KScratch restore
  USB: ldusb: fix read info leaks
  USB: usblp: fix use-after-free on disconnect
  USB: ldusb: fix memleak on disconnect
  USB: serial: ti_usb_3410_5052: fix port-close races
  usb: udc: lpc32xx: fix bad bit shift operation
  ALSA: hda/realtek - Add support for ALC711
  USB: legousbtower: fix memleak on disconnect
  memfd: Fix locking when tagging pins
  ipv4: Return -ENETUNREACH if we can't create route but saddr is valid
  net: avoid potential infinite loop in tc_ctl_action()
  sctp: change sctp_prot .no_autobind with true
  net: bcmgenet: Set phydev->dev_flags only for internal PHYs
  net: bcmgenet: Fix RGMII_MODE_EN value for GENET v1/2/3
  loop: Add LOOP_SET_DIRECT_IO to compat ioctl
  ocfs2: fix panic due to ocfs2_wq is null
  Revert "drm/radeon: Fix EEH during kexec"
  namespace: fix namespace.pl script to support relative paths
  net: hisilicon: Fix usage of uninitialized variable in function mdio_sc_cfg_reg_write()
  mips: Loongson: Fix the link time qualifier of 'serial_exit()'
  mac80211: fix txq null pointer dereference
  nl80211: fix null pointer dereference
  MIPS: dts: ar9331: fix interrupt-controller size
  ARM: dts: am4372: Set memory bandwidth limit for DISPC
  ARM: OMAP2+: Fix missing reset done flag for am3 and am43
  scsi: qla2xxx: Fix unbound sleep in fcport delete path.
  scsi: megaraid: disable device when probe failed after enabled device
  scsi: ufs: skip shutdown if hba is not powered
  rtlwifi: Fix potential overflow on P2P code
  ANDROID: clang: update to 9.0.8 based on r365631c
  ANDROID: move up spin_unlock_bh() ahead of remove_proc_entry()
  ANDROID: refactor build.config files to remove duplication

Change-Id: I3bd38745d7ba836c39e98805a6f36de88365b187
Signed-off-by: default avatarjianzhou <jianzhou@codeaurora.org>
parents 234d2c71 dd32e92a

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 197

SUBLEVEL = 198

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/boot/dts/am4372.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -1117,6 +1117,8 @@ 
				ti,hwmods = "dss_dispc";

				clocks = <&disp_clk>;

				clock-names = "fck";



				max-memory-bandwidth = <230000000>;

			};



			rfbi: rfbi@4832a800 {

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c

+2 −1
Original line number Diff line number Diff line
@@ -939,7 +939,8 @@ static struct omap_hwmod_class_sysconfig am33xx_timer_sysc = { 
	.rev_offs	= 0x0000,

	.sysc_offs	= 0x0010,

	.syss_offs	= 0x0014,

	.sysc_flags	= (SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET),

	.sysc_flags	= SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |

			  SYSC_HAS_RESET_STATUS,

	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |

			  SIDLE_SMART_WKUP),

	.sysc_fields	= &omap_hwmod_sysc_type2,

arch/mips/boot/dts/qca/ar9331.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ 


			miscintc: interrupt-controller@18060010 {

				compatible = "qca,ar7240-misc-intc";

				reg = <0x18060010 0x4>;

				reg = <0x18060010 0x8>;



				interrupt-parent = <&cpuintc>;

				interrupts = <6>;

arch/mips/loongson64/common/serial.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static int __init serial_init(void) 
}

module_init(serial_init);



static void __init serial_exit(void)

static void __exit serial_exit(void)

{

	platform_device_unregister(&uart8250_device);

}