The patch titled Subject: bitops-more-bits_to_-macros-fix has been added to the -mm tree. Its filename is bitops-more-bits_to_-macros-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/bitops-more-bits_to_-macros-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/bitops-more-bits_to_-macros-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: bitops-more-bits_to_-macros-fix remove ocfs2's private BITS_PER_BYTE() Cc: Amritha Nambiar <amritha.nambiar@xxxxxxxxx> Cc: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> Cc: Kees Cook <keescook@xxxxxxxxxxxx> Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx> Cc: Miklos Szeredi <mszeredi@xxxxxxxxxx> Cc: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx> Cc: Steffen Klassert <steffen.klassert@xxxxxxxxxxx> Cc: "Tobin C . Harding" <tobin@xxxxxxxxxx> Cc: Vineet Gupta <vineet.gupta1@xxxxxxxxxxxx> Cc: Will Deacon <will.deacon@xxxxxxx> Cc: Willem de Bruijn <willemb@xxxxxxxxxx> Cc: Yury Norov <yury.norov@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- 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) - struct dlm_query_join_request { u8 node_idx; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-gup-fix-memory-leak-in-__gup_benchmark_ioctl-fix.patch mm.patch mm-oom-avoid-printk-iteration-under-rcu-fix.patch linux-next-rejects.patch linux-next-git-rejects.patch drivers-block-null_blk_mainc-fix-layout.patch drivers-block-null_blk_mainc-fix-uninitialized-var-warnings.patch bitops-more-bits_to_-macros-fix.patch drivers-tty-serial-sh-scic-suppress-warning.patch kernel-forkc-export-kernel_thread-to-modules.patch