diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-15 16:46:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-15 16:46:32 -0700 |
| commit | b06ed1e7a2fa9b636f368a9e97c3c8877623f8b2 (patch) | |
| tree | 2c9d82a29ec4ec7dda7aa1a69ff3ed50d70fc141 /fs/locks.c | |
| parent | Merge tag 'trace-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (diff) | |
| parent | ktest: update sample.conf for grub2bls (diff) | |
| download | linux-dev-b06ed1e7a2fa9b636f368a9e97c3c8877623f8b2.tar.xz linux-dev-b06ed1e7a2fa9b636f368a9e97c3c8877623f8b2.zip | |
Merge tag 'ktest-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest
Pull more ktest updates from Steven Rostedt:
- Add support for grub2bls boot loader
- Show name and test iteration number in error message sent in mail
- Minor fixes and clean ups
* tag 'ktest-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
ktest: update sample.conf for grub2bls
ktest: remove get_grub2_index
ktest: pass KERNEL_VERSION to POST_KTEST
ktest: introduce grub2bls REBOOT_TYPE option
ktest: cleanup get_grub_index
ktest: introduce _get_grub_index
Diffstat (limited to 'fs/locks.c')
0 files changed, 0 insertions, 0 deletions