Merge remote-tracking branch 'kselftest/next'

Conflicts:
	tools/testing/selftests/powerpc/Makefile

diff --cc MAINTAINERS
Simple merge

diff --cc tools/testing/selftests/Makefile
Simple merge

diff --cc tools/testing/selftests/powerpc/Makefile
index a5d5be7ec4c7f6cc1da05727d5e8488b7da887e6,2958fe9a74e97b2c86ce1c8e6072f49291cca257..5ad042345ab9b66ea2e884824ba407897cb56833
--- 1/tools/testing/selftests/powerpc/Makefile
--- 2/tools/testing/selftests/powerpc/Makefile
+++ b/tools/testing/selftests/powerpc/Makefile
@@@ -8,27 -8,41 +8,41 @@@ ifeq ($(ARCH),powerpc
  
  GIT_VERSION = $(shell git describe --always --long --dirty || echo "unknown")
  
- CC := $(CROSS_COMPILE)$(CC)
  CFLAGS := -Wall -O2 -flto -Wall -Werror -DGIT_VERSION='"$(GIT_VERSION)"' -I$(CURDIR) $(CFLAGS)
  
- export CC CFLAGS
+ export CFLAGS
  
 -TARGETS = pmu copyloops mm tm primitives stringloops
 +SUB_DIRS = pmu copyloops mm tm primitives stringloops vphn switch_endian
  
  endif
  
 -all: $(TARGETS)
 +all: $(SUB_DIRS)
  
 -$(TARGETS):
 +$(SUB_DIRS):
        $(MAKE) -k -C $@ all
  
- run_tests: all
+ include ../lib.mk
+ 
+ override define RUN_TESTS
 -      @for TARGET in $(TARGETS); do \
 +      @for TARGET in $(SUB_DIRS); do \
                $(MAKE) -C $$TARGET run_tests; \
        done;
 -      @for TARGET in $(TARGETS); do \
+ endef
+ 
+ override define INSTALL_RULE
 -      @for TARGET in $(TARGETS); do \
++      @for TARGET in $(SUB_DIRS); do \
+               $(MAKE) -C $$TARGET install; \
+       done;
+ endef
+ 
+ override define EMIT_TESTS
++      @for TARGET in $(SUB_DIRS); do \
+               $(MAKE) -s -C $$TARGET emit_tests; \
+       done;
+ endef
  
  clean:
 -      @for TARGET in $(TARGETS); do \
 +      @for TARGET in $(SUB_DIRS); do \
                $(MAKE) -C $$TARGET clean; \
        done;
        rm -f tags
@@@ -36,4 -50,4 +50,4 @@@
  tags:
        find . -name '*.c' -o -name '*.h' | xargs ctags
  
- .PHONY: all run_tests clean tags $(SUB_DIRS)
 -.PHONY: tags $(TARGETS)
++.PHONY: tags $(SUB_DIRS)

diff --cc tools/testing/selftests/powerpc/copyloops/Makefile
Simple merge