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

Commit b0e2559a authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android-4.4.103 (9fbf3d73) into msm-4.4 



* refs/heads/tmp-9fbf3d73
  Linux 4.4.103
  Revert "sctp: do not peel off an assoc from one netns to another one"
  xen: xenbus driver must not accept invalid transaction ids
  s390/kbuild: enable modversions for symbols exported from asm
  ASoC: wm_adsp: Don't overrun firmware file buffer when reading region data
  btrfs: return the actual error value from from btrfs_uuid_tree_iterate
  ASoC: rsnd: don't double free kctrl
  netfilter: nf_tables: fix oob access
  netfilter: nft_queue: use raw_smp_processor_id()
  spi: SPI_FSL_DSPI should depend on HAS_DMA
  staging: iio: cdc: fix improper return value
  iio: light: fix improper return value
  mac80211: Suppress NEW_PEER_CANDIDATE event if no room
  mac80211: Remove invalid flag operations in mesh TSF synchronization
  drm: Apply range restriction after color adjustment when allocation
  ALSA: hda - Apply ALC269_FIXUP_NO_SHUTUP on HDA_FIXUP_ACT_PROBE
  ath10k: set CTS protection VDEV param only if VDEV is up
  ath10k: fix potential memory leak in ath10k_wmi_tlv_op_pull_fw_stats()
  ath10k: ignore configuring the incorrect board_id
  ath10k: fix incorrect txpower set by P2P_DEVICE interface
  drm/armada: Fix compile fail
  net: 3com: typhoon: typhoon_init_one: fix incorrect return values
  net: 3com: typhoon: typhoon_init_one: make return values more specific
  net: Allow IP_MULTICAST_IF to set index to L3 slave
  dmaengine: zx: set DMA_CYCLIC cap_mask bit
  PCI: Apply _HPX settings only to relevant devices
  RDS: RDMA: return appropriate error on rdma map failures
  e1000e: Separate signaling for link check/link up
  e1000e: Fix return value test
  e1000e: Fix error path in link detection
  PM / OPP: Add missing of_node_put(np)
  net/9p: Switch to wait_event_killable()
  fscrypt: lock mutex before checking for bounce page pool
  sched/rt: Simplify the IPI based RT balancing logic
  media: v4l2-ctrl: Fix flags field on Control events
  cx231xx-cards: fix NULL-deref on missing association descriptor
  media: rc: check for integer overflow
  media: Don't do DMA on stack for firmware upload in the AS102 driver
  powerpc/signal: Properly handle return value from uprobe_deny_signal()
  parisc: Fix validity check of pointer size argument in new CAS implementation
  ixgbe: Fix skb list corruption on Power systems
  fm10k: Use smp_rmb rather than read_barrier_depends
  i40evf: Use smp_rmb rather than read_barrier_depends
  ixgbevf: Use smp_rmb rather than read_barrier_depends
  igbvf: Use smp_rmb rather than read_barrier_depends
  igb: Use smp_rmb rather than read_barrier_depends
  i40e: Use smp_rmb rather than read_barrier_depends
  NFC: fix device-allocation error return
  IB/srp: Avoid that a cable pull can trigger a kernel crash
  IB/srpt: Do not accept invalid initiator port names
  libnvdimm, namespace: make 'resource' attribute only readable by root
  libnvdimm, namespace: fix label initialization to use valid seq numbers
  clk: ti: dra7-atl-clock: fix child-node lookups
  clk: ti: dra7-atl-clock: Fix of_node reference counting
  SUNRPC: Fix tracepoint storage issues with svc_recv and svc_rqst_status
  KVM: SVM: obey guest PAT
  KVM: nVMX: set IDTR and GDTR limits when loading L1 host state
  target: Fix QUEUE_FULL + SCSI task attribute handling
  iscsi-target: Fix non-immediate TMR reference leak
  fs/9p: Compare qid.path in v9fs_test_inode
  fix a page leak in vhost_scsi_iov_to_sgl() error recovery
  ALSA: hda/realtek - Fix ALC700 family no sound issue
  ALSA: timer: Remove kernel warning at compat ioctl error paths
  ALSA: usb-audio: Add sanity checks in v2 clock parsers
  ALSA: usb-audio: Fix potential out-of-bound access at parsing SU
  ALSA: usb-audio: Add sanity checks to FE parser
  ALSA: pcm: update tstamp only if audio_tstamp changed
  ext4: fix interaction between i_size, fallocate, and delalloc after a crash
  ata: fixes kernel crash while tracing ata_eh_link_autopsy event
  rtlwifi: fix uninitialized rtlhal->last_suspend_sec time
  rtlwifi: rtl8192ee: Fix memory leak when loading firmware
  nfsd: deal with revoked delegations appropriately
  nfs: Fix ugly referral attributes
  NFS: Fix typo in nomigration mount option
  isofs: fix timestamps beyond 2027
  bcache: check ca->alloc_thread initialized before wake up it
  eCryptfs: use after free in ecryptfs_release_messaging()
  nilfs2: fix race condition that causes file system corruption
  autofs: don't fail mount for transient error
  MIPS: BCM47XX: Fix LED inversion for WRT54GSv1
  MIPS: Fix an n32 core file generation regset support regression
  dm: fix race between dm_get_from_kobject() and __dm_destroy()
  dm bufio: fix integer overflow when limiting maximum cache size
  ALSA: hda: Add Raven PCI ID
  MIPS: ralink: Fix typo in mt7628 pinmux function
  MIPS: ralink: Fix MT7628 pinmux
  ARM: 8721/1: mm: dump: check hardware RO bit for LPAE
  ARM: 8722/1: mm: make STRICT_KERNEL_RWX effective for LPAE
  x86/decoder: Add new TEST instruction pattern
  lib/mpi: call cond_resched() from mpi_powm() loop
  sched: Make resched_cpu() unconditional
  vsock: use new wait API for vsock_stream_sendmsg()
  AF_VSOCK: Shrink the area influenced by prepare_to_wait
  ipv6: only call ip6_route_dev_notify() once for NETDEV_UNREGISTER
  s390/disassembler: increase show_code buffer size
  s390/disassembler: add missing end marker for e7 table
  s390/runtime instrumention: fix possible memory corruption
  s390: fix transactional execution control register handling
  BACKPORT: time: Clean up CLOCK_MONOTONIC_RAW time handling
  BACKPORT: time: Fix CLOCK_MONOTONIC_RAW sub-nanosecond accounting
  UPSTREAM: arm64: vdso: fix clock_getres for 4GiB-aligned res
  f2fs: updates on 4.15-rc1
  UPSTREAM: android: binder: fix type mismatch warning
  Linux 4.4.102
  mm, hwpoison: fixup "mm: check the return value of lookup_page_ext for all call sites"

