1. 15 Sep, 2015 6 commits
  2. 14 Sep, 2015 2 commits
  3. 13 Sep, 2015 2 commits
    • Arnaldo Carvalho de Melo's avatar
      perf header: Fixup reading of HEADER_NRCPUS feature · caa47047
      Arnaldo Carvalho de Melo authored
      The original patch introducing this header wrote the number of CPUs available
      and online in one order and then swapped those values when reading, fix it.
      
      Before:
      
        # perf record usleep 1
        # perf report --header-only | grep 'nrcpus \(online\|avail\)'
        # nrcpus online : 4
        # nrcpus avail : 4
        # echo 0 > /sys/devices/system/cpu/cpu2/online
        # perf record usleep 1
        # perf report --header-only | grep 'nrcpus \(online\|avail\)'
        # nrcpus online : 4
        # nrcpus avail : 3
        # echo 0 > /sys/devices/system/cpu/cpu1/online
        # perf record usleep 1
        # perf report --header-only | grep 'nrcpus \(online\|avail\)'
        # nrcpus online : 4
        # nrcpus avail : 2
      
      After the fix, bringing back the CPUs online:
      
        # perf report --header-only | grep 'nrcpus \(online\|avail\)'
        # nrcpus online : 2
        # nrcpus avail : 4
        # echo 1 > /sys/devices/system/cpu/cpu2/online
        # perf record usleep 1
        # perf report --header-only | grep 'nrcpus \(online\|avail\)'
        # nrcpus online : 3
        # nrcpus avail : 4
        # echo 1 > /sys/devices/system/cpu/cpu1/online
        # perf record usleep 1
        # perf report --header-only | grep 'nrcpus \(online\|avail\)'
        # nrcpus online : 4
        # nrcpus avail : 4
      Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Borislav Petkov <bp@suse.de>
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Jiri Olsa <jolsa@kernel.org>
      Cc: Kan Liang <kan.liang@intel.com>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Wang Nan <wangnan0@huawei.com>
      Fixes: fbe96f29 ("perf tools: Make perf.data more self-descriptive (v8)")
      Link: http://lkml.kernel.org/r/20150911153323.GP23511@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      caa47047
    • Peter Zijlstra's avatar
      perf/x86/intel: Fix constraint access · ebfb4988
      Peter Zijlstra authored
      Sasha reported that we can get here with .idx==-1, and
      cpuc->event_constraints unallocated.
      Suggested-by: default avatarStephane Eranian <eranian@google.com>
      Reported-by: default avatarSasha Levin <sasha.levin@oracle.com>
      Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: <stable@vger.kernel.org>
      Fixes: b371b594 ("perf/x86: Fix event/group validation")
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      ebfb4988
  4. 11 Sep, 2015 1 commit
  5. 04 Sep, 2015 1 commit
    • Ingo Molnar's avatar
      Merge tag 'perf-urgent-for-mingo' of... · 21adf76e
      Ingo Molnar authored
      Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
      
      Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
      
        - In some cases where perf_event.fork.{pid,tid} should be used we were instead
          using perf_event.comm.{pid,tid}, which is not a problem for for the 'pid'
          case, that sits in the same place in these union_perf_event members, but
          comm.tid sits where fork.ppid is, oops.
      
          These cases were considered as (potentially) problematic:
      
           - 'perf script' with !sample_id_all, i.e. only non old kernels without
              perf_event_attr.sample_id_all.
      
           - intel_pt could be affected when decoding without timestamps, as the exit
             event is only used to flush out data which anyway gets flushed at the
             end of the session.
      
           - intel_bts also uses the exit event to flush data which would probably not
             cause errors as it would get flushed at the end of the session instead.
      
          Fix it. (Adrian Hunter)
      
        - Due to relaxing the compiler checks for bison generated files, we missed
          updating one parse_events_add_pmu() caller when this function had its
          prototype changed, fix it. (Jiri Olsa)
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      21adf76e
  6. 02 Sep, 2015 3 commits
  7. 01 Sep, 2015 17 commits
    • Stephane Eranian's avatar
      perf tools: Fix link time error with sample_reg_masks on non x86 · af4aeadd
      Stephane Eranian authored
      This patch makes perf compile on non x86 platforms by defining a weak
      symbol for sample_reg_masks[] in util/perf_regs.c.
      
      The patch also moves the REG() and REG_END() macros into the
      util/per_regs.h header file. The macros are renamed to
      SMPL_REG/SMPL_REG_END to avoid clashes with other header files.
      Signed-off-by: default avatarStephane Eranian <eranian@google.com>
      Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Kan Liang <kan.liang@intel.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Link: http://lkml.kernel.org/r/1441099814-26783-1-git-send-email-eranian@google.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      af4aeadd
    • Wang Nan's avatar
      perf build: Fix Intel PT instruction decoder dependency problem · 04aa90b5
      Wang Nan authored
      I hit following building error randomly:
      
          ...
        /bin/sh: /path/to/kernel/buildperf/util/intel-pt-decoder/inat-tables.c: No such file or directory
          ...
          LINK     /path/to/kernel/buildperf/plugin_mac80211.so
          LINK     /path/to/kernel/buildperf/plugin_kmem.so
          LINK     /path/to/kernel/buildperf/plugin_xen.so
          LINK     /path/to/kernel/buildperf/plugin_hrtimer.so
        In file included from util/intel-pt-decoder/intel-pt-insn-decoder.c:25:0:
        util/intel-pt-decoder/inat.c:24:25: fatal error: inat-tables.c: No such file or directory
         #include "inat-tables.c"
                                 ^
        compilation terminated.
        make[4]: *** [/path/to/kernel/buildperf/util/intel-pt-decoder/intel-pt-insn-decoder.o] Error 1
        make[4]: *** Waiting for unfinished jobs....
          LINK     /path/to/kernel/buildperf/plugin_function.so
      
      This is caused by tools/perf/util/intel-pt-decoder/Build that, it tries
      to generate $(OUTPUT)util/intel-pt-decoder/inat-tables.c atomatically
      but forget to ensure the existance of $(OUTPUT)util/intel-pt-decoder
      directory.
      
      This patch fixes it by adding $(call rule_mkdir) like other similar rules.
      Signed-off-by: default avatarWang Nan <wangnan0@huawei.com>
      Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
      Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
      Cc: Zefan Li <lizefan@huawei.com>
      Cc: pi3orama@163.com
      Link: http://lkml.kernel.org/r/1441087005-107540-1-git-send-email-wangnan0@huawei.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      04aa90b5
    • Wang Nan's avatar
      perf dwarf: Fix potential array out of bounds access · 3b27d139
      Wang Nan authored
      There is a problem in the dwarf-regs.c files for sh, sparc and x86 where
      it is possible to make an out-of-bounds array access when searching for
      register names.
      
      This patch fixes it by replacing '<=' to '<', so when register (number
      == XXX_MAX_REGS), get_arch_regstr() will return NULL.
      Signed-off-by: default avatarWang Nan <wangnan0@huawei.com>
      Reviewed-by: default avatarMatt Fleming <matt@console-pimps.org>
      Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
      Acked-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
      Cc: David S. Miller <davem@davemloft.net>
      Cc: Zefan Li <lizefan@huawei.com>
      Cc: pi3orama@huawei.com
      Link: http://lkml.kernel.org/r/1441078184-105038-1-git-send-email-wangnan0@huawei.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      3b27d139
    • Ingo Molnar's avatar
      Merge tag 'perf-core-for-mingo' of... · 53202661
      Ingo Molnar authored
      Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
      
      Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
      
      User visible changes:
      
        - Add ability to specify to select which registers to record,
          to reduce the size of perf.data files, and also allow printing
          the registers in 'perf script': (Stephane Eranian)
      
            # perf record --intr-regs=AX,SP usleep 1
            [ perf record: Woken up 1 times to write data ]
            [ perf record: Captured and wrote 0.016 MB perf.data (8 samples) ]
            # perf script -F ip,sym,iregs | tail -5
             ffffffff8105f42a native_write_msr_safe   AX:0xf    SP:0xffff8802629c3c00
             ffffffff8105f42a native_write_msr_safe   AX:0xf    SP:0xffff8802629c3c00
             ffffffff81761ac0 _raw_spin_lock   AX:0xffff8801bfcf8020    SP:0xffff8802629c3ce8
             ffffffff81202bf8 __vma_adjust_trans_huge   AX:0x7ffc75200000    SP:0xffff8802629c3b30
             ffffffff8122b089 dput   AX:0x101    SP:0xffff8802629c3c78
            #
      
      Infrastructure changes:
      
        - Open event on evsel cpus and threads. (Kan Liang)
      
        - Add new bpf API to get name from a BPF object. (Wang Nan)
      
      Build fixes:
      
        - Fix build on powerpc broken by pt/bts. (Adrian Hunter)
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      53202661
    • Linus Torvalds's avatar
      Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 65a99597
      Linus Torvalds authored
      Pull NOHZ updates from Ingo Molnar:
       "The main changes, mostly written by Frederic Weisbecker, include:
      
         - Fix some jiffies based cputime assumptions.  (No real harm because
           the concerned code isn't used by full dynticks.)
      
         - Simplify jiffies <-> usecs conversions.  Remove dead code.
      
         - Remove early hacks on nohz full code that avoided messing up idle
           nohz internals.  Now nohz integrates well full and idle and such
           hack have become needless.
      
         - Restart nohz full tick from irq exit.  (A simplification and a
           preparation for future optimization on scheduler kick to nohz
           full)
      
         - Code cleanups.
      
         - Tile driver isolation enhancement on top of nohz.  (Chris Metcalf)"
      
      * 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        nohz: Remove useless argument on tick_nohz_task_switch()
        nohz: Move tick_nohz_restart_sched_tick() above its users
        nohz: Restart nohz full tick from irq exit
        nohz: Remove idle task special case
        nohz: Prevent tilegx network driver interrupts
        alpha: Fix jiffies based cputime assumption
        apm32: Fix cputime == jiffies assumption
        jiffies: Remove HZ > USEC_PER_SEC special case
      65a99597
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 418c2e1f
      Linus Torvalds authored
      Pull scheduler fix from Ingo Molnar:
       "This is a leftover scheduler fix from the v4.2 cycle"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched: Fix cpu_active_mask/cpu_online_mask race
      418c2e1f
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a1d85611
      Linus Torvalds authored
      Pull scheduler updates from Ingo Molnar:
       "The biggest change in this cycle is the rewrite of the main SMP load
        balancing metric: the CPU load/utilization.  The main goal was to make
        the metric more precise and more representative - see the changelog of
        this commit for the gory details:
      
          9d89c257 ("sched/fair: Rewrite runnable load and utilization average tracking")
      
        It is done in a way that significantly reduces complexity of the code:
      
          5 files changed, 249 insertions(+), 494 deletions(-)
      
        and the performance testing results are encouraging.  Nevertheless we
        need to keep an eye on potential regressions, since this potentially
        affects every SMP workload in existence.
      
        This work comes from Yuyang Du.
      
        Other changes:
      
         - SCHED_DL updates.  (Andrea Parri)
      
         - Simplify architecture callbacks by removing finish_arch_switch().
           (Peter Zijlstra et al)
      
         - cputime accounting: guarantee stime + utime == rtime.  (Peter
           Zijlstra)
      
         - optimize idle CPU wakeups some more - inspired by Facebook server
           loads.  (Mike Galbraith)
      
         - stop_machine fixes and updates.  (Oleg Nesterov)
      
         - Introduce the 'trace_sched_waking' tracepoint.  (Peter Zijlstra)
      
         - sched/numa tweaks.  (Srikar Dronamraju)
      
         - misc fixes and small cleanups"
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (44 commits)
        sched/deadline: Fix comment in enqueue_task_dl()
        sched/deadline: Fix comment in push_dl_tasks()
        sched: Change the sched_class::set_cpus_allowed() calling context
        sched: Make sched_class::set_cpus_allowed() unconditional
        sched: Fix a race between __kthread_bind() and sched_setaffinity()
        sched: Ensure a task has a non-normalized vruntime when returning back to CFS
        sched/numa: Fix NUMA_DIRECT topology identification
        tile: Reorganize _switch_to()
        sched, sparc32: Update scheduler comments in copy_thread()
        sched: Remove finish_arch_switch()
        sched, tile: Remove finish_arch_switch
        sched, sh: Fold finish_arch_switch() into switch_to()
        sched, score: Remove finish_arch_switch()
        sched, avr32: Remove finish_arch_switch()
        sched, MIPS: Get rid of finish_arch_switch()
        sched, arm: Remove finish_arch_switch()
        sched/fair: Clean up load average references
        sched/fair: Provide runnable_load_avg back to cfs_rq
        sched/fair: Remove task and group entity load when they are dead
        sched/fair: Init cfs_rq's sched_entity load average
        ...
      a1d85611
    • Linus Torvalds's avatar
      Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3959df1d
      Linus Torvalds authored
      Pull RAS updates from Ingo Molnar:
       "MCE handling updates, but also some generic drivers/edac/ changes to
        better organize the Kconfig space"
      
      * 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/ras: Move AMD MCE injector to arch/x86/ras/
        x86/mce: Add a wrapper around mce_log() for injection
        x86/mce: Rename rcu_dereference_check_mce() to mce_log_get_idx_check()
        RAS: Add a menuconfig option with descriptive text
        x86/mce: Reenable CMCI banks when swiching back to interrupt mode
        x86/mce: Clear Local MCE opt-in before kexec
        x86/mce: Remove unused function declarations
        x86/mce: Kill drain_mcelog_buffer()
        x86/mce: Avoid potential deadlock due to printk() in MCE context
        x86/mce: Remove the MCE ring for Action Optional errors
        x86/mce: Don't use percpu workqueues
        x86/mce: Provide a lockless memory pool to save error records
        x86/mce: Reuse one of the u16 padding fields in 'struct mce'
      3959df1d
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 41d859a8
      Linus Torvalds authored
      Pull perf updates from Ingo Molnar:
       "Main perf kernel side changes:
      
         - uprobes updates/fixes.  (Oleg Nesterov)
      
         - Add PERF_RECORD_SWITCH to indicate context switches and use it in
           tooling.  (Adrian Hunter)
      
         - Support BPF programs attached to uprobes and first steps for BPF
           tooling support.  (Wang Nan)
      
         - x86 generic x86 MSR-to-perf PMU driver.  (Andy Lutomirski)
      
         - x86 Intel PT, LBR and BTS updates.  (Alexander Shishkin)
      
         - x86 Intel Skylake support.  (Andi Kleen)
      
         - x86 Intel Knights Landing (KNL) RAPL support.  (Dasaratharaman
           Chandramouli)
      
         - x86 Intel Broadwell-DE uncore support.  (Kan Liang)
      
         - x86 hw breakpoints robustization (Andy Lutomirski)
      
        Main perf tooling side changes:
      
         - Support Intel PT in several tools, enabling the use of the
           processor trace feature introduced in Intel Broadwell processors:
           (Adrian Hunter)
      
             # dmesg | grep Performance
             # [0.188477] Performance Events: PEBS fmt2+, 16-deep LBR, Broadwell events, full-width counters, Intel PMU driver.
             # perf record -e intel_pt//u -a sleep 1
             [ perf record: Woken up 1 times to write data ]
             [ perf record: Captured and wrote 0.216 MB perf.data ]
             # perf script # then navigate in the tool output to some area, like this one:
             184 1030 dl_main (/usr/lib64/ld-2.17.so) => 7f21ba661440 dl_main (/usr/lib64/ld-2.17.so)
             185 1457 dl_main (/usr/lib64/ld-2.17.so) => 7f21ba669f10 _dl_new_object (/usr/lib64/ld-2.17.so)
             186 9f37 _dl_new_object (/usr/lib64/ld-2.17.so) => 7f21ba677b90 strlen (/usr/lib64/ld-2.17.so)
             187 7ba3 strlen (/usr/lib64/ld-2.17.so) => 7f21ba677c75 strlen (/usr/lib64/ld-2.17.so)
             188 7c78 strlen (/usr/lib64/ld-2.17.so) => 7f21ba669f3c _dl_new_object (/usr/lib64/ld-2.17.so)
             189 9f8a _dl_new_object (/usr/lib64/ld-2.17.so) => 7f21ba65fab0 calloc@plt (/usr/lib64/ld-2.17.so)
             190 fab0 calloc@plt (/usr/lib64/ld-2.17.so) => 7f21ba675e70 calloc (/usr/lib64/ld-2.17.so)
             191 5e87 calloc (/usr/lib64/ld-2.17.so) => 7f21ba65fa90 malloc@plt (/usr/lib64/ld-2.17.so)
             192 fa90 malloc@plt (/usr/lib64/ld-2.17.so) => 7f21ba675e60 malloc (/usr/lib64/ld-2.17.so)
             193 5e68 malloc (/usr/lib64/ld-2.17.so) => 7f21ba65fa80 __libc_memalign@plt (/usr/lib64/ld-2.17.so)
             194 fa80 __libc_memalign@plt (/usr/lib64/ld-2.17.so) => 7f21ba675d50 __libc_memalign (/usr/lib64/ld-2.17.so)
             195 5d63 __libc_memalign (/usr/lib64/ld-2.17.so) => 7f21ba675e20 __libc_memalign (/usr/lib64/ld-2.17.so)
             196 5e40 __libc_memalign (/usr/lib64/ld-2.17.so) => 7f21ba675d73 __libc_memalign (/usr/lib64/ld-2.17.so)
             197 5d97 __libc_memalign (/usr/lib64/ld-2.17.so) => 7f21ba675e18 __libc_memalign (/usr/lib64/ld-2.17.so)
             198 5e1e __libc_memalign (/usr/lib64/ld-2.17.so) => 7f21ba675df9 __libc_memalign (/usr/lib64/ld-2.17.so)
             199 5e10 __libc_memalign (/usr/lib64/ld-2.17.so) => 7f21ba669f8f _dl_new_object (/usr/lib64/ld-2.17.so)
             200 9fc2 _dl_new_object (/usr/lib64/ld-2.17.so) =>  7f21ba678e70 memcpy (/usr/lib64/ld-2.17.so)
             201 8e8c memcpy (/usr/lib64/ld-2.17.so) => 7f21ba678ea0 memcpy (/usr/lib64/ld-2.17.so)
      
         - Add support for using several Intel PT features (CYC, MTC packets),
           the relevant documentation was updated in:
               tools/perf/Documentation/intel-pt.txt
           briefly describing those packets, its purposes, how to configure
           them in the event config terms and relevant external documentation
           for further reading.  (Adrian Hunter)
      
         - Introduce support for probing at an absolute address, for user and
           kernel 'perf probe's, useful when one have the symbol maps on a
           developer machine but not on an embedded system.  (Wang Nan)
      
         - Add Intel BTS support, with a call-graph script to show it and PT
           in use in a GUI using 'perf script' python scripting with
           postgresql and Qt.  (Adrian Hunter)
      
         - Allow selecting the type of callchains per event, including
           disabling callchains in all but one entry in an event list, to save
           space, and also to ask for the callchains collected in one event to
           be used in other events.  (Kan Liang)
      
         - Beautify more syscall arguments in 'perf trace': (Arnaldo Carvalho
           de Melo)
             * A bunch more translate file/pathnames from pointers to strings.
             * Convert numbers to strings for the 'keyctl' syscall 'option'
               arg.
             * Add missing 'clockid' entries.
      
         - Introduce 'srcfile' sort key: (Andi Kleen)
      
             # perf record -F 10000 usleep 1
             # perf report --stdio --dsos '[kernel.vmlinux]' -s srcfile
             <SNIP>
             # Overhead  Source File
                26.49%  copy_page_64.S
                 5.49%  signal.c
                 0.51%  msr.h
             #
      
           It can be combined with other fields, for instance, experiment with
           '-s srcfile,symbol'.
      
           There are some oddities in some distros and with some specific
           DSOs, being investigated, so your mileage may vary.
      
         - Support per-event 'freq' term: (Namhyung Kim)
      
             $ perf record -e 'cpu/instructions,freq=1234/',cycles -c 1000 sleep 1
             $ perf evlist -F
             cpu/instructions,freq=1234/: sample_freq=1234
             cycles: sample_period=1000
             $
      
         - Deref sys_enter pointer args with contents from probe:vfs_getname,
           showing pathnames instead of pointers in many syscalls in 'perf
           trace'.  (Arnaldo Carvalho de Melo)
      
         - Stop collecting /proc/kallsyms in perf.data files, saving about
           4.5MB on a typical x86-64 system, use the the symbol resolution
           routines used in all the other tools (report, top, etc) now that we
           can ask libtraceevent to use perf's symbol resolution code.
           (Arnaldo Carvalho de Melo)
      
         - Allow filtering out of perf's PID via 'perf record --exclude-perf'.
           (Wang Nan)
      
         - 'perf trace' now supports syscall groups, like strace, i.e:
      
             $ trace -e file touch file
      
           Will expand 'file' into multiple, file related, syscalls.  More
           work needed to add extra groups for other syscall groups, and also
           to complement what was added for the 'file' group, included as a
           proof of concept.  (Arnaldo Carvalho de Melo)
      
         - Add lock_pi stresser to 'perf bench futex', to test the kernel code
           related to FUTEX_(UN)LOCK_PI.  (Davidlohr Bueso)
      
         - Let user have timestamps with per-thread recording in 'perf record'
           (Adrian Hunter)
      
         - ... and tons of other changes, see the shortlog and the Git log for
           details"
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (240 commits)
        perf evlist: Add backpointer for perf_env to evlist
        perf tools: Rename perf_session_env to perf_env
        perf tools: Do not change lib/api/fs/debugfs directly
        perf tools: Add tracing_path and remove unneeded functions
        perf buildid: Introduce sysfs/filename__sprintf_build_id
        perf evsel: Add a backpointer to the evlist a evsel is in
        perf trace: Add header with copyright and background info
        perf scripts python: Add new compaction-times script
        perf stat: Get correct cpu id for print_aggr
        tools lib traceeveent: Allow for negative numbers in print format
        perf script: Add --[no-]-demangle/--[no-]-demangle-kernel
        tracing/uprobes: Do not print '0x (null)' when offset is 0
        perf probe: Support probing at absolute address
        perf probe: Fix error reported when offset without function
        perf probe: Fix list result when address is zero
        perf probe: Fix list result when symbol can't be found
        tools build: Allow duplicate objects in the object list
        perf tools: Remove export.h from MANIFEST
        perf probe: Prevent segfault when reading probe point with absolute address
        perf tools: Update Intel PT documentation
        ...
      41d859a8
    • Linus Torvalds's avatar
      Merge branch 'mm-kasan-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 46580009
      Linus Torvalds authored
      Pull x86/kasan changes from Ingo Molnar:
       "These are two KASAN changes that factor out (and generalize) x86
        specific KASAN code from x86 to mm"
      
      * 'mm-kasan-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/kasan, mm: Introduce generic kasan_populate_zero_shadow()
        x86/kasan: Define KASAN_SHADOW_OFFSET per architecture
      46580009
    • Linus Torvalds's avatar
      Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e10994ff
      Linus Torvalds authored
      Pull liblockdep fixes from Ingo Molnar:
       "Three liblockdep fixes left over from the v4.2 cycle"
      
      * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        tools/liblockdep: Use the rbtree header provided by common tools headers
        tools/liblockdep: Correct macro for WARN
        tools: Restore export.h
      e10994ff
    • Linus Torvalds's avatar
      Merge branch 'core-types-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5757bd61
      Linus Torvalds authored
      Pull inlining tuning from Ingo Molnar:
       "A handful of inlining optimizations inspired by x86 work but
        applicable in general"
      
      * 'core-types-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        jiffies: Force inlining of {m,u}msecs_to_jiffies()
        x86/hweight: Force inlining of __arch_hweight{32,64}()
        linux/bitmap: Force inlining of bitmap weight functions
      5757bd61
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7073bc66
      Linus Torvalds authored
      Pull RCU updates from Ingo Molnar:
       "The main RCU changes in this cycle are:
      
         - the combination of tree geometry-initialization simplifications and
           OS-jitter-reduction changes to expedited grace periods.  These two
           are stacked due to the large number of conflicts that would
           otherwise result.
      
         - privatize smp_mb__after_unlock_lock().
      
           This commit moves the definition of smp_mb__after_unlock_lock() to
           kernel/rcu/tree.h, in recognition of the fact that RCU is the only
           thing using this, that nothing else is likely to use it, and that
           it is likely to go away completely.
      
         - documentation updates.
      
         - torture-test updates.
      
         - misc fixes"
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (60 commits)
        rcu,locking: Privatize smp_mb__after_unlock_lock()
        rcu: Silence lockdep false positive for expedited grace periods
        rcu: Don't disable CPU hotplug during OOM notifiers
        scripts: Make checkpatch.pl warn on expedited RCU grace periods
        rcu: Update MAINTAINERS entry
        rcu: Clarify CONFIG_RCU_EQS_DEBUG help text
        rcu: Fix backwards RCU_LOCKDEP_WARN() in synchronize_rcu_tasks()
        rcu: Rename rcu_lockdep_assert() to RCU_LOCKDEP_WARN()
        rcu: Make rcu_is_watching() really notrace
        cpu: Wait for RCU grace periods concurrently
        rcu: Create a synchronize_rcu_mult()
        rcu: Fix obsolete priority-boosting comment
        rcu: Use WRITE_ONCE in RCU_INIT_POINTER
        rcu: Hide RCU_NOCB_CPU behind RCU_EXPERT
        rcu: Add RCU-sched flavors of get-state and cond-sync
        rcu: Add fastpath bypassing funnel locking
        rcu: Rename RCU_GP_DONE_FQS to RCU_GP_DOING_FQS
        rcu: Pull out wait_event*() condition into helper function
        documentation: Describe new expedited stall warnings
        rcu: Add stall warnings to synchronize_sched_expedited()
        ...
      7073bc66
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · d4c90396
      Linus Torvalds authored
      Pull crypto updates from Herbert Xu:
       "Here is the crypto update for 4.3:
      
        API:
      
         - the AEAD interface transition is now complete.
         - add top-level skcipher interface.
      
        Drivers:
      
         - x86-64 acceleration for chacha20/poly1305.
         - add sunxi-ss Allwinner Security System crypto accelerator.
         - add RSA algorithm to qat driver.
         - add SRIOV support to qat driver.
         - add LS1021A support to caam.
         - add i.MX6 support to caam"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (163 commits)
        crypto: algif_aead - fix for multiple operations on AF_ALG sockets
        crypto: qat - enable legacy VFs
        MPI: Fix mpi_read_buffer
        crypto: qat - silence a static checker warning
        crypto: vmx - Fixing opcode issue
        crypto: caam - Use the preferred style for memory allocations
        crypto: caam - Propagate the real error code in caam_probe
        crypto: caam - Fix the error handling in caam_probe
        crypto: caam - fix writing to JQCR_MS when using service interface
        crypto: hash - Add AHASH_REQUEST_ON_STACK
        crypto: testmgr - Use new skcipher interface
        crypto: skcipher - Add top-level skcipher interface
        crypto: cmac - allow usage in FIPS mode
        crypto: sahara - Use dmam_alloc_coherent
        crypto: caam - Add support for LS1021A
        crypto: qat - Don't move data inside output buffer
        crypto: vmx - Fixing GHASH Key issue on little endian
        crypto: vmx - Fixing AES-CTR counter bug
        crypto: null - Add missing Kconfig tristate for NULL2
        crypto: nx - Add forward declaration for struct crypto_aead
        ...
      d4c90396
    • Linus Torvalds's avatar
      Merge tag 'clk-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · f36fc04e
      Linus Torvalds authored
      Pull clk updates from Michael Turquette:
       "The clk framework changes for 4.3 are mostly updates to existing
        drivers and the addition of new clock drivers.  Stephen Boyd has also
        done a lot of subsystem-wide driver clean-ups (thanks!).  There are
        also fixes to the framework core and changes to better split clock
        provider drivers from clock consumer drivers"
      
      * tag 'clk-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (227 commits)
        clk: s5pv210: add missing call to samsung_clk_of_add_provider()
        clk: pistachio: correct critical clock list
        clk: pistachio: Fix PLL rate calculation in integer mode
        clk: pistachio: Fix override of clk-pll settings from boot loader
        clk: pistachio: Fix 32bit integer overflows
        clk: tegra: Fix some static checker problems
        clk: qcom: Fix MSM8916 prng clock enable bit
        clk: Add missing header for 'bool' definition to clk-conf.h
        drivers/clk: appropriate __init annotation for const data
        clk: rockchip: register pll mux before pll itself
        clk: add bindings for the Ux500 clocks
        clk/ARM: move Ux500 PRCC bases to the device tree
        clk: remove duplicated code with __clk_set_parent_after
        clk: Convert __clk_get_name(hw->clk) to clk_hw_get_name(hw)
        clk: Constify clk_hw argument to provider APIs
        clk: Hi6220: add stub clock driver
        dt-bindings: clk: Hi6220: Document stub clock driver
        dt-bindings: arm: Hi6220: add doc for SRAM controller
        clk: atlas7: fix pll missed divide NR in fraction mode
        clk: atlas7: fix bit field and its root clk for coresight_tpiu
        ...
      f36fc04e
    • Linus Torvalds's avatar
      Merge tag 'pci-v4.3-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 26f8b7ed
      Linus Torvalds authored
      Pull PCI updates from Bjorn Helgaas:
       "PCI changes for the v4.3 merge window:
      
        Enumeration:
         - Allocate ATS struct during enumeration (Bjorn Helgaas)
         - Embed ATS info directly into struct pci_dev (Bjorn Helgaas)
         - Reduce size of ATS structure elements (Bjorn Helgaas)
         - Stop caching ATS Invalidate Queue Depth (Bjorn Helgaas)
         - iommu/vt-d: Cache PCI ATS state and Invalidate Queue Depth (Bjorn Helgaas)
         - Move MPS configuration check to pci_configure_device() (Bjorn Helgaas)
         - Set MPS to match upstream bridge (Keith Busch)
         - ARM/PCI: Set MPS before pci_bus_add_devices() (Murali Karicheri)
         - Add pci_scan_root_bus_msi() (Lorenzo Pieralisi)
         - ARM/PCI, designware, xilinx: Use pci_scan_root_bus_msi() (Lorenzo Pieralisi)
      
        Resource management:
         - Call pci_read_bridge_bases() from core instead of arch code (Lorenzo Pieralisi)
      
        PCI device hotplug:
         - pciehp: Remove unused interrupt events (Bjorn Helgaas)
         - pciehp: Remove ignored MRL sensor interrupt events (Bjorn Helgaas)
         - pciehp: Handle invalid data when reading from non-existent devices (Jarod Wilson)
         - pciehp: Simplify pcie_poll_cmd() (Yijing Wang)
         - Use "slot" and "pci_slot" for struct hotplug_slot and struct pci_slot (Yijing Wang)
         - Protect pci_bus->slots with pci_slot_mutex, not pci_bus_sem (Yijing Wang)
         - Hold pci_slot_mutex while searching bus->slots list (Yijing Wang)
      
        Power management:
         - Disable async suspend/resume for JMicron multi-function SATA/AHCI (Zhang Rui)
      
        Virtualization:
         - Add ACS quirks for Intel I219-LM/V (Alex Williamson)
         - Restore ACS configuration as part of pci_restore_state() (Alexander Duyck)
      
        MSI:
         - Add pcibios_alloc_irq() and pcibios_free_irq() (Jiang Liu)
         - x86: Implement pcibios_alloc_irq() and pcibios_free_irq() (Jiang Liu)
         - Add helpers to manage pci_dev->irq and pci_dev->irq_managed (Jiang Liu)
         - Free legacy IRQ when enabling MSI/MSI-X (Jiang Liu)
         - ARM/PCI: Remove msi_controller from struct pci_sys_data (Lorenzo Pieralisi)
         - Remove unused pcibios_msi_controller() hook (Lorenzo Pieralisi)
      
        Generic host bridge driver:
         - Remove dependency on ARM-specific struct hw_pci (Jayachandran C)
         - Build setup-irq.o for arm64 (Jayachandran C)
         - Add arm64 support (Jayachandran C)
      
        APM X-Gene host bridge driver:
         - Add APM X-Gene PCIe 64-bit prefetchable window (Duc Dang)
         - Add support for a 64-bit prefetchable memory window (Duc Dang)
         - Drop owner assignment from platform_driver (Krzysztof Kozlowski)
      
        Broadcom iProc host bridge driver:
         - Allow BCMA bus driver to be built as module (Hauke Mehrtens)
         - Delete unnecessary checks before phy calls (Markus Elfring)
         - Add arm64 support (Ray Jui)
      
        Synopsys DesignWare host bridge driver:
         - Don't complain missing *config* reg space if va_cfg0 is set (Murali Karicheri)
      
        TI DRA7xx host bridge driver:
         - Disable pm_runtime on get_sync failure (Kishon Vijay Abraham I)
         - Add PM support (Kishon Vijay Abraham I)
         - Clear MSE bit during suspend so clocks will idle (Kishon Vijay Abraham I)
         - Add support to make GPIO drive PERST# line (Kishon Vijay Abraham I)
      
        Xilinx AXI host bridge driver:
         - Check for MSI interrupt flag before handling as INTx (Russell Joyce)
      
        Miscellaneous:
         - Fix Intersil/Techwell TW686[4589] AV capture class code (Krzysztof Hałasa)
         - Use PCI_CLASS_SERIAL_USB instead of bare number (Bjorn Helgaas)
         - Fix generic NCR 53c810 class code quirk (Bjorn Helgaas)
         - Fix TI816X class code quirk (Bjorn Helgaas)
         - Remove unused "pci_probe" flags (Bjorn Helgaas)
         - Host bridge driver code simplifications (Fabio Estevam)
         - Add dev_flags bit to access VPD through function 0 (Mark Rustad)
         - Add VPD function 0 quirk for Intel Ethernet devices (Mark Rustad)
         - Kill off set_irq_flags() usage (Rob Herring)
         - Remove Intel Cherrytrail D3 delays (Srinidhi Kasagar)
         - Clean up pci_find_capability() (Wei Yang)"
      
      * tag 'pci-v4.3-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (72 commits)
        PCI: Disable async suspend/resume for JMicron multi-function SATA/AHCI
        PCI: Set MPS to match upstream bridge
        PCI: Move MPS configuration check to pci_configure_device()
        PCI: Drop references acquired by of_parse_phandle()
        PCI/MSI: Remove unused pcibios_msi_controller() hook
        ARM/PCI: Remove msi_controller from struct pci_sys_data
        ARM/PCI, designware, xilinx: Use pci_scan_root_bus_msi()
        PCI: Add pci_scan_root_bus_msi()
        ARM/PCI: Replace panic with WARN messages on failures
        PCI: generic: Add arm64 support
        PCI: Build setup-irq.o for arm64
        PCI: generic: Remove dependency on ARM-specific struct hw_pci
        PCI: imx6: Simplify a trivial if-return sequence
        PCI: spear: Use BUG_ON() instead of condition followed by BUG()
        PCI: dra7xx: Remove unneeded use of IS_ERR_VALUE()
        PCI: Remove pci_ats_enabled()
        PCI: Stop caching ATS Invalidate Queue Depth
        PCI: Move ATS declarations to linux/pci.h so they're all together
        PCI: Clean up ATS error handling
        PCI: Use pci_physfn() rather than looking up physfn by hand
        ...
      26f8b7ed
    • Linus Torvalds's avatar
      Merge tag 'leds_for_4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds · edc837da
      Linus Torvalds authored
      Pull LED updates from Jacek Anaszewski:
       "In this merge window we'd like to announce a change on the list of LED
        subsystem maintainers - Bryan Wu decided to step back and handed over
        the maintainership to me (Jacek Anaszewski), which entailed an update
        of LED subsystem git tree URL.
      
        Besides the changes in MAINTAINERS we have:
      
         - optimizations and improvements to existing LED class drivers
      
         - improvements to the common LEDs DT documentation
      
         - modifications of kirkwood-* dts files, to be in sync with patches
           for leds-ns2 driver, that move LEDs mode mapping outside of the
           driver"
      
      * tag 'leds_for_4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
        leds: Export OF module alias information in missing drivers
        leds:lp55xx: use the private data instead of updating I2C device platform data
        leds: syscon: Correct check for syscon_node_to_regmap() errors
        leds: leds-fsg: Use devm_led_classdev_register
        MAINTAINERS: Change LED subsystem git tree URL
        leds/led-class: Add missing put_device()
        ARM: Kirkwood: add modes-map property to ns2-leds nodes
        leds: tlc591xx: Remove redundant I2C_FUNC_SMBUS_BYTE_DATA functionality check
        leds: leds-ns2: depends on MACH_ARMADA_370
        leds: leds-ns2: handle can_sleep GPIOs
        leds: leds-ns2: move LED modes mapping outside of the driver
        leds: lp8860: Constify reg_default tables
        leds: Drop owner assignment from i2c_driver
        leds: Allow compile test of LEDS_AAT1290 and LEDS_KTD2692 if !GPIOLIB
        leds: Allow compile test of GPIO consumers if !GPIOLIB
        DT: leds: Improve description of flash LEDs related properties
      edc837da
  8. 31 Aug, 2015 8 commits
    • Linus Torvalds's avatar
      Merge tag 'spi-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · e5aeced6
      Linus Torvalds authored
      Pull spi updates from Mark Brown:
       "A few core tweaks this time together with the usual collection of
        driver specific updates and fixes plus a larger than average selection
        of new device support:
      
         - fix DMA mapping of unaligned vmalloc() buffers
      
         - statistics tracking transfer volumes exposed via sysfs
      
         - new drivers for Freescale MPC5125, Intel Sunrise Point, Mediatek
           SoCs, and Netlogic XLP SoCs"
      
      * tag 'spi-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (66 commits)
        spi: sh-msiof: Fix FIFO size to 64 word from 256 word
        spi: fsl-(e)spi: Fix checking return value of devm_ioremap_resource
        spi: Add DT bindings documentation for Netlogic XLP SPI controller
        spi/xlp: SPI controller driver for Netlogic XLP SoCs
        spi: fsl-espi: add runtime PM
        spi: fsl-(e)spi: simplify cleanup code
        spi: fsl-(e)spi: migrate to using devm_ functions to simplify cleanup
        spi: mediatek: fix SPI_CMD_PAUSE_IE macro error
        spi: check bits_per_word in spi_setup
        spi: mediatek: replace *_time name
        spi: mediatek: add PM clk_prepare_enable fail flow
        spi: mediatek: replace int with u32, delete TAB and define MTK_SPI_PAUSE_INT_STATUS marco
        spi: mediatek: add linux/io.h include file
        spi/bcm63xx-hsspi: add support for dual spi read/write
        spi: dw: Allow interface drivers to limit data I/O to word sizes
        dt: snps,dw-apb-ssi: Document new I/O data register width property
        spi: Fall back to master maximum speed if no slave speed specified
        spi: mediatek: use BIT() to instead of SPI_CMD_*_OFFSET
        spi: medaitek: revise quirks compatibility style
        spi: mediatek: fix spi incorrect endian usage
        ...
      e5aeced6
    • Linus Torvalds's avatar
      Merge tag 'regulator-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · cf9d615f
      Linus Torvalds authored
      Pull regulator updates from Mark Brown:
       "The biggest changes in the core this time around have been some
        refactorings that move us towards being able to drop the list of
        regulators maintained by the core and instead just use the driver
        model list maintained for the class devices for regulators which will
        make the code smaller and avoid some potential bugs.
      
        Otherwise another fairly quiet release for the regulator API,
        highlights include:
      
         - a new API for setting voltages based on a minimum, target, maximum
           triplet
      
         - support for continuous voltage ranges rather than tables of
           explicit steps in the PWM regulator, requiring less explicit
           configuration
      
         - new driver support for Dialog DA9215, Maxim 77843, Mediatek MT6311
           and Qualcomm RPM"
      
      * tag 'regulator-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (70 commits)
        regulator: mt6311: fix platform_no_drv_owner.cocci warnings
        regulator: ltc3589: Remove unnecessary MODULE_ALIAS()
        regulator: ad5398: Remove unnecessary MODULE_ALIAS()
        regulator: pfuze100: Remove unnecessary MODULE_ALIAS()
        regulator: core: use debug level print in regulator_check_drms
        regulator: lp872x: handle error case
        regulator: lp872x: use the private data instead of updating I2C device platform data
        regulator: isl9305: Export OF module alias information
        regulators: max77693: register driver earlier to avoid deferred probe
        regulator: qcom_smd: Set n_voltages for pm8941_lnldo
        regulator: core: Use IS_ERR_OR_NULL()
        regulator: core: Define regulator_set_voltage_triplet()
        regulator: Regulator driver for the Qualcomm RPM
        regulator: pbias: Fix broken pbias disable functionality
        regulator: core: Spelling fix
        regulator: core: Use class device list for regulator_list in late init
        regulator: core: Move more deallocation into class unregister
        regulator: core: Reduce rdev locking region when releasing regulator
        Input: Remove the max77843 haptic driver
        Input: max77693: Add support for Maxim 77843
        ...
      cf9d615f
    • Linus Torvalds's avatar
      Merge tag 'docs-for-linus' of git://git.lwn.net/linux-2.6 · e2701603
      Linus Torvalds authored
      Pull documentation updates from Jonathan Corbet:
       "There's been a fair amount going on in the docs tree this time around,
        including:
      
         - Support for reproducible document builds, from Ben Hutchings and
           company.
      
         - The ability to automatically generate cross-reference links within
           a single DocBook book and embedded descriptions for large
           structures.  From Danilo Cesar Lemes de Paula.
      
         - A new document on how to add a system call from David Drysdale.
      
         - Chameleon bus documentation from Johannes Thumshirn.
      
        ...plus the usual collection of improvements, typo fixes, and more"
      
      * tag 'docs-for-linus' of git://git.lwn.net/linux-2.6: (39 commits)
        Documentation, add kernel-parameters.txt entry for dis_ucode_ldr
        Documentation/x86: Rename IRQSTACKSIZE to IRQ_STACK_SIZE
        Documentation/Intel-IOMMU.txt: Modify definition of DRHD
        docs: update HOWTO for 3.x -> 4.x versioning
        kernel-doc: ignore unneeded attribute information
        scripts/kernel-doc: Adding cross-reference links to html documentation.
        DocBook: Fix non-determinstic installation of duplicate man pages
        Documentation: minor typo fix in mailbox.txt
        Documentation: describe how to add a system call
        doc: Add more workqueue functions to the documentation
        ARM: keystone: add documentation for SoCs and EVMs
        scripts/kernel-doc Allow struct arguments documentation in struct body
        SubmittingPatches: remove stray quote character
        Revert "DocBook: Avoid building man pages repeatedly and inconsistently"
        Documentation: Minor changes to men-chameleon-bus.txt
        Doc: fix trivial typo in SubmittingPatches
        MAINTAINERS: Direct Documentation/DocBook/media properly
        Documentation: installed man pages don't need to be executable
        fix Evolution submenu name in email-clients.txt
        Documentation: Add MCB documentation
        ...
      e2701603
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus-v4.3' of... · 22629b6d
      Linus Torvalds authored
      Merge tag 'hwmon-for-linus-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon updates from Guenter Roeck:
       "Notable changes:
      
         - added support for LTM4675, LTC3886, LTC2980, LTM2987, LTC2975,
           LTC3887, LTC3882, MAX20751, ADM1293, and ADM1294 to PMBus drivers
         - added support for IT8732F to it87 driver
         - added support for AMD Carrizo to fam15h_power driver
         - added support for various new attributes to nct7802 driver
         - added support for F81866 and F71868 to f71882fg driver"
      
      * tag 'hwmon-for-linus-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (45 commits)
        hwmon: (fam15h_power) Add ratio of Tsample to the PTSC period
        hwmon: (fam15h_power) Add documentation for new processors support
        hwmon: (fam15h_power) Update running_avg_capture bit field to 28
        hwmon: (fam15h_power) Rename fam15h_power_is_internal_node0 function
        hwmon: (fam15h_power) Add support for AMD Carrizo
        hwmon: (ltc2978) Add support for LTM4675
        hwmon: (ltc2978) Add polling for chips requiring it
        hwmon: (pmbus) Enable PEC if the controller supports it
        hwmon: (pmbus) Use BIT macro
        hwmon: (ltc2978) Add support for LTC3886
        hwmon: (ltc2978) Add support for LTC2980 and LTM2987
        hwmon: (ltc2978) Add missing chip IDs for LTC2978 and LTC3882
        hwmon: (ltc2978) Use correct ID mask to detect all chips
        hwmon: (ltc2978) Introduce helper functions for min and max values
        hwmon: (ltc2978) Introduce feature flags
        hwmon: (pmbus) Convert command register definitions to enum
        hwmon: (ltc2978) Add support for LTC2975
        hwmon: (ltc2978) Add support for LTC3887
        hwmon: (ltc2978) Add additional chip IDs for LTM4676 and LTM4676A
        hwmon: (ltc2978) Add support for LTC3882
        ...
      22629b6d
    • Linus Torvalds's avatar
      Merge tag 'for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply · c8192ba4
      Linus Torvalds authored
      Pull power supply and reset changes from Sebastian Reichel:
       - new reset driver for ZTE SoCs
       - add support for sama5d3 reset handling
       - overhaul of twl4030 charger driver
       - misc fixes and cleanups
      
      * tag 'for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (35 commits)
        bq2415x_charger: Allow to load and use driver even if notify device is not registered yet
        twl4030_charger: fix compile error when TWL4030_MADC not available.
        power: bq24190_charger: Fix charge type sysfs property
        power: Allow compile test of GPIO consumers if !GPIOLIB
        power: Export I2C module alias information in missing drivers
        twl4030_charger: Increase current carefully while watching voltage.
        twl4030_charger: add ac/mode to match usb/mode
        twl4030_charger: add software controlled linear charging mode.
        twl4030_charger: enable manual enable/disable of usb charging.
        twl4030_charger: allow max_current to be managed via sysfs.
        twl4030_charger: distinguish between USB current and 'AC' current
        twl4030_charger: allow fine control of charger current.
        twl4030_charger: split uA calculation into a function.
        twl4030_charger: trust phy to determine when USB power is available.
        twl4030_charger: correctly handle -EPROBE_DEFER from devm_usb_get_phy_by_node
        twl4030_charger: convert to module_platform_driver instead of ..._probe.
        twl4030_charger: use runtime_pm to keep usb phy active while charging.
        rx51-battery: Set name to rx51-battery
        MAINTAINERS: AVS is not maintained via power supply tree
        power: olpc_battery: clean up eeprom read function
        ...
      c8192ba4
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 9c6a019c
      Linus Torvalds authored
      Pull s390 updates from Martin Schwidefsky:
       "The big one is support for fake NUMA, splitting a really large machine
        in more manageable piece improves performance in some cases, e.g. for
        a KVM host.
      
        The FICON Link Incident handling has been improved, this helps the
        operator to identify degraded or non-operational FICON connections.
      
        The save and restore of floating point and vector registers has been
        overhauled to allow the future use of vector registers in the kernel.
      
        A few small enhancement, magic sys-requests for the vt220 console via
        SCLP, some more assembler code has been converted to C, the PCI error
        handling is improved.
      
        And the usual cleanup and bug fixing"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (59 commits)
        s390/jump_label: Use %*ph to print small buffers
        s390/sclp_vt220: support magic sysrequests
        s390/ctrlchar: improve handling of magic sysrequests
        s390/numa: remove superfluous ARCH_WANT defines
        s390/3270: redraw screen on unsolicited device end
        s390/dcssblk: correct out of bounds array indexes
        s390/mm: simplify page table alloc/free code
        s390/pci: move debug messages to debugfs
        s390/nmi: initialize control register 0 earlier
        s390/zcrypt: use msleep() instead of mdelay()
        s390/hmcdrv: fix interrupt registration
        s390/setup: fix novx parameter
        s390/uaccess: remove uaccess_primary kernel parameter
        s390: remove unneeded sizeof(void *) comparisons
        s390/facilities: remove transactional-execution bits
        s390/numa: re-add DIE sched_domain_topology_level
        s390/dasd: enhance CUIR scope detection
        s390/dasd: fix failing path verification
        s390/vdso: emit a GNU hash
        s390/numa: make core to node mapping data dynamic
        ...
      9c6a019c
    • Linus Torvalds's avatar
      Merge tag 'xtensa-20150830' of git://github.com/czankel/xtensa-linux · 7c019191
      Linus Torvalds authored
      Pull xtensa updates from Chris Zankel:
       "Xtensa fixes and improvements for 4.3:
      
         - reimplement DMA API using common helpers
         - implement counting and sampling perf events using hardware perf
           counters
         - add fake NMI support for hardware perf counters
         - fix THREADPTR register reloading on return to userspace
         - keep exception/interrupt stack continuous for debugger
         - improve vmlinux.lds.S post-processing"
      
      * tag 'xtensa-20150830' of git://github.com/czankel/xtensa-linux:
        xtensa: improve vmlinux.lds.S sed post-processing
        xtensa: drop unused irq_err_count
        xtensa: implement fake NMI
        xtensa: don't touch EXC_TABLE_FIXUP in _switch_to
        xtensa: fix kernel register spilling
        xtensa: reorganize irq flags tracing
        perf tools: xtensa: add DWARF register names
        xtensa: implement counting and sampling perf events
        xtensa: count software page fault perf events
        xtensa: add profiling IRQ type to xtensa_irq_map
        xtensa: select PERF_USE_VMALLOC for cache-aliasing configurations
        xtensa: move oprofile stack tracing to stacktrace.c
        xtensa: keep exception/interrupt stack continuous
        xtensa: clean up Kconfig dependencies for custom cores
        xtensa: reimplement DMA API using common helpers
        xtensa: fix threadptr reload on return to userspace
        xtensa: ISS: add missing va_end into split_if_spec
      7c019191
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha · 7b8067d3
      Linus Torvalds authored
      Pull alpha update from Matt Turner:
       "A single patch for alpha, one that enables ARCH_USE_CMPXCHG_LOCKREF
        and offers around an 8% performance improvement on a little benchmark
        that you wrote"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
        alpha: select CONFIG_ARCH_USE_CMPXCHG_LOCKREF.
      7b8067d3