Linus Torvalds
8e8459719c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
...
Pull networking fixes from David Miller:
"Several small fixes here:
1) Don't crash in tg3 driver when the number of tx queues has been
configured to be different from the number of rx queues. From
Thadeu Lima de Souza Cascardo.
2) VLAN filter not disabled properly in promisc mode in ixgbe driver,
from Vlad Yasevich.
3) Fix OOPS on dellink op in VTI tunnel driver, from Xin Long.
4) IPV6 GRE driver WCCP code checks skb->protocol for ETH_P_IP
instead of ETH_P_IPV6, whoops. From Yuri Chislov.
5) Socket matching in ping driver is buggy when packet AF does not
match socket's AF. Fix from Jane Zhou.
6) Fix checksum calculation errors in VXLAN due to where the
udp_tunnel6_xmit_skb() helper gets it's saddr/daddr from. From
Alexander Duyck.
7) Fix 5G detection problem in rtlwifi driver, from Larry Finger.
8) Fix NULL deref in tcp_v{4,6}_send_reset, from Eric Dumazet.
9) Various missing netlink attribute verifications in bridging code,
from Thomas Graf.
10) tcp_recvmsg() unconditionally calls ipv4 ip_recv_error even for
ipv6 sockets, whoops. Fix from Willem de Bruijn"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (29 commits)
net-timestamp: make tcp_recvmsg call ipv6_recv_error for AF_INET6 socks
bridge: Sanitize IFLA_EXT_MASK for AF_BRIDGE:RTM_GETLINK
bridge: Add missing policy entry for IFLA_BRPORT_FAST_LEAVE
net: Check for presence of IFLA_AF_SPEC
net: Validate IFLA_BRIDGE_MODE attribute length
bridge: Validate IFLA_BRIDGE_FLAGS attribute length
stmmac: platform: fix default values of the filter bins setting
net/mlx4_core: Limit count field to 24 bits in qp_alloc_res
net: dsa: bcm_sf2: reset switch prior to initialization
net: dsa: bcm_sf2: fix unmapping registers in case of errors
tg3: fix ring init when there are more TX than RX channels
tcp: fix possible NULL dereference in tcp_vX_send_reset()
rtlwifi: Change order in device startup
rtlwifi: rtl8821ae: Fix 5G detection problem
Revert "netfilter: conntrack: fix race in __nf_conntrack_confirm against get_next_corpse"
vxlan: Fix boolean flip in VXLAN_F_UDP_ZERO_CSUM6_[TX|RX]
ip6_udp_tunnel: Fix checksum calculation
net-timestamp: Fix a documentation typo
net/ping: handle protocol mismatching scenario
af_packet: fix sparse warning
...
2014-11-27 18:05:05 -08:00
..
ABI
Documentation/ABI/testing/sysfs-ibft: fix a typo
2014-10-21 10:31:26 -04:00
accounting
Documentation: use subdir-y to avoid unnecessary built-in.o files
2014-09-26 11:02:55 +02:00
acpi
mfd: Add ACPI support
2014-09-26 08:24:05 +01:00
aoe
arm
ARM: SoC DT updates for 3.18
2014-10-08 17:22:23 -04:00
arm64
Documentation/arm64/memory.txt: fix typo
2014-10-20 17:55:38 +01:00
auxdisplay
Documentation: use subdir-y to avoid unnecessary built-in.o files
2014-09-26 11:02:55 +02:00
backlight
blackfin
Documentation: add makefiles for more targets
2014-09-26 11:02:56 +02:00
block
Merge branch 'for-3.18/core' of git://git.kernel.dk/linux-block
2014-10-18 11:53:51 -07:00
blockdev
zram: report maximum used memory
2014-10-09 22:26:02 -04:00
bus-devices
cdrom
cgroups
cpuset: PF_SPREAD_PAGE and PF_SPREAD_SLAB should be atomic flags
2014-09-24 22:16:06 -04:00
connector
console
cpu-freq
cpuidle
cris
crypto
development-process
Documentation: remove outdated references to the linux-next wiki
2014-10-28 09:06:11 -04:00
device-mapper
devicetree
DeviceTree fixes for 3.18:
2014-11-21 16:40:41 -08:00
DocBook
Merge tag 'docs-for-linus' of git://git.lwn.net/linux-2.6
2014-10-31 11:55:40 -07:00
driver-model
PCI changes for the v3.18 merge window:
2014-10-09 15:03:49 -04:00
dvb
[media] get_dvb_firmware: Update firmware of ITEtech IT9135
2014-09-21 17:03:04 -03:00
early-userspace
EDID
extcon
fault-injection
fb
filesystems
ovl: rename filesystem type to "overlay"
2014-11-20 16:39:59 +01:00
firmware_class
fmc
frv
gpio
This is the bulk of GPIO changes for the v3.18 development
2014-10-09 14:58:15 -04:00
hid
HID: uhid: update documentation
2014-08-25 03:28:09 -05:00
hwmon
Immutable branch between MFD, HWMON, LEDs and Watchdog for v3.18
2014-09-24 09:25:06 -07:00
i2c
i2c: i801: Add Device IDs for Intel Sunrise Point PCH
2014-10-16 09:16:22 +02:00
i2o
ia64
Documentation: use subdir-y to avoid unnecessary built-in.o files
2014-09-26 11:02:55 +02:00
ide
infiniband
IB/mad: add new ioctl to ABI to support new registration options
2014-08-10 20:36:00 -07:00
input
Input: elantech - update the documentation
2014-11-13 17:50:23 -08:00
ioctl
cxl: Add documentation for userspace APIs
2014-10-08 20:16:19 +11:00
isdn
ja_JP
kbuild
Documentation: kbuild: Improve grammar
2014-08-19 10:02:56 +02:00
kdump
Documentation/kdump/kdump.txt: add ARM description
2014-08-29 16:28:17 -07:00
ko_KR
laptops
Documentation: update .gitignore files
2014-09-26 11:02:59 +02:00
leds
locking
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 15:51:40 +02:00
m68k
memory-devices
metag
mic
Documentation: update include path for mpssd
2014-10-03 15:48:20 +02:00
mips
Documentation: au1xxx-ide.c has moved
2014-08-26 09:35:53 +02:00
misc-devices
Documentation: use subdir-y to avoid unnecessary built-in.o files
2014-09-26 11:02:55 +02:00
mmc
mn10300
mtd
namespaces
netlabel
networking
net-timestamp: Fix a documentation typo
2014-11-25 13:35:26 -05:00
nfc
parisc
PCI
pcmcia
Documentation: use subdir-y to avoid unnecessary built-in.o files
2014-09-26 11:02:55 +02:00
phy
platform
power
Merge branch 'pm-qos'
2014-10-23 23:02:36 +02: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
RCU
documentation: Add verbiage on RCU-tasks stall warning messages
2014-09-07 16:27:28 -07:00
s390
scheduler
Documentation/scheduler/sched-deadline.txt: Add minimal main() appendix
2014-09-16 10:23:45 +02:00
scsi
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
2014-10-21 12:53:45 -07:00
security
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2014-10-12 10:13:55 -04:00
serial
TTY/Serial driver patches for 3.18-rc1
2014-10-08 06:52:11 -04:00
sh
sound
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
coredump: add %i/%I in core_pattern to report the tid of the crashed thread
2014-10-14 02:18:21 +02:00
target
target: Add documentation on the target userspace pass-through driver
2014-10-02 21:35:54 -07:00
thermal
timers
Documentation: update .gitignore files
2014-09-26 11:02:59 +02:00
tpm
trace
mm: trace-vmscan-postprocess.pl: report the number of file/anon pages respectively
2014-08-06 18:01:20 -07:00
usb
usb: hub: rename khubd to hub_wq in documentation and comments
2014-09-23 22:33:19 -07:00
vDSO
vdso: don't require 64-bit math in standalone test
2014-10-25 10:53:44 -04:00
video4linux
[media] vivid: default to single planar device instances
2014-11-03 14:43:26 -02:00
virtual
Changes for KVM for arm/arm64 for 3.18
2014-09-27 11:03:33 +02:00
vm
Docs: Document that the sticky bit is understood by hugetlbfs
2014-10-22 14:26:04 -04:00
w1
watchdog
Documentation: use subdir-y to avoid unnecessary built-in.o files
2014-09-26 11:02:55 +02:00
wimax
x86
x86/mm: Update memory map description to list hypervisor-reserved area
2014-09-19 12:48:02 +02: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
locking/Documentation: Move locking related docs into Documentation/locking/
2014-08-13 10:32:03 +02:00
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
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
BUG-HUNTING
bus-virt-phys-mapping.txt
cachetlb.txt
Changes
Documentation: remove obsolete pcmcia-cs from Changes
2014-09-09 10:35:58 +02:00
circular-buffers.txt
clk.txt
coccinelle.txt
CodingStyle
CodingStyle: fix a minor typo
2014-08-26 09:35:54 +02:00
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-API-HOWTO.txt
Documentation: correct parameter error for dma_mapping_error
2014-09-26 11:22:29 +02:00
DMA-API.txt
DMA-attributes.txt
dma-buf-sharing.txt
Documentation/dma-buf-sharing.txt: update API descriptions
2014-08-28 11:57:24 +05:30
DMA-ISA-LPC.txt
dmaengine.txt
dmaengine: Update documentation for inline wrapper
2014-08-28 12:37:55 +05:30
dmatest.txt
dontdiff
dynamic-debug-howto.txt
edac.txt
efi-stub.txt
eisa.txt
email-clients.txt
flexible-arrays.txt
futex-requeue-pi.txt
gcov.txt
highuid.txt
HOWTO
Documentation: remove outdated references to the linux-next wiki
2014-10-28 09:06:11 -04:00
hsi.txt
hw_random.txt
hwspinlock.txt
init.txt
initrd.txt
Intel-IOMMU.txt
intel_txt.txt
io-mapping.txt
io_ordering.txt
iostats.txt
IPMI.txt
IRQ-affinity.txt
IRQ-domain.txt
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt
kernel-docs.txt
kernel-parameters.txt
USB: Update default usb-storage delay_use value in kernel-parameters.txt
2014-11-07 08:54:53 -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
kprobes.txt
Documentation/kprobes: add s390 to list of supported architectures
2014-09-09 08:53:27 +02:00
kref.txt
ldm.txt
local_ops.txt
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
doc: add documentation for mailbox framework
2014-10-08 10:39:41 +05:30
Makefile
Documentation: add makefiles for more targets
2014-09-26 11:02:56 +02:00
ManagementStyle
md.txt
media-framework.txt
memory-barriers.txt
memory-barriers: Fix description of 2-legged-if-based control dependencies
2014-09-07 16:15:53 -07: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
numastat.txt
oops-tracing.txt
panic: add TAINT_SOFTLOCKUP
2014-08-08 15:57:24 -07:00
padata.txt
parport-lowlevel.txt
parport.txt
percpu-rw-semaphore.txt
phy.txt
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
rbtree.txt
remoteproc.txt
rfkill.txt
robust-futex-ABI.txt
robust-futexes.txt
rpmsg.txt
rtc.txt
SAK.txt
SecurityBugs
serial-console.txt
sgi-ioc4.txt
SM501.txt
smsc_ece1099.txt
sparse.txt
stable_api_nonsense.txt
stable_kernel_rules.txt
static-keys.txt
SubmitChecklist
SubmittingDrivers
SubmittingPatches
Documentation/SubmittingPatches: Reported-by tags and permission
2014-10-29 08:56:46 -04:00
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
VGA-softcursor.txt
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