Conflicts:
	fs/ext4/crypto_key.c
	mm/debug-pagealloc.c

Change-Id: Ibe35d78bd0397f3ff2049e0a1dda20fcb06f2f75
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents 00a5539a 9fbf3d73

Documentation/ABI/testing/sysfs-fs-f2fs

+42 −1
Original line number Diff line number Diff line
@@ -51,6 +51,18 @@ Description: 
		 Controls the dirty page count condition for the in-place-update

		 policies.



What:		/sys/fs/f2fs/<disk>/min_hot_blocks

Date:		March 2017

Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>

Description:

		 Controls the dirty page count condition for redefining hot data.



What:		/sys/fs/f2fs/<disk>/min_ssr_sections

Date:		October 2017

Contact:	"Chao Yu" <yuchao0@huawei.com>

Description:

		 Controls the fee section threshold to trigger SSR allocation.



What:		/sys/fs/f2fs/<disk>/max_small_discards

Date:		November 2013

Contact:	"Jaegeuk Kim" <jaegeuk.kim@samsung.com>
@@ -96,6 +108,18 @@ Contact: "Jaegeuk Kim" <jaegeuk@kernel.org> 
Description:

		 Controls the checkpoint timing.



What:		/sys/fs/f2fs/<disk>/idle_interval

Date:		January 2016

Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>

Description:

		 Controls the idle timing.



