David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-06-15 11:59:32 -04:00

..

842

…

fonts

lib/fonts/Kconfig: keep non-Sparc fonts listed together

2017-02-27 18:43:46 -08:00

lz4

lib/lz4: remove back-compat wrappers

2017-02-24 17:46:57 -08:00

lzo

…

mpi

…

raid6

…

reed_solomon

…

xz

…

zlib_deflate

…

zlib_inflate

lib/zlib_inflate/inftrees.c: fix potential buffer overflow

2017-05-08 17:15:12 -07:00

.gitignore

…

argv_split.c

…

asn1_decoder.c

…

assoc_array.c

…

atomic64_test.c

lib: add module support to atomic64 tests

2017-02-24 17:46:57 -08:00

atomic64.c

…

audit.c

…

bcd.c

…

bch.c

…

bitmap.c

kernel-api.rst: fix some complex tags at lib/bitmap.c

2017-04-02 14:29:33 -06:00

bitrev.c

…

bsearch.c

…

btree.c

…

bug.c

debug: Add _ONCE() logic to report_bug()

2017-03-30 09:37:20 +02:00

build_OID_registry

…

bust_spinlocks.c

…

chacha20.c

…

check_signature.c

…

checksum.c

…

clz_ctz.c

…

clz_tab.c

…

cmdline.c

boot/param: Move next_arg() function to lib/cmdline.c for later reuse

2017-04-18 10:37:13 +02:00

compat_audit.c

…

cordic.c

…

cpu_rmap.c

…

cpumask.c

…

crc7.c

…

crc8.c

…

crc16.c

…

crc32.c

lib: add module support to crc32 tests

2017-02-24 17:46:57 -08:00

crc32defs.h

…

crc32test.c

lib: add module support to crc32 tests

2017-02-24 17:46:57 -08:00

crc-ccitt.c

…

crc-itu-t.c

…

crc-t10dif.c

…

ctype.c

…

debug_info.c

…

debug_locks.c

…

debugobjects.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/task_stack.h>

2017-03-02 08:42:36 +01:00

dec_and_lock.c

…

decompress_bunzip2.c

…

decompress_inflate.c

…

decompress_unlz4.c

lib/decompress_unlz4: change module to work with new LZ4 module version

2017-02-24 17:46:57 -08:00

decompress_unlzma.c

…

decompress_unlzo.c

…

decompress_unxz.c

…

decompress.c

…

devres.c

devres: fix devm_ioremap_*() offset parameter kerneldoc description

2017-04-24 13:53:13 -05:00

digsig.c

KEYS: Differentiate uses of rcu_dereference_key() and user_key_payload()

2017-03-02 10:09:00 +11:00

div64.c

…

dma-debug.c

Merge tag 'dmaengine-4.12-rc1' of git://git.infradead.org/users/vkoul/slave-dma

2017-05-09 15:40:28 -07:00

dma-noop.c

lib/dma-noop: Clarify a comment

2017-01-24 12:23:35 -05:00

dma-virt.c

lib/dma-virt: Add dma_virt_ops

2017-01-24 12:23:35 -05:00

dump_stack.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/debug.h>

2017-03-02 08:42:34 +01:00

dynamic_debug.c

…

dynamic_queue_limits.c

…

earlycpio.c

…

extable.c

…

fault-inject.c

lib/fault-inject.c: use correct check for interrupts

2017-05-08 17:15:12 -07: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

lib/find_bit.c: micro-optimise find_next_*_bit

2017-02-24 17:46:57 -08:00

flex_array.c

…

flex_proportions.c

…

gcd.c

…

gen_crc32table.c

…

genalloc.c

…

glob.c

lib: add module support to glob tests

2017-02-24 17:46:57 -08:00

globtest.c

lib: add module support to glob tests

2017-02-24 17:46:57 -08:00

hexdump.c

…

hweight.c

…

idr.c

idr: Add missing __rcu annotations

2017-02-13 21:44:10 -05:00

inflate.c

…

int_sqrt.c

…

interval_tree_test.c

…

interval_tree.c

…

iomap_copy.c

…

iomap.c

…

iommu-common.c

…

iommu-helper.c

…

ioremap.c

mm: convert generic code to 5-level paging

2017-03-09 11:48:47 -08:00

iov_iter.c

Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2017-05-09 09:01:21 -07:00

irq_poll.c

…

irq_regs.c

…

is_single_threaded.c

sched/headers: Prepare to move 'init_task' and 'init_thread_union' from <linux/sched.h> to <linux/sched/task.h>

2017-03-02 08:42:38 +01:00

jedec_ddr_data.c

…

kasprintf.c

…

Kconfig

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-02-28 10:00:39 -08:00

Kconfig.debug

lib: add module support to linked list sorting tests

2017-05-08 17:15:10 -07:00

Kconfig.kasan

…

Kconfig.kgdb

…

Kconfig.kmemcheck

…

Kconfig.ubsan

…

kfifo.c

…

klist.c

…

kobject_uevent.c

…

kobject.c

kobject: Export kobject_get_unless_zero()

2017-03-22 20:11:35 -06:00

kstrtox.c

…

kstrtox.h

…

lcm.c

…

libcrc32c.c

