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 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
2013-03-03 10:16:19 -08:00
doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
2012-11-26 14:22:21 +01:00
ACPI / Documentation: refer to correct file for acpi_platform_device_ids[] table
2013-02-13 13:43:02 +01:00
aoe: allow user to disable target failure timeout
2012-12-17 17:15:25 -08:00
fbdev changes for 3.8:
2012-12-15 13:03:48 -08:00
arm64: Add simple earlyprintk support
2013-01-22 17:51:01 +00:00
backlight: lp855x_bl: support new LP8557 device
2013-02-21 17:22:25 -08:00
cfq-iosched: enable full blkcg hierarchy support
2013-01-09 08:05:11 -08:00
nbd: update documentation and link to mailinglist
2013-02-27 19:10:22 -08:00
ARM: OMAP2+: gpmc: generic timing calculation
2012-11-09 18:07:11 +05:30
Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block
2013-02-28 12:52:24 -08:00
connector: Move cn_test.c away from NLMSG_PUT().
2012-06-26 21:19:02 -07:00
cpufreq: Update Documentation for cpus and related_cpus
2013-02-02 00:01:16 +01:00
Honor state disabling in the cpuidle ladder governor
2012-09-04 01:35:44 +02:00
KEYS: Document asymmetric key type
2012-10-08 13:50:12 +10:30
md updates for 3.9
2013-03-05 17:22:08 -08:00
This is the first batch of MFD fixes for 3.9.
2013-03-15 17:34:01 -07:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-02-25 16:46:44 -08:00
lib: devres: Introduce devm_ioremap_resource()
2013-01-22 09:41:43 -08:00
[media] get_dvb_firmware: Fix the location of firmware for Terratec HTC
2013-01-01 11:18:26 -02:00
drm: Load EDID: Explain better how to write your own EDID firmware
2013-01-20 19:22:19 +10:00
doc: fix quite a few typos within Documentation
2012-11-19 14:28:24 +01: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
firmware loader: document firmware cache mechanism
2012-11-14 15:07:18 -08:00
HID: remove x bit from sensor doc
2012-12-14 08:48:59 +01:00
hwmon: (lm75) Fix tcn75 prefix
2013-03-18 21:19:49 +01:00
i2c: Fix my e-mail address in drivers and documentation
2013-03-22 11:18:34 +01:00
doc: aliasing-test: close fd on write error
2012-09-01 09:57:10 -07:00
IB/ipoib: Add rtnl_link_ops support
2012-09-20 16:49:17 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-03-11 07:49:37 -07:00
wanrouter: completely decouple obsolete code from kernel.
2013-01-31 19:20:33 -05:00
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2013-02-27 12:28:30 -08:00
kexec: update URL of kexec homepage
2012-07-18 18:35:57 -07:00
Documentation/laptops: remove depends on CONFIG_EXPERIMENTAL
2013-01-21 14:52:42 -08:00
Documentation: leds: update LP55xx family devices
2013-02-06 15:59:30 -08:00
metag: Basic documentation
2013-03-02 20:09:50 +00:00
doc: fix quite a few typos within Documentation
2012-11-19 14:28:24 +01:00
mmc: core: Extend sysfs to ext_csd parameters for RPMB support
2012-12-06 13:54:48 -05:00
userns: Recommend use of memory control groups.
2013-01-26 22:20:06 -08:00
ipvs: add backup_only flag to avoid loops
2013-03-19 21:21:51 +09:00
NFC: Update pn544 documentation
2013-01-10 01:27:46 +01:00
PCI/MSI: Enable multiple MSIs with pci_enable_msi_block_auto()
2013-01-24 17:25:13 +01:00
PM / OPP: improve introductory documentation
2013-03-04 14:23:11 +01:00
powerpc: Documentation for transactional memory on powerpc
2013-02-15 17:02:25 +11:00
seccomp: Make syscall skipping and nr changes more consistent
2012-10-02 21:14:29 +10:00
Merge branches 'urgent.2012.10.27a', 'doc.2012.11.16a', 'fixes.2012.11.13a', 'srcu.2012.10.27a', 'stall.2012.11.13a', 'tracing.2012.11.08a' and 'idle.2012.10.24a' into HEAD
2012-11-16 09:59:58 -08:00
sched: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW
2012-09-13 16:52:04 +02:00
[SCSI] megaraid_sas: Version and Changelog update
2013-02-22 15:37:15 +00:00
Documentation: fix Documentation/security/00-INDEX
2012-12-17 17:15:22 -08:00
tty: Update serial core API documentation
2013-01-15 21:57:44 -08:00
ALSA: documentation: Fix typo in Documentation/sound
2013-03-17 10:12:13 +01:00
Documentation: remove __dev* attributes.
2013-01-03 15:57:16 -08:00
Documentation/sysctl/kernel.txt: document /proc/sys/shmall
2013-01-04 16:11:46 -08:00
target: Simplify fabric sense data length handling
2012-09-17 17:12:58 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2013-02-28 19:48:26 -08:00
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-03-11 07:54:29 -07:00
USB: report submission of active URBs
2012-11-11 18:10:46 -08:00
[media] radio-si470x doc: add info about v4l2-ctl and sox+alsa
2013-02-13 17:33:20 -02:00
Merge tag 'kvm-3.9-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2013-02-24 13:07:18 -08:00
ksm: add some comments
2013-02-23 17:50:23 -08:00
w1: w1_therm: Add force-pullup option for "broken" sensors
2013-02-18 13:55:24 -08:00
watchdog: core: dt: add support for the timeout-sec dt property
2013-03-01 12:48:36 +01:00
Merge branch 'x86/microcode' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-02-22 19:22:52 -08:00
xtensa: initialize atomctl SR
2012-12-18 21:10:22 -08:00
Driver core patches for 3.9-rc1
2013-02-21 12:05:51 -08:00
ImgTec Meta architecture changes for v3.9-rc1
2013-03-03 12:06:09 -08:00
Documentation: Memory barrier semantics of atomic_xchg()
2013-01-08 14:14:55 -08:00
coccicheck: Allow the user to give a V= (verbose) argument
2013-02-22 11:39:13 +01:00
Documentation: remove depends on CONFIG_EXPERIMENTAL
2013-01-11 11:38:03 -08:00
doc: Add x86 CPU0 online/offline feature
2012-11-14 09:39:44 -08:00
firmware: remove last vestiges of dabusb
2012-11-21 13:03:01 -08:00
Documentation/DMA-API-HOWTO.txt: fix typo
2013-02-27 19:10:23 -08:00
dma-debug: New interfaces to debug dma mapping errors
2012-10-24 17:06:43 +02:00
common: DMA-mapping: add DMA_ATTR_FORCE_CONTIGUOUS attribute
2012-11-29 03:30:34 -08:00
dma-buf: implement vmap refcounting in the interface logic
2013-02-27 15:13:36 +05:30
x86: remove offsets.h from .gitignore and dontdiff
2012-11-19 14:10:53 +01:00
dynamic_debug: dynamic hex dump
2013-01-17 12:19:09 -08:00
Merge branch 'devel'
2012-07-29 21:11:05 -03:00
MCA: delete all remaining traces of microchannel bus support.
2012-05-17 19:06:13 -04:00
gpiolib: provide provision to register pin ranges
2012-11-11 19:06:00 +01:00
HOWTO: fix double words typo
2012-12-10 15:54:27 +01:00
Documentation/initrd.txt: Change the location of util-linux
2012-05-25 16:18:34 +02:00
Documentation: remove depends on CONFIG_EXPERIMENTAL
2013-01-11 11:38:03 -08:00
ipmi: add options to disable openfirmware and PCI scanning
2013-02-27 19:10:21 -08:00
irqdomain: update documentation
2012-12-05 23:52:10 +00:00
Kernel-doc: Convention: Use a "Return" section to describe return values
2012-11-27 21:08:57 +01:00
ImgTec Meta architecture changes for v3.9-rc1
2013-03-03 12:06:09 -08:00
Documentation: Fix "struct kobj_type" to include newer members.
2012-09-04 16:06:34 -07:00
kref: Add kref_get_unless_zero documentation
2012-11-28 18:36:06 +10:00
locking/stat: Fix a typo
2013-02-19 08:42:37 +01:00
wanrouter: completely decouple obsolete code from kernel.
2013-01-31 19:20:33 -05:00
Documentation: ManagementStyle: fixed typo
2012-06-28 12:03:15 +02:00
[media] Documentation/media-framework.txt: fix a sentence
2013-02-08 13:27:13 -02:00
Documentation: Memory barrier semantics of atomic_xchg()
2013-01-08 14:14:55 -08:00
hotplug: update nodemasks management
2012-12-12 17:38:33 -08:00
percpu-rw-semaphore: fix documentation typos
2012-09-26 19:56:15 +02:00
drivers/pinctrl: grab default handles from device core
2013-01-23 16:39:51 +01:00
Randy has moved
2013-03-08 15:05:34 -08:00
pwm: add devm_pwm_get() and devm_pwm_put()
2012-09-10 17:05:45 +02:00
pstore/ftrace: Convert to its own enable/disable debugfs knob
2012-09-06 22:16:58 -07:00
rbtree: move augmented rbtree functionality to rbtree_augmented.h
2012-10-09 16:22:40 +09:00
remoteproc: add rproc_report_crash function to notify rproc crashes
2012-09-18 12:53:22 +03:00
Documentation: remove __dev* attributes.
2013-01-03 15:57:16 -08:00
rtc-proc: permit the /proc/driver/rtc device to use other devices
2012-10-06 03:05:01 +09:00
mfd: smsc: Add support for smsc gpio io/keypad driver
2012-10-01 15:27:48 +02:00
Documentation/sparse.txt: document context annotations for lock checking
2012-12-17 17:15:23 -08:00
stable: Allow merging of backports for serious user-visible performance issues
2012-06-25 12:11:58 -07:00
Randy has moved
2013-03-08 15:05:34 -08:00
sparc64: Add global PMU register dumping via sysrq.
2012-10-16 09:34:01 -07:00
vfio: Trivial Documentation correction
2012-09-21 10:48:03 -06:00
workqueue: reimplement WQ_HIGHPRI using a separate worker_pool
2012-07-13 22:24:45 -07:00
b175293ccc
