10 Dec, 2011

1 commit


08 Dec, 2011

1 commit


07 Dec, 2011

1 commit


06 Dec, 2011

4 commits

  • perf_evsel.name may be not initialized

    Cc: David Ahern
    Cc: Ingo Molnar
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Arun Sharma
    Cc: devel@openvz.org
    Link: http://lkml.kernel.org/r/1322471015-107825-2-git-send-email-avagin@openvz.org
    Signed-off-by: Andrew Vagin
    Signed-off-by: Arnaldo Carvalho de Melo

    Andrew Vagin
     
  • * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    perf: Fix loss of notification with multi-event
    perf, x86: Force IBS LVT offset assignment for family 10h
    perf, x86: Disable PEBS on SandyBridge chips
    trace_events_filter: Use rcu_assign_pointer() when setting ftrace_event_call->filter
    perf session: Fix crash with invalid CPU list
    perf python: Fix undefined symbol problem
    perf/x86: Enable raw event access to Intel offcore events
    perf: Don't use -ENOSPC for out of PMU resources
    perf: Do not set task_ctx pointer in cpuctx if there are no events in the context
    perf/x86: Fix PEBS instruction unwind
    oprofile, x86: Fix crash when unloading module (nmi timer mode)
    oprofile: Fix crash when unloading module (hr timer mode)

    Linus Torvalds
     
  • A update is made to the sched:sched_switch event that adds some
    logic to the first parameter of the __print_flags() that shows the
    state of tasks. This change cause perf to fail parsing the flags.

    A simple fix is needed to have the parser be able to process ops
    within the argument.

    Cc: stable@vger.kernel.org
    Reported-by: Andrew Vagin
    Signed-off-by: Steven Rostedt

    Steven Rostedt
     
  • perf stat is failing on PowerPC:

    Error: open_counter returned with 95 (Operation not supported). /bin/dmesg may provide additional information.

    Fatal: Not all events could be opened.

    commit 370faf1dd046 (perf stat: Fail softly on unsupported events)
    added a check for failure returning ENOENT, but the POWER backend
    returns EOPNOTSUPP. It looks like alpha, blackfin and mips do the
    same.

    With the patch applied, things work as expected:

    Performance counter stats for '/bin/true':

    0.362176 task-clock # 0.623 CPUs utilized
    0 context-switches # 0.000 M/sec
    0 CPU-migrations # 0.000 M/sec
    28 page-faults # 0.077 M/sec
    1,677,020 cycles # 4.630 GHz
    stalled-cycles-frontend
    stalled-cycles-backend
    431,220 instructions # 0.26 insns per cycle
    101,889 branches # 281.325 M/sec
    4,145 branch-misses # 4.07% of all branches

    0.000581361 seconds time elapsed

    Cc: # 3.0+
    Cc: David Ahern
    Cc: Frederic Weisbecker
    Cc: Ingo Molnar
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Link: http://lkml.kernel.org/r/20111202093833.5fef7226@kryten
    Signed-off-by: Anton Blanchard
    Signed-off-by: Arnaldo Carvalho de Melo

    Anton Blanchard
     

19 Nov, 2011

1 commit

  • Let's say we have "OUTPUT_DIR = build/${TEST_NAME}", and we're iterating
    a test. In the second iteration of a test, the TEST_NAME of the test
    we're repeating is not used. Instead, ${TEST_NAME} appears literally:

    touch /home/rabin/kernel/test/build/${TEST_NAME}/.config ... SUCCESS

    Fix this by making __eval_option() check the parent test options
    for a repeated test.

    Link: http://lkml.kernel.org/r/1321616131-21352-2-git-send-email-rabin@rab.in

    Signed-off-by: Rabin Vincent
    Signed-off-by: Steven Rostedt

    Rabin Vincent
     

16 Nov, 2011

2 commits

  • commit 5d67be9 added the option to specify a range of CPUs of interest,
    but does not catch an invalid CPU list:

    $ perf script -c foo
    Segmentation fault (core dumped)

    Cc: Anton Blanchard
    Link: http://lkml.kernel.org/r/1321206327-5881-1-git-send-email-dsahern@gmail.com
    Signed-off-by: David Ahern
    Signed-off-by: Arnaldo Carvalho de Melo

    David Ahern
     
  • Recently we made perf_evsel__init call hists__init, which broke the perf
    python binding:

    [root@emilia linux]# ./tools/perf/python/twatch.py
    Traceback (most recent call last):
    File "./tools/perf/python/twatch.py", line 16, in
    import perf
    ImportError: /home/acme/git/build/perf/python/perf.so: undefined symbol: hists__init

    Fix it by moving the hists__init function to its only caller, evsel.c.

    This way we avoid dragging in other parts of tools/perf/util/ to the
    perf python binding.

    Cc: David Ahern
    Cc: Frederic Weisbecker
    Cc: Mike Galbraith
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Stephane Eranian
    Link: http://lkml.kernel.org/n/tip-5nffmdt5mu6ozxgj54oi4qon@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo

    Arnaldo Carvalho de Melo
     

