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

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

Merge 4.9.287 into android-4.9-q 



Changes in 4.9.287
	Partially revert "usb: Kconfig: using select for USB_COMMON dependency"
	USB: cdc-acm: fix racy tty buffer accesses
	USB: cdc-acm: fix break reporting
	ovl: fix missing negative dentry check in ovl_rename()
	nfsd4: Handle the NFSv4 READDIR 'dircount' hint being zero
	ARM: dts: omap3430-sdp: Fix NAND device node
	xtensa: call irqchip_init only when CONFIG_USE_OF is selected
	bpf: Fix integer overflow in prealloc_elems_and_freelist()
	phy: mdio: fix memory leak
	net_sched: fix NULL deref in fifo_set_limit()
	powerpc/fsl/dts: Fix phy-connection-type for fm1mac3
	ptp_pch: Load module automatically if ID matches
	ARM: imx6: disable the GIC CPU interface before calling stby-poweroff sequence
	net: bridge: use nla_total_size_64bit() in br_get_linkxstats_size()
	netlink: annotate data races around nlk->bound
	drm/nouveau/debugfs: fix file release memory leak
	rtnetlink: fix if_nlmsg_stats_size() under estimation
	i40e: fix endless loop under rtnl
	gup: document and work around "COW can break either way" issue
	HID: apple: Fix logical maximum and usage maximum of Magic Keyboard JIS
	netfilter: ip6_tables: zero-initialize fragment offset
	mac80211: Drop frames from invalid MAC address in ad-hoc mode
	scsi: ses: Fix unsigned comparison with less than zero
	scsi: virtio_scsi: Fix spelling mistake "Unsupport" -> "Unsupported"
	perf/x86: Reset destroy callback on event init failure
	Linux 4.9.287

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibc5959e55104368c007b86cec53b960fe153b50c
parents 0b0decfa aa13f014

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 286

SUBLEVEL = 287

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/boot/dts/omap3430-sdp.dts

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


	nand@1,0 {

		compatible = "ti,omap2-nand";

		reg = <0 0 4>; /* CS0, offset 0, IO size 4 */

		reg = <1 0 4>; /* CS1, offset 0, IO size 4 */

		interrupt-parent = <&gpmc>;

		interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */

			     <1 IRQ_TYPE_NONE>;	/* termcount */

arch/arm/mach-imx/pm-imx6.c

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/io.h>

#include <linux/irq.h>

#include <linux/genalloc.h>

#include <linux/irqchip/arm-gic.h>

#include <linux/mfd/syscon.h>

#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>

#include <linux/of.h>
@@ -606,6 +607,7 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata 


static void imx6_pm_stby_poweroff(void)

{

	gic_cpu_if_down(0);

	imx6_set_lpm(STOP_POWER_OFF);

	imx6q_suspend_finish(0);

arch/powerpc/boot/dts/fsl/t1023rdb.dts

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


			fm1mac3: ethernet@e4000 {

				phy-handle = <&sgmii_aqr_phy3>;

				phy-connection-type = "sgmii-2500";

				phy-connection-type = "2500base-x";

				sleep = <&rcpm 0x20000000>;

			};

arch/x86/events/core.c

+1 −0
Original line number Diff line number Diff line
@@ -2075,6 +2075,7 @@ static int x86_pmu_event_init(struct perf_event *event) 
	if (err) {

		if (event->destroy)

			event->destroy(event);

		event->destroy = NULL;

	}



	if (ACCESS_ONCE(x86_pmu.attr_rdpmc))