Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Feb 25, 2012
  1. @torvalds

    Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

    torvalds authored
    …git/mmarek/kbuild
    
    three kbuild fixes for 3.3:
     - make deb-pkg symlink race fix.
     - make coccicheck fix.
     - Dropping the check for modutils.  This is not a regression, but
       allows the module-init-tools replacement kmod work with the 3.3
       kernel.
    
    * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
      coccicheck: change handling of C={1,2} when M= is set
      builddeb: Don't create files in /tmp with predictable names
      kbuild: do not check for ancient modutils tools
Commits on Feb 24, 2012
  1. @dietsche @michal42

    coccicheck: change handling of C={1,2} when M= is set

    dietsche authored michal42 committed
    This patch reverts a portion of d0bc1fb so that coccicheck will
    work properly when C=1 or C=2.
    
    Reported-and-tested-by: Brice Goglin <Brice.Goglin@inria.fr>
    Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu>
    Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
Commits on Feb 18, 2012
  1. @michal42

    builddeb: Don't create files in /tmp with predictable names

    Ben Hutchings authored michal42 committed
    The current use of /tmp for file lists is insecure.  Put them under
    $objtree/debian instead.
    
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Cc: stable@vger.kernel.org  # 2.6.39+
    Acked-by: maximilian attems <max@stro.at>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
