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

Commit d371353c authored by Runmin Wang's avatar Runmin Wang
Browse files

Merge remote-tracking branch 'remotes/origin/tmp-33d930e5' into msm-next



* remotes/origin/tmp-33d930e5:
  Linux 4.14-rc5
  x86/microcode: Do the family check first
  locking/lockdep: Disable cross-release features for now
  x86/mm: Flush more aggressively in lazy TLB mode
  mm, swap: use page-cluster as max window of VMA based swap readahead
  mm: page_vma_mapped: ensure pmd is loaded with READ_ONCE outside of lock
  kmemleak: clear stale pointers from task stacks
  fs/binfmt_misc.c: node could be NULL when evicting inode
  fs/mpage.c: fix mpage_writepage() for pages with buffers
  linux/kernel.h: add/correct kernel-doc notation
  tty: fall back to N_NULL if switching to N_TTY fails during hangup
  Revert "vmalloc: back off when the current task is killed"
  mm/cma.c: take __GFP_NOWARN into account in cma_alloc()
  scripts/kallsyms.c: ignore symbol type 'n'
  userfaultfd: selftest: exercise -EEXIST only in background transfer
  mm: only display online cpus of the numa node
  mm: remove unnecessary WARN_ONCE in page_vma_mapped_walk().
  mm/mempolicy: fix NUMA_INTERLEAVE_HIT counter
  include/linux/of.h: provide of_n_{addr,size}_cells wrappers for !CONFIG_OF
  mm/madvise.c: add description for MADV_WIPEONFORK and MADV_KEEPONFORK
  lib/Kconfig.debug: kernel hacking menu: runtime testing: keep tests together
  mm/migrate: fix indexing bug (off by one) and avoid out of bound access
  iommu/amd: Finish TLB flush in amd_iommu_unmap()
  powerpc/perf: Fix IMC initialization crash
  scripts: fix faddr2line to work on last symbol
  drm/msm: fix _NO_IMPLICIT fencing case
  drm/msm: fix error path cleanup
  device property: preserve usecount for node passed to of_fwnode_graph_get_port_parent()
  drivers: of: increase MAX_RESERVED_REGIONS to 32
  of: do not leak console options
  drm/msm/mdp5: Remove extra pm_runtime_put call in mdp5_crtc_cursor_set()
  drm/msm/dsi: Use correct pm_runtime_put variant during host_init
  x86/apic: Update TSC_DEADLINE quirk with additional SKX stepping
  x86/apic: Silence "FW_BUG TSC_DEADLINE disabled due to Errata" on hypervisors
  drm/msm: fix return value check in _msm_gem_kernel_new()
  drm/msm: use proper memory barriers for updating tail/head
  drm/msm/mdp5: add missing max size for 8x74 v1
  drm/amdgpu: fix placement flags in amdgpu_ttm_bind
  powerpc/perf: Add ___GFP_NOWARN flag to alloc_pages_node()
  powerpc/perf: Fix for core/nest imc call trace on cpuhotplug
  MAINTAINERS: Add Paul Mackerras as maintainer for KVM/powerpc
  KVM: nVMX: fix guest CR4 loading when emulating L2 to L1 exit
  iommu/exynos: Remove initconst attribute to avoid potential kernel oops
  ACPI: properties: Fix __acpi_node_get_property_reference() return codes
  ACPI: properties: Align return codes of __acpi_node_get_property_reference()
  remoteproc: imx_rproc: fix return value check in imx_rproc_addr_init()
  drm/i915/bios: parse DDI ports also for CHV for HDMI DDC pin and DP AUX channel
  xfs: handle error if xfs_btree_get_bufs fails
  xfs: reinit btree pointer on attr tree inactivation walk
  xfs: Fix bool initialization/comparison
  xfs: don't change inode mode if ACL update fails
  xfs: move more RT specific code under CONFIG_XFS_RT
  xfs: Don't log uninitialised fields in inode structures
  9p: set page uptodate when required in write_end()
  x86/mm: Disable various instrumentations of mm/mem_encrypt.c and mm/tlb.c
  ALSA: caiaq: Fix stray URB at probe error path
  HID: hid-elecom: extend to fix descriptor for HUGE trackball
  HID: usbhid: fix out-of-bounds bug
  livepatch: unpatch all klp_objects if klp_module_coming fails
  usb: usbtest: fix NULL pointer dereference
  usb: gadget: configfs: Fix memory leak of interface directory data
  usb: gadget: composite: Fix use-after-free in usb_composite_overwrite_options
  usb: misc: usbtest: Fix overflow in usbtest_do_ioctl()
  usb: renesas_usbhs: Fix DMAC sequence for receiving zero-length packet
  USB: dummy-hcd: Fix deadlock caused by disconnect detection
  usb: phy: tegra: Fix phy suspend for UDC
  gpu: ipu-v3: pre: implement workaround for ERR009624
  gpu: ipu-v3: prg: wait for double buffers to be filled on channel startup
  gpu: ipu-v3: Allow channel burst locking on i.MX6 only
  ALSA: seq: Fix use-after-free at creating a port
  bio_copy_user_iov(): don't ignore ->iov_offset
  more bio_map_user_iov() leak fixes
  fix unbalanced page refcounting in bio_map_user_iov
  direct-io: Prevent NULL pointer access in submit_page_section
  PCI: aardvark: Move to struct pci_host_bridge IRQ mapping functions
  Revert "PCI: tegra: Do not allocate MSI target memory"
  seccomp: make function __get_seccomp_filter static
  remoteproc: qcom: fix RPMSG_QCOM_GLINK_SMEM dependencies
  remoteproc: imx_rproc: fix a couple off by one bugs
  rpmsg: glink: Fix memory leak in qcom_glink_alloc_intent()
  rpmsg: glink: Unlock on error in qcom_glink_request_intent()
  iommu/amd: Do not disable SWIOTLB if SME is active
  crypto: shash - Fix zero-length shash ahash digest crash
  quota: Generate warnings for DQUOT_SPACE_NOFAIL allocations
  KVM: MMU: always terminate page walks at level 1
  KVM: nVMX: update last_nonleaf_level when initializing nested EPT
  xen/vcpu: Use a unified name about cpu hotplug state for pv and pvhvm
  ALSA: usb-audio: Kill stray URB at exiting
  x86/hyperv: Fix hypercalls with extended CPU ranges for TLB flushing
  x86/hyperv: Don't use percpu areas for pcpu_flush/pcpu_flush_ex structures
  x86/hyperv: Clear vCPU banks between calls to avoid flushing unneeded vCPUs
  perf/x86/intel/uncore: Fix memory leaks on allocation failures
  x86/unwind: Disable unwinder warnings on 32-bit
  x86/unwind: Align stack pointer in unwinder dump
  x86/unwind: Use MSB for frame pointer encoding on 32-bit
  x86/unwind: Fix dereference of untrusted pointer
  powerpc: Don't call lockdep_assert_cpus_held() from arch_update_cpu_topology()
  powerpc/lib/sstep: Fix count leading zeros instructions
  sched/core: Ensure load_balance() respects the active_mask
  sched/core: Address more wake_affine() regressions
  sched/core: Fix wake_affine() performance regression
  perf/core: Fix cgroup time when scheduling descendants
  perf/core: Avoid freeing static PMU contexts when PMU is unregistered
  locking/selftest: Avoid false BUG report
  locking/lockdep: Fix stacktrace mess
  powerpc/livepatch: Fix livepatch stack access
  device property: Track owner device of device property
  waitid(): Add missing access_ok() checks
  cdc_ether: flag the u-blox TOBY-L2 and SARA-U2 as wwan
  tools include uapi bpf.h: Sync kernel ABI header with tooling header
  perf pmu: Unbreak perf record for arm/arm64 with events with explicit PMU
  net: thunderx: mark expected switch fall-throughs in nicvf_main()
  drm/i915: Read timings from the correct transcoder in intel_crtc_mode_get()
  drm/i915: Order two completing nop_submit_request
  drm/i915: Silence compiler warning for hsw_power_well_enable()
  drm/i915: Use crtc_state_is_legacy_gamma in intel_color_check
  drm/i915/edp: Increase the T12 delay quirk to 1300ms
  drm/i915/edp: Get the Panel Power Off timestamp after panel is off
  udp: fix bcast packet reception
  netlink: do not set cb_running if dump's start() errs
  ipv4: Fix traffic triggered IPsec connections.
  ipv6: Fix traffic triggered IPsec connections.
  sync_file: Return consistent status in SYNC_IOC_FILE_INFO
  ixgbe: incorrect XDP ring accounting in ethtool tx_frame param
  net: ixgbe: Use new PCI_DEV_FLAGS_NO_RELAXED_ORDERING flag
  Revert commit 1a8b6d76 ("net:add one common config...")
  ixgbe: fix masking of bits read from IXGBE_VXLANCTRL register
  ixgbe: Return error when getting PHY address if PHY access is not supported
  MIPS: math-emu: Remove pr_err() calls from fpu_emu()
  MIPS: Fix generic-board-config.sh for builds using O=
  MIPS: Fix cmpxchg on 32b signed ints for 64b kernel with !kernel_uses_llsc
  ALSA: line6: Fix leftover URB at error-path during probe
  ALSA: line6: Fix NULL dereference at podhd_disconnect()
  ALSA: line6: Fix missing initialization before error path
  netfilter: xt_bpf: Fix XT_BPF_MODE_FD_PINNED mode of 'xt_bpf_info_v1'
  MIPS: loongson1: set default number of rx and tx queues for stmmac
  MIPS: bpf: Fix uninitialised target compiler error
  drm/atomic: Unref duplicated drm_atomic_state in drm_atomic_helper_resume()
  ALSA: seq: Fix copy_from_user() call inside lock
  ALSA: usb-audio: Add sample rate quirk for Plantronics P610
  x86/alternatives: Fix alt_max_short macro to really be a max()
  x86/mm/64: Fix reboot interaction with CR4.PCIDE
  genirq/cpuhotplug: Enforce affinity setting on startup of managed irqs
  genirq/cpuhotplug: Add sanity check for effective affinity mask
  genirq: Warn when effective affinity is not updated
  netfilter: SYNPROXY: skip non-tcp packet in {ipv4, ipv6}_synproxy_hook
  USB: serial: console: fix use-after-free after failed setup
  USB: serial: console: fix use-after-free on disconnect
  tipc: Unclone message at secondary destination lookup
  tipc: correct initialization of skb list
  gso: fix payload length when gso_size is zero
  mlxsw: spectrum_router: Avoid expensive lookup during route removal
  pinctrl: cherryview: fix issues caused by dynamic gpio irqs mapping
  bpf: fix liveness marking
  doc: Fix typo "8023.ad" in bonding documentation
  ipv6: fix net.ipv6.conf.all.accept_dad behaviour for real
  gpio: omap: Fix lost edge interrupts
  crypto: skcipher - Fix crash on zero-length input
  crypto: shash - Fix a sleep-in-atomic bug in shash_setkey_unaligned
  crypto: xts - Fix an error handling path in 'create()'
  crypto: stm32 - Try to fix hash padding
  ppp: fix race in ppp device destruction
  netfilter: x_tables: avoid stack-out-of-bounds read in xt_copy_counters_from_user
  netfilter: nf_tables: do not dump chain counters if not enabled
  perf script: Add missing separator for "-F ip,brstack" (and brstackoff)
  powerpc/tm: Fix illegal TM state in signal handler
  powerpc/64s: Use emergency stack for kernel TM Bad Thing program checks
  selftests/net: rxtimestamp: Fix an off by one
  nfsd4: define nfsd4_secinfo_no_name_release()
  selftests: mqueue: fix regression in silencing output from RUN_TESTS
  selftests: x86: sysret_ss_attrs doesn't build on a PIE build
  perf callchain: Compare dsos (as well) for CCKEY_FUNCTION
  x86/mce: Hide mca_cfg
  RAS/CEC: Use the right length for "cec_disable"
  NFSv4/pnfs: Fix an infinite layoutget loop
  nl80211: Define policy for packet pattern attributes
  binder: fix use-after-free in binder_transaction()
  Drivers: hv: vmbus: Fix bugs in rescind handling
  mei: me: add gemini lake devices id
  mei: always use domain runtime pm callbacks.
  objtool: Upgrade libelf-devel warning to error for CONFIG_ORC_UNWINDER
  kprobes/x86: Remove IRQ disabling from jprobe handlers
  kprobes/x86: Set up frame pointer in kprobe trampoline
  f2fs: fix potential panic during fstrim
  USB: serial: qcserial: add Dell DW5818, DW5819
  netfilter: nf_tables: Release memory obtained by kasprintf
  nfs/filelayout: fix oops when freeing filelayout segment
  sunrpc: remove redundant initialization of sock
  NFS: Fix uninitialized rpc_wait_queue
  NFS: Cleanup error handling in nfs_idmap_request_key()
  nfs: RPC_MAX_AUTH_SIZE is in bytes
  netfilter: ebtables: fix race condition in frame_filter_net_init()
  netfilter: nf_tables: fix update chain error
  netfilter: ipset: Fix race between dump and swap
  dmaengine: altera: fix spinlock usage
  dmaengine: altera: fix response FIFO emptying
  xfrm: don't call xfrm_policy_cache_flush under xfrm_state_lock
  pinctrl/amd: Fix build dependency on pinmux code
  netfilter: ipset: pernet ops must be unregistered last
  netfilter: ipset: Fix adding an IPv4 range containing more than 2^31 addresses
  netfilter: xt_socket: Restore mark from full sockets only
  netfilter: ipvs: full-functionality option for ECN encapsulation in tunnel
  crypto: axis - hide an unused variable
  dmaengine: ti-dma-crossbar: Fix possible race condition with dma_inuse
  dmaengine: edma: Align the memcpy acnt array size with the transfer
  pinctrl: bcm2835: fix build warning in bcm2835_gpio_irq_handle_bank
  gpio: omap: omap_gpio_show_rev is not __init
  USB: serial: cp210x: add support for ELV TFD500
  gpio: acpi: work around false-positive -Wstring-overflow warning
  gpio: thunderx: select IRQ_DOMAIN_HIERARCHY instead of depends on
  USB: serial: cp210x: fix partnum regression
  MAINTAINERS: associate linux/fs.h with VFS instead of file locking
  USB: serial: option: add support for TP-Link LTE module
  USB: serial: ftdi_sio: add id for Cypress WICED dev board
  vti: fix NULL dereference in xfrm_input()
  xfrm: Fix negative device refcount on offload failure.
  xfrm: Fix deletion of offloaded SAs on failure.

  Conflicts:
	lib/Kconfig.debug

