1. 20 May, 2015 3 commits
  2. 19 May, 2015 17 commits
    • Dave Airlie's avatar
      Merge tag 'drm-amdkfd-next-2015-05-19' of git://people.freedesktop.org/~gabbayo/linux into drm-next · 91d9f985
      Dave Airlie authored
      - Add the interrupts & events modules, including new IOCTLs to create and wait
        on events. The HSA RT open source stack is mainly using events to know when
        a dispatched work has been completed. In addition, this module is
        a pre-requisite for the next module I'm going to upstream - debugger support
      
        This module also handles H/W exceptions, such as memory exception received
        through the IOMMUv2 H/W and Bad Opcode exception receieved from the GPU.
      
      - Adding a new kernel module parameter to let the user decide whether he wants
        to receive a SIGTERM when a memory exception occurs inside the GPU kernel and
        the HSA application doesn't wait on an appropriate event, or if he just want
        to receive notification about this event in dmesg. The default is the latter.
      
      - Additional improvements for SDMA code
      
      - Update my email address in Maintainers file.
      
      * tag 'drm-amdkfd-next-2015-05-19' of git://people.freedesktop.org/~gabbayo/linux:
        drm/amdkfd: change driver version to 0.7.2
        drm/amdkfd: Implement events IOCTLs
        drm/amdkfd: Add module parameter of send_sigterm
        drm/amdkfd: Add bad opcode exception handling
        drm/amdkfd: Add memory exception handling
        drm/amdkfd: Add the events module
        drm/amdkfd: add events IOCTL set definitions
        drm/amdkfd: Add interrupt handling module
        drm/radeon: Add init interrupt kfd->kgd interface
        MAINTAINERS: update amdkfd Oded's email address
        drm/amdkfd: make the sdma vm init to be asic specific
        drm/amdkfd: Use new struct for asic specific ops
        drm/amdkfd: reformat some debug prints
        drm/amdkfd: Remove unessary void pointer cast
      91d9f985
    • Dave Airlie's avatar
      Merge tag 'topic/drm-misc-2015-05-19' of git://anongit.freedesktop.org/drm-intel into drm-next · 9c37bf2d
      Dave Airlie authored
      Scattering of random drm core patches. Bunch of atomic prep work too, but
      the final bits for blob properties, atomic modesets and lifting the
      experimental tag on the atomic ioctl are still blocked on Daniel Stone
      finalizing and testing the weston support for it. I hope that we can get
      it all ready for 4.2 though.
      
      * tag 'topic/drm-misc-2015-05-19' of git://anongit.freedesktop.org/drm-intel: (22 commits)
        drm/atomic: Allow drivers to subclass drm_atomic_state, v3
        drm/atomic: remove duplicated assignment of old_plane_state
        drm/dp: Fix comment in DP helper
        drm/atomic: add drm_atomic_get_existing_*_state helpers
        drm/core: get rid of -Iinclude/drm
        drm/i915: get rid of -Iinclude/drm
        drm/atomic-helpers: Export drm_atomic_helper_update_legacy_modeset_state
        drm/atomic-helpers: Update vblank timestamping constants
        drm/sysfs: remove unnecessary connector type checks
        drm/sysfs: split DVI-I and TV-out attributes
        drm/sysfs: make optional attribute groups per connector type
        drm/sysfs: add a helper for extracting connector type from kobject
        drm/edid: Add CEA modes before inferred modes
        drm/prime: Allow internal imports without import_sg_table
        drm: Add reference counting to blob properties
        drm: Introduce blob_lock
        drm: Introduce helper for replacing blob properties
        drm: Don't leak path blob property when updating
        drm/atomic: Don't open-code CRTC state destroy
        drm/edid: Add DMT modes with ID > 0x50
        ...
      9c37bf2d
    • Oded Gabbay's avatar
      7591cd2c
    • Andrew Lewycky's avatar
      8377396b
    • Oded Gabbay's avatar
      drm/amdkfd: Add module parameter of send_sigterm · 81663016
      Oded Gabbay authored
      This patch adds a new kernel module parameter to amdkfd,
      called send_sigterm.
      
      This parameter specifies whether amdkfd should send the
      SIGTERM signal to an HSA process, when the following conditions
      occur:
      
      1. The GPU triggers an exception regarding a kernel that was
         issued by this process.
      
      2. The HSA process isn't waiting on an event that handles
         this exception.
      
      The default behavior is not to send a SIGTERM and suffice
      with a dmesg error print.
      Reviewed-by: default avatarBen Goz <ben.goz@amd.com>
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      81663016
    • Alexey Skidanov's avatar
    • Alexey Skidanov's avatar
      drm/amdkfd: Add memory exception handling · 59d3e8be
      Alexey Skidanov authored
      This patch adds Peripheral Page Request (PPR) failure processing
      and reporting.
      
      Bad address or pointer to a system memory block with inappropriate
      read/write permission cause such PPR failure during a user queue
      processing. PPR request handling is done by IOMMU driver notifying
      AMDKFD module on PPR failure.
      
      The process triggering a PPR failure will be notified by
      appropriate event or SIGTERM signal will be sent to it.
      
      v3:
      - Change all bool fields in struct kfd_memory_exception_failure to
        uint32_t
      Signed-off-by: default avatarAlexey Skidanov <alexey.skidanov@gmail.com>
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      59d3e8be
    • Andrew Lewycky's avatar
      drm/amdkfd: Add the events module · f3a39818
      Andrew Lewycky authored
      This patch adds the events module (kfd_events.c) and the interrupt
      handle module for Kaveri (cik_event_interrupt.c).
      
      The patch updates the interrupt_is_wanted(), so that it now calls the
      interrupt isr function specific for the device that received the
      interrupt. That function(implemented in cik_event_interrupt.c)
      returns whether this interrupt is of interest to us or not.
      
      The patch also updates the interrupt_wq(), so that it now calls the
      device's specific wq function, which checks the interrupt source
      and tries to signal relevant events.
      
      v2:
      
      Increase limit of signal events to 4096 per process
      Remove bitfields from struct cik_ih_ring_entry
      Rename radeon_kfd_event_mmap to kfd_event_mmap
      Add debug prints to allocate_free_slot and allocate_signal_page
      Make allocate_event_notification_slot return a correct value
      Add warning prints to create_signal_event
      Remove error print from IOCTL path
      Reformatted debug prints in kfd_event_mmap
      Map correct size (as received from mmap) in kfd_event_mmap
      
      v3:
      
      Reduce limit of signal events back to 256 per process
      Fix allocation of kernel memory for signal events
      Signed-off-by: default avatarAndrew Lewycky <Andrew.Lewycky@amd.com>
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      f3a39818
    • Andrew Lewycky's avatar
      drm/amdkfd: add events IOCTL set definitions · 29a5d3eb
      Andrew Lewycky authored
      - AMDKFD_IOC_CREATE_EVENT:
      	Creates a new event of a specified type
      
      - AMDKFD_IOC_DESTROY_EVENT:
      	Destroys an existing event
      
      - AMDKFD_IOC_SET_EVENT:
      	Signal an existing event
      
      - AMDKFD_IOC_RESET_EVENT:
      	Reset an existing event
      
      - AMDKFD_IOC_WAIT_EVENTS:
      	Wait on event(s) until they are signaled
      
      v2:
      
      - Move the limit of the signal events to kfd_ioctl.h so it
        can be used by userspace
      
      v3:
      - Change all bool fields in struct kfd_memory_exception_failure
      to uint32_t
      Signed-off-by: default avatarAndrew Lewycky <Andrew.Lewycky@amd.com>
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      29a5d3eb
    • Andrew Lewycky's avatar
      drm/amdkfd: Add interrupt handling module · 2249d558
      Andrew Lewycky authored
      This patch adds the interrupt handling module, kfd_interrupt.c, and its
      related members in different data structures to the amdkfd driver.
      
      The amdkfd interrupt module maintains an internal interrupt ring
      per amdkfd device. The internal interrupt ring contains interrupts
      that needs further handling. The extra handling is deferred to
      a later time through a workqueue.
      
      There's no acknowledgment for the interrupts we use. The hardware
      simply queues a new interrupt each time without waiting.
      
      The fixed-size internal queue means that it's possible for us to lose
      interrupts because we have no back-pressure to the hardware.
      
      However, only interrupts that are "wanted" by amdkfd, are copied into
      the amdkfd s/w interrupt ring, in order to minimize the chances
      for overflow of the ring.
      Signed-off-by: default avatarAndrew Lewycky <Andrew.Lewycky@amd.com>
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      2249d558
    • Oded Gabbay's avatar
      drm/radeon: Add init interrupt kfd->kgd interface · d36b94fc
      Oded Gabbay authored
      This patch adds a new interface function to the kfd->kgd interface.
      The function is kgd_init_interrupts() and its function is to
      initialize a pipe's interrupts.
      
      The function currently enables the timestamp interrupt and the
      bad opcode interrupt.
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      d36b94fc
    • Oded Gabbay's avatar
      MAINTAINERS: update amdkfd Oded's email address · 1241e0b4
      Oded Gabbay authored
      Leaving AMD soon so need to update my email address to @gmail.com
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      1241e0b4
    • Oded Gabbay's avatar
    • Oded Gabbay's avatar
      drm/amdkfd: Use new struct for asic specific ops · d42af779
      Oded Gabbay authored
      This patch creates a new structure for asic specific operations, instead
      of using the existing structure of operations.
      
      This is done to make the code flow more logic, readable and maintainable.
      
      The change is done only to the device queue manager module at this point.
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      d42af779
    • Oded Gabbay's avatar
      drm/amdkfd: reformat some debug prints · 8856d8e0
      Oded Gabbay authored
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      8856d8e0
    • Firo Yang's avatar
      drm/amdkfd: Remove unessary void pointer cast · 1549fcd1
      Firo Yang authored
      kmalloc() returns a void pointer - no need to cast it in
      drivers/gpu/drm/amd/amdkfd/kfd_process.c::kfd_process_destroy_delayed()
      Signed-off-by: default avatarFiro Yang <firogm@gmail.com>
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@amd.com>
      1549fcd1
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-2015-05-08' of git://anongit.freedesktop.org/drm-intel into drm-next · d0093404
      Dave Airlie authored
      - skl plane scaler support (Chandra Kondru)
      - enable hsw cmd parser (Daniel and fix from Rebecca Palmer)
      - skl dc5/6 support (low power display modes) from Suketu&Sunil
      - dp compliance testing patches (Todd Previte)
      - dp link training optimization (Mika Kahola)
      - fixes to make skl resume work (Damien)
      - rework modeset code to fully use atomic state objects (Ander&Maarten)
      - pile of bxt w/a patchs from Nick Hoath
      - (linear) partial gtt mmap support (Joonas Lahtinen)
      
      * tag 'drm-intel-next-2015-05-08' of git://anongit.freedesktop.org/drm-intel: (103 commits)
        drm/i915: Update DRIVER_DATE to 20150508
        drm/i915: Only wait for required lanes in vlv_wait_port_ready()
        drm/i915: Fix possible security hole in command parsing
        drm/edid: Kerneldoc for newly added edid_corrupt
        drm/i915: Reject huge tiled objects
        Revert "drm/i915: Hack to tie both common lanes together on chv"
        drm/i915: Work around DISPLAY_PHY_CONTROL register corruption on CHV
        drm/i915: Implement chv display PHY lane stagger setup
        drm/i915/vlv: remove wait for previous GFX clk disable request
        drm/i915: Set crtc_state->active to false when CRTC is disabled (v2)
        drm/i915/skl: Re-indent part of skl_ddi_calculate_wrpll()
        drm/i915: Use partial view in mmap fault handler
        drm/i915: Add a partial GGTT view type
        drm/i915: Consider object pinned if any VMA is pinned
        drm/i915: Do not make assumptions on GGTT VMA sizes
        drm/i915/bxt: Mark WaCcsTlbPrefetchDisable as for Broxton also.
        drm/i915/bxt: Mark WaDisablePartialResolveInVc as for Broxton also.
        drm/i915/bxt: Mark Wa4x4STCOptimizationDisable as for Broxton also.
        drm/i915/bxt: Move WaForceEnableNonCoherent to Skylake only
        drm/i915/bxt: Enable WaEnableYV12BugFixInHalfSliceChicken7 for Broxton
        ...
      d0093404
  3. 18 May, 2015 6 commits
  4. 17 May, 2015 4 commits
    • Linus Torvalds's avatar
      Merge tag 'usb-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · c0655fe9
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are some USB fixes and new device ids for 4.1-rc4.
      
        All are pretty minor, and have been in linux-next successfully"
      
      * tag 'usb-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        usb-storage: Add NO_WP_DETECT quirk for Lacie 059f:0651 devices
        Added another USB product ID for ELAN touchscreen quirks.
        xhci: gracefully handle xhci_irq dead device
        xhci: Solve full event ring by increasing TRBS_PER_SEGMENT to 256
        xhci: fix isoc endpoint dequeue from advancing too far on transaction error
        usb: chipidea: debug: avoid out of bound read
        USB: visor: Match I330 phone more precisely
        USB: pl2303: Remove support for Samsung I330
        USB: cp210x: add ID for KCF Technologies PRN device
        usb: gadget: remove incorrect __init/__exit annotations
        usb: phy: isp1301: work around tps65010 dependency
        usb: gadget: serial: fix re-ordering of tx data
        usb: gadget: hid: Fix static variable usage
        usb: gadget: configfs: Fix interfaces array NULL-termination
        usb: gadget: xilinx: fix devm_ioremap_resource() check
        usb: dwc3: dwc3-omap: correct the register macros
      c0655fe9
    • Linus Torvalds's avatar
      Merge tag 'tty-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · dd8edd7e
      Linus Torvalds authored
      Pull tty/serial fixes from Greg KH:
       "Here's some TTY and serial driver fixes for reported issues.
      
        All of these have been in linux-next successfully"
      
      * tag 'tty-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        pty: Fix input race when closing
        tty/n_gsm.c: fix a memory leak when gsmtty is removed
        Revert "serial/amba-pl011: Leave the TX IRQ alone when the UART is not open"
        serial: omap: Fix error handling in probe
        earlycon: Revert log warnings
      dd8edd7e
    • Linus Torvalds's avatar
      Merge tag 'staging-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 3f4741b1
      Linus Torvalds authored
      Pull staging / IIO driver fixes from Greg KH:
       "Here's some staging and iio driver fixes to resolve a number of
        reported issues.
      
        All of these have been in linux-next for a while"
      
      * tag 'staging-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (31 commits)
        iio: light: hid-sensor-prox: Fix memory leak in probe()
        iio: adc: cc10001: Add delay before setting START bit
        iio: adc: cc10001: Fix regulator_get_voltage() return value check
        iio: adc: cc10001: Fix incorrect use of power-up/power-down register
        staging: gdm724x: Correction of variable usage after applying ALIGN()
        iio: adc: cc10001: Fix the channel number mapping
        staging: vt6655: lock MACvWriteBSSIDAddress.
        staging: vt6655: CARDbUpdateTSF bss timestamp correct tsf counter value.
        staging: vt6655: vnt_tx_packet Correct TX order of OWNED_BY_NIC
        staging: vt6655: Fix 80211 control and management status reporting.
        staging: vt6655: implement IEEE80211_TX_STAT_NOACK_TRANSMITTED
        staging: vt6655: device_free_tx_buf use only ieee80211_tx_status_irqsafe
        staging: vt6656: use ieee80211_tx_info to select packet type.
        staging: rtl8712: freeing an ERR_PTR
        staging: sm750: remove incorrect __exit annotation
        iio: kfifo: Set update_needed to false only if a buffer was allocated
        iio: mcp320x: Fix occasional incorrect readings
        iio: accel: mma9553: check input value for activity period
        iio: accel: mma9553: add enable channel for activity
        iio: accel: mma9551_core: prevent buffer overrun
        ...
      3f4741b1
    • Linus Torvalds's avatar
      Merge tag 'char-misc-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 148c46f3
      Linus Torvalds authored
      Pull char/misc fix from Greg KH:
       "Here is one fix, in the extcon subsystem, that resolves a reported
        issue.
      
        It's been in linux-next for a number of weeks now, sorry for not
        getting it to you sooner"
      
      * tag 'char-misc-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        extcon: usb-gpio: register extcon device before IRQ registration
      148c46f3
  5. 16 May, 2015 9 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · 92752b5c
      Linus Torvalds authored
      Pull UML hostfs fix from Richard Weinberger:
       "This contains a single fix for a regression introduced in 4.1-rc1"
      
      * 'for-linus-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
        hostfs: Use correct mask for file mode
      92752b5c
    • Linus Torvalds's avatar
      Merge tag 'upstream-4.1-rc4' of git://git.infradead.org/linux-ubifs · 1630ee5e
      Linus Torvalds authored
      Pull UBI bufix from Richard Weinberger:
       "This contains a single bug fix for the UBI block driver"
      
      * tag 'upstream-4.1-rc4' of git://git.infradead.org/linux-ubifs:
        UBI: block: Add missing cache flushes
      1630ee5e
    • Linus Torvalds's avatar
      Merge tag 'for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 6a8098a4
      Linus Torvalds authored
      Pull ext4 fixes from Ted Ts'o:
       "Fix a number of ext4 bugs; the most serious of which is a bug in the
        lazytime mount optimization code where we could end up updating the
        timestamps to the wrong inode"
      
      * tag 'for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: fix an ext3 collapse range regression in xfstests
        jbd2: fix r_count overflows leading to buffer overflow in journal recovery
        ext4: check for zero length extent explicitly
        ext4: fix NULL pointer dereference when journal restart fails
        ext4: remove unused function prototype from ext4.h
        ext4: don't save the error information if the block device is read-only
        ext4: fix lazytime optimization
      6a8098a4
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · c7309e88
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "The first commit is a fix from Filipe for a very old extent buffer
        reuse race that triggered a BUG_ON.  It hasn't come up often, I looked
        through old logs at FB and we hit it a handful of times over the last
        year.
      
        The rest are other corners he hit during testing"
      
      * 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: fix race when reusing stale extent buffers that leads to BUG_ON
        Btrfs: fix race between block group creation and their cache writeout
        Btrfs: fix panic when starting bg cache writeout after IO error
        Btrfs: fix crash after inode cache writeback failure
      c7309e88
    • Linus Torvalds's avatar
      Merge branch 'master' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 518af3cb
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
       "Seven small fixes.  The shortlog below is a good description so no
        need to elaborate.
      
        It has sat in linux-next and survived the usual automated testing by
        Imagination's test farm"
      
      * 'master' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: tlb-r4k: Fix PG_ELPA comment
        MIPS: Fix up obsolete cpu_set usage
        MIPS: IP32: Fix build errors in reset code in DS1685 platform hook.
        MIPS: KVM: Fix unused variable build warning
        MIPS: traps: remove extra Tainted: line from __show_regs() output
        MIPS: Fix wrong CHECKFLAGS (sparse builds) with GCC 5.1
        MIPS: Fix a preemption issue with thread's FPU defaults
      518af3cb
    • Linus Torvalds's avatar
      Merge tag 'arc-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · 2ed3d795
      Linus Torvalds authored
      Pull ARC fixes from Vineet Gupta.
      
      * tag 'arc-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
        ARC: inline cache flush toggle helpers
        ARC: With earlycon in use, retire EARLY_PRINTK
        ARC: unbork !LLSC build
      2ed3d795
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d6610270
      Linus Torvalds authored
      Pull ARM SoC fixes from Arnd Bergmann:
       "Nothing frightening this time, just smaller fixes in a number of
        places.
      
        The other changes contained here are:
      
         MAINTAINERS file updates:
      
         - The mach-gemini maintainer is back in action and has a new git tree
      
         - Krzysztof Kozlowski has volunteered to be a new co-maintainer for
           the samsung platforms
      
         - updates to the files that belong to Marvell mvebu
      
        Bug fixes:
      
         - The largest changes are on omap2, but are only to avoid some
           harmless warnings and to fix reset on omap4
      
         - a small regression fix on tegra
      
         - multiple fixes for incorrect IRQ affinity on vexpress
      
         - the missing system controller on arm64 juno is added
      
         - one revert of a patch that was accidentally applied twice for
           mach-rockchip
      
         - two clock related DT fixes for mvebu
      
         - a workaround for suspend with old DT binaries on new exynos kernels
      
         - Another fix for suspend on exynos, needs to be backported"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits)
        MAINTAINERS: Add dts entries for some of the Marvell SoCs
        MAINTAINERS: ARM: EXYNOS: Add Krzysztof Kozlowski as co-maintainer
        ARM: EXYNOS: Use of_machine_is_compatible instead of soc_is_exynos4
        ARM: EXYNOS: Fix failed second suspend on Exynos4
        Revert "ARM: rockchip: fix undefined instruction of reset_ctrl_regs"
        ARM: EXYNOS: Fix dereference of ERR_PTR returned by of_genpd_get_from_provider
        ARM: EXYNOS: Don't try to initialize suspend on old DT
        ARM: dts: Add keep-power-in-suspend to WiFi SDIO node for Peach Boards
        ARM: gemini: fix compiler warning due wrong data type
        ARM: vexpress/tc2: Add interrupt-affinity to the PMU node
        ARM: vexpress/ca9: Add interrupt-affinity to the PMU node
        ARM: vexpress/ca9: Add unified-cache property to l2 cache node
        ARM64: juno: add sp810 support and fix sp804 clock frequency
        ARM: Gemini: Maintainers update
        ARM: OMAP2+: Remove bogus struct clk comparison for timer clock
        ARM: dove: Add clock-names to CuBox Si5351 clk generator
        ARM: AM33xx+: hwmod: re-use omap4 implementations for reset functionality
        ARM: OMAP4+: PRM: add support for passing status register/bit info to reset
        ARM: AM43xx: hwmod: add VPFE hwmod entries
        ARM: mvebu: Fix the main PLL frequency on Armada 375, 38x and 39x SoCs
        ...
      d6610270
    • Linus Torvalds's avatar
      Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 73786683
      Linus Torvalds authored
      Pull thermal fixes from Zhang Rui:
       "Specifics:
      
         - fix an issue in intel_powerclamp driver that idle injection target
           is not accurately maintained on newer Intel CPUs.  Package C8 to
           C10 states are introduced on these CPUs but they were not included
           in the package c-state residency calculation.  From Jacob Pan.
      
         - fix a problem that package c-state idle injection was missing on
           Broadwell server, by adding its id to intel_powerclamp driver.
           From Jacob Pan.
      
         - a couple of small fixes and cleanups from Joe Perches, Mathias
           Krause, Dan Carpenter and Anand Moon"
      
      * 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
        tools/thermal: tmon: fixed the 'make install' command
        thermal: rockchip: fix an error code
        thermal/powerclamp: fix missing newer package c-states
        thermal/intel_powerclamp: add id for broadwell server
        thermal/intel_powerclamp: add __init / __exit annotations
        thermal: Use bool function return values of true/false not 1/0
      73786683
    • Linus Torvalds's avatar
      Merge tag 'linux-kselftest-4.1-rc4' of... · d70933be
      Linus Torvalds authored
      Merge tag 'linux-kselftest-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull kselftest fixes from Shuah Khan:
       "Urgent fix for Kselftest regression introduced in 4.1-rc1 by the new
        x86 test due to its hard dependency on 32-bit build environment.
      
        A set of 5 patches fix the make kselftest run and kselftest install"
      
      * tag 'linux-kselftest-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        selftests, x86: Rework x86 target architecture detection
        selftests, x86: Remove useless run_tests rule
        selftests/x86: install tests
        selftest/x86: have no dependency on all when cross building
        selftest/x86: build both bitnesses
      d70933be
  6. 15 May, 2015 1 commit
    • Linus Torvalds's avatar
      Merge branch 'parisc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 4b470f12
      Linus Torvalds authored
      Pull parisc fixes from Helge Deller:
       "One important patch which fixes crashes due to stack randomization on
        architectures where the stack grows upwards (currently parisc and
        metag only).
      
        This bug went unnoticed on parisc since kernel 3.14 where the flexible
        mmap memory layout support was added by commit 9dabf60d.  The
        changes in fs/exec.c are inside an #ifdef CONFIG_STACK_GROWSUP section
        and will not affect other platforms.
      
        The other two patches rename args of the kthread_arg() function and
        fixes a printk output"
      
      * 'parisc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc,metag: Fix crashes due to stack randomization on stack-grows-upwards architectures
        parisc: copy_thread(): rename 'arg' argument to 'kthread_arg'
        parisc: %pf is only for function pointers
      4b470f12