projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 2c92341 53729eb)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Feb 2016 23:56:08 +0000 (15:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Feb 2016 23:56:08 +0000 (15:56 -0800)
Pull networking fixes from David Miller:
 "This looks like a lot but it's a mixture of regression fixes as well
  as fixes for longer standing issues.

   1) Fix on-channel cancellation in mac80211, from Johannes Berg.

   2) Handle CHECKSUM_COMPLETE properly in xt_TCPMSS netfilter xtables
      module, from Eric Dumazet.

   3) Avoid infinite loop in UDP SO_REUSEPORT logic, also from Eric
      Dumazet.

   4) Avoid a NULL deref if we try to set SO_REUSEPORT after a socket is
      bound, from Craig Gallek.

   5) GRO key comparisons don't take lightweight tunnels into account,
      from Jesse Gross.

   6) Fix struct pid leak via SCM credentials in AF_UNIX, from Eric
      Dumazet.

   7) We need to set the rtnl_link_ops of ipv6 SIT tunnels before we
      register them, otherwise the NEWLINK netlink message is missing
      the proper attributes.  From Thadeu Lima de Souza Cascardo.

   8) Several Spectrum chip bug fixes for mlxsw switch driver, from Ido
      Schimmel

   9) Handle fragments properly in ipv4 easly socket demux, from Eric
      Dumazet.

  10) Don't ignore the ifindex key specifier on ipv6 output route
      lookups, from Paolo Abeni"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (128 commits)
  tcp: avoid cwnd undo after receiving ECN
  irda: fix a potential use-after-free in ircomm_param_request
  net: tg3: avoid uninitialized variable warning
  net: nb8800: avoid uninitialized variable warning
  net: vxge: avoid unused function warnings
  net: bgmac: clarify CONFIG_BCMA dependency
  net: hp100: remove unnecessary #ifdefs
  net: davinci_cpdma: use dma_addr_t for DMA address
  ipv6/udp: use sticky pktinfo egress ifindex on connect()
  ipv6: enforce flowi6_oif usage in ip6_dst_lookup_tail()
  netlink: not trim skb for mmaped socket when dump
  vxlan: fix a out of bounds access in __vxlan_find_mac
  net: dsa: mv88e6xxx: fix port VLAN maps
  fib_trie: Fix shift by 32 in fib_table_lookup
  net: moxart: use correct accessors for DMA memory
  ipv4: ipconfig: avoid unused ic_proto_used symbol
  bnxt_en: Fix crash in bnxt_free_tx_skbs() during tx timeout.
  bnxt_en: Exclude rx_drop_pkts hw counter from the stack's rx_dropped counter.
  bnxt_en: Ring free response from close path should use completion ring
  net_sched: drr: check for NULL pointer in drr_dequeue
  ...

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
net/ipv4/fib_trie.c patch | diff1 | diff2 | blob | history
net/ipv4/tcp_ipv4.c patch | diff1 | diff2 | blob | history

diff --combined MAINTAINERS
index 30aca4a,a26b9fe..f678c37
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -781,7 -781,6 +781,7 @@@ F: sound/aoa
  APM DRIVER
  M:    Jiri Kosina <jikos@kernel.org>
  S:    Odd fixes
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git
  F:    arch/x86/kernel/apm_32.c
  F:    include/linux/apm_bios.h
  F:    include/uapi/linux/apm_bios.h
@@@ -947,7 -946,6 +947,7 @@@ M: Alexandre Belloni <alexandre.belloni
  M:    Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.linux4sam.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
  S:    Supported
  F:    arch/arm/mach-at91/
  F:    include/soc/at91/
@@@ -1417,13 -1415,12 +1417,13 @@@ W:   http://www.arm.linux.org.uk
  S:    Maintained
  
  ARM/QUALCOMM SUPPORT
 -M:    Kumar Gala <galak@codeaurora.org>
 -M:    Andy Gross <agross@codeaurora.org>
 -M:    David Brown <davidb@codeaurora.org>
 +M:    Andy Gross <andy.gross@linaro.org>
 +M:    David Brown <david.brown@linaro.org>
  L:    linux-arm-msm@vger.kernel.org
  L:    linux-soc@vger.kernel.org
  S:    Maintained
 +F:    arch/arm/boot/dts/qcom-*.dts
 +F:    arch/arm/boot/dts/qcom-*.dtsi
  F:    arch/arm/mach-qcom/
  F:    drivers/soc/qcom/
  F:    drivers/tty/serial/msm_serial.h
