Linus Torvalds
cd6362befe
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ...
Pull networking updates from David Miller:
"Here is my initial pull request for the networking subsystem during
this merge window:
1) Support for ESN in AH (RFC 4302) from Fan Du.
2) Add full kernel doc for ethtool command structures, from Ben
Hutchings.
3) Add BCM7xxx PHY driver, from Florian Fainelli.
4) Export computed TCP rate information in netlink socket dumps, from
Eric Dumazet.
5) Allow IPSEC SA to be dumped partially using a filter, from Nicolas
Dichtel.
6) Convert many drivers to pci_enable_msix_range(), from Alexander
Gordeev.
7) Record SKB timestamps more efficiently, from Eric Dumazet.
8) Switch to microsecond resolution for TCP round trip times, also
from Eric Dumazet.
9) Clean up and fix 6lowpan fragmentation handling by making use of
the existing inet_frag api for it's implementation.
10) Add TX grant mapping to xen-netback driver, from Zoltan Kiss.
11) Auto size SKB lengths when composing netlink messages based upon
past message sizes used, from Eric Dumazet.
12) qdisc dumps can take a long time, add a cond_resched(), From Eric
Dumazet.
13) Sanitize netpoll core and drivers wrt. SKB handling semantics.
Get rid of never-used-in-tree netpoll RX handling. From Eric W
Biederman.
14) Support inter-address-family and namespace changing in VTI tunnel
driver(s). From Steffen Klassert.
15) Add Altera TSE driver, from Vince Bridgers.
16) Optimizing csum_replace2() so that it doesn't adjust the checksum
by checksumming the entire header, from Eric Dumazet.
17) Expand BPF internal implementation for faster interpreting, more
direct translations into JIT'd code, and much cleaner uses of BPF
filtering in non-socket ocntexts. From Daniel Borkmann and Alexei
Starovoitov"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1976 commits)
netpoll: Use skb_irq_freeable to make zap_completion_queue safe.
net: Add a test to see if a skb is freeable in irq context
qlcnic: Fix build failure due to undefined reference to `vxlan_get_rx_port'
net: ptp: move PTP classifier in its own file
net: sxgbe: make "core_ops" static
net: sxgbe: fix logical vs bitwise operation
net: sxgbe: sxgbe_mdio_register() frees the bus
Call efx_set_channels() before efx->type->dimension_resources()
xen-netback: disable rogue vif in kthread context
net/mlx4: Set proper build dependancy with vxlan
be2net: fix build dependency on VxLAN
mac802154: make csma/cca parameters per-wpan
mac802154: allow only one WPAN to be up at any given time
net: filter: minor: fix kdoc in __sk_run_filter
netlink: don't compare the nul-termination in nla_strcmp
can: c_can: Avoid led toggling for every packet.
can: c_can: Simplify TX interrupt cleanup
can: c_can: Store dlc private
can: c_can: Reduce register access
can: c_can: Make the code readable
...
2014-04-02 20:53:45 -07:00
partly revert commit 8a10bc9: parisc/sti_console: prefer Linux fonts over built-in ROM fonts
2014-03-23 16:44:42 +01:00
lz4: fix compression/decompression signedness mismatch
2013-09-11 15:59:45 -07:00
lib/lzo: Update LZO compression to current upstream version
2013-02-20 19:36:01 +01:00
MPILIB: add module description and license
2013-09-25 17:17:01 +01:00
md update for v3.12
2013-09-10 13:03:41 -07:00
decompressors: fix typo "POWERPC"
2013-03-13 15:21:48 -07:00
X.509: Implement simple static OID registry
2012-10-08 13:50:18 +10:30
argv_split(): teach it to handle mutable strings
2013-04-29 18:28:19 -07:00
Nothing all that exciting; a new module-from-fd syscall for those who want
2012-12-19 07:55:08 -08:00
assoc_array: remove global variable
2014-01-23 09:25:10 -08:00
lib: atomic64: Initialize locks statically to fix early users
2012-12-20 13:50:16 -08:00
atomic64_test: simplify the #ifdef for atomic64_dec_if_positive() test
2012-07-30 17:25:16 -07:00
lib: Ensure EWMA does not store wrong intermediate values
2014-01-16 23:46:06 -08:00
usb/core: use bin2bcd() for bcdDevice in RH
2012-09-10 11:13:16 -07:00
propagate name change to comments in kernel source
2012-12-06 10:39:54 +01:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
btree: catch NULL value before it does harm
2012-06-07 14:43:55 -07:00
taint: add explicit flag to show whether lock dep is still OK.
2013-01-21 17:17:57 +10:30
X.509: do not emit any informational output
2013-06-19 17:54:06 +02:00
printk: Provide a wake_up_klogd() off-case
2013-03-22 16:41:20 -07:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
asm-generic headers: Allow yet more arch overrides in checksum.h
2013-02-11 20:00:33 +05:30
lib: add weak clz/ctz functions
2013-07-09 10:33:30 -07:00
lib: Fix multiple definitions of clz_tab
2012-02-02 10:34:23 +11:00
lib/cmdline.c: declare exported symbols immediately
2014-01-23 16:36:57 -08:00
Docs: wording: functions -> algorithm
2011-10-29 21:20:22 +02:00
cpu: rewrite cpu-notifier-error-inject module
2012-07-30 17:25:22 -07:00
Remove GENERIC_HARDIRQ config option
2013-09-13 15:09:52 +02:00
lib/cpumask.c: use memblock apis for early memory allocations
2014-01-21 16:19:47 -08:00
crypto: crct10dif - Add fallback for broken initrds
2013-09-12 15:31:34 +10:00
lib: crc32: reduce number of cases for crc32{, c}_combine
2013-11-04 15:27:08 -05:00
crc32: select an algorithm via Kconfig
2012-03-23 16:58:38 -07:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
mutex: Add support for wound/wait style locks
2013-06-26 12:10:56 +02:00
lib/debugobjects.c: remove unnecessary work pending test
2013-11-13 12:09:22 +09:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
lib: add support for LZ4-compressed kernel
2013-07-09 10:33:30 -07:00
decompress_bunzip2: remove invalid vi modeline
2011-12-06 10:00:05 +01:00
lib/decompressors: fix "no limit" output buffer length
2013-09-11 15:58:38 -07:00
lib/decompress_unlz4.c: always set an error return code on failures
2014-01-23 16:37:04 -08:00
treewide: Fix comment and string typo 'bufer'
2011-12-06 09:53:40 +01:00
lib/lzo: Rename lzo1x_decompress.c to lzo1x_decompress_safe.c
2013-02-20 19:36:00 +01:00
lib/devres.c: fix misplaced #endif
2013-02-27 19:10:09 -08:00
lib/digsig.c: use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(...))
2013-11-13 12:09:22 +09:00
math64: New separate div64_u64_rem helper
2013-08-23 09:02:14 -04:00
dma debug: account for cachelines and read-only mappings in overlap tracking
2014-03-04 07:55:47 -08:00
x86, asmlinkage: Make dump_stack visible
2013-08-06 14:21:01 -07:00
dynamic_debug: replace obselete simple_strtoul() with kstrtouint()
2014-01-27 21:02:39 -08:00
bql: Avoid possible inconsistent calculation.
2012-05-31 18:18:17 -04:00
earlycpio.c: Fix the confusing comment of find_cpio_data().
2013-08-14 23:24:01 +02:00
debugfs: add get/set for atomic types
2013-06-03 13:55:01 -07:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
reciprocal_divide: update/correction of the algorithm
2014-01-21 23:17:20 -08:00
lib/flex_proportions.c: fix corruption of denominator in flexible proportions
2012-09-25 08:59:21 -07:00
lib/gcd.c: prevent possible div by 0
2012-10-06 03:04:57 +09:00
sections: fix const sections for crc32 table
2012-10-06 03:04:46 +09:00
lib/genalloc.c: add check gen_pool_dma_alloc() if dma pointer is not NULL
2014-01-29 16:22:39 -08:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
lib: hash: follow-up fixups for arch hash
2013-12-19 00:14:53 -05:00
lib: introduce upper case hex ascii helpers
2013-09-20 15:38:26 -04:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
idr: Add new function idr_is_empty()
2014-02-17 16:27:47 +01:00
lib/int_sqrt.c: optimize square root algorithm
2013-04-29 18:28:19 -07:00
mm: interval tree updates
2012-10-09 16:22:40 +09:00
random32: rename random32 to prandom
2012-12-17 17:15:26 -08:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
The following text was taken from the original review request:
2012-03-24 10:24:31 -07:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
Hoist memcpy_fromiovec/memcpy_toiovec into lib/
2013-05-20 10:24:22 +09:30
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
ddr: add LPDDR2 data from JESD209-2
2012-05-02 00:04:06 -07:00
lib/kasprintf.c: use kmalloc_track_caller() to get accurate traces for kvasprintf
2012-10-11 08:50:15 +09:00
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2013-11-21 19:46:00 -08:00
locktorture: Add a lock-torture kernel module
2014-02-23 09:04:29 -08:00
treewide: Fix typo in printk
2013-06-18 13:48:45 +02:00
kfifo: kfifo_copy_{to,from}_user: fix copied bytes calculation
2013-11-15 09:32:23 +09:00
klist: del waiter from klist_remove_waiters before wakeup waitting process
2013-05-21 10:16:39 -07:00
sysfs, kobject: add sysfs wrapper for kernfs_enable_ns()
2014-02-07 16:08:57 -08:00
net: fix "queues" uevent between network namespaces
2014-01-19 20:02:02 -08:00
lib/kstrtox.c: remove redundant cleanup
2014-01-23 16:36:57 -08:00
lib/kstrtox: common code between kstrto*() and simple_strto*() functions
2011-10-31 17:30:56 -07:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
rcu: Fix broken strings in RCU's source code.
2012-07-06 06:01:49 -07:00
lib/: rename random32() to prandom_u32()
2013-04-29 18:28:42 -07:00
llists-move-llist_reverse_order-from-raid5-to-llistc-fix
2013-11-15 09:32:22 +09:00
sched: Introduce preempt_count accessor functions
2013-09-25 14:07:32 +02:00
lockref: include mutex.h rather than reinvent arch_mutex_cpu_relax
2013-11-27 20:37:33 -08:00
lru_cache: introduce lc_get_cumulative()
2013-03-22 22:17:36 -06:00
* Avoid WARN_ON() when mapping BGRT on Baytrail (EFI 32-bit).
2014-02-07 11:27:30 -08:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
memory: memory notifier error injection module
2012-07-30 17:25:22 -07:00
string: introduce memweight()
2012-07-30 17:25:16 -07:00
net: core: move mac_pton() to lib/net_utils.c
2013-06-05 12:00:27 -07:00
netlink: don't compare the nul-termination in nla_strcmp
2014-04-01 15:25:02 -04:00
mode_t, whack-a-mole at 11...
2013-04-09 14:13:05 -04:00
fault-injection: notifier error injection
2012-07-30 17:25:22 -07:00
powerpc+of: Rename and fix OF reconfig notifier error inject module
2012-12-14 10:32:52 +11:00
Give the OID registry file module info to avoid kernel tainting
2013-05-05 14:38:00 -07:00
lib/parser.c: put EXPORT_SYMBOLs in the conventional place
2014-01-23 16:36:55 -08:00
lib: add NO_GENERIC_PCI_IOPORT_MAP
2012-01-31 23:19:47 +02:00
percpu-refcount: Add a WARN() for ref going negative
2014-01-21 04:40:56 -05:00
percpu_counter: unbreak __percpu_counter_add()
2014-01-17 11:32:24 +11:00
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2014-02-14 10:45:18 -08:00
percpu: add test module for various percpu operations
2013-11-13 12:09:11 +09:00
lib/plist.c: make plist test announcements KERN_DEBUG
2012-10-06 03:04:58 +09:00
PM: PM notifier error injection module
2012-07-30 17:25:22 -07:00
locking, lib/proportions: Annotate prop_local_percpu::lock as raw
2011-09-13 11:11:50 +02:00
lib/radix-tree.c: swapoff tmpfs radix_tree: remember to rcu_read_unlock
2014-03-04 07:55:47 -08:00
random32: avoid attempt to late reseed if in the middle of seeding
2014-03-28 16:04:19 -04:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
lib: Change mail address of Oskar Schirmer
2012-05-17 15:18:37 +02:00
rbtree: add postorder iteration functions
2013-09-11 15:59:19 -07:00
rbtree/test: test rbtree_postorder_for_each_entry_safe()
2014-01-23 16:37:03 -08:00
reciprocal_divide: update/correction of the algorithm
2014-01-21 23:17:20 -08:00
lib/scatterlist: export sg_miter_skip()
2013-12-08 17:56:37 -08:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
lib/show_mem.c: show num_poisoned_pages when oom
2014-01-21 16:19:48 -08:00
sched: Introduce preempt_count accessor functions
2013-09-25 14:07:32 +02:00
lib: add support for stmp-style devices
2012-04-20 23:27:08 +02:00
asmlinkage Make __stack_chk_failed and memcmp visible
2014-02-13 18:13:43 -08:00
lib/string_helpers: introduce generic string_unescape
2013-04-30 17:04:03 -07:00
word-at-a-time: make the interfaces truly generic
2012-05-26 11:33:40 -07:00
lib: Fix generic strnlen_user for 32-bit big-endian machines
2012-05-27 20:59:46 -07:00
memblock, nobootmem: add memblock_virt_alloc_low()
2014-01-27 21:02:38 -08:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
lib/test-kstrtox.c: mark const init data with __initconst instead of __initdata
2012-05-29 16:22:32 -07:00
lib/string_helpers: introduce generic string_unescape
2013-04-30 17:04:03 -07:00
test: add minimal module for verification testing
2014-01-23 16:36:57 -08:00
test: check copy_to/from_user boundary validation
2014-01-23 16:36:57 -08:00
The following text was taken from the original review request:
2012-03-24 10:24:31 -07:00
Move utf16 functions to kernel core and rename
2013-04-15 21:23:03 +01:00
Kconfig: consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
2013-04-30 17:04:09 -07:00
uuid: use prandom_bytes()
2013-04-29 18:28:42 -07:00
vsprintf: Add support for IORESOURCE_UNSET in %pR
2014-02-26 14:42:09 -07:00
cd6362befe