1. 13 Aug, 2014 7 commits
  2. 05 Aug, 2014 7 commits
    • Linus Torvalds's avatar
      Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 98a96f20
      Linus Torvalds authored
      Pull x86 vdso updates from Ingo Molnar:
       "Further simplifications and improvements to the VDSO code, by Andy
      * '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
    • Linus Torvalds's avatar
      Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5637a2a3
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d782cebd
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8556d44f
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ce474796
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 76f09aa4
      Linus Torvalds authored
      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
         - 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()
    • Linus Torvalds's avatar
      Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e9c9eeca
      Linus Torvalds authored
      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
      * '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
  3. 04 Aug, 2014 22 commits
    • Linus Torvalds's avatar
      Merge branches 'x86-build-for-linus', 'x86-cleanups-for-linus' and... · 19d402c1
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 98959948
      Linus Torvalds authored
      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,
         * 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
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ef35ad26
      Linus Torvalds authored
      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
         - 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
         - 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
        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
         - 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
         - Fix wrong condition for allocation failure (Jiri Olsa)
         - Adjust callchain based on DWARF debug info on powerpc (Sukadev
         - 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()
    • Linus Torvalds's avatar
      Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8efb90cf
      Linus Torvalds authored
      Pull locking updates from Ingo Molnar:
       "The main changes in this cycle are:
         - big rtmutex and futex cleanup and robustification from Thomas
         - 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()
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5bda4f63
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · a45c657f
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'please-pull-misc-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 489f50be
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 5167d09f
      Linus Torvalds authored
      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
         - 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
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 8533ce72
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'trace-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · c9b88e95
      Linus Torvalds authored
      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
      * 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()
    • Linus Torvalds's avatar
      Merge tag 'trace-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · b8c0aa46
      Linus Torvalds authored
      Pull tracing updates from Steven Rostedt:
       "This pull request has a lot of work done.  The main thing is the
        changes to the ftrace function callback infrastructure.  It's
        introducing a way to allow different functions to call directly
        different trampolines instead of all calling the same "mcount" one.
        The only user of this for now is the function graph tracer, which
        always had a different trampoline, but the function tracer trampoline
        was called and did basically nothing, and then the function graph
        tracer trampoline was called.  The difference now, is that the
        function graph tracer trampoline can be called directly if a function
        is only being traced by the function graph trampoline.  If function
        tracing is also happening on the same function, the old way is still
        The accounting for this takes up more memory when function graph
        tracing is activated, as it needs to keep track of which functions it
        uses.  I have a new way that wont take as much memory, but it's not
        ready yet for this merge window, and will have to wait for the next
        Another big change was the removal of the ftrace_start/stop() calls
        that were used by the suspend/resume code that stopped function
        tracing when entering into suspend and resume paths.  The stop of
        ftrace was done because there was some function that would crash the
        system if one called smp_processor_id()! The stop/start was a big
        hammer to solve the issue at the time, which was when ftrace was first
        introduced into Linux.  Now ftrace has better infrastructure to debug
        such issues, and I found the problem function and labeled it with
        "notrace" and function tracing can now safely be activated all the way
        down into the guts of suspend and resume
        Other changes include clean ups of uprobe code, clean up of the
        trace_seq() code, and other various small fixes and clean ups to
        ftrace and tracing"
      * tag 'trace-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (57 commits)
        ftrace: Add warning if tramp hash does not match nr_trampolines
        ftrace: Fix trampoline hash update check on rec->flags
        ring-buffer: Use rb_page_size() instead of open coded head_page size
        ftrace: Rename ftrace_ops field from trampolines to nr_trampolines
        tracing: Convert local function_graph functions to static
        ftrace: Do not copy old hash when resetting
        tracing: let user specify tracing_thresh after selecting function_graph
        ring-buffer: Always run per-cpu ring buffer resize with schedule_work_on()
        tracing: Remove function_trace_stop and HAVE_FUNCTION_TRACE_MCOUNT_TEST
        s390/ftrace: remove check of obsolete variable function_trace_stop
        arm64, ftrace: Remove check of obsolete variable function_trace_stop
        Blackfin: ftrace: Remove check of obsolete variable function_trace_stop
        metag: ftrace: Remove check of obsolete variable function_trace_stop
        microblaze: ftrace: Remove check of obsolete variable function_trace_stop
        MIPS: ftrace: Remove check of obsolete variable function_trace_stop
        parisc: ftrace: Remove check of obsolete variable function_trace_stop
        sh: ftrace: Remove check of obsolete variable function_trace_stop
        sparc64,ftrace: Remove check of obsolete variable function_trace_stop
        tile: ftrace: Remove check of obsolete variable function_trace_stop
        ftrace: x86: Remove check of obsolete variable function_trace_stop
    • Linus Torvalds's avatar
      Merge tag 'ktest-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest · c7ed326f
      Linus Torvalds authored
      Pull config-bisect changes from Steven Rostedt:
       "The big change here is the rewrite of config-bisect.  The old way
        never worked properly as it assumed the bad config was a subset of the
        good config, and just found the config that would break the build.
        The new way does a diff of the bad config verses the good config and
        makes the similar until it finds that one config works and the other
        does not and reports the config that makes that difference.  The two
        configs do not need to be related.  It is much more useful now:
      * tag 'ktest-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
        ktest: Update documentation on config_bisect
        ktest: Add the config bisect manual back
        ktest: Remove unused functions
        ktest: Put back in the CONFIG_BISECT_CHECK
        ktest: Rewrite the config-bisect to actually work
        ktest: Some cleanup for improving readability
        ktest: add 2nd parameter of run_command() to set the redirect target file
    • Linus Torvalds's avatar
      Merge tag 'clk-for-linus-3.17' of git://git.linaro.org/people/mike.turquette/linux · e4ca4308
      Linus Torvalds authored
      Pull clock framework updates from Mike Turquette:
       "The clock framework changes for 3.17 are mostly additions of new clock
        drivers and fixes/enhancements to existing clock drivers.  There are
        also some non-critical fixes and improvements to the framework core.
        Changes to the clock framework core include:
         - improvements to printks on errors
         - flattening the previously hierarchal structure of per-clock entries
           in debugfs
         - allow per-clock debugfs entries that are specific to a particular
           clock driver
         - configure initial clock parent and/or initial clock rate from
           Device Tree
         - several feature enhancements to the composite clock type
         - misc fixes
        New clock drivers added include:
         - TI Palmas PMIC
         - Allwinner A23 SoC
         - Qualcomm APQ8084 and IPQ8064 SoCs
         - Rockchip rk3188, rk3066 and rk3288 SoCs
         - STMicroelectronics STiH407 SoC
         - Cirrus Logic CLPS711X SoC
        Many fixes, feature enhancements and further clock tree support for
        existing clock drivers also were merged, such as Samsung's "ARMCLK
        down" power saving feature for their Exynos4 & Exynos5 SoCs"
      * tag 'clk-for-linus-3.17' of git://git.linaro.org/people/mike.turquette/linux: (86 commits)
        clk: Add missing of_clk_set_defaults export
        clk: checking wrong variable in __set_clk_parents()
        clk: Propagate any error return from debug_init()
        clk: clps711x: Add DT bindings documentation
        clk: Add CLPS711X clk driver
        clk: st: Use round to closest divider flag
        clk: st: Update frequency tables for fs660c32 and fs432c65
        clk: st: STiH407: Support for clockgenA9
        clk: st: STiH407: Support for clockgenD0/D2/D3
        clk: st: STiH407: Support for clockgenC0
        clk: st: Add quadfs reset handling
        clk: st: Add polarity bit indication
        clk: st: STiH407: Support for clockgenA0
        clk: st: STiH407: Support for A9 MUX Clocks
        clk: st: STiH407: Support for Flexgen Clocks
        clk: st: Adds Flexgen clock binding
        clk: st: Remove uncessary (void *) cast
        clk: st: use static const for clkgen_pll_data tables
        clk: st: use static const for stm_fs tables
        clk: st: Update ST clock binding documentation
    • Linus Torvalds's avatar
      Merge branch 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · e17acfdc
      Linus Torvalds authored
      Pull libata changes from Tejun Heo:
       "Except for a few, all the changes are for ahci platform drivers for
        the arm devices.  Nothing too interesting or dangerous.  There's one
        merge from libata/for-3.16-fixes to pull in dependent changes"
      * 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (23 commits)
        ata: libahci: Silence compiler warning on 64-bit
        Documentation: bindings: document the sub-nodes AHCI bindings
        ata: ahci_platform: add a generic AHCI compatible
        ata: libahci: allow to use multiple PHYs
        ata: libahci_platform: move port_map parameters into the AHCI structure
        ahci: imx: add missing clk_disable_unprepare() on error in imx_sata_enable()
        ahci_xgene: Use correct OOB tunning parameters for APM X-Gene SoC AHCI SATA Host controller driver.
        ahci_xgene: Fix the watermark threshold for the APM X-Gene SATA host controller driver.
        ahci: st: Make of_device_id array const
        sata_sil24: Identify which card suffered IRQ status error
        ahci: st: Provide DT bindings for ST's SATA implementation
        ata: Add support for the Tegra124 SATA controller
        ata: ahci_platform: Increase AHCI_MAX_CLKS to 4
        of: Add NVIDIA Tegra SATA controller binding
        dt-bindings: ata: document ability to disable spread-spectrum clock
        ata: ahci_imx: add disable for spread-spectrum
        dt-bindings: ata: add ahci_imx electrical properties
        ata: ahci_imx: allow hardware parameters to be specified in DT
        dt-bindings: ata: create bindings for imx sata controller
        ata: pata_samsung_cf: removes s5pc100 related ata codes
    • Linus Torvalds's avatar
      Merge branch 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 47dfe403
      Linus Torvalds authored
      Pull cgroup changes from Tejun Heo:
       "Mostly changes to get the v2 interface ready.  The core features are
        mostly ready now and I think it's reasonable to expect to drop the
        devel mask in one or two devel cycles at least for a subset of
         - cgroup added a controller dependency mechanism so that block cgroup
           can depend on memory cgroup.  This will be used to finally support
           IO provisioning on the writeback traffic, which is currently being
         - The v2 interface now uses a separate table so that the interface
           files for the new interface are explicitly declared in one place.
           Each controller will explicitly review and add the files for the
           new interface.
         - cpuset is getting ready for the hierarchical behavior which is in
           the similar style with other controllers so that an ancestor's
           configuration change doesn't change the descendants' configurations
           irreversibly and processes aren't silently migrated when a CPU or
           node goes down.
        All the changes are to the new interface and no behavior changed for
        the multiple hierarchies"
      * 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (29 commits)
        cpuset: fix the WARN_ON() in update_nodemasks_hier()
        cgroup: initialize cgrp_dfl_root_inhibit_ss_mask from !->dfl_files test
        cgroup: make CFTYPE_ONLY_ON_DFL and CFTYPE_NO_ internal to cgroup core
        cgroup: distinguish the default and legacy hierarchies when handling cftypes
        cgroup: replace cgroup_add_cftypes() with cgroup_add_legacy_cftypes()
        cgroup: rename cgroup_subsys->base_cftypes to ->legacy_cftypes
        cgroup: split cgroup_base_files[] into cgroup_{dfl|legacy}_base_files[]
        cpuset: export effective masks to userspace
        cpuset: allow writing offlined masks to cpuset.cpus/mems
        cpuset: enable onlined cpu/node in effective masks
        cpuset: refactor cpuset_hotplug_update_tasks()
        cpuset: make cs->{cpus, mems}_allowed as user-configured masks
        cpuset: apply cs->effective_{cpus,mems}
        cpuset: initialize top_cpuset's configured masks at mount
        cpuset: use effective cpumask to build sched domains
        cpuset: inherit ancestor's masks if effective_{cpus, mems} becomes empty
        cpuset: update cs->effective_{cpus, mems} when config changes
        cpuset: update cpuset->effective_{cpus,mems} at hotplug
        cpuset: add cs->effective_cpus and cs->effective_mems
        cgroup: clean up sane_behavior handling
    • Linus Torvalds's avatar
      Merge branch 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · f2a84170
      Linus Torvalds authored
      Pull percpu updates from Tejun Heo:
       - Major reorganization of percpu header files which I think makes
         things a lot more readable and logical than before.
       - percpu-refcount is updated so that it requires explicit destruction
         and can be reinitialized if necessary.  This was pulled into the
         block tree to replace the custom percpu refcnting implemented in
       - In the process, percpu and percpu-refcount got cleaned up a bit
      * 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (21 commits)
        percpu-refcount: implement percpu_ref_reinit() and percpu_ref_is_zero()
        percpu-refcount: require percpu_ref to be exited explicitly
        percpu-refcount: use unsigned long for pcpu_count pointer
        percpu-refcount: add helpers for ->percpu_count accesses
        percpu-refcount: one bit is enough for REF_STATUS
        percpu-refcount, aio: use percpu_ref_cancel_init() in ioctx_alloc()
        workqueue: stronger test in process_one_work()
        workqueue: clear POOL_DISASSOCIATED in rebind_workers()
        percpu: Use ALIGN macro instead of hand coding alignment calculation
        percpu: invoke __verify_pcpu_ptr() from the generic part of accessors and operations
        percpu: preffity percpu header files
        percpu: use raw_cpu_*() to define __this_cpu_*()
        percpu: reorder macros in percpu header files
        percpu: move {raw|this}_cpu_*() definitions to include/linux/percpu-defs.h
        percpu: move generic {raw|this}_cpu_*_N() definitions to include/asm-generic/percpu.h
        percpu: only allow sized arch overrides for {raw|this}_cpu_*() ops
        percpu: reorganize include/linux/percpu-defs.h
        percpu: move accessors from include/linux/percpu.h to percpu-defs.h
        percpu: include/asm-generic/percpu.h should contain only arch-overridable parts
        percpu: introduce arch_raw_cpu_ptr()
    • Linus Torvalds's avatar
      Merge branch 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · c4c3f5fb
      Linus Torvalds authored
      Pull workqueue updates from Tejun Heo:
       "Lai has been doing a lot of cleanups of workqueue and kthread_work.
        No significant behavior change.  Just a lot of cleanups all over the
        place.  Some are a bit invasive but overall nothing too dangerous"
      * 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        kthread_work: remove the unused wait_queue_head
        kthread_work: wake up worker only when the worker is idle
        workqueue: use nr_node_ids instead of wq_numa_tbl_len
        workqueue: remove the misnamed out_unlock label in get_unbound_pool()
        workqueue: remove the stale comment in pwq_unbound_release_workfn()
        workqueue: move rescuer pool detachment to the end
        workqueue: unfold start_worker() into create_worker()
        workqueue: remove @wakeup from worker_set_flags()
        workqueue: remove an unneeded UNBOUND test before waking up the next worker
        workqueue: wake regular worker if need_more_worker() when rescuer leave the pool
        workqueue: alloc struct worker on its local node
        workqueue: reuse the already calculated pwq in try_to_grab_pending()
        workqueue: stronger test in process_one_work()
        workqueue: clear POOL_DISASSOCIATED in rebind_workers()
        workqueue: sanity check pool->cpu in wq_worker_sleeping()
        workqueue: clear leftover flags when detached
        workqueue: remove useless WARN_ON_ONCE()
        workqueue: use schedule_timeout_interruptible() instead of open code
        workqueue: remove the empty check in too_many_workers()
        workqueue: use "pool->cpu < 0" to stand for an unbound pool
    • Linus Torvalds's avatar
      Merge tag 'locks-v3.17-1' of git://git.samba.org/jlayton/linux · 1bff5988
      Linus Torvalds authored
      Pull file locking related changes from Jeff Layton:
       "Just a couple of changes from Christoph to start us down the road
        toward getting rid of the fl_owner_t typedef"
      * tag 'locks-v3.17-1' of git://git.samba.org/jlayton/linux:
        locks: purge fl_owner_t from fs/locks.c
        locks: typedef fl_owner_t to void *
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 3e7a716a
      Linus Torvalds authored
      Pull crypto update from Herbert Xu:
       - CTR(AES) optimisation on x86_64 using "by8" AVX.
       - arm64 support to ccp
       - Intel QAT crypto driver
       - Qualcomm crypto engine driver
       - x86-64 assembly optimisation for 3DES
       - CTR(3DES) speed test
       - move FIPS panic from module.c so that it only triggers on crypto
       - SP800-90A Deterministic Random Bit Generator (drbg).
       - more test vectors for ghash.
       - tweak self tests to catch partial block bugs.
       - misc fixes.
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (94 commits)
        crypto: drbg - fix failure of generating multiple of 2**16 bytes
        crypto: ccp - Do not sign extend input data to CCP
        crypto: testmgr - add missing spaces to drbg error strings
        crypto: atmel-tdes - Switch to managed version of kzalloc
        crypto: atmel-sha - Switch to managed version of kzalloc
        crypto: testmgr - use chunks smaller than algo block size in chunk tests
        crypto: qat - Fixed SKU1 dev issue
        crypto: qat - Use hweight for bit counting
        crypto: qat - Updated print outputs
        crypto: qat - change ae_num to ae_id
        crypto: qat - change slice->regions to slice->region
        crypto: qat - use min_t macro
        crypto: qat - remove unnecessary parentheses
        crypto: qat - remove unneeded header
        crypto: qat - checkpatch blank lines
        crypto: qat - remove unnecessary return codes
        crypto: Resolve shadow warnings
        crypto: ccp - Remove "select OF" from Kconfig
        crypto: caam - fix DECO RSR polling
        crypto: qce - Let 'DEV_QCE' depend on both HAS_DMA and HAS_IOMEM
    • Sylwester Nawrocki's avatar
      clk: Add missing of_clk_set_defaults export · b11a6fac
      Sylwester Nawrocki authored
      The of_clk_set_defaults() function is used in subsystems which can
      be built as module. Add the missing symbol export entry so there
      is no build errors like:
      "ERROR: "of_clk_set_defaults" [drivers/i2c/i2c-core.ko] undefined!".
      Fixes commit: 86be408b
      "clk: Support for clock parents and rates assigned from device tree"
      Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
      Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
      Acked-by: default avatarWolfram Sang <wsa@the-dreams.de>
      Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
    • Linus Torvalds's avatar
      Merge tag 'edac_for_3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · c2df436b
      Linus Torvalds authored
      Pull EDAC changes from Borislav Petkov:
       "EDAC queue for 3.17:
         - One new edac driver for Intel E3-12xx DRAM controllers.
         - Out-of-subsystem changes are making the non-atomic iomem 64-bit
           accessors' naming explicit to show both exact order of the 32-bit
           accesses and the non-atomicity of the 64-bit access.
           Usage locations are more verbose now as to what access is exactly
           being done vs having a not-very telling "readq" there, for example.
           This is needed by E3-12xx hardware where certain mmapped registers
           cannot be accessed with requests crossing a dword boundary.
           From Jason Baron.
         - Extending AMD MCE signatures to a new model 60h in family 15h, from
           Aravind Gopalakrishnan.
         - An unsigned check cleanup, from Fabian Frederick"
      * tag 'edac_for_3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        EDAC, MCE, AMD: Add MCE decoding for F15h M60h
        MAINTAINERS: add ie31200_edac entry
        ie31200_edac: Allocate mci and map mchbar first
        ie31200_edac: Introduce the driver
        x38_edac: make use of lo_hi_readq()
        readq/writeq: Add explicit lo_hi_[read|write]_q and hi_lo_[read|write]_q
        EDAC, edac_module.c: Remove unnecessary test on unsigned value
    • Linus Torvalds's avatar
      Merge tag 'pci-v3.17-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · f74ad8df
      Linus Torvalds authored
      Pull PCI updates from Bjorn Helgaas:
       "I'll be on vacation until Aug 11, and I suspect the merge window will
        open before then, so I'm sending this to you early.  There are more
        things I'd like to get into v3.17, so I hope to send another pull
        request soon after I return.
        The most notable pieces here are:
         - Support BARs up to 128GB (up from 8GB)
         - Fix SR-IOV resource assignment when we fail to expand a resource
         - Rework pciehp to handle a common hardware erratum
         - Cleanup MSI
         - Fix NIC renaming issue
         - Fix VGA default device issue on EFI systems
         - Fix ASPM configuration (previously we didn't enable it as expected)
        Alex Williamson has graciously agreed to take care of any major issues
        with this if you take it before I return.
        Resource management
          - Support BAR sizes up to 128GB (Yinghai Lu)
          - Keep original resource if we fail to expand it (Guo Chao)
          - Return conventional error values from pci_revert_fw_address() (Bjorn Helgaas)
          - Tidy resource assignment messages (Bjorn Helgaas)
          - Don't exclude low BIOS area for non-PCI cards (Christoph Schulz)
        PCI device hotplug
          - Prevent NULL dereference during pciehp probe (Andreas Noever)
          - Make pciehp pcie_wait_cmd() self-contained (Bjorn Helgaas)
          - Wait for pciehp hotplug command completion lazily (Bjorn Helgaas)
          - Compute pciehp timeout from hotplug command start time (Bjorn Helgaas)
          - Remove pciehp assumptions about which commands cause completion events (Bjorn Helgaas)
          - Clear pciehp Data Link Layer State Changed during init (Myron Stowe)
          - Remove pciehp struct controller.no_cmd_complete (Rajat Jain)
          - Remove cpqphp unnecessary null test (Fabian Frederick)
          - Remove "invalid IRQ" warning for hot-added PCIe ports (Jiang Liu)
          - Add DMA alias quirk for Intel 82801 bridge (Alex Williamson)
          - Add internal msix_clear_and_set_ctrl() (Yijing Wang)
          - Remove unused msi_enabled_mask() (Yijing Wang)
          - Cache Multiple Message Capable in struct msi_desc (Yijing Wang)
          - Add msi_setup_entry() to clean up initialization (Yijing Wang)
          - Remove unused msi_remove_pci_irq_vectors() (Yijing Wang)
          - Retrieve first MSI IRQ from msi_desc rather than pci_dev (Yijing Wang)
          - Remove unused list access in __pci_restore_msix_state() (Yijing Wang)
          - Use irq_get_msi_desc() to simplify code (Yijing Wang)
        Generic host bridge driver
          - Fix GPL v2 license string typo (Bjorn Helgaas)
        Marvell MVEBU
          - Fix GPL v2 license string typo (Thierry Reding)
        NVIDIA Tegra
          - Use correct initial HW settings (Phil Edworthy)
          - Remove rcar_pcie_setup_window() resource argument (Phil Edworthy)
          - Fix GPL v2 license string typo (Thierry Reding)
        Renesas R-Car
          - Remove redundant config accessor register checks (Sergei Shtylyov)
          - Fix GPL v2 license string typo (Bjorn Helgaas)
          - Factor secondary bus reset logic (Gavin Shan)
          - Remove duplicate powerpc reset logic (Gavin Shan)
          - Rework default VGA detection for EFI (Bruno Prémont)
          - Fix sysfs "acpi_index" and "label" errors for NIC renaming (Simone Gotti)
          - Configure ASPM at pci_enable_device()-time (Vidya Sagar)
          - Add include/linux/pci_ids.h include guard (Rasmus Villemoes)"
      * tag 'pci-v3.17-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (38 commits)
        PCI/MSI: Use irq_get_msi_desc() to simplify code
        PCI/MSI: Remove unused list access in __pci_restore_msix_state()
        PCI/MSI: Retrieve first MSI IRQ from msi_desc rather than pci_dev
        PCI/MSI: Remove unused function msi_remove_pci_irq_vectors()
        PCI/MSI: Add msi_setup_entry() to clean up MSI initialization
        PCI: Configure ASPM when enabling device
        x86: don't exclude low BIOS area when allocating address space for non-PCI cards
        PCI: generic: Fix GPL v2 license string typo
        PCI: rcar: Fix GPL v2 license string typo
        PCI: tegra: Fix GPL v2 license string typo
        PCI: mvebu: Fix GPL v2 license string typo
        PCI: Add include guard to include/linux/pci_ids.h
        x86, ia64: Move EFI_FB vga_default_device() initialization to pci_vga_fixup()
        PCI: Tidy resource assignment messages
        PCI: Return conventional error values from pci_revert_fw_address()
        PCI: Cleanup control flow
        PCI: Support BAR sizes up to 128GB
        PCI: cpqphp: Remove unnecessary null test before debugfs_remove()
        PCI: pciehp: Clear Data Link Layer State Changed during init
        PCI: Add bridge DMA alias quirk for Intel 82801 bridge
  4. 03 Aug, 2014 2 commits
  5. 02 Aug, 2014 2 commits
    • Dan Carpenter's avatar
      x86/pmc_atom: Silence shift wrapping warnings in pmc_sleep_tmr_show() · 4c51cb00
      Dan Carpenter authored
      I don't know if we really need 64 bits here but these variables are
      declared as u64 and it can't hurt to cast this so we prevent any shift
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Acked-by: default avatarAubrey Li <aubrey.li@linux.intel.com>
      Link: http://lkml.kernel.org/r/20140801082715.GE28869@mwanda
      Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · 3f9c08f7
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "A few fixes for ARM.  Some of these are correctness issues:
         - TLBs must be flushed after the old mappings are removed by the DMA
           mapping code, but before the new mappings are established.
         - An off-by-one entry error in the Keystone LPAE setup code.
        Fixes include:
         - ensuring that the identity mapping for LPAE does not remove the
           kernel image from the identity map.
         - preventing userspace from trapping into kgdb.
         - fixing a preemption issue in the Intel iwmmxt code.
         - fixing a build error with nommu.
        Other changes include:
         - Adding a note about which areas of memory are expected to be
           accessible while the identity mapping tables are in place"
      * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        ARM: 8124/1: don't enter kgdb when userspace executes a kgdb break instruction
        ARM: idmap: add identity mapping usage note
        ARM: 8115/1: LPAE: reduce damage caused by idmap to virtual memory layout
        ARM: fix alignment of keystone page table fixup
        ARM: 8112/1: only select ARM_PATCH_PHYS_VIRT if MMU is enabled
        ARM: 8100/1: Fix preemption disable in iwmmxt_task_enable()
        ARM: DMA: ensure that old section mappings are flushed from the TLB