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
..
ABI	Initial roundup of 4.5 merge window patches	2016-01-23 18:45:06 -08:00
DocBook	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2016-01-17 13:40:25 -08:00
EDID	…
PCI	The documentation tree update for 4.1. Numerous fixes, the overdue removal	2015-04-18 11:10:49 -04:00
RCU	documentation: Update RCU requirements based on expedited changes	2015-12-05 12:34:32 -08:00
accounting	Documentation-getdelays: Apply a recommendation from "checkpatch.pl" in main()	2015-12-24 07:22:32 -07:00
acpi	mfd: core: redo ACPI matching of the children devices	2015-10-26 15:25:53 +01:00
aoe	…
arm	ARM: SoC multiplatform code changes for v4.5	2016-01-20 18:03:56 -08:00
arm64	arm64: Documentation: add list of software workarounds for errata	2015-12-11 17:33:21 +00:00
auxdisplay	…
backlight	…
blackfin	Docs: blackfin: Use new switch macro SAMPLE_IRQ_TIMER instead of IRQ_TIMER5	2015-05-07 09:35:14 -06:00
block	A relatively boring cycle in the docs tree. There's a few kernel-doc	2016-01-17 11:55:07 -08:00
blockdev	zram: update documentation	2015-09-24 15:39:42 -06:00
bus-devices	…
cdrom	…
cgroup-v1	cgroup: rename cgroup documentations	2016-01-11 23:14:51 -05:00
cma	cma: debug: document new debugfs interface	2015-04-14 16:49:00 -07:00
connector	…
console	…
cpu-freq	Documentation: cpufreq: intel_pstate: enhance documentation	2016-01-05 13:47:37 +01:00
cpuidle	…
cris	…
crypto	KEYS: Merge the type-specific data with the payload data	2015-10-21 15:18:36 +01:00
development-process	…
device-mapper	dm verity: add ignore_zero_blocks feature	2015-12-10 10:39:03 -05:00
devicetree	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-22 12:18:07 -08:00
dmaengine	Merge branch 'topic/async' into for-linus	2016-01-06 15:17:47 +05:30
driver-model	driver-core: platform: Provide helpers for multi-driver modules	2015-10-05 05:02:40 +01:00
dvb	[media] use https://linuxtv.org for LinuxTV URLs	2015-12-04 10:38:59 -02:00
early-userspace	…
extcon	…
fault-injection	net: Add support for CHANGEUPPER notifier error injection	2015-12-03 11:49:23 -05:00
fb	Documentation/fb: add documentation for sm712fb	2015-08-07 15:05:01 -07:00
features	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
filesystems	efi: Make efivarfs entries immutable by default	2016-02-10 16:25:52 +00:00
firmware_class	…
fmc	…
fpga	usage documentation for FPGA manager core	2015-10-07 18:07:20 +01:00
frv	…
gpio	Doc: gpio: Fix typos in Documentation/gpio	2015-11-20 16:51:16 -07:00
hid	HID: sensor: Update document for custom sensor	2015-04-10 22:22:56 +02:00
hwmon	hwmon: (pmbus) Add client driver for LTC3815	2015-12-18 08:20:59 -08:00
i2c	i2c: i801: add Intel Lewisburg device IDs	2015-11-20 16:22:21 +01:00
ia64	virtual: Documentation: simplify and generalize paravirt_ops.txt	2015-02-13 17:15:44 +10:30
ide	…
iio	iio: Documentation: Add IIO configfs documentation	2015-12-03 18:19:28 +00:00
infiniband	IB: remove in-kernel support for memory windows	2015-12-23 14:29:04 -05:00
input	Input: add userio module	2015-10-27 18:55:31 -07:00
ioctl	Doc: ioctl: Fix typos in Documentation/ioctl	2015-11-20 16:52:50 -07:00
isdn	…
ja_JP	Documentation: translations: update linux cross reference link	2016-01-11 18:26:58 -07:00
kbuild	kbuild: document recursive dependency limitation / resolution	2015-10-08 15:36:16 +02:00
kdump	kernel: add panic_on_warn	2014-12-10 17:41:10 -08:00
ko_KR	Documentation: translations: update linux cross reference link	2016-01-11 18:26:58 -07:00
laptops	Move freefall program from Documentation/ to tools/	2015-06-08 16:42:07 -06:00
leds	Documentation: leds: Add description of brightness setting API	2016-01-04 09:57:31 +01:00
locking	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
m68k	…
memory-devices	…
metag	…
mic	misc: mic: Update MIC host daemon with COSM changes	2015-10-04 12:54:54 +01:00
mips	…
misc-devices	Doc:misc-devices: Fix typo in Documentation/misc-devices	2015-09-18 10:04:24 -06:00
mmc	mmc: core: Remove MMC_CLKGATE	2015-10-26 16:00:09 +01:00
mn10300	…
mtd	Documentation: mtd: improve nand_ecc.txt for readability and correctness	2015-11-17 17:05:14 -08:00
namespaces	…
netlabel	…
networking	net: change tcp_syn_retries documentation	2016-01-20 18:55:08 -08:00
nfc	NFC: Fix typo in nfc-hci.txt	2015-06-08 23:15:45 +02:00
nios2	…
nvdimm	libnvdimm: documentation clarifications	2015-11-12 09:55:23 -08:00
nvmem	Documentation: nvmem: add nvmem api level and how-to doc	2015-08-05 13:43:45 -07:00
parisc	…
pcmcia	pcmcia: Fix typo in locking documentation	2015-08-07 14:34:58 +02:00
phy	…
platform	…
power	Merge branches 'pm-pci' and 'pm-core'	2016-01-12 01:10:52 +01:00
powerpc	SCSI misc on 20150901	2015-09-02 12:22:54 -07:00
pps	Doc: pps: Fix file name in pps.txt	2015-07-14 12:35:42 -06:00
prctl	Documentation/prctl: don't build tsc tests when cross compiling	2015-06-22 16:05:04 -06:00
pti	…
ptp	testptp: Silence compiler warnings on ppc64	2015-09-29 21:16:56 -07:00
rapidio	…
s390	s390/zcore: remove /sys/kernel/debug/zcore/mem	2015-11-27 09:24:12 +01:00
scheduler	sched/dl/Documentation: Split Section 3	2015-05-19 08:39:21 +02:00
scsi	st: allow debug output to be enabled or disabled via sysfs	2015-11-09 17:17:27 -08:00
security	keys, trusted: seal with a TPM2 authorization policy	2015-12-20 15:27:13 +02:00
serial	Documentation: improve line discipline method descriptions	2015-10-05 04:53:26 +01:00
sh	…
sound	ASoC: img: Add documentation for SPDIF in controls	2015-11-16 10:06:58 +00:00
spi	spi: tools: move spidev_test metadata	2015-11-30 12:14:12 +00:00
sysctl	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	target: use per-attribute show and store methods	2015-10-13 22:17:49 -07:00
thermal	thermal: add description for integral_cutoff unit	2016-01-14 13:29:08 -07:00
timers	hpet: Drop stale URLs	2016-02-17 09:39:56 +01:00
tpm	…
trace	x86, tracing, perf: Add trace point for MSR accesses	2015-12-06 12:56:10 +01:00
usb	The chipidea changes for v4.5-rc1	2015-12-26 16:59:14 -08:00
vDSO	Documentation/vDSO: don't build tests when cross compiling	2015-06-22 16:04:57 -06:00
video4linux	[media] media framework: rename pads init function to media_entity_pads_init()	2016-01-11 12:19:03 -02:00
virtual	KVM doc: Fix KVM_SMI chapter number	2016-01-26 16:29:59 +01:00
vm	Merge branch 'akpm' (patches from Andrew)	2016-01-17 12:58:52 -08:00
w1	w1: masters: omap_hdq: add support for 1-wire mode	2015-10-05 04:47:09 +01:00
watchdog	watchdog: Drop pointer to watchdog device from struct watchdog_device	2016-01-11 21:53:59 +01:00
wimax	…
x86	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
xtensa	…
zh_CN	[media] media framework: rename pads init function to media_entity_pads_init()	2016-01-11 12:19:03 -02:00
00-INDEX	Update of Documentation/dmaengine/00-INDEX	2014-12-29 15:28:24 -07:00
BUG-HUNTING	…
Changes	There is a nice new document from Neil on how pathname lookups work and	2015-11-05 15:59:24 -08:00
CodeOfConflict	Code of Conflict	2015-02-27 11:44:24 -08:00
CodingStyle	Documentation: fix typo in CodingStyle	2016-01-11 18:18:16 -07:00
DMA-API-HOWTO.txt	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
DMA-API.txt	DMA-API: fix confusing sentence in Documentation/DMA-API.txt	2016-01-11 18:29:00 -07:00
DMA-ISA-LPC.txt	…
DMA-attributes.txt	…
HOWTO	Documentation: HOWTO: update code cross reference link	2015-12-10 11:19:35 -07:00
IPMI.txt	ipmi watchdog : add panic_wdt_timeout parameter	2015-11-16 06:28:43 -06:00
IRQ-affinity.txt	…
IRQ-domain.txt	irqdomain: Documentation updates	2015-10-13 19:01:25 +02:00
IRQ.txt	…
Intel-IOMMU.txt	iommu/vt-d: Fix link to Intel IOMMU Specification	2016-01-29 12:32:12 +01:00
Makefile	spi: Move spi code from Documentation to tools	2015-11-23 14:54:01 +00:00
ManagementStyle	…
SAK.txt	…
SM501.txt	…
SecurityBugs	…
SubmitChecklist	…
SubmittingDrivers	…
SubmittingPatches	A few more documentation patches that wandered in and have no reason to	2015-11-13 09:19:05 -08:00
VGA-softcursor.txt	…
adding-syscalls.txt	Documentation: describe how to add a system call	2015-08-13 17:54:06 -06:00
applying-patches.txt	…
assoc_array.txt	…
atomic_ops.txt	locking/atomics, cmpxchg: Privatize the inclusion of asm/cmpxchg.h	2015-09-13 10:35:46 +02:00
bad_memory.txt	…
basic_profiling.txt	…
bcache.txt	…
binfmt_misc.txt	…
braille-console.txt	…
bt8xxgpio.txt	…
btmrvl.txt	…
bus-virt-phys-mapping.txt	…
cachetlb.txt	rmap: drop support of non-linear mappings	2015-02-10 14:30:31 -08:00
cgroup-v2.txt	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
circular-buffers.txt	…
clk.txt	clk: change clk_ops' ->determine_rate() prototype	2015-07-27 18:12:01 -07:00
coccinelle.txt	…
cpu-hotplug.txt	Documentation: cpu-hotplug: Fix sysfs mount instructions	2015-12-10 11:35:30 -07:00
cpu-load.txt	…
cputopology.txt	Documentation: Update cputopology.txt	2015-05-27 15:22:15 +02:00
crc32.txt	…
dcdbas.txt	…
debugging-modules.txt	…
debugging-via-ohci1394.txt	Doc: Change wikipedia's URL from http to https	2015-06-22 10:14:05 -06:00
dell_rbu.txt	…
devices.txt	…
digsig.txt	…
dma-buf-sharing.txt	dma-buf: cleanup dma_buf_export() to make it easily extensible	2015-04-21 14:47:16 +05:30
dontdiff	Documentation: dontdiff: remove media from dontdiff	2015-11-11 10:08:07 -07:00
dynamic-debug-howto.txt	…
edac.txt	EDAC: Remove references to bluesmoke.sourceforge.net	2015-11-26 14:46:06 +01:00
efi-stub.txt	…
eisa.txt	…
email-clients.txt	A few more documentation patches that wandered in and have no reason to	2015-11-13 09:19:05 -08:00
flexible-arrays.txt	…
futex-requeue-pi.txt	doc: Fix misnamed FUTEX_CMP_REQUEUE_PI op constants	2015-01-19 12:05:32 +01:00
gcov.txt	…
gdb-kernel-debugging.txt	scripts/gdb: add basic documentation	2015-02-17 14:34:54 -08:00
highuid.txt	…
hsi.txt	…
hw_random.txt	hwrng: doc - Fix device node name reference /dev/hw_random => /dev/hwrng	2015-09-21 22:00:41 +08:00
hwspinlock.txt	hwspinlock/core: add device tree support	2015-05-02 09:54:30 +03:00
init.txt	…
initrd.txt	…
intel_txt.txt	…
io-mapping.txt	…
io_ordering.txt	…
iostats.txt	…
irqflags-tracing.txt	…
isapnp.txt	…
java.txt	…
kasan.txt	mm, slub, kasan: enable user tracking by default with KASAN=y	2015-11-05 19:34:48 -08:00
kernel-doc-nano-HOWTO.txt	Documenation: Update location of docproc.c	2015-07-14 12:36:39 -06:00
kernel-docs.txt	Documentation: translations: update linux cross reference link	2016-01-11 18:26:58 -07:00
kernel-parameters.txt	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
kernel-per-CPU-kthreads.txt	irq_poll: make blk-iopoll available outside the block layer	2015-12-11 11:52:24 -08:00
kmemcheck.txt	Documentation: update the CONFIG_DEBUG_PAGEALLOC description	2015-03-20 07:41:55 -06:00
kmemleak.txt	Doc: Change wikipedia's URL from http to https	2015-06-22 10:14:05 -06:00
kobject.txt	…
kprobes.txt	kprobes: Update Documentation/kprobes.txt	2015-03-20 07:41:55 -06:00
kref.txt	…
kselftest.txt	Documentation: Update kselftest.txt	2015-09-24 15:51:53 -06:00
ldm.txt	…
local_ops.txt	percpu: update local_ops.txt to reflect this_cpu operations	2014-12-13 12:42:53 -08:00
lockup-watchdogs.txt	kernel/watchdog.c: add sysctl knob hardlockup_panic	2015-11-05 19:34:48 -08:00
logo.gif	…
logo.txt	…
lzo.txt	…
magic-number.txt	Documentation/magic-number: Remove SCC_MAGIC	2015-05-13 15:39:04 -04:00
mailbox.txt	Documentation: minor typo fix in mailbox.txt	2015-08-13 18:03:18 -06:00
md-cluster.txt	md-cluster: update the documentation	2016-01-06 11:39:06 +11:00
md.txt	doc:md: fix typo in md.txt.	2015-06-23 06:49:44 -06:00
memory-barriers.txt	virtio: barrier rework+fixes	2016-01-18 16:44:24 -08:00
memory-hotplug.txt	mem-hotplug: fix typo in Documentation/memory-hotplug.txt	2015-03-20 07:41:55 -06:00
men-chameleon-bus.txt	Documentation: Minor changes to men-chameleon-bus.txt	2015-07-24 15:15:17 +02:00
module-signing.txt	Move certificate handling to its own directory	2015-08-14 16:06:13 +01:00
mono.txt	…
nommu-mmap.txt	fs: introduce f_op->mmap_capabilities for nommu mmap support	2015-01-20 14:02:58 -07:00
ntb.txt	NTB: Rename Intel code names to platform names	2015-07-04 14:09:25 -04:00
numastat.txt	…
oops-tracing.txt	livepatch: kernel: add TAINT_LIVEPATCH	2014-12-22 15:40:48 +01:00
padata.txt	…
parport-lowlevel.txt	…
parport.txt	…
percpu-rw-semaphore.txt	…
phy.txt	phy: core: Add devm_of_phy_get_by_index to phy-core	2015-05-11 21:42:23 +05:30
pi-futex.txt	…
pinctrl.txt	pinctrl: move strict option to pinmux_ops	2015-05-06 14:45:19 +02:00
pnp.txt	…
preempt-locking.txt	x86/fpu: Rename math_state_restore() to fpu__restore()	2015-05-19 15:47:18 +02:00
printk-formats.txt	printk-formats.txt: remove unimplemented %pT	2016-01-16 11:17:30 -08:00
pwm.txt	…
ramoops.txt	pstore-ram: Allow optional mapping with pgprot_noncached	2014-12-11 13:38:31 -08:00
rbtree.txt	documentation: fix small typo in rbtree.txt	2015-09-13 14:38:50 -06:00
remoteproc.txt	remoteproc: introduce rproc_get_by_phandle API	2015-06-16 21:12:52 +03:00
rfkill.txt	rfkill: document rfkill module parameters	2015-01-09 23:22:12 +01:00
robust-futex-ABI.txt	…
robust-futexes.txt	…
rpmsg.txt	…
rtc.txt	Documentation, split up rtc.txt into documentation and test file	2015-03-24 22:01:58 -06:00
serial-console.txt	…
sgi-ioc4.txt	…
smsc_ece1099.txt	…
sparse.txt	…
stable_api_nonsense.txt	…
stable_kernel_rules.txt	stable_kernel_rules.txt: Remove extra space after Cc:	2015-11-20 16:54:57 -07:00
static-keys.txt	locking/static_keys: Fix up the static keys documentation	2015-09-15 07:12:06 +02:00
svga.txt	…
sysfs-rules.txt	…
sysrq.txt	mm, oom: do not panic for oom kills triggered from sysrq	2015-09-08 15:35:28 -07:00
this_cpu_ops.txt	…
ubsan.txt	UBSAN: run-time undefined behavior sanity checker	2016-01-20 17:09:18 -08:00
unaligned-memory-access.txt	…
unicode.txt	…
unshare.txt	…
vfio.txt	vfio: powerpc/spapr: Support Dynamic DMA windows	2015-06-11 15:16:55 +10:00
vgaarbiter.txt	…
video-output.txt	…
vme_api.txt	Documentation: mention vme_master_mmap() in VME API	2015-06-12 17:26:56 -07:00
volatile-considered-harmful.txt	…
workqueue.txt	workqueue: fix trivial typo in Documentation/workqueue.txt	2015-05-05 09:50:38 -04:00
xillybus.txt	…
xz.txt	…
zorro.txt	…