Commit bce6a977 authored Apr 19, 2018 by Blagovest Kolenichev Committed by Isaac J. Manjarres Apr 19, 2018

Merge android-4.14.35 (07e13892) into msm-4.14



* refs/heads/tmp-07e13892
  Linux 4.14.35
  nfsd: fix incorrect umasks
  hugetlbfs: fix bug in pgoff overflow checking
  xen: xenbus_dev_frontend: Fix XS_TRANSACTION_END handling
  ovl: fix lookup with middle layer opaque dir and absolute path redirects
  blk-mq: don't keep offline CPUs mapped to hctx 0
  lib: fix stall in __bitmap_parselist()
  f2fs: fix heap mode to reset it back
  sunrpc: remove incorrect HMAC request initialization
  ath9k: Protect queue draining by rcu_read_lock()
  hwmon: (ina2xx) Fix access to uninitialized mutex
  x86/mce/AMD: Get address from already initialized block
  x86/mce/AMD, EDAC/mce_amd: Enumerate Reserved SMCA bank type
  x86/mce/AMD: Pass the bank number to smca_get_bank_type()
  x86/MCE: Report only DRAM ECC as memory errors on AMD systems
  rtl8187: Fix NULL pointer dereference in priv->conf_mutex
  Bluetooth: hci_bcm: Treat Interrupt ACPI resources as always being active-low
  Bluetooth: Fix connection if directed advertising and privacy is used
  getname_kernel() needs to make sure that ->name != ->iname in long case
  get_user_pages_fast(): return -EFAULT on access_ok failure
  s390/ipl: ensure loadparm valid flag is set
  s390/qdio: don't merge ERROR output buffers
  s390/qdio: don't retry EQBS after CCQ 96
  nfit: fix region registration vs block-data-window ranges
  block/loop: fix deadlock after loop_set_status
  apparmor: fix resource audit messages when auditing peer
  apparmor: fix display of .ns_name for containers
  apparmor: fix logging of the existence test for signals
  scsi: qla2xxx: Fix small memory leak in qla2x00_probe_one on probe failure
  x86/MCE/AMD: Define a function to get SMCA bank type
  radeon: hide pointless #warning when compile testing
  perf/core: Fix use-after-free in uprobe_perf_close()
  perf intel-pt: Fix timestamp following overflow
  perf intel-pt: Fix error recovery from missing TIP packet
  perf intel-pt: Fix sync_switch
  perf intel-pt: Fix overlap detection to identify consecutive buffers correctly
  KVM: PPC: Book3S HV: trace_tlbie must not be called in realmode
  PCI: hv: Serialize the present and eject work items
  Drivers: hv: vmbus: do not mark HV_PCIE as perf_device
  parisc: Fix HPMC handler by increasing size to multiple of 16 bytes
  parisc: Fix out of array access in match_pci_device()
  media: v4l: vsp1: Fix header display list status check in continuous mode
  media: v4l2-compat-ioctl32: don't oops on overlay
  lan78xx: Correctly indicate invalid OTP
  vhost: Fix vhost_copy_to_user()
  vhost: fix vhost_vq_access_ok() log check
  slip: Check if rstate is initialized before uncompressing
  rds: MP-RDS may use an invalid c_path
  cdc_ether: flag the Cinterion AHS8 modem by gemalto as WWAN
  netfilter: ipset: Missing nfnl_lock()/nfnl_unlock() is added to ip_set_net_exit()
  ANDROID: Add build server config for cuttlefish.
  ANDROID: Add defconfig for cuttlefish.
  FROMLIST: staging: Android: Add 'vsoc' driver for cuttlefish.
  ANDROID: cpufreq: Add time_in_state to /proc/uid directories
  ANDROID: proc: Add /proc/uid directory
  ANDROID: cpufreq: times: track per-uid time in state
  ANDROID: cpufreq: track per-task time in state
  f2fs/fscrypt: updates to v4.17-rc1

Change-Id: I0fdc9762e63ff9a9abb25e6adea0c723e517a2a6
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>

parents c33140a9 07e13892

Documentation/ABI/testing/sysfs-fs-f2fs

+11 −0

Original line number	Diff line number	Diff line
		@@ -192,3 +192,14 @@ Date: November 2017
		Contact: "Sheng Yong" <shengyong1@huawei.com>
		Description:
		Controls readahead inode block in readdir.

		What: /sys/fs/f2fs/<disk>/extension_list
		Date: Feburary 2018
		Contact: "Chao Yu" <yuchao0@huawei.com>
		Description:
		Used to control configure extension list:
		- Query: cat /sys/fs/f2fs/<disk>/extension_list
		- Add: echo '[h/c]extension' > /sys/fs/f2fs/<disk>/extension_list
		- Del: echo '[h/c]!extension' > /sys/fs/f2fs/<disk>/extension_list
		- [h] means add/del hot file extension
		- [c] means add/del cold file extension

Documentation/filesystems/f2fs.txt

+17 −0

Original line number	Diff line number	Diff line
		@@ -174,6 +174,23 @@ offgrpjquota Turn off group journelled quota.
		offprjjquota Turn off project journelled quota.
		quota Enable plain user disk quota accounting.
		noquota Disable all plain disk quota option.
		whint_mode=%s Control which write hints are passed down to block
		layer. This supports "off", "user-based", and
		"fs-based". In "off" mode (default), f2fs does not pass
		down hints. In "user-based" mode, f2fs tries to pass
		down hints given by users. And in "fs-based" mode, f2fs
		passes down hints with its policy.
		alloc_mode=%s Adjust block allocation policy, which supports "reuse"
		and "default".
		fsync_mode=%s Control the policy of fsync. Currently supports "posix"
		and "strict". In "posix" mode, which is default, fsync
		will follow POSIX semantics and does a light operation
		to improve the filesystem performance. In "strict" mode,
		fsync will be heavy and behaves in line with xfs, ext4
		and btrfs, where xfstest generic/342 will pass, but the
		performance will regress.
		test_dummy_encryption Enable dummy encryption, which provides a fake fscrypt
		context. The fake fscrypt context is used by xfstests.

		================================================================================
		DEBUGFS ENTRIES

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 14
		SUBLEVEL = 34
		SUBLEVEL = 35
		EXTRAVERSION =
		NAME = Petit Gorille

arch/parisc/kernel/drivers.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -651,6 +651,10 @@ static int match_pci_device(struct device *dev, int index,
		(modpath->mod == PCI_FUNC(devfn)));
		}

		/* index might be out of bounds for bc[] */
		if (index >= 6)
		return 0;

		id = PCI_SLOT(pdev->devfn) \| (PCI_FUNC(pdev->devfn) << 5);
		return (modpath->bc[index] == id);
		}

arch/parisc/kernel/hpmc.S

+5 −1

Original line number	Diff line number	Diff line
		@@ -84,6 +84,7 @@ END(hpmc_pim_data)
		.text

		.import intr_save, code
		.align 16
		ENTRY_CFI(os_hpmc)
		.os_hpmc:

		@@ -300,12 +301,15 @@ os_hpmc_6:

		b .
		nop
		.align 16 /* make function length multiple of 16 bytes */
		ENDPROC_CFI(os_hpmc)
		.os_hpmc_end:


		__INITRODATA
		.globl os_hpmc_size
		.align 4
		.export os_hpmc_size
		.type os_hpmc_size, @object
		.size os_hpmc_size, 4
		os_hpmc_size:
		.word .os_hpmc_end-.os_hpmc