1. 25 Dec, 2016 18 commits
  2. 24 Dec, 2016 10 commits
    • Len Brown's avatar
      tools/power turbostat: remove obsolete -M, -m, -C, -c options · 6886fee4
      Len Brown authored
      The new --add option has replaced the -M, -m, -C, -c options
      Eg.
      
      -M 0x10 is now --add msr0x10,raw
      -m 0x10 is now --add msr0x10,raw,u32
      -C 0x10 is now --add msr0x10,delta
      -c 0x10 is now --add msr0x10,delta,u32
      
      The --add option can be repeated to add any number of counters,
      while the previous options were limited to adding one of each type.
      
      In addition, the --add option can accept a column label,
      and can also display a counter as a percentage of elapsed cycles.
      
      Eg. --add msr0x3fe,core,percent,MY_CC3
      Signed-off-by: default avatarLen Brown <len.brown@intel.com>
      6886fee4
    • Len Brown's avatar
      tools/power turbostat: Make extensible via the --add parameter · 388e9c81
      Len Brown authored
      Create the "--add" parameter.  This can be used to teach an existing
      turbostat binary about any number of any type of counter.
      
      turbostat(8) details the syntax for --add.
      Signed-off-by: default avatarLen Brown <len.brown@intel.com>
      388e9c81
    • Linus Torvalds's avatar
      Replace <asm/uaccess.h> with <linux/uaccess.h> globally · 7c0f6ba6
      Linus Torvalds authored
      This was entirely automated, using the script by Al:
      
        PATT='^[[:blank:]]*#[[:blank:]]*include[[:blank:]]*<asm/uaccess.h>'
        sed -i -e "s!$PATT!#include <linux/uaccess.h>!" \
              $(git grep -l "$PATT"|grep -v ^include/linux/uaccess.h)
      
      to do the replacement at the end of the merge window.
      Requested-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      7c0f6ba6
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 1dd5c6b1
      Linus Torvalds authored
      Pull cifs fixes from Steve French:
       "This ncludes various cifs/smb3 bug fixes, mostly for stable as well.
      
        In the next week I expect that Germano will have some reconnection
        fixes, and also I expect to have the remaining pieces of the snapshot
        enablement and SMB3 ACLs, but wanted to get this set of bug fixes in"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        cifs_get_root shouldn't use path with tree name
        Fix default behaviour for empty domains and add domainauto option
        cifs: use %16phN for formatting md5 sum
        cifs: Fix smbencrypt() to stop pointing a scatterlist at the stack
        CIFS: Fix a possible double locking of mutex during reconnect
        CIFS: Fix a possible memory corruption during reconnect
        CIFS: Fix a possible memory corruption in push locks
        CIFS: Fix missing nls unload in smb2_reconnect()
        CIFS: Decrease verbosity of ioctl call
        SMB3: parsing for new snapshot timestamp mount parm
      1dd5c6b1
    • Linus Torvalds's avatar
      Merge tag 'watchdog-for-linus-v4.10' of... · 3a77fa85
      Linus Torvalds authored
      Merge tag 'watchdog-for-linus-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull watchdog updates from Wim Van Sebroeck and Guenter Roeck:
      
       - new driver for Add Loongson1 SoC
      
       - minor cleanup and fixes in various drivers
      
      * tag 'watchdog-for-linus-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        watchdog: it87_wdt: add IT8620E ID
        watchdog: mpc8xxx: Remove unneeded linux/miscdevice.h include
        watchdog: octeon: Remove unneeded linux/miscdevice.h include
        watchdog: bcm2835_wdt: set WDOG_HW_RUNNING bit when appropriate
        watchdog: loongson1: Add Loongson1 SoC watchdog driver
        watchdog: cpwd: remove memory allocate failure message
        watchdog: da9062/61: watchdog driver
        intel-mid_wdt: Error code is just an integer
        intel-mid_wdt: make sure watchdog is not running at startup
        watchdog: mei_wdt: request stop on reboot to prevent false positive event
        watchdog: hpwdt: changed maintainer information
        watchdog: jz4740: Fix modular build
        watchdog: qcom: fix kernel panic due to external abort on non-linefetch
        watchdog: davinci: add support for deferred probing
        watchdog: meson: Remove unneeded platform MODULE_ALIAS
        watchdog: Standardize leading tabs and spaces in Kconfig file
        watchdog: max77620_wdt: fix module autoload
        watchdog: bcm7038_wdt: fix module autoload
      3a77fa85
    • Linus Torvalds's avatar
      Merge tag 'ntb-4.10' of git://github.com/jonmason/ntb · 01e0d603
      Linus Torvalds authored
      Pull NTB update from Jon Mason:
      
       - NTB bug fixes for removing an unnecessary call to ntb_peer_spad_read,
         and correcting a free_irq inconsistency
      
       - add Intel SKX support
      
       - change the AMD NTB maintainer, and fix some bugs present there
      
      * tag 'ntb-4.10' of git://github.com/jonmason/ntb:
        ntb_transport: Remove unnecessary call to ntb_peer_spad_read
        NTB: Fix 'request_irq()' and 'free_irq()' inconsistancy
        ntb: fix SKX NTB config space size register offsets
        NTB: correct ntb_peer_spad_read for case when callback is not supplied.
        MAINTAINERS: Change in maintainer for AMD NTB
        ntb_transport: Limit memory windows based on available, scratchpads
        NTB: Register and offset values fix for memory window
        NTB: add support for hotplug feature
        ntb: Adding Skylake Xeon NTB support
      01e0d603
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 6ac3bb16
      Linus Torvalds authored
      Pull x86 fixes from Ingo Molnar:
       "There's a number of fixes:
      
         - a round of fixes for CPUID-less legacy CPUs
         - a number of microcode loader fixes
         - i8042 detection robustization fixes
         - stack dump/unwinder fixes
         - x86 SoC platform driver fixes
         - a GCC 7 warning fix
         - virtualization related fixes"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
        Revert "x86/unwind: Detect bad stack return address"
        x86/paravirt: Mark unused patch_default label
        x86/microcode/AMD: Reload proper initrd start address
        x86/platform/intel/quark: Add printf attribute to imr_self_test_result()
        x86/platform/intel-mid: Switch MPU3050 driver to IIO
        x86/alternatives: Do not use sync_core() to serialize I$
        x86/topology: Document cpu_llc_id
        x86/hyperv: Handle unknown NMIs on one CPU when unknown_nmi_panic
        x86/asm: Rewrite sync_core() to use IRET-to-self
        x86/microcode/intel: Replace sync_core() with native_cpuid()
        Revert "x86/boot: Fail the boot if !M486 and CPUID is missing"
        x86/asm/32: Make sync_core() handle missing CPUID on all 32-bit kernels
        x86/cpu: Probe CPUID leaf 6 even when cpuid_level == 6
        x86/tools: Fix gcc-7 warning in relocs.c
        x86/unwind: Dump stack data on warnings
        x86/unwind: Adjust last frame check for aligned function stacks
        x86/init: Fix a couple of comment typos
        x86/init: Remove i8042_detect() from platform ops
        Input: i8042 - Trust firmware a bit more when probing on X86
        x86/init: Add i8042 state to the platform data
        ...
      6ac3bb16
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · eb3e8d9d
      Linus Torvalds authored
      Pull timer fix from Ingo Molnar:
       "ARM/MOXA SoC clocksource driver fixes"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        clocksource/drivers/moxart: Plug memory and mapping leaks
      eb3e8d9d
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 00198dab
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "On the kernel side there's two x86 PMU driver fixes and a uprobes fix,
        plus on the tooling side there's a number of fixes and some late
        updates"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (36 commits)
        perf sched timehist: Fix invalid period calculation
        perf sched timehist: Remove hardcoded 'comm_width' check at print_summary
        perf sched timehist: Enlarge default 'comm_width'
        perf sched timehist: Honour 'comm_width' when aligning the headers
        perf/x86: Fix overlap counter scheduling bug
        perf/x86/pebs: Fix handling of PEBS buffer overflows
        samples/bpf: Move open_raw_sock to separate header
        samples/bpf: Remove perf_event_open() declaration
        samples/bpf: Be consistent with bpf_load_program bpf_insn parameter
        tools lib bpf: Add bpf_prog_{attach,detach}
        samples/bpf: Switch over to libbpf
        perf diff: Do not overwrite valid build id
        perf annotate: Don't throw error for zero length symbols
        perf bench futex: Fix lock-pi help string
        perf trace: Check if MAP_32BIT is defined (again)
        samples/bpf: Make perf_event_read() static
        uprobes: Fix uprobes on MIPS, allow for a cache flush after ixol breakpoint creation
        samples/bpf: Make samples more libbpf-centric
        tools lib bpf: Add flags to bpf_create_map()
        tools lib bpf: use __u32 from linux/types.h
        ...
      00198dab
    • Linus Torvalds's avatar
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9004fda5
      Linus Torvalds authored
      Pull irq fix from Ingo Molnar:
       "A build warning fix with certain .config's"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip/st: Mark st_irq_syscfg_resume() __maybe_unused
      9004fda5
  3. 23 Dec, 2016 12 commits