From: "Bloomfield, Jon" <jon.bloomfield@intel.com> To: Daniel Vetter <daniel.vetter@ffwll.ch>, Dave Airlie <airlied@gmail.com> Cc: Stephen Rothwell <sfr@canb.auug.org.au>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, dri-devel <dri-devel@lists.freedesktop.org>, Linus Torvalds <torvalds@linux-foundation.org> Subject: Re: drm-next + i915 CVE yolo merge Date: Thu, 14 Nov 2019 14:20:45 +0000 [thread overview] Message-ID: <AD48BB7FB99B174FBCC69E228F58B3B68EB2EE33@FMSMSX119.amr.corp.intel.com> (raw) In-Reply-To: <CAKMK7uFtbRifpYanq3qOAOfzFFKWEe0zvJUg8A241TJ6rqoE+A@mail.gmail.com> > -----Original Message----- > From: Daniel Vetter <daniel.vetter@ffwll.ch> > Sent: Thursday, November 14, 2019 12:13 AM > To: Dave Airlie <airlied@gmail.com> > Cc: 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>; > Stephen Rothwell <sfr@canb.auug.org.au>; dri-devel <dri- > devel@lists.freedesktop.org>; Intel Graphics Development <intel- > gfx@lists.freedesktop.org>; Linus Torvalds <torvalds@linux-foundation.org> > Subject: Re: drm-next + i915 CVE yolo merge > > On Thu, Nov 14, 2019 at 2:33 AM Dave Airlie <airlied@gmail.com> wrote: > > 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. > > Imre should look at the RC6 fix - He did all the hard work on that, including the rebases I sent to Dave. I was just a proxy :-) > > Let me know if it's all horrible asap, > > Add Martin and Arek for CI results. The yolo stuff landed in > CI_DRM_7340, did we break anything in there? From a quick look seems > all ok. Jon _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: "Bloomfield, Jon" <jon.bloomfield@intel.com> To: Daniel Vetter <daniel.vetter@ffwll.ch>, Dave Airlie <airlied@gmail.com> Cc: Stephen Rothwell <sfr@canb.auug.org.au>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, dri-devel <dri-devel@lists.freedesktop.org>, Linus Torvalds <torvalds@linux-foundation.org> Subject: RE: drm-next + i915 CVE yolo merge Date: Thu, 14 Nov 2019 14:20:45 +0000 [thread overview] Message-ID: <AD48BB7FB99B174FBCC69E228F58B3B68EB2EE33@FMSMSX119.amr.corp.intel.com> (raw) Message-ID: <20191114142045.I7vcF-Vq65ONJcUaxi00cZzxwolXxYZBwT5Ww6Oqi-U@z> (raw) In-Reply-To: <CAKMK7uFtbRifpYanq3qOAOfzFFKWEe0zvJUg8A241TJ6rqoE+A@mail.gmail.com> > -----Original Message----- > From: Daniel Vetter <daniel.vetter@ffwll.ch> > Sent: Thursday, November 14, 2019 12:13 AM > To: Dave Airlie <airlied@gmail.com> > Cc: 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>; > Stephen Rothwell <sfr@canb.auug.org.au>; dri-devel <dri- > devel@lists.freedesktop.org>; Intel Graphics Development <intel- > gfx@lists.freedesktop.org>; Linus Torvalds <torvalds@linux-foundation.org> > Subject: Re: drm-next + i915 CVE yolo merge > > On Thu, Nov 14, 2019 at 2:33 AM Dave Airlie <airlied@gmail.com> wrote: > > 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. > > Imre should look at the RC6 fix - He did all the hard work on that, including the rebases I sent to Dave. I was just a proxy :-) > > Let me know if it's all horrible asap, > > Add Martin and Arek for CI results. The yolo stuff landed in > CI_DRM_7340, did we break anything in there? From a quick look seems > all ok. Jon _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-11-14 14:20 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-14 1:33 drm-next + i915 CVE yolo merge Dave Airlie 2019-11-14 1:33 ` Dave Airlie 2019-11-14 8:13 ` Daniel Vetter 2019-11-14 14:20 ` Bloomfield, Jon [this message] 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=AD48BB7FB99B174FBCC69E228F58B3B68EB2EE33@FMSMSX119.amr.corp.intel.com \ --to=jon.bloomfield@intel.com \ --cc=airlied@gmail.com \ --cc=daniel.vetter@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --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: linkBe 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).