From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 6 May 2021 01:31:40 +0000 (+1000)
Subject: Merge branch 'akpm-current/current'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f4e19c08c0ac68224618196b146c9d684dedeb64;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'akpm-current/current'
---

f4e19c08c0ac68224618196b146c9d684dedeb64
diff --cc include/linux/bitmap.h
index 73d039476fa49,f57f4473bbe49..a36cfcec4e779
--- 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