13 Aug, 2013

13 commits

  • This code modifies the thermal driver to have multiple thermal zone
    support by replacing the global thermal zone variable with device data
    member of thermal_zone_device.

    Acked-by: Kukjin Kim
    Acked-by: Jonghwa Lee
    Acked-by: Eduardo Valentin
    Signed-off-by: Amit Daniel Kachhap
    Signed-off-by: Eduardo Valentin

    Amit Daniel Kachhap
     
  • This patch uses the TMU status register to know the generated interrupts
    and only clear them in the interrupt handler.

    Acked-by: Kukjin Kim
    Acked-by: Jonghwa Lee
    Acked-by: Eduardo Valentin
    Signed-off-by: Amit Daniel Kachhap
    Signed-off-by: Eduardo Valentin

    Amit Daniel Kachhap
     
  • TMU urgently sends active-high signal (thermal trip) to PMU, and thermal
    tripping by hardware logic. Thermal tripping means that PMU cuts off the
    whole power of SoC by controlling external voltage regulator.

    Acked-by: Kukjin Kim
    Acked-by: Jonghwa Lee
    Acked-by: Eduardo Valentin
    Signed-off-by: Jonghwan Choi
    Signed-off-by: Amit Daniel Kachhap
    Signed-off-by: Eduardo Valentin

    Amit Daniel Kachhap
     
  • This patch migrates the TMU register definition/bitfields to data file. This
    is needed to support SoC's which use the same TMU controller but register
    validity, offsets or bitfield may slightly vary across SOC's.

    Acked-by: Kukjin Kim
    Acked-by: Jonghwa Lee
    Acked-by: Eduardo Valentin
    Signed-off-by: Amit Daniel Kachhap
    Signed-off-by: Eduardo Valentin

    Amit Daniel Kachhap
     
  • This patch adds entries min_efuse_value, max_efuse_value, default_temp_offset,
    trigger_type, cal_type, trim_first_point, trim_second_point, max_trigger_level
    trigger_enable in the TMU platform data structure. Also the driver is modified
    to use the data passed by these new platform memebers instead of the constant
    macros. All these changes helps in separating the SOC specific data part from
    the TMU driver.

    Acked-by: Kukjin Kim
    Acked-by: Jonghwa Lee
    Signed-off-by: Amit Daniel Kachhap
    Acked-by: Eduardo Valentin
    Signed-off-by: Eduardo Valentin

    Amit Daniel Kachhap
     
  • This patch adds some extra register bitfield definations and cleans
    up the code to prepare for moving register macros and definations inside
    the TMU data section. In this code cleanup the TMU enable bit is correctly used
    as bit0 and bit1 is taken care which is reserve bit.

    Acked-by: Kukjin Kim
    Acked-by: Jonghwa Lee
    Signed-off-by: Amit Daniel Kachhap
    Acked-by: Eduardo Valentin
    Signed-off-by: Eduardo Valentin

    Amit Daniel Kachhap
     
  • This code splits the exynos tmu driver code into SOC specific data parts.
    This will simplify adding new SOC specific data to the same TMU controller.

    Acked-by: Kukjin Kim
    Acked-by: Jonghwa Lee
    Acked-by: Eduardo Valentin
    Signed-off-by: Amit Daniel Kachhap
    Signed-off-by: Eduardo Valentin

    Amit Daniel Kachhap
     
  • This patch renames and moves include/linux/platform_data/exynos_thermal.h to
    drivers/thermal/samsung/exynos_tmu.h. This file movement is needed as exynos
    SOC's are not supporting non-DT based platforms and this file now just contains
    exynos tmu driver related definations.
    Also struct freq_clip_table is now moved to exynos_thermal_common.c as it fixes
    the compilation issue occuring because now this new tmu header file is included
    in tmu driver c file and not in the common thermal header file.

    Acked-by: Kukjin Kim
    Acked-by: Jonghwa Lee
    Acked-by: Eduardo Valentin
    Signed-off-by: Amit Daniel Kachhap
    Signed-off-by: Eduardo Valentin

    Amit Daniel Kachhap
     
  • This patch renames exynos_thermal.c to exynos_tmu.c. This change is needed as
    this file now just contains exynos tmu driver related codes and thermal zone
    or cpufreq cooling registration related changes are not there anymore.

    Acked-by: Kukjin Kim
    Acked-by: Jonghwa Lee
    Acked-by: Eduardo Valentin
    Signed-off-by: Amit Daniel Kachhap
    Signed-off-by: Eduardo Valentin

    Amit Daniel Kachhap
     
  • This code bifurcates exynos thermal implementation into common and sensor
    specific parts. The common thermal code interacts with core thermal layer and
    core cpufreq cooling parts and is independent of SOC specific driver. This
    change is needed to cleanly add support for new TMU sensors.

    Acked-by: Kukjin Kim
    Acked-by: Jonghwa Lee
    Acked-by: Eduardo Valentin
    Signed-off-by: Amit Daniel Kachhap
    Signed-off-by: Eduardo Valentin

    Amit Daniel Kachhap
     
  • This patch removes the dependency on CPU_THERMAL for compiling TMU driver.
    This is useful for cases when only TMU controller needs to be initialised
    without cpu cooling action.

    Acked-by: Kukjin Kim
    Acked-by: Jonghwa Lee
    Acked-by: Eduardo Valentin
    Signed-off-by: Amit Daniel Kachhap
    Signed-off-by: Eduardo Valentin

    Amit Daniel Kachhap
     
  • This patch uses the recently added config sybmol ARCH_HAS_BANDGAP to enable
    the TMU driver. This will allow adding support for new soc easily as now it
    is the platform responsibility to enable this config symbol for a particular
    soc.

    Acked-by: Kukjin Kim
    Acked-by: Jonghwa Lee
    Acked-by: Eduardo Valentin
    Signed-off-by: Amit Daniel Kachhap
    Signed-off-by: Eduardo Valentin

    Amit Daniel Kachhap
     
  • This movement of files is done for easy maintenance and adding more
    new sensor's support for exynos platform easily . This will also help in
    bifurcating exynos common, sensor driver and sensor data related parts.

    Acked-by: Kukjin Kim
    Acked-by: Jonghwa Lee
    Acked-by: Eduardo Valentin
    Signed-off-by: Amit Daniel Kachhap
    Signed-off-by: Eduardo Valentin

    Amit Daniel Kachhap
     