@@@ -1431,22 -1428,13 +1431,22 @@@ F:   drivers/tty/serial/msm_serial.
  F:    drivers/*/pm8???-*
  F:    drivers/mfd/ssbi.c
  F:    drivers/firmware/qcom_scm.c
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git
  
  ARM/RADISYS ENP2611 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
 +ARM/RENESAS ARM64 ARCHITECTURE
 +M:    Simon Horman <horms@verge.net.au>
 +M:    Magnus Damm <magnus.damm@gmail.com>
 +L:    linux-sh@vger.kernel.org
 +Q:    http://patchwork.kernel.org/project/linux-sh/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
 +S:    Supported
 +F:    arch/arm64/boot/dts/renesas/
 +
  ARM/RISCPC ARCHITECTURE
  M:    Russell King <linux@arm.linux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1466,7 -1454,6 +1466,7 @@@ ARM/Rockchip SoC suppor
  M:    Heiko Stuebner <heiko@sntech.de>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-rockchip@lists.infradead.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
  S:    Maintained
  F:    arch/arm/boot/dts/rk3*
  F:    arch/arm/mach-rockchip/
@@@ -1544,8 -1531,9 +1544,8 @@@ F:      drivers/media/platform/s5p-jpeg
  ARM/SHMOBILE ARM ARCHITECTURE
  M:    Simon Horman <horms@verge.net.au>
  M:    Magnus Damm <magnus.damm@gmail.com>
 -L:    linux-sh@vger.kernel.org
 -W:    http://oss.renesas.com
 -Q:    http://patchwork.kernel.org/project/linux-sh/list/
 +L:    linux-renesas-soc@vger.kernel.org
 +Q:    http://patchwork.kernel.org/project/linux-renesas-soc/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
  S:    Supported
  F:    arch/arm/boot/dts/emev2*
@@@ -1615,13 -1603,6 +1615,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  N:    stm32
  F:    drivers/clocksource/armv7m_systick.c
  
 +ARM/TANGO ARCHITECTURE
 +M:    Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
 +L:    linux-arm-kernel@lists.infradead.org
 +S:    Maintained
 +F:    arch/arm/mach-tango/
 +F:    arch/arm/boot/dts/tango*
 +
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1676,8 -1657,6 +1676,8 @@@ F:      arch/arm/boot/dts/uniphier
  F:    arch/arm/include/asm/hardware/cache-uniphier.h
  F:    arch/arm/mach-uniphier/
  F:    arch/arm/mm/cache-uniphier.c
 +F:    arch/arm64/boot/dts/socionext/
 +F:    drivers/bus/uniphier-system-bus.c
  F:    drivers/i2c/busses/i2c-uniphier*
  F:    drivers/pinctrl/uniphier/
  F:    drivers/tty/serial/8250/8250_uniphier.c
@@@ -1799,7 -1778,6 +1799,7 @@@ ARM64 PORT (AARCH64 ARCHITECTURE
  M:    Catalin Marinas <catalin.marinas@arm.com>
  M:    Will Deacon <will.deacon@arm.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git
  S:    Maintained
  F:    arch/arm64/
  F:    Documentation/arm64/
@@@ -1828,12 -1806,6 +1828,12 @@@ S:    Maintaine
  F:    drivers/platform/x86/asus*.c
  F:    drivers/platform/x86/eeepc*.c
  
 +ASUS WIRELESS RADIO CONTROL DRIVER
 +M:    João Paulo Rechi Vita <jprvita@gmail.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/asus-wireless.c
 +
  ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
  R:    Dan Williams <dan.j.williams@intel.com>
  W:    http://sourceforge.net/projects/xscaleiop
@@@ -1885,7 -1857,7 +1885,7 @@@ ATHEROS ATH6KL WIRELESS DRIVE
  M:    Kalle Valo <kvalo@qca.qualcomm.com>
  L:    linux-wireless@vger.kernel.org
  W:    http://wireless.kernel.org/en/users/Drivers/ath6kl
 -T:    git git://github.com/kvalo/ath.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  S:    Supported
  F:    drivers/net/wireless/ath/ath6kl/
  
@@@ -2137,7 -2109,6 +2137,7 @@@ F:      drivers/net/wireless/broadcom/b43leg
  BACKLIGHT CLASS/SUBSYSTEM
  M:    Jingoo Han <jingoohan1@gmail.com>
  M:    Lee Jones <lee.jones@linaro.org>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git
  S:    Maintained
  F:    drivers/video/backlight/
  F:    include/linux/backlight.h
@@@ -2400,7 -2371,6 +2400,7 @@@ M:      Brian Norris <computersforpeace@gmai
  M:    Gregory Fong <gregory.0xf0@gmail.com>
  M:    Florian Fainelli <f.fainelli@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    bcm-kernel-feedback-list@broadcom.com
  T:    git git://github.com/broadcom/stblinux.git
  S:    Maintained
  F:    arch/arm/mach-bcm/*brcmstb*
@@@ -2420,8 -2390,6 +2420,8 @@@ F:      arch/mips/kernel/*bmips
  F:    arch/mips/boot/dts/brcm/bcm*.dts*
  F:    drivers/irqchip/irq-bcm7*
  F:    drivers/irqchip/irq-brcmstb*
 +F:    include/linux/bcm963xx_nvram.h
 +F:    include/linux/bcm963xx_tag.h
  
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
  M:    Prashant Sreedharan <prashant@broadcom.com>
@@@ -2476,7 -2444,7 +2476,7 @@@ N:      bcm8831
  
  BROADCOM BRCMSTB GPIO DRIVER
  M:    Gregory Fong <gregory.0xf0@gmail.com>
 -L:    bcm-kernel-feedback-list@broadcom.com>
 +L:    bcm-kernel-feedback-list@broadcom.com
  S:    Supported
  F:    drivers/gpio/gpio-brcmstb.c
  F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
@@@ -2738,11 -2706,10 +2738,11 @@@ F:   fs/ceph
  CERTIFICATE HANDLING:
  M:    David Howells <dhowells@redhat.com>
  M:    David Woodhouse <dwmw2@infradead.org>
 -L:    keyrings@linux-nfs.org
 +L:    keyrings@vger.kernel.org
  S:    Maintained
  F:    Documentation/module-signing.txt
  F:    certs/
 +F:    scripts/sign-file.c
  F:    scripts/extract-cert.c
  
  CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
@@@ -2822,7 -2789,6 +2822,7 @@@ F:      drivers/input/touchscreen/chipone_ic
  CHROME HARDWARE PLATFORM SUPPORT
  M:    Olof Johansson <olof@lixom.net>
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git
  F:    drivers/platform/chrome/
  
  CISCO VIC ETHERNET NIC DRIVER
@@@ -3121,7 -3087,6 +3121,7 @@@ M:      Mikael Starvik <starvik@axis.com
  M:    Jesper Nilsson <jesper.nilsson@axis.com>
  L:    linux-cris-kernel@axis.com
  W:    http://developer.axis.com
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git
  S:    Maintained
  F:    arch/cris/
  F:    drivers/tty/serial/crisv10.*
@@@ -3130,7 -3095,6 +3130,7 @@@ CRYPTO AP
  M:    Herbert Xu <herbert@gondor.apana.org.au>
  M:    "David S. Miller" <davem@davemloft.net>
  L:    linux-crypto@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
  S:    Maintained
  F:    Documentation/crypto/
@@@ -3463,21 -3427,8 +3463,21 @@@ DEVICE FREQUENCY (DEVFREQ
  M:    MyungJoo Ham <myungjoo.ham@samsung.com>
  M:    Kyungmin Park <kyungmin.park@samsung.com>
  L:    linux-pm@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
  S:    Maintained
  F:    drivers/devfreq/
 +F:    include/linux/devfreq.h
 +F:    Documentation/devicetree/bindings/devfreq/
 +
 +DEVICE FREQUENCY EVENT (DEVFREQ-EVENT)
 +M:    Chanwoo Choi <cw00.choi@samsung.com>
 +L:    linux-pm@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
 +S:    Supported
 +F:    drivers/devfreq/event/
 +F:    drivers/devfreq/devfreq-event.c
 +F:    include/linux/devfreq-event.h
 +F:    Documentation/devicetree/bindings/devfreq/event/
  
  DEVICE NUMBER REGISTRY
  M:    Torben Mathiasen <device@lanana.org>
@@@ -3593,7 -3544,7 +3593,7 @@@ M:      Christine Caulfield <ccaulfie@redhat
  M:    David Teigland <teigland@redhat.com>
  L:    cluster-devel@redhat.com
  W:    http://sources.redhat.com/cluster/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git
  S:    Supported
  F:    fs/dlm/
  
@@@ -3667,12 -3618,13 +3667,12 @@@ F:   drivers/scsi/dpt
  F:    drivers/scsi/dpt/
  
  DRBD DRIVER
 -P:    Philipp Reisner
 -P:    Lars Ellenberg
 -M:    drbd-dev@lists.linbit.com
 -L:    drbd-user@lists.linbit.com
 +M:    Philipp Reisner <philipp.reisner@linbit.com>
 +M:    Lars Ellenberg <lars.ellenberg@linbit.com>
 +L:    drbd-dev@lists.linbit.com
  W:    http://www.drbd.org
 -T:    git git://git.drbd.org/linux-2.6-drbd.git drbd
 -T:    git git://git.drbd.org/drbd-8.3.git
 +T:    git git://git.linbit.com/linux-drbd.git
 +T:    git git://git.linbit.com/drbd-8.4.git
  S:    Supported
  F:    drivers/block/drbd/
  F:    lib/lru_cache.c
@@@ -3793,7 -3745,7 +3793,7 @@@ F:      Documentation/devicetree/bindings/di
  DRM DRIVERS FOR RENESAS
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    dri-devel@lists.freedesktop.org
 -L:    linux-sh@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
  T:    git git://people.freedesktop.org/~airlied/linux
  S:    Supported
  F:    drivers/gpu/drm/rcar-du/
@@@ -4006,7 -3958,6 +4006,7 @@@ M:      Tyler Hicks <tyhicks@canonical.com
  L:    ecryptfs@vger.kernel.org
  W:    http://ecryptfs.org
  W:    https://launchpad.net/ecryptfs
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git
  S:    Supported
  F:    Documentation/filesystems/ecryptfs.txt
  F:    fs/ecryptfs/
@@@ -4285,7 -4236,6 +4285,7 @@@ M:      Andreas Dilger <adilger.kernel@dilge
  L:    linux-ext4@vger.kernel.org
  W:    http://ext4.wiki.kernel.org
  Q:    http://patchwork.ozlabs.org/project/linux-ext4/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git
  S:    Maintained
  F:    Documentation/filesystems/ext4.txt
  F:    fs/ext4/
@@@ -4649,7 -4599,8 +4649,7 @@@ F:      include/linux/f2fs_fs.
  F:    include/trace/events/f2fs.h
  
  FUJITSU FR-V (FRV) PORT
 -M:    David Howells <dhowells@redhat.com>
 -S:    Maintained
 +S:    Orphan
  F:    arch/frv/
  
  FUJITSU LAPTOP EXTRAS
@@@ -4968,7 -4919,6 +4968,7 @@@ F:      include/linux/hw_random.
  HARDWARE SPINLOCK CORE
  M:    Ohad Ben-Cohen <ohad@wizery.com>
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
  F:    Documentation/hwspinlock.txt
  F:    drivers/hwspinlock/hwspinlock_*
  F:    include/linux/hwspinlock.h
@@@ -5507,7 -5457,6 +5507,7 @@@ M:      Dmitry Kasatkin <dmitry.kasatkin@gma
  L:    linux-ima-devel@lists.sourceforge.net
  L:    linux-ima-user@lists.sourceforge.net
  L:    linux-security-module@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
  S:    Supported
  F:    security/integrity/ima/
  
@@@ -5583,12 -5532,6 +5583,12 @@@ T:    git git://git.code.sf.net/p/intel-sa
  S:    Supported
  F:    drivers/scsi/isci/
  
 +INTEL HID EVENT DRIVER
 +M:    Alex Hung <alex.hung@canonical.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/intel-hid.c
 +
  INTEL IDLE DRIVER
  M:    Len Brown <lenb@kernel.org>
  L:    linux-pm@vger.kernel.org
@@@ -5763,27 -5706,18 +5763,27 @@@ F:   include/linux/mic_bus.
  F:    include/linux/scif.h
  F:    include/uapi/linux/mic_common.h
  F:    include/uapi/linux/mic_ioctl.h
 -F     include/uapi/linux/scif_ioctl.h
 +F:    include/uapi/linux/scif_ioctl.h
  F:    drivers/misc/mic/
  F:    drivers/dma/mic_x100_dma.c
  F:    drivers/dma/mic_x100_dma.h
 -F     Documentation/mic/
 +F:    Documentation/mic/
  
 -INTEL PMC IPC DRIVER
 +INTEL PMC/P-Unit IPC DRIVER
  M:    Zha Qipeng<qipeng.zha@intel.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    drivers/platform/x86/intel_pmc_ipc.c
 +F:    drivers/platform/x86/intel_punit_ipc.c
  F:    arch/x86/include/asm/intel_pmc_ipc.h
 +F:    arch/x86/include/asm/intel_punit_ipc.h
 +
 +INTEL TELEMETRY DRIVER
 +M:    Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    arch/x86/include/asm/intel_telemetry.h
 +F:    drivers/platform/x86/intel_telemetry*
  
  IOC3 ETHERNET DRIVER
  M:    Ralf Baechle <ralf@linux-mips.org>
@@@ -5846,8 -5780,6 +5846,8 @@@ M:      Julian Anastasov <ja@ssi.bg
  L:    netdev@vger.kernel.org
  L:    lvs-devel@vger.kernel.org
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git
  F:    Documentation/networking/ipvs-sysctl.txt
  F:    include/net/ip_vs.h
  F:    include/uapi/linux/ip_vs.h
@@@ -6131,7 -6063,6 +6131,7 @@@ M:      "J. Bruce Fields" <bfields@fieldses.
  M:    Jeff Layton <jlayton@poochiereds.net>
  L:    linux-nfs@vger.kernel.org
  W:    http://nfs.sourceforge.net/
 +T:    git git://linux-nfs.org/~bfields/linux.git
  S:    Supported
  F:    fs/nfsd/
  F:    include/uapi/linux/nfsd/
@@@ -6188,7 -6119,6 +6188,7 @@@ M:      Christian Borntraeger <borntraeger@d
  M:    Cornelia Huck <cornelia.huck@de.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
  S:    Supported
  F:    Documentation/s390/kvm.txt
  F:    arch/s390/include/asm/kvm*
@@@ -6218,14 -6148,6 +6218,14 @@@ F:    arch/arm64/include/uapi/asm/kvm
  F:    arch/arm64/include/asm/kvm*
  F:    arch/arm64/kvm/
  
 +KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
 +M:    James Hogan <james.hogan@imgtec.com>
 +L:    linux-mips@linux-mips.org
 +S:    Supported
 +F:    arch/mips/include/uapi/asm/kvm*
 +F:    arch/mips/include/asm/kvm*
 +F:    arch/mips/kvm/
 +
  KEXEC
  M:    Eric Biederman <ebiederm@xmission.com>
  W:    http://kernel.org/pub/linux/utils/kernel/kexec/
@@@ -6270,7 -6192,6 +6270,7 @@@ KGDB / KDB /debug_cor
  M:    Jason Wessel <jason.wessel@windriver.com>
  W:    http://kgdb.wiki.kernel.org/
  L:    kgdb-bugreport@lists.sourceforge.net
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git
  S:    Maintained
  F:    Documentation/DocBook/kgdb.tmpl
  F:    drivers/misc/kgdbts.c
@@@ -6323,12 -6244,6 +6323,12 @@@ S:    Maintaine
  F:    net/l3mdev
  F:    include/net/l3mdev.h
  
 +LANTIQ MIPS ARCHITECTURE
 +M:    John Crispin <blogic@openwrt.org>
 +L:    linux-mips@linux-mips.org
 +S:    Maintained
 +F:    arch/mips/lantiq
 +
  LAPB module
  L:    linux-x25@vger.kernel.org
  S:    Orphan
@@@ -6448,7 -6363,6 +6448,7 @@@ LIBNVDIMM: NON-VOLATILE MEMORY DEVICE S
  M:    Dan Williams <dan.j.williams@intel.com>
  L:    linux-nvdimm@lists.01.org
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git
  S:    Supported
  F:    drivers/nvdimm/*
  F:    include/linux/nd.h
@@@ -6944,7 -6858,7 +6944,7 @@@ F:      drivers/iio/potentiometer/mcp4531.
  MEDIA DRIVERS FOR RENESAS - VSP1
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
 -L:    linux-sh@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
  F:    Documentation/devicetree/bindings/media/renesas,vsp1.txt
@@@ -7118,7 -7032,6 +7118,7 @@@ F:      Documentation/hwmon/menf21bm
  METAG ARCHITECTURE
  M:    James Hogan <james.hogan@imgtec.com>
  L:    linux-metag@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git
  S:    Odd Fixes
  F:    arch/metag/
  F:    Documentation/metag/
@@@ -7165,45 -7078,27 +7165,45 @@@ W:   https://linuxtv.or
  S:    Odd Fixes
  F:    drivers/media/radio/radio-miropcm20*
  
 -Mellanox MLX5 core VPI driver
 -M:    Eli Cohen <eli@mellanox.com>
 +MELLANOX MLX4 core VPI driver
 +M:    Yishai Hadas <yishaih@mellanox.com>
  L:    netdev@vger.kernel.org
  L:    linux-rdma@vger.kernel.org
  W:    http://www.mellanox.com
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
 +S:    Supported
 +F:    drivers/net/ethernet/mellanox/mlx4/
 +F:    include/linux/mlx4/
 +
 +MELLANOX MLX4 IB driver
 +M:    Yishai Hadas <yishaih@mellanox.com>
 +L:    linux-rdma@vger.kernel.org
 +W:    http://www.mellanox.com
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 -T:    git git://openfabrics.org/~eli/connect-ib.git
 +S:    Supported
 +F:    drivers/infiniband/hw/mlx4/
 +F:    include/linux/mlx4/
 +
 +MELLANOX MLX5 core VPI driver
 +M:    Matan Barak <matanb@mellanox.com>
 +M:    Leon Romanovsky <leonro@mellanox.com>
 +L:    netdev@vger.kernel.org
 +L:    linux-rdma@vger.kernel.org
 +W:    http://www.mellanox.com
 +Q:    http://patchwork.ozlabs.org/project/netdev/list/
  S:    Supported
  F:    drivers/net/ethernet/mellanox/mlx5/core/
  F:    include/linux/mlx5/
  
 -Mellanox MLX5 IB driver
 -M:    Eli Cohen <eli@mellanox.com>
 +MELLANOX MLX5 IB driver
 +M:    Matan Barak <matanb@mellanox.com>
 +M:    Leon Romanovsky <leonro@mellanox.com>
  L:    linux-rdma@vger.kernel.org
  W:    http://www.mellanox.com
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 -T:    git git://openfabrics.org/~eli/connect-ib.git
  S:    Supported
 -F:    include/linux/mlx5/
  F:    drivers/infiniband/hw/mlx5/
 +F:    include/linux/mlx5/
  
  MELEXIS MLX90614 DRIVER
  M:    Crt Mori <cmo@melexis.com>
@@@ -7618,8 -7513,7 +7618,8 @@@ NETWORKING DRIVERS (WIRELESS
  M:    Kalle Valo <kvalo@codeaurora.org>
  L:    linux-wireless@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-wireless/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
  S:    Maintained
  F:    drivers/net/wireless/
  
@@@ -7734,12 -7628,6 +7734,12 @@@ W:    https://github.com/jonmason/ntb/wik
  T:    git git://github.com/jonmason/ntb.git
  F:    drivers/ntb/hw/intel/
  
 +NTB AMD DRIVER
 +M:    Xiangliang Yu <Xiangliang.Yu@amd.com>
 +L:    linux-ntb@googlegroups.com
 +S:    Supported
 +F:    drivers/ntb/hw/amd/
 +
  NTFS FILESYSTEM
  M:    Anton Altaparmakov <anton@tuxera.com>
  L:    linux-ntfs-dev@lists.sourceforge.net
@@@ -8031,7 -7919,6 +8031,7 @@@ M:      Mark Rutland <mark.rutland@arm.com
  M:    Ian Campbell <ijc+devicetree@hellion.org.uk>
  M:    Kumar Gala <galak@codeaurora.org>
  L:    devicetree@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
  S:    Maintained
  F:    Documentation/devicetree/
  F:    arch/*/boot/dts/
