1. 22 4月, 2016 3 次提交
    • D
      Merge tag 'v4.6-rc3' into drm-next · 49047962
      Dave Airlie 提交于
      Backmerge 4.6-rc3 for i915.
      
      Linux 4.6-rc3
      49047962
    • D
      Merge tag 'topic/drm-misc-2016-04-21' of git://anongit.freedesktop.org/drm-intel into drm-next · d57d4773
      Dave Airlie 提交于
      misc pull req all over. Biggest thing is the
      drm_connector_(un)register_all cleanup from Alexey for drivers without the
      load/unload midlayer hooks. I.e. all the new ones, and a bunch of the
      pending new atomic drivers depend upon this. Or at least I asked them to
      rebase ;-)
      
      * tag 'topic/drm-misc-2016-04-21' of git://anongit.freedesktop.org/drm-intel:
        drm: Make drm.debug parameter description more helpful
        drm: Remove warning from drm_connector_unregister_all()
        drm: probe_helper: Hide ugly ifdef
        drm: rcar-du: Use generic drm_connector_register_all() helper
        drm: atmel_hldc: Use generic drm_connector_register_all() helper
        drm: Introduce drm_connector_register_all() helper
        drm: fix lut value extraction function
        drm/atomic-helper: Print an error if vblank wait times out
        drm/dp/mst: Restore primary hub guid on resume
        drm: Release driver references to handle before making it available again
        drm/i915/dp/mst: Add source port info to debugfs output
        drm/dp/mst: Enhance DP MST debugfs output
        drm/edid: Add drm_edid_get_monitor_name()
        include/drm: Reword debug categories comment.
        drm/crtc_helper: Reset empty plane state in drm_helper_crtc_mode_set_base()
        drm/virtio: Drop dummy gamma table support
        drm/bochs: Drop fake gamma support
        drm/core: Fix ordering in drm_mode_config_cleanup.
      d57d4773
    • D
      Merge tag 'topic/struct_mutex-2016-04-21' of git://anongit.freedesktop.org/drm-intel into drm-next · f230ffa1
      Dave Airlie 提交于
      struct_mutex cleanups and error paths fixes. Unfortunately I didn't manage
      to get acks from everyone, but this stuff has been hanging out for months
      now and imo simple enough to just land the remaining few patches. But
      separate pull request so that you can take a look yourself.
      
      * tag 'topic/struct_mutex-2016-04-21' of git://anongit.freedesktop.org/drm-intel:
        drm/vma_manage: Drop has_offset
        drm/vgem: Drop dev->struct_mutex
        drm/vgem: Move get_pages to gem_create
        drm/vgem: Simplify dumb_map
        drm/exynos: drop struct_mutex from fbdev setup
        drm/exynos: drop struct_mutex from exynos_drm_gem_get_ioctl
        drm/exynos: drop struct_mutex from exynos_gem_map_sgt_with_dma
        drm/exynos: Drop dev->struct_mutex from mmap offset function
        drm/nouveau: Drop dev->struct_mutex from fbdev init
        drm/qxl: Use unlocked gem unreferencing
        drm/omapdrm: Use unlocked gem unreferencing
        drm/nouveau: Use unlocked gem unreferencing
      f230ffa1
  2. 21 4月, 2016 2 次提交
  3. 20 4月, 2016 17 次提交
  4. 18 4月, 2016 1 次提交
  5. 15 4月, 2016 5 次提交
  6. 14 4月, 2016 3 次提交
  7. 12 4月, 2016 3 次提交
  8. 11 4月, 2016 5 次提交
    • L
      Linux 4.6-rc3 · bf162006
      Linus Torvalds 提交于
      bf162006
    • L
      Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · 08b15d13
      Linus Torvalds 提交于
      Pull ARM fixes from Russell King:
       "A couple of small fixes, and wiring up the new syscalls which appeared
        during the merge window"
      
      * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        ARM: 8550/1: protect idiv patching against undefined gcc behavior
        ARM: wire up preadv2 and pwritev2 syscalls
        ARM: SMP enable of cache maintanence broadcast
      08b15d13
    • L
      Merge tag 'mmc-v4.6-rc1' of git://git.linaro.org/people/ulf.hansson/mmc · 2f422f94
      Linus Torvalds 提交于
      Pull MMC fixes from Ulf Hansson:
       "Here are a couple of mmc fixes intended for v4.6 rc3:
      
        MMC host:
         - sdhci: Fix regression setting power on Trats2 board
         - sdhci-pci: Add support and PCI IDs for more Broxton host controllers"
      
      * tag 'mmc-v4.6-rc1' of git://git.linaro.org/people/ulf.hansson/mmc:
        mmc: sdhci-pci: Add support and PCI IDs for more Broxton host controllers
        mmc: sdhci: Fix regression setting power on Trats2 board
      2f422f94
    • L
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 6a7c9243
      Linus Torvalds 提交于
      Pull i2c fixes from Wolfram Sang:
       "Some bugfixes from I2C:
      
         - fix a uevent triggered boot problem by removing a useless debug
           print
      
         - fix sysfs-attributes of the new i2c-demux-pinctrl driver to follow
           standard kernel behaviour
      
         - fix a potential division-by-zero error (needed two takes)"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: jz4780: really prevent potential division by zero
        Revert "i2c: jz4780: prevent potential division by zero"
        i2c: jz4780: prevent potential division by zero
        i2c: mux: demux-pinctrl: Update docs to new sysfs-attributes
        i2c: mux: demux-pinctrl: Clean up sysfs attributes
        i2c: prevent endless uevent loop with CONFIG_I2C_DEBUG_CORE
      6a7c9243
    • L
      Revert "ext4: allow readdir()'s of large empty directories to be interrupted" · 9f2394c9
      Linus Torvalds 提交于
      This reverts commit 1028b55b.
      
      It's broken: it makes ext4 return an error at an invalid point, causing
      the readdir wrappers to write the the position of the last successful
      directory entry into the position field, which means that the next
      readdir will now return that last successful entry _again_.
      
      You can only return fatal errors (that terminate the readdir directory
      walk) from within the filesystem readdir functions, the "normal" errors
      (that happen when the readdir buffer fills up, for example) happen in
      the iterorator where we know the position of the actual failing entry.
      
      I do have a very different patch that does the "signal_pending()"
      handling inside the iterator function where it is allowable, but while
      that one passes all the sanity checks, I screwed up something like four
      times while emailing it out, so I'm not going to commit it today.
      
      So my track record is not good enough, and the stars will have to align
      better before that one gets committed.  And it would be good to get some
      review too, of course, since celestial alignments are always an iffy
      debugging model.
      
      IOW, let's just revert the commit that caused the problem for now.
      Reported-by: NGreg Thelen <gthelen@google.com>
      Cc: Theodore Ts'o <tytso@mit.edu>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      9f2394c9
  9. 10 4月, 2016 1 次提交
    • L
      Merge branch 'parisc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 5b5b7fd1
      Linus Torvalds 提交于
      Pull parisc fixes from Helge Deller:
       "Since commit 0de79858 ("parisc: Use generic extable search and
        sort routines") module loading is boken on parisc, because the parisc
        module loader wasn't prepared for the new R_PARISC_PCREL32 relocations.
      
        In addition, due to that breakage, Mikulas Patocka noticed that
        handling exceptions from modules probably never worked on parisc.  It
        was just masked by the fact that exceptions from modules don't happen
        during normal use.
      
        This patch series fixes those issues and survives the tests of the
        lib/test_user_copy kernel module test.  Some patches are tagged for
        stable"
      
      * 'parisc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Update comment regarding relative extable support
        parisc: Unbreak handling exceptions from kernel modules
        parisc: Fix kernel crash with reversed copy_from_user()
        parisc: Avoid function pointers for kernel exception routines
        parisc: Handle R_PARISC_PCREL32 relocations in kernel modules
      5b5b7fd1