David S. Miller 4cc1feeb6f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Several conflicts, seemingly all over the place. I used Stephen Rothwell's sample resolutions for many of these, if not just to double check my own work, so definitely the credit largely goes to him. The NFP conflict consisted of a bug fix (moving operations past the rhashtable operation) while chaning the initial argument in the function call in the moved code. The net/dsa/master.c conflict had to do with a bug fix intermixing of making dsa_master_set_mtu() static with the fixing of the tagging attribute location. cls_flower had a conflict because the dup reject fix from Or overlapped with the addition of port range classifiction. __set_phy_supported()'s conflict was relatively easy to resolve because Andrew fixed it in both trees, so it was just a matter of taking the net-next copy. Or at least I think it was :-) Joe Stringer's fix to the handling of netns id 0 in bpf_sk_lookup() intermixed with changes on how the sdif and caller_net are calculated in these code paths in net-next. The remaining BPF conflicts were largely about the addition of the __bpf_md_ptr stuff in 'net' overlapping with adjustments and additions to the relevant data structure where the MD pointer macros are used. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-12-09 21:43:31 -08:00
..
842	…
fonts	…
lz4	lib/lz4: update LZ4 decompressor module	2018-10-31 08:54:14 -07:00
lzo	…
mpi	…
raid6	lib/raid6: Fix arm64 test build	2018-11-06 17:12:44 +00:00
reed_solomon	…
xz	…
zlib_deflate	…
zlib_inflate	lib/zlib_inflate/inflate.c: remove fall through warnings	2018-10-31 08:54:13 -07:00
zstd	…
.gitignore	…
Kconfig	lib: introduce initial implementation of object aggregation manager	2018-11-15 14:43:43 -08:00
Kconfig.debug	lib: introduce initial implementation of object aggregation manager	2018-11-15 14:43:43 -08:00
Kconfig.kasan	…
Kconfig.kgdb	…
Kconfig.ubsan	…
Makefile	lib: introduce initial implementation of object aggregation manager	2018-11-15 14:43:43 -08:00
argv_split.c	…
ashldi3.c	…
ashrdi3.c	…
asn1_decoder.c	…
assoc_array.c	…
atomic64.c	…
atomic64_test.c	…
audit.c	…
bcd.c	…
bch.c	…
bitmap.c	lib/bitmap.c: simplify bitmap_print_to_pagebuf()	2018-10-31 08:54:12 -07:00
bitrev.c	…
bsearch.c	…
btree.c	…
bucket_locks.c	…
bug.c	…
build_OID_registry	…
bust_spinlocks.c	…
chacha20.c	…
check_signature.c	…
checksum.c	…
clz_ctz.c	…
clz_tab.c	…
cmdline.c	…
cmpdi2.c	…
compat_audit.c	…
cordic.c	lib: cordic: Move cordic macros and defines to header file	2018-11-29 17:30:48 +02:00
cpu_rmap.c	…
cpumask.c	memblock: stop using implicit alignment to SMP_CACHE_BYTES	2018-10-31 08:54:16 -07:00
crc-ccitt.c	…
crc-itu-t.c	…
crc-t10dif.c	…
crc4.c	…
crc7.c	…
crc8.c	…
crc16.c	…
crc32.c	…
crc32defs.h	…
crc32test.c	…
crc64.c	…
ctype.c	…
debug_info.c	…
debug_locks.c	…
debugobjects.c	debugobjects: avoid recursive calls with kmemleak	2018-11-30 14:56:14 -08:00
dec_and_lock.c	…
decompress.c	…
decompress_bunzip2.c	…
decompress_inflate.c	…
decompress_unlz4.c	…
decompress_unlzma.c	…
decompress_unlzo.c	…
decompress_unxz.c	…
devres.c	…
digsig.c	…
div64.c	…
dump_stack.c	…
dynamic_debug.c	…
dynamic_queue_limits.c	…
earlycpio.c	…
error-inject.c	…
errseq.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	…
find_bit_benchmark.c	…
flex_array.c	…
flex_proportions.c	…
gcd.c	…
gen_crc32table.c	…
gen_crc64table.c	…
genalloc.c	…
glob.c	…
globtest.c	…
hexdump.c	…
hweight.c	…
idr.c	…
inflate.c	…
int_sqrt.c	…
interval_tree.c	…
interval_tree_test.c	…
iomap.c	…
iomap_copy.c	…
iommu-helper.c	…
ioremap.c	…
iov_iter.c	iov_iter: teach csum_and_copy_to_iter() to handle pipe-backed ones	2018-11-25 16:24:49 -05:00
irq_poll.c	…
irq_regs.c	…
is_single_threaded.c	…
jedec_ddr_data.c	…
kasprintf.c	…
kfifo.c	…
klist.c	…
kobject.c	…
kobject_uevent.c	…
kstrtox.c	lib/kstrtox.c: delete unnecessary casts	2018-10-31 08:54:13 -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-rtmutex.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	…
logic_pio.c	…
lru_cache.c	…
lshrdi3.c	…
memcat_p.c	…
memory-notifier-error-inject.c	…
memweight.c	…
muldi3.c	…
net_utils.c	…
netdev-notifier-error-inject.c	…
nlattr.c	…
nmi_backtrace.c	…
nodemask.c	…
notifier-error-inject.c	…
notifier-error-inject.h	…
objagg.c	lib: introduce initial implementation of object aggregation manager	2018-11-15 14:43:43 -08:00
of-reconfig-notifier-error-inject.c	…
oid_registry.c	…
once.c	…
parman.c	…
parser.c	lib/parser.c: switch match_number() over to use match_strdup()	2018-10-31 08:54:12 -07:00
pci_iomap.c	…
percpu-refcount.c	…
percpu_counter.c	…
percpu_test.c	…
plist.c	…
pm-notifier-error-inject.c	…
prime_numbers.c	…
radix-tree.c	…
random32.c	…
ratelimit.c	…
rational.c	…
rbtree.c	…
rbtree_test.c	…
reciprocal_div.c	…
refcount.c	…
rhashtable.c	rhashtable: detect when object movement between tables might have invalidated a lookup	2018-12-03 15:31:55 -08:00
sbitmap.c	…
scatterlist.c	…
seq_buf.c	…
sg_pool.c	lib/sg_pool.c: remove unnecessary null check when freeing object	2018-10-31 08:54:13 -07:00
sg_split.c	…
sha1.c	…
sha256.c	…
show_mem.c	…
siphash.c	…
smp_processor_id.c	…
sort.c	…
stackdepot.c	…
stmp_device.c	…
string.c	…
string_helpers.c	…
strncpy_from_user.c	…
strnlen_user.c	…
syscall.c	…
test-kstrtox.c	…
test-string_helpers.c	…
test_bitfield.c	…
test_bitmap.c	…
test_bpf.c	net: remove VLAN_TAG_PRESENT	2018-11-16 19:25:29 -08:00
test_debug_virtual.c	…
test_firmware.c	test_firmware: fix error return getting clobbered	2018-11-11 09:18:04 -08:00
test_hash.c	…
test_hexdump.c	test_hexdump: use memcpy instead of strncpy	2018-11-30 12:13:15 -08:00
test_ida.c	…
test_kasan.c	lib/test_kasan.c: add tests for several string/memory API functions	2018-10-26 16:25:18 -07:00
test_kmod.c	lib/test_kmod.c: fix rmmod double free	2018-11-30 14:56:14 -08:00
test_list_sort.c	…
test_memcat_p.c	…
test_module.c	…
test_objagg.c	test_objagg: Fix warning.	2018-11-15 14:57:09 -08:00
test_overflow.c	…
test_parman.c	…
test_printf.c	…
test_rhashtable.c	…
test_siphash.c	…
test_sort.c	…
test_static_key_base.c	…
test_static_keys.c	…
test_string.c	…
test_sysctl.c	…
test_ubsan.c	…
test_user_copy.c	…
test_uuid.c	…
test_xarray.c	XArray tests: Add missing locking	2018-11-19 09:41:11 -05:00
textsearch.c	…
timerqueue.c	…
ts_bm.c	…
ts_fsm.c	…
ts_kmp.c	…
ubsan.c	lib/ubsan.c: don't mark __ubsan_handle_builtin_unreachable as noreturn	2018-11-18 10:15:10 -08:00
ubsan.h	…
ucmpdi2.c	…
ucs2_string.c	…
usercopy.c	…
uuid.c	…
vsprintf.c	Devicetree updates for 4.20:	2018-10-26 12:09:58 -07:00
win_minmax.c	…
xarray.c	XArray: Correct xa_store_range	2018-11-16 16:27:28 -05:00
xxhash.c	…