David S. Miller 0fa74a4be4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be_main.c net/core/sysctl_net_core.c net/ipv4/inet_diag.c The be_main.c conflict resolution was really tricky. The conflict hunks generated by GIT were very unhelpful, to say the least. It split functions in half and moved them around, when the real actual conflict only existed solely inside of one function, that being be_map_pci_bars(). So instead, to resolve this, I checked out be_main.c from the top of net-next, then I applied the be_main.c changes from 'net' since the last time I merged. And this worked beautifully. The inet_diag.c and sysctl_net_core.c conflicts were simple overlapping changes, and were easily to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-20 18:51:09 -04:00
..
fonts	fonts: Add 6x10 font	2014-10-09 11:35:48 +03:00
lz4
lzo	lzo: check for length overrun in variable length encoding.	2014-09-28 11:08:01 +02:00
mpi	MPILIB: Fix comparison of negative MPIs	2015-01-14 16:10:12 +00:00
raid6	x86/raid6: correctly check for assembler capabilities	2015-02-04 08:35:51 +11:00
reed_solomon
xz
zlib_deflate
zlib_inflate
.gitignore
argv_split.c
asn1_decoder.c
assoc_array.c	assoc_array: Include rcupdate.h for call_rcu() definition	2015-01-07 16:08:41 +00:00
atomic64.c
atomic64_test.c
audit.c	syscalls: implement execveat() system call	2014-12-13 12:42:51 -08:00
average.c
bcd.c
bch.c
bitmap.c	bitmap, cpumask, nodemask: remove dedicated formatting functions	2015-02-13 21:21:39 -08:00
bitrev.c	ARM: 8187/1: add CONFIG_HAVE_ARCH_BITREVERSE to support rbit instruction	2014-12-22 16:43:06 +00:00
bsearch.c
btree.c
bug.c	lib/bug: Use RCU list ops for module_bug_list	2014-11-11 17:07:46 +10:30
build_OID_registry
bust_spinlocks.c
check_signature.c
checksum.c	lib/checksum.c: fix build for generic csum_tcpudp_nofold	2015-01-29 11:57:38 -08:00
clz_ctz.c
clz_tab.c
cmdline.c	lib: Add a generic cmdline parse function parse_option_str	2014-10-03 18:40:58 +01:00
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_locks.c
debugobjects.c
dec_and_lock.c
decompress.c	lib/decompress.c: consistency of compress formats for kernel image	2014-12-13 12:42:52 -08:00
decompress_bunzip2.c	decompress_bunzip2: off by one in get_next_block()	2014-12-13 12:42:52 -08:00
decompress_inflate.c
decompress_unlz4.c
decompress_unlzma.c
decompress_unlzo.c
decompress_unxz.c
devres.c	devres: support sizes greater than an unsigned long	2014-11-07 10:09:07 -08:00
digsig.c
div64.c
dma-debug.c	dma-debug: prevent early callers from crashing	2014-12-10 17:41:02 -08:00
dump_stack.c
dynamic_debug.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2015-02-10 18:57:15 -08:00
dynamic_queue_limits.c	lib/dynamic_queue_limits.c: simplify includes	2015-02-12 18:54:15 -08:00
earlycpio.c
extable.c
fault-inject.c	fault-inject: add ratelimit option	2014-12-13 12:42:52 -08:00
fdt.c
fdt_empty_tree.c
fdt_ro.c
fdt_rw.c
fdt_strerror.c
fdt_sw.c
fdt_wip.c
find_last_bit.c
find_next_bit.c
flex_array.c
flex_proportions.c
gcd.c
gen_crc32table.c	lib: crc32: constify crc32 lookup table	2015-02-13 21:21:35 -08:00
genalloc.c	lib/genalloc.c: check result of devres_alloc()	2015-02-13 21:21:36 -08:00
glob.c
halfmd4.c	lib/halfmd4.c: simplify includes	2015-02-12 18:54:15 -08:00
hexdump.c	hexdump: make it return number of bytes placed in buffer	2015-02-12 18:54:15 -08:00
hweight.c
idr.c	lib/idr.c: remove redundant include	2015-02-12 18:54:15 -08:00
inflate.c
int_sqrt.c
interval_tree.c	lib/interval_tree.c: simplify includes	2015-02-12 18:54:15 -08:00
interval_tree_test.c
iomap.c
iomap_copy.c
iommu-helper.c
ioremap.c
iov_iter.c	move iov_iter.c from mm/ to lib/	2015-02-17 22:22:17 -05:00
irq_regs.c
is_single_threaded.c
jedec_ddr_data.c
kasprintf.c
Kconfig	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2015-02-19 10:36:45 -08:00
Kconfig.debug	scripts/gdb: add infrastructure	2015-02-17 14:34:53 -08:00
Kconfig.kasan	kasan: enable instrumentation of global variables	2015-02-13 21:21:42 -08:00
Kconfig.kgdb	kdb: Allow access to sensitive commands to be restricted by default	2014-11-11 09:31:52 -06:00
Kconfig.kmemcheck
kfifo.c
klist.c
kobject.c	kobject: fix NULL pointer derefernce in kobj_child_ns_ops	2014-11-07 10:52:19 -08:00
kobject_uevent.c	lib/kobject_uevent.c: remove redundant include	2015-02-12 18:54:15 -08:00
kstrtox.c
kstrtox.h
lcm.c	lib/lcm.c: replace include	2015-02-12 18:54:16 -08:00
libcrc32c.c	crypto: LLVMLinux: Remove VLAIS usage from libcrc32c.c	2014-10-14 10:51:23 +02:00
list_debug.c
list_sort.c	lib/list_sort.c: rearrange includes	2015-02-12 18:54:15 -08:00
llist.c	lib/llist.c: remove redundant include	2015-02-12 18:54:15 -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	locking/lockdep: Revert qrwlock recusive stuff	2014-10-03 06:09:30 +02:00
lockref.c	dcache: let the dentry count go down to zero without taking d_lock	2015-01-25 23:16:29 -05:00
lru_cache.c
Makefile	move iov_iter.c from mm/ to lib/	2015-02-17 22:22:17 -05:00
md5.c	lib/md5.c: simplify include	2015-02-12 18:54:15 -08:00
memory-notifier-error-inject.c
memweight.c
net_utils.c
nlattr.c	lib/nlattr.c: remove redundant include	2015-02-12 18:54:16 -08:00
notifier-error-inject.c
notifier-error-inject.h
of-reconfig-notifier-error-inject.c
oid_registry.c
parser.c
pci_iomap.c	pci: add pci_iomap_range	2015-01-21 16:28:49 +10:30
percpu-refcount.c	percpu_ref: make INIT_ATOMIC and switch_to_atomic() sticky	2014-09-24 13:31:50 -04:00
percpu_counter.c
percpu_ida.c	lib/percpu_ida.c: remove redundant includes	2015-02-12 18:54:16 -08:00
percpu_test.c
plist.c	lib/plist.c: remove redundant include	2015-02-12 18:54:16 -08:00
pm-notifier-error-inject.c
proportions.c
radix-tree.c	lib/radix-tree.c: change to simpler include	2015-02-12 18:54:16 -08:00
random32.c
ratelimit.c
rational.c
rbtree.c
rbtree_test.c
reciprocal_div.c
rhashtable.c	rhashtable: Rip out obsolete out-of-line interface	2015-03-20 16:16:24 -04:00
scatterlist.c	lib/scatterlist: fix memory leak with scsi-mq	2014-10-28 10:27:10 -06:00
seq_buf.c	seq_buf: Fix seq_buf_bprintf() truncation	2015-03-04 23:40:19 -05:00
sha1.c
show_mem.c	lib/show_mem.c: remove redundant include	2015-02-12 18:54:16 -08:00
smp_processor_id.c
sort.c	lib/sort.c: move include inside #if 0	2015-02-12 18:54:16 -08:00
stmp_device.c	lib/stmp_device.c: replace module.h include	2015-02-12 18:54:16 -08:00
string.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2015-02-14 09:47:01 -08:00
string_helpers.c	libstring_helpers.c:string_get_size(): return void	2015-02-12 18:54:13 -08:00
strncpy_from_user.c	lib/strncpy_from_user.c: replace module.h include	2015-02-12 18:54:16 -08:00
strnlen_user.c
swiotlb.c
syscall.c
test-hexdump.c	hexdump: make it return number of bytes placed in buffer	2015-02-12 18:54:15 -08:00
test-kstrtox.c
test-string_helpers.c	lib / string_helpers: introduce string_escape_mem()	2014-10-14 02:18:26 +02:00
test_bpf.c	test: bpf: expand DIV_KX to DIV_MOD_KX	2014-12-08 20:23:22 -05:00
test_firmware.c
test_kasan.c	lib: add kasan test module	2015-02-13 21:21:41 -08:00
test_module.c
test_rhashtable.c	test_rhashtable: Use inlined rhashtable interface	2015-03-20 16:16:24 -04:00
test_user_copy.c
textsearch.c	lib/textsearch.c: remove textsearch_put reference from comments	2014-10-14 02:18:14 +02:00
timerqueue.c
ts_bm.c
ts_fsm.c
ts_kmp.c
ucs2_string.c
usercopy.c
uuid.c
vsprintf.c	lib/vsprintf: implement bitmap printing through '%*pb[l]'	2015-02-13 21:21:36 -08:00