diff options
| author | Nathan Chancellor <nathan@kernel.org> | 2026-10-21 11:31:08 -0700 |
|---|---|---|
| committer | Nathan Chancellor <nathan@kernel.org> | 2026-10-21 11:31:08 -0700 |
| commit | 83deedcf85af511dc120b3cd8ee597d211cdf2fb (patch) | |
| tree | d119529d1f9a4cbea27059304773f19b44e4a705 /scripts/bash-completion/make | |
| parent | a804c5742bff224d4cb4d25dd383554d598be32b (diff) | |
| parent | e58096244338308dde3fa76982c8042981ddda52 (diff) | |
| download | linux-next-83deedcf85af511dc120b3cd8ee597d211cdf2fb.tar.gz linux-next-83deedcf85af511dc120b3cd8ee597d211cdf2fb.zip | |
Merge branch 'kbuild-fixes-unstable' into kbuild-fixes-for-next
Address following conflicts.
- arch/alpha/boot between
c437950dceb8 ("alpha: add self-extracting compressed kernel boot stub")
and
0d4d70da348b ("kbuild: Mark the gzip recipes as recursive")
- init/Kconfig between
eb13a1ff271b ("random: vDSO: avoid call to memset() when zeroing reserved parameter")
and
f85147b291e3 ("kbuild: move the toolchain checks into scripts/Kconfig.toolchain")
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Diffstat (limited to 'scripts/bash-completion/make')
0 files changed, 0 insertions, 0 deletions