Linus Torvalds
34229b2774
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
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
...
2016-02-01 15:56:08 -08:00
libceph: fix ceph_msg_revoke()
2016-01-21 19:36:08 +01:00
ARM: SoC multiplatform code changes for v4.5
2016-01-20 18:03:56 -08:00
gpio: generic: make bgpio_pdata always visible
2016-01-13 16:00:32 +01:00
RTC for 4.5
2016-01-18 12:10:45 -08:00
Initial roundup of 4.5 merge window patches
2016-01-23 18:45:06 -08:00
Initial roundup of 4.5 merge window patches
2016-01-23 18:45:06 -08:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2016-01-24 12:50:56 -08:00
Merge remote-tracking branches 'regulator/topic/pv88090', 'regulator/topic/qcom-smd', 'regulator/topic/tps6105x', 'regulator/topic/tps65086' and 'regulator/topic/tps65218' into regulator-next
2016-01-12 18:26:10 +00:00
ARM: SoC driver updates for v4.5
2016-01-20 18:42:30 -08:00
Merge remote-tracking branches 'spi/topic/overlay', 'spi/topic/pxa2xx', 'spi/topic/s3c64xx', 'spi/topic/sh-msiof' and 'spi/topic/spidev' into spi-next
2016-01-11 16:48:35 +00:00
Initial roundup of 4.5 merge window patches
2016-01-23 18:45:06 -08:00
USB patches for 4.5-rc1
2016-01-13 09:26:40 -08:00
Merge branches 'acpi-pci', 'acpi-irq' and 'acpi-assorted'
2016-01-12 01:10:19 +01:00
mmc: atmel: get rid of struct mci_dma_data
2016-01-14 13:40:30 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2016-01-17 19:13:15 -08:00
block, badblocks: introduce devm_init_badblocks
2016-01-09 08:39:04 -08:00
MIPS: bcm963xx: Add Broadcom BCM963xx board nvram data structure
2016-01-24 03:47:37 +01:00
MIPS: bcm963xx: Update bcm_tag field image_sequence
2016-01-24 03:49:03 +01:00
Merge branch 'for-4.5/nvme' of git://git.kernel.dk/linux-block
2016-01-21 19:58:02 -08:00
Merge branch 'for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2016-01-12 19:20:32 -08:00
Merge branch 'for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2016-01-12 19:20:32 -08:00
include/linux/cleancache.h: Clean up code
2016-01-27 09:10:29 -05:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2016-01-20 17:20:53 -08:00
printk: do cond_resched() between lines while outputting to consoles
2016-01-16 11:17:25 -08:00
kernel/cpu.c: make set_cpu_* static inlines
2016-01-20 17:09:18 -08:00
block: use DAX for partition table reads
2016-01-30 13:35:32 -08:00
include/linux/dcache.h: remove semicolons from HASH_LEN_DECLARE
2016-01-14 16:00:49 -08:00
PM / devfreq: Set the freq_table of devfreq device
2016-01-13 17:30:32 +09:00
dma-mapping: always provide the dma_map_ops based implementation
2016-01-20 17:09:18 -08:00
dma-mapping: use offset_in_page macro
2016-01-20 17:09:18 -08:00
firmware: dmi_scan: Save SMBIOS Type 9 System Slots
2016-01-15 22:08:45 +01:00
err.h: add (missing) unlikely() to IS_ERR_OR_NULL()
2016-01-16 11:17:24 -08:00
block: revert runtime dax control of the raw block device
2016-01-30 13:35:31 -08:00
fsnotify: destroy marks with call_srcu instead of dedicated thread
2016-01-14 16:00:49 -08:00
This includes three minor fixes, mostly due to cut-and-paste issues.
2016-01-28 17:00:50 -08:00
block: kill disk_{check|set|clear|alloc}_badblocks
2016-01-09 22:42:31 -08:00
mm: fix noisy sparse warning in LIBCFS_ALLOC_PRE()
2016-01-14 16:00:49 -08:00
hrtimer: Handle remaining time proper for TIME_LOW_RES
2016-01-17 11:13:55 +01:00
thp: change pmd_trans_huge_lock() interface to return ptl
2016-01-21 17:20:51 -08:00
hugetlb: fix compile error on tile
2016-01-15 17:56:32 -08:00
i2c: create builtin_i2c_driver to avoid registration boilerplate
2016-01-13 11:06:03 +01:00
Initial roundup of 4.5 merge window patches
2016-01-23 18:45:06 -08:00
lib/iomap_copy.c: add __ioread32_copy()
2016-01-20 17:09:18 -08:00
iommu: Update struct iommu_ops comments
2016-01-29 12:34:29 +01:00
irqdomain: Allow domain lookup with DOMAIN_BUS_WIRED token
2016-01-26 16:00:14 +01:00
include/linux/kdev_t.h: remove new_valid_dev()
2016-01-16 11:17:23 -08:00
include/linux/kernel.h: change abs() macro so it uses consistent return type
2016-01-16 11:17:22 -08:00
kexec: move some memembers and definitions within the scope of CONFIG_KEXEC_FILE
2016-01-20 17:09:18 -08:00
kvm: rename pfn_t to kvm_pfn_t
2016-01-15 17:56:32 -08:00
kvm: rename pfn_t to kvm_pfn_t
2016-01-15 17:56:32 -08:00
Merge branch 'for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2016-01-11 19:33:59 -08:00
libnvdimm: Add a poison list and export badblocks
2016-01-09 08:39:03 -08:00
lightnvm: ensure that nvm_dev_ops can be used without CONFIG_NVM
2016-01-13 13:04:11 -07:00
mm, dax, pmem: introduce {get|put}_dev_pagemap() for dax-gup
2016-01-15 17:56:32 -08:00
mm: memcontrol: move kmem accounting code to CONFIG_MEMCG
2016-01-20 17:09:18 -08:00
lz4: fix wrong compress buffer size for 64-bits
2016-01-20 17:09:18 -08:00
memblock: fix section mismatch
2016-01-15 17:56:32 -08:00
mm: memcontrol: add "sock" to cgroup2 memory.stat
2016-01-20 17:09:18 -08:00
x86, mm: introduce vmem_altmap to augment vmemmap_populate()
2016-01-15 17:56:32 -08:00
mm/mempolicy.c: convert the shared_policy lock to a rwlock
2016-01-14 16:00:49 -08:00
mm, dax, pmem: introduce {get|put}_dev_pagemap() for dax-gup
2016-01-15 17:56:32 -08:00
mm/mlock.c: change can_do_mlock return value type to boolean
2016-01-15 17:56:32 -08:00
mm: move lru_to_page to mm_inline.h
2016-01-14 16:00:49 -08:00
mm, dax, pmem: introduce {get|put}_dev_pagemap() for dax-gup
2016-01-15 17:56:32 -08:00
page-flags: introduce page flags policies wrt compound pages
2016-01-15 17:56:32 -08:00
mm: page_alloc: generalize the dirty balance reserve
2016-01-14 16:00:49 -08:00
PCI changes for the v4.5 merge window:
2016-01-21 11:52:16 -08:00
net: simplify napi_synchronize() to avoid warnings
2016-01-24 22:19:55 -08:00
NFS client updates for Linux 4.5
2016-01-14 16:08:23 -08:00
NFS client updates for Linux 4.5
2016-01-14 16:08:23 -08:00
PCI: host: Add of_pci_get_host_bridge_resources() stub
2016-01-15 12:30:35 -06:00
mm: rework mapcount accounting to enable 4k mapping of THPs
2016-01-15 17:56:32 -08:00
mm: add find_get_entries_tag()
2016-01-22 17:02:18 -08:00
PCI changes for the v4.5 merge window:
2016-01-21 11:52:16 -08:00
PCI: Add Netronome NFP4000 PF device ID
2016-01-15 17:29:37 -06:00
perf: Synchronously clean up child events
2016-01-29 08:35:35 +01:00
mm, dax, pmem: introduce pfn_t
2016-01-15 17:56:32 -08:00
phys_to_pfn_t: use phys_addr_t
2016-01-31 09:10:19 -08:00
pipe: limit the per-user amount of pages allocated in pipes
2016-01-19 19:25:21 -05:00
Power management and ACPI updates for v4.5-rc1
2016-01-12 20:25:09 -08:00
pmem: add wb_cache_pmem() to the PMEM API
2016-01-22 17:02:18 -08:00
include/linux/poison.h: use POISON_POINTER_DELTA for poison pointers
2016-01-16 11:17:22 -08:00
printk: help pr_debug and pr_devel to optimize out arguments
2016-01-16 11:17:29 -08:00
ptrace: use fsuid, fsgid, effective creds for fs access checks
2016-01-20 17:09:18 -08:00
dax: support dirty DAX entries in radix tree
2016-01-22 17:02:18 -08:00
rbtree: use READ_ONCE in RB_EMPTY_ROOT
2016-01-20 17:09:18 -08:00
mm: support madvise(MADV_FREE)
2016-01-15 17:56:32 -08:00
net, sched: add clsact qdisc
2016-01-10 22:13:15 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-01-22 10:24:03 -08:00
ipc/shm.c: is_file_shm_hugepages() can be boolean
2016-01-20 17:09:18 -08:00
make sure that freeing shmem fast symlinks is RCU-delayed
2016-01-22 18:08:52 -05:00
net: preserve IP control block during GSO segmentation
2016-01-15 14:35:24 -05:00
mm: memcontrol: move kmem accounting code to CONFIG_MEMCG
2016-01-20 17:09:18 -08:00
mm: memcontrol: move kmem accounting code to CONFIG_MEMCG
2016-01-20 17:09:18 -08:00
mm: memcontrol: move kmem accounting code to CONFIG_MEMCG
2016-01-20 17:09:18 -08:00
mm: free swap cache aggressively if memcg swap is full
2016-01-20 17:09:18 -08:00
swiotlb: Make linux/swiotlb.h standalone includible
2016-01-20 17:29:52 -05:00
kmemcg: account certain kmem allocations to memcg
2016-01-14 16:00:49 -08:00
time: nohz: Expose tick_nohz_enabled
2016-01-15 22:34:39 +01:00
numa: remove stale node_has_online_mem() define
2016-01-18 14:49:33 -05:00
Not much new with tracing for this release. Mostly just clean ups and
2016-01-12 20:04:15 -08:00
tty: Wait interruptibly for tty lock on reopen
2016-01-26 23:17:54 -08:00
virtio: make find_vqs() checkpatch.pl-friendly
2016-01-12 20:47:06 +02:00
virtio_ring: use virt_store_mb
2016-01-12 20:47:02 +02:00
mm: support madvise(MADV_FREE)
2016-01-15 17:56:32 -08:00
mm, vmalloc: remove VM_VPAGES
2016-01-14 16:00:49 -08:00
mm: memcontrol: hook up vmpressure to socket pressure
2016-01-14 16:00:49 -08:00
vmstat: make vmstat_updater deferrable again and shut down on idle
2016-01-14 16:00:49 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2016-01-12 18:57:02 -08:00
watchdog: Drop pointer to watchdog device from struct watchdog_device
2016-01-11 21:53:59 +01:00
