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

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

Merge 3.18.11 into android-3.18 



Changes in 3.18.11:
	sparc32: destroy_context() and switch_mm() needs to disable interrupts.
	sparc: semtimedop() unreachable due to comparison error
	sparc: perf: Remove redundant perf_pmu_{en|dis}able calls
	sparc: perf: Make counting mode actually work
	sparc: Touch NMI watchdog when walking cpus and calling printk
	sparc64: Fix several bugs in memmove().
	net_sched: fix struct tc_u_hnode layout in u32
	net: fec: fix receive VLAN CTAG HW acceleration issue
	net: sysctl_net_core: check SNDBUF and RCVBUF for min length
	rds: avoid potential stack overflow
	virtio-net: correctly delete napi hash
	inet_diag: fix possible overflow in inet_diag_dump_one_icsk()
	caif: fix MSG_OOB test in caif_seqpkt_recvmsg()
	rxrpc: bogus MSG_PEEK test in rxrpc_recvmsg()
	Revert "net: cx82310_eth: use common match macro"
	ipv6: fix backtracking for throw routes
	tcp: fix tcp fin memory accounting
	net: compat: Update get_compat_msghdr() to match copy_msghdr_from_user() behaviour
	tcp: make connect() mem charging friendly
	arm64: Honor __GFP_ZERO in dma allocations
	mmu_gather: move minimal range calculations into generic code
	arm64: Invalidate the TLB corresponding to intermediate page table levels
	drm/radeon: fix DRM_IOCTL_RADEON_CS oops
	drm/radeon: do a posting read in evergreen_set_irq
	drm/radeon: do a posting read in r100_set_irq
	drm/radeon: do a posting read in r600_set_irq
	drm/radeon: do a posting read in cik_set_irq
	drm/radeon: do a posting read in si_set_irq
	drm/radeon: do a posting read in rs600_set_irq
	drm/radeon: fix interlaced modes on DCE8
	drm/radeon: drop setting UPLL to sleep mode
	drm/radeon: fix wait to actually occur after the signaling callback
	drm/radeon: drop ttm two ended allocation
	LZ4 : fix the data abort issue
	fuse: set stolen page uptodate
	fuse: notify: don't move pages
	serial: 8250_dw: Fix deadlock in LCR workaround
	console: Fix console name size mismatch
	virtio_console: init work unconditionally
	virtio_console: avoid config access from irq
	Change email address for 8250_pci
	ftrace: Clear REGS_EN and TRAMP_EN flags on disabling record via sysctl
	ftrace: Fix en(dis)able graph caller when en(dis)abling record via sysctl
	ftrace: Fix ftrace enable ordering of sysctl ftrace_enabled
	can: add missing initialisations in CAN related skbuffs
	can: kvaser_usb: Read all messages in a bulk-in URB buffer
	workqueue: fix hang involving racing cancel[_delayed]_work_sync()'s for PREEMPT_NONE
	cpuset: initialize effective masks when clone_children is enabled
	cpuset: fix a warning when clearing configured masks in old hierarchy
	cpuset: Fix cpuset sched_relax_domain_level
	tpm/ibmvtpm: Additional LE support for tpm_ibmvtpm_send
	tpm/tpm_i2c_stm_st33: Add status check when reading data on the FIFO
	spi: atmel: Fix interrupt setup for PDC transfers
	spi: dw-mid: avoid potential NULL dereference
	spi: pl022: Fix race in giveback() leading to driver lock-up
	ALSA: snd-usb: add quirks for Roland UA-22
	ALSA: control: Add sanity checks for user ctl id name string
	ALSA: hda - Fix built-in mic on Compaq Presario CQ60
	ALSA: hda - Don't access stereo amps for mono channel widgets
	ALSA: hda - Set single_adc_amp flag for CS420x codecs
	ALSA: hda - Add workaround for MacBook Air 5,2 built-in mic
	ALSA: hda - Fix regression of HD-audio controller fallback modes
	ALSA: hda - Treat stereo-to-mono mix properly
	mtd: nand: pxa3xx: Fix PIO FIFO draining
	bnx2x: Force fundamental reset for EEH recovery
	regulator: rk808: Set the enable time for LDOs
	regulator: Only enable disabled regulators on resume
	regulator: core: Fix enable GPIO reference counting
	nilfs2: fix deadlock of segment constructor during recovery
	Revert "i2c: core: Dispose OF IRQ mapping at client removal time"
	drm/vmwgfx: Reorder device takedown somewhat
	drm/vmwgfx: Fix a couple of lock dependency violations
	drm: Don't assign fbs for universal cursor support to files
	drivers/rtc/rtc-s3c.c: add .needs_src_clk to s3c6410 RTC data
	xen/events: avoid NULL pointer dereference in dom0 on large machines
	xen-pciback: limit guest control of command register
	gadgetfs: use-after-free in ->aio_read()
	libsas: Fix Kernel Crash in smp_execute_task
	PCI: Don't read past the end of sysfs "driver_override" buffer
	irqchip: armada-370-xp: Fix chained per-cpu interrupts
	pagemap: do not leak physical addresses to non-privileged userspace
	crypto: arm/aes update NEON AES module to latest OpenSSL version
	crypto: aesni - fix memory usage in GCM decryption
	x86/fpu: Avoid math_state_restore() without used_math() in __restore_xstate_sig()
	x86/fpu: Drop_fpu() should not assume that tsk equals current
	kvm: move advertising of KVM_CAP_IRQFD to common code
	x86/vdso: Fix the build on GCC5
	x86: numachip: Fix 16-bit APIC ID truncation
	ARM: imx6qdl-sabresd: set swbst_reg as vbus's parent reg
	ARM: at91: pm: fix at91rm9200 standby
	ARM: dts: DRA7x: Fix the bypass clock source for dpll_iva and others
	ARM: dts: am33xx-clocks: Fix ehrpwm tbclk data on am33xx
	ARM: dts: am43xx-clocks: Fix ehrpwm tbclk data on am43xx
	target: Fix reference leak in target_get_sess_cmd() error path
	target: Fix virtual LUN=0 target_configure_device failure OOPs
	iscsi-target: Avoid early conn_logout_comp for iser connections
	target/pscsi: Fix NULL pointer dereference in get_device_type
	Linux 3.18.11

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 9a4e31c2 f154a14e

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 10

