Commit 8c67d863 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v6.1-3' of... 

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
parents 926028aa 5db8face

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -2452,6 +2452,10 @@ S: 482 Shadowgraph Dr. 
S: San Jose, CA  95110

S: USA



N: Michal Marek

E: michal.lkml@markovi.net

D: Kbuild Maintainer 2009-2017



N: Martin Mares

E: mj@ucw.cz

W: http://www.ucw.cz/~mj/

MAINTAINERS

+4 −1
Original line number Diff line number Diff line
@@ -11035,6 +11035,7 @@ KCONFIG 
M:	Masahiro Yamada <masahiroy@kernel.org>

L:	linux-kbuild@vger.kernel.org

S:	Maintained

Q:	https://patchwork.kernel.org/project/linux-kbuild/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kconfig

F:	Documentation/kbuild/kconfig*

F:	scripts/Kconfig.include
@@ -11092,10 +11093,12 @@ F: fs/autofs/ 








KERNEL BUILD + files below scripts/ (unless maintained elsewhere)









M:	Masahiro Yamada <masahiroy@kernel.org>









M:	Michal Marek <michal.lkml@markovi.net>









R:	Nathan Chancellor <nathan@kernel.org>









R:	Nick Desaulniers <ndesaulniers@google.com>









R:	Nicolas Schier <nicolas@fjasle.eu>









L:	linux-kbuild@vger.kernel.org









S:	Maintained









Q:	https://patchwork.kernel.org/project/linux-kbuild/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git









F:	Documentation/kbuild/









F:	Makefile
































scripts/package/mkdebian



+1
−1






























Original line number
Diff line number
Diff line







@@ -90,7 +90,7 @@ if [ -n "$KDEB_PKGVERSION" ]; then







	packageversion=$KDEB_PKGVERSION









	revision=${packageversion##*-}









else









	revision=$(cat .version 2>/dev/null||echo 1)









	revision=$($srctree/init/build-version)









	packageversion=$version-$revision









fi









sourcename=$KDEB_SOURCENAME