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

Conflicts:
	drivers/net/ethernet/mellanox/mlx4/cmd.c
	net/core/fib_rules.c
	net/ipv4/fib_frontend.c

The fib_rules.c and fib_frontend.c conflicts were locking adjustments
in 'net' overlapping addition and removal of code in 'net-next'.

The mlx4 conflict was a bug fix in 'net' happening in the same
place a constant was being replaced with a more suitable macro.

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

2015-04-06 22:34:15 -04:00

..

fonts

…

lz4

LZ4 : fix the data abort issue

2015-03-16 21:55:35 +01:00

lzo

…

mpi

…

raid6

…

reed_solomon

…

xz

…

zlib_deflate

…

zlib_inflate

…

.gitignore

…

argv_split.c

…

asn1_decoder.c

…

assoc_array.c

…

atomic64_test.c

…

atomic64.c

…

audit.c

…

average.c

…

bcd.c

…

bch.c

…

bitmap.c

…

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_rmap.c

…

cpu-notifier-error-inject.c

…

cpumask.c

…

crc7.c

…

crc8.c

…

crc16.c

…

crc32.c

…

crc32defs.h

…

crc-ccitt.c

…

crc-itu-t.c

…

crc-t10dif.c

…

ctype.c

…

debug_locks.c

…

debugobjects.c

…

dec_and_lock.c

…

decompress_bunzip2.c

…

decompress_inflate.c

…

decompress_unlz4.c

…

decompress_unlzma.c

…

decompress_unlzo.c

…

decompress_unxz.c

…

decompress.c

…

devres.c

…

digsig.c

…

div64.c

…

dma-debug.c

…

dump_stack.c

…

dynamic_debug.c

…

dynamic_queue_limits.c

…

earlycpio.c

…

extable.c

…

fault-inject.c

…

fdt_empty_tree.c

…

fdt_ro.c

…

fdt_rw.c

…

fdt_strerror.c

…

fdt_sw.c

…

fdt_wip.c

…

fdt.c

…

find_last_bit.c

…

find_next_bit.c

…

flex_array.c

…

flex_proportions.c

…

gcd.c

…

gen_crc32table.c

…

genalloc.c

…

glob.c

…

halfmd4.c

…

hexdump.c

…

hweight.c

…

idr.c

…

inflate.c

…

int_sqrt.c

…

interval_tree_test.c

…

interval_tree.c

…

iomap_copy.c

…

iomap.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

…

Kconfig.kasan

…

Kconfig.kgdb

…

Kconfig.kmemcheck

…

kfifo.c

…

klist.c

…

kobject_uevent.c

…

kobject.c

…

kstrtox.c

…

kstrtox.h

…

lcm.c

block: fix blk_stack_limits() regression due to lcm() change

2015-03-31 09:45:50 -06:00

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

…

lru_cache.c

…

Makefile

move iov_iter.c from mm/ to lib/

2015-02-17 22:22:17 -05:00

md5.c

…

memory-notifier-error-inject.c

…

memweight.c

…

net_utils.c

…

nlattr.c

netlink: pad nla_memcpy dest buffer with zeroes

2015-03-31 14:07:24 -04:00

notifier-error-inject.c

…

notifier-error-inject.h

…

of-reconfig-notifier-error-inject.c

…

oid_registry.c

…

parser.c

…

pci_iomap.c

…

percpu_counter.c

…

percpu_ida.c

…

percpu_test.c

…

percpu-refcount.c

…

plist.c

…

pm-notifier-error-inject.c

…

proportions.c

…

radix-tree.c

…

random32.c

…

ratelimit.c

…

rational.c

…

rbtree_test.c

…

rbtree.c

…

reciprocal_div.c

…

rhashtable.c

rhashtable: provide len to obj_hashfn

2015-03-25 17:18:33 +01:00

scatterlist.c

…

seq_buf.c

seq_buf: Fix seq_buf_bprintf() truncation

2015-03-04 23:40:19 -05:00

sha1.c

lib: EXPORT_SYMBOL sha_init

2015-03-23 22:12:08 -04:00

show_mem.c

…

smp_processor_id.c

…

sort.c

…

stmp_device.c

…

string_helpers.c

…

string.c

…

strncpy_from_user.c

…

strnlen_user.c

…

swiotlb.c

…

syscall.c

…

test_bpf.c

…

test_firmware.c

…

test_kasan.c

…

test_module.c

…

test_rhashtable.c

test_rhashtable: Remove bogus max_size setting

2015-04-03 15:09:36 -04:00

test_user_copy.c

…

test-hexdump.c

…

test-kstrtox.c

…

test-string_helpers.c

…

textsearch.c

…

timerqueue.c

…

ts_bm.c

…

ts_fsm.c

…

ts_kmp.c

…

ucs2_string.c

…

usercopy.c

…

uuid.c

…

vsprintf.c

…