Linus Torvalds
dea08e6044
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
"Looks like a lot, but mostly driver fixes scattered all over as usual.
Of note:
1) Add conditional sched in nf conntrack in cleanup to avoid NMI
watchdogs. From Florian Westphal.
2) Fix deadlock in nfnetlink cttimeout, also from Floarian.
3) Fix handling of slaves in bonding ARP monitor validation, from Jay
Vosburgh.
4) Callers of ip_cmsg_send() are responsible for freeing IP options,
some were not doing so. Fix from Eric Dumazet.
5) Fix per-cpu bugs in mvneta driver, from Gregory CLEMENT.
6) Fix vlan handling in mv88e6xxx DSA driver, from Vivien Didelot.
7) bcm7xxx PHY driver bug fixes from Florian Fainelli.
8) Avoid unaligned accesses to protocol headers wrt. GRE, from
Alexander Duyck.
9) SKB leaks and other problems in arc_emac driver, from Alexander
Kochetkov.
10) tcp_v4_inbound_md5_hash() releases listener socket instead of
request socket on error path, oops. Fix from Eric Dumazet.
11) Missing socket release in pppoe_rcv_core() that seems to have
existed basically forever. From Guillaume Nault.
12) Missing slave_dev unregister in dsa_slave_create() error path,
from Florian Fainelli.
13) crypto_alloc_hash() never returns NULL, fix return value check in
__tcp_alloc_md5sig_pool. From Insu Yun.
14) Properly expire exception route entries in ipv4, from Xin Long.
15) Fix races in tcp/dccp listener socket dismantle, from Eric
Dumazet.
16) Don't set IFF_TX_SKB_SHARING in vxlan, geneve, or GRE, it's not
legal. These drivers modify the SKB on transmit. From Jiri Benc.
17) Fix regression in the initialziation of netdev->tx_queue_len.
From Phil Sutter.
18) Missing unlock in tipc_nl_add_bc_link() error path, from Insu Yun.
19) SCTP port hash sizing does not properly ensure that table is a
power of two in size. From Neil Horman.
20) Fix initializing of software copy of MAC address in fmvj18x_cs
driver, from Ken Kawasaki"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (129 commits)
bnx2x: Fix 84833 phy command handler
bnx2x: Fix led setting for 84858 phy.
bnx2x: Correct 84858 PHY fw version
bnx2x: Fix 84833 RX CRC
bnx2x: Fix link-forcing for KR2
net: ethernet: davicom: fix devicetree irq resource
fmvj18x_cs: fix incorrect indexing of dev->dev_addr[] when copying the MAC address
Driver: Vmxnet3: Update Rx ring 2 max size
net: netcp: rework the code for get/set sw_data in dma desc
soc: ti: knav_dma: rename pad in struct knav_dma_desc to sw_data
net: ti: netcp: restore get/set_pad_info() functionality
MAINTAINERS: Drop myself as xen netback maintainer
sctp: Fix port hash table size computation
can: ems_usb: Fix possible tx overflow
Bluetooth: hci_core: Avoid mixing up req_complete and req_complete_skb
net: bcmgenet: Fix internal PHY link state
af_unix: Don't use continue to re-execute unix_stream_read_generic loop
unix_diag: fix incorrect sign extension in unix_lookup_by_ino
bnxt_en: Failure to update PHY is not fatal condition.
bnxt_en: Remove unnecessary call to update PHY settings.
...
2016-02-22 12:18:07 -08:00
Initial roundup of 4.5 merge window patches
2016-01-23 18:45:06 -08:00
Documentation-getdelays: Apply a recommendation from "checkpatch.pl" in main()
2015-12-24 07:22:32 -07:00
mfd: core: redo ACPI matching of the children devices
2015-10-26 15:25:53 +01:00
ARM: SoC multiplatform code changes for v4.5
2016-01-20 18:03:56 -08:00
arm64: Documentation: add list of software workarounds for errata
2015-12-11 17:33:21 +00:00
Docs: blackfin: Use new switch macro SAMPLE_IRQ_TIMER instead of IRQ_TIMER5
2015-05-07 09:35:14 -06:00
A relatively boring cycle in the docs tree. There's a few kernel-doc
2016-01-17 11:55:07 -08:00
zram: update documentation
2015-09-24 15:39:42 -06:00
cgroup: rename cgroup documentations
2016-01-11 23:14:51 -05:00
cma: debug: document new debugfs interface
2015-04-14 16:49:00 -07:00
Documentation: cpufreq: intel_pstate: enhance documentation
2016-01-05 13:47:37 +01:00
KEYS: Merge the type-specific data with the payload data
2015-10-21 15:18:36 +01:00
dm verity: add ignore_zero_blocks feature
2015-12-10 10:39:03 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-02-22 12:18:07 -08:00
Merge branch 'topic/async' into for-linus
2016-01-06 15:17:47 +05:30
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2016-01-17 13:40:25 -08:00
driver-core: platform: Provide helpers for multi-driver modules
2015-10-05 05:02:40 +01:00
[media] use https://linuxtv.org for LinuxTV URLs
2015-12-04 10:38:59 -02:00
net: Add support for CHANGEUPPER notifier error injection
2015-12-03 11:49:23 -05:00
Documentation/fb: add documentation for sm712fb
2015-08-07 15:05:01 -07:00
dma-mapping: always provide the dma_map_ops based implementation
2016-01-20 17:09:18 -08:00
efi: Make efivarfs entries immutable by default
2016-02-10 16:25:52 +00:00
usage documentation for FPGA manager core
2015-10-07 18:07:20 +01:00
Doc: gpio: Fix typos in Documentation/gpio
2015-11-20 16:51:16 -07:00
HID: sensor: Update document for custom sensor
2015-04-10 22:22:56 +02:00
hwmon: (pmbus) Add client driver for LTC3815
2015-12-18 08:20:59 -08:00
i2c: i801: add Intel Lewisburg device IDs
2015-11-20 16:22:21 +01:00
iio: Documentation: Add IIO configfs documentation
2015-12-03 18:19:28 +00:00
IB: remove in-kernel support for memory windows
2015-12-23 14:29:04 -05:00
Input: add userio module
2015-10-27 18:55:31 -07:00
Doc: ioctl: Fix typos in Documentation/ioctl
2015-11-20 16:52:50 -07:00
Documentation: translations: update linux cross reference link
2016-01-11 18:26:58 -07:00
kbuild: document recursive dependency limitation / resolution
2015-10-08 15:36:16 +02:00
Documentation: translations: update linux cross reference link
2016-01-11 18:26:58 -07:00
Move freefall program from Documentation/ to tools/
2015-06-08 16:42:07 -06:00
Documentation: leds: Add description of brightness setting API
2016-01-04 09:57:31 +01:00
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-11-03 16:10:43 -08:00
misc: mic: Update MIC host daemon with COSM changes
2015-10-04 12:54:54 +01:00
Doc:misc-devices: Fix typo in Documentation/misc-devices
2015-09-18 10:04:24 -06:00
mmc: core: Remove MMC_CLKGATE
2015-10-26 16:00:09 +01:00
Documentation: mtd: improve nand_ecc.txt for readability and correctness
2015-11-17 17:05:14 -08:00
net: change tcp_syn_retries documentation
2016-01-20 18:55:08 -08:00
NFC: Fix typo in nfc-hci.txt
2015-06-08 23:15:45 +02:00
libnvdimm: documentation clarifications
2015-11-12 09:55:23 -08:00
Documentation: nvmem: add nvmem api level and how-to doc
2015-08-05 13:43:45 -07:00
The documentation tree update for 4.1. Numerous fixes, the overdue removal
2015-04-18 11:10:49 -04:00
pcmcia: Fix typo in locking documentation
2015-08-07 14:34:58 +02:00
Merge branches 'pm-pci' and 'pm-core'
2016-01-12 01:10:52 +01:00
SCSI misc on 20150901
2015-09-02 12:22:54 -07:00
Doc: pps: Fix file name in pps.txt
2015-07-14 12:35:42 -06:00
Documentation/prctl: don't build tsc tests when cross compiling
2015-06-22 16:05:04 -06:00
testptp: Silence compiler warnings on ppc64
2015-09-29 21:16:56 -07:00
documentation: Update RCU requirements based on expedited changes
2015-12-05 12:34:32 -08:00
s390/zcore: remove /sys/kernel/debug/zcore/mem
2015-11-27 09:24:12 +01:00
sched/dl/Documentation: Split Section 3
2015-05-19 08:39:21 +02:00
st: allow debug output to be enabled or disabled via sysfs
2015-11-09 17:17:27 -08:00
keys, trusted: seal with a TPM2 authorization policy
2015-12-20 15:27:13 +02:00
Documentation: improve line discipline method descriptions
2015-10-05 04:53:26 +01:00
ASoC: img: Add documentation for SPDIF in controls
2015-11-16 10:06:58 +00:00
spi: tools: move spidev_test metadata
2015-11-30 12:14:12 +00: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
target: use per-attribute show and store methods
2015-10-13 22:17:49 -07:00
thermal: add description for integral_cutoff unit
2016-01-14 13:29:08 -07:00
hpet: Drop stale URLs
2016-02-17 09:39:56 +01:00
x86, tracing, perf: Add trace point for MSR accesses
2015-12-06 12:56:10 +01:00
The chipidea changes for v4.5-rc1
2015-12-26 16:59:14 -08:00
Documentation/vDSO: don't build tests when cross compiling
2015-06-22 16:04:57 -06:00
[media] media framework: rename pads init function to media_entity_pads_init()
2016-01-11 12:19:03 -02:00
KVM doc: Fix KVM_SMI chapter number
2016-01-26 16:29:59 +01:00
Merge branch 'akpm' (patches from Andrew)
2016-01-17 12:58:52 -08:00
w1: masters: omap_hdq: add support for 1-wire mode
2015-10-05 04:47:09 +01:00
watchdog: Drop pointer to watchdog device from struct watchdog_device
2016-01-11 21:53:59 +01:00
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 10:07:40 -07:00
[media] media framework: rename pads init function to media_entity_pads_init()
2016-01-11 12:19:03 -02:00
Documentation: describe how to add a system call
2015-08-13 17:54:06 -06:00
locking/atomics, cmpxchg: Privatize the inclusion of asm/cmpxchg.h
2015-09-13 10:35:46 +02:00
Merge branch 'for-4.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2016-02-10 11:36:19 -08:00
There is a nice new document from Neil on how pathname lookups work and
2015-11-05 15:59:24 -08:00
clk: change clk_ops' ->determine_rate() prototype
2015-07-27 18:12:01 -07:00
Documentation: fix typo in CodingStyle
2016-01-11 18:18:16 -07:00
Documentation: cpu-hotplug: Fix sysfs mount instructions
2015-12-10 11:35:30 -07:00
Documentation: Update cputopology.txt
2015-05-27 15:22:15 +02:00
Doc: Change wikipedia's URL from http to https
2015-06-22 10:14:05 -06:00
dma-mapping: always provide the dma_map_ops based implementation
2016-01-20 17:09:18 -08:00
DMA-API: fix confusing sentence in Documentation/DMA-API.txt
2016-01-11 18:29:00 -07:00
dma-buf: cleanup dma_buf_export() to make it easily extensible
2015-04-21 14:47:16 +05:30
Documentation: dontdiff: remove media from dontdiff
2015-11-11 10:08:07 -07:00
EDAC: Remove references to bluesmoke.sourceforge.net
2015-11-26 14:46:06 +01:00
A few more documentation patches that wandered in and have no reason to
2015-11-13 09:19:05 -08:00
Documentation: HOWTO: update code cross reference link
2015-12-10 11:19:35 -07:00
hwrng: doc - Fix device node name reference /dev/hw_random => /dev/hwrng
2015-09-21 22:00:41 +08:00
hwspinlock/core: add device tree support
2015-05-02 09:54:30 +03:00
iommu/vt-d: Fix link to Intel IOMMU Specification
2016-01-29 12:32:12 +01:00
ipmi watchdog : add panic_wdt_timeout parameter
2015-11-16 06:28:43 -06:00
irqdomain: Documentation updates
2015-10-13 19:01:25 +02:00
mm, slub, kasan: enable user tracking by default with KASAN=y
2015-11-05 19:34:48 -08:00
Documenation: Update location of docproc.c
2015-07-14 12:36:39 -06:00
Documentation: translations: update linux cross reference link
2016-01-11 18:26:58 -07:00
Merge branch 'for-4.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2016-02-10 11:04:05 -08:00
irq_poll: make blk-iopoll available outside the block layer
2015-12-11 11:52:24 -08:00
Documentation: update the CONFIG_DEBUG_PAGEALLOC description
2015-03-20 07:41:55 -06:00
Doc: Change wikipedia's URL from http to https
2015-06-22 10:14:05 -06:00
kprobes: Update Documentation/kprobes.txt
2015-03-20 07:41:55 -06:00
Documentation: Update kselftest.txt
2015-09-24 15:51:53 -06:00
kernel/watchdog.c: add sysctl knob hardlockup_panic
2015-11-05 19:34:48 -08:00
Documentation/magic-number: Remove SCC_MAGIC
2015-05-13 15:39:04 -04:00
Documentation: minor typo fix in mailbox.txt
2015-08-13 18:03:18 -06:00
spi: Move spi code from Documentation to tools
2015-11-23 14:54:01 +00:00
md-cluster: update the documentation
2016-01-06 11:39:06 +11:00
doc:md: fix typo in md.txt.
2015-06-23 06:49:44 -06:00
virtio: barrier rework+fixes
2016-01-18 16:44:24 -08:00
mem-hotplug: fix typo in Documentation/memory-hotplug.txt
2015-03-20 07:41:55 -06:00
Documentation: Minor changes to men-chameleon-bus.txt
2015-07-24 15:15:17 +02:00
Move certificate handling to its own directory
2015-08-14 16:06:13 +01:00
NTB: Rename Intel code names to platform names
2015-07-04 14:09:25 -04:00
phy: core: Add devm_of_phy_get_by_index to phy-core
2015-05-11 21:42:23 +05:30
pinctrl: move strict option to pinmux_ops
2015-05-06 14:45:19 +02:00
x86/fpu: Rename math_state_restore() to fpu__restore()
2015-05-19 15:47:18 +02:00
printk-formats.txt: remove unimplemented %pT
2016-01-16 11:17:30 -08:00
documentation: fix small typo in rbtree.txt
2015-09-13 14:38:50 -06:00
remoteproc: introduce rproc_get_by_phandle API
2015-06-16 21:12:52 +03:00
Documentation, split up rtc.txt into documentation and test file
2015-03-24 22:01:58 -06:00
stable_kernel_rules.txt: Remove extra space after Cc:
2015-11-20 16:54:57 -07:00
locking/static_keys: Fix up the static keys documentation
2015-09-15 07:12:06 +02:00
A few more documentation patches that wandered in and have no reason to
2015-11-13 09:19:05 -08:00
mm, oom: do not panic for oom kills triggered from sysrq
2015-09-08 15:35:28 -07:00
UBSAN: run-time undefined behavior sanity checker
2016-01-20 17:09:18 -08:00
vfio: powerpc/spapr: Support Dynamic DMA windows
2015-06-11 15:16:55 +10:00
Documentation: mention vme_master_mmap() in VME API
2015-06-12 17:26:56 -07:00
workqueue: fix trivial typo in Documentation/workqueue.txt
2015-05-05 09:50:38 -04:00
dea08e6044
