Commit 5d89d9f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-4.9-rc1-update' of... 

Merge tag 'linux-kselftest-4.9-rc1-update' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest updates from Shuah Khan:
 "This update consists of:

   - Fixes and improvements to existing tests

   - Moving code from Documentation to selftests, samples, and tools:

     * Moves dnotify_test, prctl, ptp, vDSO, ia64, watchdog, and
       networking tests from Documentation to selftests.

     * Moves mic/mpssd, misc-devices/mei, timers, watchdog, auxdisplay,
       and blackfin examples from Documentation to samples.

     * Moves accounting, laptops/dslm, and pcmcia/crc32hash tools from
       Documentation to tools.

     * Deletes BUILD_DOCSRC and its dependencies"

* tag 'linux-kselftest-4.9-rc1-update' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (21 commits)
  selftests/futex: Check ANSI terminal color support
  Doc: update 00-INDEX files to reflect the runnable code move
  samples: move blackfin gptimers-example from Documentation
  tools: move pcmcia crc32hash tool from Documentation
  tools: move laptops dslm tool from Documentation
  tools: move accounting tool from Documentation
  samples: move auxdisplay example code from Documentation
  samples: move watchdog example code from Documentation
  samples: move timers example code from Documentation
  samples: move misc-devices/mei example code from Documentation
  samples: move mic/mpssd example code from Documentation
  selftests: Move networking/timestamping from Documentation
  selftests: move watchdog tests from Documentation/watchdog
  selftests: move ia64 tests from Documentation/ia64
  selftests: move vDSO tests from Documentation/vDSO
  selftests: move ptp tests from Documentation/ptp
  selftests: move prctl tests from Documentation/prctl
  selftests: move dnotify_test from Documentation/filesystems
  selftests/timers: Add missing error code assignment before test
  selftests/zram: replace ZRAM_LZ4_COMPRESS
  ...
parents 50cff898 fecf861e

Documentation/00-INDEX

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ IRQ.txt 
Intel-IOMMU.txt

	- basic info on the Intel IOMMU virtualization support.

Makefile

	- some files in Documentation dir are actually sample code to build

	- This file does nothing. Removing it breaks make htmldocs and

	  make distclean.

ManagementStyle

	- how to (attempt to) manage kernel hackers.

RCU/

Documentation/Makefile

+1 −3
Original line number Diff line number Diff line 
subdir-y := accounting auxdisplay blackfin \

	filesystems filesystems ia64 laptops mic misc-devices \

	networking pcmcia prctl ptp timers vDSO watchdog
 
subdir-y :=

Documentation/accounting/Makefile

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
# List of programs to build

hostprogs-y := getdelays



# Tell kbuild to always build the programs

always := $(hostprogs-y)



HOSTCFLAGS_getdelays.o += -I$(objtree)/usr/include

Documentation/accounting/delay-accounting.txt

+3 −3
Original line number Diff line number Diff line
@@ -54,9 +54,9 @@ are sent to userspace without requiring a command. If it is the last exiting 
task of a thread group, the per-tgid statistics are also sent. More details

are given in the taskstats interface description.



The getdelays.c userspace utility in this directory allows simple commands to

be run and the corresponding delay statistics to be displayed. It also serves

as an example of using the taskstats interface.

The getdelays.c userspace utility in tools/accounting directory allows simple

commands to be run and the corresponding delay statistics to be displayed. It

also serves as an example of using the taskstats interface.



Usage

-----

Documentation/arm/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ Interrupts 
	- ARM Interrupt subsystem documentation

IXP4xx

	- Intel IXP4xx Network processor.

Makefile

	- Build sourcefiles as part of the Documentation-build for arm

Netwinder

	- Netwinder specific documentation

Porting

CRA Git | Maintained and supported by SUSTech CRA and CCSE