Linus Torvalds
c18bb396d3
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
1) The sockmap code has to free socket memory on close if there is
corked data, from John Fastabend.
2) Tunnel names coming from userspace need to be length validated. From
Eric Dumazet.
3) arp_filter() has to take VRFs properly into account, from Miguel
Fadon Perlines.
4) Fix oops in error path of tcf_bpf_init(), from Davide Caratti.
5) Missing idr_remove() in u32_delete_key(), from Cong Wang.
6) More syzbot stuff. Several use of uninitialized value fixes all
over, from Eric Dumazet.
7) Do not leak kernel memory to userspace in sctp, also from Eric
Dumazet.
8) Discard frames from unused ports in DSA, from Andrew Lunn.
9) Fix DMA mapping and reset/failover problems in ibmvnic, from Thomas
Falcon.
10) Do not access dp83640 PHY registers prematurely after reset, from
Esben Haabendal.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (46 commits)
vhost-net: set packet weight of tx polling to 2 * vq size
net: thunderx: rework mac addresses list to u64 array
inetpeer: fix uninit-value in inet_getpeer
dp83640: Ensure against premature access to PHY registers after reset
devlink: convert occ_get op to separate registration
ARM: dts: ls1021a: Specify TBIPA register address
net/fsl_pq_mdio: Allow explicit speficition of TBIPA address
ibmvnic: Do not reset CRQ for Mobility driver resets
ibmvnic: Fix failover case for non-redundant configuration
ibmvnic: Fix reset scheduler error handling
ibmvnic: Zero used TX descriptor counter on reset
ibmvnic: Fix DMA mapping mistakes
tipc: use the right skb in tipc_sk_fill_sock_diag()
sctp: sctp_sockaddr_af must check minimal addr length for AF_INET6
net: dsa: Discard frames from unused ports
sctp: do not leak kernel memory to user space
soreuseport: initialise timewait reuseport field
ipv4: fix uninit-value in ip_route_output_key_hash_rcu()
dccp: initialize ireq->ir_mark
net: fix uninit-value in __hw_addr_add_ex()
...
2018-04-09 17:04:10 -07:00
pci-v4.17-changes
2018-04-06 18:31:06 -07:00
Merge branch 'for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2018-04-03 17:42:25 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-04-01 19:49:34 -04:00
mm/memory_hotplug: optimize memory hotplug
2018-04-05 21:36:25 -07:00
Merge branch 'akpm' (patches from Andrew)
2018-04-06 14:19:26 -07:00
Bluetooth: Set HCI_QUIRK_SIMULTANEOUS_DISCOVERY for BTUSB_QCA_ROME
2018-04-01 21:43:02 +03:00
pci-v4.17-changes
2018-04-06 18:31:06 -07:00
Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2018-04-07 16:46:56 -07:00
ARM: SoC driver updates for 4.17
2018-04-05 21:29:35 -07:00
ARM: SoC platform updates for 4.17
2018-04-05 21:21:08 -07:00
ARM: SoC driver updates for 4.17
2018-04-05 21:29:35 -07:00
cpuidle: poll_state: Avoid invoking local_clock() too often
2018-03-29 13:06:08 +02:00
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2018-04-04 17:11:08 -07:00
device-dax: implement ->pagesize() for smaps to report MMUPageSize
2018-04-05 21:36:26 -07:00
dmaengine: stm32-dmamux: fix a potential buffer overflow
2018-03-22 10:51:35 +05:30
* Add NVDIMM support to EDAC (Tony Luck)
2018-04-05 14:21:13 -07:00
Char/Misc patches for 4.17-rc1
2018-04-04 20:07:20 -07:00
fw_cfg, vhost: features fixes
2018-04-06 19:21:41 -07:00
treewide: Fix typos in printk
2018-03-27 09:51:22 +02:00
PCI: Add Altera vendor ID
2018-03-19 14:18:22 -05:00
DeviceTree updates for 4.17:
2018-04-05 21:03:42 -07:00
treewide: fix up files incorrectly marked executable
2018-04-07 13:31:23 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2018-04-05 11:53:34 -07:00
ARM:
2018-04-09 11:42:31 -07:00
ARM SCMI fixes/cleanups for v4.17
2018-03-27 15:57:19 +02:00
Char/Misc patches for 4.17-rc1
2018-04-04 20:07:20 -07:00
Merge branch 'i2c/for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2018-04-07 12:36:18 -07:00
for-4.17/block-20180402
2018-04-05 14:27:02 -07:00
This is the bulk of GPIO changes for the v4.17 kernel cycle:
2018-04-05 09:51:41 -07:00
Merge candidates for 4.17 merge window
2018-04-06 17:35:43 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2018-04-05 13:21:57 -07:00
headers: untangle kmemleak.h from mm.h
2018-04-05 21:36:27 -07:00
Staging/IIO patches for 4.17-rc1
2018-04-04 18:56:27 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2018-04-03 14:04:18 -07:00
leds: Fix wrong dmi_match on PC Engines APU LEDs
2018-03-20 20:28:00 +01:00
lightnvm: pblk: remove some unnecessary NULL checks
2018-03-29 17:29:09 -06:00
powerpc updates for 4.17
2018-04-07 12:08:19 -07:00
mailbox: Add support for Hi3660 mailbox
2018-03-20 11:15:54 +08:00
mcb: Add Altera PCI ID to mcb-pci
2018-03-19 14:20:24 -05:00
- DM core passthrough ioctl fix to retain reference to DM table, and
2018-04-06 11:50:19 -07:00
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2018-04-06 11:07:08 -07:00
treewide: Align function definition open/close braces
2018-03-26 11:13:09 +02:00
powerpc updates for 4.17
2018-04-07 12:08:19 -07:00
for-4.17/block-20180402
2018-04-05 14:27:02 -07:00
MTD changes:
2018-04-06 12:15:41 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-04-09 17:04:10 -07:00
for-4.17/block-20180402
2018-04-05 14:27:02 -07:00
for-4.17/block-20180402
2018-04-05 14:27:02 -07:00
Char/Misc patches for 4.17-rc1
2018-04-04 20:07:20 -07:00
pci-v4.17-changes
2018-04-06 18:31:06 -07:00
oprofilefs: don't oops on allocation failure
2018-03-29 15:07:48 -04:00
parisc/pci: Switch LBA PCI bus from Hard Fail to Soft Fail mode
2018-03-27 18:52:22 +02:00
Char/Misc patches for 4.17-rc1
2018-04-04 20:07:20 -07:00
powerpc updates for 4.17
2018-04-07 12:08:19 -07:00
Merge branch 'for-linus-sa1100' of git://git.armlinux.org.uk/~rmk/linux-arm
2018-04-09 09:26:36 -07:00
ARM: SoC driver updates for 4.17
2018-04-05 21:29:35 -07:00
ARM: SoC platform updates for 4.17
2018-04-05 21:21:08 -07:00
This is the bulk of GPIO changes for the v4.17 kernel cycle:
2018-04-05 09:51:41 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2018-04-05 11:56:35 -07:00
ARM: SoC platform updates for 4.17
2018-04-05 21:21:08 -07:00
ARM: SoC platform updates for 4.17
2018-04-05 21:21:08 -07:00
Merge remote-tracking branches 'regulator/topic/88pg86x', 'regulator/topic/dt', 'regulator/topic/formatting' and 'regulator/topic/gpio' into regulator-next
2018-03-28 10:33:53 +08:00
Merge branch 'reset/lookup' into reset/next
2018-03-27 11:03:43 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2018-04-05 11:56:35 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2018-04-09 09:04:10 -07:00
sparc64: Properly range check DAX completion index
2018-04-01 20:07:00 -04:00
SCSI for-linus on 20180404
2018-04-05 15:05:53 -07:00
ARM: SoC driver updates for 4.17
2018-04-05 21:29:35 -07:00
spi: SPI updates for v4.17
2018-04-03 12:06:21 -07:00
Merge branch 'akpm' (patches from Andrew)
2018-04-06 14:19:26 -07:00
for-4.17/block-20180402
2018-04-05 14:27:02 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2018-04-09 09:04:10 -07:00
Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2018-04-07 11:11:41 -07:00
VFIO updates for v4.17-rc1
2018-04-06 19:44:27 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-04-09 17:04:10 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2018-04-09 09:04:10 -07:00
headers: untangle kmemleak.h from mm.h
2018-04-05 21:36:27 -07:00
This is the bulk of GPIO changes for the v4.17 kernel cycle:
2018-04-05 09:51:41 -07:00
x86/dma: Remove dma_alloc_coherent_mask()
2018-03-20 10:01:56 +01:00
hwtracing: Add HW tracing support menu
2018-03-29 13:38:10 +03:00
c18bb396d3