On Mon, Jul 20, 2020 at 03:51:57PM +0200, Uros Bizjak wrote: > Resolves conflict with the tip tree. > > CC: Herbert Xu <herb...@gondor.apana.org.au> > CC: Thomas Gleixner <t...@linutronix.de> > CC: Ingo Molnar <mi...@redhat.com> > CC: Borislav Petkov <b...@alien8.de> > CC: "H. Peter Anvin" <h...@zytor.com> > CC: Stephen Rothwell <s...@canb.auug.org.au>, > CC: "Chang S. Bae" <chang.seok....@intel.com>, > CC: Peter Zijlstra <pet...@infradead.org>, > CC: Sasha Levin <sas...@kernel.org> > Signed-off-by: Uros Bizjak <ubiz...@gmail.com> > --- > arch/x86/include/asm/inst.h | 148 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 148 insertions(+) > create mode 100644 arch/x86/include/asm/inst.h
Patch applied. Thanks. -- Email: Herbert Xu <herb...@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
