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

Commit 41af0494 authored by Jitendra Sharma's avatar Jitendra Sharma
Browse files

Merge google common 'android-3.18' into 'msm-3.18' 

Merge with google common 'android-3.18' at
7a365d34 into 'msm-3.18'

* quic/tmp-7a365d34:
  Linux 3.18.71
  xfs: XFS_IS_REALTIME_INODE() should be false if no rt device present
  ARM: 8692/1: mm: abort uaccess retries upon fatal signal
  Bluetooth: Properly check L2CAP config option output buffer length
  ALSA: msnd: Optimize / harden DSP and MIDI loops
  locktorture: Fix potential memory leak with rw lock test
  btrfs: resume qgroup rescan on rw remount
  scsi: sg: recheck MMAP_IO request length with lock held
  scsi: sg: protect against races between mmap() and SG_SET_RESERVED_SIZE
  cs5536: add support for IDE controller variant
  workqueue: Fix flag collision
  cma: fix calculation of aligned offset
  dlm: avoid double-free on error path in dlm_device_{register,unregister}
  Input: trackpoint - assume 3 buttons when buttons detection fails
  driver core: bus: Fix a potential double free
  staging/rts5208: fix incorrect shift to extract upper nybble
  USB: core: Avoid race of async_completed() w/ usbdev_release()
  usb:xhci:Fix regression when ATI chipsets detected
  usb: Add device quirk for Logitech HD Pro Webcam C920-C
  USB: serial: option: add support for D-Link DWM-157 C1
  usb: quirks: add delay init quirk for Corsair Strafe RGB keyboard
  ANDROID: sdcardfs: Add missing break
  ANDROID: Sdcardfs: Move gid derivation under flag
  ANDROID: mnt: Fix freeing of mount data
  ANDROID: Use sk_uid to replace uid get from socket file
  ANDROID: nf: xt_qtaguid: fix handling for cases where tunnels are used.
  Revert "ANDROID: Use sk_uid to replace uid get from socket file"
  ANDROID: fiq_debugger: Fix minor bug in code
  Linux 3.18.70
  epoll: fix race between ep_poll_callback(POLLFREE) and ep_free()/ep_remove()
  drm/ttm: Fix accounting error when fail to get pages for pool
  xfrm: policy: check policy direction value
  wl1251: add a missing spin_lock_init()
  CIFS: remove endian related sparse warning
  CIFS: Fix maximum SMB2 header size
  cpumask: fix spurious cpumask_of_node() on non-NUMA multi-node configs
  i2c: ismt: Return EMSGSIZE for block reads with bogus length
  i2c: ismt: Don't duplicate the receive length for block reads
  FROMLIST: binder: fix an ret value override
  FROMLIST: binder: fix memory corruption in binder_transaction binder
  Linux 3.18.69
  scsi: sg: reset 'res_in_use' after unlinking reserved array
  scsi: sg: protect accesses to 'reserved' page array
  clk: si5351: Constify clock names and struct regmap_config
  x86/tools: Fix gcc-7 warning in relocs.c
  x86-64: Handle PC-relative relocations on per-CPU data
  arm64: fpsimd: Prevent registers leaking across exec
  arm64: flush FP/SIMD state correctly after execve()
  x86/io: Add "memory" clobber to insb/insw/insl/outsb/outsw/outsl
  mm: cma: fix incorrect type conversion for size during dma allocation
  mm: cma: constify and use correct signness in mm/cma.c
  mm: cma: fix CMA aligned offset calculation
  mm: cma: fix totalcma_pages to include DT defined CMA regions
  mm: cma: split cma-reserved in dmesg log
  mm/cma: make kmemleak ignore CMA regions
  mm: cma: align to physical address, not CMA region position
  lib: bitmap: add alignment offset for bitmap_find_next_zero_area()
  arm64: mm: abort uaccess retries upon fatal signal
  p54: memset(0) whole array
  gcov: support GCC 7.1
  gcov: add support for gcc version >= 6
  gcov: add support for GCC 5.1
  ALSA: au88x0: Fix zero clear of stream->resources
  scsi: isci: avoid array subscript warning
  android: android-base.config: enable IP6_NF_MATCH_RPFILTER
  Linux 3.18.68
  ACPI / APEI: Add missing synchronize_rcu() on NOTIFY_SCI removal
  staging: rtl8188eu: add RNX-N150NUB support
  iio: imu: adis16480: Fix acceleration scale factor for adis16480
  Bluetooth: bnep: fix possible might sleep error in bnep_session
  Bluetooth: cmtp: fix possible might sleep error in cmtp_session
  Bluetooth: hidp: fix possible might sleep error in hidp_session_thread
  perf/core: Fix group {cpu,task} validation
  nfsd: Limit end of page list when decoding NFSv4 WRITE
  cifs: return ENAMETOOLONG for overlong names in cifs_open()/cifs_lookup()
  cifs: Fix df output for users with quota limits
  tracing: Fix freeing of filter in create_filter() when set_str is false
  drm: Release driver tracking before making the object available again
  ALSA: hda - Add stereo mic quirk for Lenovo G50-70 (17aa:3978)
  ALSA: core: Fix unexpected error at replacing user TLV
  Input: trackpoint - add new trackpoint firmware ID
  net_sched: fix order of queue length updates in qdisc_replace()
  net: sched: fix NULL pointer dereference when action calls some targets
  irda: do not leak initialized list.dev to userspace
  tcp: when rearming RTO, if RTO time is in past then fire RTO ASAP
  sctp: fully initialize the IPv6 address in sctp_v6_to_addr()
  dccp: defer ccid_hc_tx_delete() at dismantle time
  dccp: purge write queue in dccp_destroy_sock()
  FROMLIST: f2fs: introduce discard_granularity sysfs entry
  FROMLIST: f2fs: use IPU for cold files
  FROMLIST: f2fs: make background threads of f2fs being aware of freezing
  Linux 3.18.67
  usb: qmi_wwan: add D-Link DWM-222 device ID
  pids: make task_tgid_nr_ns() safe
  Sanitize 'move_pages()' permission checks
  irqchip/atmel-aic: Fix unbalanced refcount in aic_common_rtc_irq_fixup()
  irqchip/atmel-aic: Fix unbalanced of_node_put() in aic_common_irq_fixup()
  mm/mempolicy: fix use after free when calling get_mempolicy
  ALSA: usb-audio: Apply sample rate quirk to Sennheiser headset
  parisc: pci memory bar assignment fails with 64bit kernels on dino/cujo
  audit: Fix use after free in audit_remove_watch_rule()
  netfilter: nf_ct_ext: fix possible panic after nf_ct_extend_unregister
  ANDROID: check dir value of xfrm_userpolicy_id

