1. 11 2月, 2015 23 次提交
  2. 10 2月, 2015 17 次提交
    • L
      Merge branch 'for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 3e8c04eb
      Linus Torvalds 提交于
      Pull libata changes from Tejun Heo:
       "Mostly driver-specific changes.  Nothing too noteworthy.
      
        This pull request contains three merges from for-3.19-fixes.  The
        first two are to pull ahci_xgene and sata_dwc_460ex fix commits which
        are depended upon by later changes.  The last one is to pull in a fix
        patch which missed the v3.19-rc window"
      
      * 'for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (24 commits)
        ahci_xgene: Fix the dma state machine lockup for the ATA_CMD_SMART PIO mode command.
        ata: libahci: Use of_platform_device_create only if supported
        sata_mv: Delete unnecessary checks before the function call "phy_power_off"
        ata: Delete unnecessary checks before the function call "pci_dev_put"
        ata: pata_platform: fix owner module reference mismatch for scsi host
        ata: ahci_platform: fix owner module reference mismatch for scsi host
        pata_pdc2027x: Use 64-bit timekeeping
        ata: libahci: Fix devres cleanup on failure
        ata: libahci: Allow using multiple regulators
        Documentation: bindings: Add the regulator property to the sub-nodes AHCI bindings
        ata: libahci: Clean-up the ahci_platform_en/disable_phys functions
        sata_rcar: extend PM methods
        sata_dwc_460ex: disable compilation on ARM and ARM64
        ata: libata-core: Remove unused function
        sata_dwc_460ex: convert to devm_kzalloc in ->probe()
        sata_dwc_460ex: remove extra message
        sata_dwc_460ex: use np local variable in ->probe()
        sata_dwc_460ex: fix most of the sparse warnings
        sata_dwc_460ex: enable COMPILE_TEST for the driver
        sata_dwc_460ex: remove redundant dev_set_drvdata
        ...
      3e8c04eb
    • L
      Merge branch 'for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 44dbf058
      Linus Torvalds 提交于
      Pull workqueue changes from Tejun Heo:
       "One cosmetic cleanup patch"
      
      * 'for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue.h: remove loops of single statement macros
      44dbf058
    • L
      Merge branch 'for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 15763db1
      Linus Torvalds 提交于
      Pull cgroup changes from Tejun Heo:
       "Three mostly trivial patches.  The biggest change is that blkio is now
        initialized before memcg which will be needed to make memcg and blkcg
        cooperate on writeback IOs"
      
      * 'for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup: add dummy css_put() for !CONFIG_CGROUPS
        cgroup: reorder SUBSYS(blkio) in cgroup_subsys.h
        Update of Documentation/cgroups/00-INDEX
      15763db1
    • L
      Merge branch 'for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · c2189e3a
      Linus Torvalds 提交于
      Pull percpu changes from Tejun Heo:
       "Nothing too interesting.  One cleanup patch and another to add a
        trivial state check function"
      
      * 'for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        percpu_ref: implement percpu_ref_is_dying()
        percpu_ref: remove unnecessary ACCESS_ONCE() in percpu_ref_tryget_live()
      c2189e3a
    • L
      Merge tag 'edac_for_3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · ed824a62
      Linus Torvalds 提交于
      Pull EDAC updates from Borislav Petkov:
      
       - a new synopsys_edac.c driver for the Synopsys DDR controller, from
         Punnaiah Choudary Kalluri.
      
       - minor fixes/cleanups all around
      
       - Mauro and I are adding the repo URLs to MAINTAINERS since people
         asked for trees to base upcoming work on.
      
      * tag 'edac_for_3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        EDAC: Add repo URLs to MAINTAINERS
        EDAC, mv64x60_edac: Fix an error code in probe()
        EDAC: edac_mc_sysfs: Make stuff static
        EDAC: Fix the leak of mci->bus->name when bus_register fails
        edac: i5100_edac: Remove unused i5100_recmema_dm_buf_id
        EDAC, synps: Add EDAC support for zynq ddr ecc controller
        mpc85xx_edac: Fix a typo in comments
        EDAC, mce_amd_inj: Fix sparse non static symbol warning
      ed824a62
    • L
      Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e07e0d4c
      Linus Torvalds 提交于
      Pull x86 RAS update from Ingo Molnar:
       "The changes in this cycle were:
      
         - allow mmcfg access to APEI error injection handlers
      
         - improve MCE error messages
      
         - smaller cleanups"
      
      * 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, mce: Fix sparse errors
        x86, mce: Improve timeout error messages
        ACPI, EINJ: Enhance error injection tolerance level
      e07e0d4c
    • L
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 57d36294
      Linus Torvalds 提交于
      Pull x86 mm cleanups from Ingo Molnar:
       "Two cleanups: simplify parse_setup_data() and sanitize_e820_map()
        usage"
      
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, e820: Clean up sanitize_e820_map() users
        x86, setup: Let early_memremap() handle page alignment
      57d36294
    • L
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a8f76842
      Linus Torvalds 提交于
      Pull x86 SoC updates from Ingo Molnar:
       "Various Intel Atom SoC updates (mostly to enhance debuggability), plus
        an apb_timer cleanup"
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: pmc_atom: Expose contents of PSS
        x86: pmc_atom: Clean up init function
        x86: pmc-atom: Remove unused macro
        x86: pmc_atom: don%27t check for NULL twice
        x86: pmc-atom: Assign debugfs node as soon as possible
        x86/platform: Remove unused function from apb_timer.c
      a8f76842
    • L
      Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c93eceda
      Linus Torvalds 提交于
      Pull x86 fpu updates from Ingo Molnar:
       "Initial round of kernel_fpu_begin/end cleanups from Oleg Nesterov,
        plus a cleanup from Borislav Petkov"
      
      * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, fpu: Fix math_state_restore() race with kernel_fpu_begin()
        x86, fpu: Don't abuse has_fpu in __kernel_fpu_begin/end()
        x86, fpu: Introduce per-cpu in_kernel_fpu state
        x86/fpu: Use a symbolic name for asm operand
      c93eceda
    • L
      Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 072bc448
      Linus Torvalds 提交于
      Pull EFI updates from Ingo Molnar:
       "Main changes:
      
         - Move efivarfs from the misc filesystem section to pseudo filesystem
      
         - Expose firmware platform size in sysfs
      
         - Improve robustness of get_memory_map() by removing assumptions on
           the size of efi_memory_desc_t.
      
        - various cleanups and fixes
      
        The biggest risk is the get_memory_map() change, which changes the way
        that both the arm64 and x86 EFI boot stub build the early memory map.
        There are no known regressions with it at the moment, BYMMV"
      
      * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        efi: Don't look for chosen@0 node on DT platforms
        firmware: efi: Remove unneeded guid unparse
        efi/libstub: Call get_memory_map() to obtain map and desc sizes
        efi: Small leak on error in runtime map code
        efi: rtc-efi: Mark UIE as unsupported
        arm64/efi: efistub: Apply __init annotation
        efi: Expose underlying UEFI firmware platform size to userland
        efi: Rename efi_guid_unparse to efi_guid_to_str
        efi: Update the URLs for efibootmgr
        fs: Make efivarfs a pseudo filesystem, built by default with EFI
      072bc448
    • L
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 80f33a5f
      Linus Torvalds 提交于
      Pull x86 cleanups from Ingo Molnar:
       "Misc cleanups"
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/rtc: Remove duplicate const specifier
        x86, early_serial_console: Remove unnecessary check
        x86, early_serial_console: Remove unused macro XMTRDY
        x86, setup: Rename BOOT_ISDIGIT_H to BOOT_CTYPE_H
        x86, CPU: Fix trivial printk formatting issues with dmesg
      80f33a5f
    • L
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7453311d
      Linus Torvalds 提交于
      Pull x86 asm changes from Ingo Molnar:
       "The main changes in this cycle were the x86/entry and sysret
        enhancements from Andy Lutomirski, see merge commits 772a9aca and
        b57c0b51 for details"
      
      [ Exectutive summary: IST exceptions that interrupt user space will run
        on the regular kernel stack instead of the IST stack.  Which
        simplifies things particularly on return to user space.
      
        The sysret cleanup ends up simplifying the logic on when we can use
        sysret vs when we have to use iret.                - Linus ]
      
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86_64, entry: Remove the syscall exit audit and schedule optimizations
        x86_64, entry: Use sysret to return to userspace when possible
        x86, traps: Fix ist_enter from userspace
        x86, vdso: teach 'make clean' remove vdso64 binaries
        x86_64 entry: Fix RCX for ptraced syscalls
        x86: entry_64.S: fold SAVE_ARGS_IRQ macro into its sole user
        x86: ia32entry.S: fix wrong symbolic constant usage: R11->ARGOFFSET
        x86: entry_64.S: delete unused code
        x86, mce: Get rid of TIF_MCE_NOTIFY and associated mce tricks
        x86, traps: Add ist_begin_non_atomic and ist_end_non_atomic
        x86: Clean up current_stack_pointer
        x86, traps: Track entry into and exit from IST context
        x86, entry: Switch stacks on a paranoid entry from userspace
      7453311d
    • L
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9d43bade
      Linus Torvalds 提交于
      Pull x86 APIC updates from Ingo Molnar:
       "Continued fallout of the conversion of the x86 IRQ code to the
        hierarchical irqdomain framework: more cleanups, simplifications,
        memory allocation behavior enhancements, mainly in the interrupt
        remapping and APIC code"
      
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (44 commits)
        x86, init: Fix UP boot regression on x86_64
        iommu/amd: Fix irq remapping detection logic
        x86/acpi: Make acpi_[un]register_gsi_ioapic() depend on CONFIG_X86_LOCAL_APIC
        x86: Consolidate boot cpu timer setup
        x86/apic: Reuse apic_bsp_setup() for UP APIC setup
        x86/smpboot: Sanitize uniprocessor init
        x86/smpboot: Move apic init code to apic.c
        init: Get rid of x86isms
        x86/apic: Move apic_init_uniprocessor code
        x86/smpboot: Cleanup ioapic handling
        x86/apic: Sanitize ioapic handling
        x86/ioapic: Add proper checks to setp/enable_IO_APIC()
        x86/ioapic: Provide stub functions for IOAPIC%3Dn
        x86/smpboot: Move smpboot inlines to code
        x86/x2apic: Use state information for disable
        x86/x2apic: Split enable and setup function
        x86/x2apic: Disable x2apic from nox2apic setup
        x86/x2apic: Add proper state tracking
        x86/x2apic: Clarify remapping mode for x2apic enablement
        x86/x2apic: Move code in conditional region
        ...
      9d43bade
    • L
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 0ba97bc4
      Linus Torvalds 提交于
      Pull timer updates from Ingo Molnar:
       "The main changes in this cycle were:
      
         - rework hrtimer expiry calculation in hrtimer_interrupt(): the
           previous code had a subtle bug where expiry caching would miss an
           expiry, resulting in occasional bogus (late) expiry of hrtimers.
      
         - continuing Y2038 fixes
      
         - ktime division optimization
      
         - misc smaller fixes and cleanups"
      
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        hrtimer: Make __hrtimer_get_next_event() static
        rtc: Convert rtc_set_ntp_time() to use timespec64
        rtc: Remove redundant rtc_valid_tm() from rtc_hctosys()
        rtc: Modify rtc_hctosys() to address y2038 issues
        rtc: Update rtc-dev to use y2038-safe time interfaces
        rtc: Update interface.c to use y2038-safe time interfaces
        time: Expose get_monotonic_boottime64 for in-kernel use
        time: Expose getboottime64 for in-kernel uses
        ktime: Optimize ktime_divns for constant divisors
        hrtimer: Prevent stale expiry time in hrtimer_interrupt()
        ktime.h: Introduce ktime_ms_delta
      0ba97bc4
    • L
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5b9b28a6
      Linus Torvalds 提交于
      Pull scheduler updates from Ingo Molnar:
       "The main scheduler changes in this cycle were:
      
         - various sched/deadline fixes and enhancements
      
         - rescheduling latency fixes/cleanups
      
         - rework the rq->clock code to be more consistent and more robust.
      
         - minor micro-optimizations
      
         - ->avg.decay_count fixes
      
         - add a stack overflow check to might_sleep()
      
         - idle-poll handler fix, possibly resulting in power savings
      
         - misc smaller updates and fixes"
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/Documentation: Remove unneeded word
        sched/wait: Introduce wait_on_bit_timeout()
        sched: Pull resched loop to __schedule() callers
        sched/deadline: Remove cpu_active_mask from cpudl_find()
        sched: Fix hrtick_start() on UP
        sched/deadline: Avoid pointless __setscheduler()
        sched/deadline: Fix stale yield state
        sched/deadline: Fix hrtick for a non-leftmost task
        sched/deadline: Modify cpudl::free_cpus to reflect rd->online
        sched/idle: Add missing checks to the exit condition of cpu_idle_poll()
        sched: Fix missing preemption opportunity
        sched/rt: Reduce rq lock contention by eliminating locking of non-feasible target
        sched/debug: Print rq->clock_task
        sched/core: Rework rq->clock update skips
        sched/core: Validate rq_clock*() serialization
        sched/core: Remove check of p->sched_class
        sched/fair: Fix sched_entity::avg::decay_count initialization
        sched/debug: Fix potential call to __ffs(0) in sched_show_task()
        sched/debug: Check for stack overflow in ___might_sleep()
        sched/fair: Fix the dealing with decay_count in __synchronize_entity_decay()
      5b9b28a6
    • L
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a4cbbf54
      Linus Torvalds 提交于
      Pull perf updates from Ingo Molnar:
       "Kernel side changes:
      
         - AMD range breakpoints support:
      
           Extend breakpoint tools and core to support address range through
           perf event with initial backend support for AMD extended
           breakpoints.
      
           The syntax is:
      
               perf record -e mem:addr/len:type
      
           For example set write breakpoint from 0x1000 to 0x1200 (0x1000 + 512)
      
               perf record -e mem:0x1000/512:w
      
         - event throttling/rotating fixes
      
         - various event group handling fixes, cleanups and general paranoia
           code to be more robust against bugs in the future.
      
          - kernel stack overhead fixes
      
        User-visible tooling side changes:
      
         - Show precise number of samples in at the end of a 'record' session,
           if processing build ids, since we will then traverse the whole
           perf.data file and see all the PERF_RECORD_SAMPLE records,
           otherwise stop showing the previous off-base heuristicly counted
           number of "samples" (Namhyung Kim).
      
         - Support to read compressed module from build-id cache (Namhyung
           Kim)
      
         - Enable sampling loads and stores simultaneously in 'perf mem'
           (Stephane Eranian)
      
         - 'perf diff' output improvements (Namhyung Kim)
      
         - Fix error reporting for evsel pgfault constructor (Arnaldo Carvalho
           de Melo)
      
        Tooling side infrastructure changes:
      
         - Cache eh/debug frame offset for dwarf unwind (Namhyung Kim)
      
         - Support parsing parameterized events (Cody P Schafer)
      
         - Add support for IP address formats in libtraceevent (David Ahern)
      
        Plus other misc fixes"
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (48 commits)
        perf: Decouple unthrottling and rotating
        perf: Drop module reference on event init failure
        perf: Use POLLIN instead of POLL_IN for perf poll data in flag
        perf: Fix put_event() ctx lock
        perf: Fix move_group() order
        perf: Fix event->ctx locking
        perf: Add a bit of paranoia
        perf symbols: Convert lseek + read to pread
        perf tools: Use perf_data_file__fd() consistently
        perf symbols: Support to read compressed module from build-id cache
        perf evsel: Set attr.task bit for a tracking event
        perf header: Set header version correctly
        perf record: Show precise number of samples
        perf tools: Do not use __perf_session__process_events() directly
        perf callchain: Cache eh/debug frame offset for dwarf unwind
        perf tools: Provide stub for missing pthread_attr_setaffinity_np
        perf evsel: Don't rely on malloc working for sz 0
        tools lib traceevent: Add support for IP address formats
        perf ui/tui: Show fatal error message only if exists
        perf tests: Fix typo in sample-parsing.c
        ...
      a4cbbf54
    • L
      Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8308756f
      Linus Torvalds 提交于
      Pull core locking updates from Ingo Molnar:
       "The main changes are:
      
         - mutex, completions and rtmutex micro-optimizations
         - lock debugging fix
         - various cleanups in the MCS and the futex code"
      
      * 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        locking/rtmutex: Optimize setting task running after being blocked
        locking/rwsem: Use task->state helpers
        sched/completion: Add lock-free checking of the blocking case
        sched/completion: Remove unnecessary ->wait.lock serialization when reading completion state
        locking/mutex: Explicitly mark task as running after wakeup
        futex: Fix argument handling in futex_lock_pi() calls
        doc: Fix misnamed FUTEX_CMP_REQUEUE_PI op constants
        locking/Documentation: Update code path
        softirq/preempt: Add missing current->preempt_disable_ip update
        locking/osq: No need for load/acquire when acquire-polling
        locking/mcs: Better differentiate between MCS variants
        locking/mutex: Introduce ww_mutex_set_context_slowpath()
        locking/mutex: Move MCS related comments to proper location
        locking/mutex: Checking the stamp is WW only
      8308756f