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
bitops/find: clarify and extend documentation
2013-11-13 12:09:22 +09:00
mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()
2009-07-27 12:10:38 -07:00
asm-generic: merge branch 'master' of torvalds/linux-2.6
2009-06-12 11:32:58 +02:00
asm-generic: move cmpxchg*_local defs to cmpxchg.h
2013-03-13 06:11:05 +01:00
lib: Provide generic atomic64_t implementation
2009-06-15 13:27:38 +10:00
audit: Modify a set of system calls in audit class definitions
2014-01-17 17:01:46 -05:00
audit: support the "standard" <asm-generic/unistd.h>
2011-05-04 14:41:28 -04:00
audit: support the "standard" <asm-generic/unistd.h>
2011-05-04 14:41:28 -04:00
audit: Modify a set of system calls in audit class definitions
2014-01-17 17:01:46 -05:00
arch: Introduce smp_load_acquire(), smp_store_release()
2014-01-12 10:37:17 +01:00
bitops: remove minix bitops from asm/bitops.h
2011-03-23 19:46:22 -07:00
UAPI: (Scripted) Disintegrate include/asm-generic
2012-10-04 18:20:15 +01:00
bug.h: Fix up CONFIG_BUG=n implicit function declarations.
2012-06-25 10:32:49 -07:00
asm-generic: add generic versions of common headers
2009-06-11 21:02:37 +02:00
asm-generic: add generic NOMMU versions of some headers
2009-06-11 21:02:50 +02:00
asm-generic/cacheflush.h: flush icache when copying to user pages
2011-05-25 08:39:37 -07:00
asm-generic headers: Allow yet more arch overrides in checksum.h
2013-02-11 20:00:33 +05:30
asm-generic: Add default clkdev.h
2012-10-03 21:33:53 +02:00
generic: Use raw local irq variant for generic cmpxchg
2013-02-19 08:43:37 +01:00
asm-generic: move cmpxchg*_local defs to cmpxchg.h
2013-03-13 06:11:05 +01:00
cputime: Generic on-demand virtual cputime accounting
2013-01-27 19:23:27 +01:00
cputime: Move default nsecs_to_cputime() to jiffies based cputime file
2013-01-27 19:23:25 +01:00
cputime_nsecs: use math64.h for nsec resolution conversion helpers
2013-04-26 18:58:12 +02:00
asm-generic: add generic versions of common headers
2009-06-11 21:02:37 +02:00
asm-generic: delay.h fix udelay and ndelay for 8 bit args
2011-07-22 18:45:33 +02:00
Driver Core: Add platform device arch data V3
2009-07-22 00:28:38 +02:00
common: dma-mapping: add support for generic dma_mmap_* calls
2012-07-30 12:25:46 +02:00
asm-generic/dma-mapping-broken.h: Provide dma_alloc_attrs()/dma_free_attrs()
2012-12-25 20:14:54 +01:00
common: dma-mapping: introduce dma_get_sgtable() function
2012-07-30 12:25:46 +02:00
asm-generic: add legacy I/O header files
2009-06-11 21:02:42 +02:00
Split arch_align_stack() out from asm-generic/system.h
2012-03-28 18:30:03 +01:00
asm-generic: add generic versions of common headers
2009-06-11 21:02:37 +02:00
add generic fixmap.h
2014-01-23 16:36:54 -08:00
asm-generic headers: add ftrace.h
2011-03-17 09:19:04 +08:00
futex: Sanitize futex ops argument types
2011-03-11 12:23:31 +01:00
bitops: Add missing parentheses to new get_order macro
2012-02-24 10:39:27 -08:00
GPIO bulk changes for the v3.13 development cycle
2013-11-12 15:50:46 +09:00
Fix IRQ flag handling naming
2010-10-07 14:08:55 +01:00
lib: hash: follow-up fixups for arch hash
2013-12-19 00:14:53 -05:00
mm: Fix generic hugetlb pte check return type.
2013-10-02 20:02:35 -04:00
asm-generic: add legacy I/O header files
2009-06-11 21:02:42 +02:00
UAPI: (Scripted) Disintegrate include/asm-generic
2012-10-04 18:20:15 +01:00
asm-generic: architecture independent readq/writeq for 32bit environment
2012-02-21 16:47:28 -08:00
asm-generic: architecture independent readq/writeq for 32bit environment
2012-02-21 16:47:28 -08:00
kernel: Fix s390 absolute memory access for /dev/mem
2013-05-22 09:45:57 +02:00
UAPI: (Scripted) Disintegrate include/asm-generic
2012-10-04 18:20:15 +01:00
[PARISC] fix compile break caused by iomap: make IOPORT/PCI mapping functions conditional
2012-02-27 09:43:30 -06:00
asm-generic: add generic versions of common headers
2009-06-11 21:02:37 +02:00
core: Replace __get_cpu_var with __this_cpu_read if not used for an address.
2010-12-17 15:07:19 +01:00
Fix IRQ flag handling naming
2010-10-07 14:08:55 +01:00
UAPI: Set up uapi/asm/Kbuild.asm
2012-10-02 18:01:56 +01:00
asm-generic: kdebug.h: Checkpatch cleanup
2010-10-09 21:51:44 +02:00
asm-generic: remove km_type definitions
2012-07-24 15:27:30 +08:00
KVM: add kvm_para_available to asm-generic/kvm_para.h
2013-06-05 13:21:29 +03:00
asm-generic: add generic versions of common headers
2009-06-11 21:02:37 +02:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
__page_to_pfn: Fix typo in comment
2013-10-14 15:28:29 +02:00
asm-generic/mmu.h: Add support for FDPIC
2012-12-09 23:14:14 +01:00
asm-generic: add generic NOMMU versions of some headers
2009-06-11 21:02:50 +02: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
arch: Make __mutex_fastpath_lock_retval return whether fastpath succeeded or not
2013-06-26 12:10:55 +02:00
arch: Make __mutex_fastpath_lock_retval return whether fastpath succeeded or not
2013-06-26 12:10:55 +02:00
asm-generic: add generic versions of common headers
2009-06-11 21:02:37 +02:00
The following changes since commit 3ee72ca992
2012-01-10 17:39:40 -08:00
UAPI: (Scripted) Disintegrate include/asm-generic
2012-10-04 18:20:15 +01:00
include: remove __dev* attributes.
2013-01-03 15:57:16 -08:00
PCI: work around Stratus ftServer broken PCIe hierarchy
2012-04-30 15:21:02 -06:00
dma-mapping: pci: move pci_set_dma_mask and pci_set_consistent_dma_mask to pci-dma-compat.h
2010-03-12 15:52:42 -08:00
PCI: collapse pcibios_resource_to_bus
2012-02-23 20:19:04 -07:00
[PARISC] fix compile break caused by iomap: make IOPORT/PCI mapping functions conditional
2012-02-27 09:43:30 -06:00
percpu: Optimize __get_cpu_var()
2010-09-10 10:56:51 +02:00
asm-generic: add generic NOMMU versions of some headers
2009-06-11 21:02:50 +02:00
mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()
2009-07-27 12:10:38 -07:00
mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()
2009-07-27 12:10:38 -07:00
mm: Fix NULL pointer dereference in madvise(MADV_WILLNEED) support
2013-12-20 12:17:03 -08:00
sched: Remove PREEMPT_NEED_RESCHED from generic code
2013-12-11 15:52:32 +01:00
asm-generic/ptrace.h: start a common low level ptrace helper
2011-05-26 17:12:36 -07:00
UAPI: (Scripted) Disintegrate include/asm-generic
2012-10-04 18:20:15 +01:00
asm-generic: make get_rtc_time overridable
2009-06-11 21:02:18 +02:00
Hexagon: Add locking types and functions
2011-11-01 07:34:20 -07:00
asm-generic: remove ARCH_HAS_SG_CHAIN in scatterlist.h
2010-05-27 09:12:54 -07:00
vmlinux.lds: add comments for global variables and clean up useless declarations
2013-07-03 16:07:34 -07:00
asm-generic: add generic NOMMU versions of some headers
2009-06-11 21:02:50 +02:00
asm-generic: add legacy I/O header files
2009-06-11 21:02:42 +02:00
constify copy_siginfo_to_user{,32}()
2013-11-09 00:16:29 -05:00
unify default ptrace_signal_deliver
2012-11-29 00:01:23 -05:00
crypto: create generic version of ablk_helper
2013-09-24 06:02:24 +10:00
ARM: 7430/1: sizes.h: move from asm-generic to <linux/sizes.h>
2012-06-28 17:14:34 +01:00
asm-generic: add generic versions of common headers
2009-06-11 21:02:37 +02:00
UAPI: (Scripted) Disintegrate include/asm-generic
2012-10-04 18:20:15 +01:00
asm-generic: add generic versions of common headers
2009-06-11 21:02:37 +02:00
Split the switch_to() wrapper out of asm-generic/system.h
2012-03-28 18:30:03 +01:00
asm/syscall.h: add syscall_get_arch
2012-04-14 11:13:19 +10:00
burying unused conditionals
2013-02-14 09:21:15 -05:00
asm-generic: rename termios.h, signal.h and mman.h
2009-06-11 21:01:52 +02:00
UAPI: (Scripted) Disintegrate include/asm-generic
2012-10-04 18:20:15 +01:00
asm-generic: add legacy I/O header files
2009-06-11 21:02:42 +02:00
Fix TLB gather virtual address range invalidation corner cases
2013-08-16 08:52:46 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
topology: alternate fix for ia64 tiger_defconfig build breakage
2010-08-09 20:44:57 -07:00
tracing,x86: Add a TSC trace_clock
2012-11-13 15:48:27 -05:00
asm-generic: rename page.h and uaccess.h
2009-06-11 21:02:17 +02:00
asm-generic: uaccess: Spelling s/a ny/any/
2014-01-02 10:45:23 +01:00
asm-generic: add generic versions of common headers
2009-06-11 21:02:37 +02:00
We get rid of the general module prefix confusion with a binary config option,
2013-05-05 10:58:06 -07:00
asm-generic/user.h: Fix spelling in comment
2011-03-01 15:49:39 +01:00
asm-generic: add legacy I/O header files
2009-06-11 21:02:42 +02:00
kernel: add support for init_array constructors
2013-10-17 15:05:17 +10:30
include/asm-generic/vtime.h: avoid zero-length file
2013-09-30 14:31:02 -07:00
word-at-a-time: provide generic big-endian zero_bytemask implementation
2013-12-12 10:39:01 -08:00
asm-generic: xor: mark static functions as __maybe_unused
2012-10-03 21:21:06 +02:00
4ba9920e5e