22 Jul, 2013

1 commit

  • Commit f1a18a105 "Thermal: CPU Package temperature thermal" had code
    that did a get_online_cpus(), run a loop and then do a
    put_online_cpus(). The problem is that the loop had an error exit that
    would skip the put_online_cpus() part.

    In the error exit part of the function, it also did a get_online_cpus(),
    run a loop and then put_online_cpus(). The only way to get to the error
    exit part is with get_online_cpus() already performed. If this error
    condition is hit, the system will be prevented from taking CPUs offline.
    The process taking the CPU offline will lock up hard.

    Removing the get_online_cpus() removes the lockup as the hotplug CPU
    refcount is back to zero.

    This was bisected with ktest.

    Signed-off-by: Steven Rostedt
    Signed-off-by: Zhang Rui

    Steven Rostedt
     

16 Jul, 2013

1 commit


15 Jul, 2013

7 commits

  • If krealloc() returns NULL, it doesn't free the original. So any code
    of the form 'foo = krealloc(foo, ...);' is almost certainly a bug.

    Signed-off-by: Wei Yongjun
    Signed-off-by: Zhang Rui

    Wei Yongjun
     
  • On systems with no package MSR support this caused crash as there
    is a bug in the logic to check presence of DTHERM and PTS feature
    together. Added a change so that when there is no PTS support, module
    doesn't get loaded. Even if some CPU comes online with the PTS
    feature disabled, and other CPUs has this support, this patch
    will still prevent such MSR accesses.

    Signed-off-by: Srinivas Pandruvada
    Reported-by: Daniel Walker
    Signed-off-by: Zhang Rui

    Srinivas Pandruvada
     
  • Pull ext4 bugfixes from Ted Ts'o:
    "Various regression and bug fixes for ext4"

    * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
    ext4: don't allow ext4_free_blocks() to fail due to ENOMEM
    ext4: fix spelling errors and a comment in extent_status tree
    ext4: rate limit printk in buffer_io_error()
    ext4: don't show usrquota/grpquota twice in /proc/mounts
    ext4: fix warning in ext4_evict_inode()
    ext4: fix ext4_get_group_number()
    ext4: silence warning in ext4_writepages()

    Linus Torvalds
     
  • Linus Torvalds
     
  • Pull slab update from Pekka Enberg:
    "Highlights:

    - Fix for boot-time problems on some architectures due to
    init_lock_keys() not respecting kmalloc_caches boundaries
    (Christoph Lameter)

    - CONFIG_SLUB_CPU_PARTIAL requested by RT folks (Joonsoo Kim)

    - Fix for excessive slab freelist draining (Wanpeng Li)

    - SLUB and SLOB cleanups and fixes (various people)"

    I ended up editing the branch, and this avoids two commits at the end
    that were immediately reverted, and I instead just applied the oneliner
    fix in between myself.

    * 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
    slub: Check for page NULL before doing the node_match check
    mm/slab: Give s_next and s_stop slab-specific names
    slob: Check for NULL pointer before calling ctor()
    slub: Make cpu partial slab support configurable
    slab: add kmalloc() to kernel API documentation
    slab: fix init_lock_keys
    slob: use DIV_ROUND_UP where possible
    slub: do not put a slab to cpu partial list when cpu_partial is 0
    mm/slub: Use node_nr_slabs and node_nr_objs in get_slabinfo
    mm/slub: Drop unnecessary nr_partials
    mm/slab: Fix /proc/slabinfo unwriteable for slab
    mm/slab: Sharing s_next and s_stop between slab and slub
    mm/slab: Fix drain freelist excessively
    slob: Rework #ifdeffery in slab.h
    mm, slab: moved kmem_cache_alloc_node comment to correct place

    Linus Torvalds
     
  • In the -rt kernel (mrg), we hit the following dump:

    BUG: unable to handle kernel NULL pointer dereference at (null)
    IP: [] kmem_cache_alloc_node+0x51/0x180
    PGD a2d39067 PUD b1641067 PMD 0
    Oops: 0000 [#1] PREEMPT SMP
    Modules linked in: sunrpc cpufreq_ondemand ipv6 tg3 joydev sg serio_raw pcspkr k8temp amd64_edac_mod edac_core i2c_piix4 e100 mii shpchp ext4 mbcache jbd2 sd_mod crc_t10dif sr_mod cdrom sata_svw ata_generic pata_acpi pata_serverworks radeon ttm drm_kms_helper drm hwmon i2c_algo_bit i2c_core dm_mirror dm_region_hash dm_log dm_mod
    CPU 3
    Pid: 20878, comm: hackbench Not tainted 3.6.11-rt25.14.el6rt.x86_64 #1 empty empty/Tyan Transport GT24-B3992
    RIP: 0010:[] [] kmem_cache_alloc_node+0x51/0x180
    RSP: 0018:ffff8800a9b17d70 EFLAGS: 00010213
    RAX: 0000000000000000 RBX: 0000000001200011 RCX: ffff8800a06d8000
    RDX: 0000000004d92a03 RSI: 00000000000000d0 RDI: ffff88013b805500
    RBP: ffff8800a9b17dc0 R08: ffff88023fd14d10 R09: ffffffff81041cbd
    R10: 00007f4e3f06e9d0 R11: 0000000000000246 R12: ffff88013b805500
    R13: ffff8801ff46af40 R14: 0000000000000001 R15: 0000000000000000
    FS: 00007f4e3f06e700(0000) GS:ffff88023fd00000(0000) knlGS:0000000000000000
    CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
    CR2: 0000000000000000 CR3: 00000000a2d3a000 CR4: 00000000000007e0
    DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
    DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
    Process hackbench (pid: 20878, threadinfo ffff8800a9b16000, task ffff8800a06d8000)
    Stack:
    ffff8800a9b17da0 ffffffff81202e08 ffff8800a9b17de0 000000d001200011
    0000000001200011 0000000001200011 0000000000000000 0000000000000000
    00007f4e3f06e9d0 0000000000000000 ffff8800a9b17e60 ffffffff81041cbd
    Call Trace:
    [] ? current_has_perm+0x68/0x80
    [] copy_process+0xdd/0x15b0
    [] ? rt_up_read+0x25/0x30
    [] do_fork+0x5a/0x360
    [] ? migrate_enable+0xeb/0x220
    [] sys_clone+0x28/0x30
    [] stub_clone+0x13/0x20
    [] ? system_call_fastpath+0x16/0x1b
    Code: 89 fc 89 75 cc 41 89 d6 4d 8b 04 24 65 4c 03 04 25 48 ae 00 00 49 8b 50 08 4d 8b 28 49 8b 40 10 4d 85 ed 74 12 41 83 fe ff 74 27 8b 00 48 c1 e8 3a 41 39 c6 74 1b 8b 75 cc 4c 89 c9 44 89 f2
    RIP [] kmem_cache_alloc_node+0x51/0x180
    RSP
    CR2: 0000000000000000
    ---[ end trace 0000000000000002 ]---

    Now, this uses SLUB pretty much unmodified, but as it is the -rt kernel
    with CONFIG_PREEMPT_RT set, spinlocks are mutexes, although they do
    disable migration. But the SLUB code is relatively lockless, and the
    spin_locks there are raw_spin_locks (not converted to mutexes), thus I
    believe this bug can happen in mainline without -rt features. The -rt
    patch is just good at triggering mainline bugs ;-)

    Anyway, looking at where this crashed, it seems that the page variable
    can be NULL when passed to the node_match() function (which does not
    check if it is NULL). When this happens we get the above panic.

    As page is only used in slab_alloc() to check if the node matches, if
    it's NULL I'm assuming that we can say it doesn't and call the
    __slab_alloc() code. Is this a correct assumption?

    Acked-by: Christoph Lameter
    Signed-off-by: Steven Rostedt
    Signed-off-by: Pekka Enberg
    Signed-off-by: Linus Torvalds

    Steven Rostedt
     
  • Pull more vfs stuff from Al Viro:
    "O_TMPFILE ABI changes, Oleg's fput() series, misc cleanups, including
    making simple_lookup() usable for filesystems with non-NULL s_d_op,
    which allows us to get rid of quite a bit of ugliness"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
    sunrpc: now we can just set ->s_d_op
    cgroup: we can use simple_lookup() now
    efivarfs: we can use simple_lookup() now
    make simple_lookup() usable for filesystems that set ->s_d_op
    configfs: don't open-code d_alloc_name()
    __rpc_lookup_create_exclusive: pass string instead of qstr
    rpc_create_*_dir: don't bother with qstr
    llist: llist_add() can use llist_add_batch()
    llist: fix/simplify llist_add() and llist_add_batch()
    fput: turn "list_head delayed_fput_list" into llist_head
    fs/file_table.c:fput(): add comment
    Safer ABI for O_TMPFILE

    Linus Torvalds
     

