Re: [GIT PULL] platform-drivers-x86 for 4.8-2

From	Darren Hart <dvhart@infradead.org>
Newsgroups	linux.kernel
Subject	Re: [GIT PULL] platform-drivers-x86 for 4.8-2
Date	2016-08-08 20:50 +0200
Message-ID	<s3XMC-52s-1@gated-at.bofh.it> (permalink)
References	<s3hu2-2MG-39@gated-at.bofh.it> <s3hu2-2MG-37@gated-at.bofh.it> <s3W4f-3QC-25@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Mon, Aug 08, 2016 at 09:54:42AM -0700, Darren Hart wrote:
> On Fri, Aug 05, 2016 at 11:23:09PM -0400, Linus Torvalds wrote:
> > On Fri, Aug 5, 2016 at 6:51 PM, Darren Hart <dvhart@infradead.org> wrote:
> > >
> > > Minor platform specific event handling updates and a Kconfig cleanup.
> > 
> > No. You already sent a *different* copy of all of these except for the
> > dell-wmi one in a previous pull requests.
> 
> Well that is pretty terrible on my part. I screwed up in my management of my
> fixes branch.  I'll dig through this to make sure I didn't mess up anything else
> and submit a new pull request for anything missing.
> 
> Apologies Linus.

I identified what I did wrong and have updated my process and my tooling. While
this should never happen, if it does, my tagging script now performs a "git
cherry -v master $TAG" which will catch any previously merged commits, and
aborts.

New pull request with just the one patch momentarily.

Sorry for the noise, and thank you for catching it.

-- 
Darren Hart
Intel Open Source Technology Center

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

Re: [GIT PULL] platform-drivers-x86 for 4.8-2 Linus Torvalds <torvalds@linux-foundation.org> - 2016-08-06 23:40 +0200
  Re: [GIT PULL] platform-drivers-x86 for 4.8-2 Darren Hart <dvhart@infradead.org> - 2016-08-08 19:00 +0200
    Re: [GIT PULL] platform-drivers-x86 for 4.8-2 Darren Hart <dvhart@infradead.org> - 2016-08-08 20:50 +0200

csiph-web