[alternative-merged] bitops-more-bits_to_-macros-fix.patch removed from -mm tree

[alternative-merged] bitops-more-bits_to_-macros-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: bitops-more-bits_to_-macros-fix
has been removed from the -mm tree.  Its filename was
     bitops-more-bits_to_-macros-fix.patch

This patch was dropped because an alternative patch was merged

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: bitops-more-bits_to_-macros-fix

remove ocfs2's private BITS_PER_BYTE()

Cc: Amritha Nambiar <amritha.nambiar@intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Kees Cook <keescook@chromium.org>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Miklos Szeredi <mszeredi@redhat.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: "Tobin C . Harding" <tobin@kernel.org>
Cc: Vineet Gupta <vineet.gupta1@synopsys.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Willem de Bruijn <willemb@google.com>
Cc: Yury Norov <yury.norov@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/ocfs2/dlm/dlmcommon.h |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- a/fs/ocfs2/dlm/dlmcommon.h~bitops-more-bits_to_-macros-fix
+++ a/fs/ocfs2/dlm/dlmcommon.h
@@ -11,6 +11,7 @@
 #define DLMCOMMON_H
 
 #include <linux/kref.h>
+#include <linux/bitops.h>
 
 #define DLM_HB_NODE_DOWN_PRI     (0xf000000)
 #define DLM_HB_NODE_UP_PRI       (0x8000000)
@@ -689,9 +690,6 @@ struct dlm_begin_reco
 };
 
 
-#define BITS_PER_BYTE 8
-#define BITS_TO_BYTES(bits) (((bits)+BITS_PER_BYTE-1)/BITS_PER_BYTE)