Commits on Feb 15, 2012
  1. @tmlind

    ARM: 7324/1: modpost: Fix section warnings for ARM for many compilers

    tmlind authored Russell King committed
    It turns out that many compilers don't show section warnings on ARM
    currently because handling for ARM_CALL relocs are missing from
    modpost.c.
    
    Based on commit c2e2611 ([ARM] 3205/1: Handle new EABI relocations when
    loading kernel modules) it seems that R_ARM_PC24, R_ARM_CALL and
    R_ARM_JUMP24 can be handled the same way.
    
    Note that at least Debian libc6-dev is missing defines for both
    R_ARM_CALL and R_ARM_JUMP24 in /usr/include/elf.h. So for now
    we need to define them in modpost.c if not defined.
    
    Acked-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Ben Hutchings <ben@decadent.org.uk>
    Cc: Anders Kaseorg <andersk@ksplice.com>
    Cc: Greg KH <gregkh@linuxfoundation.org>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Commits on Feb 14, 2012
  1. @rustyrussell

    module: fix broken isapnp handling in file2alias

    Ondrej Zary authored rustyrussell committed
    Handling of isapnp module aliases was broken by commit
    626596e by changing "isapnp" string to "isa".
    The code was then modified by commit
    e49ce14 but this bug remained.
    
    Change the string back to "isapnp".
    
    Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Commits on Feb 7, 2012
  1. @JoePerches @torvalds

    checkpatch: Warn on code with 6+ tab indentation

    JoePerches authored torvalds committed
    Overly indented code should be refactored.
    
    Suggest refactoring excessive indentation of of
    if/else/for/do/while/switch statements.
    
    For example:
    
    $ cat t.c
    #include <stdio.h>
    #include <stdlib.h>
    
    int main(int argc, char **argv)
    {
    
    	if (1)
    		if (2)
    			if (3)
    				if (4)
    					if (5)
    						if (6)
    							if (7)
    								if (8)
    									;
    	return 0;
    }
    
    $ ./scripts/checkpatch.pl -f t.c
    WARNING: Too many leading tabs - consider code refactoring
    #12: FILE: t.c:12:
    +						if (6)
    
    WARNING: Too many leading tabs - consider code refactoring
    #13: FILE: t.c:13:
    +							if (7)
    
    WARNING: Too many leading tabs - consider code refactoring
    #14: FILE: t.c:14:
    +								if (8)
    
    total: 0 errors, 3 warnings, 17 lines checked
    
    t.c has style problems, please review.
    
    If any of these errors are false positives, please report
    them to the maintainer, see CHECKPATCH in MAINTAINERS.
    
    Signed-off-by: Joe Perches <joe@perches.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Jan 28, 2012
  1. @torvalds

    Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

    torvalds authored
    * 'fixes' of git://git.linaro.org/people/rmk/linux-arm: (31 commits)
      ARM: 7304/1: ioremap: fix boundary check when reusing static mapping
      ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts
      ARM: 7299/1: ftrace: clear zero bit in reported IPs for Thumb-2
      ARM: 7298/1: realview: fix mapping of MPCore private memory region
      PCMCIA: fix sa1111 oops on remove
      ARM: 7288/1: mach-sa1100: add missing module_init() call
      ARM: 7297/1: smp_twd: make sure timer is stopped before registering it
      ARM: 7296/1: proc-v7.S: remove HARVARD_CACHE preprocessor guards
      ARM: 7295/1: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block
      ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP
      ARM: 7291/1: cache: assume 64-byte L1 cachelines for ARMv7 CPUs
      ARM: 7290/1: vmlinux.lds.S: align the exception fixup table to a 4-byte boundary
      ARM: 7289/1: vmlinux.lds.S: do not hardcode cacheline size as 32 bytes
      MFD: ucb1x00-ts: fix resume failure
      MFD: ucb1x00-core: fix gpiolib direction_output handling
      MFD: ucb1x00-core: fix missing restore of io output data on resume
      MFD: mcp-core: fix mcp_priv() to be more type safe
      MFD: mcp-core: fix complaints from the genirq layer
      Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus."
      Revert "ARM: sa1100: Refactor mcp-sa11x0 to use platform resources."
      ...
    
    Fix up conflict due to arch/arm/mach-mx5/Kconfig having been merged into
    mach-imx5 (commit 784a90c: "ARM i.MX: Merge i.MX5 support into
    mach-imx"), but the ARM_L1_CACHE_SHIFT_6 entry was moved to be driven by
    the CPU_V7 logic from it in the old location in rmk's branch (commit
    a092f2b: "ARM: 7291/1: cache: assume 64-byte L1 cachelines for
    ARMv7 CPUs").
Commits on Jan 23, 2012
  1. @torvalds

    scripts/kernel-doc: fix fatal error caused by cfg80211.h

    Randy Dunlap authored torvalds committed
    include/net/cfg80211.h uses __must_check in functions that
    have kernel-doc notation.  This was confusing scripts/kernel-doc,
    so have scripts/kernel-doc ignore "__must_check".
    
    Error(include/net/cfg80211.h:2702): cannot understand prototype: 'struct cfg80211_bss * __must_check cfg80211_inform_bss(...)
    
    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Cc:	Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. @lucasdemarchi @michal42

    kbuild: do not check for ancient modutils tools

    lucasdemarchi authored michal42 committed
    scripts/depmod.sh checks for the output of '-V' expecting that it has
    module-init-tools in it. It's a hack to prevent users from using
    modutils instead of module-init-tools, that only works with 2.4.x
    kernels. This however prints an annoying warning for kmod tool, that is
    currently replacing module-init-tools.
    
    Rather than putting another check for kmod's version, just remove it
    since users of 2.4.x kernel are unlikely to upgrade to 3.x, and if they
    do, let depmod fail in that case because they should know what they are
    doing.
    
    Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
    Acked-by: WANG Cong <amwang@redhat.com>
    Acked-By: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
Commits on Jan 20, 2012
  1. Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata f…

    Russell King authored
    …or mcp bus."
    
    This reverts commit 5dd7bf5.
    
    Conflicts:
    
    	scripts/mod/file2alias.c
    
    This change is wrong on many levels.  First and foremost, it causes a
    regression.  On boot on Assabet, which this patch gives a codec id of
    'ucb1x00', it gives:
    
    	ucb1x00 ID not found: 1005
    
    0x1005 is a valid ID for the UCB1300 device.
    
    Secondly, this patch is way over the top in terms of complexity.  The
    only device which has been seen to be connected with this MCP code is
    the UCB1x00 (UCB1200, UCB1300 etc) devices, and they all use the same
    driver.  Adding a match table, requiring the codec string to match the
    hardware ID read out of the ID register, etc is completely over the top
    when we can just read the hardware ID register.
Commits on Jan 17, 2012
  1. @torvalds

    Merge branch 'x86-syscall-for-linus' of git://git.kernel.org/pub/scm/…

    torvalds authored
    …linux/kernel/git/tip/tip
    
    * 'x86-syscall-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      x86: Move <asm/asm-offsets.h> from trace_syscalls.c to asm/syscall.h
      x86, um: Fix typo in 32-bit system call modifications
      um: Use $(srctree) not $(KBUILD_SRC)
      x86, um: Mark system call tables readonly
      x86, um: Use the same style generated syscall tables as native
      um: Generate headers before generating user-offsets.s
      um: Run host archheaders, allow use of host generated headers
      kbuild, headers.sh: Don't make archheaders explicitly
      x86, syscall: Allow syscall offset to be symbolic
      x86, syscall: Re-fix typo in comment
      x86: Simplify syscallhdr.sh
      x86: Generate system call tables and unistd_*.h from tables
      checksyscalls: Use arch/x86/syscalls/syscall_32.tbl as source
      x86: Machine-readable syscall tables and scripts to process them
      trace: Include <asm/asm-offsets.h> in trace_syscalls.c
      x86-64, ia32: Move compat_ni_syscall into C and its own file
      x86-64, syscall: Adjust comment spacing and remove typo
      kbuild: Add support for an "archheaders" target
      kbuild: Add support for installing generated asm headers
Commits on Jan 16, 2012
  1. @torvalds

    Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/…

    torvalds authored
    …mmarek/kbuild
    
    * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
      scripts/coccinelle: improve the coverage of some semantic patches
      coccinelle: semantic patches related to devm_ functions (part 2)
      coccinelle: semantic patches related to devm_ functions (part 1)
      coccinelle.txt: update documentation to include M= option
      coccicheck: add M= option to control which dir is processed
      ctags: remove struct forward declarations
      scripts/tags.sh: Add Page flag function magic
  2. @torvalds

    Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds authored
    …it/mmarek/kbuild
    
    * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
      menuconfig: fix a regression when canceling the prompt dialog at exit
      kbuild: Fix compiler warning with assertion when calling 'fwrite'
      Improve update-po-config output
      menuconfig: let make not report error when not save configuration
      merge_config.sh: fix bug in final check
      merge_config.sh: whitespace cleanup
      merge_config.sh: use signal names compatible with dash and bash
      kconfig: add merge_config.sh script
      kconfig: use xfwrite wrapper function to silence warnings
      kconfig: fix set but not used warnings
      kconfig: fix warnings by specifing format arguments
  3. @torvalds

    Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    torvalds authored
    …t/mmarek/kbuild
    
    * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
      Kbuild: Use dtc's -d (dependency) option
      dtc: Implement -d option to write out a dependency file
      kbuild: Fix comment in Makefile.lib
      scripts/genksyms: clean lex/yacc generated files
      kbuild: Correctly deal with make options which contain an "s"
  4. @michal42

    menuconfig: fix a regression when canceling the prompt dialog at exit

    Li Zefan authored michal42 committed
    This commit fixes a bug, while introducing a new one..
    
    commit 7203ddbd4be9720649e47d756a001e0c7d7f8ae2
    Author: Wang YanQing <udknight@gmail.com>
    Date:   Thu Jan 12 11:31:32 2012 +0800
    
        menuconfig: let make not report error when not save configuration
    
    Pressing ESC should cancel the yes/no dialog and return back to
    the main menu, but not exit from menuconfig.
    
    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    Acked-by: Wang YanQing <udknight@gmail.com>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
Commits on Jan 15, 2012
  1. @torvalds

    Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds authored
    …nux/kernel/git/tip/tip
    
    * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (39 commits)
      perf tools: Fix compile error on x86_64 Ubuntu
      perf report: Fix --stdio output alignment when --showcpuutilization used
      perf annotate: Get rid of field_sep check
      perf annotate: Fix usage string
      perf kmem: Fix a memory leak
      perf kmem: Add missing closedir() calls
      perf top: Add error message for EMFILE
      perf test: Change type of '-v' option to INCR
      perf script: Add missing closedir() calls
      tracing: Fix compile error when static ftrace is enabled
      recordmcount: Fix handling of elf64 big-endian objects.
      perf tools: Add const.h to MANIFEST to make perf-tar-src-pkg work again
      perf tools: Add support for guest/host-only profiling
      perf kvm: Do guest-only counting by default
      perf top: Don't update total_period on process_sample
      perf hists: Stop using 'self' for struct hist_entry
      perf hists: Rename total_session to total_period
      x86: Add counter when debug stack is used with interrupts enabled
      x86: Allow NMIs to hit breakpoints in i386
      x86: Keep current stack in NMI breakpoints
      ...
  2. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/rostedt/linux-kconfig
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig:
      kconfig/streamline-config.pl: Fix parsing Makefile with variables
      kconfig/streamline-config.pl: Simplify backslash line concatination
Commits on Jan 14, 2012
  1. @lacombar @michal42

    kbuild: Fix compiler warning with assertion when calling 'fwrite'

    lacombar authored michal42 committed
    Reinhard Tartler discovered a corner case of calling xfwrite() where the
    length of the string is zero.
    
    Arnaud Lacombe suggested to use assertion for the corner case, as
    fwrite(3) is currently used:
    
     1) in comment printers. Empty comment are not allowed.
     2) in a callback passed to expr_print(), where the string printed is
        either NULL OR non-empty.
     3) in the lexer, auto-generated, and unused.
    
    I feel using assertion is a good solution:
    
     1) It cleanly takes care of the above-mentioned corner case.
     2) It can be easily disabled by defining NDEBUG.
     3) It asserts xfwrite() is simply a wrapper for fwrite().
    
    Reported-by: Reinhard Tartler <Reinhard.Tartler@informatik.uni-erlangen.de>
    Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
    Signed-off-by: Jean Sacren <sakiwit@gmail.com>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  2. @pefoley2 @michal42

    Improve update-po-config output

    pefoley2 authored michal42 committed
    Make the V=0 output from update-po-config be aligned correctly.
    Also remove an outdated comment and add a "GEN" statement.
    
    Signed-off-by: Peter Foley <pefoley2@verizon.net>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  3. @JuliaLawall @michal42

    scripts/coccinelle: improve the coverage of some semantic patches

    JuliaLawall authored michal42 committed
    This patch ensures that all semantic patches in the scripts/coccinelle
    directory provide the report option.  Report messages that include line
    numbers now have the line number preceded by "line" for easier subsequent
    processing.
    
    Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  4. @swarren @michal42

    Kbuild: Use dtc's -d (dependency) option

    swarren authored michal42 committed
    This hooks dtc into Kbuild's dependency system.
    
    Thus, for example, "make dtbs" will rebuild tegra-harmony.dtb if only
    tegra20.dtsi has changed yet tegra-harmony.dts has not. The previous
    lack of this feature recently caused me to have very confusing "git
    bisect" results.
    
    For ARM, it's obvious what to add to $(targets). I'm not familiar enough
    with other architectures to know what to add there. Powerpc appears to
    already add various .dtb files into $(targets), but the other archs may
    need something added to $(targets) to work.
    
    Signed-off-by: Stephen Warren <swarren@nvidia.com>
    Acked-by: Shawn Guo <shawn.guo@linaro.org>
    [mmarek: Dropped arch/c6x part to avoid merging commits from the middle
    of the merge window]
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  5. @swarren @michal42

    dtc: Implement -d option to write out a dependency file

    swarren authored michal42 committed
    This will allow callers to rebuild .dtb files when any of the /include/d
    .dtsi files are modified, not just the top-level .dts file.
    
    Signed-off-by: Stephen Warren <swarren@nvidia.com>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  6. @JuliaLawall @michal42

    coccinelle: semantic patches related to devm_ functions (part 2)

    JuliaLawall authored michal42 committed
    devm_ functions allocate memory that is to remain allocated until the
    device is detached.  This patch checks for freeing of such memory using
    standard memory freeing functions.
    
    Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  7. @JuliaLawall @michal42

    coccinelle: semantic patches related to devm_ functions (part 1)

    JuliaLawall authored michal42 committed
    devm_ functions allocate memory that is to remain allocated until the
    device is detached.  This patch checks for opportunities for using the
    function devm_request_and_ioremap.
    
    Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  8. @dietsche @michal42

    coccicheck: add M= option to control which dir is processed

    dietsche authored michal42 committed
    Examples:
    	make coccicheck M=drivers/net/wireless/
    	make coccicheck SUBDIRS=drivers/net/wireless/
    
    Version 2:
    	fix patch file names when using M=
    	tell coccinelle where the include files are
    
    Version 3:
    	Add second include option to support out of tree development
    	Fix error message
    
    Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu>
    Acked-by: Julia Lawall <julia.lawall@lip6.fr>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  9. @udknight @michal42

    menuconfig: let make not report error when not save configuration

    udknight authored michal42 committed
    I find every time when I choice the 'NO' button at the dialog
    which let me choice whether to save the configuration before exit
    menuconfig, it always report the blow:
    
    " GEN     /mnt/sda7/home/build/test/Makefile
      HOSTCC  scripts/kconfig/mconf.o
      HOSTLD  scripts/kconfig/mconf
    scripts/kconfig/mconf Kconfig
    
    Your configuration changes were NOT saved.
    
    make[2]: *** [menuconfig] Error 1
    make[1]: *** [menuconfig] Error 2
    make: *** [sub-make] Error 2 "
    
    This patch repair it.
    
    Signed-off-by: Wang YanQing <udknight@gmail.com>
    Acked-by: Davidlohr Bueso <dave@gnu.org>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  10. @johnstultz-work @michal42

    merge_config.sh: fix bug in final check

    johnstultz-work authored michal42 committed
    Arnaud Lacombe pointed out the final checking that the requested configs
    were included in the final .config was broken.
    
    The example was that if you had a fragment that disabled
    CONFIG_DECOMPRESS_GZIP applied to a normal defconfig, there would be no
    final warning that CONFIG_DECOMPRESS_GZIP was acutally set in the final
    .config.
    
    This bug was introduced by me in v3 of the original patch, and the
    following patch reverts the invalid change.
    
    Signed-off-by: John Stultz <john.stultz@linaro.org>
    Reported-by: Arnaud Lacombe <lacombar@gmail.com>
    Cc: Darren Hart <dvhart@linux.intel.com>
    Cc: Michal Marek <mmarek@suse.cz>
    Cc: Arnaud Lacombe <lacombar@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  11. @dvhart @michal42

    merge_config.sh: whitespace cleanup

    dvhart authored michal42 committed
    Fix whitespace usage in the clean_up routine.
    
    Signed-off-by: Darren Hart <dvhart@linux.intel.com>
    Acked-by: John Stultz <john.stultz@linaro.org>
    Cc: Michal Marek <mmarek@suse.cz>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  12. @dvhart @michal42

    merge_config.sh: use signal names compatible with dash and bash

    dvhart authored michal42 committed
    The SIGHUP SIGINT and SIGTERM names caused failures when running
    merge_config.sh with the dash shell.  Dropping the "SIG" component makes
    the script work in both bash and dash.
    
    Signed-off-by: Darren Hart <dvhart@linux.intel.com>
    Acked-by: John Stultz <john.stultz@linaro.org>
    Cc: Michal Marek <mmarek@suse.cz>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  13. @michal42

    kconfig: add merge_config.sh script

    john stultz authored michal42 committed
    After noticing almost every distro has their own method of managing config
    fragments, I went looking at some best practices, and wanted to try to
    consolidate some of the different approaches so this fairly simple
    infrastructure can be shared (and new distros/build systems don't have to
    implement yet another config fragment merge script).
    
    This script is most influenced by the Windriver tools used in the Yocto
    Project, reusing some portions found there.
    
    This script merges multiple config fragments, warning on any overridden
    values.  It then sets any unspecified values to their default, then
    finally checks to make sure no specified value was dropped due to
    unsatisfied dependencies.
    
    I'm sure this implementation won't work for everyone, and I expect it will
    need to evolve to adapt for various use cases.  But I think its a
    reasonable starting point.
    
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Cc: Greg Thelen <gthelen@google.com>
    Cc: Reinhard Tartler <Reinhard.Tartler@informatik.uni-erlangen.de>
    Cc: Dmitry Fink <Dmitry.Fink@palm.com>
    Cc: Darren Hart <dvhart@linux.intel.com>
    Cc: Eric B Munson <ebmunson@us.ibm.com>
    Cc: Bruce Ashfield <Bruce.Ashfield@windriver.com>
    Cc: Michal Marek <mmarek@suse.cz>
    Signed-off-by: John Stultz <john.stultz@linaro.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  14. @torvalds

    Merge tag 'for-linus' of git://github.com/rustyrussell/linux

    torvalds authored
    Autogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999  BFCB D920 0E6C D1AD B8F1
    
    * tag 'for-linus' of git://github.com/rustyrussell/linux:
      module_param: check that bool parameters really are bool.
      intelfbdrv.c: bailearly is an int module_param
      paride/pcd: fix bool verbose module parameter.
      module_param: make bool parameters really bool (drivers & misc)
      module_param: make bool parameters really bool (arch)
      module_param: make bool parameters really bool (core code)
      kernel/async: remove redundant declaration.
      printk: fix unnecessary module_param_name.
      lirc_parallel: fix module parameter description.
      module_param: avoid bool abuse, add bint for special cases.
      module_param: check type correctness for module_param_array
      modpost: use linker section to generate table.
      modpost: use a table rather than a giant if/else statement.
      modules: sysfs - export: taint, coresize, initsize
      kernel/params: replace DEBUGP with pr_debug
      module: replace DEBUGP with pr_debug
      module: struct module_ref should contains long fields
      module: Fix performance regression on modules with large symbol tables
      module: Add comments describing how the "strmap" logic works
    
    Fix up conflicts in scripts/mod/file2alias.c due to the new linker-
    generated table approach to adding __mod_*_device_table entries.  The
    ARM sa11x0 mcp bus needed to be converted to that too.
  15. @torvalds

    Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/…

    torvalds authored
    …git/sameo/mfd-2.6
    
    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (59 commits)
      rtc: max8925: Add function to work as wakeup source
      mfd: Add pm ops to max8925
      mfd: Convert aat2870 to dev_pm_ops
      mfd: Still check other interrupts if we get a wm831x touchscreen IRQ
      mfd: Introduce missing kfree in 88pm860x probe routine
      mfd: Add S5M series configuration
      mfd: Add s5m series irq driver
      mfd: Add S5M core driver
      mfd: Improve mc13xxx dt binding document
      mfd: Fix stmpe section mismatch
      mfd: Fix stmpe build warning
      mfd: Fix STMPE I2c build failure
      mfd: Constify aat2870-core i2c_device_id table
      gpio: Add support for stmpe variant 801
      mfd: Add support for stmpe variant 801
      mfd: Add support for stmpe variant 610
      mfd: Add support for STMPE SPI interface
      mfd: Separate out STMPE controller and interface specific code
      misc: Remove max8997-muic sysfs attributes
      mfd: Remove unused wm831x_irq_data_to_mask_reg()
      ...
    
    Fix up trivial conflict in drivers/leds/Kconfig due to addition of
    LEDS_MAX8997 and LEDS_TCA6507 next to each other.
