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
agp: kill phys_to_gart() and gart_to_phys()
2009-08-03 09:05:00 +01:00
kbuild: move asm-offsets.h to include/generated
2009-12-12 13:08:14 +01:00
sparc: Add asm/asm.h
2008-12-09 00:50:13 -08:00
sparc32: add support for run-time patching of leon/sun single instructions
2012-05-27 23:52:43 -07:00
Disintegrate asm/system.h for Sparc
2012-03-28 18:30:03 +01:00
sparc: Support atomic64_dec_if_positive properly.
2012-11-09 19:37:59 -08:00
Disintegrate asm/system.h for Sparc
2012-03-28 18:30:03 +01:00
sparc64: Improvde documentation and readability of atomic backoff code.
2012-10-28 13:04:47 -07:00
Disintegrate asm/system.h for Sparc
2012-03-28 18:30:03 +01:00
arch: Clean up asm/barrier.h implementations using asm-generic/barrier.h
2014-01-12 10:37:15 +01: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
sparc: Use popc when possible for ffs/__ffs/ffz.
2011-08-02 21:28:53 -07:00
sparc64: Faster early-boot framebuffer console.
2009-11-27 17:33:43 -08:00
Disintegrate asm/system.h for Sparc
2012-03-28 18:30:03 +01:00
sparc64: Implement SSTATE purely using notifiers and initcalls.
2008-09-02 00:49:38 -07:00
sparc32: Remove completely unused code from asm/cache.h
2012-05-19 21:15:37 -07:00
sparc32: use flushi when run-time patching in per_cpu_patch
2012-05-20 13:33:36 -07:00
sparc32: Move cache and TLB flushes over to method ops.
2012-05-13 20:49:31 -07:00
sparc32: use flushi when run-time patching in per_cpu_patch
2012-05-20 13:33:36 -07:00
sparc32: Move cache and TLB flushes over to method ops.
2012-05-13 20:49:31 -07:00
Disintegrate asm/system.h for Sparc
2012-03-28 18:30:03 +01:00
sparc32: remove runtime btfix support
2012-05-14 14:05:09 -07:00
sparc64: Provide cmpxchg64()
2013-03-20 11:06:55 -07:00
sparc64: Make montmul/montsqr/mpmul usable in 32-bit threads.
2012-10-26 15:18:37 -07:00
sparc: switch to generic sigaltstack
2013-02-03 18:16:17 -05:00
sparc32: Remove sun4{,c} control reg definitions from contregs.h.
2012-05-11 21:29:17 -07:00
sparc32: Remove sun4 and sun4c from enum sparc_cpu.
2012-05-12 00:23:23 -07:00
sparc32: generic clockevent support
2012-04-15 10:28:50 -07:00
sparc64: Use a seperate counter for timer interrupts and NMI checks, like x86.
2010-04-12 22:37:07 -07:00
of: remove asm/of_device.h
2010-07-24 09:57:52 -06:00
sparc: dma-mapping: support debug_dma_mapping_error
2012-11-17 13:20:38 +01:00
sparc32: Convert mmu_* interfaces from btfixup to method ops.
2012-05-13 13:57:05 -07:00
sparc: Move EBUS DMA interfaces into seperate header file.
2008-08-29 23:10:21 -07:00
default SET_PERSONALITY() in linux/elf.h
2013-02-26 02:46:08 -05:00
sparc64: Add detection for features new in SPARC-T4.
2012-08-18 23:02:36 -07:00
sparc: Really fix "console=" for serial consoles.
2010-08-16 12:26:09 -07:00
UAPI: (Scripted) Disintegrate arch/sparc/include/asm
2012-10-09 09:47:43 +01:00
sparc64: Rewrite central driver.
2008-08-31 20:56:15 -07:00
sparc: Kill mmu_{un,}lockarea().
2012-05-13 13:23:16 -07:00
sparc: remove deprecated IRQF_DISABLED
2013-10-02 20:02:35 -04:00
sparc64: Add proper dynamic ftrace support.
2009-06-16 04:56:53 -07:00
Disintegrate asm/system.h for Sparc
2012-03-28 18:30:03 +01:00
gpiolib/arches: Centralise bolierplate asm/gpio.h
2012-05-11 18:00:14 -06:00
hardirq: Make hardirq bits generic
2013-11-13 20:21:46 +01:00
hardirq: Make hardirq bits generic
2013-11-13 20:21:46 +01:00
sparc: Consistently use 'wr' and 'rd' instructions for ASRs.
2013-04-06 17:51:48 -04:00
sparc64: Hibernation support
2013-03-20 11:06:54 -07:00
sparc32: move kmap_init() to highmem.c
2012-07-26 16:46:17 -07:00
mm/hugetlb: add more arch-defined huge_pte functions
2013-04-29 15:54:33 -07:00
sparc64: Add hypervisor interfaces for SPARC-T4 perf counter access.
2012-08-18 23:03:53 -07:00
sparc32: Kill iounit_map_dma_*().
2008-08-29 02:15:23 -07:00
sparc: add {read,write}*_be routines
2011-05-12 13:44:29 -07:00
Disintegrate asm/system.h for Sparc
2012-03-28 18:30:03 +01:00
Disintegrate asm/system.h for Sparc
2012-03-28 18:30:03 +01:00
UAPI: (Scripted) Disintegrate arch/sparc/include/asm
2012-10-09 09:47:43 +01:00
sparc: Remove generic SBUS probing layer.
2008-08-29 02:15:21 -07:00
sparc64: Get rid of pci_controller_info.
2008-09-10 23:07:41 -07:00
sparc32: genirq support
2011-04-19 22:11:40 -07:00
nmi watchdog: do not use cpp symbol in Kconfig
2012-03-23 16:58:31 -07:00
Disintegrate asm/system.h for Sparc
2012-03-28 18:30:03 +01:00
sparc/irqs: Do not trace arch_local_{*,irq_*} functions
2011-07-06 08:00:29 -07:00
compiler/gcc4: Add quirk for 'asm goto' miscompilation bug
2013-10-11 07:39:14 +02:00
lib: Add missing arch generic-y entries for asm-generic/hash.h
2013-12-17 21:26:19 -05:00
sparc32: kernel/trace/trace.c wants DIE_OOPS
2008-11-01 21:44:01 -07:00
sparc64: Implement NMI watchdog on capable cpus.
2009-01-30 00:03:53 -08:00
kmap_types: make most arches use generic header file
2009-06-16 19:47:51 -07:00
sparc32, leon: Require separate snoop tags set to regard snooping to be enabled
2013-07-10 13:35:52 -07:00
sparc32, leon: Remove separate "ticker" timer for SMP
2013-06-19 02:10:29 -07:00
sparc32,leon: add support for PCI busn resource for GRPCI2
2013-03-20 11:06:53 -07:00
sparc32: Trivial removal of sun4c references in comments.
2012-05-12 00:35:45 -07:00
sparc32: Remove cypress cpu support.
2012-05-15 10:22:00 -07:00
sparc64: Use generic CMOS driver.
2008-08-29 14:16:48 -07:00
sparc64: Probe cpu page size support more portably.
2012-09-06 19:01:25 -07:00
sparc64: Add generic interface for registering a dimm printing handler.
2008-08-24 22:08:34 -07:00
UAPI: (Scripted) Disintegrate arch/sparc/include/asm
2012-10-09 09:47:43 +01:00
sparc32: add irq + smp declarations to headers
2011-03-16 18:19:08 -07:00
sparc64: Move from 4MB to 8MB huge pages.
2013-11-12 15:22:34 -08:00
sparc32: centralize all mmu context handling in srmmu.c
2012-07-26 16:46:16 -07:00
sparc64: Do not save/restore interrupts in get_new_mmu_context()
2013-04-08 22:50:47 -04:00
Fix node_start/end_pfn() definition for mm/page_cgroup.c
2011-06-27 14:13:09 -07:00
sparc64: Initial hw perf counter support.
2009-09-10 06:28:20 -07:00
Disintegrate asm/system.h for Sparc
2012-03-28 18:30:03 +01:00
sparc32: move smp ipi to method ops
2012-05-14 14:05:07 -07:00
sparc: Pass buffer pointer all the way down to prom_{get,put}char().
2010-11-30 14:33:29 -08:00
sparc: fix format string argument for prom_printf()
2012-10-02 23:20:34 -04:00
sparc: fix format string argument for prom_printf()
2012-10-02 23:20:34 -04:00
sparc32: drop sparc_unmapped_base
2012-07-26 16:46:16 -07:00
sparc64: Move to 64-bit PGDs and PMDs.
2013-11-12 15:22:35 -08:00
SPARC: drivers: remove __dev* attributes.
2013-01-03 15:57:04 -08:00
pci-dma: add linux/pci-dma.h to linux/pci.h
2010-03-12 15:52:42 -08:00
PCI: collapse pcibios_resource_to_bus
2012-02-23 20:19:04 -07:00
PCI: collapse pcibios_resource_to_bus
2012-02-23 20:19:04 -07:00
sparc32: added CONFIG_PCIC_PCI Kconfig setting
2011-06-02 14:32:37 -07:00
sparc64: Add PCR ops for SPARC-T4.
2012-08-18 23:26:19 -07:00
sparc64: Get rid of real_setup_per_cpu_areas().
2009-06-16 04:56:23 -07:00
perf, arch: Cleanup perf-pmu init vs lockup-detector
2010-11-26 15:14:56 +01:00
sparc32: drop quicklist
2012-07-26 16:46:16 -07:00
sparc64: Support transparent huge pages.
2012-10-09 16:23:06 +09:00
consolidate io_remap_pfn_range definitions
2013-06-29 12:46:35 +04:00
mm: fix TLB flush race between migration, and change_protection_range
2013-12-18 19:04:51 -08:00
sparc32: srmmu_probe now knows about leon too
2012-05-27 23:52:51 -07:00
sparc64: Reschedule KGDB capture to a software interrupt.
2009-03-18 23:51:57 -07:00
Disintegrate asm/system.h for Sparc
2012-03-28 18:30:03 +01:00
sparc idle: rename pm_idle to sparc_idle
2013-02-17 23:36:56 -05:00
sparc64: Kill __ARCH_WANT_UNLOCKED_CTXSW
2013-03-20 12:09:01 -07:00
of: move of_address_to_resource and of_iomap declarations from sparc
2013-10-09 20:04:09 -05:00
UAPI: (Scripted) Disintegrate arch/sparc/include/asm
2012-10-09 09:47:43 +01:00
Merge commit ' 517ffce4e1' into arch-sparc
2012-11-16 20:49:06 -05:00
rwsem: Move duplicate function prototypes to linux/rwsem.h
2011-01-27 12:30:39 +01:00
remove needless ISA_DMA_THRESHOLD
2010-08-07 18:15:50 +02:00
x86-64: seccomp: fix 32/64 syscall hole
2009-03-02 15:41:30 -08:00
sparc32: add support for run-time patching of leon/sun single instructions
2012-05-27 23:52:43 -07:00
UAPI: (Scripted) Disintegrate arch/sparc/include/asm
2012-10-09 09:47:43 +01:00
sparc32: Remove sun4 and sun4c from enum sparc_cpu.
2012-05-12 00:23:23 -07:00
UAPI: (Scripted) Disintegrate arch/sparc/include/asm
2012-10-09 09:47:43 +01:00
UAPI: (Scripted) Disintegrate arch/sparc/include/asm
2012-10-09 09:47:43 +01:00
consolidate kernel-side struct sigaction declarations
2013-02-03 15:09:22 -05:00
sparc:cleanup unused code in smp_32.h
2013-03-31 19:29:12 -04:00
sparc64: Add global PMU register dumping via sysrq.
2012-10-16 09:34:01 -07:00
sparc64: Fix inconsistent max-physical-address defines.
2013-11-12 15:22:34 -08:00
sparc32: unbreak arch_write_unlock()
2011-08-15 14:35:19 -07:00
sparc64: remove unnecessary macros from spinlock_64.h
2011-08-15 14:35:18 -07:00
locking: Convert raw_rwlock to arch_rwlock
2009-12-14 23:55:32 +01:00
sparc64: correctly recognize SPARC64-X chips
2013-03-11 05:06:27 -07:00
sparc64: Delete starfire_cpu_setup().
2008-08-31 01:40:12 -07:00
sparc32: Remove inline strncmp "optimization" for constant counts.
2012-05-11 19:53:29 -07:00
sparc: Stop trying to be so fancy and use __builtin_{memcpy,memset}()
2009-12-10 23:32:10 -08:00
Disintegrate asm/system.h for Sparc
2012-03-28 18:30:03 +01:00
Disintegrate asm/system.h for Sparc
2012-03-28 18:30:03 +01:00
sparc64: cleanup: Rename ret_from_syscall to ret_from_fork
2013-07-31 19:10:04 -07:00
tracing: Unify arch_syscall_addr() implementations
2010-02-17 13:07:21 +01:00
sparc32: switch to generic sys_execve()
2012-10-16 19:03:53 -04:00
UAPI: (Scripted) Disintegrate arch/sparc/include/asm
2012-10-09 09:47:43 +01:00
UAPI: (Scripted) Disintegrate arch/sparc/include/asm
2012-10-09 09:47:43 +01:00
preempt: Make PREEMPT_ACTIVE generic
2013-11-13 20:21:47 +01:00
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-11-19 10:40:00 -08:00
sparc32: remove runtime btfix support
2012-05-14 14:05:09 -07:00
SPARC: drivers: remove __dev* attributes.
2013-01-03 15:57:04 -08:00
sparc32: generic clockevent support
2012-04-15 10:28:50 -07:00
sparc: mmu_gather rework
2011-05-25 08:39:13 -07:00
sparc32: Move cache and TLB flushes over to method ops.
2012-05-13 20:49:31 -07:00
sparc64: fix build regession
2013-11-18 15:07:35 -08:00
sched/numa: Rewrite the CONFIG_NUMA sched domain support
2012-05-09 15:00:55 +02:00
sparc64: Store per-cpu offset in trap_block[]
2009-06-16 04:56:11 -07:00
UAPI: (Scripted) Disintegrate arch/sparc/include/asm
2012-10-09 09:47:43 +01:00
sparc64: Encode huge PMDs using PTE encoding.
2013-11-13 12:33:08 -08:00
sparc64: Make montmul/montsqr/mpmul usable in 32-bit threads.
2012-10-26 15:18:37 -07:00
sparc: Fix user_addr_max() definition.
2012-05-24 13:41:58 -07:00
sparc: use the new generic strnlen_user() function
2012-05-26 11:33:54 -07:00
Revert "sparc64: Fix __copy_{to,from}_user_inatomic defines."
2014-01-04 17:55:19 -08:00
consolidate cond_syscall and SYSCALL_ALIAS declarations
2013-03-03 22:55:19 -05:00
sparc32: drop fixmap.h
2012-07-26 16:46:16 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
powerpc+sparc/vio: Modernize driver registration
2012-03-28 11:33:24 +11:00
sparc64: Fix sparse warnings in visemul.c
2008-09-11 23:46:40 -07:00
sparc32: Implement hard_smp_processor_id() via instruction patching.
2012-05-14 13:31:38 -07:00
sparc64: Future proof Niagara cpu detection.
2011-09-16 14:21:33 -07:00
4ba9920e5e