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

Commit fbb7468c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.64 into android-4.9



Changes in 4.9.64
	media: imon: Fix null-ptr-deref in imon_probe
	media: dib0700: fix invalid dvb_detach argument
	arm: crypto: reduce priority of bit-sliced AES cipher
	Bluetooth: btusb: fix QCA Rome suspend/resume
	extcon: Remove potential problem when calling extcon_register_notifier()
	extcon: palmas: Check the parent instance to prevent the NULL
	fm10k: request reset when mbx->state changes
	ARM: dts: Fix compatible for ti81xx uarts for 8250
	ARM: dts: Fix am335x and dm814x scm syscon to probe children
	ARM: OMAP2+: Fix init for multiple quirks for the same SoC
	ARM: dts: Fix omap3 off mode pull defines
	ARM: dts: omap5-uevm: Allow bootloader to configure USB Ethernet MAC
	ata: ATA_BMDMA should depend on HAS_DMA
	ata: SATA_HIGHBANK should depend on HAS_DMA
	ata: SATA_MV should depend on HAS_DMA
	drm/sti: sti_vtg: Handle return NULL error from devm_ioremap_nocache
	igb: reset the PHY before reading the PHY ID
	igb: close/suspend race in netif_device_detach
	igb: Fix hw_dbg logging in igb_update_flash_i210
	scsi: ufs-qcom: Fix module autoload
	scsi: ufs: add capability to keep auto bkops always enabled
	tcp: provide timestamps for partial writes
	staging: rtl8188eu: fix incorrect ERROR tags from logs
	x86/irq, trace: Add __irq_entry annotation to x86's platform IRQ handlers
	scsi: lpfc: Add missing memory barrier
	scsi: lpfc: FCoE VPort enable-disable does not bring up the VPort
	scsi: lpfc: Correct host name in symbolic_name field
	scsi: lpfc: Correct issue leading to oops during link reset
	scsi: lpfc: Clear the VendorVersion in the PLOGI/PLOGI ACC payload
	rtc: rx8010: change lock mechanism
	power: supply: axp288_fuel_gauge: Read 15 bit values 2 registers at a time
	power: supply: axp288_fuel_gauge: Read 12 bit values 2 registers at a time
	ALSA: vx: Don't try to update capture stream before running
	ALSA: vx: Fix possible transfer overflow
	drm/omap: panel-sony-acx565akm.c: Add MODULE_ALIAS
	backlight: lcd: Fix race condition during register
	backlight: adp5520: Fix error handling in adp5520_bl_probe()
	gpu: drm: mgag200: mgag200_main:- Handle error from pci_iomap
	ALSA: hda/realtek - Add new codec ID ALC299
	arm64: dts: NS2: reserve memory for Nitro firmware
	ixgbe: Configure advertised speeds correctly for KR/KX backplane
	ixgbe: fix AER error handling
	ixgbe: handle close/suspend race with netif_device_detach/present
	ixgbe: Fix reporting of 100Mb capability
	ixgbe: Reduce I2C retry count on X550 devices
	ixgbe: add mask for 64 RSS queues
	ixgbe: do not disable FEC from the driver
	staging: rtl8712: fixed little endian problem
	staging: wilc1000: Fix endian sparse warning
	staging: greybus: add host device function pointer checks
	MIPS: End asm function prologue macros with .insn
	MIPS: init: Ensure bootmem does not corrupt reserved memory
	MIPS: init: Ensure reserved memory regions are not added to bootmem
	MIPS: traps: Ensure L1 & L2 ECC checking match for CM3 systems
	MIPS: Netlogic: Exclude netlogic,xlp-pic code from XLR builds
	Revert "crypto: xts - Add ECB dependency"
	Revert "uapi: fix linux/rds.h userspace compilation errors"
	uapi: fix linux/rds.h userspace compilation error
	uapi: fix linux/rds.h userspace compilation errors
	Revert "dt-bindings: Add vendor prefix for LEGO"
	Revert "dt-bindings: Add LEGO MINDSTORMS EV3 compatible specification"
	crypto: dh - Don't permit 'p' to be 0
	crypto: dh - Don't permit 'key' or 'g' size longer than 'p'
	USB: usbfs: compute urb->actual_length for isochronous
	USB: Add delay-init quirk for Corsair K70 LUX keyboards
	usb: gadget: f_fs: Fix use-after-free in ffs_free_inst
	USB: serial: qcserial: add pid/vid for Sierra Wireless EM7355 fw update
	USB: serial: garmin_gps: fix I/O after failed probe and remove
	USB: serial: garmin_gps: fix memory leak on probe errors
	x86/MCE/AMD: Always give panic severity for UC errors in kernel context
	brcmfmac: don't preset all channels as disabled
	staging: greybus: spilib: fix use-after-free after deregistration
	Linux 4.9.64

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents a8287142 563c24f6
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -13,10 +13,6 @@ EnBW AM1808 based CMC board
Required root node properties:
    - compatible = "enbw,cmc", "ti,da850;

LEGO MINDSTORMS EV3 (AM1808 based)
Required root node properties:
    - compatible = "lego,ev3", "ti,da850";

Generic DaVinci Boards
----------------------

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ kosagi Sutajio Ko-Usagi PTE Ltd.
kyo	Kyocera Corporation
lacie	LaCie
lantiq	Lantiq Semiconductor
lego	LEGO Systems A/S
lenovo	Lenovo Group Ltd.
lg	LG Corporation
linux	Linux-specific binding
+1 −1
Original line number Diff line number Diff line
VERSION = 4
PATCHLEVEL = 9
SUBLEVEL = 63
SUBLEVEL = 64
EXTRAVERSION =
NAME = Roaring Lionus

+2 −1
Original line number Diff line number Diff line
@@ -143,10 +143,11 @@
				};

				scm_conf: scm_conf@0 {
					compatible = "syscon";
					compatible = "syscon", "simple-bus";
					reg = <0x0 0x800>;
					#address-cells = <1>;
					#size-cells = <1>;
					ranges = <0 0 0x800>;

					scm_clocks: clocks {
						#address-cells = <1>;
+5 −4
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@
			};

			uart1: uart@20000 {
				compatible = "ti,omap3-uart";
				compatible = "ti,am3352-uart", "ti,omap3-uart";
				ti,hwmods = "uart1";
				reg = <0x20000 0x2000>;
				clock-frequency = <48000000>;
@@ -262,7 +262,7 @@
			};

			uart2: uart@22000 {
				compatible = "ti,omap3-uart";
				compatible = "ti,am3352-uart", "ti,omap3-uart";
				ti,hwmods = "uart2";
				reg = <0x22000 0x2000>;
				clock-frequency = <48000000>;
@@ -272,7 +272,7 @@
			};

			uart3: uart@24000 {
				compatible = "ti,omap3-uart";
				compatible = "ti,am3352-uart", "ti,omap3-uart";
				ti,hwmods = "uart3";
				reg = <0x24000 0x2000>;
				clock-frequency = <48000000>;
@@ -332,10 +332,11 @@
				ranges = <0 0x140000 0x20000>;

				scm_conf: scm_conf@0 {
					compatible = "syscon";
					compatible = "syscon", "simple-bus";
					reg = <0x0 0x800>;
					#address-cells = <1>;
					#size-cells = <1>;
					ranges = <0 0 0x800>;

					scm_clocks: clocks {
						#address-cells = <1>;
Loading