Linus Torvalds
41a00f7950
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Merge networking fixes from David Miller:
1) Revert Johannes Berg's genetlink locking fix, because it causes
regressions.
Johannes and Pravin Shelar are working on fixing things properly.
2) Do not drop ipv6 ICMP messages without a redirected header option,
they are legal. From Duan Jiong.
3) Missing error return propagation in probing of via-ircc driver.
From Alexey Khoroshilov.
4) Do not clear out broadcast/multicast/unicast/WOL bits in r8169 when
initializing, from Peter Wu.
5) realtek phy driver programs wrong interrupt status bit, from
Giuseppe CAVALLARO.
6) Fix statistics regression in AF_PACKET code, from Willem de Bruijn.
7) Bridge code uses wrong bitmap length, from Toshiaki Makita.
8) SFC driver uses wrong indexes to look up MAC filters, from Ben
Hutchings.
9) Don't pass stack buffers into usb control operations in hso driver,
from Daniel Gimpelevich.
10) Multiple ipv6 fragmentation headers in one packet is illegal and
such packets should be dropped, from Hannes Frederic Sowa.
11) When TCP sockets are "repaired" as part of checkpoint/restart, the
timestamp field of SKBs need to be refreshed otherwise RTOs can be
wildly off. From Andrey Vagin.
12) Fix memcpy args (uses 'address of pointer' instead of 'pointer') in
hostp driver. From Dan Carpenter.
13) nl80211hdr_put() doesn't return an ERR_PTR, but some code believes
it does. From Dan Carpenter.
14) Fix regression in wireless SME disconnects, from Johannes Berg.
15) Don't use a stack buffer for DMA in zd1201 USB wireless driver, from
Jussi Kivilinna.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (33 commits)
ipv4: expose IPV4_DEVCONF
ipv6: handle Redirect ICMP Message with no Redirected Header option
be2net: fix disabling TX in be_close()
Revert "genetlink: fix family dump race"
hso: Fix stack corruption on some architectures
hso: Earlier catch of error condition
sfc: Fix lookup of default RX MAC filters when steered using ethtool
bridge: Use the correct bit length for bitmap functions in the VLAN code
packet: restore packet statistics tp_packets to include drops
net: phy: rtl8211: fix interrupt on status link change
r8169: remember WOL preferences on driver load
via-ircc: don't return zero if via_ircc_open() failed
macvtap: Ignore tap features when VNET_HDR is off
macvtap: Correctly set tap features when IFF_VNET_HDR is disabled.
macvtap: simplify usage of tap_features
tcp: set timestamps for restored skb-s
bnx2x: set VF DMAE when first function has 0 supported VFs
bnx2x: Protect against VFs' ndos when SR-IOV is disabled
bnx2x: prevent VF benign attentions
bnx2x: Consider DCBX remote error
...
2013-08-23 09:54:21 -07:00
dmaengine: PL08x: Avoid collisions with get_signal() macro
2013-07-05 11:40:47 +05:30
bcma: add support for BCM43142
2013-06-27 13:42:16 -04:00
ARM: imx: flexcan: Remove platform file
2013-06-27 15:15:32 +02:00
libceph: fix invalid unsigned->signed conversion for timespec encoding
2013-07-09 12:18:06 -07:00
The common clock framework changes for 3.11 include new clock drivers
2013-07-03 11:54:50 -07:00
lib: add support for LZ4-compressed kernel
2013-07-09 10:33:30 -07:00
mfd: twl-core: Change TWL6025 references to TWL6032
2013-06-20 10:26:29 +02:00
iio:trigger: Fix use_count race condition
2013-07-20 10:18:53 +01:00
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
Second round of IIO fixes for the 3.11 cycle.
2013-08-05 14:04:24 +08:00
net/mlx4_core: Add HW enforcement to VF link state
2013-07-01 13:10:57 -07:00
net/mlx5_core: Support MANAGE_PAGES and QUERY_PAGES firmware command changes
2013-08-15 15:42:57 -07:00
mmc: esdhc: Fix bug when writing to SDHCI_HOST_CONTROL register
2013-07-05 12:48:35 -04:00
pinctrl: set unit for debounce time pinconfig to usec
2013-06-25 15:34:44 +02:00
ARM: pxa: propagate errors from regulator_enable() to pxamci
2013-07-23 12:15:15 -07:00
PM / AVS: SmartReflex: use omap_sr * for enable/disable interface
2013-06-10 10:46:18 -07:00
Merge remote-tracking branch 'regulator/topic/linar' into regulator-next
2013-07-01 11:17:08 +01:00
Merge remote-tracking branch 'spi/topic/xilinx' into spi-next
2013-06-26 16:21:06 +01:00
ssb: add struct for serial flash
2013-06-17 14:38:54 -04:00
SUNRPC: If the rpcbind channel is disconnected, fail the call to unregister
2013-08-07 17:07:18 -04:00
ARM SoC specific changes
2013-07-02 13:43:38 -07:00
Revert "ACPI / video / i915: No ACPI backlight if firmware expects Windows 8"
2013-07-26 14:59:20 +02:00
PCI changes for the v3.11 merge window:
2013-07-03 16:31:35 -07:00
alarmtimer: Add functions for timerfd support
2013-05-29 12:57:34 -07:00
drivers: bus: add ARM CCI support
2013-05-29 15:50:34 -04:00
drivers/dma: remove unused support for MEMSET operations
2013-07-03 16:07:42 -07:00
audit: fix mq_open and mq_unlink to add the MQ root as a hidden parent audit_names record
2013-07-09 10:33:19 -07:00
backlight: add devm_backlight_device_{register,unregister}()
2013-07-03 16:07:43 -07:00
xtensa: remove the second argument of __bio_kmap_atomic()
2013-07-08 01:23:15 -07:00
mm: kill free_all_bootmem_node()
2013-07-03 16:07:39 -07:00
mm: vmscan: take page buffers dirty and locked state into account
2013-07-03 16:07:29 -07:00
Merge branch 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2013-07-23 15:48:35 -07:00
cgroup: remove bcache_subsys_id which got added stealthily
2013-07-09 16:30:35 -07:00
clk: gate: add CLK_GATE_HIWORD_MASK
2013-06-15 20:23:53 -07:00
clocksource: Reselect clocksource when watchdog validated high-res capability
2013-07-05 11:09:28 +02:00
sched: Rename sched.c as sched/core.c in comments and Documentation
2013-06-19 12:58:42 +02:00
vt: delete unneeded function unregister_con_driver
2013-05-20 12:27:59 -07:00
kvm: Move guest entry/exit APIs to context_tracking
2013-05-31 11:32:30 +02:00
kernel: delete __cpuinit usage from all core kernel files
2013-07-14 19:36:59 -04:00
thermal: cpu_cooling: fix stub function
2013-07-08 10:13:40 -04:00
cpufreq: Fix serialization of frequency transitions
2013-07-04 13:12:44 +02:00
cpuidle: simplify multiple driver support
2013-06-11 13:42:38 +02:00
Revert "crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework"
2013-07-24 17:04:16 +10:00
vfs: constify dentry parameter in d_count()
2013-07-20 05:06:27 +04:00
debugfs: add get/set for atomic types
2013-06-03 13:55:01 -07:00
PM / devfreq: add comments and Documentation
2013-06-03 20:20:29 +09:00
dm: optimize use SRCU and RCU
2013-07-10 23:41:18 +01:00
driver core: add default groups to struct class
2013-07-16 10:57:37 -07:00
drivers/dma: remove unused support for MEMSET operations
2013-07-03 16:07:42 -07:00
drbd: Allow online change of al-stripes and al-stripe-size
2013-06-28 16:04:36 +02:00
drbd: Allow online change of al-stripes and al-stripe-size
2013-06-28 16:04:36 +02:00
drbd: Allow online change of al-stripes and al-stripe-size
2013-06-28 16:04:36 +02:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-07-06 14:09:38 -07:00
EDAC: Fix lockdep splat
2013-07-23 16:01:28 -07:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-07-06 14:09:38 -07:00
elevator: Fix a race in elevator switching
2013-07-03 13:25:24 +02:00
err.h: IS_ERR() can accept __user pointers
2013-07-03 16:07:41 -07:00
f2fs: align data types between on-disk and in-memory block addresses
2013-05-28 15:03:04 +09:00
fb: make fp_get_options name argument const
2013-06-27 16:53:30 +08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-06-19 16:49:39 -07:00
firewire: fix libdc1394/FlyCap2 iso event regression
2013-07-27 20:24:36 +02:00
firmware loader: don't export cache_firmware and uncache_firmware
2013-06-06 12:41:57 -07:00
FMC: add needed headers
2013-06-17 16:38:57 -07:00
fmc: avoid readl/writel namespace conflict
2013-06-19 20:30:32 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-07-14 11:42:26 -07:00
FS-Cache: The retrieval remaining-pages counter needs to be atomic_t
2013-06-19 14:16:47 +01:00
Replace a bunch of file->dentry->d_inode refs with file_inode()
2013-06-29 12:57:13 +04:00
tracing: Disable tracing on warning
2013-06-19 23:32:07 -04:00
tracing: Fix fields of struct trace_iterator that are zeroed by mistake
2013-08-02 22:28:41 -04:00
include/linux/gfp.h: fix the comment for GFP_ZONE_TABLE
2013-07-09 10:33:21 -07:00
rcu: Remove TINY_PREEMPT_RCU
2013-06-10 13:45:49 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-07-04 10:29:23 -07:00
mm/hugetlb: remove hugetlb_prefault
2013-07-03 16:07:32 -07:00
Drivers: hv: Add the GUID fot synthetic fibre channel device
2013-06-03 14:09:14 -07:00
mac80211: set mesh formation field properly
2013-06-03 17:03:18 +02:00
net: core: move mac_pton() to lib/net_utils.c
2013-06-05 12:00:27 -07:00
net/core: Add VF link state control
2013-06-13 17:51:04 -07:00
macvtap: Let TUNSETOFFLOAD actually controll offload features.
2013-06-25 16:44:56 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-06-19 16:49:39 -07:00
vlan: mask vlan prio bits
2013-07-18 13:05:23 -07:00
igmp: hash a hash table to speedup ip_check_mc_rcu()
2013-06-12 00:25:23 -07:00
ipv4: expose IPV4_DEVCONF
2013-08-22 20:30:15 -07:00
init.h: remove __cpuinit sections from the kernel
2013-06-26 12:13:18 -04:00
Add arch_phys_wc_{add, del} to manipulate WC MTRRs if needed
2013-05-31 13:02:52 +10:00
FMC: add needed headers
2013-06-17 16:38:57 -07:00
ipv6: drop packets with multiple fragmentation headers
2013-08-20 00:11:24 -07:00
genirq: Add irq_get_trigger_type() to get IRQ flags
2013-06-25 11:48:24 +02:00
irqchip: Add irqchip_init dummy function
2013-06-06 10:23:58 +09:00
irqdomain: make irq_linear_revmap() a fast path again
2013-06-24 14:02:41 +01:00
jbd/jbd2: relocate bit_spinlock header to jbd_common
2013-06-12 23:02:35 -04:00
jbd2: invalidate handle if jbd2_journal_restart() fails
2013-07-01 08:12:41 -04:00
jbd/jbd2: relocate bit_spinlock header to jbd_common
2013-06-12 23:02:35 -04:00
net: convert lls to use time_in_range()
2013-07-02 15:53:53 -07:00
tracing: Fix trace_dump_stack() proto when CONFIG_TRACING is not set
2013-08-02 22:38:10 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
KVM fixes for 3.11
2013-07-03 13:21:40 -07:00
lcd: add devm_lcd_device_{register,unregister}()
2013-07-03 16:07:43 -07:00
ahci: make ahci_transmit_led_message into a function pointer
2013-06-06 14:05:23 -07:00
linked-list: Remove __list_for_each
2013-07-16 22:00:14 -07:00
llist: llist_add() can use llist_add_batch()
2013-07-13 13:29:32 +04:00
lib: add lz4 compressor module
2013-07-09 10:33:30 -07:00
phy: Add Marvell 88E1510 phy ID
2013-05-31 00:48:22 -07:00
include/linux/math64.h: add div64_ul()
2013-06-12 16:29:47 -07:00
mm, memcg: don't take task_lock in task_in_mem_cgroup
2013-07-03 16:07:26 -07:00
Driver core / memory: Simplify __memory_block_change_state()
2013-06-01 21:37:09 +02:00
Memory hotplug: Move alternative function definitions to header
2013-06-01 22:24:07 +02:00
mm: remove unused VM_<READfoo> macros and expand other in-place
2013-07-09 10:33:23 -07:00
x86 get_unmapped_area: Access mmap_legacy_base through mm_struct member
2013-08-22 10:19:35 -07:00
mm: tune vm_committed_as percpu_counter batching size
2013-07-03 16:07:32 -07:00
mm: remove unused functions is_{normal_idx, normal, dma32, dma}
2013-07-09 10:33:22 -07:00
ssb: fix alignment of struct bcma_device_id
2013-07-18 16:21:59 -04:00
There is no /sys/parameters
2013-07-02 15:38:19 +09:30
PCI: Allocate only as many MSI vectors as requested by driver
2013-05-28 11:31:16 -06:00
mutex: Add support for wound/wait style locks
2013-06-26 12:10:56 +02:00
mutex: Move ww_mutex definitions to ww_mutex.h
2013-07-12 12:07:46 +02:00
net: mv643xx_eth: add phy_node to platform_data struct
2013-05-30 17:54:03 -07:00
nbd: correct disconnect behavior
2013-07-03 16:08:05 -07:00
net: do not manually initialize enumerators
2013-06-04 15:17:38 -07:00
MPLS: Add limited GSO support
2013-05-27 22:50:59 -07:00
net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL
2013-08-01 15:11:17 -07:00
netfilter: don't panic on error while walking through the init path
2013-05-23 14:22:30 +02:00
netfilter: add nf_ipv6_ops hook to fix xt_addrtype with IPv6
2013-05-23 11:58:55 +02:00
netlink: fix splat in skb_clone with large messages
2013-06-27 22:44:16 -07:00
netpoll: remove return value from netpoll_rx_disable()
2013-05-27 23:18:50 -07:00
NFSv4: Introduce new label structure
2013-06-08 16:20:14 -04:00
NFS: Make nfs_attribute_cache_expired() non-static
2013-07-09 17:17:07 -04:00
NFS: Client implementation of Labeled-NFS
2013-06-08 16:20:16 -04:00
Merge branch 'labeled-nfs' into linux-next
2013-06-28 16:29:51 -04:00
watchdog: Rename confusing state variable
2013-06-20 15:41:18 +02:00
of: remove CONFIG_OF_DEVICE
2013-06-12 12:37:40 +01:00
dma: of: Remove check on always true condition
2013-06-12 07:49:19 +05:30
of: remove of_platform_driver
2013-06-12 12:37:30 +01:00
mailbox/omap: move the OMAP mailbox framework to drivers
2013-06-11 11:41:51 -05:00
mm/pageblock: remove get/set_pageblock_flags
2013-07-03 16:07:32 -07:00
mm: remove lru parameter from __pagevec_lru_add and remove parts of pagevec API
2013-07-03 16:07:31 -07:00
pci: add pcibios_release_device
2013-06-26 21:10:05 +02:00
Merge branch 'pci/misc' into next
2013-06-26 15:55:52 -06:00
percpu-refcount: use RCU-sched insted of normal RCU
2013-06-16 16:12:26 -07:00
kernel: delete __cpuinit usage from all core kernel files
2013-07-14 19:36:59 -04:00
phy: add reverse MII PHY connection type
2013-05-31 17:19:05 -07:00
kernel/fork.c:copy_process(): don't add the uninitialized child to thread/task/pid lists
2013-07-03 16:08:03 -07:00
Device tree updates for v3.11
2013-07-04 15:51:45 -07:00
PM / Runtime: Rework the "runtime idle" helper routine
2013-06-03 21:49:52 +02:00
PM / Sleep: Fix comment typo in pm_wakeup.h
2013-07-15 01:31:37 +02:00
posix_cpu_timer: consolidate expiry time type
2013-07-03 16:16:20 +02:00
power_supply: Move of_node out of the #ifdef CONFIG_OF
2013-06-28 18:20:52 -07:00
tracing/context-tracking: Add preempt_schedule_context() for tracing
2013-06-19 12:55:10 +02:00
Add include dependencies to <linux/printk.h>.
2013-05-22 01:34:24 +02:00
pstore: Pass header size in the pstore write callback
2013-07-01 18:10:48 +10:00
ptrace: revert "Prepare to fix racy accesses on task breakpoints"
2013-07-09 10:33:26 -07:00
timekeeping: Indicate that clock was set in the pvclock gtod notifier
2013-06-28 23:15:06 +02:00
pwm: Add sysfs interface
2013-06-21 11:32:51 +02:00
rcu: Add _notrace variation of rcu_dereference_raw() and hlist_for_each_entry_rcu()
2013-05-28 22:47:13 -04:00
net: force a reload of first item in hlist_nulls_for_each_entry_rcu
2013-06-02 20:53:59 -07:00
rcu: Shrink TINY_RCU by moving exit_rcu()
2013-06-10 13:45:52 -07:00
rcu: Shrink TINY_RCU by moving exit_rcu()
2013-06-10 13:45:52 -07:00
rcu: Shrink TINY_RCU by moving exit_rcu()
2013-06-10 13:45:52 -07:00
reboot: move arch/x86 reboot= handling to generic kernel
2013-07-09 10:33:29 -07:00
regmap: Add missing header for !CONFIG_REGMAP stubs
2013-08-06 19:49:46 +01:00
mutex: Move ww_mutex definitions to ww_mutex.h
2013-07-12 12:07:46 +02:00
rapidio: change endpoint device name format
2013-07-03 16:08:05 -07:00
rapidio: make enumeration/discovery configurable
2013-05-24 16:22:50 -07:00
rapidio: add udev notification
2013-07-03 16:08:05 -07:00
lib/scatterlist: introduce sg_pcopy_from_buffer() and sg_pcopy_to_buffer()
2013-07-09 10:33:30 -07:00
Revert "x86 get_unmapped_area(): use proper mmap base for bottom-up direction"
2013-08-22 10:18:44 -07:00
sched_clock: Make ARM's sched_clock generic for all architectures
2013-06-12 14:02:13 -07:00
FMC: add needed headers
2013-06-17 16:38:57 -07:00
NFS client updates for Linux 3.11
2013-07-09 12:09:43 -07:00
ipc/sem.c: replace shared sem_otime with per-semaphore value
2013-07-09 10:33:28 -07:00
seq_file: add seq_list_*_percpu helpers
2013-07-08 13:36:41 +04:00
serial: Move "uart_console" def to core header file.
2013-05-20 11:47:21 -07:00
serial: sh-sci: HSCIF support
2013-06-17 18:09:53 +09:00
DMA: shdma: shdma_chan_filter() has to be in shdma-base.h
2013-07-05 11:40:59 +05:30
dmaengine: shdma: fix a build failure on platforms with no DMA support
2013-07-22 19:40:01 -07:00
net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL
2013-08-01 15:11:17 -07:00
slab: add kmalloc() to kernel API documentation
2013-07-07 19:02:59 +03:00
slab: add kmalloc() to kernel API documentation
2013-07-07 19:02:59 +03:00
include/linux/smp.h:on_each_cpu(): switch back to a macro
2013-07-03 16:07:22 -07:00
RDMA/cma: Define native IB address
2013-06-20 13:08:01 -07:00
sched: fix the theoretical signal_wake_up() vs schedule() race
2013-08-13 08:19:26 -07:00
spinlock_api_smp.h: fix preprocessor comments
2013-06-19 23:34:50 +02:00
sched: Rename sched.c as sched/core.c in comments and Documentation
2013-06-19 12:58:42 +02:00
splice: don't pass the address of ->f_pos to methods
2013-06-20 19:02:45 +04:00
rcu: Remove srcu_read_lock_raw() and srcu_read_unlock_raw().
2013-06-10 13:45:25 -07:00
dt:net:stmmac: Add dt specific phy reset callback support.
2013-07-04 14:34:17 -07:00
PM / Sleep: Print last wakeup source on failed wakeup_count write
2013-06-21 00:35:12 +02:00
swap: discard while swapping only if SWAP_FLAG_DISCARD_PAGES
2013-07-03 16:07:32 -07:00
mm: save soft-dirty bits on swapped pages
2013-08-13 17:57:47 -07:00
microblaze: fix clone syscall
2013-08-13 17:57:48 -07:00
sysfs: use file mode defines from stat.h
2013-07-16 10:57:37 -07:00
kmsg: honor dmesg_restrict sysctl on /dev/kmsg
2013-06-12 16:29:44 -07:00
Revert "cpuidle: Quickly notice prediction failure for repeat mode"
2013-07-29 13:32:29 +02:00
tpm: move TPM_DIGEST_SIZE defintion
2013-05-21 12:25:02 -05:00
tracing: Add DEFINE_EVENT_FN() macro
2013-06-20 22:24:32 -07:00
n_tty: Encapsulate minimum_to_wake within N_TTY
2013-06-17 12:55:11 -07:00
n_tty: Encapsulate minimum_to_wake within N_TTY
2013-06-17 12:55:11 -07:00
USB: move the definition of USB_MAXCHILDREN
2013-07-16 15:33:02 -07:00
userns: limit the maximum depth of user_namespace->parent chain
2013-08-08 13:11:39 -07:00
reboot: arm: change reboot_mode to use enum reboot_mode
2013-07-09 10:33:29 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
virtio: include asm/barrier explicitly
2013-07-09 10:47:53 +09:30
mm/vmalloc.c: rename VM_UNLIST to VM_UNINITIALIZED
2013-07-09 10:33:21 -07:00
vmpressure: make sure there are no events queued after memcg is offlined
2013-07-31 14:41:04 -07:00
Merge 3.10-rc3 into tty-next
2013-05-27 10:57:53 +09:00
vtime: Use consistent clocks among nohz accounting
2013-05-31 11:31:50 +02:00
FS-Cache patches 2013-07-02
2013-07-02 09:52:47 -07:00
drivers: avoid format strings in names passed to alloc_workqueue()
2013-07-03 16:07:41 -07:00
mm/writeback: commit reason of WB_REASON_FORKER_THREAD mismatch name
2013-07-09 10:33:22 -07:00
mutex: Move ww_mutex definitions to ww_mutex.h
2013-07-12 12:07:46 +02:00
zbud: add to mm/
2013-07-10 18:11:34 -07:00
