[git,pull] drm fixes for 4.15-rc6

Submitted by Dave Airlie on Dec. 29, 2017, 3:18 a.m.

Details

Message ID CAPM=9tznj0cpGeM43bGBoo2c=rBhVkwbxGYnXcn=dKFi1RVZjQ@mail.gmail.com
State New
Headers show

Not browsing as part of any series.

Pull-request download mbox

git pull git://people.freedesktop.org/~airlied/linux tags/drm-fixes-for-v4.15-rc6

Commit Message

Dave Airlie Dec. 29, 2017, 3:18 a.m.
Hi Linus,

Just dequeuing some fixes, I'm on holidays next week again, but I
think things should be fine.

Dave.

The following changes since commit 464e1d5f23cca236b930ef068c328a64cab78fb1:

  Linux 4.15-rc5 (2017-12-23 20:47:16 -0800)

are available in the git repository at:

  git://people.freedesktop.org/~airlied/linux tags/drm-fixes-for-v4.15-rc6

for you to fetch changes up to 03bfd4e19b935adb8be4f7342f13395fb7f11096:

  Merge tag 'drm-intel-fixes-2017-12-22-1' of
git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (2017-12-28
05:20:07 +1000)

----------------------------------------------------------------
nouveau and i915 regression fixes

----------------------------------------------------------------
Ben Skeggs (1):
      drm/nouveau: fix race when adding delayed work items

Dave Airlie (2):
      Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes
      Merge tag 'drm-intel-fixes-2017-12-22-1' of
git://anongit.freedesktop.org/drm/drm-intel into drm-fixes

Gabriel Krisman Bertazi (1):
      i915: Reject CCS modifiers for pipe C on Geminilake

Jani Nikula (1):
      Merge tag 'gvt-fixes-2017-12-21' of
https://github.com/intel/gvt-linux into drm-intel-fixes

Xiaolin Zhang (1):
      drm/i915/gvt: Fix pipe A enable as default for vgpu

 drivers/gpu/drm/i915/gvt/display.c    | 5 +++--
 drivers/gpu/drm/i915/intel_display.c  | 2 +-
 drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

Comments

On 12/28/2017 07:18 PM, Dave Airlie wrote:
> Hi Linus,
> 
> Just dequeuing some fixes, I'm on holidays next week again, but I
> think things should be fine.
> 
> Dave.

Hi,

It would be good to get this documentation build error patch
merged into 4.15.  Daniel Vetter says that he merged (applied) it.

[PATCH] documentation/gpu/i915: fix docs build error after file rename
  https://marc.info/?l=linux-kernel&m=151234419425847&w=2
On Thu, 28 Dec 2017, Randy Dunlap <rdunlap@infradead.org> wrote:
> It would be good to get this documentation build error patch
> merged into 4.15.  Daniel Vetter says that he merged (applied) it.
>
> [PATCH] documentation/gpu/i915: fix docs build error after file rename
>   https://marc.info/?l=linux-kernel&m=151234419425847&w=2

Hi Randy, didn't look too closely but I presume our scripts tripped over
the Fixes: tag that's split to two lines in that patch. I'll pick it up
for our next fixes batch.

Btw your documentation efforts haven't gone unnoticed, much appreciated.

BR,
Jani.
On Fri, 29 Dec 2017, Jani Nikula <jani.nikula@linux.intel.com> wrote:
> On Thu, 28 Dec 2017, Randy Dunlap <rdunlap@infradead.org> wrote:
>> It would be good to get this documentation build error patch
>> merged into 4.15.  Daniel Vetter says that he merged (applied) it.
>>
>> [PATCH] documentation/gpu/i915: fix docs build error after file rename
>>   https://marc.info/?l=linux-kernel&m=151234419425847&w=2
>
> Hi Randy, didn't look too closely but I presume our scripts tripped over
> the Fixes: tag that's split to two lines in that patch. I'll pick it up
> for our next fixes batch.

I just sent the pull request with this to Dave.

BR,
Jani.