1. 03 10月, 2014 1 次提交
  2. 10 9月, 2014 2 次提交
  3. 14 8月, 2014 20 次提交
  4. 05 8月, 2014 17 次提交
    • L
      Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 98a96f20
      Linus Torvalds 提交于
      Pull x86 vdso updates from Ingo Molnar:
       "Further simplifications and improvements to the VDSO code, by Andy
        Lutomirski"
      
      * 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86_64/vsyscall: Fix warn_bad_vsyscall log output
        x86/vdso: Set VM_MAYREAD for the vvar vma
        x86, vdso: Get rid of the fake section mechanism
        x86, vdso: Move the vvar area before the vdso text
      98a96f20
    • L
      Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5637a2a3
      Linus Torvalds 提交于
      Pull x86 UV TLB update from Ingo Molnar:
       "UV TLB shootdown logic updates for version of the UV architecture"
      
      * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/uv: Update the UV3 TLB shootdown logic
      5637a2a3
    • L
      Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d782cebd
      Linus Torvalds 提交于
      Pull RAS updates from Ingo Molnar:
       "The main changes in this cycle are:
      
         - RAS tracing/events infrastructure, by Gong Chen.
      
         - Various generalizations of the APEI code to make it available to
           non-x86 architectures, by Tomasz Nowicki"
      
      * 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/ras: Fix build warnings in <linux/aer.h>
        acpi, apei, ghes: Factor out ioremap virtual memory for IRQ and NMI context.
        acpi, apei, ghes: Make NMI error notification to be GHES architecture extension.
        apei, mce: Factor out APEI architecture specific MCE calls.
        RAS, extlog: Adjust init flow
        trace, eMCA: Add a knob to adjust where to save event log
        trace, RAS: Add eMCA trace event interface
        RAS, debugfs: Add debugfs interface for RAS subsystem
        CPER: Adjust code flow of some functions
        x86, MCE: Robustify mcheck_init_device
        trace, AER: Move trace into unified interface
        trace, RAS: Add basic RAS trace event
        x86, MCE: Kill CPU_POST_DEAD
      d782cebd
    • L
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8556d44f
      Linus Torvalds 提交于
      Pull x86 platform updates from Ingo Molnar:
       "The main changes in this cycle are:
      
         - Intel SOC driver updates, by Aubrey Li.
      
         - TS5500 platform updates, by Vivien Didelot"
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/pmc_atom: Silence shift wrapping warnings in pmc_sleep_tmr_show()
        x86/pmc_atom: Expose PMC device state and platform sleep state
        x86/pmc_atom: Eisable a few S0ix wake up events for S0ix residency
        x86/platform: New Intel Atom SOC power management controller driver
        x86/platform/ts5500: Add support for TS-5400 boards
        x86/platform/ts5500: Add a 'name' sysfs attribute
        x86/platform/ts5500: Use the DEVICE_ATTR_RO() macro
      8556d44f
    • L
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ce474796
      Linus Torvalds 提交于
      Pull x86 mm changes from Ingo Molnar:
       "The main change in this cycle is the rework of the TLB range flushing
        code, to simplify, fix and consolidate the code.  By Dave Hansen"
      
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mm: Set TLB flush tunable to sane value (33)
        x86/mm: New tunable for single vs full TLB flush
        x86/mm: Add tracepoints for TLB flushes
        x86/mm: Unify remote INVLPG code
        x86/mm: Fix missed global TLB flush stat
        x86/mm: Rip out complicated, out-of-date, buggy TLB flushing
        x86/mm: Clean up the TLB flushing code
        x86/smep: Be more informative when signalling an SMEP fault
      ce474796
    • L
      Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 76f09aa4
      Linus Torvalds 提交于
      Pull EFI changes from Ingo Molnar:
       "Main changes in this cycle are:
      
         - arm64 efi stub fixes, preservation of FP/SIMD registers across
           firmware calls, and conversion of the EFI stub code into a static
           library - Ard Biesheuvel
      
         - Xen EFI support - Daniel Kiper
      
         - Support for autoloading the efivars driver - Lee, Chun-Yi
      
         - Use the PE/COFF headers in the x86 EFI boot stub to request that
           the stub be loaded with CONFIG_PHYSICAL_ALIGN alignment - Michael
           Brown
      
         - Consolidate all the x86 EFI quirks into one file - Saurabh Tangri
      
         - Additional error logging in x86 EFI boot stub - Ulf Winkelvos
      
         - Support loading initrd above 4G in EFI boot stub - Yinghai Lu
      
         - EFI reboot patches for ACPI hardware reduced platforms"
      
      * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits)
        efi/arm64: Handle missing virtual mapping for UEFI System Table
        arch/x86/xen: Silence compiler warnings
        xen: Silence compiler warnings
        x86/efi: Request desired alignment via the PE/COFF headers
        x86/efi: Add better error logging to EFI boot stub
        efi: Autoload efivars
        efi: Update stale locking comment for struct efivars
        arch/x86: Remove efi_set_rtc_mmss()
        arch/x86: Replace plain strings with constants
        xen: Put EFI machinery in place
        xen: Define EFI related stuff
        arch/x86: Remove redundant set_bit(EFI_MEMMAP) call
        arch/x86: Remove redundant set_bit(EFI_SYSTEM_TABLES) call
        efi: Introduce EFI_PARAVIRT flag
        arch/x86: Do not access EFI memory map if it is not available
        efi: Use early_mem*() instead of early_io*()
        arch/ia64: Define early_memunmap()
        x86/reboot: Add EFI reboot quirk for ACPI Hardware Reduced flag
        efi/reboot: Allow powering off machines using EFI
        efi/reboot: Add generic wrapper around EfiResetSystem()
        ...
      76f09aa4
    • L
      Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e9c9eeca
      Linus Torvalds 提交于
      Pull x86 cpufeature updates from Ingo Molnar:
       "The main changes in this cycle were:
      
         - Continued cleanups of CPU bugs mis-marked as 'missing features', by
           Borislav Petkov.
      
         - Detect the xsaves/xrstors feature and releated cleanup, by Fenghua
           Yu"
      
      * 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, cpu: Kill cpu_has_mp
        x86, amd: Cleanup init_amd
        x86/cpufeature: Add bug flags to /proc/cpuinfo
        x86, cpufeature: Convert more "features" to bugs
        x86/xsaves: Detect xsaves/xrstors feature
        x86/cpufeature.h: Reformat x86 feature macros
      e9c9eeca
    • L
      Merge branches 'x86-build-for-linus', 'x86-cleanups-for-linus' and... · 19d402c1
      Linus Torvalds 提交于
      Merge branches 'x86-build-for-linus', 'x86-cleanups-for-linus' and 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      
      Pull x86 build/cleanup/debug updates from Ingo Molnar:
       "Robustify the build process with a quirk to avoid GCC reordering
        related bugs.
      
        Two code cleanups.
      
        Simplify entry_64.S CFI annotations, by Jan Beulich"
      
      * 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, build: Change code16gcc.h from a C header to an assembly header
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Simplify __HAVE_ARCH_CMPXCHG tests
        x86/tsc: Get rid of custom DIV_ROUND() macro
      
      * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/debug: Drop several unnecessary CFI annotations
      19d402c1
    • L
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 98959948
      Linus Torvalds 提交于
      Pull scheduler updates from Ingo Molnar:
      
       - Move the nohz kick code out of the scheduler tick to a dedicated IPI,
         from Frederic Weisbecker.
      
        This necessiated quite some background infrastructure rework,
        including:
      
         * Clean up some irq-work internals
         * Implement remote irq-work
         * Implement nohz kick on top of remote irq-work
         * Move full dynticks timer enqueue notification to new kick
         * Move multi-task notification to new kick
         * Remove unecessary barriers on multi-task notification
      
       - Remove proliferation of wait_on_bit() action functions and allow
         wait_on_bit_action() functions to support a timeout.  (Neil Brown)
      
       - Another round of sched/numa improvements, cleanups and fixes.  (Rik
         van Riel)
      
       - Implement fast idling of CPUs when the system is partially loaded,
         for better scalability.  (Tim Chen)
      
       - Restructure and fix the CPU hotplug handling code that may leave
         cfs_rq and rt_rq's throttled when tasks are migrated away from a dead
         cpu.  (Kirill Tkhai)
      
       - Robustify the sched topology setup code.  (Peterz Zijlstra)
      
       - Improve sched_feat() handling wrt.  static_keys (Jason Baron)
      
       - Misc fixes.
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (37 commits)
        sched/fair: Fix 'make xmldocs' warning caused by missing description
        sched: Use macro for magic number of -1 for setparam
        sched: Robustify topology setup
        sched: Fix sched_setparam() policy == -1 logic
        sched: Allow wait_on_bit_action() functions to support a timeout
        sched: Remove proliferation of wait_on_bit() action functions
        sched/numa: Revert "Use effective_load() to balance NUMA loads"
        sched: Fix static_key race with sched_feat()
        sched: Remove extra static_key*() function indirection
        sched/rt: Fix replenish_dl_entity() comments to match the current upstream code
        sched: Transform resched_task() into resched_curr()
        sched/deadline: Kill task_struct->pi_top_task
        sched: Rework check_for_tasks()
        sched/rt: Enqueue just unthrottled rt_rq back on the stack in __disable_runtime()
        sched/fair: Disable runtime_enabled on dying rq
        sched/numa: Change scan period code to match intent
        sched/numa: Rework best node setting in task_numa_migrate()
        sched/numa: Examine a task move when examining a task swap
        sched/numa: Simplify task_numa_compare()
        sched/numa: Use effective_load() to balance NUMA loads
        ...
      98959948
    • L
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ef35ad26
      Linus Torvalds 提交于
      Pull perf changes from Ingo Molnar:
       "Kernel side changes:
      
         - Consolidate the PMU interrupt-disabled code amongst architectures
           (Vince Weaver)
      
         - misc fixes
      
        Tooling changes (new features, user visible changes):
      
         - Add support for pagefault tracing in 'trace', please see multiple
           examples in the changeset messages (Stanislav Fomichev).
      
         - Add pagefault statistics in 'trace' (Stanislav Fomichev)
      
         - Add header for columns in 'top' and 'report' TUI browsers (Jiri
           Olsa)
      
         - Add pagefault statistics in 'trace' (Stanislav Fomichev)
      
         - Add IO mode into timechart command (Stanislav Fomichev)
      
         - Fallback to syscalls:* when raw_syscalls:* is not available in the
           perl and python perf scripts.  (Daniel Bristot de Oliveira)
      
         - Add --repeat global option to 'perf bench' to be used in benchmarks
           such as the existing 'futex' one, that was modified to use it
           instead of a local option.  (Davidlohr Bueso)
      
         - Fix fd -> pathname resolution in 'trace', be it using /proc or a
           vfs_getname probe point.  (Arnaldo Carvalho de Melo)
      
         - Add suggestion of how to set perf_event_paranoid sysctl, to help
           non-root users trying tools like 'trace' to get a working
           environment.  (Arnaldo Carvalho de Melo)
      
         - Updates from trace-cmd for traceevent plugin_kvm plus args cleanup
           (Steven Rostedt, Jan Kiszka)
      
         - Support S/390 in 'perf kvm stat' (Alexander Yarygin)
      
        Tooling infrastructure changes:
      
         - Allow reserving a row for header purposes in the hists browser
           (Arnaldo Carvalho de Melo)
      
         - Various fixes and prep work related to supporting Intel PT (Adrian
           Hunter)
      
         - Introduce multiple debug variables control (Jiri Olsa)
      
         - Add callchain and additional sample information for python scripts
           (Joseph Schuchart)
      
         - More prep work to support Intel PT: (Adrian Hunter)
           - Polishing 'script' BTS output
           - 'inject' can specify --kallsym
           - VDSO is per machine, not a global var
           - Expose data addr lookup functions previously private to 'script'
           - Large mmap fixes in events processing
      
         - Include standard stringify macros in power pc code (Sukadev
           Bhattiprolu)
      
        Tooling cleanups:
      
         - Convert open coded equivalents to asprintf() (Andy Shevchenko)
      
         - Remove needless reassignments in 'trace' (Arnaldo Carvalho de Melo)
      
         - Cache the is_exit syscall test in 'trace) (Arnaldo Carvalho de
           Melo)
      
         - No need to reimplement err() in 'perf bench sched-messaging', drop
           barf().  (Davidlohr Bueso).
      
         - Remove ev_name argument from perf_evsel__hists_browse, can be
           obtained from the other parameters.  (Jiri Olsa)
      
        Tooling fixes:
      
         - Fix memory leak in the 'sched-messaging' perf bench test.
           (Davidlohr Bueso)
      
         - The -o and -n 'perf bench mem' options are mutually exclusive, emit
           error when both are specified.  (Davidlohr Bueso)
      
         - Fix scrollbar refresh row index in the ui browser, problem exposed
           now that headers will be added and will be allowed to be switched
           on/off.  (Jiri Olsa)
      
         - Handle the num array type in python properly (Sebastian Andrzej
           Siewior)
      
         - Fix wrong condition for allocation failure (Jiri Olsa)
      
         - Adjust callchain based on DWARF debug info on powerpc (Sukadev
           Bhattiprolu)
      
         - Fix a risk for doing free on uninitialized pointer in traceevent
           lib (Rickard Strandqvist)
      
         - Update attr test with PERF_FLAG_FD_CLOEXEC flag (Jiri Olsa)
      
         - Enable close-on-exec flag on perf file descriptor (Yann Droneaud)
      
         - Fix build on gcc 4.4.7 (Arnaldo Carvalho de Melo)
      
         - Event ordering fixes (Jiri Olsa)"
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (123 commits)
        Revert "perf tools: Fix jump label always changing during tracing"
        perf tools: Fix perf usage string leftover
        perf: Check permission only for parent tracepoint event
        perf record: Store PERF_RECORD_FINISHED_ROUND only for nonempty rounds
        perf record: Always force PERF_RECORD_FINISHED_ROUND event
        perf inject: Add --kallsyms parameter
        perf tools: Expose 'addr' functions so they can be reused
        perf session: Fix accounting of ordered samples queue
        perf powerpc: Include util/util.h and remove stringify macros
        perf tools: Fix build on gcc 4.4.7
        perf tools: Add thread parameter to vdso__dso_findnew()
        perf tools: Add dso__type()
        perf tools: Separate the VDSO map name from the VDSO dso name
        perf tools: Add vdso__new()
        perf machine: Fix the lifetime of the VDSO temporary file
        perf tools: Group VDSO global variables into a structure
        perf session: Add ability to skip 4GiB or more
        perf session: Add ability to 'skip' a non-piped event stream
        perf tools: Pass machine to vdso__dso_findnew()
        perf tools: Add dso__data_size()
        ...
      ef35ad26
    • L
      Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8efb90cf
      Linus Torvalds 提交于
      Pull locking updates from Ingo Molnar:
       "The main changes in this cycle are:
      
         - big rtmutex and futex cleanup and robustification from Thomas
           Gleixner
         - mutex optimizations and refinements from Jason Low
         - arch_mutex_cpu_relax() removal and related cleanups
         - smaller lockdep tweaks"
      
      * 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
        arch, locking: Ciao arch_mutex_cpu_relax()
        locking/lockdep: Only ask for /proc/lock_stat output when available
        locking/mutexes: Optimize mutex trylock slowpath
        locking/mutexes: Try to acquire mutex only if it is unlocked
        locking/mutexes: Delete the MUTEX_SHOW_NO_WAITER macro
        locking/mutexes: Correct documentation on mutex optimistic spinning
        rtmutex: Make the rtmutex tester depend on BROKEN
        futex: Simplify futex_lock_pi_atomic() and make it more robust
        futex: Split out the first waiter attachment from lookup_pi_state()
        futex: Split out the waiter check from lookup_pi_state()
        futex: Use futex_top_waiter() in lookup_pi_state()
        futex: Make unlock_pi more robust
        rtmutex: Avoid pointless requeueing in the deadlock detection chain walk
        rtmutex: Cleanup deadlock detector debug logic
        rtmutex: Confine deadlock logic to futex
        rtmutex: Simplify remove_waiter()
        rtmutex: Document pi chain walk
        rtmutex: Clarify the boost/deboost part
        rtmutex: No need to keep task ref for lock owner check
        rtmutex: Simplify and document try_to_take_rtmutex()
        ...
      8efb90cf
    • L
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5bda4f63
      Linus Torvalds 提交于
      Pull RCU changes from Ingo Molar:
       "The main changes:
      
         - torture-test updates
         - callback-offloading changes
         - maintainership changes
         - update RCU documentation
         - miscellaneous fixes"
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (32 commits)
        rcu: Allow for NULL tick_nohz_full_mask when nohz_full= missing
        rcu: Fix a sparse warning in rcu_report_unblock_qs_rnp()
        rcu: Fix a sparse warning in rcu_initiate_boost()
        rcu: Fix __rcu_reclaim() to use true/false for bool
        rcu: Remove CONFIG_PROVE_RCU_DELAY
        rcu: Use __this_cpu_read() instead of per_cpu_ptr()
        rcu: Don't use NMIs to dump other CPUs' stacks
        rcu: Bind grace-period kthreads to non-NO_HZ_FULL CPUs
        rcu: Simplify priority boosting by putting rt_mutex in rcu_node
        rcu: Check both root and current rcu_node when setting up future grace period
        rcu: Allow post-unlock reference for rt_mutex
        rcu: Loosen __call_rcu()'s rcu_head alignment constraint
        rcu: Eliminate read-modify-write ACCESS_ONCE() calls
        rcu: Remove redundant ACCESS_ONCE() from tick_do_timer_cpu
        rcu: Make rcu node arrays static const char * const
        signal: Explain local_irq_save() call
        rcu: Handle obsolete references to TINY_PREEMPT_RCU
        rcu: Document deadlock-avoidance information for rcu_read_unlock()
        scripts: Teach get_maintainer.pl about the new "R:" tag
        rcu: Update rcu torture maintainership filename patterns
        ...
      5bda4f63
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · a45c657f
      Linus Torvalds 提交于
      Pull m68k changes from Geert Uytterhoeven:
       "Extremely non-spectacular changes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k/sun3: Remove define statement no longer needed
        zorro: Use ARRAY_SIZE
      a45c657f
    • L
      Merge tag 'please-pull-misc-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 489f50be
      Linus Torvalds 提交于
      Pull ia64 cleanups from Tony Luck:
       "Miscellaneous ia64 specific cleanup"
      
      * tag 'please-pull-misc-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        [IA64] sn: Do not needlessly convert between pointers and integers
        [IA64] sn: Fix zeroing of PDAs
      489f50be
    • L
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 5167d09f
      Linus Torvalds 提交于
      Pull arm64 updates from Will Deacon:
       "Once again, Catalin's off on holiday and I'm looking after the arm64
        tree.  Please can you pull the following arm64 updates for 3.17?
      
        Note that this branch also includes the new GICv3 driver (merged via a
        stable tag from Jason's irqchip tree), since there is a fix for older
        binutils on top.
      
        Changes include:
         - context tracking support (NO_HZ_FULL) which narrowly missed 3.16
         - vDSO layout rework following Andy's work on x86
         - TEXT_OFFSET fuzzing for bootloader testing
         - /proc/cpuinfo tidy-up
         - preliminary work to support 48-bit virtual addresses, but this is
           currently disabled until KVM has been ported to use it (the patches
           do, however, bring some nice clean-up)
         - boot-time CPU sanity checks (especially useful on heterogenous
           systems)
         - support for syscall auditing
         - support for CC_STACKPROTECTOR
         - defconfig updates"
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (55 commits)
        arm64: add newline to I-cache policy string
        Revert "arm64: dmi: Add SMBIOS/DMI support"
        arm64: fpsimd: fix a typo in fpsimd_save_partial_state ENDPROC
        arm64: don't call break hooks for BRK exceptions from EL0
        arm64: defconfig: enable devtmpfs mount option
        arm64: vdso: fix build error when switching from LE to BE
        arm64: defconfig: add virtio support for running as a kvm guest
        arm64: gicv3: Allow GICv3 compilation with older binutils
        arm64: fix soft lockup due to large tlb flush range
        arm64/crypto: fix makefile rule for aes-glue-%.o
        arm64: Do not invoke audit_syscall_* functions if !CONFIG_AUDIT_SYSCALL
        arm64: Fix barriers used for page table modifications
        arm64: Add support for 48-bit VA space with 64KB page configuration
        arm64: asm/pgtable.h pmd/pud definitions clean-up
        arm64: Determine the vmalloc/vmemmap space at build time based on VA_BITS
        arm64: Clean up the initial page table creation in head.S
        arm64: Remove asm/pgtable-*level-types.h files
        arm64: Remove asm/pgtable-*level-hwdef.h files
        arm64: Convert bool ARM64_x_LEVELS to int ARM64_PGTABLE_LEVELS
        arm64: mm: Implement 4 levels of translation tables
        ...
      5167d09f
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 8533ce72
      Linus Torvalds 提交于
      Pull KVM changes from Paolo Bonzini:
       "These are the x86, MIPS and s390 changes; PPC and ARM will come in a
        few days.
      
        MIPS and s390 have little going on this release; just bugfixes, some
        small, some larger.
      
        The highlights for x86 are nested VMX improvements (Jan Kiszka),
        optimizations for old processor (up to Nehalem, by me and Bandan Das),
        and a lot of x86 emulator bugfixes (Nadav Amit).
      
        Stephen Rothwell reported a trivial conflict with the tracing branch"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (104 commits)
        x86/kvm: Resolve shadow warnings in macro expansion
        KVM: s390: rework broken SIGP STOP interrupt handling
        KVM: x86: always exit on EOIs for interrupts listed in the IOAPIC redir table
        KVM: vmx: remove duplicate vmx_mpx_supported() prototype
        KVM: s390: Fix memory leak on busy SIGP stop
        x86/kvm: Resolve shadow warning from min macro
        kvm: Resolve missing-field-initializers warnings
        Replace NR_VMX_MSR with its definition
        KVM: x86: Assertions to check no overrun in MSR lists
        KVM: x86: set rflags.rf during fault injection
        KVM: x86: Setting rflags.rf during rep-string emulation
        KVM: x86: DR6/7.RTM cannot be written
        KVM: nVMX: clean up nested_release_vmcs12 and code around it
        KVM: nVMX: fix lifetime issues for vmcs02
        KVM: x86: Defining missing x86 vectors
        KVM: x86: emulator injects #DB when RFLAGS.RF is set
        KVM: x86: Cleanup of rflags.rf cleaning
        KVM: x86: Clear rflags.rf on emulated instructions
        KVM: x86: popf emulation should not change RF
        KVM: x86: Clearing rflags.rf upon skipped emulated instruction
        ...
      8533ce72
    • L
      Merge tag 'trace-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · c9b88e95
      Linus Torvalds 提交于
      Pull tracing filter cleanups from Steven Rostedt:
       "Oleg Nesterov did several clean ups with the tracing filter code.  As
        he found some small bugs that went into 3.16, and these changes were
        based on that, I had to apply his changes to a separate branch than my
        main development branch.
      
        This was based on work that was already pulled into 3.16, and is a
        separate pull request to keep from having local merges in my pull
        request"
      
      * tag 'trace-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Kill "filter_string" arg of replace_preds()
        tracing: Change apply_subsystem_event_filter() paths to check file->system == dir
        tracing: Kill ftrace_event_call->files
        tracing/uprobes: Kill the dead TRACE_EVENT_FL_USE_CALL_FILTER logic
        tracing: Kill call_filter_disable()
        tracing: Kill destroy_call_preds()
        tracing: Kill destroy_preds() and destroy_file_preds()
      c9b88e95