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

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

Merge 4.4.117 into android-4.4 



Changes in 4.4.117
	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: dts: STi: Add gpio polarity for "hdmi,hpd-gpio" property
	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
	KVM/x86: Reduce retpoline performance impact in slot_handle_level_range(), by always inlining iterator helper methods
	x86/cpu: Change type of x86_cache_size variable to unsigned int
	drm/radeon: adjust tested variable
	rtc-opal: Fix handling of firmware error codes, prevent busy loops
	ext4: save error to disk in __ext4_grp_locked_error()
	ext4: correct documentation for grpid mount option
	mm: hide a #warning for COMPILE_TEST
	video: fbdev: atmel_lcdfb: fix display-timings lookup
	console/dummy: leave .con_font_get set to NULL
	rtlwifi: rtl8821ae: Fix connection lost problem correctly
	Btrfs: fix deadlock in run_delalloc_nocow
	Btrfs: fix crash due to not cleaning up tree log block's dirty bits
	Btrfs: fix unexpected -EEXIST when creating new inode
	ALSA: hda - Fix headset mic detection problem for two Dell machines
	ALSA: usb-audio: Fix UAC2 get_ctl request with a RANGE attribute
	ALSA: hda/realtek: PCI quirk for Fujitsu U7x7
	ALSA: usb-audio: add implicit fb quirk for Behringer UFX1204
	ALSA: seq: Fix racy pool initializations
	mvpp2: fix multicast address filter
	dm: correctly handle chained bios in dec_pending()
	x86: fix build warnign with 32-bit PAE
	vfs: don't do RCU lookup of empty pathnames
	ARM: pxa/tosa-bt: add MODULE_LICENSE tag
	ARM: dts: s5pv210: add interrupt-parent for ohci
	media: r820t: fix r820t_write_reg for KASAN
	Linux 4.4.117

Change-Id: Id192d691d19a99889dc5d36711f18576f48f2981
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 8c1e0d65 e9fd3d16

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

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

		interrupts = <0 35 0x4>;

		status = "disabled";

		status = "disabled";

		dmas = <&dmahost 12 0 1>,

		dmas = <&dmahost 12 0 1>,

			<&dmahost 13 0 1 0>;

			<&dmahost 13 1 0>;

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

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

	};
 
	};

Documentation/filesystems/ext4.txt

+1 −1
Original line number Original line 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_err=abort		Abort the journal if an error occurs in a file

			data buffer in ordered mode.

			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

bsdgroups





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

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

Makefile

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

VERSION = 4

PATCHLEVEL = 4

PATCHLEVEL = 4

SUBLEVEL = 116

SUBLEVEL = 117

EXTRAVERSION =

EXTRAVERSION =

NAME = Blurry Fish Butt

NAME = Blurry Fish Butt

arch/arm/boot/dts/s5pv210.dtsi

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

			compatible = "samsung,exynos4210-ohci";

			reg = <0xec300000 0x100>;

			reg = <0xec300000 0x100>;

			interrupts = <23>;

			interrupts = <23>;

			interrupt-parent = <&vic1>;

			clocks = <&clocks CLK_USB_HOST>;

			clocks = <&clocks CLK_USB_HOST>;

			clock-names = "usbhost";

			clock-names = "usbhost";

			#address-cells = <1>;

			#address-cells = <1>;

arch/arm/boot/dts/spear1310-evb.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -349,7 +349,7 @@ 
			spi0: spi@e0100000 {

			spi0: spi@e0100000 {

				status = "okay";

				status = "okay";

				num-cs = <3>;

				num-cs = <3>;

				cs-gpios = <&gpio1 7 0>, <&spics 0>, <&spics 1>;

				cs-gpios = <&gpio1 7 0>, <&spics 0 0>, <&spics 1 0>;





				stmpe610@0 {

				stmpe610@0 {

					compatible = "st,stmpe610";

					compatible = "st,stmpe610";