1. 25 10月, 2014 1 次提交
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 8264fce6
      Linus Torvalds 提交于
      Pull thermal management updates from Zhang Rui:
       "Sorry that I missed the merge window as there is a bug found in the
        last minute, and I have to fix it and wait for the code to be tested
        in linux-next tree for a few days.  Now the buggy patch has been
        dropped entirely from my next branch.  Thus I hope those changes can
        still be merged in 3.18-rc2 as most of them are platform thermal
        driver changes.
      
        Specifics:
      
         - introduce ACPI INT340X thermal drivers.
      
           Newer laptops and tablets may have thermal sensors and other
           devices with thermal control capabilities that are exposed for the
           OS to use via the ACPI INT340x device objects.  Several drivers are
           introduced to expose the temperature information and cooling
           ability from these objects to user-space via the normal thermal
           framework.
      
           From: Lu Aaron, Lan Tianyu, Jacob Pan and Zhang Rui.
      
         - introduce a new thermal governor, which just uses a hysteresis to
           switch abruptly on/off a cooling device.  This governor can be used
           to control certain fan devices that can not be throttled but just
           switched on or off.  From: Peter Feuerer.
      
         - introduce support for some new thermal interrupt functions on
           i.MX6SX, in IMX thermal driver.  From: Anson, Huang.
      
         - introduce tracing support on thermal framework.  From: Punit
           Agrawal.
      
         - small fixes in OF thermal and thermal step_wise governor"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (25 commits)
        Thermal: int340x thermal: select ACPI fan driver
        Thermal: int3400_thermal: use acpi_thermal_rel parsing APIs
        Thermal: int340x_thermal: expose acpi thermal relationship tables
        Thermal: introduce int3403 thermal driver
        Thermal: introduce INT3402 thermal driver
        Thermal: move the KELVIN_TO_MILLICELSIUS macro to thermal.h
        ACPI / Fan: support INT3404 thermal device
        ACPI / Fan: add ACPI 4.0 style fan support
        ACPI / fan: convert to platform driver
        ACPI / fan: use acpi_device_xxx_power instead of acpi_bus equivelant
        ACPI / fan: remove no need check for device pointer
        ACPI / fan: remove unused macro
        Thermal: int3400 thermal: register to thermal framework
        Thermal: int3400 thermal: add capability to detect supporting UUIDs
        Thermal: introduce int3400 thermal driver
        ACPI: add ACPI_TYPE_LOCAL_REFERENCE support to acpi_extract_package()
        ACPI: make acpi_create_platform_device() an external API
        thermal: step_wise: fix: Prevent from binary overflow when trend is dropping
        ACPI: introduce ACPI int340x thermal scan handler
        thermal: Added Bang-bang thermal governor
        ...
      8264fce6
  2. 24 10月, 2014 4 次提交
    • L
      Merge tag 'remove-weak-declarations' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 816fb417
      Linus Torvalds 提交于
      Pull weak function declaration removal from Bjorn Helgaas:
       "The "weak" attribute is commonly used for the default version of a
        function, where an architecture can override it by providing a strong
        version.
      
        Some header file declarations included the "weak" attribute.  That's
        error-prone because it causes every implementation to be weak, with no
        strong version at all, and the linker chooses one based on link order.
      
        What we want is the "weak" attribute only on the *definition* of the
        default implementation.  These changes remove "weak" from the
        declarations, leaving it on the default definitions"
      
      * tag 'remove-weak-declarations' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        uprobes: Remove "weak" from function declarations
        memory-hotplug: Remove "weak" from memory_block_size_bytes() declaration
        kgdb: Remove "weak" from kgdb_arch_pc() declaration
        ARC: kgdb: generic kgdb_arch_pc() suffices
        vmcore: Remove "weak" from function declarations
        clocksource: Remove "weak" from clocksource_default_clock() declaration
        x86, intel-mid: Remove "weak" from function declarations
        audit: Remove "weak" from audit_classify_compat_syscall() declaration
      816fb417
    • L
      Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8c81f48e
      Linus Torvalds 提交于
      Pull x86 EFI updates from Peter Anvin:
       "This patchset falls under the "maintainers that grovel" clause in the
        v3.18-rc1 announcement.  We had intended to push it late in the merge
        window since we got it into the -tip tree relatively late.
      
        Many of these are relatively simple things, but there are a couple of
        key bits, especially Ard's and Matt's patches"
      
      * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
        rtc: Disable EFI rtc for x86
        efi: rtc-efi: Export platform:rtc-efi as module alias
        efi: Delete the in_nmi() conditional runtime locking
        efi: Provide a non-blocking SetVariable() operation
        x86/efi: Adding efi_printks on memory allocationa and pci.reads
        x86/efi: Mark initialization code as such
        x86/efi: Update comment regarding required phys mapped EFI services
        x86/efi: Unexport add_efi_memmap variable
        x86/efi: Remove unused efi_call* macros
        efi: Resolve some shadow warnings
        arm64: efi: Format EFI memory type & attrs with efi_md_typeattr_format()
        ia64: efi: Format EFI memory type & attrs with efi_md_typeattr_format()
        x86: efi: Format EFI memory type & attrs with efi_md_typeattr_format()
        efi: Introduce efi_md_typeattr_format()
        efi: Add macro for EFI_MEMORY_UCE memory attribute
        x86/efi: Clear EFI_RUNTIME_SERVICES if failing to enter virtual mode
        arm64/efi: Do not enter virtual mode if booting with efi=noruntime or noefi
        arm64/efi: uefi_init error handling fix
        efi: Add kernel param efi=noruntime
        lib: Add a generic cmdline parse function parse_option_str
        ...
      8c81f48e
    • L
      Merge tag 'hwmon-for-linus-v3.18-rc2' of... · 5de551e0
      Linus Torvalds 提交于
      Merge tag 'hwmon-for-linus-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull a hwmon fix from Guenter Roeck:
       "Fix potential compile problem for menf21bmc hwmon driver"
      
      * tag 'hwmon-for-linus-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (menf21bmc) Include linux/err.h
      5de551e0
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · eb0c5ff6
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Intel, nouveau, radeon and qxl.
      
        Mostly for bugs introduced in the merge window, nothing too shocking"
      
      [ And one cirrus fix added later and not mentioned in the pull request..  - Linus ]
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/cirrus: bind also to qemu-xen-traditional
        qxl: don't create too large primary surface
        drm/nouveau: fix regression on agp boards
        drm/gt215/gr: fix initialisation on gddr5 boards
        drm/radeon: reduce sparse false positive warnings
        drm/radeon: fix vm page table block size calculation
        drm/ttm: Don't evict BOs outside of the requested placement range
        drm/ttm: Don't skip fpfn check if lpfn is 0 in ttm_bo_mem_compat
        drm/radeon: use gart memory for DMA ring tests
        drm/radeon: fix speaker allocation setup
        drm/radeon: initialize sadb to NULL in the audio code
        drm/i915: fix short vs. long hpd detection
        drm/i915: Don't trust the DP_DETECT bit for eDP ports on CHV
        Revert "drm/radeon/dpm: drop clk/voltage dependency filters for SI"
        Revert "drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table"
        drm/i915: properly reenable gen8 pipe IRQs
        drm/i915: Move DIV_ROUND_CLOSEST_ULL macro to header
        drm/i915: intel_backlight scale() math WA
      eb0c5ff6
  3. 23 10月, 2014 9 次提交
  4. 22 10月, 2014 4 次提交
    • M
      qxl: don't create too large primary surface · c572aaf4
      Marc-André Lureau 提交于
      Limit primary to qemu vgamem size, to avoid reaching
      qemu guest bug "requested primary larger than framebuffer"
      on resizing screen too large to fit.
      
      Remove unneeded and misleading variables.
      
      Related to:
      https://bugzilla.redhat.com/show_bug.cgi?id=1127552Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      c572aaf4
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · c3351dfa
      Linus Torvalds 提交于
      Pull SCSI target updates from Nicholas Bellinger:
       "Here are the target updates for v3.18-rc2 code.  These where
        originally destined for -rc1, but due to the combination of travel
        last week for KVM Forum and my mistake of taking the three week merge
        window literally, the pull request slipped..  Apologies for that.
      
        Things where reasonably quiet this round.  The highlights include:
      
         - New userspace backend driver (target_core_user.ko) by Shaohua Li
           and Andy Grover
         - A number of cleanups in target, iscsi-taret and qla_target code
           from Joern Engel
         - Fix an OOPs related to queue full handling with CHECK_CONDITION
           status from Quinn Tran
         - Fix to disable TX completion interrupt coalescing in iser-target,
           that was causing problems on some hardware
         - Fix for PR APTPL metadata handling with demo-mode ACLs
      
        I'm most excited about the new backend driver that uses UIO + shared
        memory ring to dispatch I/O and control commands into user-space.
        This was probably the most requested feature by users over the last
        couple of years, and opens up a new area of development + porting of
        existing user-space storage applications to LIO.  Thanks to Shaohua +
        Andy for making this happen.
      
        Also another honorable mention, a new Xen PV SCSI driver was merged
        via the xen/tip.git tree recently, which puts us now at 10 target
        drivers in upstream! Thanks to David Vrabel + Juergen Gross for their
        work to get this code merged"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (40 commits)
        target/file: fix inclusive vfs_fsync_range() end
        iser-target: Disable TX completion interrupt coalescing
        target: Add force_pr_aptpl device attribute
        target: Fix APTPL metadata handling for dynamic MappedLUNs
        qla_target: don't delete changed nacls
        target/user: Recalculate pad size inside is_ring_space_avail()
        tcm_loop: Fixup tag handling
        iser-target: Fix smatch warning
        target/user: Fix up smatch warnings in tcmu_netlink_event
        target: Add a user-passthrough backstore
        target: Add documentation on the target userspace pass-through driver
        uio: Export definition of struct uio_device
        target: Remove unneeded check in sbc_parse_cdb
        target: Fix queue full status NULL pointer for SCF_TRANSPORT_TASK_SENSE
        qla_target: rearrange struct qla_tgt_prm
        qla_target: improve qlt_unmap_sg()
        qla_target: make some global functions static
        qla_target: remove unused parameter
        target: simplify core_tmr_abort_task
        target: encapsulate smp_mb__after_atomic()
        ...
      c3351dfa
    • L
      Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd · 848a5528
      Linus Torvalds 提交于
      Pull email address change from Boaz Harrosh.
      
      * 'for-linus' of git://git.open-osd.org/linux-open-osd:
        Boaz Harrosh - fix email in Documentation
        Boaz Harrosh - Fix broken email address
        MAINTAINERS: Change Boaz Harrosh's email
      848a5528
    • L
      Merge branch 'mailbox-for-linus' of git://git.linaro.org/landing-teams/working/fujitsu/integration · 43d451f1
      Linus Torvalds 提交于
      Pull mailbox framework from Jassi Brar:
       "A framework for Mailbox controllers and clients have been cooking for
        more than a year now.
      
        Everybody in the CC list had been copied on patchset revisions and
        most of them have made sounds of approval, though just one concrete
        Reviewed-by.  The patchset has also been in linux-next for a couple of
        weeks now and no conflict has been reported.  The framework has the
        backing of at least 5 platforms, though I can't say if/when they
        upstream their drivers (some businesses have 'changed')"
      
      (Further acked-by by Arnd Bergmann and Suman Anna in the pull request
      thread)
      
      * 'mailbox-for-linus' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
        dt: mailbox: add generic bindings
        doc: add documentation for mailbox framework
        mailbox: Introduce framework for mailbox
        mailbox: rename pl320-ipc specific mailbox.h
      43d451f1
  5. 21 10月, 2014 22 次提交