crypto: Work around deallocated stack frame reference gcc bug on sparc.

2017-06-08 17:36:03 +08:00

list_debug.c

bug: switch data corruption check to __must_check

2017-02-24 17:46:56 -08:00

list_sort.c

lib: add module support to linked list sorting tests

2017-05-08 17:15:10 -07:00

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

…

lru_cache.c

…

Makefile

lib: add module support to linked list sorting tests

2017-05-08 17:15:10 -07:00

memory-notifier-error-inject.c

…

memweight.c

…

net_utils.c

…

netdev-notifier-error-inject.c

…

nlattr.c

networking: use skb_put_zero()

2017-06-13 13:54:03 -04:00

nmi_backtrace.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/debug.h>

2017-03-02 08:42:34 +01:00

nodemask.c

…

notifier-error-inject.c

…

notifier-error-inject.h

…

of-reconfig-notifier-error-inject.c

…

oid_registry.c

…

once.c

…

parman.c

lib: Introduce priority array area manager

2017-02-03 16:35:42 -05:00

parser.c

…

pci_iomap.c

…

percpu_counter.c

percpu_counter: percpu_counter_hotcpu_callback() cleanup

2017-01-20 10:06:56 -05:00

percpu_ida.c

sched/headers: Prepare to remove the <linux/gfp.h> include from <linux/sched.h>

2017-03-02 08:42:34 +01:00

percpu_test.c

…

percpu-refcount.c

percpu-refcount: support synchronous switch to atomic mode.

2017-03-22 19:18:43 -07:00

plist.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/clock.h>

2017-03-02 08:42:27 +01:00

pm-notifier-error-inject.c

…

prime_numbers.c

lib/prime_numbers: Suppress warn on kmalloc failure

2017-01-23 09:17:12 +01:00

radix-tree.c

lockdep: allow to disable reclaim lockup detection

2017-05-03 15:52:09 -07:00

random32.c

…

ratelimit.c

…

rational.c

…

rbtree_test.c

…

rbtree.c

rbtree: use designated initializers

2017-02-24 17:46:57 -08:00

reciprocal_div.c

…

refcount.c

refcount: change EXPORT_SYMBOL markings

2017-05-06 11:01:34 -07:00

rhashtable.c

lib/rhashtable.c: simplify a strange allocation pattern

2017-05-08 17:15:12 -07:00

sbitmap.c

sbitmap: add sbitmap_get_shallow() operation

2017-04-14 14:06:52 -06:00

scatterlist.c

scatterlist: do not disable IRQs in sg_copy_buffer

2017-02-27 18:43:46 -08:00

seq_buf.c

…

sg_pool.c

…

sg_split.c

…

sha1.c

…

show_mem.c

lib/show_mem.c: teach show_mem to work with the given nodemask

2017-02-22 16:41:30 -08:00

siphash.c

…

smp_processor_id.c

sched/core: Remove the tsk_cpus_allowed() wrapper

2017-03-02 08:42:24 +01:00

sort.c

lib: add CONFIG_TEST_SORT to enable self-test of sort()

2017-02-24 17:46:57 -08:00

stackdepot.c

…

stmp_device.c

…

string_helpers.c

…

string.c

Merge tag 'usb-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2017-05-04 18:03:51 -07:00

strncpy_from_user.c

…

strnlen_user.c

…

swiotlb.c

swiotlb: ensure that page-sized mappings are page-aligned

2017-01-15 12:37:24 -05:00

syscall.c

lib/syscall: Clear return values when no stack

2017-03-24 07:43:35 +01:00

test_bitmap.c

…

test_bpf.c

test_bpf: Add test to make conditional jump cross a large number of insns.

2017-06-14 15:03:22 -04:00

test_firmware.c

test_firmware: add test custom fallback trigger

2017-01-25 11:52:34 +01:00

test_hash.c

…

test_hexdump.c

…

test_kasan.c

kasan: report only the first error by default

2017-03-31 17:13:30 -07:00

test_list_sort.c

lib: add module support to linked list sorting tests

2017-05-08 17:15:10 -07:00

test_module.c

…

test_parman.c

lib: fix spelling mistake: "actualy" -> "actually"

2017-02-26 11:03:38 -05:00

test_printf.c

…

test_rhashtable.c

…

test_siphash.c

…

test_sort.c

Revert "lib/test_sort.c: make it explicitly non-modular"

2017-05-08 17:15:10 -07:00

test_static_key_base.c

…

test_static_keys.c

…

test_user_copy.c

lib: remove check for AVR32 arch in test_user_copy

2017-05-01 09:36:30 +02:00

test_uuid.c

…

test-kstrtox.c

…

test-string_helpers.c

…

textsearch.c

…

timerqueue.c

timerqueue: Use rb_entry_safe() instead of open-coding it

2017-01-20 08:03:42 +01:00

ts_bm.c

…

ts_fsm.c

…

ts_kmp.c

…

ubsan.c

…

ubsan.h

…

ucs2_string.c

…

usercopy.c

generic ...copy_..._user primitives

2017-03-28 18:22:11 -04:00

uuid.c

…

vsprintf.c

checkpatch: add ability to find bad uses of vsprintf %p<foo> extensions

2017-05-08 17:15:10 -07:00

win_minmax.c

…