09 Nov, 2011

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest: (21 commits)
    ktest: Evaluate variables entered on the command line
    ktest: Add variable ${PWD}
    ktest: Add another monitor flush before installing kernel
    ktest: Do not opencode reboot in grub setting
    ktest: Add processing of complex conditionals
    ktest: Fix parsing of config section lines
    ktest: Sort make_min_config configs by dependecies
    ktest: Add DEFINED keyword for IF statements
    ktest: Add OVERRIDE keyword to DEFAULTS section
    ktest: Consolidate TEST_TYPE and DEFAULT code
    ktest: Add INCLUDE keyword to include other config files
    ktest: Let IF keyword take comparisons
    ktest: Add IF and ELSE to config sections
    ktest: Do not reboot on config or build issues
    ktest: Add option REBOOT_SUCCESS_LINE to stop waiting after a reboot
    ktest: Add NO_INSTALL option to not install for a test
    ktest: Fail when grub menu not found
    ktest: Include monitor in reboot code
    ktest: Only need to save .config when doing mrproper
    ktest: Create outputdir if it does not exist
    ...

    Linus Torvalds
     

08 Nov, 2011

2 commits

  • * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    perf top: Fix live annotation in the --stdio interface
    perf top tui: Don't recalc column widths considering just the first page
    perf report: Add progress bar when processing time ordered events
    perf hists browser: Warn about lost events
    perf tools: Fix a typo of command name as trace-cmd
    perf hists: Fix recalculation of total_period when sorting entries
    perf header: Fix build on old systems
    perf ui browser: Handle K_RESIZE in dialog windows
    perf ui browser: No need to switch char sets that often
    perf hists browser: Use K_TIMER
    perf ui: Rename ui__warning_paranoid to ui__error_paranoid
    perf ui: Reimplement the popup windows using libslang
    perf ui: Reimplement ui__popup_menu using ui__browser
    perf ui: Reimplement ui_helpline using libslang
    perf ui: Improve handling sigwinch a bit
    perf ui progress: Reimplement using slang
    perf evlist: Fix grouping of multiple events

    Linus Torvalds
     
  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
    cpuidle: Single/Global registration of idle states
    cpuidle: Split cpuidle_state structure and move per-cpu statistics fields
    cpuidle: Remove CPUIDLE_FLAG_IGNORE and dev->prepare()
    cpuidle: Move dev->last_residency update to driver enter routine; remove dev->last_state
    ACPI: Fix CONFIG_ACPI_DOCK=n compiler warning
    ACPI: Export FADT pm_profile integer value to userspace
    thermal: Prevent polling from happening during system suspend
    ACPI: Drop ACPI_NO_HARDWARE_INIT
    ACPI atomicio: Convert width in bits to bytes in __acpi_ioremap_fast()
    PNPACPI: Simplify disabled resource registration
    ACPI: Fix possible recursive locking in hwregs.c
    ACPI: use kstrdup()
    mrst pmu: update comment
    tools/power turbostat: less verbose debugging

    Linus Torvalds
     

07 Nov, 2011

1 commit


03 Nov, 2011

1 commit

  • In the old --stdio interface the annotation is done just after one
    selects a symbol, while in --tui, now the default when the required libs
    are installed, we annotate all symbols with samples so that when
    annotation is asked we see what happened recently on that symbol.

    To achieve that the --stdio variant checks if the hist_entry being
    processed is the one selected by the user via the 's' hotkey. What
    happens now that we share the hist_entry abstractions with 'perf report'
    is that for minimizing locking contention multiple rb_trees are used,
    one for collecting the samples and other to browse/show them after
    resorting it by number of samples and decay them, which is done
    periodically.

    So the simple test in record_precise_ip doesn't work as we move
    hist_entries between those rb_trees. To fix it just check that the
    underlying struct symbol associated with those hist_entries is the same.

    Reported-by: Mike Galbraith
    Tested-by: Mike Galbraith
    Cc: David Ahern
    Cc: Frederic Weisbecker
    Cc: Mike Galbraith
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Stephane Eranian
    Link: http://lkml.kernel.org/n/tip-bcfnraqkux88fox9ba9767ds@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo

    Arnaldo Carvalho de Melo
     