Conflicts:
	drivers/net/usb/qmi_wwan.c
	drivers/staging/android/fiq_debugger/fiq_debugger.c
	drivers/usb/core/quirks.c
	drivers/usb/serial/option.c
	include/linux/cma.h
	mm/cma.c
	net/netfilter/xt_qtaguid.c
	sound/usb/quirks.c

USB related changes were ignored as per feedback
from respective teams.
One patch set(https://www.spinics.net/lists/kernel/msg2592695.html

)
is ignored in this merge, as with this patch, we observe kernel
crash.

Change-Id: Ie3c2b3671d61902d9d66edd89ebda76370d5062c
Signed-off-by: default avatarJitendra Sharma <shajit@codeaurora.org>
parents 9fdbd92e 7a365d34

Documentation/ABI/testing/sysfs-fs-f2fs

+9 −0
Original line number Diff line number Diff line
@@ -57,6 +57,15 @@ Contact: "Jaegeuk Kim" <jaegeuk.kim@samsung.com> 
Description:

		 Controls the issue rate of small discard commands.



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

Date:          July 2017

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

Description:

		Controls discard granularity of inner discard thread, inner thread

		will not issue discards with size that is smaller than granularity.

		The unit size is one block, now only support configuring in range

		of [1, 512].



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

Date:		January 2014

Contact:	"Jaegeuk Kim" <jaegeuk.kim@samsung.com>

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 66

SUBLEVEL = 71

EXTRAVERSION =

NAME = Diseased Newt

android/configs/android-base.cfg

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ CONFIG_INET_XFRM_MODE_TUNNEL=y 
CONFIG_IP6_NF_FILTER=y

CONFIG_IP6_NF_IPTABLES=y

CONFIG_IP6_NF_MANGLE=y

CONFIG_IP6_NF_MATCH_RPFILTER=y

CONFIG_IP6_NF_RAW=y

CONFIG_IP6_NF_TARGET_REJECT=y

CONFIG_IPV6=y

arch/arm/mm/fault.c

+4 −1
Original line number Diff line number Diff line
@@ -319,8 +319,11 @@ retry: 
	 * signal first. We do not need to release the mmap_sem because

	 * it would already be released in __lock_page_or_retry in

	 * mm/filemap.c. */

	if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current))

	if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current)) {

		if (!user_mode(regs))

			goto no_context;

		return 0;

	}



	/*

	 * Major/minor page fault accounting is only done on the

arch/arm64/kernel/fpsimd.c

+2 −0
Original line number Diff line number Diff line
@@ -202,9 +202,11 @@ void fpsimd_thread_switch(struct task_struct *next) 


void fpsimd_flush_thread(void)

{

	preempt_disable();

	memset(&current->thread.fpsimd_state, 0, sizeof(struct fpsimd_state));

	fpsimd_flush_task_state(current);

	set_thread_flag(TIF_FOREIGN_FPSTATE);

	preempt_enable();

}



/*