tree 8ff5aa1eaf11814bfd6de098b8383ac94abf0ca7
parent f343b6454dcf4e458fe26a19f59caa800ac9edcd
parent a427932c0bb022241bc801c13dd4061d891a6653
author Minming Qi <mqi@codeaurora.org> 1543210139 +0800
committer Minming Qi <mqi@codeaurora.org> 1543210139 +0800

Merge android-4.9.134 (a427932) into msm-4.9

* refs/heads/tmp-a427932:
  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: Minming Qi <mqi@codeaurora.org>