Linus Torvalds
7e29629543
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
1) Fix namespace init and cleanup in phonet to fix some oopses, from
Eric W. Biederman.
2) Missing kfree_skb() in AF_KEY, from Julia Lawall.
3) Refcount leak and source address handling fix in l2tp from James
Chapman.
4) Memory leak fix in CAIF from Tomasz Gregorek.
5) When routes are cloned from ipv6 addrconf routes, we don't process
expirations properly. Fix from Gao Feng.
6) Fix panic on DMA errors in atl1 driver, from Tony Zelenoff.
7) Only enable interrupts in 8139cp driver after we've registered the
IRQ handler. From Jason Wang.
8) Fix too many reads of KS_CIDER register in ks8851 during probe,
fixing crashes on spurious interrupts. From Matt Renzelmann.
9) Missing include in ath5k driver and missing iounmap on probe
failure, from Jonathan Bither.
10) Fix RX packet handling in smsc911x driver, from Will Deacon.
11) Fix ixgbe WoL on fiber by leaving the laser on during shutdown.
12) ks8851 needs MAX_RECV_FRAMES increased otherwise the internal MAC
buffers are easily overflown. Fix from Davide Cimingahi.
13) Fix memory leaks in peak_usb CAN driver, from Jesper Juhl.
14) gred packet scheduler can dump in WRED more when doing a netlink
dump. Fix from David Ward.
15) Fix MTU in USB smsc75xx driver, from Stephane Fillod.
16) Dummy device needs ->ndo_uninit handler to properly handle
->ndo_init failures. From Hiroaki SHIMODA.
17) Fix TX fragmentation in ath9k driver, from Sujith Manoharan.
18) Missing RTNL lock in ixgbe PM resume, from Benjamin Poirier.
19) Missing iounmap in farsync WAN driver, from Julia Lawall.
20) With LRO/GRO, tcp_grow_window() is easily tricked into not growing
the receive window properly, and this hurts performance. Fix from
Eric Dumazet.
21) Network namespace init failure can leak net_generic data, fix from
Julian Anastasov.
22) Fix skb_over_panic due to mis-accounting in TCP for partially ACK'd
SKBs. From Eric Dumazet.
23) New IDs for qmi_wwan driver, from Bjørn Mork.
24) Fix races in ax25_exit(), from Eric W. Biederman.
25) IPV6 TCP doesn't handle TCP_MAXSEG socket option properly, copy over
logic from the IPV4 side. From Neal Cardwell.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (59 commits)
tcp: fix TCP_MAXSEG for established IPv6 passive sockets
drivers/net: Do not free an IRQ if its request failed
drop_monitor: allow more events per second
ks8851: Fix request_irq/free_irq mismatch
net/hyperv: Adding cancellation to ensure rndis filter is closed
ks8851: Fix mutex deadlock in ks8851_net_stop()
net ax25: Reorder ax25_exit to remove races.
icplus: fix interrupt for IC+ 101A/G and 1001LF
net: qmi_wwan: support Sierra Wireless MC77xx devices in QMI mode
bnx2x: off by one in bnx2x_ets_e3b0_sp_pri_to_cos_set()
ksz884x: don't copy too much in netdev_set_mac_address()
tcp: fix retransmit of partially acked frames
netns: do not leak net_generic data on failed init
net/sock.h: fix sk_peek_off kernel-doc warning
tcp: fix tcp_grow_window() for large incoming frames
drivers/net/wan/farsync.c: add missing iounmap
davinci_mdio: Fix MDIO timeout check
ipv6: clean up rt6_clean_expires
ipv6: fix rt6_update_expires
arcnet: rimi: Fix device name in debug output
...
2012-04-22 21:02:57 -07:00
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
2012-04-15 17:35:19 -07:00
mfd: Convert twl6040 to i2c driver, and separate it from twl core
2012-04-16 16:45:34 +02:00
mfd: Fix modular builds of rc5t583 regulator support
2012-04-16 21:27:07 +02:00
mmc: remove MMC bus legacy suspend/resume method
2012-04-20 20:30:19 -04:00
MTD merge for 3.4
2012-03-30 17:31:56 -07:00
netfilter: ip6_tables: ip6t_ext_hdr is now static inline
2012-04-09 16:29:34 +02:00
nfsd: include cld.h in the headers_install target
2012-04-16 15:19:12 -04:00
pinctrl: include <linux/bug.h> to prevent compile errors
2012-04-11 09:31:01 +02:00
avr32: fix build failures from mis-naming of atmel_nand.h
2012-04-02 14:41:25 -07:00
regulator: Fixes for -rc1
2012-04-04 10:09:30 -07:00
usb: fixes for v3.4-rc cycle
2012-04-16 08:35:33 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
block: use lockdep_assert_held for queue locking
2012-03-30 12:33:28 +02:00
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-29 18:12:23 -07:00
cpuidle: power_usage should be declared signed integer
2012-03-30 03:23:30 -04:00
cpumask: remove old cpu_*_map.
2012-03-29 15:38:31 +10:30
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-29 14:46:05 -07:00
crypto: user - Fix size of netlink dump message
2012-03-29 19:52:48 +08:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Merge branch 'for-linus-3.4' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf
2012-03-28 15:02:41 -07:00
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-04-04 17:13:43 -07:00
dmaengine-fixes for 3.4-rc3
2012-04-10 15:30:16 -07:00
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
2012-03-28 14:24:40 -07:00
ethtool: Remove exception to the requirement of holding RTNL lock
2012-04-06 02:43:12 -04:00
migrate ext2_fs.h guts to fs/ext2/ext2.h
2012-03-31 16:03:16 -04:00
firewire: restore the device.h include in linux/firewire.h
2012-04-02 14:41:27 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
fuse: use flexible array in fuse.h
2012-04-12 12:57:08 +02:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
irq: Kill pointless irqd_to_hw export
2012-04-10 22:39:17 -06:00
irq_domain: Move irq_virq_count into NOMAP revmap
2012-04-12 00:37:48 -06:00
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00
kconfig: fix IS_ENABLED to not require all options to be defined
2012-04-12 18:35:58 -07:00
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-31 13:34:04 -07:00
x86,kgdb: Fix DEBUG_RODATA limitation using text_poke()
2012-03-29 17:41:25 -05:00
PM / Sleep: Mitigate race between the freezer and request_firmware()
2012-03-28 23:30:28 +02:00
KVM: unmap pages from the iommu when slots are removed
2012-04-11 22:55:25 -03:00
lsm_audit: don't specify the audit pre/post callbacks in 'struct common_audit_data'
2012-04-03 09:49:59 -07:00
kill mm argument of vm_munmap()
2012-04-21 01:58:20 -04:00
net: fix /proc/net/dev regression
2012-04-03 17:23:23 -04:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-03-28 14:41:36 -07:00
pidns: add reboot_pid_ns() to handle the reboot syscall
2012-03-28 17:14:36 -07:00
PM / QoS: add pm_qos_update_request_timeout() API
2012-03-28 23:31:24 +02:00
radix-tree: introduce bit-optimized iterator
2012-03-28 17:14:37 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
serial/8250_pci: add a "force background timer" flag and use it for the "kt" serial port
2012-04-09 10:38:30 -07:00
skbuff: struct ubuf_info callback type safety
2012-04-13 13:09:19 -04:00
Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
2012-03-28 15:04:26 -07:00
smp: add func to IPI cpus based on parameter func
2012-03-28 17:14:35 -07:00
tcp: tcp_sendpages() should call tcp_push() once
2012-04-05 19:04:27 -04:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
do not export kernel's NULL #define to userspace
2012-04-14 07:47:49 -07:00
memcg swap: use mem_cgroup_uncharge_swap fix
2012-04-05 15:25:51 -07:00
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-29 18:12:23 -07:00
irq: Kill pointless irqd_to_hw export
2012-04-10 22:39:17 -06:00
vgaarb.h: fix build warnings
2012-04-11 09:36:00 +01:00
virtio: drop thaw PM operation
2012-03-31 08:09:50 +05:30
