Linus Torvalds 36bef88380 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Pull networking fixes from David Miller: 1) nft_compat accidently truncates ethernet protocol to 8-bits, from Arturo Borrero. 2) Memory leak in ip_vs_proc_conn(), from Julian Anastasov. 3) Don't allow the space required for nftables rules to exceed the maximum value representable in the dlen field. From Patrick McHardy. 4) bcm63xx_enet can accidently leave interrupts permanently disabled due to errors in the NAPI polling exit logic. Fix from Nicolas Schichan. 5) Fix OOPSes triggerable by the ping protocol module, due to missing address family validations etc. From Lorenzo Colitti. 6) Don't use RCU locking in sleepable context in team driver, from Jiri Pirko. 7) xen-netback miscalculates statistic offset pointers when reporting the stats to userspace. From David Vrabel. 8) Fix a leak of up to 256 pages per VIF destroy in xen-netaback, also from David Vrabel. 9) ip_check_defrag() cannot assume that skb_network_offset(), particularly when it is used by the AF_PACKET fanout defrag code. From Alexander Drozdov. 10) gianfar driver doesn't query OF node names properly when trying to determine the number of hw queues available. Fix it to explicitly check for OF nodes named queue-group. From Tobias Waldekranz. 11) MID field in macb driver should be 12 bits, not 16. From Punnaiah Choudary Kalluri. 12) Fix unintentional regression in traceroute due to timestamp socket option changes. Empty ICMP payloads should be allowed in non-timestamp cases. From Willem de Bruijn. 13) When devices are unregistered, we have to get rid of AF_PACKET multicast list entries that point to it via ifindex. Fix from Francesco Ruggeri. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (38 commits) tipc: fix bug in link failover handling net: delete stale packet_mclist entries net: macb: constify macb configuration data MAINTAINERS: add Marc Kleine-Budde as co maintainer for CAN networking layer MAINTAINERS: linux-can moved to github can: kvaser_usb: Read all messages in a bulk-in URB buffer can: kvaser_usb: Avoid double free on URB submission failures can: peak_usb: fix missing ctrlmode_ init for every dev can: add missing initialisations in CAN related skbuffs ip: fix error queue empty skb handling bgmac: Clean warning messages tcp: align tcp_xmit_size_goal() on tcp_tso_autosize() net: fec: fix unbalanced clk disable on driver unbind net: macb: Correct the MID field length value net: gianfar: correctly determine the number of queue groups ipv4: ip_check_defrag should not assume that skb_network_offset is zero net: bcmgenet: properly disable password matching net: eth: xgene: fix booting with devicetree bnx2x: Force fundamental reset for EEH recovery xen-netback: refactor xenvif_handle_frag_list() ...		2015-03-09 18:17:21 -07:00
..
ABI	platform-drivers-x86 for 3.20	2015-02-19 10:56:51 -08:00
DocBook	KGDB/KDB New:	2015-02-20 15:13:29 -08:00
EDID	…
PCI	…
RCU	Merge branches 'doc.2015.01.07a', 'fixes.2015.01.15a', 'preempt.2015.01.06a', 'srcu.2015.01.06a', 'stall.2015.01.16a' and 'torture.2015.01.11a' into HEAD	2015-01-15 23:34:34 -08:00
accounting	Documentation: use subdir-y to avoid unnecessary built-in.o files	2014-09-26 11:02:55 +02:00
acpi	ACPI / Documentation: add a missing '='	2015-01-22 01:21:45 +01:00
aoe	…
arm	ARM: SoC platform changes	2015-02-17 09:27:54 -08:00
arm64	arm64: Emulate SETEND for AArch32 tasks	2015-01-23 17:11:44 +00:00
auxdisplay	Documentation: use subdir-y to avoid unnecessary built-in.o files	2014-09-26 11:02:55 +02:00
backlight	…
blackfin	Documentation: fix blackfin gptimers-example build errors	2015-01-28 12:07:58 -07:00
block	Merge branch 'for-3.19/core' of git://git.kernel.dk/linux-block	2014-12-13 14:14:23 -08:00
blockdev	zram: report maximum used memory	2014-10-09 22:26:02 -04:00
bus-devices	…
cdrom	…
cgroups	mm: memcontrol: use "max" instead of "infinity" in control knobs	2015-02-28 09:57:51 -08:00
connector	…
console	…
cpu-freq	intel_pstate: Add num_pstates to sysfs	2015-01-30 01:52:17 +01:00
cpuidle	…
cris	…
crypto	crypto: doc - userspace interface spec	2014-11-13 22:31:38 +08:00
development-process	Documentation: remove outdated references to the linux-next wiki	2014-10-28 09:06:11 -04:00
device-mapper	dm crypt: add 'submit_from_crypt_cpus' option	2015-02-16 11:11:15 -05:00
devicetree	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-09 18:17:21 -07:00
dmaengine	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2015-02-18 08:49:20 -08:00
driver-model	Staging drivers patches for 3.20-rc1	2015-02-15 11:30:39 -08:00
dvb	[media] get_dvb_firmware: Update firmware of ITEtech IT9135	2014-09-21 17:03:04 -03:00
early-userspace	…
extcon	…
fault-injection	…
fb	…
filesystems	ocfs2: update web page + git tree in documentation	2015-02-28 09:57:50 -08:00
firmware_class	doc: fix minor typos in firmware_class README	2014-07-17 18:43:40 -07:00
fmc	…
frv	…
gpio	gpio: board.txt: Fix the gpio name example	2015-01-28 11:14:00 -07:00
hid	HID: uhid: update documentation	2014-08-25 03:28:09 -05:00
hwmon	hwmon: (ina2xx) Add ina231 compatible string	2015-01-25 21:23:59 -08:00
i2c	i2c: fix reference to functionality constants definition	2015-02-19 16:57:48 +01:00
i2o	…
ia64	virtual: Documentation: simplify and generalize paravirt_ops.txt	2015-02-13 17:15:44 +10:30
ide	…
infiniband	IB/mad: add new ioctl to ABI to support new registration options	2014-08-10 20:36:00 -07:00
input	Input: ALPS - move v7 packet info to Documentation and v6 packet info	2015-02-15 16:04:23 -08:00
ioctl	cxl: Add documentation for userspace APIs	2014-10-08 20:16:19 +11:00
isdn	…
ja_JP	…
kbuild	Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2015-02-19 10:31:37 -08:00
kdump	kernel: add panic_on_warn	2014-12-10 17:41:10 -08:00
ko_KR	…
laptops	Documentation: update .gitignore files	2014-09-26 11:02:59 +02:00
leds	…
locking	Documentation changes for 3.20	2015-02-11 13:03:11 -08:00
m68k	…
memory-devices	…
metag	…
mic	Documentation: Build mic/mpssd only for x86_64	2014-12-05 11:18:36 -05:00
mips	Documentation: au1xxx-ide.c has moved	2014-08-26 09:35:53 +02:00
misc-devices	Documentation/misc-devices/mei: Fix indentation of embedded code.	2015-01-29 12:56:20 -07:00
mmc	…
mn10300	…
mtd	…
namespaces	…
netlabel	…
networking	Documentation changes for 3.20	2015-02-11 13:03:11 -08:00
nfc	…
nios2	Documentation: Add documentation for Nios2 architecture	2014-12-08 12:56:06 +08:00
parisc	…
pcmcia	Documentation: use subdir-y to avoid unnecessary built-in.o files	2014-09-26 11:02:55 +02:00
phy	…
platform	…
power	genirq / PM: describe IRQF_COND_SUSPEND	2015-03-06 01:28:14 +01:00
powerpc	cxl: Add documentation for userspace APIs	2014-10-08 20:16:19 +11:00
pps	…
prctl	Documentation: Restrict TSC test code to x86	2014-10-28 08:46:27 -04:00
pti	…
ptp	ptp: restore the makefile for building the test program.	2014-10-24 16:07:10 -04:00
rapidio	rapidio/tsi721_dma: rework scatter-gather list handling	2014-08-08 15:57:24 -07:00
s390	s390/docs: Remove section about script debugging from Debugging390.txt	2015-01-15 11:11:14 +01:00
scheduler	doc: brief user documentation for completion	2015-01-30 11:19:25 -07:00
scsi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2014-12-12 10:08:06 -08:00
security	KEYS: Make /proc/keys unconditional if CONFIG_KEYS=y	2015-01-22 22:34:32 +00:00
serial	serial: Fix locking for uart driver set_termios() method	2014-11-05 18:53:54 -08:00
sh	…
sound	ALSA: hda - Add "eapd" model string for AD1986A codec	2014-12-10 14:00:13 +01:00
spi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/doc	2014-10-07 21:14:57 -04:00
sysctl	Merge branch 'akpm' (patches from Andrew)	2015-02-11 18:23:28 -08:00
target	Documentation/target: Update fabric_ops to latest code	2015-01-06 13:46:49 -08:00
thermal	Documentation: thermal: document of_cpufreq_cooling_register()	2015-01-06 14:39:17 -04:00
timers	Documentation: update .gitignore files	2014-09-26 11:02:59 +02:00
tpm	…
trace	Char / Misc patches for 3.20-rc1	2015-02-15 10:48:44 -08:00
usb	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2015-02-10 18:57:15 -08:00
vDSO	vdso: don't require 64-bit math in standalone test	2014-10-25 10:53:44 -04:00
video4linux	MODULE_DEVICE_TABLE: fix some callsites	2015-02-13 21:21:40 -08:00
virtual	OK, this has the big virtio 1.0 implementation, as specified by OASIS.	2015-02-18 09:24:01 -08:00
vm	mm:add KPF_ZERO_PAGE flag for /proc/kpageflags	2015-02-11 17:06:00 -08:00
w1	…
watchdog	Documentation: use subdir-y to avoid unnecessary built-in.o files	2014-09-26 11:02:55 +02:00
wimax	…
x86	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-02-21 10:41:29 -08:00
xtensa	…
zh_CN	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2014-08-06 21:03:53 -07:00
00-INDEX	Update of Documentation/dmaengine/00-INDEX	2014-12-29 15:28:24 -07:00
BUG-HUNTING	…
Changes	Documentation: GNU is frequently spelled Gnu	2014-12-29 15:33:17 -07:00
CodeOfConflict	Code of Conflict	2015-02-27 11:44:24 -08:00
CodingStyle	CodingStyle: enable emacs display of trailing whitespace	2015-01-28 12:05:46 -07:00
DMA-API-HOWTO.txt	Documentation: correct parameter error for dma_mapping_error	2014-09-26 11:22:29 +02:00
DMA-API.txt	…
DMA-ISA-LPC.txt	…
DMA-attributes.txt	…
HOWTO	Documentation: remove outdated references to the linux-next wiki	2014-10-28 09:06:11 -04:00
IPMI.txt	ipmi: Add SMBus interface driver (SSIF)	2014-12-11 15:04:11 -06:00
IRQ-affinity.txt	…
IRQ-domain.txt	irqdomain: Introduce new interfaces to support hierarchy irqdomains	2014-11-23 13:01:45 +01:00
IRQ.txt	…
Intel-IOMMU.txt	…
Makefile	Documentation: add makefiles for more targets	2014-09-26 11:02:56 +02:00
ManagementStyle	…
SAK.txt	…
SM501.txt	…
SecurityBugs	…
SubmitChecklist	…
SubmittingDrivers	…
SubmittingPatches	Merge branch 'doc/sp-update' into docs-next	2015-01-29 13:11:58 -07:00
VGA-softcursor.txt	…
applying-patches.txt	Documentation: change "&" to "and" in Documentation/applying-patches.txt	2014-09-26 11:10:11 +02:00
assoc_array.txt	…
atomic_ops.txt	documentation: Add atomic_long_t to atomic_ops.txt	2014-11-13 10:34:54 -08:00
bad_memory.txt	…
basic_profiling.txt	…
bcache.txt	…
binfmt_misc.txt	binfmt_misc: touch up documentation a bit	2014-10-14 02:18:16 +02:00
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
circular-buffers.txt	…
clk.txt	clk: Add rate constraints to clocks	2015-02-02 14:23:42 -08:00
coccinelle.txt	…
cpu-hotplug.txt	…
cpu-load.txt	…
cputopology.txt	…
crc32.txt	…
dcdbas.txt	…
debugging-modules.txt	…
debugging-via-ohci1394.txt	…
dell_rbu.txt	…
devices.txt	…
digsig.txt	…
dma-buf-sharing.txt	Documentation/dma-buf-sharing.txt: update API descriptions	2014-08-28 11:57:24 +05:30
dontdiff	…
dynamic-debug-howto.txt	…
edac.txt	…
efi-stub.txt	…
eisa.txt	…
email-clients.txt	Documentation/email-clients.txt: add info about Claws Mail	2014-12-02 11:55:29 -05: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	…
hwspinlock.txt	…
init.txt	…
initrd.txt	…
intel_txt.txt	…
io-mapping.txt	…
io_ordering.txt	…
iostats.txt	…
irqflags-tracing.txt	…
isapnp.txt	…
java.txt	…
kasan.txt	kasan: enable instrumentation of global variables	2015-02-13 21:21:42 -08:00
kernel-doc-nano-HOWTO.txt	…
kernel-docs.txt	…
kernel-parameters.txt	TTY/Serial driver patches for 3.20-rc1	2015-02-15 11:37:02 -08:00
kernel-per-CPU-kthreads.txt	…
kmemcheck.txt	…
kmemleak.txt	Documentation: Add CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF case	2014-10-24 13:59:03 -04:00
kobject.txt	kobject: grammar fix	2014-12-08 09:07:11 -05:00
kprobes.txt	Documentation: add description for FTRACE probe status	2015-02-04 16:05:44 -05:00
kref.txt	…
kselftest.txt	kselftest: Move the docs to the Documentation dir	2014-11-24 10:49:54 -07: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	lockup-watchdogs: Fix a typo	2014-08-26 09:35:52 +02:00
logo.gif	…
logo.txt	…
lzo.txt	Documentation: lzo: document part of the encoding	2014-09-28 11:08:00 +02:00
magic-number.txt	…
mailbox.txt	Documentation: Fix a typo in mailbox.txt	2014-11-03 11:54:50 -05:00
md.txt	…
media-framework.txt	…
memory-barriers.txt	documentation: Fix smp typo in memory-barriers.txt	2015-01-07 08:59:32 -08:00
memory-hotplug.txt	memory-hotplug: add sysfs valid_zones attribute	2014-10-09 22:25:52 -04:00
module-signing.txt	…
mono.txt	…
nommu-mmap.txt	fs: introduce f_op->mmap_capabilities for nommu mmap support	2015-01-20 14:02:58 -07: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: improved lookup method	2014-11-21 19:48:50 +05:30
pi-futex.txt	…
pinctrl.txt	pinctrl: clean up after enable refactoring	2014-09-04 10:05:07 +02:00
pnp.txt	…
preempt-locking.txt	…
printk-formats.txt	lib/vsprintf: add %*pE[achnops] format specifier	2014-10-14 02:18:26 +02:00
pwm.txt	…
ramoops.txt	pstore-ram: Allow optional mapping with pgprot_noncached	2014-12-11 13:38:31 -08:00
rbtree.txt	…
remoteproc.txt	…
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	…
serial-console.txt	…
sgi-ioc4.txt	…
smsc_ece1099.txt	…
sparse.txt	…
stable_api_nonsense.txt	…
stable_kernel_rules.txt	stable_kernel_rules: reorganize and update submission options	2015-01-12 05:04:12 -08:00
static-keys.txt	…
svga.txt	…
sysfs-rules.txt	Documentation/sysfs-rules.txt: Add device attribute error code documentation	2014-09-19 14:44:51 -07:00
sysrq.txt	…
this_cpu_ops.txt	Docs: this_cpu_ops: remove redundant add forms	2014-09-26 11:03:00 +02:00
unaligned-memory-access.txt	…
unicode.txt	…
unshare.txt	…
vfio.txt	drivers/vfio: EEH support for VFIO PCI device	2014-08-05 15:28:48 +10:00
vgaarbiter.txt	…
video-output.txt	…
vme_api.txt	…
volatile-considered-harmful.txt	…
workqueue.txt	…
xillybus.txt	xillybus: Move out of staging	2014-09-23 23:44:16 -07:00
xz.txt	…
zorro.txt	…