Linus Torvalds
9eb127cc04
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
...
Pull networking fixes from David Miller:
1) Really fix tuntap SKB use after free bug, from Eric Dumazet.
2) Adjust SKB data pointer to point past the transport header before
calling icmpv6_notify() so that the headers are in the state which
that function expects. From Duan Jiong.
3) Fix ambiguities in the new tuntap multi-queue APIs. From Jason
Wang.
4) mISDN needs to use del_timer_sync(), from Konstantin Khlebnikov.
5) Don't destroy mutex after freeing up device private in mac802154,
fix also from Konstantin Khlebnikov.
6) Fix INET request socket leak in TCP and DCCP, from Christoph Paasch.
7) SCTP HMAC kconfig rework, from Neil Horman.
8) Fix SCTP jprobes function signature, otherwise things explode, from
Daniel Borkmann.
9) Fix typo in ipv6-offload Makefile variable reference, from Simon
Arlott.
10) Don't fail USBNET open just because remote wakeup isn't supported,
from Oliver Neukum.
11) be2net driver bug fixes from Sathya Perla.
12) SOLOS PCI ATM driver bug fixes from Nathan Williams and David
Woodhouse.
13) Fix MTU changing regression in 8139cp driver, from John Greene.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (45 commits)
solos-pci: ensure all TX packets are aligned to 4 bytes
solos-pci: add firmware upgrade support for new models
solos-pci: remove superfluous debug output
solos-pci: add GPIO support for newer versions on Geos board
8139cp: Prevent dev_close/cp_interrupt race on MTU change
net: qmi_wwan: add ZTE MF880
drivers/net: Use of_match_ptr() macro in smsc911x.c
drivers/net: Use of_match_ptr() macro in smc91x.c
ipv6: addrconf.c: remove unnecessary "if"
bridge: Correctly encode addresses when dumping mdb entries
bridge: Do not unregister all PF_BRIDGE rtnl operations
use generic usbnet_manage_power()
usbnet: generic manage_power()
usbnet: handle PM failure gracefully
ksz884x: fix receive polling race condition
qlcnic: update driver version
qlcnic: fix unused variable warnings
net: fec: forbid FEC_PTP on SoCs that do not support
be2net: fix wrong frag_idx reported by RX CQ
be2net: fix be_close() to ensure all events are ack'ed
...
2012-12-19 20:29:15 -08:00
..
accessibility
acpi
Merge branch 'x86-acpi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-12-14 10:03:23 -08:00
amba
ARM: arm-soc: Cleanups on various subarchitectures
2012-12-12 11:51:39 -08:00
ata
1) More ACPI fixes
2012-12-15 12:37:18 -08:00
atm
solos-pci: ensure all TX packets are aligned to 4 bytes
2012-12-19 14:53:53 -08:00
auxdisplay
base
Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-12-14 09:59:59 -08:00
bcma
MTD pull for 3.8
2012-12-19 12:47:41 -08:00
block
Merge branch 'akpm' (Andrew's patch-bomb)
2012-12-17 20:58:12 -08:00
bluetooth
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-12-12 18:07:07 -08:00
bus
ARM: OMAP: Fix drivers to depend on omap for internal devices
2012-12-16 15:23:37 -08:00
cdrom
char
A few /dev/random improvements for the v3.8 merge window.
2012-12-19 20:23:37 -08:00
clk
MTD pull for 3.8
2012-12-19 12:47:41 -08:00
clocksource
ARM: arm-soc: Updates for Marvell mvebu/kirkwood
2012-12-14 14:54:26 -08:00
connector
cpufreq
ACPI and power management updates for 3.8-rc1
2012-12-11 12:45:35 -08:00
cpuidle
ARM: arm-soc: SoC updates for 3.8
2012-12-12 12:05:15 -08:00
crypto
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-12-18 09:58:09 -08:00
dca
devfreq
Merge branch 'pm-devfreq'
2012-12-07 23:13:36 +01:00
dio
dma
dmatest: check for dma mapping error
2012-12-17 17:15:13 -08:00
edac
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-12-14 14:27:45 -08:00
eisa
extcon
firewire
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
firmware
efi: Fix the build with user namespaces enabled.
2012-12-17 20:14:15 -08:00
gpio
gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG
2012-12-19 22:15:14 +00:00
gpu
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2012-12-19 20:24:25 -08:00
hid
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-12-13 19:22:22 -08:00
hsi
hv
hwmon
hwmon: (twl4030-madc-hwmon) Fix warning message caused by removal of __devexit
2012-12-16 18:21:33 -08:00
hwspinlock
i2c
Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux
2012-12-18 16:51:10 -08:00
ide
idle
iio
This is the MFD patch set for the 3.8 merge window.
2012-12-16 18:55:20 -08:00
infiniband
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-12-18 09:58:09 -08:00
input
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-12-19 12:56:42 -08:00
iommu
ARM: arm-soc: Header cleanups
2012-12-12 11:45:16 -08:00
ipack
TTY/Serial merge for 3.8-rc1
2012-12-11 14:08:47 -08:00
irqchip
ARM: arm-soc: Device-tree updates, take 2
2012-12-14 14:42:53 -08:00
isdn
mISDN: fix race in timer canceling on module unloading
2012-12-14 13:14:07 -05:00
leds
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2012-12-15 12:52:42 -08:00
lguest
macintosh
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-12-18 09:58:09 -08:00
md
md update for 3.8
2012-12-18 09:32:44 -08:00
media
fbdev changes for 3.8:
2012-12-15 13:03:48 -08:00
memory
memstick
message
drivers/message/fusion/mptscsih.c: missing break
2012-12-18 15:02:12 -08:00
mfd
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-12-18 12:46:37 -08:00
misc
Sound updates for 3.8-rc1
2012-12-13 11:51:23 -08:00
mmc
This is the MFD patch set for the 3.8 merge window.
2012-12-16 18:55:20 -08:00
mtd
MTD pull for 3.8
2012-12-19 12:47:41 -08:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-12-19 20:29:15 -08:00
nfc
nubus
of
of: Fix export of of_find_matching_node_and_match()
2012-12-19 10:58:53 +00:00
oprofile
parisc
parport
pci
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2012-12-13 14:20:19 -08:00
pcmcia
ARM: arm-soc: Header cleanups
2012-12-12 11:45:16 -08:00
pinctrl
ARM: arm-soc: multiplatform conversion patches
2012-12-13 10:57:16 -08:00
platform
Corentin has moved
2012-12-17 17:15:14 -08:00
pnp
Driver core updates for 3.8-rc1
2012-12-11 13:13:55 -08:00
power
In part2:
2012-12-19 08:14:08 -08:00
pps
ps3
ptp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-12-12 18:07:07 -08:00
pwm
pwm: Changes for v3.8-rc1
2012-12-19 08:19:07 -08:00
rapidio
Driver core updates for 3.8-rc1
2012-12-11 13:13:55 -08:00
regulator
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
remoteproc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
rpmsg
rtc
rtc: DA9055 RTC driver
2012-12-17 17:15:21 -08:00
s390
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2012-12-13 14:20:19 -08:00
sbus
scsi
random32: rename random32 to prandom
2012-12-17 17:15:26 -08:00
sfi
sh
sn
spi
spi/sh-hspi: fix return value check in hspi_probe().
2012-12-19 15:11:41 +00:00
ssb
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-12-14 14:27:45 -08:00
staging
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-12-17 15:44:47 -08:00
target
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-12-15 14:25:10 -08:00
tc
thermal
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
tty
Merge tag 'kvm-3.8-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2012-12-13 15:31:08 -08:00
uio
ARM: arm-soc: SoC updates for 3.8
2012-12-12 12:05:15 -08:00
usb
usb: musb: use io{read,write}*_rep accessors
2012-12-17 17:15:13 -08:00
uwb
vfio
vhost
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-12-15 14:25:10 -08:00
video
backlight: locomolcd: fix checkpatch error and warning
2012-12-18 15:02:11 -08:00
virt
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-12-18 09:58:09 -08:00
virtio
virtio_balloon: introduce migration primitives to balloon pages
2012-12-11 17:22:27 -08:00
vlynq
vme
w1
ARM: OMAP: Fix drivers to depend on omap for internal devices
2012-12-16 15:23:37 -08:00
watchdog
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
xen
Feature:
2012-12-16 17:39:14 -08:00
zorro
Kconfig
Makefile