Linus Torvalds
518a7cb698
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
1) When we run a tap on netlink sockets, we have to copy mmap'd SKBs
instead of cloning them. From Daniel Borkmann.
2) When converting classical BPF into eBPF, fix the setting of the
source reg to BPF_REG_X. From Tycho Andersen.
3) Fix igmpv3/mldv2 report parsing in the bridge multicast code, from
Linus Lussing.
4) Fix dst refcounting for ipv6 tunnels, from Martin KaFai Lau.
5) Set NLM_F_REPLACE flag properly when replacing ipv6 routes, from
Roopa Prabhu.
6) Add some new cxgb4 PCI device IDs, from Hariprasad Shenai.
7) Fix headroom tests and SKB leaks in ipv6 fragmentation code, from
Florian Westphal.
8) Check DMA mapping errors in bna driver, from Ivan Vecera.
9) Several 8139cp bug fixes (dev_kfree_skb_any in interrupt context,
misclearing of interrupt status in TX timeout handler, etc.) from
David Woodhouse.
10) In tipc, reset SKB header pointer after skb_linearize(), from Erik
Hugne.
11) Fix autobind races et al. in netlink code, from Herbert Xu with
help from Tejun Heo and others.
12) Missing SET_NETDEV_DEV in sunvnet driver, from Sowmini Varadhan.
13) Fix various races in timewait timer and reqsk_queue_hadh_req, from
Eric Dumazet.
14) Fix array overruns in mac80211, from Johannes Berg and Dan
Carpenter.
15) Fix data race in rhashtable_rehash_one(), from Dmitriy Vyukov.
16) Fix race between poll_one_napi and napi_disable, from Neil Horman.
17) Fix byte order in geneve tunnel port config, from John W Linville.
18) Fix handling of ARP replies over lightweight tunnels, from Jiri
Benc.
19) We can loop when fib rule dumps cross multiple SKBs, fix from Wilson
Kok and Roopa Prabhu.
20) Several reference count handling bug fixes in the PHY/MDIO layer
from Russel King.
21) Fix lockdep splat in ppp_dev_uninit(), from Guillaume Nault.
22) Fix crash in icmp_route_lookup(), from David Ahern.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (116 commits)
net: Fix panic in icmp_route_lookup
net: update docbook comment for __mdiobus_register()
ppp: fix lockdep splat in ppp_dev_uninit()
net: via/Kconfig: GENERIC_PCI_IOMAP required if PCI not selected
phy: marvell: add link partner advertised modes
net: fix net_device refcounting
phy: add phy_device_remove()
phy: fixed-phy: properly validate phy in fixed_phy_update_state()
net: fix phy refcounting in a bunch of drivers
of_mdio: fix MDIO phy device refcounting
phy: add proper phy struct device refcounting
phy: fix mdiobus module safety
net: dsa: fix of_mdio_find_bus() device refcount leak
phy: fix of_mdio_find_bus() device refcount leak
ip6_tunnel: Reduce log level in ip6_tnl_err() to debug
ip6_gre: Reduce log level in ip6gre_err() to debug
fib_rules: fix fib rule dumps across multiple skbs
bnx2x: byte swap rss_key to comply to Toeplitz specs
net: revert "net_sched: move tp->root allocation into fw_init()"
lwtunnel: remove source and destination UDP port config option
...
2015-09-26 06:01:33 -04:00
Revert "uart: pl011: Add support to ZTE ZX296702 uart"
2015-09-04 09:14:20 -07:00
libceph: advertise support for keepalive2
2015-09-17 20:14:27 +03:00
ARM: SoC driver updates for v4.3
2015-09-01 13:00:04 -07:00
fsl /bestcomm
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2015-09-04 15:49:32 -07:00
ARM:
2015-09-10 16:42:49 -07:00
sound updates for 4.3-rc1
2015-09-04 11:46:02 -07:00
Changes for 4.3
2015-09-09 08:33:31 -07:00
Changes for 4.3
2015-09-09 08:33:31 -07:00
mmc: block: skip trim for some kingston eMMCs
2015-08-27 14:50:52 +02:00
netfilter: nf_conntrack: make nf_ct_zone_dflt built-in
2015-09-02 16:32:56 -07:00
MMC core:
2015-09-08 16:33:16 -07:00
Merge remote-tracking branches 'regulator/topic/qcom-smd', 'regulator/topic/qcom-spmi', 'regulator/topic/rk808', 'regulator/topic/stub' and 'regulator/topic/tol' into regulator-next
2015-08-30 14:40:11 +01:00
ARM: SoC driver updates for v4.3
2015-09-01 13:00:04 -07:00
spi: fix kernel-doc warnings in spi.h
2015-09-16 20:44:47 +01:00
SUNRPC: Ensure that we wait for connections to complete before retrying
2015-09-17 18:01:28 -04:00
Merge branches 'acpi-pci', 'acpi-soc', 'acpi-ec' and 'acpi-osl'
2015-09-01 03:41:19 +02:00
cgroup, writeback: don't enable cgroup writeback on traditional hierarchies
2015-09-24 16:48:52 -04:00
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
2015-09-03 12:28:30 -07:00
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2015-09-19 18:57:09 -07:00
Revert "sched, cgroup: replace signal_struct->group_rwsem with a global percpu_rwsem"
2015-09-16 11:51:12 -04:00
Merge branch 'for-4.3-unified-base' into for-4.3
2015-08-25 14:19:29 -04:00
Merge branch 'for-4.3/blkcg' of git://git.kernel.dk/linux-block
2015-09-10 18:56:14 -07:00
clk: Constify clk_hw argument to provider APIs
2015-08-24 16:49:11 -07:00
clockevents: Remove unused set_mode() callback
2015-09-14 11:00:55 +02:00
cpufreq: acpi-cpufreq: Use cpufreq_cpu_get_raw() in ->get()
2015-09-16 02:17:49 +02:00
cpuidle/coupled: Remove cpuidle_device::safe_state_index
2015-08-28 15:14:54 +02:00
capabilities: ambient capabilities
2015-09-04 16:54:41 -07:00
dax: add huge page fault support
2015-09-08 15:35:28 -07:00
PM / devfreq: comments for get_dev_status usage updated
2015-09-11 14:23:29 +09:00
Power management and ACPI material for v4.3-rc1
2015-09-01 19:45:46 -07:00
mm: add dma_pool_zalloc() call to DMA API
2015-09-08 15:35:28 -07:00
dax: move DAX-related functions to a new header
2015-09-08 15:35:28 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-09-05 20:34:28 -07:00
genalloc: add support of multiple gen_pools per device
2015-09-04 16:54:41 -07:00
mm: use numa_mem_id() in alloc_pages_node()
2015-09-08 15:35:28 -07:00
dax: don't use set_huge_zero_page()
2015-09-08 15:35:28 -07:00
hugetlbfs: add hugetlbfs_fallocate()
2015-09-08 15:35:28 -07:00
i2c: core: Add support for best effort block read emulation
2015-08-24 14:05:19 +02:00
IGMP: Inhibit reports for local multicast groups
2015-08-28 13:28:47 -07:00
Revert "sched, cgroup: replace signal_struct->group_rwsem with a global percpu_rwsem"
2015-09-16 11:51:12 -04:00
add devm_memremap_pages
2015-08-27 19:40:58 -04:00
ipmi: Don't flush messages in sender() in run-to-completion mode
2015-09-03 15:02:28 -05:00
genirq: Remove irq argument from irq flow handlers
2015-09-16 15:47:51 +02:00
genirq: Remove irq argument from irq flow handlers
2015-09-16 15:47:51 +02:00
genirq: Remove irq argument from irq flow handlers
2015-09-16 15:47:51 +02:00
Pretty much all bug fixes and clean ups for 4.3, after a lot of
2015-09-03 12:52:19 -07:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 14:04:50 -07:00
locking/static_keys: Fix up the static keys documentation
2015-09-15 07:12:06 +02:00
x86/kasan, mm: Introduce generic kasan_populate_zero_shadow()
2015-08-22 14:54:55 +02:00
kexec: split kexec_load syscall from kexec core code
2015-09-10 13:29:01 -07:00
kmod: use system_unbound_wq instead of khelper
2015-09-10 13:29:01 -07:00
kernel/kthread.c:kthread_create_on_node(): clarify documentation
2015-09-04 16:54:41 -07:00
KVM: make halt_poll_ns per-vCPU
2015-09-06 16:27:10 +02:00
libnvdimm, pmem: direct map legacy pmem by default
2015-08-28 23:40:05 -04:00
mem-hotplug: handle node hole when initializing numa_meminfo.
2015-09-08 15:35:28 -07:00
memcg: zap try_get_mem_cgroup_from_page
2015-09-10 13:29:01 -07:00
mm: ZONE_DEVICE for "device memory"
2015-08-27 19:40:58 -04:00
add microchip LAN88xx phy driver
2015-09-09 17:19:14 -07:00
media updates for v4.3-rc1
2015-09-11 16:42:39 -07:00
mm: drop __nocast from vm_flags_t definition
2015-09-08 15:35:28 -07:00
mm: introduce idle page tracking
2015-09-10 13:29:01 -07:00
libnvdimm for 4.3:
2015-09-08 14:35:59 -07:00
netpoll: Close race condition between poll_one_napi and napi_disable
2015-09-23 14:32:50 -07:00
netfilter: nf_conntrack: make nf_ct_zone_dflt built-in
2015-09-02 16:32:56 -07:00
netfilter: Define v6ops in !CONFIG_NETFILTER case.
2015-08-27 16:35:51 -07:00
netlink, mmap: fix edge-case leakages in nf queue zero-copy
2015-09-09 21:43:22 -07:00
NFS: Get suppattr_exclcreat when getting server capabilities
2015-08-27 19:45:27 -04:00
NFSv4: Express delegation limit in units of pages
2015-09-07 12:36:13 -04:00
Merge branch 'nmi' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
2015-09-08 12:28:10 -07:00
NTB: Fix documentation for ntb_peer_db_clear.
2015-09-07 15:17:09 -04:00
NTB: Add flow control to the ntb_netdev
2015-09-07 15:17:08 -04:00
device property: check fwnode type in to_of_node()
2015-08-26 01:46:39 +02:00
of/platform: add function to populate default bus
2015-08-25 11:29:55 -05:00
PKCS#7: Add OIDs for sha224, sha284 and sha512 hash algos and use them
2015-09-01 09:59:20 +10:00
mm, oom: add description of struct oom_control
2015-09-08 15:35:28 -07:00
mm: introduce idle page tracking
2015-09-10 13:29:01 -07:00
mm, page_isolation: make set/unset_migratetype_isolate() file-local
2015-09-08 15:35:28 -07:00
mm: introduce idle page tracking
2015-09-10 13:29:01 -07:00
mm: introduce idle page tracking
2015-09-10 13:29:01 -07:00
pci: mm: add pci_pool_zalloc() call
2015-09-08 15:35:28 -07:00
phy: add phy_device_remove()
2015-09-24 23:04:53 -07:00
phy: fixed_phy: Add gpio to determine link up/down.
2015-08-31 14:48:02 -07:00
PM / Domains: Remove unusable governor dummies
2015-08-29 01:54:43 +02:00
PM / OPP: add dev_pm_opp_get_suspend_opp() helper
2015-09-09 02:20:39 +02:00
x86, pmem: clarify that ARCH_HAS_PMEM_API implies PMEM mapped WB
2015-08-27 19:40:59 -04:00
include/linux/poison.h: remove not-used poison pointer macros
2015-09-10 13:29:01 -07:00
hexdump: do not print debug dumps for !CONFIG_DEBUG
2015-09-10 13:29:01 -07:00
Merge remote-tracking branches 'regmap/topic/lockdep' and 'regmap/topic/seq-delay' into regmap-next
2015-09-04 17:22:10 +01:00
reset: Add (devm_)reset_control_get stub functions
2015-09-01 09:56:58 +02:00
mm: send one IPI per CPU to TLB flush all entries after unmapping pages
2015-09-04 16:54:41 -07:00
lib: scatterlist: add sg splitting function
2015-08-24 14:28:01 -06:00
Revert "sched, cgroup: replace signal_struct->group_rwsem with a global percpu_rwsem"
2015-09-16 11:51:12 -04:00
security: fix typo in security_task_prctl
2015-09-20 17:00:26 -07:00
fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void
2015-09-11 15:21:34 -07:00
skbuff: Fix skb checksum flag on skb pull
2015-09-24 14:09:13 -07:00
slab: infrastructure for bulk object allocation and freeing
2015-09-04 16:54:41 -07:00
smpboot: allow passing the cpumask on per-cpu thread registration
2015-09-04 16:54:41 -07:00
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 08:40:25 -07:00
lib/string_helpers: rename "esc" arg to "only"
2015-09-10 13:29:01 -07:00
mm: swap: zswap: maybe_preload & refactoring
2015-09-08 15:35:28 -07:00
mm/hwpoison: fix race between soft_offline_page and unpoison_memory
2015-09-08 15:35:28 -07:00
sys_membarrier(): system-wide memory barrier (generic, x86)
2015-09-11 15:21:34 -07:00
thermal: Add a function to get the minimum power
2015-09-14 07:39:46 -07:00
nohz: Affine unpinned timers to housekeepers
2015-09-02 10:33:22 +02:00
lib: introduce strncpy_from_unsafe()
2015-08-28 16:27:27 -07:00
userfaultfd: mcopy_atomic|mfill_zeropage: UFFDIO_COPY|UFFDIO_ZEROPAGE preparation
2015-09-04 16:54:41 -07:00
userfaultfd: revert "userfaultfd: waitqueue: add nr wake parameter to __wake_up_locked_key"
2015-09-22 15:09:53 -07:00
kernel/watchdog: move NMI function header declarations from watchdog.h to nmi.h
2015-09-04 16:54:41 -07:00
mm: zbud: constify the zbud_ops
2015-09-08 15:35:28 -07:00
zpool: add zpool_has_pool()
2015-09-10 13:29:01 -07:00
zsmalloc: account the number of compacted pages
2015-09-08 15:35:28 -07:00
