The patch titled Subject: bitops-more-bits_to_-macros-fix-fix has been removed from the -mm tree. Its filename was bitops-more-bits_to_-macros-fix-fix.patch This patch was dropped because it was folded into bitops-more-bits_to_-macros.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: bitops-more-bits_to_-macros-fix-fix fix drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h Cc: Yury Norov <ynorov@xxxxxxxxxxx> 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-vmallocc-fix-typo-in-comment.patch prctl_set_mm-refactor-checks-from-validate_prctl_map-checkpatch-fixes.patch prctl_set_mm-downgrade-mmap_sem-to-read-lock-checkpatch-fixes.patch mm-mmu_gather-remove-__tlb_reset_range-for-force-flush-checkpatch-fixes.patch scripts-spellingtxt-drop-sepc-from-the-misspelling-list-fix.patch ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch mm.patch include-linux-pfn_th-remove-pfn_t_to_virt.patch mm-swap-use-rbtree-for-swap_extent-fix.patch proc-sysctl-add-shared-variables-for-range-check-fix.patch vmcore-add-a-kernel-parameter-novmcoredd-fix.patch byteorder-sanity-check-toolchain-vs-kernel-endianess-checkpatch-fixes.patch bitops-more-bits_to_-macros.patch selftests-ptrace-add-a-test-case-for-ptrace_get_syscall_info-checkpatch-fixes.patch linux-next-rejects.patch kernel-forkc-export-kernel_thread-to-modules.patch