02 Nov, 2011

3 commits

  • It makes sense for the stdio where we can't navigate to the other pages.

    On the TUI it breaks as soon as we navigate to other pages that have,
    DSOs with longer names than the ones on the first page.

    Cc: David Ahern
    Cc: Frederic Weisbecker
    Cc: Mike Galbraith
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Stephane Eranian
    Link: http://lkml.kernel.org/n/tip-zvqfp18mw229agb43cikgb0k@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo

    Arnaldo Carvalho de Melo
     
  • So that for large perf.data files the user can have visual feedback that
    activity is being performed.

    Cc: David Ahern
    Cc: Frederic Weisbecker
    Cc: Mike Galbraith
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Stephane Eranian
    Link: http://lkml.kernel.org/n/tip-3ysn01mpspfrbsy56gznzqqz@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo

    Arnaldo Carvalho de Melo
     
  • Just like the old perf top --tui and the --stdio version.

    But because we have the initial menu to choose which event to show in a
    session with multiple events we can see how many chunks were lost in
    each of the event types, clarifying which events are being affected the
    most.

    Cc: David Ahern
    Cc: Frederic Weisbecker
    Cc: Mike Galbraith
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Stephane Eranian
    Link: http://lkml.kernel.org/n/tip-47yyqbubmjzch2chezmb21m6@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo

    Arnaldo Carvalho de Melo
     

28 Oct, 2011

2 commits

  • When ktest.pl is called without any arguments, or if the config
    file does not exist, ktest.pl will ask the user for some information.
    Some of these questions are code paths. Allowing the user to type
    ${PWD} for the current directory greatly simplifies these entries.

    Add variable processing to the entered values.

    Signed-off-by: Steven Rostedt

    Steven Rostedt
     
  • Fix a typo which may be introduced when original code has been copied
    from trace-cmd.

    Cc: Ingo Molnar
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Steven Rostedt
    Cc: yrl.pp-manager.tt@hitachi.com
    Link: http://lkml.kernel.org/r/20111004104456.14591.37395.stgit@fedora15
    Signed-off-by: Masami Hiramatsu
    Signed-off-by: Arnaldo Carvalho de Melo

    Masami Hiramatsu
     

27 Oct, 2011

2 commits

  • We were doing parts of it in hists__collapse_resort and parts of it in
    hists__output_resort, leading to a bogus total_period.

    Fix it by doing just the filtering operation when collapsing because
    there we know that the Zoom operations adds filters just what is in
    hists->entries, not to the new batch of entries being collapsed.

    And move all the nr_entries + total_period recalculation to
    hists__output_resort since we will traverse all entries anyway there.

    Problem introduced when developing threaded addition of new batches
    of hist_entries, i.e. post v3.1.

    Reported-by: Frederic Weisbecker
    Cc: David Ahern
    Cc: Frederic Weisbecker
    Cc: Mike Galbraith
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Stephane Eranian
    Link: http://lkml.kernel.org/n/tip-8xyh165h7hmwy0696hu25en6@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo

    Arnaldo Carvalho de Melo
     
  • * 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
    tools, slub: Fix off-by-one buffer corruption after readlink() call
    slub: Discard slab page when node partial > minimum partial number
    slub: correct comments error for per cpu partial
    mm: restrict access to slab files under procfs and sysfs
    slub: Code optimization in get_partial_node()
    slub: doc: update the slabinfo.c file path
    slub: explicitly document position of inserting slab to partial list
    slub: update slabinfo tools to report per cpu partial list statistics
    slub: per cpu cache for partial pages
    slub: return object pointer from get_partial() / new_slab().
    slub: pass kmem_cache_cpu pointer to get_partial()
    slub: Prepare inuse field in new_slab()
    slub: Remove useless statements in __slab_alloc
    slub: free slabs without holding locks
    slub: use print_hex_dump
    slab: use print_hex_dump

    Linus Torvalds
     

26 Oct, 2011

