From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Jun 2014 04:29:20 +0000 (-0700)
Subject: Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
X-Git-Tag: MMI-PSA29.97-13-9~12063
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c1fdb2d3389c5a1e7c559a37a4967c1d2580e75c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'misc' of git://git./linux/kernel/git/mmarek/kbuild

Pull kbuild misc updates from Michal Marek:
 "This is the non-critical part of kbuild for v3.16-rc1:
   - make deb-pkg can do s390x and arm64
   - new patterns in scripts/tags.sh
   - scripts/tags.sh skips userspace tools' sources (which sometimes
     have copies of kernel structures) and symlinks
   - improvements to the objdiff tool
   - two new coccinelle patches
   - other minor fixes"

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  scripts: objdiff: support directories for the augument of record command
  scripts: objdiff: fix a comment
  scripts: objdiff: change the extension of disassembly from .o to .dis
  scripts: objdiff: improve path flexibility for record command
  scripts: objdiff: remove unnecessary code
  scripts: objdiff: direct error messages to stderr
  scripts: objdiff: get the path to .tmp_objdiff more simply
  deb-pkg: Add automatic support for s390x architecture
  coccicheck: Add unneeded return variable test
  kbuild: Fix a typo in documentation
  kbuild: trivial - use tabs for code indent where possible
  kbuild: trivial - remove trailing empty lines
  coccinelle: Check for missing NULL terminators in of_device_id tables
  scripts/tags.sh: ignore symlink'ed source files
  scripts/tags.sh: add regular expression replacement pattern for memcg
  builddeb: add arm64 in the supported architectures
  builddeb: use $OBJCOPY variable instead of objcopy
  scripts/tags.sh: ignore code of user space tools
  scripts/tags.sh: add pattern for DEFINE_HASHTABLE
  .gitignore: ignore Module.symvers in all directories
---

c1fdb2d3389c5a1e7c559a37a4967c1d2580e75c
diff --cc scripts/Makefile.host
index 0f0d6ba87e42,b0ec4be67674..66893643fd7d
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@@ -166,5 -166,4 +166,4 @@@ $(host-cshlib): $(obj)/%: $(host-cshobj
  	$(call if_changed,host-cshlib)
  
  targets += $(host-csingle)  $(host-cmulti) $(host-cobjs)\
 -	   $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) 
 +	   $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
-