Linus Torvalds
23f347ef63
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking updates from David Miller:
1) Fix inaccuracies in network driver interface documentation, from Ben
Hutchings.
2) Fix handling of negative offsets in BPF JITs, from Jan Seiffert.
3) Compile warning, locking, and refcounting fixes in netfilter's
xt_CT, from Pablo Neira Ayuso.
4) phonet sendmsg needs to validate user length just like any other
datagram protocol, fix from Sasha Levin.
5) Ipv6 multicast code uses wrong loop index, from RongQing Li.
6) Link handling and firmware fixes in bnx2x driver from Yaniv Rosner
and Yuval Mintz.
7) mlx4 erroneously allocates 4 pages at a time, regardless of page
size, fix from Thadeu Lima de Souza Cascardo.
8) SCTP socket option wasn't extended in a backwards compatible way,
fix from Thomas Graf.
9) Add missing address change event emissions to bonding, from Shlomo
Pongratz.
10) /proc/net/dev regressed because it uses a private offset to track
where we are in the hash table, but this doesn't track the offset
pullback that the seq_file code does resulting in some entries being
missed in large dumps.
Fix from Eric Dumazet.
11) do_tcp_sendpage() unloads the send queue way too fast, because it
invokes tcp_push() when it shouldn't. Let the natural sequence
generated by the splice paths, and the assosciated MSG_MORE
settings, guide the tcp_push() calls.
Otherwise what goes out of TCP is spaghetti and doesn't batch
effectively into GSO/TSO clusters.
From Eric Dumazet.
12) Once we put a SKB into either the netlink receiver's queue or a
socket error queue, it can be consumed and freed up, therefore we
cannot touch it after queueing it like that.
Fixes from Eric Dumazet.
13) PPP has this annoying behavior in that for every transmit call it
immediately stops the TX queue, then calls down into the next layer
to transmit the PPP frame.
But if that next layer can take it immediately, it just un-stops the
TX queue right before returning from the transmit method.
Besides being useless work, it makes several facilities unusable, in
particular things like the equalizers. Well behaved devices should
only stop the TX queue when they really are full, and in PPP's case
when it gets backlogged to the downstream device.
David Woodhouse therefore fixed PPP to not stop the TX queue until
it's downstream can't take data any more.
14) IFF_UNICAST_FLT got accidently lost in some recent stmmac driver
changes, re-add. From Marc Kleine-Budde.
15) Fix link flaps in ixgbe, from Eric W. Multanen.
16) Descriptor writeback fixes in e1000e from Matthew Vick.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)
net: fix a race in sock_queue_err_skb()
netlink: fix races after skb queueing
doc, net: Update ndo_start_xmit return type and values
doc, net: Remove instruction to set net_device::trans_start
doc, net: Update netdev operation names
doc, net: Update documentation of synchronisation for TX multiqueue
doc, net: Remove obsolete reference to dev->poll
ethtool: Remove exception to the requirement of holding RTNL lock
MAINTAINERS: update for Marvell Ethernet drivers
bonding: properly unset current_arp_slave on slave link up
phonet: Check input from user before allocating
tcp: tcp_sendpages() should call tcp_push() once
ipv6: fix array index in ip6_mc_add_src()
mlx4: allocate just enough pages instead of always 4 pages
stmmac: re-add IFF_UNICAST_FLT for dwmac1000
bnx2x: Clear MDC/MDIO warning message
bnx2x: Fix BCM57711+BCM84823 link issue
bnx2x: Clear BCM84833 LED after fan failure
bnx2x: Fix BCM84833 PHY FW version presentation
bnx2x: Fix link issue for BCM8727 boards.
...
2012-04-06 10:37:38 -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
Documentation: update cgroupfs mount point
2011-06-15 21:52:50 -07:00
Update documentation for parameter *notrigger* in einj.txt
2012-03-30 03:30:19 -04:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
backlight: new backlight driver for LP855x devices
2012-03-23 16:58:33 -07:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
Documentation: drop as block elevator reference in switching-sched.txt
2011-11-04 12:01:48 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
documentation: remove references to cpu_*_map.
2012-03-29 15:38:31 +10:30
Documentation/: it's -> its where appropriate
2010-04-23 02:09:52 +02:00
Doc: cpufreq: Fix typo and outdated line
2011-11-08 10:23:29 +01:00
cpuidle: add a sysfs entry to disable specific C state for debug purpose.
2012-03-30 01:52:58 -04:00
Documentation: Update stable address
2011-12-12 14:14:31 -08:00
dm: add verity target
2012-03-28 18:43:38 +01:00
ARM: SoC fixes for 3.4-rc2
2012-04-05 22:13:39 -07:00
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00
Merge remote-tracking branches 'regulator/topic/devm' and 'regulator/topic/stub' into regulator-next
2012-03-18 21:38:28 +00:00
[media] lmedm04 RS2000 Firmware details
2012-03-19 14:55:55 -03:00
drm: allow loading an EDID as firmware to override broken monitor
2012-03-20 10:09:28 +00:00
fault-injection: update documentation with the mmc module param
2011-10-26 16:32:13 -04:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -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
firmware: Update hotplug script
2010-08-05 13:53:34 -07:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
HID: Move hiddev.txt to the new Documentation/hid directory
2011-03-22 11:43:51 +01:00
hwmon: (k10temp) Add support for AMD Trinity CPUs
2012-04-01 10:25:56 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Documentation: update broken web addresses.
2010-08-04 15:21:40 +02:00
Documentation: input.txt: clarify mousedev 'cat' command syntax
2012-03-30 16:03:15 -07:00
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2011-07-25 23:06:24 -07:00
Documentation: mention scripts/diffconfig tool
2012-03-30 16:03:15 -07:00
[S390] Add s390x description to Documentation/kdump/kdump.txt
2011-12-27 11:27:13 +01:00
driver-core: documentation: fix up Greg's email address
2012-02-15 14:48:01 -08:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
drivers/leds/leds-lp5521.c: support led pattern data
2012-03-23 16:58:34 -07:00
Documentation: add pointer to name_to_dev_t for root= values
2011-08-03 14:25:21 -10:00
kbuild: introduce HDR_ARCH_LIST for headers_install_all
2010-12-14 22:16:19 +01:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
mmc: core: Fixup delayed work clock gating patch
2012-01-11 23:58:43 -05:00
Documentation: update broken web addresses.
2010-08-04 15:21:40 +02:00
Documentation/: it's -> its where appropriate
2010-04-23 02:09:52 +02:00
doc, net: Update ndo_start_xmit return type and values
2012-04-06 02:43:13 -04:00
NFC: Driver for NXP Semiconductors PN544 NFC chip.
2011-01-13 08:03:19 -08:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
pcmcia: use autoconfiguration feature for ioports and iomem
2010-09-29 17:20:24 +02:00
PM / Freezer / Docs: Document the beauty of freeze/thaw semantics
2012-02-09 23:55:49 +01:00
Documentation/powerpc/mpc52xx.txt: Checkpatch cleanup
2012-03-18 23:59:34 +01:00
pps: add parallel port PPS signal generator
2011-01-13 08:03:21 -08:00
Kernel documentation for the PTI feature.
2011-05-13 16:31:00 -07:00
ptp: Added a brand new class driver for ptp clocks.
2011-05-23 13:01:00 -07:00
RapidIO: documentation update
2011-11-02 16:07:02 -07:00
rcu: Call out dangers of expedited RCU primitives
2012-02-21 09:06:08 -08:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
sched: Remove sched_switch
2012-01-27 13:28:53 +01:00
SCSI updates on 20120331
2012-03-31 13:31:23 -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
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
sh: clkfwk: Kill off unused clk_set_rate_ex().
2010-11-15 18:25:12 +09:00
Documentation: replace install commands with softdeps
2012-03-30 16:03:15 -07:00
spi: create a message queueing infrastructure
2012-03-07 19:19:48 -07:00
Documentation: add missing tainted bits to Documentation/sysctl/kernel.txt
2012-02-06 16:29:19 -08:00
Documentation: Fix typo in tcm_mod_builder.py
2012-02-10 09:52:18 +01:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
thermal: Rename generate_netlink_event
2012-01-23 03:15:25 -05:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-03-20 21:12:50 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Document the vDSO and add a reference parser
2011-07-14 17:57:09 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07: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
mm: move hugepage test examples to tools/testing/selftests/vm
2012-03-28 17:14:37 -07:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
watchdog: Add support for WDIOC_GETTIMELEFT IOCTL in watchdog core
2012-03-27 20:15:37 +02:00
x86-64, doc: Remove int 0xcc from entry_64.S documentation
2011-08-16 08:04:08 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-03-20 21:04:47 -07:00
crc32: move long comment about crc32 fundamentals to Documentation/
2012-03-23 16:58:37 -07:00
doc: Add load/store guarantees to Documentation/atomic-ops.txt
2011-12-11 10:31:58 -08:00
Documentation: update broken web addresses.
2010-08-04 15:21:40 +02:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
mm: convert mm->cpu_vm_cpumask into cpumask_var_t
2011-05-25 08:39:21 -07:00
Documentation/Changes: remove some really obsolete text
2011-07-11 16:48:38 -07:00
Documentation: common clk API
2012-03-16 20:35:01 +00:00
coccinelle.txt: update documentation to include M= option
2012-01-14 22:25:56 +01:00
Documentation: CodingStyle: add inline assembly guidelines
2012-03-30 16:03:15 -07:00
documentation: remove references to cpu_*_map.
2012-03-29 15:38:31 +10:30
topology/sysfs: Provide book id and siblings attributes
2010-09-09 20:41:25 +02:00
crc32: move long comment about crc32 fundamentals to Documentation/
2012-03-23 16:58:37 -07:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
vhost-net: add module alias (v2.1)
2012-01-13 10:12:23 -08:00
crypto: digital signature verification support
2011-11-09 12:10:37 +02:00
Documentation/DMA-API-HOWTO.txt: fix misleading example
2011-07-26 16:49:45 -07:00
include/linux/dma-mapping.h: add dma_zalloc_coherent()
2011-11-02 16:07:02 -07:00
common: DMA-mapping: add NON-CONSISTENT attribute
2012-03-28 16:36:44 +02:00
dma-buf: document fd flags and O_CLOEXEC requirement
2012-03-26 11:33:22 +05:30
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
Documentation: remove 'mach' from dontdiff file
2012-03-30 16:03:15 -07:00
dynamic_debug: process multiple debug-queries on a line
2012-01-24 12:50:36 -08:00
EDAC: Correct scrub rate API
2012-03-19 12:03:58 +01:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
Documentation: email-clients: Add better Thunderbird information
2011-08-13 18:34:03 -07:00
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-04-04 10:04:01 -07:00
flex_array: flex_array_prealloc takes a number of elements, not an end
2011-04-28 16:12:47 -04:00
Documentation/gpio.txt: Explain expected pinctrl interaction
2012-03-12 11:27:07 -06:00
Documentation: Update stable address
2011-12-12 14:14:31 -08:00
hwspinlock/core: register a bank of hwspinlocks in a single API call
2011-09-21 19:45:34 +03:00
Documentation: update broken web addresses.
2010-08-04 15:21:40 +02:00
Documentation/iostats.txt: bit-size reference etc.
2011-03-23 20:44:18 +01:00
IPMI: Add the document description of ipmi_get_smi_info
2010-12-14 00:22:00 -05:00
bitmap, irq: add smp_affinity_list interface to /proc/irq
2011-05-25 08:39:45 -07:00
irq_domain: add documentation and MAINTAINERS entry.
2012-02-14 14:06:47 -07:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
docbook: warn on unused doc entries
2010-09-11 16:49:21 -07:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
Merge branch 'for-3.4' of git://linux-nfs.org/~bfields/linux
2012-03-29 14:53:25 -07:00
kmemleak: Handle percpu memory allocation
2011-12-02 16:12:42 +00:00
driver-core: documentation: fix up Greg's email address
2012-02-15 14:48:01 -08:00
tree-wide: fix comment/printk typos
2010-11-01 15:38:34 -04:00
kref: Fix typo in kref documentation
2011-03-07 13:20:05 -08:00
Documentation: update broken web addresses.
2010-08-04 15:21:40 +02:00
lockdep: Update documentation for lock-class leak detection
2011-12-11 10:31:23 -08:00
Documentation: Add statistics about nested locks
2011-05-28 17:03:29 +02:00
watchdog: Update documentation
2012-02-11 15:11:28 +01:00
drivers/net: fix up stale paths from driver reorg
2012-01-30 12:54:40 -05:00
mm: move hugepage test examples to tools/testing/selftests/vm
2012-03-28 17:14:37 -07:00
doc: fix wrong arch/i386 references
2011-06-13 13:43:05 +02:00
md: create externally visible flags for supporting hot-replace.
2011-12-23 10:17:51 +11:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
memory hotplug: Allow memory blocks to span multiple memory sections
2011-02-03 16:08:57 -08:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
mutex: Fix annotations to include it in kernel-locking docbook
2010-09-03 08:19:51 +02:00
Doc: Update numastat.txt
2012-02-28 16:05:06 +01:00
module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree
2011-11-07 07:54:42 +10:30
Documentation/padata.txt: fix typos etc.
2010-08-11 08:59:18 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
pinctrl: enhance mapping table to support pin config operations
2012-03-05 11:25:11 +01:00
Documentation: update printk-formats.txt
2011-06-15 21:52:50 -07:00
Documentation: add Ramoops usage description
2011-08-13 18:34:03 -07:00
Documentation: Update augmented rbtree documentation
2011-07-24 10:03:05 -07:00
remoteproc: remove the single rpmsg vdev limitation
2012-03-06 19:14:12 +02:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
rpmsg: add virtio-based remote processor messaging bus
2012-02-08 22:53:58 +02:00
variable name fix to Documentation/rt-mutex-design.txt
2010-06-05 17:39:09 +02:00
RTC: Fix up rtc.txt documentation to reflect changes to generic rtc layer
2011-03-09 11:25:10 -08:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
update email address
2010-07-19 10:56:54 +02:00
Documentation/spinlocks.txt: Remove reference to sti()/cli()
2011-07-11 12:45:04 -07:00
doc: stable_api_nonsense.txt: fix paragraph to make more sense.
2011-03-30 12:02:05 +02:00
stable: update documentation to ask for kernel version
2012-01-24 10:50:22 -08:00
static keys: Add docs better explaining the whole 'struct static_key' mechanism
2012-02-24 09:12:19 +01:00
Documentation/SubmitChecklist: add RCU debug config options
2011-07-25 20:57:17 -07:00
Documentation: SubmittingDrivers: fix Linus's git tree URL
2011-08-13 18:34:03 -07:00
Documentation: fix spelling error in SubmittingPatches
2011-08-13 18:34:02 -07:00
Documentation: sysrq: Crutcher Dunnavant is unavailable
2012-03-30 16:03:15 -07:00
misc latin1 to utf8 conversions
2012-01-02 13:04:55 +01:00
workqueue: Document debugging tricks
2011-03-31 13:40:42 +02:00
decompressors: add XZ decompressor module
2011-01-13 08:03:24 -08:00
23f347ef63
