Commit ac86a6d6 authored Feb 27, 2018 by Srinivasarao P

Merge android-4.4.117 (4ec36565) into msm-4.4



* refs/heads/tmp-4ec36565
  Linux 4.4.117
  media: r820t: fix r820t_write_reg for KASAN
  ARM: dts: s5pv210: add interrupt-parent for ohci
  ARM: pxa/tosa-bt: add MODULE_LICENSE tag
  vfs: don't do RCU lookup of empty pathnames
  x86: fix build warnign with 32-bit PAE
  dm: correctly handle chained bios in dec_pending()
  mvpp2: fix multicast address filter
  ALSA: seq: Fix racy pool initializations
  ALSA: usb-audio: add implicit fb quirk for Behringer UFX1204
  ALSA: hda/realtek: PCI quirk for Fujitsu U7x7
  ALSA: usb-audio: Fix UAC2 get_ctl request with a RANGE attribute
  ALSA: hda - Fix headset mic detection problem for two Dell machines
  Btrfs: fix unexpected -EEXIST when creating new inode
  Btrfs: fix crash due to not cleaning up tree log block's dirty bits
  Btrfs: fix deadlock in run_delalloc_nocow
  rtlwifi: rtl8821ae: Fix connection lost problem correctly
  console/dummy: leave .con_font_get set to NULL
  video: fbdev: atmel_lcdfb: fix display-timings lookup
  mm: hide a #warning for COMPILE_TEST
  ext4: correct documentation for grpid mount option
  ext4: save error to disk in __ext4_grp_locked_error()
  rtc-opal: Fix handling of firmware error codes, prevent busy loops
  drm/radeon: adjust tested variable
  x86/cpu: Change type of x86_cache_size variable to unsigned int
  KVM/x86: Reduce retpoline performance impact in slot_handle_level_range(), by always inlining iterator helper methods
  ALSA: seq: Fix regression by incorrect ioctl_mutex usages
  arm: spear13xx: Fix spics gpio controller's warning
  arm: spear13xx: Fix dmas cells
  arm: spear600: Add missing interrupt-parent of rtc
  ARM: dts: STi: Add gpio polarity for "hdmi,hpd-gpio" property
  s390: fix handling of -1 in set{,fs}[gu]id16 syscalls
  PM / devfreq: Propagate error from devfreq_add_device()
  IB/mlx4: Fix incorrectly releasing steerable UD QPs when have only ETH ports
  BACKPORT: tee: shm: Potential NULL dereference calling tee_shm_register()
  BACKPORT: tee: shm: don't put_page on null shm->pages
  BACKPORT: tee: shm: make function __tee_shm_alloc static
  BACKPORT: tee: optee: check type of registered shared memory
  BACKPORT: tee: add start argument to shm_register callback
  BACKPORT: tee: optee: fix header dependencies
  BACKPORT: tee: shm: inline tee_shm_get_id()
  BACKPORT: tee: use reference counting for tee_context
  BACKPORT: tee: optee: enable dynamic SHM support
  BACKPORT: tee: optee: add optee-specific shared pool implementation
  BACKPORT: tee: optee: store OP-TEE capabilities in private data
  BACKPORT: tee: optee: add registered buffers handling into RPC calls
  BACKPORT: tee: optee: add registered shared parameters handling
  BACKPORT: tee: optee: add shared buffer registration functions
  BACKPORT: tee: optee: add page list manipulation functions
  BACKPORT: tee: optee: Update protocol definitions
  BACKPORT: tee: shm: add page accessor functions
  BACKPORT: tee: shm: add accessors for buffer size and page offset
  BACKPORT: tee: add register user memory
  BACKPORT: tee: flexible shared memory pool creation
  BACKPORT: optee: support asynchronous supplicant requests
  BACKPORT: tee: add TEE_IOCTL_PARAM_ATTR_META
  BACKPORT: tee: add tee_param_is_memref() for driver use
  f2fs: fix build error with multiply defined inode_nohighmem()

Change-Id: I6b4b025e4b03fe9433de0bf2ff292a8f24e3c3cb
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>

parents 863577dd 4ec36565

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";