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

Commit 5ffa7b1d authored by Minming Qi's avatar Minming Qi
Browse files

Merge android-4.9.134 (a427932c) into msm-4.9 



* refs/heads/tmp-a427932c:
  Linux 4.9.134
  ipv4: frags: precedence bug in ip_expire()
  ip: frags: fix crash in ip_do_fragment()
  ip: process in-order fragments efficiently
  ip: add helpers to process in-order fragments faster.
  ip: use rb trees for IP frag queue.
  net: add rb_to_skb() and other rb tree helpers
  net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends
  ipv6: defrag: drop non-last frags smaller than min mtu
  net: modify skb_rbtree_purge to return the truesize of all purged skbs.
  net: speed up skb_rbtree_purge()
  ip: discard IPv4 datagrams with overlapping segments.
  inet: frags: fix ip6frag_low_thresh boundary
  inet: frags: get rid of ipfrag_skb_cb/FRAG_CB
  inet: frags: reorganize struct netns_frags
  rhashtable: reorganize struct rhashtable layout
  ipv6: frags: rewrite ip6_expire_frag_queue()
  inet: frags: do not clone skb in ip_expire()
  inet: frags: break the 2GB limit for frags storage
  inet: frags: remove inet_frag_maybe_warn_overflow()
  inet: frags: get rif of inet_frag_evicting()
  inet: frags: remove some helpers
  inet: frags: use rhashtables for reassembly units
  rhashtable: add schedule points
  ipv6: export ip6 fragments sysctl to unprivileged users
  inet: frags: refactor lowpan_net_frag_init()
  inet: frags: refactor ipv6_frag_init()
  inet: frags: refactor ipfrag_init()
  inet: frags: add a pointer to struct netns_frags
  inet: frags: change inet_frags_init_net() return value
  inet: make sure to grab rcu_read_lock before using ireq->ireq_opt
  tcp/dccp: fix lockdep issue when SYN is backlogged
  rtnl: limit IFLA_NUM_TX_QUEUES and IFLA_NUM_RX_QUEUES to 4096
  net: systemport: Fix wake-up interrupt race during resume
  net: mvpp2: Extract the correct ethtype from the skb for tx csum offload
  net: dsa: bcm_sf2: Fix unbind ordering
  team: Forbid enslaving team device to itself
  qmi_wwan: Added support for Gemalto's Cinterion ALASxx WWAN interface
  qlcnic: fix Tx descriptor corruption on 82xx devices
  net/usb: cancel pending work when unbinding smsc75xx
  netlabel: check for IPV4MASK in addrinfo_get
  net/ipv6: Display all addresses in output of /proc/net/if_inet6
  net: ipv4: update fnhe_pmtu when first hop's MTU changes
  net: hns: fix for unmapping problem when SMMU is on
  net: dsa: bcm_sf2: Call setup during switch resume
  ipv6: take rcu lock in rawv6_send_hdrinc()
  ipv4: fix use-after-free in ip_cmsg_recv_dstaddr()
  ip_tunnel: be careful when accessing the inner header
  ip6_tunnel: be careful when accessing the inner header
  bonding: avoid possible dead-lock
  bnxt_en: Fix TX timeout during netpoll.
  xhci: Don't print a warning when setting link state for disabled ports
  i2c: i2c-scmi: fix for i2c_smbus_write_block_data
  perf script python: Fix export-to-postgresql.py occasional failure
  mach64: detect the dot clock divider correctly on sparc
  mm/vmstat.c: fix outdated vmstat_text
  ext4: Fix error code in ext4_xattr_set_entry()
  drm/amdgpu: Fix SDMA HQD destroy error on gfx_v7
  x86/kvm/lapic: always disable MMIO interface in x2APIC mode
  ARM: dts: at91: add new compatibility string for macb on sama5d3
  net: macb: disable scatter-gather for macb on sama5d3
  stmmac: fix valid numbers of unicast filter entries
  sound: enable interrupt after dma buffer initialization
  scsi: qla2xxx: Fix an endian bug in fcpcmd_is_corrupted()
  scsi: iscsi: target: Don't use stack buffer for scatterlist
  mfd: omap-usb-host: Fix dts probe of children
  selftests: memory-hotplug: add required configs
  selftests/efivarfs: add required kernel configs
  ASoC: sigmadsp: safeload should not have lower byte limit
  ASoC: wm8804: Add ACPI support
  ANDROID: x86_64_cuttlefish_defconfig: disable CONFIG_MEMORY_STATE_TIME
  UPSTREAM: loop: Add LOOP_SET_BLOCK_SIZE in compat ioctl
  BACKPORT: block/loop: set hw_sectors
  UPSTREAM: loop: add ioctl for changing logical block size

Conflicts:
	drivers/usb/host/xhci-hub.c

Change-Id: Ib8b13accaaa7b8d1772dc1c55c27b1e0edf8858a
Signed-off-by: default avatarMinming Qi <mqi@codeaurora.org>
parents f343b645 a427932c

Documentation/devicetree/bindings/net/macb.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
  Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on

  the Cadence GEM, or the generic form: "cdns,gem".

  Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs.

  Use "atmel,sama5d3-macb" for the 10/100Mbit IP available on Atmel sama5d3 SoCs.

  Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.

  Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.

  Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.

Documentation/networking/ip-sysctl.txt

+5 −8
Original line number Diff line number Diff line
@@ -122,14 +122,11 @@ min_adv_mss - INTEGER 


IP Fragmentation:



ipfrag_high_thresh - INTEGER

	Maximum memory used to reassemble IP fragments. When

	ipfrag_high_thresh bytes of memory is allocated for this purpose,

	the fragment handler will toss packets until ipfrag_low_thresh

	is reached. This also serves as a maximum limit to namespaces

	different from the initial one.



ipfrag_low_thresh - INTEGER

ipfrag_high_thresh - LONG INTEGER

	Maximum memory used to reassemble IP fragments.



ipfrag_low_thresh - LONG INTEGER

	(Obsolete since linux-4.17)

	Maximum memory used to reassemble IP fragments before the kernel

	begins to remove incomplete fragment queues to free up resources.

	The kernel still accepts new fragments for defragmentation.

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 133

SUBLEVEL = 134

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/boot/dts/sama5d3_emac.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
			};



			macb1: ethernet@f802c000 {

				compatible = "cdns,at91sam9260-macb", "cdns,macb";

				compatible = "atmel,sama5d3-macb", "cdns,at91sam9260-macb", "cdns,macb";

				reg = <0xf802c000 0x100>;

				interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>;

				pinctrl-names = "default";

arch/x86/configs/x86_64_cuttlefish_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -210,7 +210,6 @@ CONFIG_BLK_DEV_RAM=y 
CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_VIRTIO_BLK=y

CONFIG_UID_SYS_STATS=y

CONFIG_MEMORY_STATE_TIME=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SR=y