SUBLEVEL = 11

EXTRAVERSION =

NAME = Shuffling Zombie Juror

arch/arm/boot/dts/am33xx-clocks.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 
	ehrpwm0_tbclk: ehrpwm0_tbclk@44e10664 {

		#clock-cells = <0>;

		compatible = "ti,gate-clock";

		clocks = <&dpll_per_m2_ck>;

		clocks = <&l4ls_gclk>;

		ti,bit-shift = <0>;

		reg = <0x0664>;

	};
@@ -107,7 +107,7 @@ 
	ehrpwm1_tbclk: ehrpwm1_tbclk@44e10664 {

		#clock-cells = <0>;

		compatible = "ti,gate-clock";

		clocks = <&dpll_per_m2_ck>;

		clocks = <&l4ls_gclk>;

		ti,bit-shift = <1>;

		reg = <0x0664>;

	};
@@ -115,7 +115,7 @@ 
	ehrpwm2_tbclk: ehrpwm2_tbclk@44e10664 {

		#clock-cells = <0>;

		compatible = "ti,gate-clock";

		clocks = <&dpll_per_m2_ck>;

		clocks = <&l4ls_gclk>;

		ti,bit-shift = <2>;

		reg = <0x0664>;

	};

arch/arm/boot/dts/am43xx-clocks.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ 
	ehrpwm0_tbclk: ehrpwm0_tbclk {

		#clock-cells = <0>;

		compatible = "ti,gate-clock";

		clocks = <&dpll_per_m2_ck>;

		clocks = <&l4ls_gclk>;

		ti,bit-shift = <0>;

		reg = <0x0664>;

	};
@@ -115,7 +115,7 @@ 
	ehrpwm1_tbclk: ehrpwm1_tbclk {

		#clock-cells = <0>;

		compatible = "ti,gate-clock";

		clocks = <&dpll_per_m2_ck>;

		clocks = <&l4ls_gclk>;

		ti,bit-shift = <1>;

		reg = <0x0664>;

	};
@@ -123,7 +123,7 @@ 
	ehrpwm2_tbclk: ehrpwm2_tbclk {

		#clock-cells = <0>;

		compatible = "ti,gate-clock";

		clocks = <&dpll_per_m2_ck>;

		clocks = <&l4ls_gclk>;

		ti,bit-shift = <2>;

		reg = <0x0664>;

	};
