Linus Torvalds
4ba9920e5e
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ...
Pull networking updates from David Miller:
1) BPF debugger and asm tool by Daniel Borkmann.
2) Speed up create/bind in AF_PACKET, also from Daniel Borkmann.
3) Correct reciprocal_divide and update users, from Hannes Frederic
Sowa and Daniel Borkmann.
4) Currently we only have a "set" operation for the hw timestamp socket
ioctl, add a "get" operation to match. From Ben Hutchings.
5) Add better trace events for debugging driver datapath problems, also
from Ben Hutchings.
6) Implement auto corking in TCP, from Eric Dumazet. Basically, if we
have a small send and a previous packet is already in the qdisc or
device queue, defer until TX completion or we get more data.
7) Allow userspace to manage ipv6 temporary addresses, from Jiri Pirko.
8) Add a qdisc bypass option for AF_PACKET sockets, from Daniel
Borkmann.
9) Share IP header compression code between Bluetooth and IEEE802154
layers, from Jukka Rissanen.
10) Fix ipv6 router reachability probing, from Jiri Benc.
11) Allow packets to be captured on macvtap devices, from Vlad Yasevich.
12) Support tunneling in GRO layer, from Jerry Chu.
13) Allow bonding to be configured fully using netlink, from Scott
Feldman.
14) Allow AF_PACKET users to obtain the VLAN TPID, just like they can
already get the TCI. From Atzm Watanabe.
15) New "Heavy Hitter" qdisc, from Terry Lam.
16) Significantly improve the IPSEC support in pktgen, from Fan Du.
17) Allow ipv4 tunnels to cache routes, just like sockets. From Tom
Herbert.
18) Add Proportional Integral Enhanced packet scheduler, from Vijay
Subramanian.
19) Allow openvswitch to mmap'd netlink, from Thomas Graf.
20) Key TCP metrics blobs also by source address, not just destination
address. From Christoph Paasch.
21) Support 10G in generic phylib. From Andy Fleming.
22) Try to short-circuit GRO flow compares using device provided RX
hash, if provided. From Tom Herbert.
The wireless and netfilter folks have been busy little bees too.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (2064 commits)
net/cxgb4: Fix referencing freed adapter
ipv6: reallocate addrconf router for ipv6 address when lo device up
fib_frontend: fix possible NULL pointer dereference
rtnetlink: remove IFLA_BOND_SLAVE definition
rtnetlink: remove check for fill_slave_info in rtnl_have_link_slave_info
qlcnic: update version to 5.3.55
qlcnic: Enhance logic to calculate msix vectors.
qlcnic: Refactor interrupt coalescing code for all adapters.
qlcnic: Update poll controller code path
qlcnic: Interrupt code cleanup
qlcnic: Enhance Tx timeout debugging.
qlcnic: Use bool for rx_mac_learn.
bonding: fix u64 division
rtnetlink: add missing IFLA_BOND_AD_INFO_UNSPEC
sfc: Use the correct maximum TX DMA ring size for SFC9100
Add Shradha Shah as the sfc driver maintainer.
net/vxlan: Share RX skb de-marking and checksum checks with ovs
tulip: cleanup by using ARRAY_SIZE()
ip_tunnel: clear IPCB in ip_tunnel_xmit() in case dst_link_failure() is called
net/cxgb4: Don't retrieve stats during recovery
...
2014-01-25 11:17:34 -08:00
sh: nommu: use 32-bit phys mode.
2010-11-04 12:32:24 +09:00
sh: Split out the unaligned counters and user bits.
2010-01-12 16:12:25 +09:00
kbuild: move asm-offsets.h to include/generated
2009-12-12 13:08:14 +01:00
sh: consolidate atomic_cmpxchg()/atomic_add_unless() definitions.
2010-01-08 17:02:17 +09:00
Disintegrate asm/system.h for SH
2012-03-28 18:30:03 +01:00
sh: consolidate atomic_cmpxchg()/atomic_add_unless() definitions.
2010-01-08 17:02:17 +09:00
sh: Fix up tracepoint build fallout from static key introduction.
2012-04-27 11:12:38 +09:30
arch: Clean up asm/barrier.h implementations using asm-generic/barrier.h
2014-01-12 10:37:15 +01:00
sh: Convert to generic bitops for IRQ-toggling implementation.
2008-12-22 18:42:53 +09:00
sh: Relax inline assembly constraints
2009-01-29 11:57:09 +09:00
sh: Provide optimized non-atomic bitops for SH-2A.
2008-12-22 18:42:54 +09:00
Disintegrate asm/system.h for SH
2012-03-28 18:30:03 +01:00
UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
2012-10-02 18:01:25 +01:00
Disintegrate asm/system.h for SH
2012-03-28 18:30:03 +01:00
Disintegrate asm/system.h for SH
2012-03-28 18:30:03 +01:00
sh: Consolidate die definitions for trap handlers.
2012-06-14 14:18:51 +09:00
sh: Idle loop chainsawing for SMP-based light sleep.
2009-10-16 17:20:58 +09:00
Merge branch 'for-35' of git://repo.or.cz/linux-kbuild
2010-06-01 08:55:52 -07:00
UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
2012-10-02 18:01:25 +01:00
Disintegrate asm/system.h for SH
2012-03-28 18:30:03 +01:00
Disintegrate asm/system.h for SH
2012-03-28 18:30:03 +01:00
sh: Assume new page cache pages have dirty dcache lines.
2010-12-01 15:39:51 +09:00
UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
2012-10-02 18:01:25 +01:00
clk: Add common __clk_get(), __clk_put() implementations
2013-12-04 17:19:44 +01:00
sh: sh header sh_clk_ops rename
2012-03-12 22:19:10 +01:00
sh: Fix up xchg/cmpxchg corruption with gUSA RB.
2011-06-08 15:22:39 +09:00
Disintegrate asm/system.h for SH
2012-03-28 18:30:03 +01:00
sh: Fix sh4a llsc-based cmpxchg()
2009-06-11 09:31:55 +03:00
Disintegrate asm/system.h for SH
2012-03-28 18:30:03 +01:00
sh: Defer to asm-generic/device.h.
2012-01-13 16:27:38 +09:00
sh: dma_debug: add debug_dma_mapping_error support
2012-11-28 15:29:00 +01:00
dmaengine: shdma: separate DMA headers.
2010-03-02 11:09:04 +09:00
sh: Kill off MAX_DMA_ADDRESS leftovers.
2012-05-19 18:50:09 +09:00
sh: Optimise FDE/CIE lookup by using red-black trees
2010-02-08 11:29:15 +09:00
sh: Fix FDPIC binary loader
2013-01-11 21:02:57 +09:00
sh: Remove implicit sign extension from assembler immediates
2009-08-24 17:09:53 +09:00
sh: use generic fixmap.h
2014-01-23 16:36:54 -08:00
flat: fix data sections alignment
2009-05-29 08:40:02 -07:00
sh: move fpu_counter into ARCH specific thread_struct
2013-11-13 12:09:13 +09:00
sh: Provide CALLER_ADDRx definitions even when ftrace is disabled.
2009-10-14 11:49:49 +09:00
Disintegrate asm/system.h for SH
2012-03-28 18:30:03 +01:00
futex: Sanitize futex ops argument types
2011-03-11 12:23:31 +01:00
sh: Remove unused sh_pfc_register_info() function
2013-01-25 09:24:30 +09:00
sh: Count NMIs in irq_cpustat_t.
2009-10-14 16:42:28 +09:00
sh: mach-hp6xx: Fix up the hp6xx build for hd64461 changes.
2009-05-20 11:27:13 +09:00
sh: Prevent heartbeat from scribbling over non-LED bits.
2009-08-18 21:16:29 +09:00
mm/hugetlb: add more arch-defined huge_pte functions
2013-04-29 15:54:33 -07:00
UAPI: (Scripted) Disintegrate arch/sh/include/asm
2012-10-09 09:47:37 +01:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
sh: edosk7760 evt2irq migration.
2012-05-18 14:52:31 +09:00
/dev/mem: use phys_addr_t for physical addresses
2012-10-24 15:32:50 -07:00
sh: machvec IO death.
2010-11-01 09:49:04 -04:00
SH: Convert out[bwl] macros to inline functions
2012-07-12 13:12:13 +09:00
sh: Kill off machvec IRQ hinting.
2012-05-21 17:54:01 +09:00
Fix IRQ flag handling naming
2010-10-07 14:08:55 +01:00
lib: Add missing arch generic-y entries for asm-generic/hash.h
2013-12-17 21:26:19 -05:00
sh64: Convert to unwinder API.
2012-05-24 15:03:46 +09:00
sh: convert kexec crash kernel management to LMB.
2010-05-07 14:54:55 +09:00
sh: kgdb: Unset CACHE_FLUSH_IS_SAFE for SMP.
2012-04-11 10:48:24 +09:00
kmap_types: make most arches use generic header file
2009-06-16 19:47:51 -07:00
sh: Add kprobe-based event tracer.
2010-06-14 15:16:53 +09:00
sh: Kill off machvec IRQ hinting.
2012-05-21 17:54:01 +09:00
sh: Fix up NUMA build for 29-bit.
2010-03-10 16:29:48 +09:00
treewide: fix "distingush" typo
2013-10-14 15:38:33 +02:00
sh: Mass ctrl_in/outX to __raw_read/writeX conversion.
2010-01-26 12:58:40 +09:00
Fix node_start/end_pfn() definition for mm/page_cgroup.c
2011-06-27 14:13:09 -07:00
Make most arch asm/module.h files use asm-generic/module.h
2012-09-28 14:31:03 +09:30
arch: Make __mutex_fastpath_lock_retval return whether fastpath succeeded or not
2013-06-26 12:10:55 +02:00
sh: Add SH-4A optimized fastpath mutex implementation.
2008-12-22 18:42:55 +09:00
sh: Fix cached/uncaced address calculation in 29bit mode
2011-11-04 22:13:50 +09:00
PCI: collapse pcibios_resource_to_bus
2012-02-23 20:19:04 -07:00
irq_work: Add generic hardirq context callbacks
2010-10-18 19:58:50 +02:00
sh: handle pgtable_page_ctor() fail
2013-11-15 09:32:18 +09:00
sh: Rename split-level pgtable headers.
2010-01-13 19:18:39 +09:00
sh: Rename split-level pgtable headers.
2010-01-13 19:18:39 +09:00
consolidate io_remap_pfn_range definitions
2013-06-29 12:46:35 +04:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
sh64: Kill off unused fixed I/O mapping window.
2012-05-14 15:16:11 +09:00
UAPI: (Scripted) Disintegrate arch/sh/include/asm
2012-10-09 09:47:37 +01:00
UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
2012-10-02 18:01:25 +01:00
sh: move fpu_counter into ARCH specific thread_struct
2013-11-13 12:09:13 +09:00
sh: move fpu_counter into ARCH specific thread_struct
2013-11-13 12:09:13 +09:00
UAPI: (Scripted) Disintegrate arch/sh/include/asm
2012-10-09 09:47:37 +01:00
UAPI: (Scripted) Disintegrate arch/sh/include/asm
2012-10-09 09:47:37 +01:00
UAPI: (Scripted) Disintegrate arch/sh/include/asm
2012-10-09 09:47:37 +01:00
sh: machine_ops based reboot support.
2010-01-20 16:42:52 +09:00
sh: add romimage-macros.h
2009-09-11 13:19:16 +09:00
sh: rtc-generic support.
2009-04-27 17:34:39 +09:00
rwsem: Move duplicate function prototypes to linux/rwsem.h
2011-01-27 12:30:39 +01:00
mtd/uclinux: Use generic __bss_stop instead of _ebss
2012-06-27 09:59:43 +02:00
UAPI: (Scripted) Disintegrate arch/sh/include/asm
2012-10-09 09:47:37 +01:00
sh: Kill off more unused sh_bios callbacks.
2010-01-12 15:26:11 +09:00
sh: remove unused DMA device pointer from SIU platform data
2012-07-20 11:23:44 +05:30
sh: CPU hotplug support.
2010-04-26 19:08:55 +09:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
locking: Convert raw_rwlock functions to arch_rwlock
2009-12-14 23:55:32 +01:00
locking: Convert raw_rwlock to arch_rwlock
2009-12-14 23:55:32 +01:00
sh: Provide a generic SRAM pool for tiny memories.
2010-10-15 02:09:00 +09:00
sh: initial stack protector support.
2012-04-19 15:45:57 +09:00
sh: remove warning and warning_symbol from struct stacktrace_ops
2011-05-23 14:42:15 +09:00
UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
2012-10-02 18:01:25 +01:00
sh: Add SH-5 optimized memcpy()/memset()/strcpy()/strlen().
2008-12-22 18:44:05 +09:00
SH: cpuidle: check error code at init
2013-04-22 00:35:53 +02:00
UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
2012-10-02 18:01:25 +01:00
Disintegrate asm/system.h for SH
2012-03-28 18:30:03 +01:00
Disintegrate asm/system.h for SH
2012-03-28 18:30:03 +01:00
UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
2012-10-02 18:01:25 +01:00
sh: Add ftrace syscall tracing support
2009-07-06 20:16:33 +09:00
sh: Fix up spurious syscall restarting.
2009-01-29 11:56:03 +09:00
UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
2012-10-02 18:01:25 +01:00
sh: switch to generic old sigaction()
2013-02-03 18:16:16 -05:00
sh: switch to generic fork/vfork/clone
2012-11-28 22:36:47 -05:00
preempt: Make PREEMPT_ACTIVE generic
2013-11-13 20:21:47 +01:00
sh: Only provide a PCLK definition for legacy CPG CPUs.
2009-12-29 11:09:30 +09:00
Fix TLB gather virtual address range invalidation corner cases
2013-08-16 08:52:46 -07:00
sh: Provide a global TLB flush for U/I-TLB clear.
2010-07-02 15:44:09 +09:00
sched/numa: Rewrite the CONFIG_NUMA sched domain support
2012-05-09 15:00:55 +02:00
UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
2012-10-02 18:01:25 +01:00
Disintegrate asm/system.h for SH
2012-03-28 18:30:03 +01:00
sh64: Provide EXPEVT helper.
2012-05-14 13:04:08 +09:00
UAPI: (Scripted) Disintegrate arch/sh/include/asm
2012-10-09 09:47:37 +01:00
UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
2012-10-02 18:01:25 +01:00
sh: use the new generic strnlen_user() function
2012-06-13 10:28:37 +09:00
sh: use the new generic strnlen_user() function
2012-06-13 10:28:37 +09:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
sh: Convert to asm-generic/unaligned.h.
2009-06-14 23:24:43 +09:00
sh: nommu: Support building without an uncached mapping.
2010-11-04 12:46:19 +09:00
consolidate cond_syscall and SYSCALL_ALIAS declarations
2013-03-03 22:55:19 -05:00
sh: unwinder: Introduce UNWINDER_BUG() and UNWINDER_BUG_ON()
2009-08-21 13:02:44 +01:00
sh64: fix up memory offset calculation.
2010-02-12 15:41:45 +09:00
sh: Mass ctrl_in/outX to __raw_read/writeX conversion.
2010-01-26 12:58:40 +09:00
sh: use the new generic strnlen_user() function
2012-06-13 10:28:37 +09:00
4ba9920e5e