@@@ -8348,7 -8235,7 +8348,7 @@@ F:      drivers/pci/host/pci-dra7xx.
  PCI DRIVER FOR RENESAS R-CAR
  M:    Simon Horman <horms@verge.net.au>
  L:    linux-pci@vger.kernel.org
 -L:    linux-sh@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
  S:    Maintained
  F:    drivers/pci/host/*rcar*
  
@@@ -8375,12 -8262,6 +8375,12 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/pci/host-generic-pci.txt
  F:    drivers/pci/host/pci-host-generic.c
  
 +PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
 +M:    Keith Busch <keith.busch@intel.com>
 +L:    linux-pci@vger.kernel.org
 +S:    Supported
 +F:    arch/x86/pci/vmd.c
 +
  PCIE DRIVER FOR ST SPEAR13XX
  M:    Pratyush Anand <pratyush.anand@gmail.com>
  L:    linux-pci@vger.kernel.org
@@@ -8405,24 -8286,16 +8405,24 @@@ F:   drivers/pci/host/pci-xgene-msi.
  
  PCIE DRIVER FOR HISILICON
  M:    Zhou Wang <wangzhou1@hisilicon.com>
 +M:    Gabriele Paoloni <gabriele.paoloni@huawei.com>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
  F:    drivers/pci/host/pcie-hisi.c
  
 +PCIE DRIVER FOR QUALCOMM MSM
 +M:     Stanimir Varbanov <svarbanov@mm-sol.com>
 +L:     linux-pci@vger.kernel.org
 +L:     linux-arm-msm@vger.kernel.org
 +S:     Maintained
 +F:     drivers/pci/host/*qcom*
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    linux-pcmcia@lists.infradead.org
  W:    http://lists.infradead.org/mailman/listinfo/linux-pcmcia
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git
  S:    Maintained
  F:    Documentation/pcmcia/
  F:    drivers/pcmcia/
@@@ -8540,7 -8413,7 +8540,7 @@@ F:      drivers/pinctrl/intel
  PIN CONTROLLER - RENESAS
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  M:    Geert Uytterhoeven <geert+renesas@glider.be>
 -L:    linux-sh@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
  S:    Maintained
  F:    drivers/pinctrl/sh-pfc/
  
@@@ -8744,7 -8617,7 +8744,7 @@@ M:      Colin Cross <ccross@android.com
  M:    Kees Cook <keescook@chromium.org>
  M:    Tony Luck <tony.luck@intel.com>
  S:    Maintained
 -T:    git git://git.infradead.org/users/cbou/linux-pstore.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
  F:    fs/pstore/
  F:    include/linux/pstore*
  F:    drivers/firmware/efi/efi-pstore.c
@@@ -8953,14 -8826,13 +8953,14 @@@ QUALCOMM ATHEROS ATH10K WIRELESS DRIVE
  M:    Kalle Valo <kvalo@qca.qualcomm.com>
  L:    ath10k@lists.infradead.org
  W:    http://wireless.kernel.org/en/users/Drivers/ath10k
 -T:    git git://github.com/kvalo/ath.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  S:    Supported
  F:    drivers/net/wireless/ath/ath10k/
  
  QUALCOMM HEXAGON ARCHITECTURE
  M:    Richard Kuo <rkuo@codeaurora.org>
  L:    linux-hexagon@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git
  S:    Supported
  F:    arch/hexagon/
  
@@@ -9013,12 -8885,6 +9013,12 @@@ L:    linux-fbdev@vger.kernel.or
  S:    Maintained
  F:    drivers/video/fbdev/aty/aty128fb.c
  
 +RALINK MIPS ARCHITECTURE
 +M:    John Crispin <blogic@openwrt.org>
 +L:    linux-mips@linux-mips.org
 +S:    Maintained
 +F:    arch/mips/ralink
 +
  RALINK RT2X00 WIRELESS LAN DRIVER
  P:    rt2x00 project
  M:    Stanislaw Gruszka <sgruszka@redhat.com>
@@@ -9153,19 -9019,18 +9153,19 @@@ F:   include/linux/rpmsg.
  RENESAS ETHERNET DRIVERS
  R:    Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
  L:    netdev@vger.kernel.org
 -L:    linux-sh@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
  F:    drivers/net/ethernet/renesas/
  F:    include/linux/sh_eth.h
  
  RENESAS USB2 PHY DRIVER
  M:    Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
 -L:    linux-sh@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
  S:    Maintained
  F:    drivers/phy/phy-rcar-gen3-usb2.c
  
  RESET CONTROLLER FRAMEWORK
  M:    Philipp Zabel <p.zabel@pengutronix.de>
 +T:    git git://git.pengutronix.de/git/pza/linux
  S:    Maintained
  F:    drivers/reset/
  F:    Documentation/devicetree/bindings/reset/
@@@ -9313,7 -9178,6 +9313,7 @@@ M:      Martin Schwidefsky <schwidefsky@de.i
  M:    Heiko Carstens <heiko.carstens@de.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
  S:    Supported
  F:    arch/s390/
  F:    drivers/s390/
@@@ -9506,7 -9370,7 +9506,7 @@@ M:      Lukasz Majewski <l.majewski@samsung.
  L:    linux-pm@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
  S:    Supported
 -T:    https://github.com/lmajewski/linux-samsung-thermal.git
 +T:    git https://github.com/lmajewski/linux-samsung-thermal.git
  F:    drivers/thermal/samsung/
  
  SAMSUNG USB2 PHY DRIVER
@@@ -10159,7 -10023,6 +10159,7 @@@ F:   drivers/media/pci/solo6x10
  
  SOFTWARE RAID (Multiple Disks) SUPPORT
  L:    linux-raid@vger.kernel.org
 +T:    git git://neil.brown.name/md
  S:    Supported
  F:    drivers/md/
  F:    include/linux/raid/
@@@ -10173,7 -10036,7 +10173,7 @@@ F:   drivers/net/ethernet/natsemi/sonic.
  
  SONICS SILICON BACKPLANE DRIVER (SSB)
  M:    Michael Buesch <m@bues.ch>
- L:    netdev@vger.kernel.org
+ L:    linux-wireless@vger.kernel.org
  S:    Maintained
  F:    drivers/ssb/
  F:    include/linux/ssb/
@@@ -10331,7 -10194,6 +10331,7 @@@ SQUASHFS FILE SYSTE
  M:    Phillip Lougher <phillip@squashfs.org.uk>
  L:    squashfs-devel@lists.sourceforge.net (subscribers-only)
  W:    http://squashfs.org.uk
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git
  S:    Maintained
  F:    Documentation/filesystems/squashfs.txt
  F:    fs/squashfs/
@@@ -10497,11 -10359,9 +10497,11 @@@ S: Maintaine
  F:    drivers/net/ethernet/dlink/sundance.c
  
  SUPERH
 +M:    Yoshinori Sato <ysato@users.sourceforge.jp>
 +M:    Rich Felker <dalias@libc.org>
  L:    linux-sh@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-sh/list/
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/sh/
  F:    arch/sh/
  F:    drivers/sh/
@@@ -10530,7 -10390,6 +10530,7 @@@ F:   arch/x86/boot/video
  SWIOTLB SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  L:    linux-kernel@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
  S:    Supported
  F:    lib/swiotlb.c
  F:    arch/*/kernel/pci-swiotlb.c
