linux/tools/testing/selftests
David S. Miller 03fe2debbb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Fun set of conflict resolutions here...

For the mac80211 stuff, these were fortunately just parallel
adds.  Trivially resolved.

In drivers/net/phy/phy.c we had a bug fix in 'net' that moved the
function phy_disable_interrupts() earlier in the file, whilst in
'net-next' the phy_error() call from this function was removed.

In net/ipv4/xfrm4_policy.c, David Ahern's changes to remove the
'rt_table_id' member of rtable collided with a bug fix in 'net' that
added a new struct member "rt_mtu_locked" which needs to be copied
over here.

The mlxsw driver conflict consisted of net-next separating
the span code and definitions into separate files, whilst
a 'net' bug fix made some changes to that moved code.

The mlx5 infiniband conflict resolution was quite non-trivial,
the RDMA tree's merge commit was used as a guide here, and
here are their notes:

====================

    Due to bug fixes found by the syzkaller bot and taken into the for-rc
    branch after development for the 4.17 merge window had already started
    being taken into the for-next branch, there were fairly non-trivial
    merge issues that would need to be resolved between the for-rc branch
    and the for-next branch.  This merge resolves those conflicts and
    provides a unified base upon which ongoing development for 4.17 can
    be based.

    Conflicts:
            drivers/infiniband/hw/mlx5/main.c - Commit 42cea83f95
            (IB/mlx5: Fix cleanup order on unload) added to for-rc and
            commit b5ca15ad7e (IB/mlx5: Add proper representors support)
            add as part of the devel cycle both needed to modify the
            init/de-init functions used by mlx5.  To support the new
            representors, the new functions added by the cleanup patch
            needed to be made non-static, and the init/de-init list
            added by the representors patch needed to be modified to
            match the init/de-init list changes made by the cleanup
            patch.
    Updates:
            drivers/infiniband/hw/mlx5/mlx5_ib.h - Update function
            prototypes added by representors patch to reflect new function
            names as changed by cleanup patch
            drivers/infiniband/hw/mlx5/ib_rep.c - Update init/de-init
            stage list to match new order from cleanup patch
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-03-23 11:31:58 -04:00
..
android selftests/android: Fix line continuation in Makefile 2018-02-13 13:59:39 -07:00
bpf bpf: sockmap sample test for bpf_msg_pull_data 2018-03-19 21:14:41 +01:00
breakpoints
capabilities
cpu-hotplug
cpufreq
drivers/gpu
efivarfs
exec
filesystems
firmware
ftrace Al Viro discovered some breakage with the parsing of the set_ftrace_filter 2018-02-09 14:47:09 -08:00
futex selftests/futex: Fix line continuation in Makefile 2018-02-26 16:09:49 -07:00
gpio
ia64
intel_pstate
ipc
kcmp
kmod
lib
locking
media_tests selftests: media_tests: Add SPDX license identifier 2018-01-12 11:46:56 -07:00
membarrier membarrier/selftest: Test private expedited sync core command 2018-02-05 21:35:38 +01:00
memfd Merge tag 'linux-kselftest-4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest 2018-02-28 13:38:52 -08:00
memory-hotplug selftests: memory-hotplug: fix emit_tests regression 2018-03-02 10:12:59 -07:00
mount
mqueue
net selftests: Add multipath tests for onlink flag 2018-03-22 12:37:05 -04:00
networking/timestamping selftests/txtimestamp: Add more configurable parameters 2018-03-16 15:05:57 -04:00
nsfs tools/testing: Fix trailing semicolon 2018-01-12 11:41:33 -07:00
ntb NTB: ntb_test: Update ntb_perf tests 2018-01-28 22:17:24 -05:00
powerpc selftests/powerpc: Skip the subpage_prot tests if the syscall is unavailable 2018-03-02 11:37:04 +11:00
prctl
pstore selftests: pstore: Adding config fragment CONFIG_PSTORE_RAM=m 2018-02-13 14:09:17 -07:00
ptp posix-timers: Prevent UB from shifting negative signed value 2018-01-04 14:57:10 +01:00
ptrace
rcutorture
seccomp - Fix seccomp GET_METADATA to deal with field sizes correctly (Tycho Andersen) 2018-02-22 10:50:24 -08:00
sigaltstack
size
splice
static_keys
sync selftests: sync: missing CFLAGS while compiling 2018-02-13 11:34:51 -07:00
sysctl
tc-testing tc-testing: updated gact tests with batch test cases 2018-03-12 21:08:54 -04:00
timers
user
vDSO selftest/vDSO: fix O= 2018-02-13 11:35:01 -07:00
vm selftests/vm/run_vmtests: adjust hugetlb size according to nr_cpus 2018-03-09 16:40:01 -08:00
watchdog
x86 selftests/x86/entry_from_vm86: Add test cases for POPF 2018-03-14 09:21:01 +01:00
zram
.gitignore
gen_kselftest_tar.sh selftests: gen_kselftest_tar.h: Add SPDX license identifier 2018-01-12 11:44:31 -07:00
kselftest_harness.h
kselftest_install.sh selftests: kselftest_install.sh: Add SPDX license identifier 2018-01-12 11:45:05 -07:00
kselftest.h selftests: kselftest.h: Add SPDX license identifier 2018-01-12 11:46:21 -07:00
lib.mk selftests: Fix loss of test output in run_kselftests.sh 2018-01-16 09:31:31 -07:00
Makefile selftests: Fix loss of test output in run_kselftests.sh 2018-01-16 09:31:31 -07:00