linux

mirror of https://github.com/torvalds/linux.git synced 2026-02-04 15:28:49 +08:00

Files

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

Lots of overlapping changes, mostly trivial in nature.

The mlxsw conflict was resolving using the example
resolution at:

https://github.com/jpirko/linux_mlxsw/blob/combined_queue/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c

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

2018-08-05 13:04:31 -07:00

fault-injection

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

ktest

Merge tag 'ktest-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest

2018-04-11 16:42:27 -07:00

nvdimm

tools/testing/nvdimm: advertise a write cache for nfit_test

2018-06-30 10:45:48 -07:00

radix-tree

idr: fix invalid ptr dereference on item delete