1. 14 4月, 2018 27 次提交
  2. 13 4月, 2018 13 次提交
    • L
      Merge tag 'drm-fixes-for-v4.17-rc1' of git://people.freedesktop.org/~airlied/linux · 16e205cf
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "One omap, and one alsa pm fix (we merged the breaking patch via drm
        tree).
      
        Otherwise it's two bunches of amdgpu fixes, removing an unneeded file,
        some DC fixes, HDMI audio regression fix, and some vega12 fixes"
      
      * tag 'drm-fixes-for-v4.17-rc1' of git://people.freedesktop.org/~airlied/linux: (27 commits)
        Revert "drm/amd/display: disable CRTCs with NULL FB on their primary plane (V2)"
        Revert "drm/amd/display: fix dereferencing possible ERR_PTR()"
        drm/amd/display: Fix regamma not affecting full-intensity color values
        drm/amd/display: Fix FBC text console corruption
        drm/amd/display: Only register backlight device if embedded panel connected
        drm/amd/display: fix brightness level after resume from suspend
        drm/amd/display: HDMI has no sound after Panel power off/on
        drm/amdgpu: add MP1 and THM hw ip base reg offset
        drm/amdgpu: fix null pointer panic with direct fw loading on gpu reset
        drm/radeon: add PX quirk for Asus K73TK
        drm/omap: fix crash if there's no video PLL
        drm/amdgpu: Fix memory leaks at amdgpu_init() error path
        drm/amdgpu: Fix PCIe lane width calculation
        drm/radeon: Fix PCIe lane width calculation
        drm/amdgpu/si: implement get/set pcie_lanes asic callback
        drm/amdgpu: Add support for SRBM selection v3
        Revert "drm/amdgpu: Don't change preferred domian when fallback GTT v5"
        drm/amd/powerply: fix power reading on Fiji
        drm/amd/powerplay: Enable ACG SS feature
        drm/amdgpu/sdma: fix mask in emit_pipeline_sync
        ...
      16e205cf
    • L
      Merge tag 'trace-v4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · affb0280
      Linus Torvalds 提交于
      Pull tracing fixes from Steven Rostedt:
       "A few clean ups and bug fixes:
      
         - replace open coded "ARRAY_SIZE()" with macro
      
         - updates to uprobes
      
         - bug fix for perf event filter on error path"
      
      * tag 'trace-v4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Enforce passing in filter=NULL to create_filter()
        trace_uprobe: Simplify probes_seq_show()
        trace_uprobe: Use %lx to display offset
        tracing/uprobe: Add support for overlayfs
        tracing: Use ARRAY_SIZE() macro instead of open coding it
      affb0280
    • A
      proc: fixup copyright sign · ee9294d6
      Alexey Dobriyan 提交于
      Add copyright in two files before they get autorubberstamped.
      Signed-off-by: NAlexey Dobriyan <adobriyan@gmail.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ee9294d6
    • L
      Merge tag 'pci-v4.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 0c314a95
      Linus Torvalds 提交于
      Pull PCI fixes from Bjorn Helgaas:
      
       - mark Extended Tags as broken on Broadcom HT1100 and HT2000 Root Ports
         to fix drm/Xorg hangs and unresponsive keyboards (Sinan Kaya)
      
       - remove useless messages during resource reassignment (Desnes A. Nunes
         do Rosario)
      
      * tag 'pci-v4.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        PCI: Remove messages about reassigning resources
        PCI: Mark Broadcom HT1100 and HT2000 Root Port Extended Tags as broken
      0c314a95
    • L
      Merge branch 'parisc-4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 681857ef
      Linus Torvalds 提交于
      Pull parisc updates from Helge Deller:
      
       - fix panic when halting system via "shutdown -h now"
      
       - drop own coding in favour of generic CONFIG_COMPAT_BINFMT_ELF
         implementation
      
       - add FPE_CONDTRAP constant: last outstanding parisc-specific cleanup
         for Eric Biedermans siginfo patches
      
       - move some functions to .init and some to .text.hot linker sections
      
      * 'parisc-4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Prevent panic at system halt
        parisc: Switch to generic COMPAT_BINFMT_ELF
        parisc: Move cache flush functions into .text.hot section
        parisc/signal: Add FPE_CONDTRAP for conditional trap handling
      681857ef
    • D
      Merge branch 'drm-next-4.17' of git://people.freedesktop.org/~agd5f/linux into drm-next · a10beabb
      Dave Airlie 提交于
      - Add a PX quirk for radeon
      - Fix flickering and stability issues with DC on some platforms
      - Fix HDMI audio regression
      - Few other misc DC and base driver fixes
      
      * 'drm-next-4.17' of git://people.freedesktop.org/~agd5f/linux:
        Revert "drm/amd/display: disable CRTCs with NULL FB on their primary plane (V2)"
        Revert "drm/amd/display: fix dereferencing possible ERR_PTR()"
        drm/amd/display: Fix regamma not affecting full-intensity color values
        drm/amd/display: Fix FBC text console corruption
        drm/amd/display: Only register backlight device if embedded panel connected
        drm/amd/display: fix brightness level after resume from suspend
        drm/amd/display: HDMI has no sound after Panel power off/on
        drm/amdgpu: add MP1 and THM hw ip base reg offset
        drm/amdgpu: fix null pointer panic with direct fw loading on gpu reset
        drm/radeon: add PX quirk for Asus K73TK
      a10beabb
    • D
      Merge tag 'drm-misc-next-fixes-2018-04-11' of... · dece02f7
      Dave Airlie 提交于
      Merge tag 'drm-misc-next-fixes-2018-04-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
      
      omap: Fix crash on AM4 EVM, and all OMAP2/3 boards (Tomi)
      
      Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
      
      * tag 'drm-misc-next-fixes-2018-04-11' of git://anongit.freedesktop.org/drm/drm-misc:
        drm/omap: fix crash if there's no video PLL
      dece02f7
    • L
      Merge tag 'xfs-4.17-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · 80aa76bc
      Linus Torvalds 提交于
      Pull more xfs updates from Darrick Wong:
       "Most of these are code cleanups, but there are a couple of notable
        use-after-free bug fixes.
      
        This series has been run through a full xfstests run over the week and
        through a quick xfstests run against this morning's master, with no
        major failures reported.
      
         - clean up unnecessary function call parameters
      
         - fix a use-after-free bug when aborting logging intents
      
         - refactor filestreams state data to avoid use-after-free bug
      
         - fix incorrect removal of cow extents when truncating extended
           attributes.
      
         - refactor open-coded __set_page_dirty in favor of using vfs
           function.
      
         - fix a deadlock when fstrim and fs shutdown race"
      
      * tag 'xfs-4.17-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
        Force log to disk before reading the AGF during a fstrim
        Export __set_page_dirty
        xfs: only cancel cow blocks when truncating the data fork
        xfs: non-scrub - remove unused function parameters
        xfs: remove filestream item xfs_inode reference
        xfs: fix intent use-after-free on abort
        xfs: Remove "committed" argument of xfs_dir_ialloc
      80aa76bc
    • L
      Merge tag 'gfs2-4.17.fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · 4ac1800f
      Linus Torvalds 提交于
      Pull more gfs2 updates from Bob Peterson:
       "We decided to request the latest three patches to be merged into this
        merge window while it's still open.
      
         - The first patch adds a new function to lockref:
           lockref_put_not_zero
      
         - The second patch fixes GFS2's glock dump code so it uses the new
           lockref function. This fixes a problem whereby lock dumps could
           miss glocks.
      
         - I made a minor patch to update some comments and fix the lock
           ordering text in our gfs2-glocks.txt Documentation file"
      
      * tag 'gfs2-4.17.fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
        GFS2: Minor improvements to comments and documentation
        gfs2: Stop using rhashtable_walk_peek
        lockref: Add lockref_put_not_zero
      4ac1800f
    • L
      Merge tag 'nfs-for-4.17-1' of git://git.linux-nfs.org/projects/anna/linux-nfs · a1bf4c7d
      Linus Torvalds 提交于
      Pull NFS client updates from Anna Schumaker:
       "Stable bugfixes:
         - xprtrdma: Fix corner cases when handling device removal # v4.12+
         - xprtrdma: Fix latency regression on NUMA NFS/RDMA clients # v4.15+
      
        Features:
         - New sunrpc tracepoint for RPC pings
         - Finer grained NFSv4 attribute checking
         - Don't unnecessarily return NFS v4 delegations
      
        Other bugfixes and cleanups:
         - Several other small NFSoRDMA cleanups
         - Improvements to the sunrpc RTT measurements
         - A few sunrpc tracepoint cleanups
         - Various fixes for NFS v4 lock notifications
         - Various sunrpc and NFS v4 XDR encoding cleanups
         - Switch to the ida_simple API
         - Fix NFSv4.1 exclusive create
         - Forget acl cache after setattr operation
         - Don't advance the nfs_entry readdir cookie if xdr decoding fails"
      
      * tag 'nfs-for-4.17-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (47 commits)
        NFS: advance nfs_entry cookie only after decoding completes successfully
        NFSv3/acl: forget acl cache after setattr
        NFSv4.1: Fix exclusive create
        NFSv4: Declare the size up to date after it was set.
        nfs: Use ida_simple API
        NFSv4: Fix the nfs_inode_set_delegation() arguments
        NFSv4: Clean up CB_GETATTR encoding
        NFSv4: Don't ask for attributes when ACCESS is protected by a delegation
        NFSv4: Add a helper to encode/decode struct timespec
        NFSv4: Clean up encode_attrs
        NFSv4; Clean up XDR encoding of type bitmap4
        NFSv4: Allow GFP_NOIO sleeps in decode_attr_owner/decode_attr_group
        SUNRPC: Add a helper for encoding opaque data inline
        SUNRPC: Add helpers for decoding opaque and string types
        NFSv4: Ignore change attribute invalidations if we hold a delegation
        NFS: More fine grained attribute tracking
        NFS: Don't force unnecessary cache invalidation in nfs_update_inode()
        NFS: Don't redirty the attribute cache in nfs_wcc_update_inode()
        NFS: Don't force a revalidation of all attributes if change is missing
        NFS: Convert NFS_INO_INVALID flags to unsigned long
        ...
      a1bf4c7d
    • L
      Merge branch 'work.thaw' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 7214dd4e
      Linus Torvalds 提交于
      Pull vfs thaw updates from Al Viro:
       "An ancient series that has fallen through the cracks in the previous
        cycle"
      
      * 'work.thaw' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        buffer.c: call thaw_super during emergency thaw
        vfs: factor sb iteration out of do_emergency_remount
      7214dd4e
    • H
      Revert "drm/amd/display: disable CRTCs with NULL FB on their primary plane (V2)" · 1cb19e82
      Harry Wentland 提交于
      This seems to cause flickering and lock-ups for a wide range of users.
      Revert until we've found a proper fix for the flickering and lock-ups.
      
      This reverts commit 36cc549d.
      
      Cc: Shirish S <shirish.s@amd.com>
      Cc: Alex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      Reviewed-by: NMichel Dänzer <michel.daenzer@amd.com>
      Signed-off-by: NHarry Wentland <harry.wentland@amd.com>
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      1cb19e82
    • L
      Merge branch 'afs-dh' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 19e8a2f8
      Linus Torvalds 提交于
      Pull AFS updates from Al Viro:
       "The AFS series posted by dhowells depended upon lookup_one_len()
        rework; now that prereq is in the mainline, that series had been
        rebased on top of it and got some exposure and testing..."
      
      * 'afs-dh' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        afs: Do better accretion of small writes on newly created content
        afs: Add stats for data transfer operations
        afs: Trace protocol errors
        afs: Locally edit directory data for mkdir/create/unlink/...
        afs: Adjust the directory XDR structures
        afs: Split the directory content defs into a header
        afs: Fix directory handling
        afs: Split the dynroot stuff out and give it its own ops tables
        afs: Keep track of invalid-before version for dentry coherency
        afs: Rearrange status mapping
        afs: Make it possible to get the data version in readpage
        afs: Init inode before accessing cache
        afs: Introduce a statistics proc file
        afs: Dump bad status record
        afs: Implement @cell substitution handling
        afs: Implement @sys substitution handling
        afs: Prospectively look up extra files when doing a single lookup
        afs: Don't over-increment the cell usage count when pinning it
        afs: Fix checker warnings
        vfs: Remove the const from dir_context::actor
      19e8a2f8