From: Dave Airlie <airlied@gmail.com>
To: Jani Nikula <jani.nikula@linux.intel.com>,
"Bloomfield, Jon" <jon.bloomfield@intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Chris Wilson <chris@chris-wilson.co.uk>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
dri-devel <dri-devel@lists.freedesktop.org>
Subject: drm-next + i915 CVE yolo merge
Date: Thu, 14 Nov 2019 11:33:24 +1000 [thread overview]
Message-ID: <CAPM=9txqtne1+ycij3YYmxWA1jAOB=VoWCZbjnLb71hwxB7_Cw@mail.gmail.com> (raw)
Message-ID: <20191114013324.Cd3c_oqofpEIEgW5i3cwASfz86UWUKSShe4__K9Z6nY@z> (raw)
The landing of the i915 CVE fixes into Linus tree has created a bit of
a mess in linux-next and downstream in drm-next trees.
I talked to Daniel and he had talked to Joonas a bit, and I decided to
go with what Daniel describes as the YOLO merge, where I just solve it
and pray, and everyone else verifies/fixes it.
In my favour I've been reading these patches for a couple of months
now and applied them to a lot of places, so I'm quite familiar with
what they are doing.
The worst culprit was the RC6 ctx corruption fix since the whole of
rc6 got refactored in next. However I also had access to a version of
this patch Jon wrote on drm-tip a couple of weeks ago.
I took that patch, applied it and fixed it up on top of drm-next. Then
I backmerged the commit that also went into Linus' tree. Then I
removed any evidence of the RC6 patch from Linus' tree and left the
newer version pieces in place. The other stuff mostly merged fine and
the results looked fine, but I'd definitely think everyone at Intel
should be staring at it, and my dinq tip resolutions ASAP and
hopefully it goes into CI and comes out smelling of something good.
Let me know if it's all horrible asap,
Thanks,
Dave.
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next reply other threads:[~2019-11-14 1:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-14 1:33 Dave Airlie [this message]
2019-11-14 1:33 ` drm-next + i915 CVE yolo merge Dave Airlie
2019-11-14 8:13 ` Daniel Vetter
2019-11-14 14:20 ` Bloomfield, Jon
2019-11-14 14:20 ` Bloomfield, Jon
2019-11-15 11:14 ` Joonas Lahtinen
2019-11-15 11:42 ` Jani Nikula
2019-11-15 11:42 ` Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAPM=9txqtne1+ycij3YYmxWA1jAOB=VoWCZbjnLb71hwxB7_Cw@mail.gmail.com' \
--to=airlied@gmail.com \
--cc=chris@chris-wilson.co.uk \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=jon.bloomfield@intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).