On Tue, 2020-04-28 at 17:48 +0200, speck for Thomas Gleixner wrote:
> Folks!
> 
> I've merged the documentation update from Josh into the master branch of
> the speck git repository at:
> 
>    cvs.ou.linutronix.de:linux/speck/linux
> 
> The stable branches linux-5.6.y, linux-5.4.y, linux-4.19.y and
> linux-4.14.y have been updated as well.
> 
> The badly smelling linux-4.9.y and linux-4.4.y branches have the backports provided
> by Mark.
> 
> A tarball with git bundles is attached.

I noticed that the backports of "x86/cpu: Add a steppings field to
struct x86_cpu_id" to 5.4 and 5.6 add a couple of unused macros to the
top of <arch/x86/include/asm/cpu_device_id.h>:

+#define X86_CENTAUR_FAM6_C7_D          0xd
+#define X86_CENTAUR_FAM6_NANO          0xf

It looks like a bogus conflict resolution.  The backports to older
versions don't have these.

Ben.

-- 
Ben Hutchings
It's easier to fight for one's principles than to live up to them.