Change-Id: I4188c5b0f29b19e9470116f26ca8da2622b8d250
Signed-off-by: default avatarRunmin Wang <runminw@codeaurora.org>
parents d0c80e68 33d930e5
Loading
Loading
Loading
Loading
+0 −10
Original line number Original line Diff line number Diff line
@@ -14,13 +14,3 @@ Description: Enable/disable VMA based swap readahead.
		still used for tmpfs etc. other users.  If set to
		still used for tmpfs etc. other users.  If set to
		false, the global swap readahead algorithm will be
		false, the global swap readahead algorithm will be
		used for all swappable pages.
		used for all swappable pages.

What:		/sys/kernel/mm/swap/vma_ra_max_order
Date:		August 2017
Contact:	Linux memory management mailing list <linux-mm@kvack.org>
Description:	The max readahead size in order for VMA based swap readahead

		VMA based swap readahead algorithm will readahead at
		most 1 << max_order pages for each readahead.  The
		real readahead size for each readahead will be scaled
		according to the estimation algorithm.
+1 −1
Original line number Original line Diff line number Diff line
@@ -2387,7 +2387,7 @@ broadcast: Like active-backup, there is not much advantage to this
	and packet type ID), so in a "gatewayed" configuration, all
	and packet type ID), so in a "gatewayed" configuration, all
	outgoing traffic will generally use the same device.  Incoming
	outgoing traffic will generally use the same device.  Incoming
	traffic may also end up on a single device, but that is
	traffic may also end up on a single device, but that is
	dependent upon the balancing policy of the peer's 8023.ad
	dependent upon the balancing policy of the peer's 802.3ad
	implementation.  In a "local" configuration, traffic will be
	implementation.  In a "local" configuration, traffic will be
	distributed across the devices in the bond.
	distributed across the devices in the bond.


