* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/Kconfig.assembler
>
> between commits:
>
> 984f835009d6 ("crypto: x86 - Remove CONFIG_AS_SHA1_NI")
> d032a27e8fe9 ("crypto: x86 - Remove CONFIG_AS_SHA256_NI")
>
> from the crypto tree and commit:
>
> a72d55dc3bd6 ("x86/idle: Remove CONFIG_AS_TPAUSE")
>
> from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
The resolution looks good to me, thank you!
Ingo
