The patch titled Subject: bitops-more-bits_to_-macros-fix-fix has been added to the -mm tree. Its filename is bitops-more-bits_to_-macros-fix-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/bitops-more-bits_to_-macros-fix-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/bitops-more-bits_to_-macros-fix-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-fix convert drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h 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> --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h~bitops-more-bits_to_-macros-fix-fix +++ a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h @@ -17,6 +17,8 @@ #ifndef BNX2X_INIT_H #define BNX2X_INIT_H +#include <linux/bitops.h> + /* Init operation types and structures */ enum { OP_RD = 0x1, /* read a single register */ @@ -296,7 +298,6 @@ static inline void bnx2x_dcb_config_qm(s * possible, the driver should only write the valid vnics into the internal * ram according to the appropriate port mode. */ -#define BITS_TO_BYTES(x) ((x)/8) /* CMNG constants, as derived from system spec calculations */ _ 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 linux-next-fix.patch drivers-block-null_blk_mainc-fix-layout.patch drivers-block-null_blk_mainc-fix-uninitialized-var-warnings.patch proc-convert-everything-to-struct-proc_ops-fix.patch bitops-more-bits_to_-macros-fix.patch bitops-more-bits_to_-macros-fix-fix.patch drivers-tty-serial-sh-scic-suppress-warning.patch kernel-forkc-export-kernel_thread-to-modules.patch