Hi all,
On Tue, 6 Oct 2020 17:11:35 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/kernel/setup.c
>
> between commit:
>
> f47e22d65d08 ("dma-mapping: split <linux/dma-mapping.h>")
>
> from the dma-mapping tree and commit:
>
> a945c8345ec0 ("static_call: Allow early init")
>
> 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.
>
> diff --cc arch/x86/kernel/setup.c
> index 787c5ff1e7c0,fa16b906ea3f..000000000000
> --- a/arch/x86/kernel/setup.c
> +++ b/arch/x86/kernel/setup.c
> @@@ -20,7 -19,7 +20,8 @@@
> #include <linux/hugetlb.h>
> #include <linux/tboot.h>
> #include <linux/usb/xhci-dbgp.h>
> + #include <linux/static_call.h>
> +#include <linux/swiotlb.h>
>
> #include <uapi/linux/mount.h>
>
This is now a conflict between the dma-mapping tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpKRHr7qiThM.pgp
Description: OpenPGP digital signature