@@ -131,7 +131,7 @@ 
	ehrpwm3_tbclk: ehrpwm3_tbclk {

		#clock-cells = <0>;

		compatible = "ti,gate-clock";

		clocks = <&dpll_per_m2_ck>;

		clocks = <&l4ls_gclk>;

		ti,bit-shift = <4>;

		reg = <0x0664>;

	};
@@ -139,7 +139,7 @@ 
	ehrpwm4_tbclk: ehrpwm4_tbclk {

		#clock-cells = <0>;

		compatible = "ti,gate-clock";

		clocks = <&dpll_per_m2_ck>;

		clocks = <&l4ls_gclk>;

		ti,bit-shift = <5>;

		reg = <0x0664>;

	};
@@ -147,7 +147,7 @@ 
	ehrpwm5_tbclk: ehrpwm5_tbclk {

		#clock-cells = <0>;

		compatible = "ti,gate-clock";

		clocks = <&dpll_per_m2_ck>;

		clocks = <&l4ls_gclk>;

		ti,bit-shift = <6>;

		reg = <0x0664>;

	};

arch/arm/boot/dts/dra7xx-clocks.dtsi

+81 −9
Original line number Diff line number Diff line
@@ -243,10 +243,18 @@ 
		ti,invert-autoidle-bit;

	};



	dpll_core_byp_mux: dpll_core_byp_mux {

		#clock-cells = <0>;

		compatible = "ti,mux-clock";

		clocks = <&sys_clkin1>, <&dpll_abe_m3x2_ck>;

		ti,bit-shift = <23>;

		reg = <0x012c>;

	};



	dpll_core_ck: dpll_core_ck {

		#clock-cells = <0>;

		compatible = "ti,omap4-dpll-core-clock";

		clocks = <&sys_clkin1>, <&dpll_abe_m3x2_ck>;

		clocks = <&sys_clkin1>, <&dpll_core_byp_mux>;

		reg = <0x0120>, <0x0124>, <0x012c>, <0x0128>;

	};
@@ -309,10 +317,18 @@ 
		clock-div = <1>;

	};



	dpll_dsp_byp_mux: dpll_dsp_byp_mux {

		#clock-cells = <0>;

		compatible = "ti,mux-clock";

		clocks = <&sys_clkin1>, <&dsp_dpll_hs_clk_div>;

		ti,bit-shift = <23>;

		reg = <0x0240>;

	};



	dpll_dsp_ck: dpll_dsp_ck {

		#clock-cells = <0>;

		compatible = "ti,omap4-dpll-clock";

		clocks = <&sys_clkin1>, <&dsp_dpll_hs_clk_div>;

		clocks = <&sys_clkin1>, <&dpll_dsp_byp_mux>;

		reg = <0x0234>, <0x0238>, <0x0240>, <0x023c>;

	};
@@ -335,10 +351,18 @@ 
		clock-div = <1>;

	};



	dpll_iva_byp_mux: dpll_iva_byp_mux {

		#clock-cells = <0>;

		compatible = "ti,mux-clock";

		clocks = <&sys_clkin1>, <&iva_dpll_hs_clk_div>;

		ti,bit-shift = <23>;

		reg = <0x01ac>;

	};



	dpll_iva_ck: dpll_iva_ck {

		#clock-cells = <0>;

		compatible = "ti,omap4-dpll-clock";

		clocks = <&sys_clkin1>, <&iva_dpll_hs_clk_div>;

		clocks = <&sys_clkin1>, <&dpll_iva_byp_mux>;

		reg = <0x01a0>, <0x01a4>, <0x01ac>, <0x01a8>;

	};
@@ -361,10 +385,18 @@ 
		clock-div = <1>;

	};



	dpll_gpu_byp_mux: dpll_gpu_byp_mux {

		#clock-cells = <0>;

		compatible = "ti,mux-clock";

		clocks = <&sys_clkin1>, <&dpll_abe_m3x2_ck>;

		ti,bit-shift = <23>;

		reg = <0x02e4>;

	};



	dpll_gpu_ck: dpll_gpu_ck {

		#clock-cells = <0>;

		compatible = "ti,omap4-dpll-clock";

		clocks = <&sys_clkin1>, <&dpll_abe_m3x2_ck>;

		clocks = <&sys_clkin1>, <&dpll_gpu_byp_mux>;

		reg = <0x02d8>, <0x02dc>, <0x02e4>, <0x02e0>;

	};
