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

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

Merge 3.18.96 into android-3.18 



Changes in 3.18.96
	IB/mlx4: Fix incorrectly releasing steerable UD QPs when have only ETH ports
	PM / devfreq: Propagate error from devfreq_add_device()
	s390: fix handling of -1 in set{,fs}[gu]id16 syscalls
	arm: spear600: Add missing interrupt-parent of rtc
	arm: spear13xx: Fix dmas cells
	arm: spear13xx: Fix spics gpio controller's warning
	ALSA: seq: Fix regression by incorrect ioctl_mutex usages
	drm/radeon: adjust tested variable
	ext4: save error to disk in __ext4_grp_locked_error()
	ext4: correct documentation for grpid mount option
	video: fbdev: atmel_lcdfb: fix display-timings lookup
	console/dummy: leave .con_font_get set to NULL
	Btrfs: fix deadlock in run_delalloc_nocow
	Btrfs: fix crash due to not cleaning up tree log block's dirty bits
	ALSA: seq: Fix racy pool initializations
	ARM: dts: s5pv210: add interrupt-parent for ohci
	media: r820t: fix r820t_write_reg for KASAN
	mm,vmscan: Make unregister_shrinker() no-op if register_shrinker() failed.
	xfrm: check id proto in validate_tmpl()
	selinux: skip bounded transition processing if the policy isn't loaded
	crypto: x86/twofish-3way - Fix %rbp usage
	netfilter: x_tables: fix int overflow in xt_alloc_table_info()
	netfilter: x_tables: avoid out-of-bounds reads in xt_request_find_{match|target}
	netfilter: ipt_CLUSTERIP: fix out-of-bounds accesses in clusterip_tg_check()
	netfilter: on sockopt() acquire sock lock only in the required scope
	netfilter: xt_RATEEST: acquire xt_rateest_mutex for hash insert
	net: avoid skb_warn_bad_offload on IS_ERR
	Provide a function to create a NUL-terminated string from unterminated data
	selinux: ensure the context is NUL terminated in security_context_to_sid_core()
	ASoC: ux500: add MODULE_LICENSE tag
	video: fbdev/mmp: add MODULE_LICENSE
	dn_getsockoptdecnet: move nf_{get/set}sockopt outside sock lock
	usbip: keep usbip_device sockfd state in sync with tcp_socket
	usb: build drivers/usb/common/ when USB_SUPPORT is set
	ARM: AM33xx: PRM: Remove am33xx_pwrdm_read_prev_pwrst function
	ARM: dts: am4372: Correct the interrupts_properties of McASP
	perf top: Fix window dimensions change handling
	perf bench numa: Fixup discontiguous/sparse numa nodes
	media: s5k6aa: describe some function parameters
	scripts/kernel-doc: Don't fail with status != 0 if error encountered with -none
	powerpc/perf: Fix oops when grouping different pmu events
	s390/dasd: prevent prefix I/O error
	gianfar: fix a flooded alignment reports because of padding issue.
	net_sched: red: Avoid devision by zero
	net_sched: red: Avoid illegal values
	btrfs: Fix possible off-by-one in btrfs_search_path_in_tree
	509: fix printing uninitialized stack memory when OID is empty
	spi: sun4i: disable clocks in the remove function
	xfrm: Fix stack-out-of-bounds with misconfigured transport mode policies.
	dmaengine: jz4740: disable/unprepare clk if probe fails
	mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep
	x86/mm/kmmio: Fix mmiotrace for page unaligned addresses
	xen: XEN_ACPI_PROCESSOR is Dom0-only
	hippi: Fix a Fix a possible sleep-in-atomic bug in rr_close
	KVM: async_pf: Fix #DF due to inject "Page not Present" and "Page Ready" exceptions simultaneously
	crypto: s5p-sss - Fix kernel Oops in AES-ECB mode
	Linux 3.18.96

Change-Id: I4fbf699657677841ad8c8219d924e4462a87661b
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 75051206 f8f8e8c5

Documentation/devicetree/bindings/dma/snps-dma.txt

+1 −1
Original line number Diff line number Diff line
@@ -58,6 +58,6 @@ Example: 
		interrupts = <0 35 0x4>;

		status = "disabled";

		dmas = <&dmahost 12 0 1>,

			<&dmahost 13 0 1 0>;

			<&dmahost 13 1 0>;

		dma-names = "rx", "rx";

	};

Documentation/filesystems/ext4.txt

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ data_err=ignore(*) Just print an error message if an error occurs 
data_err=abort		Abort the journal if an error occurs in a file

			data buffer in ordered mode.



grpid			Give objects the same group ID as their creator.

grpid			New objects have the group ID of their parent.

bsdgroups



nogrpid		(*)	New objects have the group ID of their creator.

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 95

SUBLEVEL = 96

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/boot/dts/am4372.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -702,7 +702,8 @@ 
			reg = <0x48038000 0x2000>,

			      <0x46000000 0x400000>;

			reg-names = "mpu", "dat";

			interrupts = <80>, <81>;

			interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "tx", "rx";

			status = "disabled";

			dmas = <&edma 8>,
@@ -716,7 +717,8 @@ 
			reg = <0x4803C000 0x2000>,

			      <0x46400000 0x400000>;

			reg-names = "mpu", "dat";

			interrupts = <82>, <83>;

			interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "tx", "rx";

			status = "disabled";

			dmas = <&edma 10>,

arch/arm/boot/dts/s5pv210.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ 
			compatible = "samsung,exynos4210-ohci";

			reg = <0xec300000 0x100>;

			interrupts = <23>;

			interrupt-parent = <&vic1>;

			clocks = <&clocks CLK_USB_HOST>;

			clock-names = "usbhost";

			#address-cells = <1>;