Linus Torvalds
72a67a94bc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
1) Don't ignore user initiated wireless regulatory settings on cards
with custom regulatory domains, from Arik Nemtsov.
2) Fix length check of bluetooth information responses, from Jaganath
Kanakkassery.
3) Fix misuse of PTR_ERR in btusb, from Adam Lee.
4) Handle rfkill properly while iwlwifi devices are offline, from
Emmanuel Grumbach.
5) Fix r815x devices DMA'ing to stack buffers, from Hayes Wang.
6) Kernel info leak in ATM packet scheduler, from Dan Carpenter.
7) 8139cp doesn't check for DMA mapping errors, from Neil Horman.
8) Fix bridge multicast code to not snoop when no querier exists,
otherwise mutlicast traffic is lost. From Linus Lüssing.
9) Avoid soft lockups in fib6_run_gc(), from Michal Kubecek.
10) Fix races in automatic address asignment on ipv6, which can result
in incorrect lifetime assignments. From Jiri Benc.
11) Cure build bustage when CONFIG_NET_LL_RX_POLL is not set and rename
it CONFIG_NET_RX_BUSY_POLL to eliminate the last reference to the
original naming of this feature. From Cong Wang.
12) Fix crash in TIPC when server socket creation fails, from Ying Xue.
13) macvlan_changelink() silently succeeds when it shouldn't, from
Michael S Tsirkin.
14) HTB packet scheduler can crash due to sign extension, fix from
Stephen Hemminger.
15) With the cable unplugged, r8169 prints out a message every 10
seconds, make it netif_dbg() instead of netif_warn(). From Peter
Wu.
16) Fix memory leak in rtm_to_ifaddr(), from Daniel Borkmann.
17) sis900 gets spurious TX queue timeouts due to mismanagement of link
carrier state, from Denis Kirjanov.
18) Validate somaxconn sysctl to make sure it fits inside of a u16.
From Roman Gushchin.
19) Fix MAC address filtering on qlcnic, from Shahed Shaikh.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (68 commits)
qlcnic: Fix for flash update failure on 83xx adapter
qlcnic: Fix link speed and duplex display for 83xx adapter
qlcnic: Fix link speed display for 82xx adapter
qlcnic: Fix external loopback test.
qlcnic: Removed adapter series name from warning messages.
qlcnic: Free up memory in error path.
qlcnic: Fix ingress MAC learning
qlcnic: Fix MAC address filter issue on 82xx adapter
net: ethernet: davinci_emac: drop IRQF_DISABLED
netlabel: use domain based selectors when address based selectors are not available
net: check net.core.somaxconn sysctl values
sis900: Fix the tx queue timeout issue
net: rtm_to_ifaddr: free ifa if ifa_cacheinfo processing fails
r8169: remove "PHY reset until link up" log spam
net: ethernet: cpsw: drop IRQF_DISABLED
htb: fix sign extension bug
macvlan: handle set_promiscuity failures
macvlan: better mode validation
tipc: fix oops when creating server socket fails
net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL
...
2013-08-03 15:00:23 -07:00
Merge branch 'for-3.11/drivers' of git://git.kernel.dk/linux-block
2013-07-22 19:02:52 -07:00
Documentation/accounting/getdelays.c: avoid strncpy in accounting tool
2013-07-03 16:08:06 -07:00
Power management and ACPI updates for 3.11-rc1
2013-07-03 14:35:40 -07:00
aoe: allow user to disable target failure timeout
2012-12-17 17:15:25 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07:00
arm64: KVM: document kernel object mappings in HYP
2013-06-12 16:42:20 +01:00
backlight: lp855x: remove duplicate platform data
2013-04-29 18:28:19 -07:00
doc: fix misspellings with 'codespell' tool
2013-05-28 12:02:12 +02: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.11/core' of git://git.kernel.dk/linux-block
2013-07-11 13:03:24 -07:00
TTY:console: update document console.txt
2013-05-21 10:21:57 -07:00
cpufreq: rename index as driver_data in cpufreq_frequency_table
2013-06-04 14:25:59 +02:00
cpuidle: make a single register function for all
2013-04-23 13:45:22 +02:00
drivers/dma: remove unused support for MEMSET operations
2013-07-03 16:07:42 -07:00
Add a device-mapper target called dm-switch to provide a multipath
2013-07-11 13:05:40 -07:00
ARM: SoC fixes for 3.11-rc
2013-07-26 12:42:40 -07:00
printk: move to separate directory for easier modification
2013-07-31 14:41:03 -07: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
Documentation/early-userspace/README fix a typo
2013-06-05 16:24:58 +02:00
drm: Add 1600x1200 (UXGA) screen resolution to the built-in EDIDs
2013-04-12 14:06:16 +10:00
doc: fix quite a few typos within Documentation
2012-11-19 14:28:24 +01:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-07-09 16:04:31 -07:00
xfs: update ( #2 ) for 3.11-rc1
2013-07-13 11:40:24 -07:00
firmware loader: document firmware cache mechanism
2012-11-14 15:07:18 -08:00
FMC: add a char-device mezzanine driver
2013-06-18 15:42:15 -07:00
HID: remove x bit from sensor doc
2012-12-14 08:48:59 +01:00
New driver to support GMT G762/G763 pwm fan controllers
2013-07-03 19:56:35 -07:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-07-04 14:02:09 -07:00
Fix example error_injection_tool
2013-04-02 09:39:55 -07:00
IB/ipoib: Add rtnl_link_ops support
2012-09-20 16:49:17 -04:00
Input: MT - Specify that ABS_MT_SLOT must have a minimum of 0
2013-06-13 21:32:00 +02:00
s390/sclp: Add SCLP character device driver
2013-06-26 21:10:13 +02:00
HOWTO ja_JP sync
2013-07-24 22:06:34 -07:00
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2013-07-10 16:06:46 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07:00
doc: fix misspellings with 'codespell' tool
2013-05-28 12:02:12 +02:00
leds: lp55xx: configure the clock detection
2013-04-01 11:04:53 -07:00
block: remove refs to XD disks from documentation
2013-05-17 15:17:12 +02:00
doc: fix misspellings with 'codespell' tool
2013-05-28 12:02:12 +02:00
doc: fix misspellings with 'codespell' tool
2013-05-28 12:02:12 +02:00
mmc: core: Add in support to expose PRV for v4 MMCs
2013-03-22 12:10:42 -04:00
userns: Recommend use of memory control groups.
2013-01-26 22:20:06 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
NFC: Update pn544 documentation
2013-01-10 01:27:46 +01:00
parisc: document the shadow registers
2013-07-09 22:09:19 +02:00
PCI/MSI: Enable multiple MSIs with pci_enable_msi_block_auto()
2013-01-24 17:25:13 +01:00
Merge branch 'pm-assorted'
2013-06-28 13:01:40 +02:00
powerpc/perf: Core EBB support for 64-bit book3s
2013-07-01 11:50:10 +10:00
seccomp: Make syscall skipping and nr changes more consistent
2012-10-02 21:14:29 +10:00
rapidio: documentation update
2013-07-03 16:08:05 -07:00
Merge branches 'cbnum.2013.06.10a', 'doc.2013.06.10a', 'fixes.2013.06.10a', 'srcu.2013.06.10a' and 'tiny.2013.06.10a' into HEAD
2013-06-10 13:46:44 -07:00
s390/cio: add condev keyword to cio_ignore
2013-05-02 15:50:20 +02:00
sched: Rename sched.c as sched/core.c in comments and Documentation
2013-06-19 12:58:42 +02:00
[SCSI] megaraid_sas: Changelog and driver version update
2013-06-24 17:52:10 -07:00
Smack: add support for modification of existing rules
2013-03-19 14:16:42 -07:00
stallion: final cleanup
2013-06-03 14:31:39 -07:00
ALSA: hda - Update HD-Audio-Models.txt
2013-06-17 11:16:33 +02:00
Documentation: remove __dev* attributes.
2013-01-03 15:57:16 -08:00
net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL
2013-08-01 15:11:17 -07:00
target: Simplify fabric sense data length handling
2012-09-17 17:12:58 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2013-07-11 12:26:08 -07:00
nohz_full: Document additional restrictions
2013-06-10 13:42:38 -07:00
The majority of the changes here are cleanups for the large changes that
2013-07-11 09:02:09 -07:00
Driver core patches for 3.11-rc1
2013-07-02 11:44:19 -07:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2013-07-13 12:09:57 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07:00
zswap: add documentation
2013-07-10 18:11:34 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07:00
watchdog: delete mpcore_wdt driver
2013-07-11 21:47:58 +02:00
arm: add support for LZ4-compressed kernel
2013-07-09 10:33:30 -07:00
xtensa: document MMUv3 setup sequence
2013-05-09 01:07:09 -07:00
[media] v4l2-framework: replace g_chip_ident by g_std in the examples
2013-06-17 09:18:29 -03:00
FMC: add documentation for the core
2013-06-18 15:41:03 -07:00
Documentation: Memory barrier semantics of atomic_xchg()
2013-01-08 14:14:55 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07:00
doc: clk: Fix incorrect wording
2013-06-10 23:54:14 +02:00
Coccinelle: Update information about the minimal version required
2013-07-03 22:58:20 +02:00
Documentation/CodingStyle: allow multiple return statements per function
2013-07-03 16:08:01 -07:00
kernel: delete __cpuinit usage from all core kernel files
2013-07-14 19:36:59 -04:00
/dev/oldmem: Remove the interface
2013-07-03 16:08:03 -07: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: replace dma_buf_export() with dma_buf_export_named()
2013-05-01 16:35:36 +05:30
dmatest: do not allow to interrupt ongoing tests
2013-06-08 02:13:44 +05:30
x86: remove offsets.h from .gitignore and dontdiff
2012-11-19 14:10:53 +01:00
doc: fix misspellings with 'codespell' tool
2013-05-28 12:02:12 +02:00
Merge branch 'devel'
2012-07-29 21:11:05 -03:00
Remove GENERIC_GPIO config option
2013-04-16 18:47:19 +09:00
Documentation: Updated broken link in HOWTO
2013-06-03 14:22:57 -07:00
hwrng: Fix a wrong comment in Documentation/hw_random.txt
2013-03-10 18:16:36 +08:00
Documentation: remove depends on CONFIG_EXPERIMENTAL
2013-01-11 11:38:03 -08:00
iostats.txt: add easy-to-find description for field 6
2013-04-29 15:18:50 +02: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: Update references to SGML to refs to XML instead.
2013-05-28 12:02:11 +02:00
The majority of the changes here are cleanups for the large changes that
2013-07-11 09:02:09 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07: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
md: remove doubled description for sync_max, merging it within sync_min/sync_max
2013-07-03 09:43:28 +10:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2013-07-13 12:09:57 -07: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
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07:00
lib: vsprintf: add IPv4/v6 generic %p[Ii]S[pfs] format specifier
2013-07-01 23:22:13 -07:00
pwm: Add sysfs interface
2013-06-21 11:32:51 +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
sched: Rename sched.c as sched/core.c in comments and Documentation
2013-06-19 12:58:42 +02:00
rtc: add ability to push out an existing wakealarm using sysfs
2013-07-03 16:07:54 -07: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
sched: Rename sched.c as sched/core.c in comments and Documentation
2013-06-19 12:58:42 +02:00
Finally eradicate CONFIG_HOTPLUG
2013-06-03 14:20:18 -07:00
checkpatch: add Suggested-by as a standard signature
2013-04-29 18:28:20 -07:00
Documentation/sysrq: fix inconstistent help message of sysrq key
2013-04-30 17:04:10 -07:00
percpu: add documentation on this_cpu operations
2013-04-04 10:24:53 -07:00
vfio Updates for v3.11
2013-07-10 14:50:08 -07:00
mutex: Add support for wound/wait style locks
2013-06-26 12:10:56 +02:00
72a67a94bc