@@ -398,10 +430,18 @@ 
		clock-div = <1>;

	};



	dpll_ddr_byp_mux: dpll_ddr_byp_mux {

		#clock-cells = <0>;

		compatible = "ti,mux-clock";

		clocks = <&sys_clkin1>, <&dpll_abe_m3x2_ck>;

		ti,bit-shift = <23>;

		reg = <0x021c>;

	};



	dpll_ddr_ck: dpll_ddr_ck {

		#clock-cells = <0>;

		compatible = "ti,omap4-dpll-clock";

		clocks = <&sys_clkin1>, <&dpll_abe_m3x2_ck>;

		clocks = <&sys_clkin1>, <&dpll_ddr_byp_mux>;

		reg = <0x0210>, <0x0214>, <0x021c>, <0x0218>;

	};
@@ -416,10 +456,18 @@ 
		ti,invert-autoidle-bit;

	};



	dpll_gmac_byp_mux: dpll_gmac_byp_mux {

		#clock-cells = <0>;

		compatible = "ti,mux-clock";

		clocks = <&sys_clkin1>, <&dpll_abe_m3x2_ck>;

		ti,bit-shift = <23>;

		reg = <0x02b4>;

	};



	dpll_gmac_ck: dpll_gmac_ck {

		#clock-cells = <0>;

		compatible = "ti,omap4-dpll-clock";

		clocks = <&sys_clkin1>, <&dpll_abe_m3x2_ck>;

		clocks = <&sys_clkin1>, <&dpll_gmac_byp_mux>;

		reg = <0x02a8>, <0x02ac>, <0x02b4>, <0x02b0>;

	};
@@ -482,10 +530,18 @@ 
		clock-div = <1>;

	};



	dpll_eve_byp_mux: dpll_eve_byp_mux {

		#clock-cells = <0>;

		compatible = "ti,mux-clock";

		clocks = <&sys_clkin1>, <&eve_dpll_hs_clk_div>;

		ti,bit-shift = <23>;

		reg = <0x0290>;

	};



	dpll_eve_ck: dpll_eve_ck {

		#clock-cells = <0>;

		compatible = "ti,omap4-dpll-clock";

		clocks = <&sys_clkin1>, <&eve_dpll_hs_clk_div>;

		clocks = <&sys_clkin1>, <&dpll_eve_byp_mux>;

		reg = <0x0284>, <0x0288>, <0x0290>, <0x028c>;

	};
@@ -1249,10 +1305,18 @@ 
		clock-div = <1>;

	};



	dpll_per_byp_mux: dpll_per_byp_mux {

		#clock-cells = <0>;

		compatible = "ti,mux-clock";

		clocks = <&sys_clkin1>, <&per_dpll_hs_clk_div>;

		ti,bit-shift = <23>;

		reg = <0x014c>;

	};



	dpll_per_ck: dpll_per_ck {

		#clock-cells = <0>;

		compatible = "ti,omap4-dpll-clock";

		clocks = <&sys_clkin1>, <&per_dpll_hs_clk_div>;

		clocks = <&sys_clkin1>, <&dpll_per_byp_mux>;

		reg = <0x0140>, <0x0144>, <0x014c>, <0x0148>;

	};
@@ -1275,10 +1339,18 @@ 
		clock-div = <1>;

	};



	dpll_usb_byp_mux: dpll_usb_byp_mux {

		#clock-cells = <0>;

		compatible = "ti,mux-clock";

		clocks = <&sys_clkin1>, <&usb_dpll_hs_clk_div>;

		ti,bit-shift = <23>;

		reg = <0x018c>;

	};



	dpll_usb_ck: dpll_usb_ck {

		#clock-cells = <0>;

		compatible = "ti,omap4-dpll-j-type-clock";

		clocks = <&sys_clkin1>, <&usb_dpll_hs_clk_div>;

		clocks = <&sys_clkin1>, <&dpll_usb_byp_mux>;

		reg = <0x0180>, <0x0184>, <0x018c>, <0x0188>;

	};

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

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
			regulator-max-microvolt = <5000000>;

			gpio = <&gpio3 22 0>;

			enable-active-high;

			vin-supply = <&swbst_reg>;

		};



		reg_usb_h1_vbus: regulator@1 {
@@ -45,6 +46,7 @@ 
			regulator-max-microvolt = <5000000>;

			gpio = <&gpio1 29 0>;

			enable-active-high;

			vin-supply = <&swbst_reg>;

		};



		reg_audio: regulator@2 {