Linus Torvalds
0b6280c620
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
1) Don't leak ipvs->sysctl_tbl, from Tommi Rentala.
2) Fix neighbour table entry leak in rocker driver, from Ying Xue.
3) Do not emit bonding notifications for unregistered interfaces, from
Nicolas Dichtel.
4) Set ipv6 flow label properly when in TIME_WAIT state, from Florent
Fourcot.
5) Fix regression in ipv6 multicast filter test, from Henning Rogge.
6) do_replace() in various footables netfilter modules is missing a
check for 0 counters in the datastructure provided by the user. Fix
from Dave Jones, and found with trinity.
7) Fix RCU bug in packet scheduler classifier module unloads, from
Daniel Borkmann.
8) Avoid deadlock in tcp_get_info() by using u64_sync. From Eric
Dumzaet.
9) Input packet processing can race with inetdev_destroy() teardown,
fix potential OOPS in ip_error() by explicitly testing whether the
inetdev is still attached. From Eric W Biederman.
10) MLDv2 parser in bridge multicast code breaks too early while
parsing. Fix from Thadeu Lima de Souza Cascardo.
11) Asking for settings on non-zero PHYID doesn't work because we do not
import the command structure from the user and use the PHYID
provided there. Fix from Arun Parameswaran.
12) Fix UDP checksums with IPV6 RAW sockets, from Vlad Yasevich.
13) Missing NF_TABLES depends for TPROXY etc can cause build failures,
fix from Florian Westphal.
14) Fix netfilter conntrack to handle RFC5961 challenge ACKs properly,
from Jesper Dangaard Brouer.
15) If netlink autobind retry fails, we have to reset the sockets portid
back to zero. From Herbert Xu.
16) VXLAN netns exit code unregisters using wrong device, from John W
Linville.
17) Add some USB device IDs to ath3k and btusb bluetooth drivers, from
Dmitry Tunin and Wen-chien Jesse Sung.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (44 commits)
bridge: fix lockdep splat
net: core: 'ethtool' issue with querying phy settings
bridge: fix parsing of MLDv2 reports
ARM: zynq: DT: Use the zynq binding with macb
net: macb: Disable half duplex gigabit on Zynq
net: macb: Document zynq gem dt binding
ipv4: fill in table id when replacing a route
cdc_ncm: Fix tx_bytes statistics
ipv4: Avoid crashing in ip_error
tcp: fix a potential deadlock in tcp_get_info()
net: sched: fix call_rcu() race on classifier module unloads
net: phy: Make sure phy_start() always re-enables the phy interrupts
ipv6: fix ECMP route replacement
ipv6: do not delete previously existing ECMP routes if add fails
Revert "netfilter: bridge: query conntrack about skb dnat"
netfilter: ensure number of counters is >0 in do_replace()
netfilter: nfnetlink_{log,queue}: Register pernet in first place
tcp: don't over-send F-RTO probes
tcp: only undo on partial ACKs in CA_Loss
net/ipv6/udp: Fix ipv6 multicast socket filter regression
...
2015-05-22 15:44:50 -07:00
platform-drivers-x86 for 4.1
2015-04-26 13:44:46 -07:00
Documentation: use subdir-y to avoid unnecessary built-in.o files
2014-09-26 11:02:55 +02:00
ACPI / documentation: Fix ambiguity in the GPIO properties document
2015-05-04 14:26:14 +02:00
ARM: SoC multiplatform code changes for v4.1
2015-04-22 09:20:15 -07:00
ARM64 / ACPI: additions of ACPI documentation for arm64
2015-03-26 15:13:09 +00:00
Documentation: use subdir-y to avoid unnecessary built-in.o files
2014-09-26 11:02:55 +02:00
Documentation: blackfin: Makefile: Typo building issue
2015-04-11 15:19:31 +02:00
Documentation: Remove mentioning of block barriers
2015-03-20 07:41:56 -06:00
Merge branch 'for-4.1/drivers' of git://git.kernel.dk/linux-block
2015-04-16 22:05:27 -04:00
The documentation tree update for 4.1. Numerous fixes, the overdue removal
2015-04-18 11:10:49 -04:00
cma: debug: document new debugfs interface
2015-04-14 16:49:00 -07:00
intel_pstate: Add num_pstates to sysfs
2015-01-30 01:52:17 +01:00
crypto: doc - AEAD / RNG AF_ALG interface
2015-03-09 21:06:18 +11:00
Documentation: remove outdated references to the linux-next wiki
2014-10-28 09:06:11 -04:00
dm crypt: update URLs to new cryptsetup project page
2015-04-15 12:10:24 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-05-22 15:44:50 -07:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2015-02-18 08:49:20 -08:00
Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus
2015-04-21 09:44:55 -03:00
Char/Misc driver patches for 4.1-rc1
2015-04-21 09:42:58 -07:00
[media] get_dvb_firmware: Update firmware of ITEtech IT9135
2014-09-21 17:03:04 -03:00
xfs: update for 4.1-rc1
2015-04-24 07:08:41 -07:00
doc: fix minor typos in firmware_class README
2014-07-17 18:43:40 -07:00
The documentation tree update for 4.1. Numerous fixes, the overdue removal
2015-04-18 11:10:49 -04:00
HID: sensor: Update document for custom sensor
2015-04-10 22:22:56 +02:00
hwmon: (it87) Add support for IT8620E
2015-04-05 06:01:00 -07:00
i2c: slave: add documentation for i2c-slave-eeprom
2015-03-27 16:53:39 +01:00
virtual: Documentation: simplify and generalize paravirt_ops.txt
2015-02-13 17:15:44 +10:30
IB/mad: add new ioctl to ABI to support new registration options
2014-08-10 20:36:00 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2015-04-21 12:54:08 -07:00
platform/chrome: Add Chrome OS EC userspace device interface
2015-02-26 15:45:06 -08:00
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2015-02-19 10:31:37 -08:00
kernel: add panic_on_warn
2014-12-10 17:41:10 -08:00
thinkpad_acpi: Add adaptive_kbd_mode sysfs attr
2015-03-03 09:00:08 -08:00
Documentation: leds: Add description of LED Flash class extension
2015-03-09 17:18:00 -07:00
Documentation changes for 3.20
2015-02-11 13:03:11 -08:00
Documentation: Build mic/mpssd only for x86_64
2014-12-05 11:18:36 -05:00
Documentation: au1xxx-ide.c has moved
2014-08-26 09:35:53 +02:00
Documentation/misc-devices/mei: Fix indentation of embedded code.
2015-01-29 12:56:20 -07:00
MTD updates for 3.16:
2014-06-11 08:35:34 -07:00
net: rfs: fix crash in get_rps_cpus()
2015-04-26 16:07:57 -04:00
Documentation: Add documentation for Nios2 architecture
2014-12-08 12:56:06 +08:00
The documentation tree update for 4.1. Numerous fixes, the overdue removal
2015-04-18 11:10:49 -04:00
Documentation: use subdir-y to avoid unnecessary built-in.o files
2014-09-26 11:02:55 +02:00
Documentation: Add list of laptop models supported by the Compal driver
2014-06-10 19:11:06 -04:00
Power management and ACPI updates for v4.1-rc1
2015-04-14 20:21:54 -07:00
Revert "powerpc/tm: Abort syscalls in active transactions"
2015-04-30 15:24:58 +10:00
Documentation: Restrict TSC test code to x86
2014-10-28 08:46:27 -04:00
ptp: restore the makefile for building the test program.
2014-10-24 16:07:10 -04:00
rapidio/tsi721_dma: rework scatter-gather list handling
2014-08-08 15:57:24 -07:00
Merge branches 'doc.2015.01.07a', 'fixes.2015.01.15a', 'preempt.2015.01.06a', 'srcu.2015.01.06a', 'stall.2015.01.16a' and 'torture.2015.01.11a' into HEAD
2015-01-15 23:34:34 -08:00
s390/docs: Remove section about script debugging from Debugging390.txt
2015-01-15 11:11:14 +01:00
docs/completion.txt: Various tweaks and corrections
2015-04-04 15:20:26 +02:00
genirq: Remove the deprecated 'IRQF_DISABLED' request_irq() flag entirely
2015-03-05 20:53:06 +01:00
Smack: Updates for Smack documentation
2015-03-31 10:35:31 -07:00
pty: Fix input race when closing
2015-05-10 19:26:37 +02:00
ASoC: Updates for v4.1
2015-04-13 14:14:29 +02:00
Documentation/spi/spidev_test.c: fix warning
2015-04-17 09:04:12 -04:00
Doc/sysctl/kernel.txt: document threads-max
2015-04-17 09:04:07 -04:00
target: Version 2 of TCMU ABI
2015-04-19 22:40:26 -07:00
Documentation: thermal: document of_cpufreq_cooling_register()
2015-01-06 14:39:17 -04:00
documentation: Update NO_HZ_FULL interaction with POSIX timers
2015-02-26 11:57:29 -08:00
coresight: Correcting documentation typographical error
2015-04-03 16:17:03 +02:00
usb: patches for v4.1 merge window
2015-03-24 22:57:49 +01:00
vdso: don't require 64-bit math in standalone test
2014-10-25 10:53:44 -04:00
[media] media/Documentation: New flag EXECUTE_ON_WRITE
2015-04-08 06:35:16 -03:00
KVM: MMU: fix SMAP virtualization
2015-05-11 17:17:50 +02:00
The documentation tree update for 4.1. Numerous fixes, the overdue removal
2015-04-18 11:10:49 -04:00
w1: new w1_ds2406 driver
2014-06-19 17:45:14 -07:00
Documentation: use subdir-y to avoid unnecessary built-in.o files
2014-09-26 11:02:55 +02:00
x86/mm/KASLR: Propagate KASLR status to kernel proper
2015-04-03 15:26:15 +02:00
Documentation:Update Documentation/zh_CN/arm64/memory.txt
2015-04-04 15:20:26 +02:00
Update of Documentation/dmaengine/00-INDEX
2014-12-29 15:28:24 -07:00
Documentation: change "&" to "and" in Documentation/applying-patches.txt
2014-09-26 11:10:11 +02:00
documentation: Clarify memory-barrier semantics of atomic operations
2015-02-26 11:57:31 -08:00
binfmt_misc: touch up documentation a bit
2014-10-14 02:18:16 +02:00
rmap: drop support of non-linear mappings
2015-02-10 14:30:31 -08:00
Documentation: GNU is frequently spelled Gnu
2014-12-29 15:33:17 -07:00
clk: Add rate constraints to clocks
2015-02-02 14:23:42 -08:00
Code of Conflict
2015-02-27 11:44:24 -08:00
The documentation tree update for 4.1. Numerous fixes, the overdue removal
2015-04-18 11:10:49 -04:00
cpumask: fix cpu-hotplug documentation
2015-03-05 13:37:01 +10:30
firewire: revert to 4 GB RDMA, fix protocols using Memory Space
2014-05-29 15:50:30 +02:00
Documentation: correct parameter error for dma_mapping_error
2014-09-26 11:22:29 +02:00
dma-buf: cleanup dma_buf_export() to make it easily extensible
2015-04-21 14:47:16 +05:30
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next
2014-06-04 08:50:34 -07:00
Documentation/email-clients.txt: Fix one grammar mistake, add extra info about TB
2015-03-20 07:41:55 -06:00
doc: Fix misnamed FUTEX_CMP_REQUEUE_PI op constants
2015-01-19 12:05:32 +01:00
scripts/gdb: add basic documentation
2015-02-17 14:34:54 -08:00
Documentation: remove outdated references to the linux-next wiki
2014-10-28 09:06:11 -04:00
ipmi:ssif: Ignore spaces when comparing I2C adapter names
2015-05-05 14:24:45 -05:00
IRQCHIP: Update docs regarding irq_domain_add_tree()
2015-04-01 17:21:35 +02:00
kasan: show gcc version requirements in Kconfig and Documentation
2015-05-05 17:10:10 -07:00
uas: Add US_FL_MAX_SECTORS_240 flag
2015-04-28 12:48:57 +02:00
documentation: Update per-CPU kthreads documentation
2015-02-26 11:57:30 -08:00
Documentation: update the CONFIG_DEBUG_PAGEALLOC description
2015-03-20 07:41:55 -06:00
Documentation: Add CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF case
2014-10-24 13:59:03 -04:00
kobject: grammar fix
2014-12-08 09:07:11 -05:00
kprobes: Update Documentation/kprobes.txt
2015-03-20 07:41:55 -06:00
kselftest: Move the docs to the Documentation dir
2014-11-24 10:49:54 -07:00
percpu: update local_ops.txt to reflect this_cpu operations
2014-12-13 12:42:53 -08:00
lockup-watchdogs: Fix a typo
2014-08-26 09:35:52 +02:00
Documentation: lzo: document part of the encoding
2014-09-28 11:08:00 +02:00
Documentation: Fix a typo in mailbox.txt
2014-11-03 11:54:50 -05:00
Documentation: Remove ZBOOT MMC/SDHI utility and docs
2015-02-24 06:45:25 +09:00
md-cluster: Design Documentation
2015-02-23 07:16:46 -06:00
The documentation tree update for 4.1. Numerous fixes, the overdue removal
2015-04-18 11:10:49 -04:00
mem-hotplug: fix typo in Documentation/memory-hotplug.txt
2015-03-20 07:41:55 -06:00
modsign: change default key details
2015-04-30 09:35:41 -07:00
fs: introduce f_op->mmap_capabilities for nommu mmap support
2015-01-20 14:02:58 -07:00
livepatch: kernel: add TAINT_LIVEPATCH
2014-12-22 15:40:48 +01:00
phy: improved lookup method
2014-11-21 19:48:50 +05:30
pinctrl: fix example .get_group_pins implementation signature
2015-03-18 02:02:20 +01:00
The documentation tree update for 4.1. Numerous fixes, the overdue removal
2015-04-18 11:10:49 -04:00
pstore-ram: Allow optional mapping with pgprot_noncached
2014-12-11 13:38:31 -08:00
rfkill: document rfkill module parameters
2015-01-09 23:22:12 +01:00
Documentation, split up rtc.txt into documentation and test file
2015-03-24 22:01:58 -06:00
stable_kernel_rules: Add clause about specification of kernel versions to patch.
2015-03-26 23:52:24 +01:00
doc: SubmittingPatches: remove dead link, kerneltrap.org no longer works
2014-06-19 15:15:27 +02:00
checkpatch, SubmittingPatches: suggest line wrapping commit messages at 75 columns
2015-04-17 09:03:57 -04:00
Documentation/sysfs-rules.txt: Add device attribute error code documentation
2014-09-19 14:44:51 -07:00
Docs: this_cpu_ops: remove redundant add forms
2014-09-26 11:03:00 +02:00
drivers/vfio: EEH support for VFIO PCI device
2014-08-05 15:28:48 +10:00
xillybus: Move out of staging
2014-09-23 23:44:16 -07:00
0b6280c620
