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
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)
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
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
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
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
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
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
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:
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:
>
>
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
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/crypto/mv_cesa.c
between commit:
27b43fd95b14 ("crypto: marvell - Remove the old mv_cesa driver")
from the crypto tree and commit:
f34d8d506eef ("crypto: Convert timers to use timer_setup()")
from the tip
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/crypto/mv_cesa.c
between commit:
27b43fd95b14 ("crypto: marvell - Remove the old mv_cesa driver")
from the crypto tree and commit:
f34d8d506eef ("crypto: Convert timers to use timer_setup()")
from the tip
On Mon, Oct 12, 2015 at 02:24:21PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/Makefile
>
> between commit:
>
> e38b6b7fcfd1 ("crypto: x86/sha - Add build support for Intel SHA Extensions
> optimized SHA1 and
On Mon, Oct 12, 2015 at 02:24:21PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/Makefile
>
> between commit:
>
> e38b6b7fcfd1 ("crypto: x86/sha - Add build support for Intel SHA Extensions
> optimized SHA1 and
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/Makefile
between commit:
e38b6b7fcfd1 ("crypto: x86/sha - Add build support for Intel SHA Extensions
optimized SHA1 and SHA256")
from the crypto tree and commit:
7b956f035a9e ("x86/asm: Re-add parts of the
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/Makefile
between commit:
e38b6b7fcfd1 ("crypto: x86/sha - Add build support for Intel SHA Extensions
optimized SHA1 and SHA256")
from the crypto tree and commit:
7b956f035a9e ("x86/asm: Re-add parts of the
Hi all,
Today's linux-next merge of the tip tree got conflicts in:
drivers/crypto/vmx/aes.c
drivers/crypto/vmx/aes_cbc.c
drivers/crypto/vmx/ghash.c
between commit:
4beb10604597 "crypto: vmx - Reindent to kernel style"
from the crypto tree and commit:
5f76eea88dcb "sched/preempt,
Hi all,
Today's linux-next merge of the tip tree got conflicts in:
drivers/crypto/vmx/aes.c
drivers/crypto/vmx/aes_cbc.c
drivers/crypto/vmx/ghash.c
between commit:
4beb10604597 crypto: vmx - Reindent to kernel style
from the crypto tree and commit:
5f76eea88dcb sched/preempt,
19 matches
Mail list logo
