Re: linux-next: manual merge of the akpm-current tree with the gpio-brgl tree

[Andy Shevchenko <andy.shevchenko@gmail.com>]

On Mon, Mar 29, 2021 at 12:07 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
>   include/linux/bitmap.h
>
> between commit:
>
>   f7d5fbad07a4 ("lib: bitmap: order includes alphabetically")
>
> from the gpio-brgl tree and commit:
>
>   f3b90426c407 ("kernel.h: drop inclusion in bitmap.h")
>
> from the akpm-current 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.

Looks good to me, thanks, Stephen!

> diff --cc include/linux/bitmap.h
> index 73d039476fa4,6cbcd9d9edd2..000000000000
> --- a/include/linux/bitmap.h
> +++ b/include/linux/bitmap.h
> @@@ -4,12 -4,11 +4,13 @@@
>
>   #ifndef __ASSEMBLY__
>
> + #include <linux/align.h>
>  -#include <linux/types.h>
>   #include <linux/bitops.h>
> - #include <linux/kernel.h>
> + #include <linux/limits.h>
>   #include <linux/string.h>
>  +#include <linux/types.h>
>  +
>  +struct device;
>
>   /*
>    * bitmaps provide bit arrays that consume one or more unsigned



-- 
With Best Regards,
Andy Shevchenko