| Message ID | 1463759778-4764-1-git-send-email-tim.gardner@canonical.com |
|---|---|
| State | New |
| Headers | show |
ACK: Upstream cherry-picks; all now appear in mainline master.
On Fri, May 20, 2016 at 09:56:16AM -0600, Tim Gardner wrote: > From: Philippe Bergheaud <felix@linux.vnet.ibm.com> > > BugLink: http://bugs.launchpad.net/bugs/1584066 > > Signed-off-by: Philippe Bergheaud <felix@linux.vnet.ibm.com> > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> > (cherry picked from linux-next commit 86c9ffcc1ed17497a5df473232a7e654fa8cfa1f) > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > arch/powerpc/include/asm/reg.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h > index 2220f7a..9b92693 100644 > --- a/arch/powerpc/include/asm/reg.h > +++ b/arch/powerpc/include/asm/reg.h > @@ -1174,6 +1174,7 @@ > #define PVR_970GX 0x0045 > #define PVR_POWER7p 0x004A > #define PVR_POWER8E 0x004B > +#define PVR_POWER8NVL 0x004C > #define PVR_POWER8 0x004D > #define PVR_BE 0x0070 > #define PVR_PA6T 0x0090 Looks to be all upstream, all cherry-picks. Can we make sure the commit ids in here are the appropriate upstream ones and update the cherry picked lines when applying please. Acked-by: Andy Whitcroft <apw@canonical.com> -apw
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h index 2220f7a..9b92693 100644 --- a/arch/powerpc/include/asm/reg.h +++ b/arch/powerpc/include/asm/reg.h @@ -1174,6 +1174,7 @@ #define PVR_970GX 0x0045 #define PVR_POWER7p 0x004A #define PVR_POWER8E 0x004B +#define PVR_POWER8NVL 0x004C #define PVR_POWER8 0x004D #define PVR_BE 0x0070 #define PVR_PA6T 0x0090