diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-07 11:59:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-07 11:59:20 -0700 |
| commit | 33de0d1c68a5127e923363349c349d90c7da06a1 (patch) | |
| tree | 54b5bd17293f0cc768670e1164e7eb97291451a0 /scripts/kconfig/tests/err_recursive_inc/expected_stderr | |
| parent | 91f152e75bcdba95130ec5fdb1010e91a48d9a11 (diff) | |
| parent | 913ab9780fc021298949cc5514d6255a008e69f9 (diff) | |
Merge tag 'kbuild-fixes-v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild fixes from Masahiro Yamada:
- fix kselftest-merge to find config fragments in deeper directories
- fix kconfig unit test, which was broken by SPDX tag addition
- add + prefix to buildtar to suppress jobserver unavailable warning
- fix checkstack.pl to recognize arch=arm64
- suppress noisy warning from cc-cross-prefix
* tag 'kbuild-fixes-v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kbuild: use more portable 'command -v' for cc-cross-prefix
scripts/checkstack.pl: Fix arm64 wrong or unknown architecture
kbuild: tar-pkg: enable communication with jobserver
kconfig: tests: fix recursive inclusion unit test
kbuild: teach kselftest-merge to find nested config files
Diffstat (limited to 'scripts/kconfig/tests/err_recursive_inc/expected_stderr')
| -rw-r--r-- | scripts/kconfig/tests/err_recursive_inc/expected_stderr | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/kconfig/tests/err_recursive_inc/expected_stderr b/scripts/kconfig/tests/err_recursive_inc/expected_stderr index 6b582eee2176..b070a31fdfeb 100644 --- a/scripts/kconfig/tests/err_recursive_inc/expected_stderr +++ b/scripts/kconfig/tests/err_recursive_inc/expected_stderr @@ -1,6 +1,6 @@ Recursive inclusion detected. Inclusion path: current file : Kconfig.inc1 - included from: Kconfig.inc3:1 - included from: Kconfig.inc2:3 - included from: Kconfig.inc1:4 + included from: Kconfig.inc3:2 + included from: Kconfig.inc2:4 + included from: Kconfig.inc1:5 |