@@@ -10794,7 -10653,6 +10794,7 @@@ TENSILICA XTENSA PORT (xtensa
  M:    Chris Zankel <chris@zankel.net>
  M:    Max Filippov <jcmvbkbc@gmail.com>
  L:    linux-xtensa@linux-xtensa.org
 +T:    git git://github.com/czankel/xtensa-linux.git
  S:    Maintained
  F:    arch/xtensa/
  F:    drivers/irqchip/irq-xtensa-*
@@@ -11077,7 -10935,7 +11077,7 @@@ R:   Jason Gunthorpe <jgunthorpe@obsidian
  W:    http://tpmdd.sourceforge.net
  L:    tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
  Q:    git git://github.com/PeterHuewe/linux-tpmdd.git
 -T:    https://github.com/PeterHuewe/linux-tpmdd
 +T:    git https://github.com/PeterHuewe/linux-tpmdd
  S:    Maintained
  F:    drivers/char/tpm/
  
@@@ -11534,7 -11392,6 +11534,7 @@@ M:   Richard Weinberger <richard@nod.at
  L:    user-mode-linux-devel@lists.sourceforge.net
  L:    user-mode-linux-user@lists.sourceforge.net
  W:    http://user-mode-linux.sourceforge.net
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git
  S:    Maintained
  F:    Documentation/virtual/uml/
  F:    arch/um/
@@@ -11581,7 -11438,6 +11581,7 @@@ F:   fs/fat
  VFIO DRIVER
  M:    Alex Williamson <alex.williamson@redhat.com>
  L:    kvm@vger.kernel.org
 +T:    git git://github.com/awilliam/linux-vfio.git
  S:    Maintained
  F:    Documentation/vfio.txt
  F:    drivers/vfio/
@@@ -11651,7 -11507,6 +11651,7 @@@ M:   "Michael S. Tsirkin" <mst@redhat.com
  L:    kvm@vger.kernel.org
  L:    virtualization@lists.linux-foundation.org
  L:    netdev@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git
  S:    Maintained
  F:    drivers/vhost/
  F:    include/uapi/linux/vhost.h
@@@ -12068,7 -11923,7 +12068,7 @@@ M:   Dave Chinner <david@fromorbit.com
  M:    xfs@oss.sgi.com
  L:    xfs@oss.sgi.com
  W:    http://oss.sgi.com/projects/xfs
 -T:    git git://oss.sgi.com/xfs/xfs.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git
  S:    Supported
  F:    Documentation/filesystems/xfs.txt
  F:    fs/xfs/
diff --combined net/ipv4/fib_trie.c
index 7aea0cc,22e7317..d07fc07
--- 1/net/ipv4/fib_trie.c
--- 2/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@@ -289,8 -289,10 +289,8 @@@ static void __node_free_rcu(struct rcu_
  
        if (!n->tn_bits)
                kmem_cache_free(trie_leaf_kmem, n);
 -      else if (n->tn_bits <= TNODE_KMALLOC_MAX)
 -              kfree(n);
        else
 -              vfree(n);
 +              kvfree(n);
  }
  
  #define node_free(n) call_rcu(&tn_info(n)->rcu, __node_free_rcu)
@@@ -1394,9 -1396,10 +1394,10 @@@ found
                struct fib_info *fi = fa->fa_info;
                int nhsel, err;
  
-               if ((index >= (1ul << fa->fa_slen)) &&
-                   ((BITS_PER_LONG > KEYLENGTH) || (fa->fa_slen != KEYLENGTH)))
-                       continue;
+               if ((BITS_PER_LONG > KEYLENGTH) || (fa->fa_slen < KEYLENGTH)) {
+                       if (index >= (1ul << fa->fa_slen))
+                               continue;
+               }
                if (fa->fa_tos && fa->fa_tos != flp->flowi4_tos)
                        continue;
                if (fi->fib_dead)
diff --combined net/ipv4/tcp_ipv4.c
index 5ced3e4,2a67244..a4d5237
--- 1/net/ipv4/tcp_ipv4.c
--- 2/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@@ -73,6 -73,7 +73,6 @@@
  #include <net/timewait_sock.h>
  #include <net/xfrm.h>
  #include <net/secure_seq.h>
 -#include <net/tcp_memcontrol.h>
  #include <net/busy_poll.h>
  
  #include <linux/inet.h>
@@@ -707,7 -708,8 +707,8 @@@ release_sk1
     outside socket context is ugly, certainly. What can I do?
   */
  
- static void tcp_v4_send_ack(struct sk_buff *skb, u32 seq, u32 ack,
+ static void tcp_v4_send_ack(struct net *net,
+                           struct sk_buff *skb, u32 seq, u32 ack,
                            u32 win, u32 tsval, u32 tsecr, int oif,
                            struct tcp_md5sig_key *key,
                            int reply_flags, u8 tos)
@@@ -722,7 -724,6 +723,6 @@@
                        ];
        } rep;
        struct ip_reply_arg arg;