14 commits

  • For instance, on Fedora 8:

    CC /home/acme/git/build/perf/util/header.o
    cc1: warnings being treated as errors
    util/header.c: In function ‘write_cpudesc’:
    util/header.c:281: warning: implicit declaration of function ‘getline’
    util/header.c:281: warning: nested extern declaration of ‘getline’
    make: *** [/home/acme/git/build/perf/util/header.o] Error 1
    make: Leaving directory `/home/acme/git/linux/tools/perf'
    [acme@localhost linux]$

    This happens due to header ordering, in perf util.h sets _GNU_SOURCE, so
    it must come first.

    Reported-by: Ingo Molnar
    Cc: David Ahern
    Cc: Frederic Weisbecker
    Cc: Mike Galbraith
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Stephane Eranian
    Link: http://lkml.kernel.org/n/tip-alfra9wao63euguj7gr8jw7e@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo

    Arnaldo Carvalho de Melo
     
  • Just provide wrappers for things like ui__warning, ui__dialog_yesno and
    if they return K_RESIZE, refresh dimensions, redraw the entries, etc.

    Cc: David Ahern
    Cc: Frederic Weisbecker
    Cc: Mike Galbraith
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Stephane Eranian
    Link: http://lkml.kernel.org/n/tip-3ih7hyk9weryxaxb501sfq4u@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo

    Arnaldo Carvalho de Melo
     
  • Just before and after the loop.

    Cc: David Ahern
    Cc: Frederic Weisbecker
    Cc: Mike Galbraith
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Stephane Eranian
    Link: http://lkml.kernel.org/n/tip-0lh91cedngyg1pqarbky5vn7@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo

    Arnaldo Carvalho de Melo
     
  • In the switch case entry for the timer routine.

    Cc: David Ahern
    Cc: Frederic Weisbecker
    Cc: Mike Galbraith
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Stephane Eranian
    Link: http://lkml.kernel.org/n/tip-ypw3i9kmxoq28skx7jy914it@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo

    Arnaldo Carvalho de Melo
     
  • As it will exit the tool after the user is notified.

    Cc: David Ahern
    Cc: Frederic Weisbecker
    Cc: Mike Galbraith
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Stephane Eranian
    Link: http://lkml.kernel.org/n/tip-vy06m8xzlvkhr8tk7nylhbng@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo

    Arnaldo Carvalho de Melo
     
  • Pekka Enberg
     
  • Just another step in stopping the use of libnewt in perf.

    Cc: David Ahern
    Cc: Frederic Weisbecker
    Cc: Mike Galbraith
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Stephane Eranian
    Link: http://lkml.kernel.org/n/tip-vtxnmz1t1807ykprapnk9njl@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo

    Arnaldo Carvalho de Melo
     
  • Right now let it work just like the other browsers: in full screen, at
    the top left corner. If people complain we can revisit, I found it OK
    and the laziest/quickest approach at reusing the ui_browser ;-)

    Cc: David Ahern
    Cc: Frederic Weisbecker
    Cc: Mike Galbraith
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Stephane Eranian
    Link: http://lkml.kernel.org/n/tip-4bgeqizcxh04q0sk24cw43gk@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo

    Arnaldo Carvalho de Melo
     
  • Just another step in stopping the use of libnewt in perf.

    Cc: David Ahern
    Cc: Frederic Weisbecker
    Cc: Mike Galbraith
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Stephane Eranian
    Link: http://lkml.kernel.org/n/tip-gh7e1v2z7pzqmok02r6zvp17@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo

    Arnaldo Carvalho de Melo
     
  • No need to unblock it at each ui__getch() and also allow other users to
    check if a resize is needed, or force an refresh of terminal dimensions.

    The 'force' one shouldn't be needed, but its in a slow path, so leave it
    like that for now, I'll revisit this another day.

    Cc: David Ahern
    Cc: Frederic Weisbecker
    Cc: Mike Galbraith
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Stephane Eranian
    Link: http://lkml.kernel.org/n/tip-aujchu6yx3bfy64non1rky0w@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo

    Arnaldo Carvalho de Melo
     
  • Just another step in stopping the use of libnewt in perf.

    Cc: David Ahern
    Cc: Frederic Weisbecker
    Cc: Mike Galbraith
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Stephane Eranian
    Link: http://lkml.kernel.org/n/tip-vkb9jh5kkzl5ep3puoatd6an@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo

    Arnaldo Carvalho de Melo
     
  • * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (121 commits)
    perf symbols: Increase symbol KSYM_NAME_LEN size
    perf hists browser: Refuse 'a' hotkey on non symbolic views
    perf ui browser: Use libslang to read keys
    perf tools: Fix tracing info recording
    perf hists browser: Elide DSO column when it is set to just one DSO, ditto for threads
    perf hists: Don't consider filtered entries when calculating column widths
    perf hists: Don't decay total_period for filtered entries
    perf hists browser: Honour symbol_conf.show_{nr_samples,total_period}
    perf hists browser: Do not exit on tab key with single event
    perf annotate browser: Don't change selection line when returning from callq
    perf tools: handle endianness of feature bitmap
    perf tools: Add prelink suggestion to dso update message
    perf script: Fix unknown feature comment
    perf hists browser: Apply the dso and thread filters when merging new batches
    perf hists: Move the dso and thread filters from hist_browser
    perf ui browser: Honour the xterm colors
    perf top tui: Give color hints just on the percentage, like on --stdio
    perf ui browser: Make the colors configurable and change the defaults
    perf tui: Remove unneeded call to newtCls on startup
    perf hists: Don't format the percentage on hist_entry__snprintf
    ...

    Fix up conflicts in arch/x86/kernel/kprobes.c manually.

    Ingo's tree did the insane "add volatile to const array", which just
    doesn't make sense ("volatile const"?). But we could remove the const
    *and* make the array volatile to make doubly sure that gcc doesn't
    optimize it away..

    Also fix up kernel/trace/ring_buffer.c non-data-conflicts manually: the
    reader_lock has been turned into a raw lock by the core locking merge,
    and there was a new user of it introduced in this perf core merge. Make
    sure that new use also uses the raw accessor functions.

    Linus Torvalds
     
  • * '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

    Linus Torvalds
     
  • The __perf_evsel__open routing was grouping just the threads for that
    specific events per cpu when we want to group all threads in all events
    to the first fd opened on that cpu.

    So pass the xyarray with the first event, where the other events will be
    able to get that first per cpu fd.

    At some point top and record will switch to using perf_evlist__open that
    takes care of this detail and probably will also handle the fallback
    from hw to soft counters, etc.

    Reported-by: Deng-Cheng Zhu
    Tested-by: Deng-Cheng Zhu
    Cc: David Ahern
    Cc: Frederic Weisbecker
    Cc: Mike Galbraith
    Cc: Paul Mackerras
    Cc: Peter Zijlstra
    Cc: Stephane Eranian
    Link: http://lkml.kernel.org/n/tip-ebm34rh098i9y9v4cytfdp0x@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo

    Arnaldo Carvalho de Melo
     

25 Oct, 2011

2 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)
    MAINTAINERS: linux-m32r is moderated for non-subscribers
    linux@lists.openrisc.net is moderated for non-subscribers
    Drop default from "DM365 codec select" choice
    parisc: Kconfig: cleanup Kernel page size default
    Kconfig: remove redundant CONFIG_ prefix on two symbols
    cris: remove arch/cris/arch-v32/lib/nand_init.S
    microblaze: add missing CONFIG_ prefixes
    h8300: drop puzzling Kconfig dependencies
    MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers
    tty: drop superfluous dependency in Kconfig
    ARM: mxc: fix Kconfig typo 'i.MX51'
    Fix file references in Kconfig files
    aic7xxx: fix Kconfig references to READMEs
    Fix file references in drivers/ide/
    thinkpad_acpi: Fix printk typo 'bluestooth'
    bcmring: drop commented out line in Kconfig
    btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888'
    doc: raw1394: Trivial typo fix
    CIFS: Don't free volume_info->UNC until we are entirely done with it.
    treewide: Correct spelling of successfully in comments
    ...

    Linus Torvalds
     
  • This was done to resolve a conflict in the
    drivers/staging/comedi/drivers/ni_labpc.c file that resolved a build
    bugfix in Linus's tree with a "better" bugfix that was in the
    staging-next tree that resolved the issue in a more complete manner.

    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

22 Oct, 2011

2 commits

  • Adding the variable ${PWD} that equals `pwd` makes the config files
    much simpler.

    Signed-off-by: Steven Rostedt

    Steven Rostedt
     
  • On some tests that do multiple boots (patchcheck, bisect, etc), the build
    of the next kernel to run may finish before the stable kernel has finished
    booting. Then the install of the new kernel will fail when it tries to connect
    as the machine has not finished the boot process.

    Do one more monitor flush to make sure the machine is up and running before
    trying to connect to it again.

    Signed-off-by: Steven Rostedt

    Steven Rostedt