Linus Torvalds
2758b3e3e6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
1) IPv6 gre tunnels end up with different default features enabled
depending upon whether netlink or ioctls are used to bring them up.
Fix from Alexey Kodanev.
2) Fix read past end of user control message in RDS< from Avinash
Repaka.
3) Missing RCU barrier in mini qdisc code, from Cong Wang.
4) Missing policy put when reusing per-cpu route entries, from Florian
Westphal.
5) Handle nested PCI errors properly in bnx2x driver, from Guilherme G.
Piccoli.
6) Run nested transport mode IPSEC packets via tasklet, from Herbert
Xu.
7) Fix handling poll() for stream sockets in tipc, from Parthasarathy
Bhuvaragan.
8) Fix two stack-out-of-bounds issues in IPSEC, from Steffen Klassert.
9) Another zerocopy ubuf handling fix, from Willem de Bruijn.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (33 commits)
strparser: Call sock_owned_by_user_nocheck
sock: Add sock_owned_by_user_nocheck
skbuff: in skb_copy_ubufs unclone before releasing zerocopy
tipc: fix hanging poll() for stream sockets
sctp: Replace use of sockets_allocated with specified macro.
bnx2x: Improve reliability in case of nested PCI errors
tg3: Enable PHY reset in MTU change path for 5720
tg3: Add workaround to restrict 5762 MRRS to 2048
tg3: Update copyright
net: fec: unmap the xmit buffer that are not transferred by DMA
tipc: fix tipc_mon_delete() oops in tipc_enable_bearer() error path
tipc: error path leak fixes in tipc_enable_bearer()
RDS: Check cmsg_len before dereferencing CMSG_DATA
tcp: Avoid preprocessor directives in tracepoint macro args
tipc: fix memory leak of group member when peer node is lost
net: sched: fix possible null pointer deref in tcf_block_put
tipc: base group replicast ack counter on number of actual receivers
net_sched: fix a missing rcu barrier in mini_qdisc_pair_swap()
net: phy: micrel: ksz9031: reconfigure autoneg after phy autoneg workaround
ip6_gre: fix device features for ioctl setup
...
2017-12-28 23:20:21 -08:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
2017-12-23 13:47:22 -08:00
A couple of dma-mapping updates:
2017-11-14 16:54:12 -08:00
ANDROID: binder: fix transaction leak.
2017-11-28 16:54:45 +01:00
libata: sata_down_spd_limit should return if driver has not recorded sstatus speed
2017-12-04 13:57:03 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-11-29 13:10:25 -08:00
auxdisplay: img-ascii-lcd: Only build on archs that have IOMEM
2017-11-27 12:36:45 -08:00
PM / sleep: Avoid excess pm_runtime_enable() calls in device_resume()
2017-12-11 14:32:56 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2017-11-15 11:56:19 -08:00
null_blk: unalign call_single_data
2017-12-20 13:16:33 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-11-04 09:26:51 +09:00
bus: arm-ccn: fix module unloading Error: Removing state 147 which has instances left.
2017-12-04 17:15:20 +00:00
Merge branch 'for-4.15/block' of git://git.kernel.dk/linux-block
2017-11-14 15:32:19 -08:00
The big changes for IPMI that just went in had a few problems. These
2017-12-11 17:01:59 -08:00
clk: use atomic runtime pm api in clk_core_is_enabled
2017-12-26 17:34:03 -08:00
- final batch of "non trivial" timer conversions (multi-tree dependencies,
2017-11-23 16:29:05 +01:00
cpufreq: governor: Ensure sufficiently large sampling intervals
2017-12-18 12:09:39 +01:00
powerpc updates for 4.15
2017-11-16 12:47:46 -08:00
powerpc updates for 4.15
2017-11-16 12:47:46 -08:00
device-dax: implement ->split() to catch invalid munmap attempts
2017-11-29 18:40:42 -08:00
Merge branches 'pm-devfreq' and 'pm-tools'
2017-11-13 01:41:39 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
dmaengine: fsl-edma: disable clks on all error paths
2017-12-15 09:53:04 +05:30
Tracing updates for 4.15:
2017-11-17 14:58:01 -08:00
Modules updates for v4.15
2017-11-15 13:46:33 -08:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
USB/PHY patches for 4.15-rc1
2017-11-13 21:14:07 -08:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-11-13 17:56:58 -08:00
ARM: SoC fixes for 4.15-rc
2017-12-10 08:26:59 -08:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
Char/Misc patches for 4.15-rc1
2017-11-16 09:10:59 -08:00
gpio: fix "gpio-line-names" property retrieval
2017-12-22 15:24:31 +01:00
Merge tag 'drm-intel-fixes-2017-12-22-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
2017-12-28 05:20:07 +10:00
treewide: setup_timer() -> timer_setup()
2017-11-21 15:57:07 -08:00
HSI changes for the v4.15 series
2017-11-15 13:35:43 -08:00
Drivers: hv: vmbus: Fix a rescind issue
2017-11-28 16:56:26 +01:00
hwmon: Deal with errors from the thermal subsystem
2017-12-26 11:53:24 -08:00
hwspinlock update for v4.15
2017-11-17 20:16:20 -08:00
tracing: Pass export pointer as argument to ->write()
2017-12-04 07:14:30 -05:00
i2c: piix4: Fix port number check on release
2017-12-12 23:27:04 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
2017-11-19 08:04:41 -10:00
Merge branch 'pm-cpuidle'
2017-11-13 01:34:14 +01:00
iio: health: max30102: Temperature should be in milli Celsius
2017-12-02 11:15:14 +00:00
Third pull request for 4.15-rc
2017-12-28 23:06:01 -08:00
treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts
2017-11-21 16:35:54 -08:00
IOMMU fixes for Linux v4.15-rc3
2017-12-06 10:53:02 -08:00
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-11-26 14:39:20 -08:00
treewide: setup_timer() -> timer_setup() (2 field)
2017-11-21 15:57:09 -08:00
led: core: Fix brightness setting when setting delay_off=0
2017-12-27 20:45:07 +01:00
lightnvm: Convert timers to use timer_setup()
2017-11-21 15:46:44 -08:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-11-13 17:56:58 -08:00
Change to POLL api and fixes for FlexRM and OMAP driver
2017-11-15 13:39:18 -08:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
- Fix a particularly nasty DM core bug in a 4.15 refcount_t conversion.
2017-12-15 12:53:37 -08:00
media fixes for v4.15-rc3
2017-12-08 13:18:47 -08:00
ARM: SoC driver updates for v4.15
2017-11-16 16:05:01 -08:00
treewide: setup_timer() -> timer_setup()
2017-11-21 15:57:07 -08:00
Modules updates for v4.15
2017-11-15 13:46:33 -08:00
mfd: cros ec: spi: Fix "in progress" error signaling
2017-11-29 16:29:46 +00:00
Merge branch 'WIP.x86-pti.base.prep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-12-17 13:54:31 -08:00
mmc: core: apply NO_CMD23 quirk to some specific cards
2017-12-11 13:43:27 +01:00
mtd: Fix mtd_check_oob_ops()
2017-12-18 09:16:35 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-12-28 23:20:21 -08:00
treewide: setup_timer() -> timer_setup() (2 field)
2017-11-21 15:57:09 -08:00
treewide: setup_timer() -> timer_setup()
2017-11-21 15:57:07 -08:00
m68k updates for 4.15
2017-11-13 12:10:24 -08:00
libnvdimm, btt: Fix an incompatibility in the log layout
2017-12-21 14:59:27 -08:00
nvme: setup streams after initializing namespace head
2017-12-15 15:18:07 +01:00
Char/Misc patches for 4.15-rc1
2017-11-16 09:10:59 -08:00
of_mdio / mdiobus: ensure mdio devices have fwnode correctly populated
2017-12-13 15:01:47 -05:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
parisc: Hide Diva-built-in serial aux and graphics card
2017-12-17 21:06:25 +01:00
Char/Misc patches for 4.15-rc1
2017-11-16 09:10:59 -08:00
PCI / PM: Force devices to D0 in pci_pm_thaw_noirq()
2017-12-18 12:06:07 +01:00
drivers/pcmcia/sa1111_badge4.c: avoid unused function warning
2017-11-17 16:10:04 -08:00
arm64 updates for 4.15
2017-11-15 10:56:56 -08:00
USB/PHY patches for 4.15-rc1
2017-11-13 21:14:07 -08:00
pinctrl: cherryview: Mask all interrupts on Intel_Strago based systems
2017-12-12 09:51:38 +01:00
platform/x86: dell-wmi: check for kmalloc() errors
2017-12-11 17:26:03 -08:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
power supply and reset changes for the v4.15 series
2017-11-15 13:37:15 -08:00
treewide: setup_timer() -> timer_setup()
2017-11-21 15:57:07 -08:00
xen: features and fixes for v4.15-rc1
2017-11-16 13:06:27 -08:00
pwm: Changes for v4.15-rc1
2017-11-22 21:09:18 -10:00
Merge branch 'akpm' (patches from Andrew)
2017-11-17 16:56:17 -08:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-11-13 17:56:58 -08:00
- New Drivers
2017-11-16 09:15:57 -08:00
remoteproc updates for v4.15
2017-11-17 20:14:10 -08:00
ARM: SoC driver updates for v4.15
2017-11-16 16:05:01 -08:00
rpmsg updates for v4.15
2017-11-17 20:12:08 -08:00
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-11-25 08:37:16 -10:00
s390/qeth: fix error handling in checksum cmd callback
2017-12-20 15:11:49 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
2017-11-17 20:21:44 -08:00
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2017-12-21 11:13:37 -08:00
A couple of dma-mapping updates:
2017-11-14 16:54:12 -08:00
meson-gx-socinfo: Fix package id parsing
2017-11-30 15:29:44 -08:00
Merge remote-tracking branches 'spi/fix/armada', 'spi/fix/atmel', 'spi/fix/doc', 'spi/fix/imx', 'spi/fix/rspi', 'spi/fix/sun4i' and 'spi/fix/xilinx' into spi-linus
2017-12-19 11:07:00 +00:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
Merge tag 'staging-4.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2017-12-15 12:59:48 -08:00
block: fix blk_rq_append_bio
2017-12-18 13:55:43 -07:00
optee: fix invalid of_node_put() in optee_driver_init()
2017-11-29 10:24:57 +01:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2017-11-17 14:31:27 -08:00
Char/Misc patches for 4.15-rc1
2017-11-16 09:10:59 -08:00
serdev: ttyport: fix tty locking in close
2017-11-28 16:00:50 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
USB: core: prevent malicious bNumInterfaces overflow
2017-12-13 12:28:43 +01:00
treewide: setup_timer() -> timer_setup()
2017-11-21 15:57:07 -08:00
VFIO Updates for Linux v4.15
2017-11-14 16:47:47 -08:00
vhost: fix skb leak in handle_rx()
2017-12-02 21:31:03 -05:00
fbdev changes for v4.15:
2017-11-20 21:50:24 -10:00
virtio_mmio: fix devm cleanup
2017-12-14 21:01:40 +02:00
Char/Misc patches for 4.15-rc1
2017-11-16 09:10:59 -08:00
Char/Misc patches for 4.15-rc1
2017-11-16 09:10:59 -08:00
treewide: setup_timer() -> timer_setup()
2017-11-21 15:57:07 -08:00
xen: fixes for 4.15-rc5
2017-12-22 12:30:10 -08:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
Merge branches 'pm-cpufreq-sched' and 'pm-opp'
2017-11-13 01:40:52 +01:00
usb: build drivers/usb/common/ when USB_SUPPORT is set
2017-11-28 15:17:49 +01:00
2758b3e3e6