What:		/sys/fs/f2fs/<disk>/iostat_enable

Date:		August 2017

Contact:	"Chao Yu" <yuchao0@huawei.com>

Description:

		 Controls to enable/disable IO stat.



What:		/sys/fs/f2fs/<disk>/ra_nid_pages

Date:		October 2015

Contact:	"Chao Yu" <chao2.yu@samsung.com>
@@ -116,6 +140,12 @@ Contact: "Shuoran Liu" <liushuoran@huawei.com> 
Description:

		 Shows total written kbytes issued to disk.



What:		/sys/fs/f2fs/<disk>/feature

Date:		July 2017

Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>

Description:

		 Shows all enabled features in current device.



What:		/sys/fs/f2fs/<disk>/inject_rate

Date:		May 2016

Contact:	"Sheng Yong" <shengyong1@huawei.com>
@@ -132,7 +162,18 @@ What: /sys/fs/f2fs/<disk>/reserved_blocks 
Date:		June 2017

Contact:	"Chao Yu" <yuchao0@huawei.com>

Description:

		 Controls current reserved blocks in system.

		 Controls target reserved blocks in system, the threshold

		 is soft, it could exceed current available user space.



What:		/sys/fs/f2fs/<disk>/current_reserved_blocks

Date:		October 2017

Contact:	"Yunlong Song" <yunlong.song@huawei.com>

Contact:	"Chao Yu" <yuchao0@huawei.com>

Description:

		 Shows current reserved blocks in system, it may be temporarily

		 smaller than target_reserved_blocks, but will gradually

		 increase to target_reserved_blocks when more free blocks are

		 freed by user later.



What:		/sys/fs/f2fs/<disk>/gc_urgent

Date:		August 2017

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 101

SUBLEVEL = 103

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/mm/dump.c

+2 −2
Original line number Diff line number Diff line
@@ -126,8 +126,8 @@ static const struct prot_bits section_bits[] = { 
		.val	= PMD_SECT_USER,

		.set	= "USR",

	}, {

		.mask	= L_PMD_SECT_RDONLY,

		.val	= L_PMD_SECT_RDONLY,

		.mask	= L_PMD_SECT_RDONLY | PMD_SECT_AP2,

		.val	= L_PMD_SECT_RDONLY | PMD_SECT_AP2,

		.set	= "ro",

		.clear	= "RW",

#elif __LINUX_ARM_ARCH__ >= 6

arch/arm/mm/init.c

+2 −2
Original line number Diff line number Diff line
@@ -669,8 +669,8 @@ static struct section_perm ro_perms[] = { 
		.start  = (unsigned long)_stext,

		.end    = (unsigned long)__init_begin,

#ifdef CONFIG_ARM_LPAE

		.mask   = ~L_PMD_SECT_RDONLY,

		.prot   = L_PMD_SECT_RDONLY,

		.mask   = ~(L_PMD_SECT_RDONLY | PMD_SECT_AP2),

		.prot   = L_PMD_SECT_RDONLY | PMD_SECT_AP2,

#else

		.mask   = ~(PMD_SECT_APX | PMD_SECT_AP_WRITE),

		.prot   = PMD_SECT_APX | PMD_SECT_AP_WRITE,

arch/arm64/kernel/vdso.c

+2 −2
Original line number Diff line number Diff line
@@ -218,8 +218,8 @@ void update_vsyscall(struct timekeeper *tk) 
	if (!use_syscall) {

		/* tkr_mono.cycle_last == tkr_raw.cycle_last */

		vdso_data->cs_cycle_last	= tk->tkr_mono.cycle_last;

		vdso_data->raw_time_sec		= tk->raw_time.tv_sec;

		vdso_data->raw_time_nsec	= tk->raw_time.tv_nsec;

		vdso_data->raw_time_sec         = tk->raw_sec;

		vdso_data->raw_time_nsec        = tk->tkr_raw.xtime_nsec;

		vdso_data->xtime_clock_sec	= tk->xtime_sec;

		vdso_data->xtime_clock_nsec	= tk->tkr_mono.xtime_nsec;

		/* tkr_raw.xtime_nsec == 0 */