Commits on Jan 13, 2012
  1. @rostedt

    kconfig/streamline-config.pl: Fix parsing Makefile with variables

    Steven Rostedt authored rostedt committed
    Thomas Lange reported that when he did a 'make localmodconfig', his
    config was missing the brcmsmac driver, even though he had the module
    loaded.
    
    Looking into this, I found the file:
    drivers/net/wireless/brcm80211/brcmsmac/Makefile
    had the following in the Makefile:
    
    MODULEPFX := brcmsmac
    
    obj-$(CONFIG_BRCMSMAC)  += $(MODULEPFX).o
    
    The way streamline-config.pl works, is parsing all the
     obj-$(CONFIG_FOO) += foo.o
    lines to find that CONFIG_FOO belongs to the module foo.ko.
    
    But in this case, the brcmsmac.o was not used, but a variable in its place.
    
    By changing streamline-config.pl to remember defined variables in Makefiles
    and substituting them when they are used in the obj-X lines, allows
    Thomas (and others) to have their brcmsmac module stay configured
    when it is loaded and running "make localmodconfig".
    
    Reported-by: Thomas Lange <thomas-lange2@gmx.de>
    Tested-by: Thomas Lange <thomas-lange2@gmx.de>
    Cc: Arend van Spriel <arend@broadcom.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
  2. @rostedt

    kconfig/streamline-config.pl: Simplify backslash line concatination

    Steven Rostedt authored rostedt committed
    Simplify the way lines ending with backslashes (continuation) in Makefiles
    is parsed. This is needed to implement a necessary fix.
    
    Tested-by: Thomas Lange <thomas-lange2@gmx.de>
    Cc: stable@vger.kernel.org
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Commits on Jan 12, 2012
  1. @rustyrussell

    modpost: use linker section to generate table.

    rustyrussell authored
    This means (most) future busses need only have one hunk in their
    patch.  Also took the opportunity to check that function matches the
    type.
    
    Again, inspired by Alessandro's patch series.
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Alessandro Rubini <rubini@gnudd.com>
Something went wrong with that request. Please try again.