The patch titled
edac i5000 parenthesis balance fix
has been removed from the -mm tree. Its filename was
drivers-edac-new-intel-5000-mc-driver-fix.patch
This patch was dropped because it was folded into drivers-edac-new-intel-5000-mc-driver.patch
------------------------------------------------------
Subject: edac i5000 parenthesis balance fix
From: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx>
Signed-off-by: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx>
Cc: Eric Wollesen <ericw@xxxxxxxx>
Cc: Doug Thompson <norsk5@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/edac/i5000_edac.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/edac/i5000_edac.c~drivers-edac-new-intel-5000-mc-driver-fix drivers/edac/i5000_edac.c
--- a/drivers/edac/i5000_edac.c~drivers-edac-new-intel-5000-mc-driver-fix
+++ a/drivers/edac/i5000_edac.c
@@ -277,7 +277,7 @@
#define MTR_DRAM_BANKS(mtr) ((((mtr) >> 5) & 0x1) ? 8 : 4)
#define MTR_DRAM_BANKS_ADDR_BITS(mtr) ((MTR_DRAM_BANKS(mtr) == 8) ? 3 : 2)
#define MTR_DIMM_RANK(mtr) (((mtr) >> 4) & 0x1)
-#define MTR_DIMM_RANK_ADDR_BITS(mtr) ((MTR_DIM_RANKS(mtr) ? 2 : 1)
+#define MTR_DIMM_RANK_ADDR_BITS(mtr) (MTR_DIM_RANKS(mtr) ? 2 : 1)
#define MTR_DIMM_ROWS(mtr) (((mtr) >> 2) & 0x3)
#define MTR_DIMM_ROWS_ADDR_BITS(mtr) (MTR_DIMM_ROWS(mtr) + 13)
#define MTR_DIMM_COLS(mtr) ((mtr) & 0x3)
_
Patches currently in -mm which might be from m.kozlowski@xxxxxxxxxx are
origin.patch
drivers-edac-new-intel-5000-mc-driver.patch
drivers-edac-new-intel-5000-mc-driver-fix.patch
driver-edac-i5000-define-typo.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
