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

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

Merge remote-tracking branch 'remotes/origin/tmp-0b07194b' into msm-next 



* remotes/origin/tmp-0b07194b:
  Linux 4.14-rc7
  selftests: Introduce a new test case to tc testsuite
  selftests: Introduce a new script to generate tc batch file
  net_sched: fix call_rcu() race on act_sample module removal
  net_sched: add rtnl assertion to tcf_exts_destroy()
  net_sched: use tcf_queue_work() in tcindex filter
  net_sched: use tcf_queue_work() in rsvp filter
  net_sched: use tcf_queue_work() in route filter
  net_sched: use tcf_queue_work() in u32 filter
  net_sched: use tcf_queue_work() in matchall filter
  net_sched: use tcf_queue_work() in fw filter
  net_sched: use tcf_queue_work() in flower filter
  net_sched: use tcf_queue_work() in flow filter
  net_sched: use tcf_queue_work() in cgroup filter
  net_sched: use tcf_queue_work() in bpf filter
  net_sched: use tcf_queue_work() in basic filter
  net_sched: introduce a workqueue for RCU callbacks of tc filter
  sctp: fix some type cast warnings introduced since very beginning
  sctp: fix a type cast warnings that causes a_rwnd gets the wrong value
  sctp: fix some type cast warnings introduced by transport rhashtable
  sctp: fix some type cast warnings introduced by stream reconf
  net_sched: avoid matching qdisc with zero handle
  sctp: reset owner sk for data chunks on out queues when migrating a sock
  bpf: rename sk_actions to align with bpf infrastructure
  bpf: bpf_compute_data uses incorrect cb structure
  assoc_array: Fix a buggy node-splitting case
  tap: reference to KVA of an unloaded module causes kernel panic
  tcp: refresh tp timestamp before tcp_mtu_probe()
  tuntap: properly align skb->head before building skb
  Fix tracing sample code warning.
  Input: synaptics-rmi4 - limit the range of what GPIOs are buttons
  Input: gtco - fix potential out-of-bound access
  ip6_gre: update dst pmtu if dev mtu has been updated by toobig in __gre6_xmit
  ip6_gre: only increase err_count for some certain type icmpv6 in ip6gre_err
  ipip: only increase err_count for some certain type icmp in ipip_err
  net: stmmac: First Queue must always be in DCB mode
  net: stmmac: dwc-qos-eth: Fix typo in DT bindings parsing
  Revert "x86/mm: Limit mmap() of /dev/mem to valid physical addresses"
  maintainers: drop Chris Wright from pvops
  arm/xen: don't inclide rwlock.h directly.
  drm/i915/gvt: Adding ACTHD mmio read handler
  drm/i915/gvt: Extract mmio_read_from_hw() common function
  drm/i915/gvt: Refine MMIO_RING_F()
  drm/i915/gvt: properly check per_ctx bb valid state
  Revert "apparmor: add base infastructure for socket mediation"
  SMB3: Validate negotiate request must always be signed
  alpha/PCI: Move pci_map_irq()/pci_swizzle() out of initdata
  i40e: Add programming descriptors to cleaned_count
  i40e: Fix incorrect use of tx_itr_setting when checking for Rx ITR setup
  ixgbe: Fix Tx map failure path
  igb: Fix TX map failure path
  e1000: avoid null pointer dereference on invalid stat type
  e1000: fix race condition between e1000_down() and e1000_watchdog
  xen: fix booting ballooned down hvm guest
  tap: double-free in error path in tap_open()
  tcp: call tcp_rate_skb_sent() when retransmit with unaligned skb->data
  tcp/dccp: fix other lockdep splats accessing ireq_opt
  rds: Fix inaccurate accounting of unsignaled wrs
  rds: ib: Fix uninitialized variable
  net: mvpp2: do not sleep in set_rx_mode
  net: mvpp2: fix invalid parameters order when calling the tcam init
  net: mvpp2: fix typo in the tcam setup
  net/mlx5e: DCBNL, Implement tc with ets type and zero bandwidth
  net/mlx5e: Properly deal with encap flows add/del under neigh update
  net/mlx5: Delay events till mlx5 interface's add complete for pci resume
  net/mlx5: Fix health work queue spin lock to IRQ safe
  tun: allow positive return values on dev_get_valid_name() call
  nfp: refuse offloading filters that redirects to upper devices
  net/unix: don't show information about sockets from other namespaces
  RDMA/netlink: OOPs in rdma_nl_rcv_msg() from misinterpreted flag
  SMB: fix validate negotiate info uninitialised memory use
  SMB: fix leak of validate negotiate info response buffer
  CIFS: Fix NULL pointer deref on SMB2_tcon() failure
  CIFS: do not send invalid input buffer on QUERY_INFO requests
  cifs: Select all required crypto modules
  xen/gntdev: avoid out of bounds access in case of partial gntdev_mmap()
  drm/i915/perf: fix perf enable/disable ioctls with 32bits userspace
  fuse: fix READDIRPLUS skipping an entry
  drm/amd/amdgpu: Remove workaround check for UVD6 on APUs
  efi/libstub/arm: Don't randomize runtime regions when CONFIG_HIBERNATION=y
  efi/efi_test: Prevent an Oops in efi_runtime_query_capsulecaps()
  mac80211: don't compare TKIP TX MIC key in reinstall prevention
  ceph: unlock dangling spinlock in try_flush_caps()
  s390/kvm: fix detection of guest machine checks
  net: dsa: check master device before put
  strparser: Use delayed work instead of timer for msg timeout
  nbd: handle interrupted sendmsg with a sndtimeo set
  Input: elan_i2c - add ELAN0611 to the ACPI table
  ovl: do not cleanup unsupported index entries
  ovl: handle ENOENT on index lookup
  ovl: fix EIO from lookup of non-indexed upper
  PM / QoS: Fix device resume latency PM QoS
  hwmon: (tmp102) Fix first temperature reading
  ALSA: hda - fix headset mic problem for Dell machines with alc236
  perf/x86/intel/bts: Fix exclusive event reference leak
  can: kvaser_usb: Ignore CMD_FLUSH_QUEUE_REPLY messages
  can: kvaser_usb: Correct return value in printout
  can: sun4i: fix loopback mode
  sctp: full support for ipv6 ip_nonlocal_bind & IP_FREEBIND
  net: mvpp2: do not call txq_done from the Tx path when Tx irqs are used
  net: mvpp2: do not unmap TSO headers buffers
  net: mvpp2: fix TSO headers allocation and management
  cdc_ether: flag the Huawei ME906/ME909 as WWAN
  drivers/net/usb: add device id for TP-LINK UE300 USB 3.0 Ethernet
  xfs: fix AIM7 regression
  kbuild: clang: fix build failures with sparse check
  kbuild doc: a bundle of fixes on makefiles.txt
  platform/x86: intel_pmc_ipc: Use spin_lock to protect GCR updates
  platform/x86: intel_pmc_ipc: Use devm_* calls in driver probe function
  sched/swait: Document it clearly that the swait facilities are special and shouldn't be used
  x86/unwind: Show function name+offset in ORC error messages
  x86/entry: Fix idtentry unwind hint
  scsi: Suppress a kernel warning in case the prep function returns BLKPREP_DEFER
  ipsec: Fix aborted xfrm policy dump crash
  tcp/dccp: fix lockdep splat in inet_csk_route_req()
  tcp: do tcp_mstamp_refresh before retransmits on TSQ handler
  x86/cpu/AMD: Apply the Erratum 688 fix when the BIOS doesn't
  drm/amd/powerplay: fix uninitialized variable
  hwmon: (da9052) Increase sample rate when using TSI
  ALSA: hda/realtek - Add support for ALC236/ALC3204
  SUNRPC: Destroy transport from the system workqueue
  nvme-rdma: Fix error status return in tagset allocation failure
  nvme-rdma: Fix possible double free in reconnect flow
  ovl: Return -ENOMEM if an allocation fails ovl_lookup()
  ovl: add NULL check in ovl_alloc_inode
  pinctrl: mcp23s08: fix interrupt handling regression
  pinctrl/amd: fix masking of GPIO interrupts
  nvmet: synchronize sqhd update
  nvme-fc: retry initial controller connections 3 times
  nvme-fc: fix iowait hang
  CIFS: SMBD: Fix the definition for SMB2_CHANNEL_RDMA_V1_INVALIDATE
  cifs: handle large EA requests more gracefully in smb2+
  Fix encryption labels and lengths for SMB3.1.1
  regulator: rn5t618: Do not index regulator_desc arrays by id
  fq_impl: Properly enforce memory limit
  mac80211: validate user rate mask before configuring driver
  cfg80211: fix connect/disconnect edge cases
  mac80211: use constant time comparison with keys
  scsi: sg: Re-fix off by one in sg_fill_request_table()
  scsi: aacraid: Fix controller initialization failure
  scsi: hpsa: Fix configured_logical_drive_count·check
  scsi: qla2xxx: Initialize Work element before requesting IRQs
  scsi: zfcp: fix erp_action use-before-initialize in REC action trace
  spi: fix IDR collision on systems with both fixed and dynamic SPI bus numbers
  SUNRPC: fix a list corruption issue in xprt_release()
  KVM: PPC: Book3S HV: Add more barriers in XIVE load/unload code
  KVM: PPC: Book3S: Protect kvmppc_gpa_to_ua() with SRCU
  KVM: PPC: Book3S HV: POWER9 more doorbell fixes
  KVM: PPC: Fix oops when checking KVM_CAP_PPC_HTM
  spi: bcm-qspi: Fix use after free in bcm_qspi_probe() in error path
  ARC: unbork module link errors with !CONFIG_ARC_HAS_LLSC
  ARC: [plat-hsdk] Increase SDIO CIU frequency to 50000000Hz
  ipsec: Fix dst leak in xfrm_bundle_create().
  workqueue: replace pool->manager_arb mutex with a flag
  spi: a3700: Return correct value on timeout detection
  ARC: [plat-hsdk] select CONFIG_RESET_HSDK from Kconfig
  Makefile: kselftest: fix grammar typo
  kbuild: Fix optimization level choice default
  kbuild: drop unused symverfile in Makefile.modpost
  kbuild: revert $(realpath ...) to $(shell cd ... && /bin/pwd)
  regulator: axp20x: Fix poly-phase bit offset for AXP803 DCDC5/6
  spi: uapi: spidev: add missing ioctl header
  spi: stm32: Fix logical error in stm32_spi_prepare_mbr()
  spi: armada-3700: Fix padding when sending not 4-byte aligned data
  spi: armada-3700: Fix failing commands with quad-SPI

  Conflicts:
		Makefile

Change-Id: I06fa17c404fc626cbefb620a36824596dbc6f21d
Signed-off-by: default avatarRunmin Wang <runminw@codeaurora.org>
parents b2e799c3 0b07194b

Documentation/ABI/testing/sysfs-devices-power

+3 −1
Original line number Diff line number Diff line
@@ -211,7 +211,9 @@ Description: 
		device, after it has been suspended at run time, from a resume

		request to the moment the device will be ready to process I/O,

		in microseconds.  If it is equal to 0, however, this means that

		the PM QoS resume latency may be arbitrary.

		the PM QoS resume latency may be arbitrary and the special value

		"n/a" means that user space cannot accept any resume latency at

		all for the given device.



		Not all drivers support this attribute.  If it isn't supported,

		it is not present.

Documentation/kbuild/makefiles.txt

+18 −13
Original line number Diff line number Diff line
@@ -1108,14 +1108,6 @@ When kbuild executes, the following steps are followed (roughly): 
    ld

	Link target. Often, LDFLAGS_$@ is used to set specific options to ld.



    objcopy

	Copy binary. Uses OBJCOPYFLAGS usually specified in

	arch/$(ARCH)/Makefile.

	OBJCOPYFLAGS_$@ may be used to set additional options.



    gzip

	Compress target. Use maximum compression to compress target.



	Example:

		#arch/x86/boot/Makefile

		LDFLAGS_bootsect := -Ttext 0x0 -s --oformat binary
@@ -1139,6 +1131,19 @@ When kbuild executes, the following steps are followed (roughly): 
	      resulting in the target file being recompiled for no

	      obvious reason.



    objcopy

	Copy binary. Uses OBJCOPYFLAGS usually specified in

	arch/$(ARCH)/Makefile.

	OBJCOPYFLAGS_$@ may be used to set additional options.



    gzip

	Compress target. Use maximum compression to compress target.



	Example:

		#arch/x86/boot/compressed/Makefile

		$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE

			$(call if_changed,gzip)



    dtc

	Create flattened device tree blob object suitable for linking

	into vmlinux. Device tree blobs linked into vmlinux are placed
@@ -1219,7 +1224,7 @@ When kbuild executes, the following steps are followed (roughly): 
	that may be shared between individual architectures.

	The recommended approach how to use a generic header file is

	to list the file in the Kbuild file.

	See "7.3 generic-y" for further info on syntax etc.

	See "7.2 generic-y" for further info on syntax etc.



--- 6.11 Post-link pass
@@ -1299,7 +1304,7 @@ See subsequent chapter for the syntax of the Kbuild file. 
			#arch/x86/include/asm/Kbuild

			generated-y += syscalls_32.h



	--- 7.5 mandatory-y

--- 7.4 mandatory-y



	mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm

	to define the minimum set of headers that must be exported in

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -10179,7 +10179,6 @@ F: Documentation/parport*.txt 


PARAVIRT_OPS INTERFACE

M:	Juergen Gross <jgross@suse.com>

M:	Chris Wright <chrisw@sous-sol.org>

M:	Alok Kataria <akataria@vmware.com>

M:	Rusty Russell <rusty@rustcorp.com.au>

L:	virtualization@lists.linux-foundation.org

Makefile

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

PATCHLEVEL = 14

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Fearless Coyote



# *DOCUMENTATION*
@@ -130,8 +130,8 @@ endif 
ifneq ($(KBUILD_OUTPUT),)

# check that the output directory actually exists

saved-output := $(KBUILD_OUTPUT)

$(shell [ -d $(KBUILD_OUTPUT) ] || mkdir -p $(KBUILD_OUTPUT))

KBUILD_OUTPUT := $(realpath $(KBUILD_OUTPUT))

KBUILD_OUTPUT := $(shell mkdir -p $(KBUILD_OUTPUT) && cd $(KBUILD_OUTPUT) \

								&& /bin/pwd)

$(if $(KBUILD_OUTPUT),, \

     $(error failed to create output directory "$(saved-output)"))
@@ -701,11 +701,11 @@ KBUILD_CFLAGS += $(stackp-flag) 
ifeq ($(cc-name),clang)

ifneq ($(CROSS_COMPILE),)

CLANG_TRIPLE	?= $(CROSS_COMPILE)

CLANG_TARGET	:= -target $(notdir $(CLANG_TRIPLE:%-=%))

CLANG_TARGET	:= --target=$(notdir $(CROSS_COMPILE:%-=%))

GCC_TOOLCHAIN	:= $(realpath $(dir $(shell which $(LD)))/..)

endif

ifneq ($(GCC_TOOLCHAIN),)

CLANG_GCC_TC	:= -gcc-toolchain $(GCC_TOOLCHAIN)

CLANG_GCC_TC	:= --gcc-toolchain=$(GCC_TOOLCHAIN)

endif

KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) -meabi gnu

KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
@@ -1412,7 +1412,7 @@ help: 
	@echo  '                    Build, install, and boot kernel before'

	@echo  '                    running kselftest on it'

	@echo  '  kselftest-clean - Remove all generated kselftest files'

	@echo  '  kselftest-merge - Merge all the config dependencies of kselftest to existed'

	@echo  '  kselftest-merge - Merge all the config dependencies of kselftest to existing'

	@echo  '                    .config.'

	@echo  ''

	@echo 'Userspace tools targets:'

arch/alpha/kernel/sys_alcor.c

+2 −2
Original line number Diff line number Diff line
@@ -181,10 +181,10 @@ alcor_init_irq(void) 
 * comes in on.  This makes interrupt processing much easier.

 */



static int __init

static int

alcor_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

	static char irq_tab[7][5] __initdata = {

	static char irq_tab[7][5] = {

		/*INT    INTA   INTB   INTC   INTD */

		/* note: IDSEL 17 is XLT only */

		{16+13, 16+13, 16+13, 16+13, 16+13},	/* IdSel 17,  TULIP  */