+3 −3
Original line number Original line Diff line number Diff line
@@ -5346,9 +5346,7 @@ M: "J. Bruce Fields" <bfields@fieldses.org>
L:	linux-fsdevel@vger.kernel.org
L:	linux-fsdevel@vger.kernel.org
S:	Maintained
S:	Maintained
F:	include/linux/fcntl.h
F:	include/linux/fcntl.h
F:	include/linux/fs.h
F:	include/uapi/linux/fcntl.h
F:	include/uapi/linux/fcntl.h
F:	include/uapi/linux/fs.h
F:	fs/fcntl.c
F:	fs/fcntl.c
F:	fs/locks.c
F:	fs/locks.c


@@ -5357,6 +5355,8 @@ M: Alexander Viro <viro@zeniv.linux.org.uk>
L:	linux-fsdevel@vger.kernel.org
L:	linux-fsdevel@vger.kernel.org
S:	Maintained
S:	Maintained
F:	fs/*
F:	fs/*
F:	include/linux/fs.h
F:	include/uapi/linux/fs.h


FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
M:	Riku Voipio <riku.voipio@iki.fi>
M:	Riku Voipio <riku.voipio@iki.fi>
@@ -7571,7 +7571,7 @@ F: arch/mips/include/asm/kvm*
F:	arch/mips/kvm/
F:	arch/mips/kvm/


KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)
KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)
M:	Alexander Graf <agraf@suse.com>
M:	Paul Mackerras <paulus@ozlabs.org>
L:	kvm-ppc@vger.kernel.org
L:	kvm-ppc@vger.kernel.org
W:	http://www.linux-kvm.org/
W:	http://www.linux-kvm.org/
T:	git git://github.com/agraf/linux-2.6.git
T:	git git://github.com/agraf/linux-2.6.git
+6 −2
Original line number Original line Diff line number Diff line
VERSION = 4
VERSION = 4
PATCHLEVEL = 14
PATCHLEVEL = 14
SUBLEVEL = 0
SUBLEVEL = 0
EXTRAVERSION = -rc4
EXTRAVERSION = -rc5
NAME = Fearless Coyote
NAME = Fearless Coyote


# *DOCUMENTATION*
# *DOCUMENTATION*
@@ -946,7 +946,11 @@ ifdef CONFIG_STACK_VALIDATION
  ifeq ($(has_libelf),1)
  ifeq ($(has_libelf),1)
    objtool_target := tools/objtool FORCE
    objtool_target := tools/objtool FORCE
  else
  else
    $(warning "Cannot use CONFIG_STACK_VALIDATION, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
    ifdef CONFIG_ORC_UNWINDER
      $(error "Cannot generate ORC metadata for CONFIG_ORC_UNWINDER=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
    else
      $(warning "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
    endif
    SKIP_STACK_VALIDATION := 1
    SKIP_STACK_VALIDATION := 1
    export SKIP_STACK_VALIDATION
    export SKIP_STACK_VALIDATION
  endif
  endif
+0 −3
Original line number Original line Diff line number Diff line
@@ -937,9 +937,6 @@ config STRICT_MODULE_RWX
	  and non-text memory will be made non-executable. This provides
	  and non-text memory will be made non-executable. This provides
	  protection against certain security exploits (e.g. writing to text)
	  protection against certain security exploits (e.g. writing to text)


config ARCH_WANT_RELAX_ORDER
	bool

config ARCH_HAS_REFCOUNT
config ARCH_HAS_REFCOUNT
	bool
	bool
	help
	help
Loading