Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Nov 7, 2011
  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:
      script/checkpatch.pl: warn about deprecated use of EXTRA_{A,C,CPP,LD}FLAGS
      tags, powerpc: Update tags.sh to support _GLOBAL symbols
      scripts: add extract-vmlinux
  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:
      scripts/kconfig/nconf: add KEY_HOME / KEY_END for dialog_inputbox
      scripts/kconfig/nconf: fix editing long strings
      scripts/kconfig/nconf: dynamically alloc dialog_input_result
      scripts/kconfig/nconf: fix memmove's length arg
      scripts/kconfig/nconf: fix typo: unknow => unknown
      kconfig: fix set but not used variables
      kconfig: handle SIGINT in menuconfig
      kconfig: fix __enabled_ macros definition for invisible and un-selected symbols
      kconfig: factor code in menu_get_ext_help()
      kbuild: Fix help text not displayed in choice option.
      kconfig/nconf: nuke unreferenced `nohelp_text'
      kconfig/streamline_config.pl: merge local{mod,yes}config
      kconfig/streamline_config.pl: use options to determine operating mode
      kconfig/streamline_config.pl: directly access LSMOD from the environment
  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: append missing-syscalls to the default target list
      genksyms: Regenerate lexer and parser
      genksyms: Do not expand internal types
      genksyms: Minor parser cleanup
      Makefile: remove a duplicated line
      fixdep: fix extraneous dependencies
      scripts/Makefile.build: do not reference EXTRA_CFLAGS as CFLAGS replacement
      kbuild: prevent make from deleting _shipped files
      kbuild: Do not delete empty files in make distclean
Commits on Nov 6, 2011
  1. @rustyrussell

    module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree

    Ben Hutchings authored rustyrussell committed
    Use of the GPL or a compatible licence doesn't necessarily make the code
    any good.  We already consider staging modules to be suspect, and this
    should also be true for out-of-tree modules which may receive very
    little review.
    
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Reviewed-by: Dave Jones <davej@redhat.com>
    Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (patched oops-tracing.txt)
Commits on Nov 1, 2011
  1. @JoePerches @torvalds

    checkpatch: add a --strict check for utf-8 in commit logs

    JoePerches authored torvalds committed
    Some find using utf-8 in commit logs inappropriate.
    
    Some patch commit logs contain unintended utf-8 characters when doing
    things like copy/pasting compilation output.
    
    Look for the start of any commit log by skipping initial lines that look
    like email headers and "From: " lines.
    
    Stop looking for utf-8 at the first signature line.
    
    Signed-off-by: Joe Perches <joe@perches.com>
    Suggested-by: Andrew Morton <akpm@linux-foundation.org>
    Cc: Andy Whitcroft <apw@shadowen.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. @JoePerches @torvalds

    kernel.h/checkpatch: mark strict_strto<foo> and simple_strto<foo> as …

    JoePerches authored torvalds committed
    …obsolete
    
    Mark obsolete/deprecated strict_strto<foo> and simple_strto<foo> functions
    and macros as obsolete.
    
    Update checkpatch to warn about their use.
    
    Signed-off-by: Joe Perches <joe@perches.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Oct 26, 2011
  1. @torvalds

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

    torvalds authored
    …nel/git/gregkh/staging
    
    * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits)
      staging: et131x: Remove redundant check and return statement
      staging: et131x: Mainly whitespace changes to appease checkpatch
      staging: et131x: Remove last of the forward declarations
      staging: et131x: Remove even more forward declarations
      staging: et131x: Remove yet more forward declarations
      staging: et131x: Remove more forward declarations
      staging: et131x: Remove forward declaration of et131x_adapter_setup
      staging: et131x: Remove some forward declarations
      staging: et131x: Remove unused rx_ring.recv_packet_pool
      staging: et131x: Remove call to find pci pm capability
      staging: et131x: Remove redundant et131x_reset_recv() call
      staging: et131x: Remove unused rx_ring.recv_buffer_pool
      Staging: bcm: Fix three initialization errors in InterfaceDld.c
      Staging: bcm: Fix coding style issues in InterfaceDld.c
      staging:iio:dac: Add AD5360 driver
      staging:iio:trigger:bfin-timer: Fix compile error
      Staging: vt6655: add some range checks before memcpy()
      Staging: vt6655: whitespace fixes to iotcl.c
      Staging: vt6656: add some range checks before memcpy()
      Staging: vt6656: whitespace cleanups in ioctl.c
      ...
    
    Fix up conflicts in:
     - drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}:
    	vg driver movement
     - drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}:
    	driver removal vs now stale changes
     - drivers/staging/rtl8192e/r8192E_core.c:
    	driver removal vs now stale changes
     - drivers/staging/et131x/et131*:
    	driver consolidation into one file, tried to do fixups
Commits on Oct 11, 2011
  1. @michal42
  2. @michal42

    genksyms: Do not expand internal types

    michal42 authored
    Consider structures, unions and enums defined in the source file as
    internal and do not expand them. This way, changes to e.g. struct
    serial_private in drivers/tty/serial/8250_pci.c will not affect the
    checksum of the pciserial_* exports.
  3. @michal42

    genksyms: Minor parser cleanup

    michal42 authored
    Move the identical logic for recording a struct/union/enum definition to
    a function.
Commits on Sep 15, 2011
  1. Merge branch 'master' into for-next

    Jiri Kosina authored
    Fast-forward merge with Linus to be able to merge patches
    based on more recent version of the tree.
  2. treewide: remove extra semicolons from various parts of the kernel

    Justin P. Mattock authored Jiri Kosina committed
    This is a resend from the original, changing the title from PATCH to
    RFC(since this is a review for commit, and I should have put that the first go around).
    and also removing some of the commit's with ia64 and bash since it is significant.
    let me know if I might have missed anything etc..
    
    Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Commits on Sep 9, 2011
  1. @crquan @michal42

    scripts/kconfig/nconf: add KEY_HOME / KEY_END for dialog_inputbox

    crquan authored michal42 committed
    to make it easier to locate begin/end when editing long strings;
    
    Signed-off-by: Cheng Renquan <crquan@gmail.com>
    Acked By: Nir Tzachar <nir.tzachar@gmail.com>
  2. @crquan @michal42

    scripts/kconfig/nconf: fix editing long strings

    crquan authored michal42 committed
    The original dialog_inputbox doesn't work with longer than prompt_width
    strings, here fixed it in this way:
    1) add variable cursor_form_win to record cursor of form_win,
       keep its value always between [0, prompt_width-1];
       reuse the original cursor_position as cursor of the string result,
       use (cursor_position-cursor_form_win) as begin offset to show part of
       the string in form_win;
    
    Signed-off-by: Cheng Renquan <crquan@gmail.com>
    Cc: Arnaud Lacombe <lacombar@gmail.com>
    Cc: Nir Tzachar <nir.tzachar@gmail.com>
  3. @crquan @michal42

    scripts/kconfig/nconf: dynamically alloc dialog_input_result

    crquan authored michal42 committed
    To support unlimited length string config items;
    
    No check for realloc return value keeps code simple, and to be
    consistent with other existing unchecked malloc in kconfig.
    
    Signed-off-by: Cheng Renquan <crquan@gmail.com>
    Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
  4. @crquan @michal42

    scripts/kconfig/nconf: fix memmove's length arg

    crquan authored michal42 committed
    In case KEY_BACKSPACE / KEY_DC to delete a char, it memmove only
    (len-cursor_position+1) bytes;
    the default case is to insert a char, it should also memmove exactly
    (len-cursor_position+1) bytes;
    
    the original use of (len+1) is wrong and may access following memory
    that doesn't belong to result, may cause SegFault in theory;
    
    	case KEY_BACKSPACE:
    		if (cursor_position > 0) {
    			memmove(&result[cursor_position-1],
    					&result[cursor_position],
    					len-cursor_position+1);
    			cursor_position--;
    		}
    		break;
    	case KEY_DC:
    		if (cursor_position >= 0 && cursor_position < len) {
    			memmove(&result[cursor_position],
    					&result[cursor_position+1],
    					len-cursor_position+1);
    		}
    		break;
    	default:
    		if ((isgraph(res) || isspace(res)) &&
    				len-2 < result_len) {
    			/* insert the char at the proper position */
    			memmove(&result[cursor_position+1],
    					&result[cursor_position],
    					len-cursor_position+1);
    			result[cursor_position] = res;
    			cursor_position++;
    		}
    
    Signed-off-by: Cheng Renquan <crquan@gmail.com>
    Acked-by: Nir Tzachar <nir.tzachar@gmail.com>
  5. @crquan @michal42

    scripts/kconfig/nconf: fix typo: unknow => unknown

    crquan authored michal42 committed
    Signed-off-by: Cheng Renquan <crquan@gmail.com>
    Acked-by: Arnaud Lacombe <lacombar@gmail.com>
  6. @michal42

    fixdep: fix extraneous dependencies

    Peter Foley authored michal42 committed
    The introduction of include/linux/kconfig.h created 3 extraneous
    dependencies:
    include/config/.h
    include/config/h.h
    include/config/foo.h
    
    Fix this by excluding kconfig.h from fixdep calculations.
    
    Signed-off-by: Peter Foley <pefoley2@verizon.net>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
Commits on Aug 31, 2011
  1. @lacombar @michal42

    script/checkpatch.pl: warn about deprecated use of EXTRA_{A,C,CPP,LD}…

    lacombar authored michal42 committed
    …FLAGS
    
    Usage of these flags has been deprecated for nearly 4 years by:
    
        commit f77bf01
        Author: Sam Ravnborg <sam@neptun.(none)>
        Date:   Mon Oct 15 22:25:06 2007 +0200
    
            kbuild: introduce ccflags-y, asflags-y and ldflags-y
    
    Moreover, these flags (at least EXTRA_CFLAGS) have been documented for command
    line use. By default, gmake(1) do not override command line setting, so this is
    likely to result in build failure or unexpected behavior.
    
    Warn about their introduction in Makefile or Kbuild files.
    
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Cc: Andy Whitcroft <apw@canonical.com>
    Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  2. @lacombar @michal42

    scripts/Makefile.build: do not reference EXTRA_CFLAGS as CFLAGS repla…

    lacombar authored michal42 committed
    …cement
    
    Usage of these flags has been deprecated for nearly 4 years by:
    
        commit f77bf01
        Author: Sam Ravnborg <sam@neptun.(none)>
        Date:   Mon Oct 15 22:25:06 2007 +0200
    
            kbuild: introduce ccflags-y, asflags-y and ldflags-y
    
    Moreover, these flags (at least EXTRA_CFLAGS) have been documented for
    command line use. By default, gmake(1) do not override command line
    setting, so this is likely to result in build failure or unexpected
    behavior.
    
    Do not advertise for its usage.
    
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Cc: linux-kbuild@vger.kernel.org
    Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  3. @michal42

    kbuild: prevent make from deleting _shipped files

    Peter Foley authored michal42 committed
    commit 7373f4f (kbuild: add implicit rules for parser generation)
    created a implicit rule chain (%.c: %.c_shipped: %.y).
    Make considers the _shipped files to be intermediate files which
    causes them to be deleted if they didn't exist before make was run.
    Mark the _shipped files PRECIOUS to prevent make from deleting them.
    
    Signed-off-by: Peter Foley <pefoley2@verizon.net>
    Acked-by: Arnaud Lacombe <lacombar@gmail.com>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  4. @DarkStarSword @michal42

    tags, powerpc: Update tags.sh to support _GLOBAL symbols

    DarkStarSword authored michal42 committed
    On PowerPC we use _GLOBAL throughout the assembly to define symbols, but
    currently these symbols are missing from the tags generated with
    ARCH=powerpc make tags. This patch modifies the tags.sh script to
    recognise _GLOBAL(.*) so that these symbols will be in the tags.
    
    This is almost (but not quite) PowerPC specific and this change should
    not affect anyone else:
    
    $ git grep -E '^_GLOBAL\(([^)]*)\).*' |sed 's/^\([^/]*\/[^/]*\)\/.*$/\1/'|uniq -c
        627 arch/powerpc
          2 arch/um
    
    Signed-off-by: Ian Munsie <imunsie@au1.ibm.com>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  5. @iksaif @michal42

    scripts: add extract-vmlinux

    iksaif authored michal42 committed
    This script can be used to extract vmlinux from a compressed
    kernel image (bzImage, etc..). It's inspired from (a subset of)
    extract-ikconfig.
    
    It's something a lot of people have been looking for (mainly
    people with xen < 4 that doesn't support bzImages at all).
    
    Signed-off-by: Corentin Chary <corentincj@iksaif.net>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  6. @michal42
Commits on Aug 30, 2011
  1. @lucasdemarchi @lacombar

    kconfig: fix set but not used variables

    lucasdemarchi authored lacombar committed
    Some variables were being set but never used, which was triggering
    warnings in GCC >= 4.6.
    
    Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
    Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
  2. @lacombar

    kconfig: handle SIGINT in menuconfig

    Davidlohr Bueso authored lacombar committed
    I recently got bitten in the ass when pressing Ctrl-C and lost all my current
    configuration changes. This patch captures SIGINT and allows the user to save
    any changes.
    
    Some code refactoring was made in order to handle the exit behavior.
    
    Signed-off-by: Davidlohr Bueso <dave@gnu.org>
    Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
  3. @lacombar

    kconfig: fix __enabled_ macros definition for invisible and un-select…

    lacombar authored
    …ed symbols
    
    __enabled_<sym-name> are only generated on visible or selected entries, do not
    reflect the purpose of its introduction.
    
    Fix this by always generating these entries for named symbol.
    
    Reported-by: Rabin Vincent <rabin@rab.in>
    Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Commits on Aug 29, 2011
  1. @gregkh

    Merge 3.1-rc4 into staging-next

    gregkh authored
    This resolves a conflict with:
    	drivers/staging/brcm80211/brcmsmac/types.h
    
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Commits on Aug 25, 2011
  1. @teawater @torvalds

    checkpatch: add missing WARN argument for min_t and max_t tests

    teawater authored torvalds committed
    The test for bad usage of min_t() and max_t() is missing the --ignore
    type.  Add it.
    
    Signed-off-by: Hui Zhu <teawater@gmail.com>
    Signed-off-by: Joe Perches <joe@perches.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. @ralfth @torvalds

    scripts/get_maintainer.pl: update Linus's git repository

    ralfth authored torvalds committed
    Change to new git tree -
    (git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git).
    
    Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
    Cc: Joe Perches <joe@perches.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @gregkh

    Staging: hv: file2alias: fix up alias creation logic for hv_vmbus_dev…

    gregkh authored
    …ice_id
    
    When I added the driver_data field to hv_vmbus_device_id, I forgot to
    take into the account how the alias was created, so it would append the
    kernel pointer to the end of the alias, which is not correct.
    
    This changes how the hv_vmbus_device_id alias is created to proper
    account for the driver_data field.  As no module yet uses this alias, it
    is safe to fix this up at this point in the commit stream.
    
    Cc: K. Y. Srinivasan <kys@microsoft.com>
    Cc: Haiyang Zhang <haiyangz@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  4. @kattisrinivasan @gregkh

    Staging: hv: Add code to parse struct hv_vmbus_device_id table

    kattisrinivasan authored gregkh committed
    Add code to parse struct hv_vmbus_device_id table.
    
    Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
    Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Commits on Aug 19, 2011
  1. @michal42

    Merge branch 'master/kconfig-localmodconfig' of git://github.com/laco…

    michal42 authored
    …mbar/linux-2.6 into kbuild/kconfig
Commits on Aug 8, 2011
  1. @lacombar @michal42

    kconfig: factor code in menu_get_ext_help()

    lacombar authored michal42 committed
    Cc: Srinivas Kandagatla <srinivas.kandagatla@st.com>
    Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
  2. @michal42

    kbuild: Fix help text not displayed in choice option.

    Srinivas Kandagatla authored michal42 committed
    Help text under choice menu is never displayed because it does not have
    symbol name associated with it, however many kconfigs have help text
    under choice, assuming that it will be displayed when user selects help.
    for example in Kconfig if we have:
    choice
            prompt "Choice"
            ---help---
               HELP TEXT ...
    
    config A
            bool "A"
    
    config B
            bool "B"
    
    endchoice
    
    Without this patch "HELP TEXT" is not displayed when user selects help
    option when "Choice" is highlighted from menuconfig or xconfig or
    gconfig.
    
    This patch changes the logic in menu_get_ext_help to display help for
    cases which dont have symbol names like choice.
    
    Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
    Reviewed-by: Stuart Menefy <stuart.menefy@st.com>
    Reviewed-by: Arnaud Lacombe <lacombar@gmail.com>
    Cc: stable@kernel.org
    Signed-off-by: Michal Marek <mmarek@suse.cz>
Something went wrong with that request. Please try again.