Re: linux-next: manual merge of the tip tree with the crypto tree

2020-08-03 Thread Stephen Rothwell
Hi all, On Tue, 21 Jul 2020 14:28:45 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > arch/x86/include/asm/inst.h > > between commit: > > d7866e503bdc ("crypto: x86 - Remove include/asm/inst.h") > (also "crypto: x86 - Put back integer parts

linux-next: manual merge of the tip tree with the crypto tree

2020-07-20 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/x86/include/asm/inst.h between commit: d7866e503bdc ("crypto: x86 - Remove include/asm/inst.h") (also "crypto: x86 - Put back integer parts of include/asm/inst.h" which I have added to the crypto tree merge today) fro

Re: linux-next: manual merge of the tip tree with the crypto tree

2020-07-20 Thread Herbert Xu
On Fri, Jul 17, 2020 at 09:31:18AM +0200, Uros Bizjak wrote: > Please find attached the incremental patch that puts back integer > parts of inst.h. This resolves the conflict with the tip tree. Sorry but you can't send a patch without changing the Subject line as otherwise patchwork will simply tr

Re: linux-next: manual merge of the tip tree with the crypto tree

2020-07-19 Thread Stephen Rothwell
Hi Uros, On Mon, 20 Jul 2020 08:13:51 +0200 Uros Bizjak wrote: > > On Mon, Jul 20, 2020 at 6:03 AM Stephen Rothwell > wrote: > > > > Please find attached the incremental patch that puts back integer > > > parts of inst.h. This resolves the conflict with the tip tree. > > > > The tip tree cha

Re: linux-next: manual merge of the tip tree with the crypto tree

2020-07-19 Thread Uros Bizjak
On Mon, Jul 20, 2020 at 6:03 AM Stephen Rothwell wrote: > > Please find attached the incremental patch that puts back integer > > parts of inst.h. This resolves the conflict with the tip tree. > > The tip tree change needs the XMM parts kept as well, sorry. Strange, because I did test my patch w

Re: linux-next: manual merge of the tip tree with the crypto tree

2020-07-19 Thread Stephen Rothwell
Hi Uros, On Fri, 17 Jul 2020 09:31:18 +0200 Uros Bizjak wrote: > > Please find attached the incremental patch that puts back integer > parts of inst.h. This resolves the conflict with the tip tree. The tip tree change needs the XMM parts kept as well, sorry. So I ended up just removing the actu

Re: linux-next: manual merge of the tip tree with the crypto tree

2020-07-17 Thread Uros Bizjak
Please find attached the incremental patch that puts back integer parts of inst.h. This resolves the conflict with the tip tree. Uros. On Fri, Jul 17, 2020 at 8:45 AM Herbert Xu wrote: > > On Fri, Jul 17, 2020 at 08:27:27AM +0200, Uros Bizjak wrote: > > > > I will prepare a v2 that leaves needed

Re: linux-next: manual merge of the tip tree with the crypto tree

2020-07-16 Thread Stephen Rothwell
Hi Herbert, On Fri, 17 Jul 2020 16:44:01 +1000 Herbert Xu wrote: > > On Fri, Jul 17, 2020 at 08:27:27AM +0200, Uros Bizjak wrote: > > > > I will prepare a v2 that leaves needed part of inst.h. > > Your patch has already been applied. So please make it an > incremental patch. Thank you both.

Re: linux-next: manual merge of the tip tree with the crypto tree

2020-07-16 Thread Herbert Xu
On Fri, Jul 17, 2020 at 08:27:27AM +0200, Uros Bizjak wrote: > > I will prepare a v2 that leaves needed part of inst.h. Your patch has already been applied. So please make it an incremental patch. Thanks, -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gond

Re: linux-next: manual merge of the tip tree with the crypto tree

2020-07-16 Thread Uros Bizjak
On Fri, Jul 17, 2020 at 6:47 AM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > arch/x86/include/asm/inst.h > > between commit: > > d7866e503bdc ("crypto: x86 - Remove include/asm/inst.h") > > from the crypto tree and commit: > > eaad98

linux-next: manual merge of the tip tree with the crypto tree

2020-07-16 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/x86/include/asm/inst.h between commit: d7866e503bdc ("crypto: x86 - Remove include/asm/inst.h") from the crypto tree and commit: eaad981291ee ("x86/entry/64: Introduce the FIND_PERCPU_BASE macro") from the tip tre