Linus Torvalds
b175293ccc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
1) Always increment IPV4 ID field in encapsulated GSO packets, even
when DF is set. Regression fix from Pravin B Shelar.
2) Fix per-net subsystem initialization in netfilter conntrack,
otherwise we may access dynamically allocated memory before it is
actually allocated. From Gao Feng.
3) Fix DMA buffer lengths in iwl3945 driver, from Stanislaw Gruszka.
4) Fix race between submission of sync vs async commands in mwifiex
driver, from Amitkumar Karwar.
5) Add missing cancel of command timer in mwifiex driver, from Bing
Zhao.
6) Missing SKB free in rtlwifi USB driver, from Jussi Kivilinna.
7) Thermal layer tries to use a genetlink multicast string that is
longer than the 16 character limit. Fix it and add a BUG check to
prevent this kind of thing from happening in the future.
From Masatake YAMATO.
8) Fix many bugs in the handling of the teardown of L2TP connections,
UDP encapsulation instances, and sockets. From Tom Parkin.
9) Missing socket release in IRDA, from Kees Cook.
10) Fix fec driver modular build, from Fabio Estevam.
11) Erroneous use of kfree() instead of free_netdev() in lantiq_etop,
from Wei Yongjun.
12) Fix bugs in handling of queue numbers and steering rules in mlx4
driver, from Moshe Lazer, Hadar Hen Zion, and Or Gerlitz.
13) Some FOO_DIAG_MAX constants were defined off by one, fix from Andrey
Vagin.
14) TCP segmentation deferral is unintentionally done too strongly,
breaking ACK clocking. Fix from Eric Dumazet.
15) net_enable_timestamp() can legitimately be invoked from software
interrupts, and in a way that is safe, so remove the WARN_ON().
Also from Eric Dumazet.
16) Fix use after free in VLANs, from Cong Wang.
17) Fix TCP slow start retransmit storms after SACK reneging, from
Yuchung Cheng.
18) Unix socket release should mark a socket dead before NULL'ing out
sock->sk, otherwise we can race. Fix from Paul Moore.
19) IPV6 addrconf code can try to free static memory, from Hong Zhiguo.
20) Fix register mis-programming, NULL pointer derefs, and wrong PHC
clock frequency in IGB driver. From Lior LevyAlex Williamson, Jiri
Benc, and Jeff Kirsher.
21) skb->ip_summed logic in pch_gbe driver is reversed, breaking packet
forwarding. Fix from Veaceslav Falico.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (65 commits)
ipv4: Fix ip-header identification for gso packets.
bonding: remove already created master sysfs link on failure
af_unix: dont send SCM_CREDENTIAL when dest socket is NULL
pch_gbe: fix ip_summed checksum reporting on rx
igb: fix PHC stopping on max freq
igb: make sensor info static
igb: SR-IOV init reordering
igb: Fix null pointer dereference
igb: fix i350 anti spoofing config
ixgbevf: don't release the soft entries
ipv6: fix bad free of addrconf_init_net
unix: fix a race condition in unix_release()
tcp: undo spurious timeout after SACK reneging
bnx2x: fix assignment of signed expression to unsigned variable
bridge: fix crash when set mac address of br interface
8021q: fix a potential use-after-free
net: remove a WARN_ON() in net_enable_timestamp()
tcp: preserve ACK clocking in TSO
net: fix *_DIAG_MAX constants
net/mlx4_core: Disallow releasing VF QPs which have steering rules
...
2013-03-26 14:24:29 -07:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-02-26 09:24:48 -08:00
Fairly unexciting MTD merge for 3.9:
2013-03-02 16:33:54 -08:00
libceph: add support for HASHPSPOOL pool flag
2013-02-26 15:03:06 -08:00
arm-soc: soc-specific updates
2013-02-21 15:27:22 -08:00
hsi: fix kernel-doc warnings
2013-03-01 13:39:00 -08:00
Input: atmel_mxt_ts - Support for touchpad variant
2013-03-08 16:03:29 -08:00
iio: Fix build error seen if IIO_TRIGGER is defined but IIO_BUFFER is not
2013-03-02 16:31:21 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-02-20 11:00:43 -08:00
ImgTec Meta architecture changes for v3.9-rc1
2013-03-03 12:06:09 -08:00
Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux
2013-02-28 18:02:55 -08:00
mfd: wm831x: Don't forward declare enum wm831x_auxadc
2013-03-12 09:29:20 +01:00
Main batch of InfiniBand/RDMA changes for 3.9:
2013-02-26 11:41:08 -08:00
mmc: sh_mobile_sdhi: remove unused .pdata field
2013-02-24 14:37:22 -05:00
mtd: nand: reintroduce NAND_NO_READRDY as NAND_NEED_READRDY
2013-03-14 12:48:54 +00:00
Merge branch 'master' of git://1984.lsi.us.es/nf
2013-02-26 17:24:26 -05:00
pinctrl: generic: rename input schmitt disable
2013-02-15 09:52:29 +01:00
Fairly unexciting MTD merge for 3.9:
2013-03-02 16:33:54 -08:00
bq2415x_charger: Add support for offline and 100mA mode
2013-02-16 13:34:10 -08:00
regulator: core: update kernel documentation for regulator_desc
2013-03-01 06:07:22 +00:00
sched: move RR_TIMESLICE from sysctl.h to rt.h
2013-02-22 09:20:11 -08:00
Staging tree update for 3.9-rc1
2013-02-21 12:11:44 -08:00
NFS client bugfixes for Linux 3.9
2013-03-02 16:46:07 -08:00
USB fixes for 3.9-rc3
2013-03-22 12:45:55 -07:00
x86, ACPI, mm: Revert movablemem_map support
2013-03-02 09:34:39 -08:00
bdi: allow block devices to say that they require stable page writes
2013-02-21 17:22:19 -08:00
watchdog: bcm47xx_wdt.c: use platform device
2013-03-01 12:47:16 +01:00
fs/exec.c: make bprm_mm_init() static
2013-02-26 02:46:13 -05:00
Input: bma150 - make some defines public and fix some comments
2013-02-15 18:52:45 -08:00
memory-hotplug: common APIs to support page tables hot-remove
2013-02-23 17:50:12 -08:00
Btrfs: move fs/btrfs/ioctl.h to include/uapi/linux/btrfs.h
2013-02-20 09:37:28 -05:00
bug.h, compiler.h: introduce compiletime_assert & BUILD_BUG_ON_MSG
2013-02-21 17:22:16 -08:00
mm: compaction: make __compact_pgdat() and compact_pgdat() return void
2013-02-23 17:50:10 -08:00
fix compat truncate/ftruncate
2013-02-25 09:24:55 -05:00
compiler-gcc.h: Add gcc-recommended GCC_VERSION macro
2013-02-21 17:22:15 -08:00
compiler-gcc{3,4}.h: Use GCC_VERSION macro
2013-02-21 17:22:15 -08:00
compiler{,-gcc4}.h, bug.h: Remove duplicate macros
2013-02-21 17:22:15 -08:00
bug.h, compiler.h: introduce compiletime_assert & BUILD_BUG_ON_MSG
2013-02-21 17:22:16 -08:00
sched: add wait_for_completion_io[_timeout]
2013-02-15 16:45:06 +01:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-02-25 16:46:44 -08:00
vfs: kill FS_REVAL_DOT by adding a d_weak_revalidate dentry op
2013-02-26 02:46:09 -05:00
lockdep: check that no locks held at freeze time
2013-02-27 19:10:11 -08:00
dm: add target num_write_bios fn
2013-03-01 22:45:49 +00:00
Driver core patches for 3.9-rc1
2013-02-21 12:05:51 -08:00
dm kcopyd: introduce configurable throttling
2013-03-01 22:45:49 +00:00
dma-buf: implement vmap refcounting in the interface logic
2013-02-27 15:13:36 +05:30
dmaengine: add dma_request_slave_channel_compat()
2013-02-27 22:37:34 +05:30
dmaengine: dw_dmac: move to generic DMA binding
2013-02-28 09:53:21 +05:30
eCryptfs: allow userspace messaging to be disabled
2013-03-03 23:59:59 -08:00
EDAC: Merge mci.mem_is_per_rank with mci.csbased
2013-03-16 06:32:30 +01:00
A few fixes to reduce places where pstore might hang
2013-02-21 09:38:18 -08:00
Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block
2013-02-28 12:52:24 -08:00
default SET_PERSONALITY() in linux/elf.h
2013-02-26 02:46:08 -05:00
include/linux/eventfd.h: fix incorrect filename is a comment
2013-02-27 19:10:23 -08:00
memory-hotplug: remove /sys/firmware/memmap/X sysfs
2013-02-23 17:50:12 -08:00
lockdep: check that no locks held at freeze time
2013-02-27 19:10:11 -08:00
fs: Limit sys_mount to only request filesystem modules.
2013-03-03 19:36:31 -08:00
constify path_get/path_put and fs_struct.c stuff
2013-03-01 23:51:07 -05:00
new helper: file_inode(file)
2013-02-22 23:31:31 -05:00
block: fix part_pack_uuid() build error
2013-02-26 03:10:52 +11:00
irq: Remove IRQ_EXIT_OFFSET workaround
2013-02-22 00:05:07 +01:00
kprobes: Make hash_64() as always inlined
2013-03-18 10:21:23 +01:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
video: Add generic HDMI infoframe helpers
2013-02-22 08:20:05 +01:00
Merge branches 'for-3.9/logitech', 'for-3.9/multitouch', 'for-3.9/ntrig', 'for-3.9/thingm' and 'for-3.9/upstream' into for-linus
2013-02-21 10:45:01 +01:00
mm: remove unused memclear_highpage_flush()
2013-02-23 17:50:16 -08:00
mm/rmap: rename anon_vma_unlock() => anon_vma_unlock_write()
2013-02-23 17:50:17 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
idr: deprecate idr_pre_get() and idr_get_new[_above]()
2013-03-13 15:21:47 -07:00
mac80211: advertise operating mode notification capability
2013-02-15 09:41:42 +01:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
vlan: adjust vlan_set_encap_proto() for its callers
2013-02-23 21:00:06 -05:00
sched/rt: Add <linux/sched/rt.h> header to <linux/init_task.h>
2013-02-19 08:06:01 +01:00
ipmi: remove superfluous kernel/userspace explanation
2013-02-27 19:10:21 -08:00
irq_work.h: fix warning when CONFIG_IRQ_WORK=n
2013-03-22 16:41:19 -07:00
printk: Provide a wake_up_klogd() off-case
2013-03-22 16:41:20 -07:00
ksm: remove old stable nodes more thoroughly
2013-02-23 17:50:19 -08:00
Revert "KVM: allow host header to be included even for !CONFIG_KVM"
2013-03-22 08:08:06 -03:00
list: Fix double fetch of pointer in hlist_entry_safe()
2013-03-14 13:18:30 -07:00
xen-blkfront: drop the use of llist_for_each_entry_safe
2013-02-19 15:17:08 -05:00
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-02-22 19:25:09 -08:00
lib/lzo: Update LZO compression to current upstream version
2013-02-20 19:36:01 +01:00
x86, ACPI, mm: Revert movablemem_map support
2013-03-02 09:34:39 -08:00
mm: refactor inactive_file_is_low() to use get_lru_size()
2013-02-23 17:50:20 -08:00
memory-hotplug: export the function try_offline_node()
2013-02-23 17:50:13 -08:00
mm: remove offlining arg to migrate_pages
2013-02-23 17:50:19 -08:00
ImgTec Meta architecture changes for v3.9-rc1
2013-03-03 12:06:09 -08:00
mm: fold page->_last_nid into page->flags where possible
2013-02-23 17:50:17 -08:00
mm: introduce VM_POPULATE flag to better deal with racy userspace programs
2013-02-23 17:50:11 -08:00
mm: zone_end_pfn is too small
2013-03-22 16:41:20 -07:00
ARM: video: mxs: Fix mxsfb misconfiguring VDCTRL0
2013-03-19 11:07:58 +08:00
v4 GRE: Add TCP segmentation offload for GRE
2013-02-15 15:17:11 -05:00
net: fix a build failure when !CONFIG_PROC_FS
2013-02-19 13:18:13 -05:00
NFS client bugfixes for Linux 3.9
2013-03-02 16:46:07 -08:00
PM / OPP: fix condition for empty of_init_opp_table()
2013-02-23 00:30:08 +01:00
mm: fold page->_last_nid into page->flags where possible
2013-02-23 17:50:17 -08:00
mm: remove MIGRATE_ISOLATE check in hotpath
2013-02-23 17:50:15 -08:00
mm: only enforce stable page writes if the backing device requires it
2013-02-21 17:22:19 -08:00
constify path_get/path_put and fs_struct.c stuff
2013-03-01 23:51:07 -05:00
PCI changes for the v3.9 merge window:
2013-02-25 21:18:18 -08:00
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
2013-02-28 20:42:33 -08:00
perf,x86: fix link failure for non-Intel configs
2013-03-17 15:59:15 -07:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
pm / runtime: introduce pm_runtime_set_memalloc_noio()
2013-02-23 17:50:16 -08:00
pm / runtime: introduce pm_runtime_set_memalloc_noio()
2013-02-23 17:50:16 -08:00
Driver core patches for 3.9-rc1
2013-02-21 12:05:51 -08:00
printk: Provide a wake_up_klogd() off-case
2013-03-22 16:41:20 -07:00
tty/serial patches for 3.9-rc1
2013-02-21 13:41:04 -08:00
pwm: Changes for v3.9-rc1
2013-02-26 09:34:29 -08:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
include/linux/res_counter.h needs errno.h
2013-03-13 15:21:44 -07:00
mm/rmap: rename anon_vma_unlock() => anon_vma_unlock_write()
2013-02-23 17:50:17 -08:00
Driver core patches for 3.9-rc1
2013-02-21 12:05:51 -08:00
lib/scatterlist: use page iterator in the mapping iterator
2013-02-27 19:10:10 -08:00
coredump: remove redundant defines for dumpable states
2013-02-27 19:10:11 -08:00
seqlock: Use seqcount infrastructure
2013-02-19 08:43:34 +01:00
skb: Propagate pfmemalloc on skb from head page only
2013-03-14 11:53:32 -04:00
smp: make smp_call_function_many() use logic similar to smp_call_function_single()
2013-02-21 17:22:20 -08:00
stop_machine: Mark per cpu stopper enabled early
2013-02-26 22:25:17 +01:00
rtc: stmp3xxx: add wdt-accessor function
2013-03-01 12:40:36 +01:00
vmscan: change type of vm_total_pages to unsigned long
2013-02-23 17:50:22 -08:00
thermal: shorten too long mcast group name
2013-03-20 17:56:58 -04:00
arm-soc: cleanups
2013-02-21 14:58:40 -08:00
udp: add encap_destroy callback
2013-03-20 12:10:38 -04:00
mm: don't wait on congested zones in balance_pgdat()
2013-02-23 17:50:15 -08:00
mm: numa: handle side-effects in count_vm_numa_events() for !CONFIG_NUMA_BALANCING
2013-02-23 17:50:16 -08:00
watchdog: core: dt: add support for the timeout-sec dt property
2013-03-01 12:48:36 +01:00
