diff for duplicates of <145685944232118@kroah.com> diff --git a/a/content_digest b/N1/content_digest index 9c61028..9bcc3c0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,13 @@ "From\0<gregkh@linuxfoundation.org>\0" "Subject\0Patch \"Revert \"MIPS: Fix PAGE_MASK definition\"\" has been added to the 4.4-stable tree\0" "Date\0Tue, 01 Mar 2016 19:10:44 +0000\0" - "To\0<dan.j.williams@intel.com>" - <gregkh@linuxfoundation.org> - <linux-mips@linux-mips.org> - <manuel.lauss@gmail.com> - " <ralf@linux-mips.org>\0" - "Cc\0<stable@vger.kernel.org>" - " <stable-commits@vger.kernel.org>\0" + "To\0dan.j.williams@intel.com" + gregkh@linuxfoundation.org + linux-mips@linux-mips.org + manuel.lauss@gmail.com + " ralf@linux-mips.org\0" + "Cc\0stable@vger.kernel.org" + " stable-commits@vger.kernel.org\0" "\00:1\0" "b\0" "\n" @@ -25,4 +25,4 @@ "If you, or anyone else, feels it should not be added to the stable tree,\n" please let <stable@vger.kernel.org> know about it. -baca7dea791e83f5f280c53f9ee429d85b83a78a797ea3e9f5589ae1c6cf6787 +6643073ab6478973f63100046e75a34de25fa3d9ae29885a11dd124d7108b217
diff --git a/a/1.txt b/N2/1.txt index 2d1fd39..960d8b4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -12,3 +12,49 @@ and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@vger.kernel.org> know about it. + + +>From 800dc4f49cc002879e1e5e6b79926f86b60528e6 Mon Sep 17 00:00:00 2001 +From: Dan Williams <dan.j.williams@intel.com> +Date: Fri, 22 Jan 2016 09:20:37 -0800 +Subject: Revert "MIPS: Fix PAGE_MASK definition" + +From: Dan Williams <dan.j.williams@intel.com> + +commit 800dc4f49cc002879e1e5e6b79926f86b60528e6 upstream. + +This reverts commit 22b14523994588279ae9c5ccfe64073c1e5b3c00. + +It was originally sent in an earlier revision of the pfn_t patchset. +Besides being broken, the warning is also fixed by PFN_FLAGS_MASK +casting the PAGE_MASK to an unsigned long. + +Reported-by: Manuel Lauss <manuel.lauss@gmail.com> +Signed-off-by: Dan Williams <dan.j.williams@intel.com> +Cc: linux-kernel@vger.kernel.org +Cc: Linux-MIPS <linux-mips@linux-mips.org> +Patchwork: https://patchwork.linux-mips.org/patch/12182/ +Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +--- + arch/mips/include/asm/page.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/mips/include/asm/page.h ++++ b/arch/mips/include/asm/page.h +@@ -33,7 +33,7 @@ + #define PAGE_SHIFT 16 + #endif + #define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT) +-#define PAGE_MASK (~(PAGE_SIZE - 1)) ++#define PAGE_MASK (~((1 << PAGE_SHIFT) - 1)) + + /* + * This is used for calculating the real page sizes + + +Patches currently in stable-queue which might be from dan.j.williams@intel.com are + +queue-4.4/revert-mips-fix-page_mask-definition.patch +queue-4.4/devm_memremap-fix-error-value-when-memremap-failed.patch diff --git a/a/content_digest b/N2/content_digest index 9c61028..f59baba 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,6 +1,6 @@ "From\0<gregkh@linuxfoundation.org>\0" "Subject\0Patch \"Revert \"MIPS: Fix PAGE_MASK definition\"\" has been added to the 4.4-stable tree\0" - "Date\0Tue, 01 Mar 2016 19:10:44 +0000\0" + "Date\0Tue, 01 Mar 2016 19:10:47 +0000\0" "To\0<dan.j.williams@intel.com>" <gregkh@linuxfoundation.org> <linux-mips@linux-mips.org> @@ -23,6 +23,52 @@ "and it can be found in the queue-4.4 subdirectory.\n" "\n" "If you, or anyone else, feels it should not be added to the stable tree,\n" - please let <stable@vger.kernel.org> know about it. + "please let <stable@vger.kernel.org> know about it.\n" + "\n" + "\n" + ">From 800dc4f49cc002879e1e5e6b79926f86b60528e6 Mon Sep 17 00:00:00 2001\n" + "From: Dan Williams <dan.j.williams@intel.com>\n" + "Date: Fri, 22 Jan 2016 09:20:37 -0800\n" + "Subject: Revert \"MIPS: Fix PAGE_MASK definition\"\n" + "\n" + "From: Dan Williams <dan.j.williams@intel.com>\n" + "\n" + "commit 800dc4f49cc002879e1e5e6b79926f86b60528e6 upstream.\n" + "\n" + "This reverts commit 22b14523994588279ae9c5ccfe64073c1e5b3c00.\n" + "\n" + "It was originally sent in an earlier revision of the pfn_t patchset.\n" + "Besides being broken, the warning is also fixed by PFN_FLAGS_MASK\n" + "casting the PAGE_MASK to an unsigned long.\n" + "\n" + "Reported-by: Manuel Lauss <manuel.lauss@gmail.com>\n" + "Signed-off-by: Dan Williams <dan.j.williams@intel.com>\n" + "Cc: linux-kernel@vger.kernel.org\n" + "Cc: Linux-MIPS <linux-mips@linux-mips.org>\n" + "Patchwork: https://patchwork.linux-mips.org/patch/12182/\n" + "Signed-off-by: Ralf Baechle <ralf@linux-mips.org>\n" + "Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>\n" + "\n" + "---\n" + " arch/mips/include/asm/page.h | 2 +-\n" + " 1 file changed, 1 insertion(+), 1 deletion(-)\n" + "\n" + "--- a/arch/mips/include/asm/page.h\n" + "+++ b/arch/mips/include/asm/page.h\n" + "@@ -33,7 +33,7 @@\n" + " #define PAGE_SHIFT\t16\n" + " #endif\n" + " #define PAGE_SIZE\t(_AC(1,UL) << PAGE_SHIFT)\n" + "-#define PAGE_MASK\t(~(PAGE_SIZE - 1))\n" + "+#define PAGE_MASK\t(~((1 << PAGE_SHIFT) - 1))\n" + " \n" + " /*\n" + " * This is used for calculating the real page sizes\n" + "\n" + "\n" + "Patches currently in stable-queue which might be from dan.j.williams@intel.com are\n" + "\n" + "queue-4.4/revert-mips-fix-page_mask-definition.patch\n" + queue-4.4/devm_memremap-fix-error-value-when-memremap-failed.patch -baca7dea791e83f5f280c53f9ee429d85b83a78a797ea3e9f5589ae1c6cf6787 +f684eab190507af980dd45a6ba4d6f543f80167b909bedd669f216827be49bf6
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.