1. 16 11月, 2013 4 次提交
    • L
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · e4528d69
      Linus Torvalds 提交于
      Pull misc kbuild changes from Michal Marek:
       - make tags fixes again
       - scripts/show_delta fix for newer python
       - scripts/kernel-doc does not fail on unknown function prototype
       - one less coccinelle check this time
      
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        scripts/tags.sh: remove obsolete __devinit[const|data]
        scripts/kernel-doc: make unknown function prototype a Warning instead of an Error
        show_delta: Update script to support python versions 2.5 through 3.3
        scripts/coccinelle/api: remove devm_request_and_ioremap.cocci
        scripts/tags.sh: Increase identifier list
      e4528d69
    • L
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · d72681d7
      Linus Torvalds 提交于
      Pull kconfig changes from Michal Marek:
       - xconfig stores its setting in a meaningful path
         (~/.config/kernel.org/qconf.conf)
       - kconfig symbol search fix
       - documentation fixes
       - cleanup & comment update
       - fix warning when a kconfig symbol is defined with two different types
       - Yann is now officially listed as maintainer of kconfig, but he
         prefers me to send pull requests for now
      
      * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        MAINTAINERS: New kconfig maintainer
        xconfig: Fix the filename for GUI settings
        kconfig: fix bug in search results string: use strlen(gstr->s), not gstr->len
        kconfig: remove unused definition from scanner
        kconfig: adjust warning message for conflicting types
        kconfig: fix trivial typos and update mconf documentation
        kconfig: add short explanation to SYMBOL_WRITE
        Documentation/kbuild/kconfig.txt: 'make listnewconfig' replaces: yes "" | make oldconfig
      d72681d7
    • L
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 762fb1dd
      Linus Torvalds 提交于
      Pull kbuild changes from Michal Marek:
       - LTO fixes, but the kallsyms part had to be reverted
       - Pass -Werror=implicit-int and -Werror=strict-prototypes to the
         compiler by default
       - snprintf fix in modpost
       - remove GREP_OPTIONS from the environment to be immune against exotic
         grep option settings
      
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kallsyms: Revert back to 128 max symbol length
        Kbuild: Ignore GREP_OPTIONS env variable
        scripts: kallsyms: Use %zu to print 'size_t'
        scripts/bloat-o-meter: use .startswith rather than fragile slicing
        scripts/bloat-o-meter: ignore changes in the size of linux_banner
        kbuild: replace unbounded sprintf call in modpost
        kbuild, bloat-o-meter: fix static detection
        Kbuild: Handle longer symbols in kallsyms.c
        kbuild: Increase kallsyms max symbol length
        Makefile: enable -Werror=implicit-int and -Werror=strict-prototypes by default
      762fb1dd
    • L
      Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming · f13399f0
      Linus Torvalds 提交于
      Pull Kconfig cleanups from Mark Salter:
       "Remove some unused config options from C6X and clean up PC_PARPORT
        dependencies.  The latter was discussed here:
      
          https://lkml.org/lkml/2013/10/8/12"
      
      * tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
        c6x: remove unused COMMON_CLKDEV Kconfig parameter
        Kconfig cleanup (PARPORT_PC dependencies)
        x86: select ARCH_MIGHT_HAVE_PC_PARPORT
        unicore32: select ARCH_MIGHT_HAVE_PC_PARPORT
        sparc: select ARCH_MIGHT_HAVE_PC_PARPORT
        sh: select ARCH_MIGHT_HAVE_PC_PARPORT
        powerpc: select ARCH_MIGHT_HAVE_PC_PARPORT
        parisc: select ARCH_MIGHT_HAVE_PC_PARPORT
        mips: select ARCH_MIGHT_HAVE_PC_PARPORT
        microblaze: select ARCH_MIGHT_HAVE_PC_PARPORT
        m68k: select ARCH_MIGHT_HAVE_PC_PARPORT
        ia64: select ARCH_MIGHT_HAVE_PC_PARPORT
        arm: select ARCH_MIGHT_HAVE_PC_PARPORT
        alpha: select ARCH_MIGHT_HAVE_PC_PARPORT
        c6x: remove unused parameter in Kconfig
      f13399f0
  2. 15 11月, 2013 36 次提交