Linus Torvalds
174808af90
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
1) Fix bluetooth userland regression reported by Keith Packard, from
Gustavo Padovan.
2) Revert ath9k PS idle change, from Sujith Manoharan.
3) Correct default TCP memory limits (again), from Eric Dumazet.
4) Fix tcp_rcv_rtt_update() accidental use of unscaled RTT, from Neal
Cardwell.
5) We made a facility for layers like wireless to say how much tailroom
they need in the SKB for link layer stuff such as wireless
encryption etc., but TCP works hard to fill every SKB out to the end
defeating this specification.
This leads to every TCP packet getting reallocated by the wireless
code in order to have the right amount of tailroom available.
Fix TCP to only fill SKBs out to the real amount of data area it
asked for during the allocation, this way it won't eat into the
slack added for the device's tailroom needs.
Reported by Marc Merlin and fixed by Eric Dumazet.
6) Leaks, endian bugs, and new device IDs in bluetooth from Santosh
Nayak, João Paulo Rechi Vita, Cho, Yu-Chen, Andrei Emeltchenko,
AceLan Kao, and Andrei Emeltchenko.
7) OOPS on tty_close fix in bluetooth's hci_ldisc from Johan Hovold.
8) netfilter erroneously scales TCP window twice, fix from Changli Gao.
9) Memleak fix in wext-core from Julia Lawall.
10) Consistently handle invalid TCP packets in ipv4 vs. ipv6 conntrack,
from Jozsef Kadlecsik.
11) Validate IP header length properly in netfilter conntrack's
ipv4_get_l4proto().
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (39 commits)
NFC: Fix the LLCP Tx fragmentation loop
rtlwifi: Add missing DMA buffer unmapping for PCI drivers
rtlwifi: Preallocate USB read buffers and eliminate kalloc in read routine
tcp: avoid order-1 allocations on wifi and tx path
net: allow pskb_expand_head() to get maximum tailroom
bridge: Do not send queries on multicast group leaves
MAINTAINERS: Mark NATSEMI driver as orphan'd.
tcp: fix tcp_rcv_rtt_update() use of an unscaled RTT sample
tcp: restore correct limit
Revert "ath9k: fix going to full-sleep on PS idle"
rt2x00: Fix rfkill_polling register function.
bcma: fix build error on MIPS; implicit pcibios_enable_device
netfilter: nf_conntrack: fix incorrect logic in nf_conntrack_init_net
netfilter: nf_ct_ipv4: packets with wrong ihl are invalid
netfilter: nf_ct_ipv4: handle invalid IPv4 and IPv6 packets consistently
net/wireless/wext-core.c: add missing kfree
rtlwifi: Fix oops on rate-control failure
mac80211: Convert WARN_ON to WARN_ON_ONCE
rtlwifi: rtl8192de: Fix firmware initialization
nl80211: ensure interface is up in various APIs
...
2012-04-12 14:04:33 -07:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-03-29 15:34:57 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2012-03-28 10:01:29 -07:00
mxs-dma : move the mxs dma.h to a more common place
2012-03-27 00:37:23 +01:00
MFD changes for 3.4
2012-03-28 13:56:35 -07:00
Input: ili210x - add support for Ilitek ILI210x based touchscreens
2012-03-17 12:20:44 -07:00
Various small bugfixes and enhancements, plus two new drivers:
2012-03-30 16:09:02 -07:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
MMC highlights for 3.4:
2012-03-28 20:59:45 -07:00
MTD merge for 3.4
2012-03-30 17:31:56 -07:00
netfilter: ipset: avoid use of kernel-only types
2012-03-26 21:06:30 +02:00
netfilter: remove ipt_SAME.h and ipt_realm.h
2012-03-07 17:40:56 +01:00
netfilter: ip6_tables: ip6t_ext_hdr is now static inline
2012-04-09 16:29:34 +02:00
nfsd: add a header describing upcall to nfsdcld
2012-03-26 11:49:47 -04:00
pinctrl: introduce generic pin config
2012-03-12 22:49:02 +01:00
avr32: fix build failures from mis-naming of atmel_nand.h
2012-04-02 14:41:25 -07:00
Add I2C driver for Summit Microelectronics SMB347 Battery Charger.
2012-03-26 20:41:01 +04:00
md: Use existed macros instead of numbers
2012-03-13 11:21:23 +11:00
regulator: Fixes for -rc1
2012-04-04 10:09:30 -07:00
ARM: More device tree support updates
2012-03-28 12:34:33 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
Merge nfs containerization work from Trond's tree
2012-03-26 11:48:54 -04:00
USB: EHCI: Add a generic platform device driver
2012-03-15 12:42:07 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
apple_bl: Add register/unregister functions
2012-03-22 09:31:55 -04:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
constify path argument of audit_log_d_path()
2012-03-20 21:29:40 -04:00
__register_binfmt() made void
2012-03-20 21:29:46 -04:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
bitops: introduce for_each_clear_bit()
2012-03-23 16:58:34 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
cgroup: revert ss_id_lock to spinlock
2012-03-21 17:55:01 -07:00
clk: basic clock hardware types
2012-03-16 20:35:02 +00:00
clk: basic clock hardware types
2012-03-16 20:35:02 +00:00
clk: introduce the common clock framework
2012-03-16 20:35:01 +00:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
vmscan: only defer compaction for failed order and higher
2012-03-21 17:54:56 -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
include/ and checkpatch: prefer __scanf to __attribute__((format(scanf,...)
2012-03-23 16:58:36 -07:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -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
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
crc32: bolt on crc32c
2012-03-23 16:58:38 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
crypto: user - Fix size of netlink dump message
2012-03-29 19:52:48 +08:00
vfs: d_alloc_root() gone
2012-03-20 21:29:37 -04:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
debugfs-related mode_t whack-a-mole
2012-03-20 21:29:53 -04:00
PM / devfreq: add relation of recommended frequency.
2012-03-17 21:51:34 +01:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-03-21 18:55:10 -07:00
common: DMA-mapping: add NON-CONSISTENT attribute
2012-03-28 16:36:44 +02: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
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
drivercore: Add driver probe deferral mechanism
2012-03-08 11:53:13 -08: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
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
vfs: drop_file_write_access() made static
2012-03-20 21:29:32 -04:00
firewire: allow explicit flushing of iso packet completions
2012-03-18 22:15:39 +01: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
perf: Add ifdef to remove unused enum switch warnings
2012-03-14 08:47:58 -04:00
GPIO changes for v3.4
2012-03-28 14:08:46 -07:00
Input: gpio_keys - add support for interrupt only keys
2012-03-19 17:56:18 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
thp: add HPAGE_PMD_* definitions for !CONFIG_TRANSPARENT_HUGEPAGE
2012-03-21 17:55:02 -07:00
hugetlbfs: fix alignment of huge page requests
2012-03-21 17:54:59 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
Tools: hv: Support enumeration from all the pools
2012-03-16 13:36:04 -07:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
eql: dont rely on HZ=100
2012-03-27 22:45:26 -04:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
arp: allow arp processing to honor per interface arp_accept sysctl
2012-03-16 23:00:20 -07:00
cpuset: mm: reduce large amounts of memory barrier related damage v3
2012-03-21 17:54:59 -07:00
Merge branch 'for-next' of github.com:rydberg/linux into next
2012-03-09 10:56:35 -08:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04: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
jbd2: cleanup journal tail after transaction commit
2012-03-13 22:45:38 -04:00
jbd2: remove bh_state lock from checkpointing code
2012-03-13 22:45:25 -04:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
vt:tackle kbd_table
2012-03-08 10:50:35 -08:00
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00
pagemap: export KPF_THP
2012-03-21 17:54:57 -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
NFS client updates for Linux 3.4
2012-03-23 08:53:47 -07:00
vt:tackle kbd_table
2012-03-08 10:50:35 -08: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: Allow host IRQ sharing for assigned PCI 2.3 devices
2012-03-08 14:11:36 +02:00
Merge branch 'kvm-updates/3.4' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2012-03-28 14:35:31 -07:00
leds-lm3530: support pwm input mode
2012-03-23 16:58:35 -07:00
drivers/leds/leds-lp5521.c: support led pattern data
2012-03-23 16:58:34 -07:00
Add #includes needed to permit the removal of asm/system.h
2012-03-28 18:30:03 +01:00
backlight: new backlight driver for LP855x devices
2012-03-23 16:58:33 -07:00
lp8727_charger: Correct typos on the comment
2012-03-26 20:40:59 +04:00
lsm_audit: don't specify the audit pre/post callbacks in 'struct common_audit_data'
2012-04-03 09:49:59 -07:00
magic.h: move some FS magic numbers into magic.h
2012-03-23 16:58:31 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
math: Introduce div64_long
2012-03-15 21:41:34 +01:00
memcg: fix performance of mem_cgroup_begin_update_page_stat()
2012-03-21 17:55:02 -07:00
mm: replace PAGE_MIGRATION with IS_ENABLED(CONFIG_MIGRATION)
2012-03-21 17:54:57 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-03-28 17:19:28 -07:00
vmscan: only defer compaction for failed order and higher
2012-03-21 17:54:56 -07:00
remoteproc/rpmsg: new subsystem
2012-03-27 16:30:09 -07:00
module: move __module_get and try_module_get() out of line.
2012-03-26 12:50:52 +10:30
params: <level>_initcall-like kernel parameters
2012-03-26 12:50:51 +10:30
[SCSI] st: expand ability to write immediate filemarks
2012-03-27 08:26:34 +01:00
net: fix /proc/net/dev regression
2012-04-03 17:23:23 -04:00
Merge nfs containerization work from Trond's tree
2012-03-26 11:48:54 -04:00
NFS: Fix more NFS debug related build warnings
2012-03-21 09:31:44 -04:00
NFSv4.1: Clean ups and bugfixes for the pNFS read/writeback/commit code
2012-03-17 11:09:33 -04:00
NFS: Remove nfs4_setup_sequence from generic rename code
2012-03-21 09:31:46 -04:00
cfg80211: Add background scan period attribute.
2012-03-12 14:19:34 -04:00
nmi watchdog: do not use cpp symbol in Kconfig
2012-03-23 16:58:31 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-03-28 14:41:36 -07:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
of/mtd/nand: add generic bindings and helpers
2012-03-15 23:28:19 +08:00
mm, oom: force oom kill on sysrq+f
2012-03-21 17:54:58 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
padata: Fix race on sequence number wrap
2012-03-14 17:25:56 +08:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
memcg: remove PCG_FILE_MAPPED
2012-03-21 17:55:01 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-03-23 14:02:12 -07:00
perf: Move mmap page data_head offset assertion out of header
2012-03-24 08:46:59 +01:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
pidns: add reboot_pid_ns() to handle the reboot syscall
2012-03-28 17:14:36 -07:00
magic.h: move some FS magic numbers into magic.h
2012-03-23 16:58:31 -07:00
Merge branch 'pm-qos'
2012-03-16 21:49:24 +01:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
PM / QoS: add pm_qos_update_request_timeout() API
2012-03-28 23:31:24 +02:00
poll: add poll_requested_events() and poll_does_not_wait() functions
2012-03-23 16:58:38 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
prctl: add PR_{SET,GET}_CHILD_SUBREAPER to allow simple process supervision
2012-03-23 16:58:32 -07:00
driver core merge for 3.4-rc1
2012-03-20 11:16:20 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
fs: initial qnx6fs addition
2012-03-20 21:29:38 -04:00
radix-tree: introduce bit-optimized iterator
2012-03-28 17:14:37 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
move private bits of reiserfs_fs.h to fs/reiserfs/reiserfs.h
2012-03-20 21:29:43 -04:00
take private bits of reiserfs_xattr.h to fs/reiserfs/xattr.h
2012-03-20 21:29:42 -04:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
rmap: remove __anon_vma_link() declaration
2012-03-21 17:54:57 -07:00
rtc: Provide flag for rtc devices that don't support UIE
2012-03-15 18:23:10 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-03-21 13:25:04 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
TTY: serial, simplify ASYNC_USR_MASK
2012-03-08 11:38:50 -08:00
serial: introduce generic port in/out helpers
2012-03-09 12:47:56 -08:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
sh: remove clk_ops
2012-03-12 22:19:13 +01:00
tcp: avoid order-1 allocations on wifi and tx path
2012-04-11 10:11:12 -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: reduce out_of_order memory use
2012-03-19 16:53:08 -04: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
locking/kconfig: Simplify INLINE_SPIN_UNLOCK usage
2012-03-23 13:18:57 +01:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
memcg swap: use mem_cgroup_uncharge_swap fix
2012-04-05 15:25:51 -07:00
x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep.
2012-03-13 14:06:33 -04: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
ntp: Fix leap-second hrtimer livelock
2012-03-22 19:43:43 -07:00
constify path argument of trace_seq_path()
2012-03-20 21:29:40 -04:00
ptrace: the killed tracee should not enter the syscall
2012-03-23 16:58:40 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
TTY: tty_driver, document tty->ops->shutdown limitation
2012-03-08 11:38:51 -08:00
irq: Kill pointless irqd_to_hw export
2012-04-10 22:39:17 -06:00
USB: dynamically allocate usb_device children pointers instead of using a fix array
2012-03-13 14:24:07 -07:00
vgaarb.h: fix build warnings
2012-04-11 09:36:00 +01:00
[media] V4L: Improve the selection API documentation
2012-03-19 15:33:24 -03:00
virtio: drop thaw PM operation
2012-03-31 08:09:50 +05:30
remoteproc/rpmsg: new subsystem
2012-03-27 16:30:09 -07:00
vt:tackle kbd_table
2012-03-08 10:50:35 -08:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
watchdog: Add support for WDIOC_GETTIMELEFT IOCTL in watchdog core
2012-03-27 20:15:37 +02:00
