1. 04 7月, 2015 26 次提交
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b1be9ead
      Linus Torvalds 提交于
      Pull x86 fixes from Ingo Molnar:
       "Two FPU rewrite related fixes.  This addresses all known x86
        regressions at this stage.  Also some other misc fixes"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/fpu: Fix boot crash in the early FPU code
        x86/asm/entry/64: Update path names
        x86/fpu: Fix FPU related boot regression when CPUID masking BIOS feature is enabled
        x86/boot/setup: Clean up the e820_reserve_setup_data() code
        x86/kaslr: Fix typo in the KASLR_FLAG documentation
      b1be9ead
    • L
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 22a093b2
      Linus Torvalds 提交于
      Pull scheduler fixes from Ingo Molnar:
       "Debug info and other statistics fixes and related enhancements"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/numa: Fix numa balancing stats in /proc/pid/sched
        sched/numa: Show numa_group ID in /proc/sched_debug task listings
        sched/debug: Move print_cfs_rq() declaration to kernel/sched/sched.h
        sched/stat: Expose /proc/pid/schedstat if CONFIG_SCHED_INFO=y
        sched/stat: Simplify the sched_info accounting dependency
      22a093b2
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c1776a18
      Linus Torvalds 提交于
      Pull perf updates from Ingo Molnar:
       "This tree includes an x86 PMU scheduling fix, but most changes are
        late breaking tooling fixes and updates:
      
        User visible fixes:
      
         - Create config.detected into OUTPUT directory, fixing parallel
           builds sharing the same source directory (Aaro Kiskinen)
      
         - Allow to specify custom linker command, fixing some MIPS64 builds.
           (Aaro Kiskinen)
      
         - Fix to show proper convergence stats in 'perf bench numa' (Srikar
           Dronamraju)
      
        User visible changes:
      
         - Validate syscall list passed via -e argument to 'perf trace'.
           (Arnaldo Carvalho de Melo)
      
         - Introduce 'perf stat --per-thread' (Jiri Olsa)
      
         - Check access permission for --kallsyms and --vmlinux (Li Zhang)
      
         - Move toggling event logic from 'perf top' and into hists browser,
           allowing freeze/unfreeze with event lists with more than one entry
           (Namhyung Kim)
      
         - Add missing newlines when dumping PERF_RECORD_FINISHED_ROUND and
           showing the Aggregated stats in 'perf report -D' (Adrian Hunter)
      
        Infrastructure fixes:
      
         - Add missing break for PERF_RECORD_ITRACE_START, which caused those
           events samples to be parsed as well as PERF_RECORD_LOST_SAMPLES.
           ITRACE_START only appears when Intel PT or BTS are present, so..
           (Jiri Olsa)
      
         - Call the perf_session destructor when bailing out in the inject,
           kmem, report, kvm and mem tools (Taeung Song)
      
        Infrastructure changes:
      
         - Move stuff out of 'perf stat' and into the lib for further use
           (Jiri Olsa)
      
         - Reference count the cpu_map and thread_map classes (Jiri Olsa)
      
         - Set evsel->{cpus,threads} from the evlist, if not set, allowing the
           generalization of some 'perf stat' functions that previously were
           accessing private static evlist variable (Jiri Olsa)
      
         - Delete an unnecessary check before the calling free_event_desc()
           (Markus Elfring)
      
         - Allow auxtrace data alignment (Adrian Hunter)
      
         - Allow events with dot (Andi Kleen)
      
         - Fix failure to 'perf probe' events on arm (He Kuang)
      
         - Add testing for Makefile.perf (Jiri Olsa)
      
         - Add test for make install with prefix (Jiri Olsa)
      
         - Fix single target build dependency check (Jiri Olsa)
      
         - Access thread_map entries via accessors, prep patch to hold more
           info per entry, for ongoing 'perf stat --per-thread' work (Jiri
           Olsa)
      
         - Use __weak definition from compiler.h (Sukadev Bhattiprolu)
      
         - Split perf_pmu__new_alias() (Sukadev Bhattiprolu)"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (54 commits)
        perf tools: Allow to specify custom linker command
        perf tools: Create config.detected into OUTPUT directory
        perf mem: Fill in the missing session freeing after an error occurs
        perf kvm: Fill in the missing session freeing after an error occurs
        perf report: Fill in the missing session freeing after an error occurs
        perf kmem: Fill in the missing session freeing after an error occurs
        perf inject: Fill in the missing session freeing after an error occurs
        perf tools: Add missing break for PERF_RECORD_ITRACE_START
        perf/x86: Fix 'active_events' imbalance
        perf symbols: Check access permission when reading symbol files
        perf stat: Introduce --per-thread option
        perf stat: Introduce print_counters function
        perf stat: Using init_stats instead of memset
        perf stat: Rename print_interval to process_interval
        perf stat: Remove perf_evsel__read_cb function
        perf stat: Move perf_stat initialization counter process code
        perf stat: Move zero_per_pkg into counter process code
        perf stat: Separate counters reading and processing
        perf stat: Introduce read_counters function
        perf stat: Introduce perf_evsel__read function
        ...
      c1776a18
    • L
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 91cca0f0
      Linus Torvalds 提交于
      Pull max log buf size increase from Ingo Molnar:
       "Ran into this limit recently, so increase it by an order of magnitude"
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        printk: Increase maximum CONFIG_LOG_BUF_SHIFT from 21 to 25
      91cca0f0
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · ec0337e0
      Linus Torvalds 提交于
      Pull second round of input updates from Dmitry Torokhov:
       "A new driver for Weida wdt87xx touch controllers, and a bunch of
        fixups for other drivers"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: wdt87xx_i2c - add a scaling factor for TOUCH_MAJOR event
        Input: wdt87xx_i2c - remove stray newline in diagnostic message
        Input: arc_ps2 - add HAS_IOMEM dependency
        Input: wdt87xx_i2c - fix format warning
        Input: improve parsing OF parameters for touchscreens
        Input: edt-ft5x06 - mark as direct input device
        Input: use for_each_set_bit() where appropriate
        Input: add a driver for wdt87xx touchscreen controller
        Input: axp20x-pek - fix reporting button state as inverted
        Input: xpad - re-send LED command on present event
        Input: xpad - set the LEDs properly on XBox Wireless controllers
        Input: imx_keypad - check for clk_prepare_enable() error
      ec0337e0
    • I
      x86/fpu: Fix boot crash in the early FPU code · b96fecbf
      Ingo Molnar 提交于
      Jan Kara and Thomas Gleixner reported boot crashes in the FPU
      code:
      
        general protection fault: 0000 [#1] SMP
        RIP: 0010:[<ffffffff81048a6c>]  [<ffffffff81048a6c>] mxcsr_feature_mask_init+0x1c/0x40
      
        2b:*  0f ae 85 00 fe ff ff    fxsave -0x200(%rbp)
      
      and bisected it down to the following FPU commit:
      
         91a8c2a5 ("x86/fpu: Clean up and fix MXCSR handling")
      
      The reason is that the on-stack FPU registers state variable,
      used by the FXSAVE instruction, did not have the required
      minimum alignment of 16 bytes, causing the general protection
      fault.
      
      This is most likely a GCC bug in older GCC versions, but the
      offending commit also added a bogus extra 32-byte alignment
      (which GCC ignored too).
      
      So fix this bug by making the variable static again, but also
      mark it __initdata this time, because fpu__init_system_mxcsr()
      is now an __init function.
      Reported-and-bisected-by: NJan Kara <jack@suse.cz>
      Reported-bisected-and-tested-by: NThomas Gleixner <tglx@linutronix.de>
      Cc: Andy Lutomirski <luto@amacapital.net>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Brian Gerst <brgerst@gmail.com>
      Cc: Dave Hansen <dave.hansen@linux.intel.com>
      Cc: Denys Vlasenko <dvlasenk@redhat.com>
      Cc: Fenghua Yu <fenghua.yu@intel.com>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Jan Kara <jack@suse.cz>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Oleg Nesterov <oleg@redhat.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Quentin Casasnovas <quentin.casasnovas@oracle.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Link: http://lkml.kernel.org/r/20150704075819.GA9201@gmail.comSigned-off-by: NIngo Molnar <mingo@kernel.org>
      b96fecbf
    • S
      sched/numa: Fix numa balancing stats in /proc/pid/sched · 397f2378
      Srikar Dronamraju 提交于
      Commit 44dba3d5 ("sched: Refactor task_struct to use
      numa_faults instead of numa_* pointers") modified the way
      tsk->numa_faults stats are accounted.
      
      However that commit never touched show_numa_stats() that is displayed
      in /proc/pid/sched and thus the numbers displayed in /proc/pid/sched
      don't match the actual numbers.
      
      Fix it by making sure that /proc/pid/sched reflects the task
      fault numbers. Also add group fault stats too.
      
      Also couple of more modifications are added here:
      
      1. Format changes:
      
        - Previously we would list two entries per node, one for private
          and one for shared. Also the home node info was listed in each entry.
      
        - Now preferred node, total_faults and current node are
          displayed separately.
      
        - Now there is one entry per node, that lists private,shared task and
          group faults.
      
      2. Unit changes:
      
        - p->numa_pages_migrated was getting reset after every read of
          /proc/pid/sched. It's more useful to have absolute numbers since
          differential migrations between two accesses can be more easily
          calculated.
      Signed-off-by: NSrikar Dronamraju <srikar@linux.vnet.ibm.com>
      Acked-by: NRik van Riel <riel@redhat.com>
      Cc: Iulia Manda <iulia.manda21@gmail.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Link: http://lkml.kernel.org/r/1435252903-1081-4-git-send-email-srikar@linux.vnet.ibm.comSigned-off-by: NIngo Molnar <mingo@kernel.org>
      397f2378
    • S
      sched/numa: Show numa_group ID in /proc/sched_debug task listings · e3d24d0a
      Srikar Dronamraju 提交于
      Having the numa group ID in /proc/sched_debug helps to see how
      the numa groups have spread across the system.
      Signed-off-by: NSrikar Dronamraju <srikar@linux.vnet.ibm.com>
      Acked-by: NRik van Riel <riel@redhat.com>
      Cc: Iulia Manda <iulia.manda21@gmail.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Link: http://lkml.kernel.org/r/1435252903-1081-3-git-send-email-srikar@linux.vnet.ibm.comSigned-off-by: NIngo Molnar <mingo@kernel.org>
      e3d24d0a
    • S
      sched/debug: Move print_cfs_rq() declaration to kernel/sched/sched.h · 6b55c965
      Srikar Dronamraju 提交于
      Currently print_cfs_rq() is declared in include/linux/sched.h.
      However it's not used outside kernel/sched. Hence move the
      declaration to kernel/sched/sched.h
      
      Also some functions are only available for CONFIG_SCHED_DEBUG=y.
      Hence move the declarations to within the #ifdef.
      Signed-off-by: NSrikar Dronamraju <srikar@linux.vnet.ibm.com>
      Acked-by: NRik van Riel <riel@redhat.com>
      Cc: Iulia Manda <iulia.manda21@gmail.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Link: http://lkml.kernel.org/r/1435252903-1081-2-git-send-email-srikar@linux.vnet.ibm.comSigned-off-by: NIngo Molnar <mingo@kernel.org>
      6b55c965
    • N
      sched/stat: Expose /proc/pid/schedstat if CONFIG_SCHED_INFO=y · 5968cece
      Naveen N. Rao 提交于
      Expand /proc/pid/schedstat output:
      
       - enable it on CONFIG_TASK_DELAY_ACCT=y && !CONFIG_SCHEDSTATS kernels.
      
       - dump all zeroes on kernels that are booted with the 'nodelayacct'
         option, which boot option disables delay accounting on
         CONFIG_TASK_DELAY_ACCT=y kernels.
      Signed-off-by: NNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
      Cc: Balbir Singh <bsingharora@gmail.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: a.p.zijlstra@chello.nl
      Cc: ricklind@us.ibm.com
      Link: http://lkml.kernel.org/r/5ccbef17d4bc841084ea6e6421d4e4a23b7b806f.1435654789.git.naveen.n.rao@linux.vnet.ibm.comSigned-off-by: NIngo Molnar <mingo@kernel.org>
      5968cece
    • N
      sched/stat: Simplify the sched_info accounting dependency · f6db8347
      Naveen N. Rao 提交于
      Both CONFIG_SCHEDSTATS=y and CONFIG_TASK_DELAY_ACCT=y track task
      sched_info, which results in ugly #if clauses.
      
      Simplify the code by introducing a synthethic CONFIG_SCHED_INFO
      switch, selected by both.
      Signed-off-by: NNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
      Cc: Balbir Singh <bsingharora@gmail.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: a.p.zijlstra@chello.nl
      Cc: ricklind@us.ibm.com
      Link: http://lkml.kernel.org/r/8d19eef800811a94b0f91bcbeb27430a884d7433.1435255405.git.naveen.n.rao@linux.vnet.ibm.comSigned-off-by: NIngo Molnar <mingo@kernel.org>
      f6db8347
    • D
      Merge branch 'next' into for-linus · a5cba18c
      Dmitry Torokhov 提交于
      Prepare second round of input updates for 4.2 merge window.
      a5cba18c
    • L
      Merge tag 'topic/drm-fixes-2015-07-04' of git://anongit.freedesktop.org/drm-intel · 5c65e7be
      Linus Torvalds 提交于
      Pull drm EDID fix from Daniel Vetter:
       "Since Dave is enjoying vacation I figured I'll send you this drm core
        fix directly"
      
      * tag 'topic/drm-fixes-2015-07-04' of git://anongit.freedesktop.org/drm-intel:
        drm/crtc: Fix edid length computation
      5c65e7be
    • L
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · 5fc83528
      Linus Torvalds 提交于
      Pull virtio/vhost cross endian support from Michael Tsirkin:
       "I have just queued some more bugfix patches today but none fix
        regressions and none are related to these ones, so it looks like a
        good time for a merge for -rc1.
      
        The motivation for this is support for legacy BE guests on the new LE
        hosts.  There are two redeeming properties that made me merge this:
      
         - It's a trivial amount of code: since we wrap host/guest accesses
           anyway, almost all of it is well hidden from drivers.
      
         - Sane platforms would never set flags like VHOST_CROSS_ENDIAN_LEGACY,
           and when it's clear, there's zero overhead (as some point it was
           tested by compiling with and without the patches, got the same
           stripped binary).
      
        Maybe we could create a Kconfig symbol to enforce the second point:
        prevent people from enabling it eg on x86.  I will look into this"
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        virtio-pci: alloc only resources actually used.
        macvtap/tun: cross-endian support for little-endian hosts
        vhost: cross-endian support for legacy devices
        virtio: add explicit big-endian support to memory accessors
        vhost: introduce vhost_is_little_endian() helper
        vringh: introduce vringh_is_little_endian() helper
        macvtap: introduce macvtap_is_little_endian() helper
        tun: add tun_is_little_endian() helper
        virtio: introduce virtio_is_little_endian() helper
      5fc83528
    • S
      drm/crtc: Fix edid length computation · e24ff467
      Shixin Zeng 提交于
      The length of each EDID block is EDID_LENGTH, and number of blocks is
      (1 + edid->extensions) - we need to multiply not add them.
      
      This causes wrong EDID to be passed on, and is a regression introduced
      by d2ed3436 (drm: Introduce helper for replacing blob properties)
      Signed-off-by: NShixin Zeng <zeng.shixin@gmail.com>
      Cc: Daniel Stone <daniels@collabora.com>
      Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Reviewed-by: NDaniel Stone <daniels@collabora.com>
      [danvet: Add Cc: and fix commit summary.]
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      e24ff467
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · 0cbee992
      Linus Torvalds 提交于
      Pull user namespace updates from Eric Biederman:
       "Long ago and far away when user namespaces where young it was realized
        that allowing fresh mounts of proc and sysfs with only user namespace
        permissions could violate the basic rule that only root gets to decide
        if proc or sysfs should be mounted at all.
      
        Some hacks were put in place to reduce the worst of the damage could
        be done, and the common sense rule was adopted that fresh mounts of
        proc and sysfs should allow no more than bind mounts of proc and
        sysfs.  Unfortunately that rule has not been fully enforced.
      
        There are two kinds of gaps in that enforcement.  Only filesystems
        mounted on empty directories of proc and sysfs should be ignored but
        the test for empty directories was insufficient.  So in my tree
        directories on proc, sysctl and sysfs that will always be empty are
        created specially.  Every other technique is imperfect as an ordinary
        directory can have entries added even after a readdir returns and
        shows that the directory is empty.  Special creation of directories
        for mount points makes the code in the kernel a smidge clearer about
        it's purpose.  I asked container developers from the various container
        projects to help test this and no holes were found in the set of mount
        points on proc and sysfs that are created specially.
      
        This set of changes also starts enforcing the mount flags of fresh
        mounts of proc and sysfs are consistent with the existing mount of
        proc and sysfs.  I expected this to be the boring part of the work but
        unfortunately unprivileged userspace winds up mounting fresh copies of
        proc and sysfs with noexec and nosuid clear when root set those flags
        on the previous mount of proc and sysfs.  So for now only the atime,
        read-only and nodev attributes which userspace happens to keep
        consistent are enforced.  Dealing with the noexec and nosuid
        attributes remains for another time.
      
        This set of changes also addresses an issue with how open file
        descriptors from /proc/<pid>/ns/* are displayed.  Recently readlink of
        /proc/<pid>/fd has been triggering a WARN_ON that has not been
        meaningful since it was added (as all of the code in the kernel was
        converted) and is not now actively wrong.
      
        There is also a short list of issues that have not been fixed yet that
        I will mention briefly.
      
        It is possible to rename a directory from below to above a bind mount.
        At which point any directory pointers below the renamed directory can
        be walked up to the root directory of the filesystem.  With user
        namespaces enabled a bind mount of the bind mount can be created
        allowing the user to pick a directory whose children they can rename
        to outside of the bind mount.  This is challenging to fix and doubly
        so because all obvious solutions must touch code that is in the
        performance part of pathname resolution.
      
        As mentioned above there is also a question of how to ensure that
        developers by accident or with purpose do not introduce exectuable
        files on sysfs and proc and in doing so introduce security regressions
        in the current userspace that will not be immediately obvious and as
        such are likely to require breaking userspace in painful ways once
        they are recognized"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        vfs: Remove incorrect debugging WARN in prepend_path
        mnt: Update fs_fully_visible to test for permanently empty directories
        sysfs: Create mountpoints with sysfs_create_mount_point
        sysfs: Add support for permanently empty directories to serve as mount points.
        kernfs: Add support for always empty directories.
        proc: Allow creating permanently empty directories that serve as mount points
        sysctl: Allow creating permanently empty directories that serve as mountpoints.
        fs: Add helper functions for permanently empty directories.
        vfs: Ignore unlocked mounts in fs_fully_visible
        mnt: Modify fs_fully_visible to deal with locked ro nodev and atime
        mnt: Refactor the logic for mounting sysfs and proc in a user namespace
      0cbee992
    • L
      Merge tag 'remoteproc-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc · 2fee94b7
      Linus Torvalds 提交于
      Pull remoteproc updates from Ohad Ben-Cohen:
      
       - remoteproc fixes/cleanups from Suman Anna
      
       - new remoteproc TI Wakeup M3 driver from Dave Gerlach
      
       - remoteproc core support for TI's Wakeup M3 driver from both Dave and Suman
      
       - tiny remoteproc build fix from myself
      
      * tag 'remoteproc-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
        remoteproc: fix !CONFIG_OF build breakage
        remoteproc/wkup_m3: add a remoteproc driver for TI Wakeup M3
        Documentation: dt: add bindings for TI Wakeup M3 processor
        remoteproc: add a rproc ops for performing address translation
        remoteproc: introduce rproc_get_by_phandle API
        remoteproc: fix various checkpatch warnings
        remoteproc/davinci: fix quoted split string checkpatch warning
        remoteproc/ste: add blank lines after declarations
      2fee94b7
    • L
      Merge tag 'hwspinlock-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock · d033ed9e
      Linus Torvalds 提交于
      Pull hwspinlock updates from Ohad Ben-Cohen:
      
       - hwspinlock core DT support from Suman Anna
      
       - OMAP hwspinlock DT support from Suman Anna
      
       - QCOM hwspinlock DT support from Bjorn Andersson
      
       - a new CSR atlas7 hwspinlock driver from Wei Chen
      
       - CSR atlas7 hwspinlock DT binding document from Wei Chen
      
       - a tiny QCOM hwspinlock driver fix from Bjorn Andersson
      
      * tag 'hwspinlock-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock:
        hwspinlock: qcom: Correct msb in regmap_field
        DT: hwspinlock: add the CSR atlas7 hwspinlock bindings document
        hwspinlock: add a CSR atlas7 driver
        hwspinlock: qcom: Add support for Qualcomm HW Mutex block
        DT: hwspinlock: Add binding documentation for Qualcomm hwmutex
        hwspinlock/omap: add support for dt nodes
        Documentation: dt: add the omap hwspinlock bindings document
        hwspinlock/core: add device tree support
        Documentation: dt: add common bindings for hwspinlock
      d033ed9e
    • L
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 6361c845
      Linus Torvalds 提交于
      Pull arm64 fixes (and cleanups) from Catalin Marinas:
       "Various arm64 fixes:
      
         - suspicious RCU usage warning
         - BPF (out of bounds array read and endianness conversion)
         - perf (of_node usage after of_node_put, cpu_pmu->plat_device
           assignment)
         - huge pmd/pud check for value 0
         - rate-limiting should only take unhandled signals into account
      
        Clean-up:
      
         - incorrect use of pgprot_t type
         - unused header include
         - __init annotation to arm_cpuidle_init
         - pr_debug instead of pr_error for disabled GICC entries in
           ACPI/MADT"
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: Fix show_unhandled_signal_ratelimited usage
        ARM64 / SMP: Switch pr_err() to pr_debug() for disabled GICC entry
        arm64: cpuidle: add __init section marker to arm_cpuidle_init
        arm64: Don't report clear pmds and puds as huge
        arm64: perf: fix unassigned cpu_pmu->plat_device when probing PMU PPIs
        arm64: perf: Don't use of_node after putting it
        arm64: fix incorrect use of pgprot_t variable
        arm64/hw_breakpoint.c: remove unnecessary header
        arm64: bpf: fix endianness conversion bugs
        arm64: bpf: fix out-of-bounds read in bpf2a64_offset()
        ARM64: smp: Fix suspicious RCU usage with ipi tracepoints
      6361c845
    • L
      Merge tag 'nios2-v4.2' of git://git.rocketboards.org/linux-socfpga-next · 31351f73
      Linus Torvalds 提交于
      Pull nios2 update from Ley Foon Tan:
       "Check number of timer instances"
      
      * tag 'nios2-v4.2' of git://git.rocketboards.org/linux-socfpga-next:
        nios2: check number of timer instances
      31351f73
    • L
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 9a3c284a
      Linus Torvalds 提交于
      Pull more hwmon updates from Jean Delvare.
      
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        hwmon: (w83627ehf) Use swap() in w82627ehf_swap_tempreg()
        hwmon: Document which I2C addresses can be probed
        hwmon: (w83792d) Additional PWM outputs support
      9a3c284a
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 1e512b08
      Linus Torvalds 提交于
      Pull block fixes from Jens Axboe:
       "Mainly sending this off now for the writeback fixes, since they fix a
        real regression introduced with the cgroup writeback changes.  The
        NVMe fix could wait for next pull for this series, but it's simple
        enough that we might as well include it.
      
        This contains:
      
         - two cgroup writeback fixes from Tejun, fixing a user reported issue
           with luks crypt devices hanging when being closed.
      
         - NVMe error cleanup fix from Jon Derrick, fixing a case where we'd
           attempt to free an unregistered IRQ"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        NVMe: Fix irq freeing when queue_request_irq fails
        writeback: don't drain bdi_writeback_congested on bdi destruction
        writeback: don't embed root bdi_writeback_congested in bdi_writeback
      1e512b08
    • L
      Merge tag 'fbdev-fixes-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · 1c65ae63
      Linus Torvalds 提交于
      Pull fbdev fix from Tomi Valkeinen:
       "Fix display regression on TI AM4xxx boards"
      
      * tag 'fbdev-fixes-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
        OMAPDSS: fix probing if rfbi device is enabled
      1c65ae63
    • L
      Merge tag 'edac_urgent_for_4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · b53343fc
      Linus Torvalds 提交于
      Pull EDAC fix from Borislav Petkov:
       "A build fix for octeon_edac from Aaro Koskinen"
      
      * tag 'edac_urgent_for_4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        EDAC, octeon: Fix broken build due to model helper renames
      b53343fc
    • S
    • S
      arm64: Fix show_unhandled_signal_ratelimited usage · f871d268
      Suzuki K. Poulose 提交于
      Commit 86dca36e introduced ratelimited usage for
      'unhandled_signal' messages.
      The commit checks the ratelimit irrespective of whether
      the signal is handled or not, which is wrong and leads
      to false reports like the below in dmesg :
      
      __do_user_fault: 127 callbacks suppressed
      
      Do the ratelimit check only if the signal is unhandled.
      
      Fixes: 86dca36e ("arm64: use private ratelimit state along with show_unhandled_signals")
      Cc: Vladimir Murzin <Vladimir.Murzin@arm.com>
      Signed-off-by: NSuzuki K. Poulose <suzuki.poulose@arm.com>
      Signed-off-by: NCatalin Marinas <catalin.marinas@arm.com>
      f871d268
  2. 03 7月, 2015 14 次提交
    • F
      hwmon: (w83627ehf) Use swap() in w82627ehf_swap_tempreg() · ffe3df53
      Fabian Frederick 提交于
      Use kernel.h macro definition.
      
      Thanks to Julia Lawall for Coccinelle scripting support.
      Signed-off-by: NFabian Frederick <fabf@skynet.be>
      Signed-off-by: NJean Delvare <jdelvare@suse.de>
      ffe3df53
    • J
      hwmon: Document which I2C addresses can be probed · 97607f98
      Jean Delvare 提交于
      Add an item to the checklist when submitting a new hwmon driver: only
      some I2C addresses can be probed, others should not for safety
      reasons.
      Signed-off-by: NJean Delvare <jdelvare@suse.de>
      Reviewed-by: NGuenter Roeck <linux@roeck-us.net>
      97607f98
    • R
      hwmon: (w83792d) Additional PWM outputs support · f617f731
      Roger Lucas 提交于
      Add pwm[4-7] and the associated pwm[4-7]_mode attributes.
      Signed-off-by: NRoger Lucas <vt8231@hiddenengine.co.uk>
      Signed-off-by: NJean Delvare <jdelvare@suse.de>
      f617f731
    • H
      ARM64 / SMP: Switch pr_err() to pr_debug() for disabled GICC entry · f9058929
      Hanjun Guo 提交于
      It is normal that firmware presents GICC entry or entries (processors)
      with disabled flag in ACPI MADT, taking a system of 16 cpus for example,
      ACPI firmware may present 8 ebabled first with another 8 cpus disabled
      in MADT, the disabled cpus can be hot-added later.
      
      Firmware may also present more cpus than the hardware actually has, but
      disabled the unused ones, and easily enable it when the hardware has such
      cpus to make the firmware code scalable.
      
      So that's not an error for disabled cpus in MADT, we can switch pr_err()
      to pr_debug() to make the boot a little quieter by default.
      
      Since hwid for disabled cpus often are invalid, and we check invalid hwid
      first in the code, for use case that hot add cpus later will be filtered
      out and will not be counted in possible cups, so move this check before
      the hwid one to prepare the code to count for disabeld cpus when cpu
      hot-plug is introduced.
      Signed-off-by: NHanjun Guo <hanjun.guo@linaro.org>
      Reviewed-by: NAl Stone <ahs3@redhat.com>
      Signed-off-by: NCatalin Marinas <catalin.marinas@arm.com>
      f9058929
    • L
      Merge tag 'acpica-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 9bdc771f
      Linus Torvalds 提交于
      Pull ACPICA updates from Rafael Wysocki:
       "Additional ACPICA material for v4.2-rc1
      
        This will update the ACPICA code in the kernel to upstream revision
        20150619 (a bug-fix release mostly including stable-candidate fixes)
        and restore an earlier ACPICA commit that had to be reverted due to a
        regression introduced by it (the regression is addressed by
        blacklisting the only known system affected by it to date).
      
        The only new feature added by this update is the support for
        overriding objects in the ACPI namespace and a new ACPI table that can
        be used for that called the Override System Definition Table (OSDT).
        That should allow us to "patch" the ACPI namespace built from
        incomplete or incorrect ACPI System Definition tables (DSDT, SSDT)
        during system startup without the need to provide replacements for all
        of those tables in the future.
      
        Specifics:
      
         - Fix system resume problems related to 32-bit and 64-bit versions of
           the Firmware ACPI Control Structure (FACS) in the firmare (Lv
           Zheng)
      
         - Fix double initialization of the FACS (Lv Zheng)
      
         - Add _CLS object processing code to ACPICA (Suravee Suthikulpanit)
      
         - Add support for the (currently missing) new GIC version field in
           the Multiple APIC Description Table (MADT) (Hanjun Guo)
      
         - Add support for overriding objects in the ACPI namespace to ACPICA
           and OSDT support (Lv Zheng, Bob Moore, Zhang Rui)
      
         - Updates related to the TCPA and TPM2 ACPI tables (Bob Moore)
      
         - Restore the commit modifying _REV to always return "2" (as required
           by ACPI 6) and add a blacklisting mechanism for systems that may be
           affected by that change (Rafael J Wysocki)
      
         - Assorted fixes and cleanups (Bob Moore, Lv Zheng, Sascha Wildner)"
      
      * tag 'acpica-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (28 commits)
        Revert 'Revert "ACPICA: Permanently set _REV to the value '2'."'
        ACPI / init: Make it possible to override _REV
        ACPICA: Update version to 20150619
        ACPICA: Comment update, no functional change
        ACPICA: Update TPM2 ACPI table
        ACPICA: Update definitions for the TCPA and TPM2 ACPI tables
        ACPICA: Split C library prototypes to new header
        ACPICA: De-macroize calls to standard C library functions
        ACPI / acpidump: Update acpidump manual
        ACPICA: acpidump: Convert the default behavior to dump from /sys/firmware/acpi/tables
        ACPICA: acpidump: Allow customized tables to be dumped without accessing /dev/mem
        ACPICA: Cleanup output for the ASL Debug object
        ACPICA: Update for acpi_install_table memory types
        ACPICA: Namespace: Change namespace override to avoid node deletion
        ACPICA: Namespace: Add support of OSDT table
        ACPICA: Namespace: Add support to allow overriding objects
        ACPICA: ACPI 6.0: Add values for MADT GIC version field
        ACPICA: Utilities: Add _CLS processing
        ACPICA: Add dragon_fly support to unix file mapping file
        ACPICA: EFI: Add EFI interface definitions to eliminate dependency of GNU EFI
        ...
      9bdc771f
    • L
      make certificate list change message more useful · 7df9ab84
      Linus Torvalds 提交于
      It's a bug in our Makefile rules, make it show what the changing
      certificate list was, and make it a warning so that people actually see
      it.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      7df9ab84
    • R
      Revert 'Revert "ACPICA: Permanently set _REV to the value '2'."' · ea7d5215
      Rafael J. Wysocki 提交于
      Revert commit ff284f37 (Revert "ACPICA: Permanently set _REV to
      the value '2'.) as the regression introduced by commit b1ef2972
      reverted by it is now addressed via a blacklist entry.
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      ea7d5215
    • R
      ACPI / init: Make it possible to override _REV · 18d78b64
      Rafael J. Wysocki 提交于
      The platform firmware on some systems expects Linux to return "5" as
      the supported ACPI revision which makes it expose system configuration
      information in a special way.
      
      For example, based on what ACPI exports as the supported revision,
      Dell XPS 13 (2015) configures its audio device to either work in HDA
      mode or in I2S mode, where the former is supposed to be used on Linux
      until the latter is fully supported (in the kernel as well as in user
      space).
      
      Since ACPI 6 mandates that _REV should return "2" if ACPI 2 or later
      is supported by the OS, a subsequent change will make that happen, so
      make it possible to override that on systems where "5" is expected to
      be returned for Linux to work correctly one them (such as the Dell
      machine mentioned above).
      Original-by: NDominik Brodowski <linux@dominikbrodowski.net>
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      18d78b64
    • L
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · e965b8ce
      Linus Torvalds 提交于
      Pull kbuild updates from Michal Marek:
       "Just a few kbuild core commits this time:
      
         - kallsyms fix for CONFIG_XIP_KERNEL
      
         - bashisms in scripts/link-vmlinux.sh fixed
      
         - workaround to make DEBUG_INFO_REDUCED more useful yet still space
           efficient
      
         - clang is not wrongly detected when cross-compiling"
      
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kbuild: include core debug info when DEBUG_INFO_REDUCED
        scripts: link-vmlinux: Don't pass page offset to kallsyms if XIP Kernel
        scripts: fix link-vmlinux.sh bash-ism
        Makefile: Fix detection of clang when cross-compiling
      e965b8ce
    • L
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · a95cb3cd
      Linus Torvalds 提交于
      Pull kconfig updates from Michal Marek:
      
       - kconfig conditions can use usual less/greater than comparisons
      
       - kconfig warns about stray characters in Kconfig files
      
       - bogus expression simplification removed
      
       - some minor fixes
      
      * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kconfig: re-generate *.c_shipped files after previous change
        kconfig: allow use of relations other than (in)equality
        kconfig: don't silently ignore unhandled characters
        kconfig: Wrap long "make help" text lines
        scripts/kconfig/Makefile: Cosmetic fixes
        scripts/kconfig/Makefile: Fix spelling of Qt
        Kconfig: Remove bad inference rules expr_eliminate_dups2()
      a95cb3cd
    • L
      Merge tag 'hwmon-for-linus-v4.2-rc1' of... · 19127af9
      Linus Torvalds 提交于
      Merge tag 'hwmon-for-linus-v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon fixes from Guenter Roeck:
       "Two patches headed for stable:
         - Fix broken output scaling in mcp3021 driver
         - Fix attribute visibility in nct7802 driver
      
        One regression:
         - Fix name attribute in dell-smm-hwmon driver"
      
      * tag 'hwmon-for-linus-v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (mcp3021) Fix broken output scaling
        hwmon: (nct7802) fix visibility of temp3
        hwmon: (dell-smm-hwmon) Use a valid name attribute
      19127af9
    • L
      Merge tag 'please-pull-put_kernel_page' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 799b63a4
      Linus Torvalds 提交于
      Pull ia64 boot noise reduction fix from Tony Luck:
       "Remove some boot noise from a now-invalid check that pages are
        reserved"
      
      * tag 'please-pull-put_kernel_page' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        [IA64] Drop debug test/printk that some special pages are marked reserved
      799b63a4
    • L
      Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d4113f2f
      Linus Torvalds 提交于
      Pull ARM SoC late fixes and dependencies from Kevin Hilman:
       "This is a collection of a few late fixes and other misc stuff that had
        dependencies on things being merged from other trees.
      
        Other than the fixes, the primary feature being added is the
        conversion of some OMAP drivers to the new generic wakeirq interface"
      
      * tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: multi_v7_defconfig: Enable BRCMNAND driver
        ARM: BCM: Do not select CONFIG_MTD_NAND_BRCMNAND
        ARM: at91/dt: update udc compatible strings
        ARM: at91/dt: trivial: fix USB udc compatible string
        arm64: dts: Add APM X-Gene standby GPIO controller DTS entries
        soc: qcom: spm: Fix idle on THUMB2 kernels
        ARM: dove: fix legacy dove IRQ numbers
        ARM: mvebu: fix suspend to RAM on big-endian configurations
        ARM: mvebu: adjust Armada XP DT spi muxing after pinctrl function rename
        serial: 8250_omap: Move wake-up interrupt to generic wakeirq
        serial: omap: Switch wake-up interrupt to generic wakeirq
        mmc: omap_hsmmc: Change wake-up interrupt to use generic wakeirq
      d4113f2f
    • L
      Merge branch 'drm-next-4.2' of git://people.freedesktop.org/~agd5f/linux · 84807727
      Linus Torvalds 提交于
      Pull radeon and amdgpu fixes from Alex Deucher:
       "First round of fixes for 4.2 for radeon and amdgpu.  Stuff all over
        the place:
      
         - hibernation, suspend fixes for radeon and amdgpu
         - radeon audio fix
         - amdgpu ioctl optimzations and fixes
         - amdgpu VCE cs checker improvements
         - misc bug fixes"
      
      [ Dave on vacation, pulling directly ]
      
      * 'drm-next-4.2' of git://people.freedesktop.org/~agd5f/linux: (30 commits)
        drm/radeon: only check the sink type on DP connectors
        drm/amdgpu: add flag to delay VM updates
        drm/amdgpu: add optional dependencies to the CS IOCTL v2
        drm/amdgpu: recreate fence from user seq
        gpu/drm/amdgpu: Fix build when CONFIG_DEBUG_FS is not set
        Revert "drm/radeon: dont switch vt on suspend"
        drm/amdgpu: disable enable_nb_ps_policy temporarily
        drm/amdgpu: correct define SMU_EnabledFeatureScoreboard_SclkDpmOn
        drm/amdgpu: allocate ip_block_enabled memory in common code
        drm/amdgpu: remove unnecessary check before kfree
        drm/amdgpu: use kzalloc for allocating one thing
        drm/radeon: fix adding all VAs to the freed list on remove v2
        drm/amdgpu: add chunk id validity check
        drm/amdgpu: fix crash on invalid CS IOCTL
        drm/amdgpu: reset wptr at cp compute resume (v2)
        drm/amdgpu: check VCE feedback and bitstream index
        drm/amdgpu: make VCE handle check more strict
        drm/amdgpu: check VCE relocation buffer range
        drm/amdgpu: silence invalid error message
        drm/amdgpu: fix wrong type
        ...
      84807727