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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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 it was folded into bitops-more-bits_to_-macros.patch

------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: bitops-more-bits_to_-macros-fix

fix fs/ocfs2/dlm/dlmcommon.h

Reported-by: kbuild test robot <lkp@xxxxxxxxx>
Cc: Yury Norov <ynorov@xxxxxxxxxxx>
Cc: Yury Norov <yury.norov@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 fs/ocfs2/dlm/dlmcommon.h |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- a/fs/ocfs2/dlm/dlmcommon.h~bitops-more-bits_to_-macros-fix
+++ a/fs/ocfs2/dlm/dlmcommon.h
@@ -25,6 +25,8 @@
 #ifndef DLMCOMMON_H
 #define DLMCOMMON_H
 
+#include <linux/bits.h>
+#include <linux/bitops.h>
 #include <linux/kref.h>
 
 #define DLM_HB_NODE_DOWN_PRI     (0xf000000)
@@ -704,10 +706,6 @@ struct dlm_begin_reco
 	__be32 pad2;
 };
 
-
-#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-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
bitops-more-bits_to_-macros-fix-fix.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




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux