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

Commit ef5ecfe4 authored by Kyle Yan's avatar Kyle Yan
Browse files

Merge remote-tracking branch 'origin/tmp-3e5de27e' into msm-4.8



* origin/tmp-3e5de27e:
  Linux 4.9-rc8
  mm, vmscan: add cond_resched() into shrink_node_memcg()
  mm: workingset: fix NULL ptr in count_shadow_nodes
  kbuild: fix building bzImage with CONFIG_TRIM_UNUSED_KSYMS enabled
  net: avoid signed overflows for SO_{SND|RCV}BUFFORCE
  geneve: avoid use-after-free of skb->data
  tipc: check minimum bearer MTU
  net: renesas: ravb: unintialized return value
  sh_eth: remove unchecked interrupts for RZ/A1
  net: bcmgenet: Utilize correct struct device for all DMA operations
  Fix up a couple of field names in the CREDITS file
  NET: usb: qmi_wwan: add support for Telit LE922A PID 0x1040
  cdc_ether: Fix handling connection notification
  ip6_offload: check segs for NULL in ipv6_gso_segment.
  RDS: TCP: unregister_netdevice_notifier() in error path of rds_tcp_init_net
  Revert: "ip6_tunnel: Update skb->protocol to ETH_P_IPV6 in ip6_tnl_xmit()"
  ipv6: Set skb->protocol properly for local output
  ipv4: Set skb->protocol properly for local output
  packet: fix race condition in packet_set_ring
  net: ethernet: altera: TSE: do not use tx queue lock in tx completion handler
  net: ethernet: altera: TSE: Remove unneeded dma sync for tx buffers
  default exported asm symbols to zero
  arm64: dts: juno: fix cluster sleep state entry latency on all SoC versions
  net: ethernet: stmmac: fix of-node and fixed-link-phydev leaks
  net: ethernet: stmmac: platform: fix outdated function header
  net: ethernet: stmmac: dwmac-meson8b: fix probe error path
  net: ethernet: stmmac: dwmac-generic: fix probe error path
  net: ethernet: stmmac: dwmac-rk: fix probe error path
  net: ethernet: stmmac: dwmac-sti: fix probe error path
  net: ethernet: stmmac: dwmac-socfpga: fix use-after-free on probe errors
  net/rtnetlink: fix attribute name in nlmsg_size() comments
  ixgbe/ixgbevf: Don't use lco_csum to compute IPv4 checksum
  igb/igbvf: Don't use lco_csum to compute IPv4 checksum
  net: asix: Fix AX88772_suspend() USB vendor commands failure issues
  kbuild: make sure autoksyms.h exists early
  KVM: use after free in kvm_ioctl_create_device()
  can: peak: Add support for PCAN-USB X6 USB interface
  can: peak: Fix bittiming fields size in bits
  mm: fix false-positive WARN_ON() in truncate/invalidate for hugetlb
  kasan: support use-after-scope detection
  kasan: update kasan_global for gcc 7
  lib/debugobjects: export for use in modules
  zram: fix unbalanced idr management at hot removal
  thp: fix corner case of munlock() of PTE-mapped THPs
  mm, thp: propagation of conditional compilation in khugepaged.c
  arm64: dts: juno: Correct PCI IO window
  macvtap: handle ubuf refcount correctly when meet errors
  tun: handle ubuf refcount correctly when meet errors
  net: ethernet: ti: cpsw: fix ASSERT_RTNL() warning during resume
  bpf: fix states equal logic for varlen access
  netfilter: arp_tables: fix invoking 32bit "iptable -P INPUT ACCEPT" failed in 64bit kernel
  l2tp: fix address test in __l2tp_ip6_bind_lookup()
  l2tp: fix lookup for sockets not bound to a device in l2tp_ip
  l2tp: fix racy socket lookup in l2tp_ip and l2tp_ip6 bind()
  l2tp: hold socket before dropping lock in l2tp_ip{, 6}_recv()
  l2tp: lock socket before checking flags in connect()
  cxgb4: Add PCI device ID for new adapter
  isofs: add KERN_CONT to printing of ER records
  net: fec: cache statistics while device is down
  vxlan: fix a potential issue when create a new vxlan fdb entry.
  Input: change KEY_DATA from 0x275 to 0x277
  openvswitch: Fix skb leak in IPv6 reassembly.
  esp6: Fix integrity verification when ESN are used
  esp4: Fix integrity verification when ESN are used
  drm/i915: drop the struct_mutex when wedged or trying to reset
  drm/i915: Don't touch NULL sg on i915_gem_object_get_pages_gtt() error
  xfrm_user: fix return value from xfrm_user_rcv_msg
  drm: Don't call drm_for_each_crtc with a non-KMS driver
  net: dsa: slave: fix fixed-link phydev leaks
  net: ethernet: ti: davinci_emac: fix fixed-link phydev and of-node leaks
  net: ethernet: dwc_eth_qos: fix fixed-link phydev leaks
  net: ethernet: renesas: ravb: fix fixed-link phydev leaks
  net: ethernet: mediatek: fix fixed-link phydev leaks
  net: ethernet: marvell: mvneta: fix fixed-link phydev leaks
  net: ethernet: ucc_geth: fix fixed-link phydev leaks
  net: ethernet: gianfar: fix fixed-link phydev leaks
  net: ethernet: fs_enet: fix fixed-link phydev leaks
  net: ethernet: fec: fix fixed-link phydev leaks
  net: ethernet: bcmgenet: fix fixed-link phydev leaks
  net: ethernet: bcmsysport: fix fixed-link phydev leaks
  net: ethernet: aurora: nb8800: fix fixed-link phydev leaks
  net: ethernet: altera: fix fixed-link phydev leaks
  of_mdio: add helper to deregister fixed-link PHYs
  net: dsa: slave: fix of-node leak and phy priority
  GSO: Reload iph after pskb_may_pull
  sched: cls_flower: remove from hashtable only in case skip sw flag is not set
  net/dccp: fix use-after-free in dccp_invalid_packet
  net: macb: ensure ordering write to re-enable RX smoothly
  net: macb: fix the RX queue reset in macb_rx()
  netlink: Call cb->done from a worker thread
  net/sched: pedit: make sure that offset is valid
  Re-enable CONFIG_MODVERSIONS in a slightly weaker form
  netfilter: ipv6: nf_defrag: drop mangled skb on ream error
  Revert "i2c: octeon: thunderx: Limit register access retries"
  ARC: mm: PAE40: Fix crash at munmap
  mremap: move_ptes: check pte dirty after its removal
  pwm: Fix device reference leak
  drm/radeon: fix check for port PM availability
  drm/amdgpu: fix check for port PM availability
  ovl: fix d_real() for stacked fs
  CIFS: iterate over posix acl xattr entry correctly in ACL_to_cifs_posix()
  Call echo service immediately after socket reconnect
  CIFS: Fix BUG() in calc_seckey()
  drm/amd/powerplay: initialize the soft_regs offset in struct smu7_hwmgr
  bpf/samples: Fix PT_REGS_IP on s390x and use it
  net: dsa: fix unbalanced dsa_switch_tree reference counting
  net: handle no dst on skb in icmp6_send
  dbri: Fix compiler warning
  qlogicpti: Fix compiler warnings
  net/mlx4: Fix uninitialized fields in rule when adding promiscuous mode to device managed flow steering
  Revert "net/mlx4_en: Avoid unregister_netdev at shutdown flow"
  net/sched: Export tc_tunnel_key so its UAPI accessible
  amd-xgbe: Fix unused suspend handlers build warning
  ARC: mm: IOC: Don't enable IOC by default
  ARC: Don't use "+l" inline asm constraint
  tcp: Set DEFAULT_TCP_CONG to bbr if DEFAULT_BBR is set
  net: phy: realtek: fix enabling of the TX-delay for RTL8211F
  Documentation: devicetree: clarify usage of the RGMII phy-modes
  net, sched: respect rcu grace period on cls destruction
  tipc: fix link statistics counter errors
  driver: macvtap: Unregister netdev rx_handler if macvtap_newlink fails
  net: qcom/emac: fix of_node and phydev leaks
  net: fsl/fman: fix fixed-link-phydev reference leak
  net: fsl/fman: fix phydev reference leak
  net: bcmgenet: fix phydev reference leak
  net: dsa: fix fixed-link-phy device leaks
  irda: fix overly long udelay()
  driver: ipvlan: Fix one possible memleak in ipvlan_link_new
  drm: hdlcd: Fix cleanup order
  netfilter: nat: fix crash when conntrack entry is re-used
  netfilter: nft_range: add the missing NULL pointer check
  netfilter: nf_tables: fix inconsistent element expiration calculation
  netfilter: nat: switch to new rhlist interface
  netfilter: nat: fix cmp return value
  netfilter: nft_hash: validate maximum value of u32 netlink hash attribute
  KVM: arm/arm64: vgic: Don't notify EOI for non-SPIs
  netfilter: fix nf_conntrack_helper documentation
  netfilter: Update nf_send_reset6 to consider L3 domain
  netfilter: Update ip_route_me_harder to consider L3 domain
  clk: bcm: Fix unmet Kconfig dependencies for CLK_BCM_63XX
  PCI: Set Read Completion Boundary to 128 iff Root Port supports it (_HPX)
  PCI: Export pcie_find_root_port
  clk: sunxi-ng: enable so-said LDOs for A33 SoC's pll-mipi clock
  ARM: dts: STiH407-family: fix i2c nodes
  flowcache: Increase threshold for refusing new allocations
  scsi: be2iscsi: allocate enough memory in beiscsi_boot_get_sinfo()
  scsi: mpt3sas: Unblock device after controller reset
  scsi: hpsa: use bus '3' for legacy HBA devices
  ARM: gr8: Rename the DTSI and relevant DTS
  clk: sunxi-ng: sun6i-a31: Enable PLL-MIPI LDOs when ungating it
  ahci: always fall back to single-MSI mode
  xfrm: unbreak xfrm_sk_policy_lookup
  scsi: libfc: fix seconds_since_last_reset miscalculation
  mwifiex: printk() overflow with 32-byte SSIDs
  Input: psmouse - disable automatic probing of BYD touchpads
  PCI: designware-plat: Update author email
  PCI: designware: Change maintainer to Joao Pinto
  MAINTAINERS: Add devicetree binding to PCI i.MX6 entry
  MAINTAINERS: Update Richard Zhu's email address
  libata-scsi: Fixup ata_gen_passthru_sense()
  mvsas: fix error return code in mvs_task_prep()
  pwm: meson: Add missing spin_lock_init()
  vti6: flush x-netns xfrm cache when vti interface is removed

Change-Id: I055dd31e2827d41c82aa2c23ec9772ec536e0c0b
Signed-off-by: default avatarKyle Yan <kyan@codeaurora.org>
parents 745af210 3e5de27e
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@
			Linus
----------

M: Matt Mackal
N: Matt Mackal
E: mpm@selenic.com
D: SLOB slab allocator

@@ -1910,7 +1910,7 @@ S: Ra'annana, Israel

N: Andi Kleen
E: andi@firstfloor.org
U: http://www.halobates.de
W: http://www.halobates.de
D: network, x86, NUMA, various hacks
S: Schwalbenstr. 96
S: 85551 Ottobrunn
@@ -2089,8 +2089,8 @@ D: ST Microelectronics SPEAr13xx PCI host bridge driver
D: Synopsys Designware PCI host bridge driver

N: Gabor Kuti
M: seasons@falcon.sch.bme.hu
M: seasons@makosteszta.sote.hu
E: seasons@falcon.sch.bme.hu
E: seasons@makosteszta.sote.hu
D: Original author of software suspend

N: Jaroslav Kysela
+20 −4
Original line number Diff line number Diff line
@@ -9,10 +9,26 @@ The following properties are common to the Ethernet controllers:
- max-speed: number, specifies maximum speed in Mbit/s supported by the device;
- max-frame-size: number, maximum transfer unit (IEEE defined MTU), rather than
  the maximum frame size (there's contradiction in ePAPR).
- phy-mode: string, operation mode of the PHY interface; supported values are
  "mii", "gmii", "sgmii", "qsgmii", "tbi", "rev-mii", "rmii", "rgmii", "rgmii-id",
  "rgmii-rxid", "rgmii-txid", "rtbi", "smii", "xgmii", "trgmii"; this is now a
  de-facto standard property;
- phy-mode: string, operation mode of the PHY interface. This is now a de-facto
  standard property; supported values are:
  * "mii"
  * "gmii"
  * "sgmii"
  * "qsgmii"
  * "tbi"
  * "rev-mii"
  * "rmii"
  * "rgmii" (RX and TX delays are added by the MAC when required)
  * "rgmii-id" (RGMII with internal RX and TX delays provided by the PHY, the
     MAC should not add the RX or TX delays in this case)
  * "rgmii-rxid" (RGMII with internal RX delay provided by the PHY, the MAC
     should not add an RX delay in this case)
  * "rgmii-txid" (RGMII with internal TX delay provided by the PHY, the MAC
     should not add an TX delay in this case)
  * "rtbi"
  * "smii"
  * "xgmii"
  * "trgmii"
- phy-connection-type: the same as "phy-mode" property but described in ePAPR;
- phy-handle: phandle, specifies a reference to a node representing a PHY
  device; this property is described in ePAPR and so preferred;
+5 −2
Original line number Diff line number Diff line
@@ -62,10 +62,13 @@ nf_conntrack_generic_timeout - INTEGER (seconds)
	protocols.

nf_conntrack_helper - BOOLEAN
	0 - disabled
	not 0 - enabled (default)
	0 - disabled (default)
	not 0 - enabled

	Enable automatic conntrack helper assignment.
	If disabled it is required to set up iptables rules to assign
	helpers to connections.  See the CT target description in the
	iptables-extensions(8) man page for further information.

nf_conntrack_icmp_timeout - INTEGER (seconds)
	default 30
+4 −9
Original line number Diff line number Diff line
@@ -9257,11 +9257,12 @@ S: Maintained
F:	drivers/pci/host/*layerscape*

PCI DRIVER FOR IMX6
M:	Richard Zhu <Richard.Zhu@freescale.com>
M:	Richard Zhu <hongxing.zhu@nxp.com>
M:	Lucas Stach <l.stach@pengutronix.de>
L:	linux-pci@vger.kernel.org
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
F:	drivers/pci/host/*imx6*

PCI DRIVER FOR TI KEYSTONE
@@ -9320,17 +9321,11 @@ F: drivers/pci/host/pci-exynos.c

PCI DRIVER FOR SYNOPSIS DESIGNWARE
M:	Jingoo Han <jingoohan1@gmail.com>
M:	Pratyush Anand <pratyush.anand@gmail.com>
L:	linux-pci@vger.kernel.org
S:	Maintained
F:	drivers/pci/host/*designware*

PCI DRIVER FOR SYNOPSYS PROTOTYPING DEVICE
M:	Jose Abreu <Jose.Abreu@synopsys.com>
M:	Joao Pinto <Joao.Pinto@synopsys.com>
L:	linux-pci@vger.kernel.org
S:	Maintained
F:	Documentation/devicetree/bindings/pci/designware-pcie.txt
F:	drivers/pci/host/pcie-designware-plat.c
F:	drivers/pci/host/*designware*

PCI DRIVER FOR GENERIC OF HOSTS
M:	Will Deacon <will.deacon@arm.com>
+9 −4
Original line number Diff line number Diff line
VERSION = 4
PATCHLEVEL = 9
SUBLEVEL = 0
EXTRAVERSION = -rc7
EXTRAVERSION = -rc8
NAME = Psychotic Stoned Sheep

# *DOCUMENTATION*
@@ -611,6 +611,13 @@ else
include/config/auto.conf: ;
endif # $(dot-config)

# For the kernel to actually contain only the needed exported symbols,
# we have to build modules as well to determine what those symbols are.
# (this can be evaluated only once include/config/auto.conf has been included)
ifdef CONFIG_TRIM_UNUSED_KSYMS
  KBUILD_MODULES := 1
endif

# The all: target is the default when no target is given on the
# command line.
# This allow a user to issue only 'make' to build a kernel including modules
@@ -948,7 +955,7 @@ ifdef CONFIG_GDB_SCRIPTS
endif
ifdef CONFIG_TRIM_UNUSED_KSYMS
	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \
	  "$(MAKE) KBUILD_MODULES=1 -f $(srctree)/Makefile vmlinux_prereq"
	  "$(MAKE) -f $(srctree)/Makefile vmlinux"
endif

# standalone target for easier testing
@@ -1023,8 +1030,6 @@ prepare2: prepare3 prepare-compiler-check outputmakefile asm-generic
prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
                   include/config/auto.conf
	$(cmd_crmodverdir)
	$(Q)test -e include/generated/autoksyms.h || \
	    touch   include/generated/autoksyms.h

archprepare: archheaders archscripts prepare1 scripts_basic

Loading