Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1457371 > unrolled thread

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

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  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

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

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.

This pull request gets me four new commits, but three of them I
already had. From you.

See for example your new commit

  2dd73625dedc platform/x86: Drop duplicate dependencies on X86

vs

  25789f95a883 platform/x86: Drop duplicate dependencies on X86

which are identical patches, just different dates.

Why should I pull a branch that is this confused?

It's not like I got those patches from somebody else, and there was
just a mis-communication about who should apply them. They were both
from *you*. That old commit came in in 4.7-rc4, so it's not even all
that recent.

              Linus

[toc] | [next] | [standalone]

#1457917

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.

> 
> This pull request gets me four new commits, but three of them I
> already had. From you.
> 
> See for example your new commit
> 
>   2dd73625dedc platform/x86: Drop duplicate dependencies on X86
> 
> vs
> 
>   25789f95a883 platform/x86: Drop duplicate dependencies on X86
> 
> which are identical patches, just different dates.
> 
> Why should I pull a branch that is this confused?
> 
> It's not like I got those patches from somebody else, and there was
> just a mis-communication about who should apply them. They were both
> from *you*. That old commit came in in 4.7-rc4, so it's not even all
> that recent.
> 
>               Linus
> 

-- 
Darren Hart
Intel Open Source Technology Center

[toc] | [prev] | [next] | [standalone]

#1457984

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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web