Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the akpm-current tree with the gpio-brgl tree
@ 2021-03-29  8:47 Stephen Rothwell
  2021-03-29 11:32 ` Andy Shevchenko
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2021-03-29  8:47 UTC (permalink / raw)
  To: Andrew Morton, Bartosz Golaszewski
  Cc: Andy Shevchenko, Bartosz Golaszewski, Linux Kernel Mailing List,
	Linux Next Mailing List


[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]

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.

-- 
Cheers,
Stephen Rothwell

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: linux-next: manual merge of the akpm-current tree with the gpio-brgl tree
  2021-03-29  8:47 linux-next: manual merge of the akpm-current tree with the gpio-brgl tree Stephen Rothwell
@ 2021-03-29 11:32 ` Andy Shevchenko
  0 siblings, 0 replies; 2+ messages in thread
From: Andy Shevchenko @ 2021-03-29 11:32 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Andrew Morton, Bartosz Golaszewski, Andy Shevchenko,
	Bartosz Golaszewski, Linux Kernel Mailing List,
	Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-29  8:47 linux-next: manual merge of the akpm-current tree with the gpio-brgl tree Stephen Rothwell
2021-03-29 11:32 ` Andy Shevchenko

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git