-       struct net *net = dev_net(skb_dst(skb)->dev);
  
        memset(&rep.th, 0, sizeof(struct tcphdr));
        memset(&arg, 0, sizeof(arg));
@@@ -784,7 -785,8 +784,8 @@@ static void tcp_v4_timewait_ack(struct 
        struct inet_timewait_sock *tw = inet_twsk(sk);
        struct tcp_timewait_sock *tcptw = tcp_twsk(sk);
  
-       tcp_v4_send_ack(skb, tcptw->tw_snd_nxt, tcptw->tw_rcv_nxt,
+       tcp_v4_send_ack(sock_net(sk), skb,
+                       tcptw->tw_snd_nxt, tcptw->tw_rcv_nxt,
                        tcptw->tw_rcv_wnd >> tw->tw_rcv_wscale,
                        tcp_time_stamp + tcptw->tw_ts_offset,
                        tcptw->tw_ts_recent,
@@@ -803,8 -805,10 +804,10 @@@ static void tcp_v4_reqsk_send_ack(cons
        /* sk->sk_state == TCP_LISTEN -> for regular TCP_SYN_RECV
         * sk->sk_state == TCP_SYN_RECV -> for Fast Open.
         */
-       tcp_v4_send_ack(skb, (sk->sk_state == TCP_LISTEN) ?
-                       tcp_rsk(req)->snt_isn + 1 : tcp_sk(sk)->snd_nxt,
+       u32 seq = (sk->sk_state == TCP_LISTEN) ? tcp_rsk(req)->snt_isn + 1 :
+                                            tcp_sk(sk)->snd_nxt;
+ 
+       tcp_v4_send_ack(sock_net(sk), skb, seq,
                        tcp_rsk(req)->rcv_nxt, req->rsk_rcv_wnd,
                        tcp_time_stamp,
                        req->ts_recent,
Domain: System / Kernel;