1. 13 9月, 2014 1 次提交
  2. 12 9月, 2014 11 次提交
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 850ebc0c
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "AST, i915, radeon and msm fixes, all over the place.
      
        All fixing build issues, regressions, oopses or failure to detect
        cards"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/ast: AST2000 cannot be detected correctly
        drm/ast: open key before detect chips
        drm/msm: don't crash if no msm.vram param
        drm/msm/hdmi: fix build break on non-CCF platforms
        drm/msm: Change nested function to static function
        drm/radeon/dpm: set the thermal type properly for special configs
        drm/radeon: reduce memory footprint for debugging
        drm/radeon: add connector quirk for fujitsu board
        drm/radeon: fix semaphore value init
        drm/radeon: only use me/pfp sync on evergreen+
        drm/i915: Wait for vblank before enabling the TV encoder
        drm/i915: Evict CS TLBs between batches
        drm/i915: Fix irq enable tracking in driver load
        drm/i915: Fix EIO/wedged handling in gem fault handler
        drm/i915: Prevent recursive deadlock on releasing a busy userptr
      850ebc0c
    • P
      video: ARM CLCD: Fix color model capabilities for DT platforms · e4cf39ea
      Pawel Moll 提交于
      The DT-based panel capabilities selection was picking up
      a subset of available modes based on hardware configuration.
      This was wrong, as the capabilities describe available
      memory models and adapt the display controller to them
      that the RGB output is wired up correctly (as in: R and
      B components are not swapped).
      
      This patch fixes it by removing the unnecessary limitation.
      Signed-off-by: NPawel Moll <pawel.moll@arm.com>
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      e4cf39ea
    • Y
      drm/ast: AST2000 cannot be detected correctly · 83502a5d
      Y.C. Chen 提交于
      Type error and cause AST2000 cannot be detected correctly
      Signed-off-by: NY.C. Chen <yc_chen@aspeedtech.com>
      Reviewed-by: NEgbert Eich <eich@suse.de>
      Cc: stable@vger.kernel.org
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      83502a5d
    • Y
      drm/ast: open key before detect chips · 8f372e25
      Y.C. Chen 提交于
      Some config settings like 3rd TX chips will not get correctly
      if the extended reg is protected
      Signed-off-by: NY.C. Chen <yc_chen@aspeedtech.com>
      Reviewed-by: NEgbert Eich <eich@suse.de>
      Cc: stable@vger.kernel.org
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      8f372e25
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · c73f6fdf
      Linus Torvalds 提交于
      Pull Ceph fixes from Sage Weil:
       "The main thing here is a set of three patches that fix a buffer
        overrun for large authentication tickets (sigh).
      
        There is also a trivial warning fix and an error path fix that are
        both regressions"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        libceph: do not hard code max auth ticket len
        libceph: add process_one_ticket() helper
        libceph: gracefully handle large reply messages from the mon
        rbd: fix error return code in rbd_dev_device_setup()
        rbd: avoid format-security warning inside alloc_workqueue()
      c73f6fdf
    • L
      Merge tag 'stable/for-linus-3.17-b-rc4-tag' of... · 7ee2d2d6
      Linus Torvalds 提交于
      Merge tag 'stable/for-linus-3.17-b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
      
      Pull Xen bug fixes from David Vrabel:
       - fix for PVHVM suspend/resume and migration
       - don't pointlessly retry certain ballooning ops
       - fix gntalloc when grefs have run out.
       - fix PV boot if KSALR is enable or very large modules are used.
      
      * tag 'stable/for-linus-3.17-b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        x86/xen: don't copy bogus duplicate entries into kernel page tables
        xen/gntalloc: safely delete grefs in add_grefs() undo path
        xen/gntalloc: fix oops after runnning out of grant refs
        xen/balloon: cancel ballooning if adding new memory failed
        xen/manage: Always freeze/thaw processes when suspend/resuming
      7ee2d2d6
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux · 018cace2
      Linus Torvalds 提交于
      Pull powerpc fixes from Michael Ellerman:
       "Ben's travelling so this is my first attempt at a pull request.
      
        There's nothing too exciting.  The CONFIG_FHANDLE one is annoying, I
        know you love defconfig changes.  But we've had a couple of developers
        waste time debugging boxes that wouldn't boot, only to realise it's
        just that systemd needs CONFIG_FHANDLE and our defconfigs don't have
        it.
      
        The new syscalls seem to be working, I've run the selftests that
        exist, and also let trinity bash on them for a while"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
        powerpc: Wire up sys_seccomp(), sys_getrandom() and sys_memfd_create()
        powerpc: Make CONFIG_FHANDLE=y for all 64 bit powerpc defconfigs
        powerpc: use machine_subsys_initcall() for opal_hmi_handler_init()
        powerpc/perf: Fix ABIv2 kernel backtraces
        powerpc/pseries: Fix endian issues in memory hotplug
      018cace2
    • L
      Merge tag 'pm+acpi-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 8381e57a
      Linus Torvalds 提交于
      Pull ACPI and power management fixes from Rafael Wysocki:
       "These are regression fixes (cpufreq, ACPI battery) and fixes for stuff
        that never worked correctly (ACPI RTC operation region handler and PM
        domain implementation in the ACPI LPSS driver).
      
        Specifics:
      
         - Fix for the cpufreq Operation Performance Points (OPP) code where a
           recent commit added a kcalloc() call with an incorrect ordering of
           arguments.  From Anand Moon.
      
         - Reverts of two ACPI battery commits that caused incorrect
           diagnostic information to be printed to dmesg in some cases from
           Bjørn Mork.
      
         - Fix for the ACPI RTC operation region handler that applied the &
           operator to an argument already representing an address and that
           caused it to overwrite its own argument instead of writing to the
           address contained in it as expected.  From Chun-Yi Lee.
      
         - Fix for the PM domain implementation in the ACPI LPSS (Low-Power
           Subsystem) driver where one callback pointer pointed to a wrong
           routine and one was NULL, but it shouldn't.  From Fu Zhonghui"
      
      * tag 'pm+acpi-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / LPSS: complete PM entries for LPSS power domain
        Revert "ACPI / battery: fix wrong value of capacity_now reported when fully charged"
        Revert "ACPI / battery: Fix warning message in acpi_battery_get_state()"
        ACPI / RTC: Fix CMOS RTC opregion handler accesses to wrong addresses
        cpufreq / OPP: Fix the order of arguments for kcalloc()
      8381e57a
    • L
      Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma · 1497e84a
      Linus Torvalds 提交于
      Pull dmaengine fixes from Vinod Koul:
       "Two minor fixes.
      
        First one from Kuninori clarifying dmas bindings and second from Lars
        for fixing dma descriptor completion in non cyclic case"
      
      * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
        dmaengine: jz4740: Fix non-cyclic descriptor completion
        dt/bindings: rcar-audmapp: tidyup dmas explanation
      1497e84a
    • L
      Merge tag 'pinctrl-v3.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 8b02c5ef
      Linus Torvalds 提交于
      Pull two pin control fixes from Linus Walleij:
       - fix a warning about unbalanced IRQs on the Baytrail
       - update Tomasz Figa's address in MAINTAINERS
      
      * tag 'pinctrl-v3.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        MAINTAINERS: Tomasz has moved
        pinctrl: baytrail: resolve unbalanced IRQ wake disable warning
      8b02c5ef
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · c8c16e36
      Linus Torvalds 提交于
      Pull input updates from Dmitry Torokhov:
       "An update to Synaptics PS/2 driver to handle "ForcePads" (currently
        found in HP EliteBook 1040 laptops), a change for Elan PS/2 driver to
        detect newer touchpads, bunch of devices get annotated as Trackpoint
        and/or Pointer to help userspace classify and handle them, plus
        assorted driver fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: serport - add compat handling for SPIOCSTYPE ioctl
        Input: atmel_mxt_ts - fix double free of input device
        Input: synaptics - add support for ForcePads
        Input: matrix_keypad - use request_any_context_irq()
        Input: atmel_mxt_ts - downgrade warning about empty interrupts
        Input: wm971x - fix typo in module parameter description
        Input: cap1106 - fix register definition
        Input: add missing POINTER / DIRECT properties to a bunch of drivers
        Input: add INPUT_PROP_POINTING_STICK property
        Input: elantech - fix detection of touchpad on ASUS s301l
      c8c16e36
  3. 11 9月, 2014 26 次提交
  4. 10 9月, 2014 2 次提交
    • S
      x86/xen: don't copy bogus duplicate entries into kernel page tables · 0b5a5063
      Stefan Bader 提交于
      When RANDOMIZE_BASE (KASLR) is enabled; or the sum of all loaded
      modules exceeds 512 MiB, then loading modules fails with a warning
      (and hence a vmalloc allocation failure) because the PTEs for the
      newly-allocated vmalloc address space are not zero.
      
        WARNING: CPU: 0 PID: 494 at linux/mm/vmalloc.c:128
                 vmap_page_range_noflush+0x2a1/0x360()
      
      This is caused by xen_setup_kernel_pagetables() copying
      level2_kernel_pgt into level2_fixmap_pgt, overwriting many non-present
      entries.
      
      Without KASLR, the normal kernel image size only covers the first half
      of level2_kernel_pgt and module space starts after that.
      
      L4[511]->level3_kernel_pgt[510]->level2_kernel_pgt[  0..255]->kernel
                                                        [256..511]->module
                                [511]->level2_fixmap_pgt[  0..505]->module
      
      This allows 512 MiB of of module vmalloc space to be used before
      having to use the corrupted level2_fixmap_pgt entries.
      
      With KASLR enabled, the kernel image uses the full PUD range of 1G and
      module space starts in the level2_fixmap_pgt. So basically:
      
      L4[511]->level3_kernel_pgt[510]->level2_kernel_pgt[0..511]->kernel
                                [511]->level2_fixmap_pgt[0..505]->module
      
      And now no module vmalloc space can be used without using the corrupt
      level2_fixmap_pgt entries.
      
      Fix this by properly converting the level2_fixmap_pgt entries to MFNs,
      and setting level1_fixmap_pgt as read-only.
      
      A number of comments were also using the the wrong L3 offset for
      level2_kernel_pgt.  These have been corrected.
      Signed-off-by: NStefan Bader <stefan.bader@canonical.com>
      Signed-off-by: NDavid Vrabel <david.vrabel@citrix.com>
      Reviewed-by: NBoris Ostrovsky <boris.ostrovsky@oracle.com>
      Cc: stable@vger.kernel.org
      0b5a5063
    • T
      MAINTAINERS: Tomasz has moved · fea685e9
      Tomasz Figa 提交于
      I am leaving Samsung, so my current e-mail address is not going to work
      any longer. Replace it with my private one. In addition, Sylwester
      Nawrocki is being added as co-maintainer for Samsung clock drivers to
      take some of the responsibilities, as I will be doing my part in my spare
      time.
      Signed-off-by: NTomasz Figa <t.figa@samsung.com>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      fea685e9