Skip to content

Commit 8c67d86

Browse files
committed
Merge tag 'kbuild-fixes-v6.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada: - Update MAINTAINERS with Nathan and Nicolas as new Kbuild reviewers - Increment the debian revision for deb-pkg builds * tag 'kbuild-fixes-v6.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: kbuild: Restore .version auto-increment behaviour for Debian packages MAINTAINERS: Add linux-kbuild's patchwork MAINTAINERS: Remove Michal Marek from Kbuild maintainers MAINTAINERS: Add Nathan and Nicolas to Kbuild reviewers
2 parents 926028a + 5db8fac commit 8c67d86

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

CREDITS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2452,6 +2452,10 @@ S: 482 Shadowgraph Dr.
24522452
S: San Jose, CA 95110
24532453
S: USA
24542454

2455+
N: Michal Marek
2456+
2457+
D: Kbuild Maintainer 2009-2017
2458+
24552459
N: Martin Mares
24562460
24572461
W: http://www.ucw.cz/~mj/

MAINTAINERS

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11035,6 +11035,7 @@ KCONFIG
1103511035
M: Masahiro Yamada <[email protected]>
1103611036
1103711037
S: Maintained
11038+
Q: https://patchwork.kernel.org/project/linux-kbuild/list/
1103811039
T: git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kconfig
1103911040
F: Documentation/kbuild/kconfig*
1104011041
F: scripts/Kconfig.include
@@ -11092,10 +11093,12 @@ F: fs/autofs/
1109211093

1109311094
KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
1109411095
M: Masahiro Yamada <[email protected]>
11095-
M: Michal Marek <[email protected]>
11096+
R: Nathan Chancellor <[email protected]>
1109611097
R: Nick Desaulniers <[email protected]>
11098+
R: Nicolas Schier <[email protected]>
1109711099
1109811100
S: Maintained
11101+
Q: https://patchwork.kernel.org/project/linux-kbuild/list/
1109911102
T: git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git
1110011103
F: Documentation/kbuild/
1110111104
F: Makefile

scripts/package/mkdebian

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ if [ -n "$KDEB_PKGVERSION" ]; then
9090
packageversion=$KDEB_PKGVERSION
9191
revision=${packageversion##*-}
9292
else
93-
revision=$(cat .version 2>/dev/null||echo 1)
93+
revision=$($srctree/init/build-version)
9494
packageversion=$version-$revision
9595
fi
9696
sourcename=$KDEB_SOURCENAME

0 commit comments

Comments
 (0)