Re: [PATCH -v2 0/5] Further sanitize INTEL_FAM6 naming

[Ingo Molnar]

* Peter Zijlstra <peterz@xxxxxxxxxxxxx> wrote:

> On Wed, Aug 28, 2019 at 11:33:01AM +0200, Peter Zijlstra wrote:
> > On Tue, Aug 27, 2019 at 11:51:35PM +0200, Peter Zijlstra wrote:
> > > On Tue, Aug 27, 2019 at 08:44:23PM +0000, Luck, Tony wrote:
> > > > > I'm reposting because the version Ingo applied and partially fixed up still
> > > > > generates build bot failure.
> > > > 
> > > > Looks like this version gets them all. I built my standard config, allmodconfig and allyesconfig.
> > > > 
> > > > Reviewed-by: Tony Luck <tony.luck@xxxxxxxxx>
> > > > 
> > > > What happens next? Will Ingo back out the previous set & his partial fixup and replace
> > > > with this series?  Or just slap one extra patch on top of what is already in tip?

There was no extra patch needed:

> > > > First option changes a TIP branch
> > > 
> > > This is uncommon, but not unheard of. I'll talk to Ingo and Thomas
> > > tomorrow to see what would be the best way forward.
> > 
> > OK, I talked to Thomas and we're going to force update that branch. I've
> > pushed it out to my queue.git thing and I'll push it to -tip later
> > (hoping the 0day gets a chance to have a go at it, but that thing's been
> > soooooo slow recently I'm loath to rely/wait on it).
> 
> Done now. tip/x86/cpu should have the shiny new patches in.

Note that it's the exact same patches:

  old:  tip/x86/cpu 26ee9ccc117b: x86/cpu/intel: Fix rename fallout
  new:  tip/x86/cpu a3d8c0d13bde: x86/intel: Add common OPTDIFFs

  dagon:~/tip> git diff 26ee9ccc117b..a3d8c0d13bde
  dagon:~/tip> 

What you did was to backmerge my fix, but haven't changed anything else, 
right?

Thanks,

	Ingo