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

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

Merge 4.9.321 into android-4.9-q 



Changes in 4.9.321
	vt: drop old FONT ioctls
	random: schedule mix_interrupt_randomness() less often
	ata: libata: add qc->flags in ata_qc_complete_template tracepoint
	dm era: commit metadata in postsuspend after worker stops
	random: quiet urandom warning ratelimit suppression message
	USB: serial: option: add Telit LE910Cx 0x1250 composition
	bonding: ARP monitor spams NETDEV_NOTIFY_PEERS notifiers
	x86/xen: Remove undefined behavior in setup_features()
	MIPS: Remove repetitive increase irq_err_count
	igb: Make DMA faster when CPU is active on the PCIe link
	iio: adc: vf610: fix conversion mode sysfs node name
	usb: chipidea: udc: check request status before setting device address
	iio:accel:bma180: rearrange iio trigger get and register
	iio: accel: mma8452: ignore the return value of reset operation
	iio: trigger: sysfs: fix use-after-free on remove
	xtensa: xtfpga: Fix refcount leak bug in setup
	xtensa: Fix refcount leak bug in time.c
	powerpc: Enable execve syscall exit tracepoint
	ARM: dts: imx6qdl: correct PU regulator ramp delay
	ARM: exynos: Fix refcount leak in exynos_map_pmu
	ARM: Fix refcount leak in axxia_boot_secondary
	ARM: cns3xxx: Fix refcount leak in cns3xxx_init
	modpost: fix section mismatch check for exported init/exit sections
	powerpc/pseries: wire up rng during setup_arch()
	drm: remove drm_fb_helper_modinit
	xen: unexport __init-annotated xen_xlate_map_ballooned_pages()
	fdt: Update CRC check for rng-seed
	kexec_file: drop weak attribute from arch_kexec_apply_relocations[_add]
	swiotlb: skip swiotlb_bounce when orig_addr is zero
	Linux 4.9.321

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie00bdc5e2dcd549184919936708d5b0783954b1e
parents 6d2329d0 f52c80ec

Documentation/ABI/testing/sysfs-bus-iio-vf610

+1 −1
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/iio:deviceX/conversion_mode

What:		/sys/bus/iio/devices/iio:deviceX/in_conversion_mode

KernelVersion:	4.2

Contact:	linux-iio@vger.kernel.org

Description:

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 320

SUBLEVEL = 321

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/boot/dts/imx6qdl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ 
					regulator-name = "vddpu";

					regulator-min-microvolt = <725000>;

					regulator-max-microvolt = <1450000>;

					regulator-enable-ramp-delay = <150>;

					regulator-enable-ramp-delay = <380>;

					anatop-reg-offset = <0x140>;

					anatop-vol-bit-shift = <9>;

					anatop-vol-bit-width = <5>;

arch/arm/mach-axxia/platsmp.c

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ static int axxia_boot_secondary(unsigned int cpu, struct task_struct *idle) 
		return -ENOENT;



	syscon = of_iomap(syscon_np, 0);

	of_node_put(syscon_np);

	if (!syscon)

		return -ENOMEM;

arch/arm/mach-cns3xxx/core.c

+2 −0
Original line number Diff line number Diff line
@@ -379,6 +379,7 @@ static void __init cns3xxx_init(void) 
		/* De-Asscer SATA Reset */

		cns3xxx_pwr_soft_rst(CNS3XXX_PWR_SOFTWARE_RST(SATA));

	}

	of_node_put(dn);



	dn = of_find_compatible_node(NULL, NULL, "cavium,cns3420-sdhci");

	if (of_device_is_available(dn)) {
@@ -392,6 +393,7 @@ static void __init cns3xxx_init(void) 
		cns3xxx_pwr_clk_en(CNS3XXX_PWR_CLK_EN(SDIO));

		cns3xxx_pwr_soft_rst(CNS3XXX_PWR_SOFTWARE_RST(SDIO));

	}

	of_node_put(dn);



	pm_power_off = cns3xxx_power_off;