Linus Torvalds
be9c6d9169
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
"Just a bunch of small fixes and tidy ups:
1) Finish the "busy_poll" renames, from Eliezer Tamir.
2) Fix RCU stalls in IFB driver, from Ding Tianhong.
3) Linearize buffers properly in tun/macvtap zerocopy code.
4) Don't crash on rmmod in vxlan, from Pravin B Shelar.
5) Spinlock used before init in alx driver, from Maarten Lankhorst.
6) A sparse warning fix in bnx2x broke TSO checksums, fix from Dmitry
Kravkov.
7) Dummy and ifb driver load failure paths can oops, fixes from Tan
Xiaojun and Ding Tianhong.
8) Correct MTU calculations in IP tunnels, from Alexander Duyck.
9) Account all TCP retransmits in SNMP stats properly, from Yuchung
Cheng.
10) atl1e and via-rhine do not handle DMA mapping failures properly,
from Neil Horman.
11) Various equal-cost multipath route fixes in ipv6 from Hannes
Frederic Sowa"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (36 commits)
ipv6: only static routes qualify for equal cost multipathing
via-rhine: fix dma mapping errors
atl1e: fix dma mapping warnings
tcp: account all retransmit failures
usb/net/r815x: fix cast to restricted __le32
usb/net/r8152: fix integer overflow in expression
net: access page->private by using page_private
net: strict_strtoul is obsolete, use kstrtoul instead
drivers/net/ieee802154: don't use devm_pinctrl_get_select_default() in probe
drivers/net/ethernet/cadence: don't use devm_pinctrl_get_select_default() in probe
drivers/net/can/c_can: don't use devm_pinctrl_get_select_default() in probe
net/usb: add relative mii functions for r815x
net/tipc: use %*phC to dump small buffers in hex form
qlcnic: Adding Maintainers.
gre: Fix MTU sizing check for gretap tunnels
pkt_sched: sch_qfq: remove forward declaration of qfq_update_agg_ts
pkt_sched: sch_qfq: improve efficiency of make_eligible
gso: Update tunnel segmentation to support Tx checksum offload
inet: fix spacing in assignment
ifb: fix oops when loading the ifb failed
...
2013-07-13 17:42:22 -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
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
MMC highlights for 3.11:
2013-07-10 11:16:00 -07:00
net/mlx4_core: Add HW enforcement to VF link state
2013-07-01 13:10:57 -07:00
mlx5_core: Adjust hca_cap.uar_page_sz to conform to Connect-IB spec
2013-07-11 16:45:08 -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
Trivial remoteproc fixes by Suman Anna, Wei Yongjun and Thomas Meyer.
2013-07-11 12:35:09 -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
Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux
2013-07-11 10:17:13 -07:00
ARM SoC specific changes
2013-07-02 13:43:38 -07:00
ACPI: Do not use CONFIG_ACPI_HOTPLUG_MEMORY_MODULE
2013-06-19 01:02:50 +02:00
PCI changes for the v3.11 merge window:
2013-07-03 16:31:35 -07: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/core' of git://git.kernel.dk/linux-block
2013-07-11 13:03:24 -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
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07: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
helper for reading ->d_count
2013-07-05 18:59:33 +04:00
dm: optimize use SRCU and RCU
2013-07-10 23:41:18 +01:00
Power management and ACPI updates for 3.11-rc1
2013-07-03 14:35:40 -07:00
drivers/dma: remove unused support for MEMSET operations
2013-07-03 16:07:42 -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
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
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: introduce fw_driver.probe and .remove methods
2013-06-09 18:15:00 +02: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 'akpm' (updates from Andrew Morton)
2013-07-09 13:33:36 -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
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
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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-07-03 14:55:13 -07:00
igmp: hash a hash table to speedup ip_check_mc_rcu()
2013-06-12 00:25:23 -07:00
igmp: hash a hash table to speedup ip_check_mc_rcu()
2013-06-12 00:25:23 -07:00
init.h: remove __cpuinit sections from the kernel
2013-06-26 12:13:18 -04:00
FMC: add needed headers
2013-06-17 16:38:57 -07:00
genirq: Add irq_get_trigger_type() to get IRQ flags
2013-06-25 11:48:24 +02: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
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07: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
lib: add lz4 compressor module
2013-07-09 10:33:30 -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
mm: remove unused VM_<READfoo> macros and expand other in-place
2013-07-09 10:33:23 -07:00
mm: remove free_area_cache
2013-07-10 18:11:34 -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
rapidio: add udev notification
2013-07-03 16:08:05 -07:00
There is no /sys/parameters
2013-07-02 15:38:19 +09:30
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
nbd: correct disconnect behavior
2013-07-03 16:08:05 -07:00
net: rename ll methods to busy-poll
2013-07-10 17:08:27 -07:00
netlink: fix splat in skb_clone with large messages
2013-06-27 22:44:16 -07:00
NFS: Make nfs_attribute_cache_expired() non-static
2013-07-09 17:17:07 -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
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-07-02 16:17:25 -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
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
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: 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
Merge remote-tracking branch 'regmap/topic/field' into regmap-next
2013-06-30 12:40:03 +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: 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
mm: remove free_area_cache
2013-07-10 18:11:34 -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: 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
DMA: shdma: add DT support
2013-07-05 11:41:00 +05:30
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-07-03 14:55:13 -07: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
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: migration: add migrate_entry_wait_huge()
2013-06-12 16:29:46 -07:00
kmsg: honor dmesg_restrict sysctl on /dev/kmsg
2013-06-12 16:29:44 -07: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
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
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
