From: Greg KH <gregkh@linuxfoundation.org>
To: Ben Widawsky <benjamin.widawsky@linux.intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>, stable <stable@vger.kernel.org>,
Intel GFX <intel-gfx@lists.freedesktop.org>,
James Ausmus <james.ausmus@intel.com>,
Jani Nikula <jani.nikula@linux.intel.com>
Subject: Re: [PATCH 00/12] Broadwell 3.14 backports
Date: Fri, 21 Mar 2014 16:47:05 -0700 [thread overview]
Message-ID: <20140321234705.GA9504@kroah.com> (raw)
In-Reply-To: <20140321221448.GA16674@linux.intel.com>
On Fri, Mar 21, 2014 at 03:14:48PM -0700, Ben Widawsky wrote:
> On Fri, Mar 21, 2014 at 08:49:35PM +0100, Daniel Vetter wrote:
> > On Fri, Mar 21, 2014 at 7:48 PM, Ben Widawsky
> > <benjamin.widawsky@linux.intel.com> wrote:
> > > The following patches are the backported "simple" fixes for 3.14. Some
> > > of these already had Cc: stable on them, but required conflict
> > > resolution which I've provided (presumably they canbe dropped if it's
> > > easier for upstream). There will be another series of backports which
> > > has fixes that require more than a single patch.
> > >
> > > I will not have a machine to test these on until Monday, but I am
> > > mailing them out now in case our QA can get it tested sooner.
> > >
> > > Ben Widawsky (2):
> > > drm/i915/bdw: Use scratch page table for GEN8 PPGTT
> > > drm/i915/bdw: Restore PPAT on thaw
> > >
> > > Damien Lespiau (1):
> > > drm/i915/bdw: The TLB invalidation mechanism has been removed from
> > > INSTPM
> > >
> > > Jani Nikula (1):
> > > drm/i915: don't flood the logs about bdw semaphores
> > >
> > > Kenneth Graunke (2):
> > > drm/i915: Add a partial instruction shootdown workaround on Broadwell.
> > > drm/i915: Add thread stall DOP clock gating workaround on Broadwell.
> > >
> > > Mika Kuoppala (2):
> > > drm/i915: Fix forcewake counts for gen8
> > > drm/i915: Do forcewake reset on gen8
> > >
> > > Ville Syrjälä (4):
> > > drm/i915: Disable semaphore wait event idle message on BDW
> > > drm/i915: Implement WaDisableSDEUnitClockGating:bdw
> > > drm/i915: We implement WaDisableAsyncFlipPerfMode:bdw
> > > drm/i915: Don't clobber CHICKEN_PIPESL_1 on BDW
> >
> > The stable team requires a reference to the sha1 of the upstream
> > commit, which your patches seem to lack. git cherry-pick -x
> > automatically adds that for you.
>
> I decided not to do this because in the git help it says,
> "This is done only for cherry picks without conflicts." I believe only
> one of these patches didn't actually have a conflict (so I should have
> done it for that). So I will assume I should ignore this recommendation
> from the git help. I didn't want to make it seem like these patches did
> not have conflicts.
>
> >
> > Also please don't send out backports to stable if we still want to do
> > some testing on them. Adding Greg and stable so he knows that he can
> > bin this series for now. Of course all the patches in here which
> > already have cc: stable in upstream should still go through the normal
> > process (presuming they don't conflict ofc). But since most of these
> > patches are from drm-intel-next we must wait anyway until drm-next has
> > been merged into Linus' tree.
> >
>
> Since you added Greg, I am curious - as noted in the cover letter, I've
> done the merge conflict resolution on the patches which already had Cc:
> stable. I didn't intentionally include any patches which already had Cc:
> stable and didn't require conflict resolution. Are those
> interesting/useful, should I drop them from the series?
I have no idea what is going on here, what this original email was from
/ about, or what I am supposed to do here...
The stable patch process is pretty well defined, and documented, is that
lacking somehow, and if so, in what?
greg k-h
next prev parent reply other threads:[~2014-03-21 23:47 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-21 18:48 [PATCH 00/12] Broadwell 3.14 backports Ben Widawsky
2014-03-21 18:48 ` [PATCH 01/12] drm/i915: Fix forcewake counts for gen8 Ben Widawsky
2014-03-21 18:48 ` [PATCH 02/12] drm/i915: Do forcewake reset on gen8 Ben Widawsky
2014-03-21 18:48 ` [PATCH 03/12] drm/i915: Disable semaphore wait event idle message on BDW Ben Widawsky
2014-03-21 18:48 ` [PATCH 04/12] drm/i915: Implement WaDisableSDEUnitClockGating:bdw Ben Widawsky
2014-03-21 18:48 ` [PATCH 05/12] drm/i915: We implement WaDisableAsyncFlipPerfMode:bdw Ben Widawsky
2014-03-21 18:48 ` [PATCH 06/12] drm/i915: Add a partial instruction shootdown workaround on Broadwell Ben Widawsky
2014-03-21 18:48 ` [PATCH 07/12] drm/i915: Add thread stall DOP clock gating " Ben Widawsky
2014-03-21 18:48 ` [PATCH 08/12] drm/i915/bdw: The TLB invalidation mechanism has been removed from INSTPM Ben Widawsky
2014-03-21 18:48 ` [PATCH 09/12] drm/i915: Don't clobber CHICKEN_PIPESL_1 on BDW Ben Widawsky
2014-03-21 18:48 ` [PATCH 10/12] drm/i915: don't flood the logs about bdw semaphores Ben Widawsky
2014-03-21 22:06 ` [PATCH 10/12] [v2] " Ben Widawsky
2014-03-21 18:48 ` [PATCH 11/12] drm/i915/bdw: Use scratch page table for GEN8 PPGTT Ben Widawsky
2014-03-21 18:48 ` [PATCH 12/12] drm/i915/bdw: Restore PPAT on thaw Ben Widawsky
2014-03-21 19:49 ` [PATCH 00/12] Broadwell 3.14 backports Daniel Vetter
2014-03-21 22:14 ` Ben Widawsky
2014-03-21 23:47 ` Greg KH [this message]
2014-03-22 0:06 ` Ben Widawsky
2014-03-22 0:17 ` Ben Widawsky
2014-03-22 11:29 ` Daniel Vetter
2014-03-22 0:51 ` Ben Widawsky
2014-03-22 11:34 ` Daniel Vetter
2014-03-24 23:14 ` Ausmus, James
2014-03-24 23:17 ` Ben Widawsky
2014-03-25 9:43 ` Daniel Vetter
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=20140321234705.GA9504@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=benjamin.widawsky@linux.intel.com \
--cc=daniel@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=james.ausmus@intel.com \
--cc=jani.nikula@linux.intel.com \
--cc=stable@vger.kernel.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