David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06:08:27 -07:00
..
842
fonts
lz4
lzo
mpi	MPI: Fix mpi_read_buffer	2015-08-25 21:13:16 +08:00
raid6	md/raid6: delta syndrome for ARM NEON	2015-08-31 19:29:05 +02: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	ASN.1: Handle 'ANY OPTIONAL' in grammar	2015-08-05 13:38:07 +01:00
assoc_array.c
atomic64.c	atomic: Provide atomic_{or,xor,and}	2015-07-27 14:06:24 +02:00
atomic64_test.c	atomic: Add simple atomic_t tests	2015-07-27 14:06:24 +02:00
audit.c
bcd.c
bch.c
bitmap.c	lib/bitmap.c: bitmap_parselist can accept string with whitespaces on head or tail	2015-09-10 13:29:01 -07:00
bitrev.c
bsearch.c
btree.c
bug.c
build_OID_registry
bust_spinlocks.c
check_signature.c
checksum.c
clz_ctz.c
clz_tab.c
cmdline.c
compat_audit.c
cordic.c
cpu-notifier-error-inject.c
cpu_rmap.c
cpumask.c
crc-ccitt.c
crc-itu-t.c
crc-t10dif.c
crc7.c
crc8.c
crc16.c
crc32.c
crc32defs.h
ctype.c
debug_info.c
debug_locks.c
debugobjects.c
dec_and_lock.c
decompress.c	lib/decompress: set the compressor name to NULL on error	2015-07-17 16:39:54 -07:00
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
devres.c	cleanup IORESOURCE_CACHEABLE vs ioremap()	2015-08-10 23:07:06 -04:00
digsig.c
div64.c
dma-debug.c	dma-debug: skip debug_dma_assert_idle() when disabled	2015-07-17 16:39:53 -07:00
dump_stack.c
dynamic_debug.c
dynamic_queue_limits.c
earlycpio.c
extable.c
fault-inject.c
fdt.c
fdt_empty_tree.c
fdt_ro.c
fdt_rw.c
fdt_strerror.c
fdt_sw.c
fdt_wip.c
find_bit.c
flex_array.c
flex_proportions.c
gcd.c
gen_crc32table.c
genalloc.c	genalloc: add support of multiple gen_pools per device	2015-09-04 16:54:41 -07:00
glob.c
halfmd4.c
hexdump.c	hexdump: fix for non-aligned buffers	2015-07-17 16:39:53 -07:00
hweight.c
idr.c
inflate.c
int_sqrt.c
interval_tree.c
interval_tree_test.c
iomap.c
iomap_copy.c
iommu-common.c	lib/iommu-common.c: do not try to deref a null iommu->lazy_flush() pointer when n < pool->hint	2015-09-22 15:09:53 -07:00
iommu-helper.c
ioremap.c
iov_iter.c
irq_regs.c
is_single_threaded.c
jedec_ddr_data.c
kasprintf.c
Kconfig	lib/Kconfig: ZLIB_DEFLATE must select BITREVERSE	2015-10-16 11:42:28 -07:00
Kconfig.debug	Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-09-03 15:46:07 -07:00
Kconfig.kasan	x86/kasan: Move KASAN_SHADOW_OFFSET to the arch Kconfig	2015-07-06 14:53:15 +02:00
Kconfig.kgdb
Kconfig.kmemcheck
kfifo.c
klist.c	klist: implement klist_prev()	2015-07-28 08:50:42 +01:00
kobject.c	include, lib: add __printf attributes to several function prototypes	2015-07-17 16:39:53 -07:00
kobject_uevent.c
kstrtox.c	kstrto*: accept "-0" for signed conversion	2015-09-10 13:29:01 -07:00
kstrtox.h
lcm.c
libcrc32c.c
list_debug.c
list_sort.c
llist.c
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	locking/lockref: Remove homebrew cmpxchg64_relaxed() macro definition	2015-08-12 11:59:04 +02:00
lru_cache.c
Makefile	net: move net_get_random_once to lib	2015-10-08 05:26:35 -07:00
md5.c
memory-notifier-error-inject.c
memweight.c
net_utils.c
nlattr.c
nmi_backtrace.c	nmi: create generic NMI backtrace implementation	2015-07-17 12:23:17 +01: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-refcount.c
percpu_counter.c
percpu_ida.c
percpu_test.c
plist.c
pm-notifier-error-inject.c
proportions.c
radix-tree.c
random32.c	random32: add prandom_init_once helper for own rngs	2015-10-08 05:26:38 -07:00
ratelimit.c
rational.c
rbtree.c
rbtree_test.c
reciprocal_div.c
rhashtable.c	lib: fix data race in rhashtable_rehash_one	2015-09-22 17:36:07 -07:00
scatterlist.c	scatterlist: allow limited chaining without ARCH_HAS_SG_CHAIN	2015-08-17 08:12:51 -06:00
seq_buf.c
sg_split.c	lib: scatterlist: add sg splitting function	2015-08-24 14:28:01 -06:00
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
stmp_device.c
string.c	strscpy: zero any trailing garbage bytes in the destination	2015-10-06 14:53:18 -04:00
string_helpers.c	lib/string_helpers.c: fix infinite loop in string_get_size()	2015-09-17 21:16:07 -07:00
strncpy_from_user.c	lib: move strncpy_from_unsafe() into mm/maccess.c	2015-08-31 12:36:10 -07:00
strnlen_user.c
swiotlb.c
syscall.c
test-hexdump.c
test-kstrtox.c	kstrto*: accept "-0" for signed conversion	2015-09-10 13:29:01 -07:00
test-string_helpers.c
test_bpf.c	test_bpf: add tests checking that JIT/interpreter sets A and X to 0.	2015-08-06 22:02:32 -07:00
test_firmware.c
test_kasan.c	lib/test_kasan.c: make kmalloc_oob_krealloc_less more correctly	2015-09-10 13:29:01 -07:00
test_module.c
test_rhashtable.c	rhashtable-test: extend to test concurrency	2015-08-17 14:33:47 -07:00
test_static_key_base.c	locking/static_keys: Provide a selftest	2015-08-03 11:51:12 +02:00
test_static_keys.c	locking/static_keys: Make verify_keys() static	2015-08-05 09:53:40 +02:00
test_user_copy.c
textsearch.c
timerqueue.c
ts_bm.c
ts_fsm.c
ts_kmp.c
ucs2_string.c
usercopy.c
uuid.c
vsprintf.c	lib/vsprintf.c: Include clk.h	2015-07-20 10:52:48 -07:00