David S. Miller 2745529ac7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Couple conflicts resolved here: 1) In the MACB driver, a bug fix to properly initialize the RX tail pointer properly overlapped with some changes to support variable sized rings. 2) In XGBE we had a "CONFIG_PM" --> "CONFIG_PM_SLEEP" fix overlapping with a reorganization of the driver to support ACPI, OF, as well as PCI variants of the chip. 3) In 'net' we had several probe error path bug fixes to the stmmac driver, meanwhile a lot of this code was cleaned up and reorganized in 'net-next'. 4) The cls_flower classifier obtained a helper function in 'net-next' called __fl_delete() and this overlapped with Daniel Borkamann's bug fix to use RCU for object destruction in 'net'. It also overlapped with Jiri's change to guard the rhashtable_remove_fast() call with a check against tc_skip_sw(). 5) In mlx4, a revert bug fix in 'net' overlapped with some unrelated changes in 'net-next'. 6) In geneve, a stale header pointer after pskb_expand_head() bug fix in 'net' overlapped with a large reorganization of the same code in 'net-next'. Since the 'net-next' code no longer had the bug in question, there was nothing to do other than to simply take the 'net-next' hunks. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-12-03 12:29:53 -05:00
..
842	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2016-03-17 21:38:27 -07:00
fonts
lz4	lib: lz4: cleanup unaligned access efficiency detection	2016-04-13 09:22:49 -07:00
lzo
mpi	mpi: Fix NULL ptr dereference in mpi_powm() [ver #3]	2016-11-25 12:57:50 +11:00
raid6	Merge tag 'md/4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md	2016-10-07 09:45:43 -07:00
reed_solomon
xz
zlib_deflate	zlib_deflate/deftree: remove bi_reverse()	2015-09-10 13:29:01 -07:00
zlib_inflate
.gitignore
argv_split.c
asn1_decoder.c	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2016-05-17 09:33:39 -07:00
assoc_array.c	assoc_array: don't call compare_object() on a node	2016-04-06 14:06:48 +01:00
atomic64_test.c	atomic64: no need for CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE	2016-10-07 18:46:30 -07:00
atomic64.c	locking/atomic: Implement atomic{,64,_long}_fetch_{add,sub,and,andnot,or,xor}{,_relaxed,_acquire,_release}()	2016-06-16 10:48:32 +02:00
audit.c
bcd.c
bch.c
bitmap.c	lib/bitmap.c: enhance bitmap syntax	2016-10-11 15:06:30 -07:00
bitrev.c
bsearch.c
btree.c	treewide: Remove old email address	2015-11-23 09:44:58 +01:00
bug.c	lib/bug.c: use common WARN helper	2016-03-17 15:09:34 -07:00
build_OID_registry
bust_spinlocks.c
chacha20.c	random: replace non-blocking pool with a Chacha20-based CRNG	2016-07-03 00:57:23 -04:00
check_signature.c
checksum.c	ipv4: Update parameters for csum_tcpudp_magic to their original types	2016-03-13 23:55:13 -04:00
clz_ctz.c
clz_tab.c
cmdline.c
compat_audit.c
cordic.c
cpu_rmap.c
cpu-notifier-error-inject.c	fault-injection/cpu: Convert to hotplug state machine	2016-09-19 21:44:31 +02:00
cpumask.c	cpumask: Export cpumask_any_but()	2016-02-29 09:35:20 +01:00
crc7.c
crc8.c
crc16.c
crc32.c	crc32: use ktime_get_ns() for measurement	2016-08-02 19:35:08 -04:00
crc32defs.h
crc-ccitt.c
crc-itu-t.c
crc-t10dif.c
ctype.c
debug_info.c
debug_locks.c
debugobjects.c	lib/debugobjects: export for use in modules	2016-11-30 16:32:52 -08:00
dec_and_lock.c
decompress_bunzip2.c	lib/decompressors: use real out buf size for gunzip with kernel	2015-09-10 13:29:01 -07:00
decompress_inflate.c	lib/decompressors: use real out buf size for gunzip with kernel	2015-09-10 13:29:01 -07:00
decompress_unlz4.c	lib/decompressors: use real out buf size for gunzip with kernel	2015-09-10 13:29:01 -07:00
decompress_unlzma.c	lib/decompress_unlzma: Do a NULL check for pointer	2015-09-10 13:29:01 -07:00
decompress_unlzo.c	lib/decompressors: use real out buf size for gunzip with kernel	2015-09-10 13:29:01 -07:00
decompress_unxz.c	lib/decompressors: use real out buf size for gunzip with kernel	2015-09-10 13:29:01 -07:00
decompress.c
devres.c	devres: use to_pci_dev()	2016-02-07 23:17:59 -08:00
digsig.c	lib/digsig: digsig_verify_rsa(): return -EINVAL if modulo length is zero	2016-05-31 16:42:00 +08:00
div64.c	__div64_32(): make it overridable at compile time	2015-11-16 14:42:12 -05:00
dma-debug.c	dmaengine updates for 4.8-rc1	2016-10-06 17:13:54 -07:00
dma-noop.c	dma-mapping: use unsigned long for dma_attrs	2016-08-04 08:50:07 -04:00
dump_stack.c	dump_stack: avoid potential deadlocks	2016-02-05 18:10:40 -08:00
dynamic_debug.c	dynamic_debug: add jump label support	2016-08-04 08:50:07 -04:00
dynamic_queue_limits.c
earlycpio.c	lib/cpio: Make find_cpio_data()'s offset arg optional	2016-06-08 11:04:19 +02:00
extable.c	extable: add support for relative extables to search and sort routines	2016-02-24 14:57:26 +00:00
fault-inject.c	fault-inject: fix inverted interval/probability values in printk	2015-10-23 17:55:10 +09:00
fdt_empty_tree.c
fdt_ro.c
fdt_rw.c
fdt_strerror.c
fdt_sw.c
fdt_wip.c
fdt.c
find_bit.c
flex_array.c
flex_proportions.c	lib+mm: fix few spelling mistakes	2016-02-15 11:18:23 +01:00
gcd.c	lib/GCD.c: use binary GCD algorithm instead of Euclidean	2016-05-20 17:58:30 -07:00
gen_crc32table.c
genalloc.c	lib/genalloc.c: start search from start of chunk	2016-10-27 18:43:43 -07:00
glob.c
halfmd4.c	lib/halfmd4.c: use rol32 inline function in the ROUND macro	2015-11-06 17:50:42 -08:00
hexdump.c	lib/hexdump.c: truncate output in case of overflow	2015-11-06 17:50:42 -08:00
hweight.c	x86/hweight: Get rid of the special calling convention	2016-06-08 15:01:02 +02:00
idr.c	mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd	2015-11-06 17:50:42 -08:00
inflate.c
int_sqrt.c
interval_tree_test.c
interval_tree.c
iomap_copy.c	lib/iomap_copy.c: add __ioread32_copy()	2016-01-20 17:09:18 -08:00
iomap.c
iommu-common.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc	2015-11-05 16:34:48 -08:00
iommu-helper.c	lib/iommu-helper: skip to next segment	2016-08-02 19:35:07 -04:00
ioremap.c
iov_iter.c	fix iov_iter_advance() for ITER_PIPE	2016-11-17 00:00:48 -05:00
irq_poll.c	This adds a new gcc plugin named "latent_entropy". It is designed to	2016-10-15 10:03:15 -07:00
irq_regs.c
is_single_threaded.c	lib/is_single_threaded.c: change current_is_single_threaded() to use for_each_thread()	2015-11-06 17:50:42 -08:00
jedec_ddr_data.c
kasprintf.c	lib/kasprintf.c: add sanity check to kvasprintf	2016-01-16 11:17:27 -08:00
Kconfig	Merge branch 'akpm' (patches from Andrew)	2016-10-07 21:38:00 -07:00
Kconfig.debug	config: Adding the new config parameter CONFIG_PROVE_LOCKING_SMALL for sparc	2016-11-18 11:33:19 -08:00
Kconfig.kasan	mm, kasan: switch SLUB to stackdepot, enable memory quarantine for SLUB	2016-07-28 16:07:41 -07:00
Kconfig.kgdb	kgdb: depends on VT	2016-05-23 17:04:14 -07:00
Kconfig.kmemcheck
Kconfig.ubsan	ubsan: allow to disable the null sanitizer	2016-09-20 14:26:08 +02:00
kfifo.c
klist.c	klist: fix starting point removed bug in klist iterators	2016-02-07 22:18:47 -08:00
kobject_uevent.c
kobject.c	kobject: export kset_find_obj() for module use	2016-02-09 17:36:34 -08:00
kstrtox.c	lib/kstrtox.c: smaller _parse_integer()	2016-10-11 15:06:30 -07:00
kstrtox.h
lcm.c
libcrc32c.c	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2016-01-22 11:58:43 -08:00
list_debug.c	list: kill list_force_poison()	2016-03-09 15:43:42 -08:00
list_sort.c
llist.c	lib/llist.c: fix data race in llist_del_first	2015-11-06 17:50:42 -08:00
locking-selftest-hardirq.h
locking-selftest-mutex.h
locking-selftest-rlock-hardirq.h
locking-selftest-rlock-softirq.h
locking-selftest-rlock.h
locking-selftest-rsem.h
locking-selftest-softirq.h
locking-selftest-spin-hardirq.h
locking-selftest-spin-softirq.h
locking-selftest-spin.h
locking-selftest-wlock-hardirq.h
locking-selftest-wlock-softirq.h
locking-selftest-wlock.h
locking-selftest-wsem.h
locking-selftest.c
lockref.c
lru_cache.c	lru_cache: Converted lc_seq_printf_status to return void	2015-11-25 09:22:02 -07:00
Makefile	kcov: do not instrument lib/stackdepot.c	2016-10-11 15:06:32 -07:00
md5.c
memory-notifier-error-inject.c
memweight.c
net_utils.c
netdev-notifier-error-inject.c	net: Add support for CHANGEUPPER notifier error injection	2015-12-03 11:49:23 -05:00
nlattr.c	netlink: smaller nla_attr_minlen table	2016-11-19 22:11:25 -05:00
nmi_backtrace.c	nmi_backtrace: generate one-line reports for idle cpus	2016-10-07 18:46:30 -07:00
nodemask.c	include/linux/nodemask.h: create next_node_in() helper	2016-05-19 19:12:14 -07:00
notifier-error-inject.c
notifier-error-inject.h
of-reconfig-notifier-error-inject.c
oid_registry.c
once.c	once: make helper generic for calling functions once	2015-10-08 05:26:36 -07:00
parser.c
pci_iomap.c	libnvdimm for 4.3:	2015-09-08 14:35:59 -07:00
percpu_counter.c	percpu_counter: update debugobjects fixup callbacks return type	2016-05-19 19:12:14 -07:00
percpu_ida.c	mm, page_alloc: rename __GFP_WAIT to __GFP_RECLAIM	2015-11-06 17:50:42 -08:00
percpu_test.c
percpu-refcount.c	percpu-refcount: init ->confirm_switch member properly	2016-08-11 13:52:23 -04:00
plist.c
pm-notifier-error-inject.c
radix-tree.c	mm: filemap: don't plant shadow entries without radix tree node	2016-10-05 09:17:56 -07:00
random32.c	This adds a new gcc plugin named "latent_entropy". It is designed to	2016-10-15 10:03:15 -07:00
ratelimit.c	ratelimit: extend to print suppressed messages on release	2016-08-02 19:35:06 -04:00
rational.c
rbtree_test.c
rbtree.c	Introduce rb_replace_node_rcu()	2016-07-06 10:51:14 +01:00
reciprocal_div.c
rhashtable.c	rhashtable: Add rhlist interface	2016-09-20 04:43:36 -04:00
sbitmap.c	sbitmap: initialize weight to zero	2016-09-19 08:19:40 -06:00
scatterlist.c	scatterlist: fix a typo in comment block of sg_miter_stop()	2016-02-08 10:15:17 -08:00
seq_buf.c	tracing: Use seq_buf_used() in seq_buf_to_user() instead of len	2015-12-23 14:27:20 -05:00
sg_pool.c	lib: scatterlist: move SG pool code from SCSI driver to lib/sg_pool.c	2016-04-15 16:53:14 -04:00
sg_split.c
sha1.c
show_mem.c	lib/show_mem.c: correct reserved memory calculation	2015-09-08 15:35:28 -07:00
smp_processor_id.c
sort.c
stackdepot.c	lib/stackdepot: export save/fetch stack for drivers	2016-11-11 08:12:37 -08:00
stmp_device.c
string_helpers.c	string_helpers: add kstrdup_quotable_file	2016-04-21 10:47:26 +10:00
string.c	lib: move strtobool() to kstrtobool()	2016-03-17 15:09:34 -07:00
strncpy_from_user.c	lib: harden strncpy_from_user	2016-10-11 15:06:30 -07:00
strnlen_user.c	unsafe_[get|put]_user: change interface to use a error target label	2016-08-08 13:02:01 -07:00
swiotlb.c	dma-mapping: use unsigned long for dma_attrs	2016-08-04 08:50:07 -04:00
syscall.c	lib/syscall: Pin the task stack in collect_syscall()	2016-09-16 09:18:53 +02:00
test_bitmap.c	test_bitmap: unit tests for lib/bitmap.c	2016-02-19 22:54:09 -05:00
test_bpf.c	bpf, test: fix ld_abs + vlan push/pop stress test	2016-10-20 14:39:06 -04:00
test_firmware.c	test: firmware_class: add asynchronous request trigger	2016-01-07 13:44:22 -07:00
test_hash.c	lib/test_hash.c: fix warning in preprocessor symbol evaluation	2016-09-01 17:52:01 -07:00
test_hexdump.c	test_hexdump: print statistics at the end	2016-01-20 17:09:18 -08:00
test_kasan.c	kasan: support use-after-scope detection	2016-11-30 16:32:52 -08:00
test_module.c
test_printf.c	mm, printk: introduce new format string for flags	2016-03-15 16:55:16 -07:00
test_rhashtable.c	rhashtable-test: Fix max_size parameter description	2016-08-08 12:52:42 -07:00
test_static_key_base.c
test_static_keys.c	locking/static_keys: Avoid nested functions	2016-02-09 10:27:29 +01:00
test_user_copy.c
test_uuid.c	lib/uuid: add a test module	2016-05-30 15:26:57 -07:00
test-kstrtox.c	kstrto*: accept "-0" for signed conversion	2015-09-10 13:29:01 -07:00
test-string_helpers.c	lib/test-string_helpers.c: fix and improve string_get_size() tests	2016-02-03 08:28:43 -08:00
textsearch.c
timerqueue.c
ts_bm.c
ts_fsm.c
ts_kmp.c
ubsan.c	UBSAN: fix typo in format string	2016-08-02 17:31:41 -04:00
ubsan.h	UBSAN: run-time undefined behavior sanity checker	2016-01-20 17:09:18 -08:00
ucs2_string.c	lib/ucs2_string: Speed up ucs2_utf8size()	2016-09-09 16:08:46 +01:00
uuid.c	lib/uuid.c: use correct offset in uuid parser	2016-05-30 15:26:57 -07:00
vsprintf.c	lib/uuid.c: introduce a few more generic helpers	2016-05-20 17:58:30 -07:00
win_minmax.c	lib/win_minmax: windowed min or max estimator	2016-09-21 00:22:59 -04:00