On Mon, Jul 20, 2020 at 03:51:57PM +0200, Uros Bizjak wrote: > Resolves conflict with the tip tree. > > CC: Herbert Xu <[email protected]> > CC: Thomas Gleixner <[email protected]> > CC: Ingo Molnar <[email protected]> > CC: Borislav Petkov <[email protected]> > CC: "H. Peter Anvin" <[email protected]> > CC: Stephen Rothwell <[email protected]>, > CC: "Chang S. Bae" <[email protected]>, > CC: Peter Zijlstra <[email protected]>, > CC: Sasha Levin <[email protected]> > Signed-off-by: Uros Bizjak <[email protected]> > --- > 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 <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
