Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bf99477 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes 

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
  Don't clean bounds.h and asm-offsets.h
  kconfig: incorrect 'len' field initialisation ?
  kernel-doc: allow unnamed bit-fields
  kbuild: filter away debug symbols from kernel symbols
  Remove *.rej pattern from .gitignore
  MAINTAINERS: document names of new kbuild trees
  kbuild: disable modpost warnings for linkonce sections
  kbuild: escape meta characters in regular expression in make TAGS
parents 83e0c24a 7d3cc8b6

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -54,6 +54,5 @@ series 
cscope.*



*.orig

*.rej

*~

\#*#

Kbuild

+1 −2
Original line number Diff line number Diff line
@@ -96,5 +96,4 @@ missing-syscalls: scripts/checksyscalls.sh FORCE 
	$(call cmd,syscalls)



# Delete all targets during make clean

clean-files := $(addprefix $(objtree)/,$(targets))

clean-files := $(addprefix $(objtree)/,$(filter-out $(bounds-file) $(offsets-file),$(targets)))

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -2329,7 +2329,8 @@ S: Maintained 
KERNEL BUILD (kbuild: Makefile, scripts/Makefile.*)

P:	Sam Ravnborg

M:	sam@ravnborg.org

T:	git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git

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

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

L:	linux-kbuild@vger.kernel.org

S:	Maintained

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -1114,6 +1114,7 @@ MRPROPER_DIRS += include/config include2 usr/include 
MRPROPER_FILES += .config .config.old include/asm .version .old_version \

                  include/linux/autoconf.h include/linux/version.h      \

                  include/linux/utsrelease.h                            \

                  include/linux/bounds.h include/asm*/asm-offsets.h     \

		  Module.symvers tags TAGS cscope*



# clean - Delete most, but leave enough to build external modules
@@ -1431,7 +1432,7 @@ define xtags 
	elif $1 --version 2>&1 | grep -iq emacs; then \

	    $(all-sources) | xargs $1 -a; \

	    $(all-kconfigs) | xargs $1 -a \

		--regex='/^[ \t]*(menu|)config[ \t]+\([a-zA-Z0-9_]+\)/\2/'; \

		--regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'; \

	    $(all-defconfigs) | xargs -r $1 -a \

		--regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \

	else \

scripts/kallsyms.c

+3 −0
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ static int read_symbol(FILE *in, struct sym_entry *s) 
	/* exclude also MIPS ELF local symbols ($L123 instead of .L123) */

	else if (str[0] == '$')

		return -1;

	/* exclude debugging symbols */

	else if (stype == 'N')

		return -1;



	/* include the type field in the symbol name, so that it gets

	 * compressed together */