14 Jul, 2013

18 commits

  • Signed-off-by: Al Viro

    Al Viro
     
  • Signed-off-by: Al Viro

    Al Viro
     
  • Signed-off-by: Al Viro

    Al Viro
     
  • Signed-off-by: Al Viro

    Al Viro
     
  • Signed-off-by: Al Viro

    Al Viro
     
  • ... and use d_hash_and_lookup() instead of open-coding it, for fsck sake...

    Signed-off-by: Al Viro

    Al Viro
     
  • just pass the name

    Signed-off-by: Al Viro

    Al Viro
     
  • Pull x86 platform driver updates from Matthew Garrett:
    "Nothing overly exciting here - a couple of new drivers that don't do a
    great deal, along with some miscellaneous fixes and a couple of small
    feature enablement patches"

    * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
    x86 platform drivers: fix gpio leak
    toshiba_acpi: Add dependency on SERIO_I8042
    asus-nb-wmi: set wapf=4 for ASUSTeK COMPUTER INC. 1015E/U
    Add trivial driver to disable Intel Smart Connect
    Add support driver for Intel Rapid Start Technology
    hp-wmi: add supports for POST code error
    asus-wmi: control wlan-led only if wapf == 4
    drivers/platform/x86/intel_ips: Convert to module_pci_driver
    asus-nb-wmi: ignore ALS notification key code
    asus-wmi: append newline to messages
    x86: asus-laptop: fix invalid point access
    x86: msi-laptop: fix memleak
    amilo-rfkill: Add dependency on SERIO_I8042
    dell-laptop: fix error return code in dell_init()
    hp-wmi: Enable hotkeys on some systems

    Linus Torvalds
     
  • Pull second round of input updates from Dmitry Torokhov:
    "An update to Elantech driver to support hardware v7, fix to the new
    cyttsp4 driver to use proper addressing, ads7846 device tree support
    and nspire-keypad got a small cleanup."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Input: nspire-keypad - replace magic offset with define
    Input: elantech - fix for newer hardware versions (v7)
    Input: cyttsp4 - use 16bit address for I2C/SPI communication
    Input: ads7846 - add device tree bindings
    Input: ads7846 - make sure we do not change platform data

    Linus Torvalds
     
  • Pull networking fixes from David Miller:
    "Just a bunch of small fixes and tidy ups:

    1) Finish the "busy_poll" renames, from Eliezer Tamir.

    2) Fix RCU stalls in IFB driver, from Ding Tianhong.

    3) Linearize buffers properly in tun/macvtap zerocopy code.

    4) Don't crash on rmmod in vxlan, from Pravin B Shelar.

    5) Spinlock used before init in alx driver, from Maarten Lankhorst.

    6) A sparse warning fix in bnx2x broke TSO checksums, fix from Dmitry
    Kravkov.

    7) Dummy and ifb driver load failure paths can oops, fixes from Tan
    Xiaojun and Ding Tianhong.

    8) Correct MTU calculations in IP tunnels, from Alexander Duyck.

    9) Account all TCP retransmits in SNMP stats properly, from Yuchung
    Cheng.

    10) atl1e and via-rhine do not handle DMA mapping failures properly,
    from Neil Horman.

    11) Various equal-cost multipath route fixes in ipv6 from Hannes
    Frederic Sowa"

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (36 commits)
    ipv6: only static routes qualify for equal cost multipathing
    via-rhine: fix dma mapping errors
    atl1e: fix dma mapping warnings
    tcp: account all retransmit failures
    usb/net/r815x: fix cast to restricted __le32
    usb/net/r8152: fix integer overflow in expression
    net: access page->private by using page_private
    net: strict_strtoul is obsolete, use kstrtoul instead
    drivers/net/ieee802154: don't use devm_pinctrl_get_select_default() in probe
    drivers/net/ethernet/cadence: don't use devm_pinctrl_get_select_default() in probe
    drivers/net/can/c_can: don't use devm_pinctrl_get_select_default() in probe
    net/usb: add relative mii functions for r815x
    net/tipc: use %*phC to dump small buffers in hex form
    qlcnic: Adding Maintainers.
    gre: Fix MTU sizing check for gretap tunnels
    pkt_sched: sch_qfq: remove forward declaration of qfq_update_agg_ts
    pkt_sched: sch_qfq: improve efficiency of make_eligible
    gso: Update tunnel segmentation to support Tx checksum offload
    inet: fix spacing in assignment
    ifb: fix oops when loading the ifb failed
    ...

    Linus Torvalds
     
  • Pull final round of SCSI updates from James Bottomley:
    "This is the remaining set of SCSI patches for the merge window. It's
    mostly driver updates (scsi_debug, qla2xxx, storvsc, mp3sas). There
    are also several bug fixes in fcoe, libfc, and megaraid_sas. We also
    have a couple of core changes to try to make device destruction more
    deterministic"

    * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (46 commits)
    [SCSI] scsi constants: command, sense key + additional sense strings
    fcoe: Reduce number of sparse warnings
    fcoe: Stop fc_rport_priv structure leak
    libfcoe: Fix meaningless log statement
    libfc: Differentiate echange timer cancellation debug statements
    libfc: Remove extra space in fc_exch_timer_cancel definition
    fcoe: fix the link error status block sparse warnings
    fcoe: Fix smatch warning in fcoe_fdmi_info function
    libfc: Reject PLOGI from nodes with incompatible role
    [SCSI] enable destruction of blocked devices which fail LUN scanning
    [SCSI] Fix race between starved list and device removal
    [SCSI] megaraid_sas: fix a bug for 64 bit arches
    [SCSI] scsi_debug: reduce duplication between prot_verify_read and prot_verify_write
    [SCSI] scsi_debug: simplify offset calculation for dif_storep
    [SCSI] scsi_debug: invalidate protection info for unmapped region
    [SCSI] scsi_debug: fix NULL pointer dereference with parameters dif=0 dix=1
    [SCSI] scsi_debug: fix incorrectly nested kmap_atomic()
    [SCSI] scsi_debug: fix invalid address passed to kunmap_atomic()
    [SCSI] mpt3sas: Bump driver version to v02.100.00.00
    [SCSI] mpt3sas: when async scanning is enabled then while scanning, devices are removed but their transport layer entries are not removed
    ...

    Linus Torvalds
     
  • Pull scheduler fix from Thomas Gleixner:
    "Fix a potential deadlock versus hrtimers"

    * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    sched: Fix HRTICK

    Linus Torvalds
     
  • Pull irq updates from Thomas Gleixner:
    - core fix for missing round up in the generic irq chip implementation
    - new irq chip for MOXA SoCs
    - a few fixes and cleanups in the irqchip drivers

    * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    irqchip: Add support for MOXA ART SoCs
    genirq: generic chip: Use DIV_ROUND_UP to calculate numchips
    irqchip: nvic: Fix wrong num_ct argument for irq_alloc_domain_generic_chips()
    irqchip: sun4i: Staticize sun4i_irq_ack()
    irqchip: vt8500: Staticize local symbols

    Linus Torvalds
     
  • Pull timer updates from Thomas Gleixner:
    - watchdog fixes for full dynticks
    - improved debug output for full dynticks
    - remove an obsolete full dynticks check
    - two ARM SoC clocksource drivers for sharing across SoCs
    - tick broadcast fix for CPU hotplug

    * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    tick: broadcast: Check broadcast mode on CPU hotplug
    clocksource: arm_global_timer: Add ARM global timer support
    clocksource: Add Marvell Orion SoC timer
    nohz: Remove obsolete check for full dynticks CPUs to be RCU nocbs
    watchdog: Boot-disable by default on full dynticks
    watchdog: Rename confusing state variable
    watchdog: Register / unregister watchdog kthreads on sysctl control
    nohz: Warn if the machine can not perform nohz_full

    Linus Torvalds
     
  • Pull perf fixes from Thomas Gleixner:
    - fix for do_div() abuse on x86
    - locking fix in perf core
    - a pile of (build) fixes and cleanups in perf tools

    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits)
    perf/x86: Fix incorrect use of do_div() in NMI warning
    perf: Fix perf_lock_task_context() vs RCU
    perf: Remove WARN_ON_ONCE() check in __perf_event_enable() for valid scenario
    perf: Clone child context from parent context pmu
    perf script: Fix broken include in Context.xs
    perf tools: Fix -ldw/-lelf link test when static linking
    perf tools: Revert regression in configuration of Python support
    perf tools: Fix perf version generation
    perf stat: Fix per-socket output bug for uncore events
    perf symbols: Fix vdso list searching
    perf evsel: Fix missing increment in sample parsing
    perf tools: Update symbol_conf.nr_events when processing attribute events
    perf tools: Fix new_term() missing free on error path
    perf tools: Fix parse_events_terms() segfault on error path
    perf evsel: Fix count parameter to read call in event_format__new
    perf tools: fix a typo of a Power7 event name
    perf tools: Fix -x/--exclude-other option for report command
    perf evlist: Enhance perf_evlist__start_workload()
    perf record: Remove -f/--force option
    perf record: Remove -A/--append option
    ...

    Linus Torvalds
     
  • Pull core locking updates from Thomas Gleixner:
    "Header cleanup as requested by Linus"

    (This is the "don't include support for ww_mutex in a header file that
    everybody wants, when almost nobody wants the ww part" change)

    * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    mutex: Move ww_mutex definitions to ww_mutex.h

    Linus Torvalds
     
  • Pull ARM SoC fixes from Olof Johansson:
    "This is our first set of fixes from arm-soc for 3.11.
    - A handful of build and warning fixes from Arnd
    - A collection of OMAP fixes
    - defconfig updates to make the default configs more useful for real
    use (and testing) out of the box on hardware

    And a couple of other small fixes. Some of these have been recently
    applied but it's normally how we deal with fixes, with less bake time
    in -next needed"

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (32 commits)
    arm: multi_v7_defconfig: Tweaks for omap and sunxi
    arm: multi_v7_defconfig: add i.MX options and NFS root
    ARM: omap2: add select of TI_PRIV_EDMA
    ARM: exynos: select PM_GENERIC_DOMAINS only when used
    ARM: ixp4xx: avoid circular header dependency
    ARM: OMAP: omap_common_late_init may be unused
    ARM: sti: move DEBUG_STI_UART into alphabetical order
    ARM: OMAP: build mach-omap code only if needed
    ARM: zynq: use DT_MACHINE_START
    ARM: omap5: omap5 has SCU and TWD
    ARM: OMAP2+: omap2plus_defconfig: Enable appended DTB support
    ARM: OMAP2+: Enable TI_EDMA in omap2plus_defconfig
    ARM: OMAP2+: omap2plus_defconfig: enable DRA752 thermal support by default
    ARM: OMAP2+: omap2plus_defconfig: enable TI bandgap driver
    ARM: OMAP2+: devices: remove duplicated include from devices.c
    ARM: OMAP3: igep0020: Set DSS pins in correct mux mode.
    ARM: OMAP2+: N900: enable N900-specific drivers even if device tree is enabled
    ARM: OMAP2+: Cocci spatch "ptr_ret.spatch"
    ARM: OMAP2+: Remove obsolete Makefile line
    ARM: OMAP5: Enable Cortex A15 errata 798181
    ...

    Linus Torvalds
     
  • Pull ARM fixes from Russell King:
    "A few fixes for ARM, mostly just one liners with the exception of the
    missing section specification. We decided not to rely on .previous to
    fix this but to explicitly state the section we want the code to be
    in."

    * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
    ARM: 7778/1: smp_twd: twd_update_frequency need be run on all online CPUs
    ARM: 7782/1: Kconfig: Let ARM_ERRATA_364296 not depend on CONFIG_SMP
    ARM: mm: fix boot on SA1110 Assabet
    ARM: 7781/1: mmu: Add debug_ll_io_init() mappings to early mappings
    ARM: 7780/1: add missing linker section markup to head-common.S

    Linus Torvalds