Linus Torvalds
51a26ae7a1
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
"Just a small pile of fixes"
1) Fix race conditions in IP fragmentation LRU list handling, from
Konstantin Khlebnikov.
2) vfree() is no longer verboten in interrupts, so deferring is
pointless, from Al Viro.
3) Conversion from mutex to semaphore in netpoll left trylock test
inverted, caught by Dan Carpenter.
4) 3c59x uses wrong base address when releasing regions, from Sergei
Shtylyov.
5) Bounds checking in TIPC from Dan Carpenter.
6) Fastopen cookies should not be expired as aggressively as other TCP
metrics. From Eric Dumazet.
7) Fix retrieval of MAC address in ibmveth, from Ben Herrenschmidt.
8) Don't use "u16" in virtio user headers, from Stephen Hemminger
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
tipc: potential divide by zero in tipc_link_recv_fragment()
tipc: add a bounds check in link_recv_changeover_msg()
net/usb: new driver for RTL8152
3c59x: fix freeing nonexistent resource on driver unload
netpoll: inverted down_trylock() test
rps_dev_flow_table_release(): no need to delay vfree()
fib_trie: no need to delay vfree()
net: frag, fix race conditions in LRU list maintenance
tcp: do not expire TCP fastopen cookies
net/eth/ibmveth: Fixup retrieval of MAC address
virtio: don't expose u16 in userspace api
2013-05-06 15:51:10 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
atm: he: use mdelay instead of large udelay constants
2013-04-29 13:26:48 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-05-01 13:20:04 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2013-05-06 13:11:19 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-05-01 14:08:52 -07:00
rtc: single_open() leaks
2013-05-05 00:12:29 -04:00
ARM: arm-soc board specific changes for 3.10, part 1
2013-05-04 12:34:30 -07:00
ARM: arm-soc driver changes for 3.10
2013-05-04 12:31:18 -07:00
Merge branch 'pm-cpufreq'
2013-04-29 00:08:46 +02:00
cpuidle: add maintainer entry
2013-04-26 22:30:25 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2013-05-02 14:53:12 -07:00
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
2013-04-30 10:00:49 -07:00
PCI changes for the v3.10 merge window:
2013-04-29 09:30:25 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
GPIO changes for Linux 3.10
2013-05-06 15:40:55 -07:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-05-02 19:40:34 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2013-04-30 09:37:55 -07:00
Merge branch 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-04-30 08:41:21 -07:00
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2013-05-04 13:44:38 -07:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-05-02 14:38:53 -07:00
Merge branch 'pm-cpuidle'
2013-04-28 01:54:49 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-05-01 14:08:52 -07:00
For 3.10 we have a few new MFD drivers for:
2013-05-05 17:36:20 -07:00
IOMMU Updates for Linux v3.10
2013-05-06 14:59:13 -07:00
ARM: arm-soc driver changes for 3.10
2013-05-04 12:31:18 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
Lots of virtio work which wasn't quite ready for last merge window. Plus
2013-05-02 14:14:04 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-05-02 10:16:16 -07:00
MD: ignore discard request for hard disks of hybid raid1/raid10 array
2013-04-30 14:49:36 +10:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-05-02 14:38:53 -07:00
drivers/memstick/host/r592.c: make r592_pm_ops static
2013-04-30 17:04:08 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
For 3.10 we have a few new MFD drivers for:
2013-05-05 17:36:20 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
MMC highlights for 3.10:
2013-05-04 13:45:17 -07:00
We get rid of the general module prefix confusion with a binary config option,
2013-05-05 10:58:06 -07:00
net/usb: new driver for RTL8152
2013-05-06 16:16:52 -04:00
nubus: Kill nubus_proc_detach_device()
2013-05-04 14:47:26 -04:00
ARM: arm-soc driver changes for 3.10
2013-05-04 12:31:18 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-05-02 10:16:16 -07:00
ARM: arm-soc pinctrl changes for Renesas for 3.10
2013-05-04 12:32:41 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-05-02 10:16:16 -07:00
For 3.10 we have a few new MFD drivers for:
2013-05-05 17:36:20 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
Merge remote-tracking branch 'regulator/topic/wm8994' into v3.9-rc8
2013-04-28 02:13:50 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-04-30 09:36:50 -07:00
Lots of virtio work which wasn't quite ready for last merge window. Plus
2013-05-02 14:14:04 -07:00
ARM: arm-soc multiplatform updates for 3.10
2013-05-02 09:38:16 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2013-05-06 12:34:53 -07:00
megaraid: single_open() leak
2013-05-05 00:15:15 -04:00
spi: Updates for v3.10
2013-04-29 16:38:41 -07:00
ssb: implement ssb spuravoid for chipid BCM43222
2013-04-26 08:42:22 -04:00
staging: single_open() leaks
2013-05-05 00:15:43 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
serial: sunsu: add missing platform_driver_unregister() when module exit
2013-05-04 17:39:48 -07:00
gadget: single_open() leaks
2013-05-05 00:16:11 -04:00
uwb: rename random32() to prandom_u32()
2013-04-29 18:28:43 -07:00
vfio updates for v3.10
2013-05-02 14:02:32 -07:00
Lots of virtio work which wasn't quite ready for last merge window. Plus
2013-05-02 14:14:04 -07:00
pwm: Changes for v3.10-rc1
2013-05-06 15:32:36 -07:00
drivers/w1/slaves/w1_ds2760.c: fix the error handling in w1_ds2760_add_slave()
2013-04-30 17:04:08 -07:00
zcache/tmem: Better error checking on frontswap_register_ops return value.
2013-04-30 17:04:01 -07:00
proc: Supply PDE attribute setting accessor functions
2013-05-01 17:29:18 -04:00
ARM: arm-soc driver changes for 3.10
2013-05-04 12:31:18 -07:00
ARM: arm-soc driver changes for 3.10
2013-05-04 12:31:18 -07:00
51a26ae7a1