1. 12 9月, 2013 38 次提交
  2. 11 9月, 2013 2 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · e831cbfc
      Linus Torvalds 提交于
      Pull more s390 updates from Heiko Carstens:
       "This includes one bpf/jit bug fix where the jit compiler could
        sometimes write generated code out of bounds of the allocated memory
        area.
      
        The rest of the patches are only cleanups and minor improvements"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/irq: reduce size of external interrupt handler hash array
        s390/compat,uid16: use current_cred()
        s390/ap_bus: use and-mask instead of a cast
        s390/ftrace: avoid pointer arithmetics with function pointers
        s390: make various functions static, add declarations to header files
        s390/compat signal: add couple of __force annotations
        s390/mm: add __releases()/__acquires() annotations to gmap_alloc_table()
        s390: keep Kconfig sorted
        s390/irq: rework irq subclass handling
        s390/irq: use hlists for external interrupt handler array
        s390/dumpstack: convert print_symbol to %pSR
        s390/perf: Remove print_hex_dump_bytes() debug output
        s390: update defconfig
        s390/bpf,jit: fix address randomization
      e831cbfc
    • L
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 5b419784
      Linus Torvalds 提交于
      Pull kconfig updates from Michal Marek:
       "This is the kconfig part of kbuild for v3.12-rc1:
         - post-3.11 search code fixes and micro-optimizations
         - CONFIG_MODULES is no longer a special case; this is needed to
           eventually fix the bug that using KCONFIG_ALLCONFIG breaks
           allmodconfig
         - long long is used to store hex and int values
         - make silentoldconfig no longer warns when a symbol changes from
           tristate to bool (it's a job for make oldconfig)
         - scripts/diffconfig updated to work with newer Pythons
         - scripts/config does not rely on GNU sed extensions"
      
      * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kconfig: do not allow more than one symbol to have 'option modules'
        kconfig: regenerate bison parser
        kconfig: do not special-case 'MODULES' symbol
        diffconfig: Update script to support python versions 2.5 through 3.3
        diffconfig: Gracefully exit if the default config files are not present
        modules: do not depend on kconfig to set 'modules' option to symbol MODULES
        kconfig: silence warning when parsing auto.conf when a symbol has changed type
        scripts/config: use sed's POSIX interface
        kconfig: switch to "long long" for sanity
        kconfig: simplify symbol-search code
        kconfig: don't allocate n+1 elements in temporary array
        kconfig: minor style fixes in symbol-search code
        kconfig/[mn]conf: shorten title in search-box
        kconfig: avoid multiple calls to strlen
        Documentation/kconfig: more concise and straightforward search explanation
      5b419784