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

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

Merge 4.9.246 into android-4.9-q 



Changes in 4.9.246
	ah6: fix error return code in ah6_input()
	atm: nicstar: Unmap DMA on send error
	bnxt_en: read EEPROM A2h address using page 0
	devlink: Add missing genlmsg_cancel() in devlink_nl_sb_port_pool_fill()
	inet_diag: Fix error path to cancel the meseage in inet_req_diag_fill()
	net: b44: fix error return code in b44_init_one()
	net: bridge: add missing counters to ndo_get_stats64 callback
	net: Have netpoll bring-up DSA management interface
	netlabel: fix our progress tracking in netlbl_unlabel_staticlist()
	netlabel: fix an uninitialized warning in netlbl_unlabel_staticlist()
	net/mlx4_core: Fix init_hca fields offset
	net: x25: Increase refcnt of "struct x25_neigh" in x25_rx_call_request
	qlcnic: fix error return code in qlcnic_83xx_restart_hw()
	sctp: change to hold/put transport for proto_unreach_timer
	net: usb: qmi_wwan: Set DTR quirk for MR400
	tcp: only postpone PROBE_RTT if RTT is < current min_rtt estimate
	net: ftgmac100: Fix crash when removing driver
	mlxsw: core: Use variable timeout for EMAD retries
	pinctrl: rockchip: enable gpio pclk for rockchip_gpio_to_irq
	arm64: psci: Avoid printing in cpu_psci_cpu_die()
	vfs: remove lockdep bogosity in __sb_start_write
	Input: adxl34x - clean up a data type in adxl34x_probe()
	MIPS: export has_transparent_hugepage() for modules
	arm: dts: imx6qdl-udoo: fix rgmii phy-mode for ksz9031 phy
	ARM: dts: imx50-evk: Fix the chip select 1 IOMUX
	perf lock: Don't free "lock_seq_stat" if read_count isn't zero
	can: dev: can_restart(): post buffer from the right context
	can: peak_usb: fix potential integer overflow on shift of a int
	can: m_can: m_can_handle_state_change(): fix state change
	MIPS: Alchemy: Fix memleak in alchemy_clk_setup_cpu
	regulator: ti-abb: Fix array out of bound read access on the first transition
	xfs: revert "xfs: fix rmap key and record comparison functions"
	libfs: fix error cast of negative value in simple_attr_write()
	powerpc/uaccess-flush: fix missing includes in kup-radix.h
	ALSA: ctl: fix error path at adding user-defined element set
	ALSA: mixart: Fix mutex deadlock
	tty: serial: imx: keep console clocks always on
	efivarfs: fix memory leak in efivarfs_create()
	ext4: fix bogus warning in ext4_update_dx_flag()
	iio: accel: kxcjk1013: Replace is_smo8500_device with an acpi_type enum
	regulator: fix memory leak with repeated set_machine_constraints()
	xtensa: disable preemption around cache alias management calls
	mac80211: minstrel: remove deferred sampling code
	mac80211: minstrel: fix tx status processing corner case
	mac80211: free sta in sta_info_insert_finish() on errors
	s390/cpum_sf.c: fix file permission for cpum_sfb_size
	x86/microcode/intel: Check patch signature before saving microcode for early loading
	Linux 4.9.246

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic9613c4db8b8f5ccca8be4b76d59b79303303da3
parents a3ba0ea9 6d0b08c5

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 245

SUBLEVEL = 246

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/boot/dts/imx50-evk.dts

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
				MX50_PAD_CSPI_MISO__CSPI_MISO		0x00

				MX50_PAD_CSPI_MOSI__CSPI_MOSI		0x00

				MX50_PAD_CSPI_SS0__GPIO4_11		0xc4

				MX50_PAD_ECSPI1_MOSI__CSPI_SS1		0xf4

				MX50_PAD_ECSPI1_MOSI__GPIO4_13		0x84

			>;

		};

arch/arm/boot/dts/imx6qdl-udoo.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ 
&fec {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_enet>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

	status = "okay";

};

arch/arm64/kernel/psci.c

+1 −4
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ static int cpu_psci_cpu_disable(unsigned int cpu) 


static void cpu_psci_cpu_die(unsigned int cpu)

{

	int ret;

	/*

	 * There are no known implementations of PSCI actually using the

	 * power state field, pass a sensible default for now.
@@ -77,9 +76,7 @@ static void cpu_psci_cpu_die(unsigned int cpu) 
	u32 state = PSCI_POWER_STATE_TYPE_POWER_DOWN <<

		    PSCI_0_2_POWER_STATE_TYPE_SHIFT;



	ret = psci_ops.cpu_off(state);



	pr_crit("unable to power off CPU%u (%d)\n", cpu, ret);

	psci_ops.cpu_off(state);

}



static int cpu_psci_cpu_kill(unsigned int cpu)

arch/mips/alchemy/common/clock.c

+8 −1
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ static struct clk __init *alchemy_clk_setup_cpu(const char *parent_name, 
{

	struct clk_init_data id;

	struct clk_hw *h;

	struct clk *clk;



	h = kzalloc(sizeof(*h), GFP_KERNEL);

	if (!h)
@@ -163,7 +164,13 @@ static struct clk __init *alchemy_clk_setup_cpu(const char *parent_name, 
	id.ops = &alchemy_clkops_cpu;

	h->init = &id;



	return clk_register(NULL, h);

	clk = clk_register(NULL, h);

	if (IS_ERR(clk)) {

		pr_err("failed to register clock\n");

		kfree(h);

	}



	return clk;

}



/* AUXPLLs ************************************************************/