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

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

Merge branch 'for-35' of git://repo.or.cz/linux-kbuild 

* 'for-35' of git://repo.or.cz/linux-kbuild: (81 commits)
  kbuild: Revert part of e8d400a9 to resolve a conflict
  kbuild: Fix checking of scm-identifier variable
  gconfig: add support to show hidden options that have prompts
  menuconfig: add support to show hidden options which have prompts
  gconfig: remove show_debug option
  gconfig: remove dbg_print_ptype() and dbg_print_stype()
  kconfig: fix zconfdump()
  kconfig: some small fixes
  add random binaries to .gitignore
  kbuild: Include gen_initramfs_list.sh and the file list in the .d file
  kconfig: recalc symbol value before showing search results
  .gitignore: ignore *.lzo files
  headerdep: perlcritic warning
  scripts/Makefile.lib: Align the output of LZO
  kbuild: Generate modules.builtin in make modules_install
  Revert "kbuild: specify absolute paths for cscope"
  kbuild: Do not unnecessarily regenerate modules.builtin
  headers_install: use local file handles
  headers_check: fix perl warnings
  export_report: fix perl warnings
  ...
parents b904d713 64ffc9ff

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ modules.builtin 
*.gz

*.bz2

*.lzma

*.lzo

*.patch

*.gcno

Documentation/.gitignore

0 → 100644
+7 −0
Original line number Diff line number Diff line 
filesystems/dnotify_test

laptops/dslm

timers/hpet_example

vm/hugepage-mmap

vm/hugepage-shm

vm/map_hugetlb

Documentation/kbuild/kbuild.txt

+5 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ CROSS_COMPILE 
Specify an optional fixed part of the binutils filename.

CROSS_COMPILE can be a part of the filename or the full path.



CROSS_COMPILE is also used for ccache is some setups.

CROSS_COMPILE is also used for ccache in some setups.



CF

--------------------------------------------------
@@ -162,3 +162,7 @@ For tags/TAGS/cscope targets, you can specify more than one arch 
to be included in the databases, separated by blank space. E.g.:



    $ make ALLSOURCE_ARCHS="x86 mips arm" tags



To get all available archs you can also specify all. E.g.:



    $ make ALLSOURCE_ARCHS=all tags

Documentation/mutex-design.txt

+2 −2
Original line number Diff line number Diff line
@@ -66,14 +66,14 @@ of advantages of mutexes: 


    c0377ccb <mutex_lock>:

    c0377ccb:       f0 ff 08                lock decl (%eax)

    c0377cce:       78 0e                   js     c0377cde <.text.lock.mutex>

    c0377cce:       78 0e                   js     c0377cde <.text..lock.mutex>

    c0377cd0:       c3                      ret



   the unlocking fastpath is equally tight:



    c0377cd1 <mutex_unlock>:

    c0377cd1:       f0 ff 00                lock incl (%eax)

    c0377cd4:       7e 0f                   jle    c0377ce5 <.text.lock.mutex+0x7>

    c0377cd4:       7e 0f                   jle    c0377ce5 <.text..lock.mutex+0x7>

    c0377cd6:       c3                      ret



 - 'struct mutex' semantics are well-defined and are enforced if

MAINTAINERS

+4 −1
Original line number Diff line number Diff line
@@ -3242,7 +3242,7 @@ L: autofs@linux.kernel.org 
S:	Maintained

F:	fs/autofs4/



KERNEL BUILD

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

M:	Michal Marek <mmarek@suse.cz>

T:	git git://repo.or.cz/linux-kbuild.git for-next

T:	git git://repo.or.cz/linux-kbuild.git for-linus
@@ -3251,6 +3251,9 @@ S: Maintained 
F:	Documentation/kbuild/

F:	Makefile

F:	scripts/Makefile.*

F:	scripts/basic/

F:	scripts/mk*

F:	scripts/package/



KERNEL JANITORS

L:	kernel-janitors@vger.kernel.org