diff for duplicates of <20201030151758.1241164-2-arnd@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 8e593d9..5a78c63 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -60,7 +60,7 @@ index e73636b75f29..12c6a9028ed2 100644 -F: drivers/net/ethernet/amd/am79c961a.* - ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT - M: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> + M: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> R: Pengutronix Kernel Team <kernel@pengutronix.de> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index fe2f17eb2b50..1b9fda08b92f 100644 @@ -197,7 +197,7 @@ index 731a22a55f4e..000000000000 @@ -1,74 +0,0 @@ -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y --CONFIG_LOG_BUF_SHIFT\x14 +-CONFIG_LOG_BUF_SHIFT=14 -CONFIG_EXPERT=y -CONFIG_MODULES=y -CONFIG_ARCH_EBSA110=y @@ -206,7 +206,7 @@ index 731a22a55f4e..000000000000 -CONFIG_LEDS=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 --CONFIG_CMDLINE="root=/dev/nfs rw mem\x16M console=ttyS1,38400n8" +-CONFIG_CMDLINE="root=/dev/nfs rw mem=16M console=ttyS1,38400n8" -CONFIG_FPE_NWFPE=y -CONFIG_FPE_FASTFPE=y -CONFIG_BINFMT_AOUT=y @@ -942,7 +942,8 @@ index 3ec12efe98a6..000000000000 - do { - v = base[UART_LSR << 2]; - barrier(); -- } while ((v & (UART_LSR_TEMT|UART_LSR_THRE)) !- (UART_LSR_TEMT|UART_LSR_THRE)); +- } while ((v & (UART_LSR_TEMT|UART_LSR_THRE)) != +- (UART_LSR_TEMT|UART_LSR_THRE)); -} - -/* @@ -1011,7 +1012,7 @@ index 3c44dd3596ea..000000000000 - - ret += 0xe8000000; - -- if ((a & 0x20000) = (a & 0x40000) >> 1) +- if ((a & 0x20000) == (a & 0x40000) >> 1) - return (void __iomem *)ret; - - BUG(); @@ -1156,9 +1157,9 @@ index 3c44dd3596ea..000000000000 - * f0000405 203 pnp read data - */ -#define SUPERIO_PORT(p) \ -- (((p) >> 3) = (0x3f8 >> 3) || \ -- ((p) >> 3) = (0x2f8 >> 3) || \ -- ((p) >> 3) = (0x378 >> 3)) +- (((p) >> 3) == (0x3f8 >> 3) || \ +- ((p) >> 3) == (0x2f8 >> 3) || \ +- ((p) >> 3) == (0x378 >> 3)) - -/* - * We're addressing an 8 or 16-bit peripheral which tranfers diff --git a/a/content_digest b/N1/content_digest index 818c3e3..1899563 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020201030151758.1241164-1-arnd@kernel.org\0" "From\0Arnd Bergmann <arnd@kernel.org>\0" "Subject\0[PATCH v2 01/15] ARM: remove ebsa110 platform\0" - "Date\0Fri, 30 Oct 2020 15:17:44 +0000\0" + "Date\0Fri, 30 Oct 2020 16:17:44 +0100\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Thomas Gleixner <tglx@linutronix.de>" Arnd Bergmann <arnd@arndb.de> @@ -88,7 +88,7 @@ "-F:\tdrivers/net/ethernet/amd/am79c961a.*\n" "-\n" " ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT\n" - " M:\tUwe Kleine-K\303\203\302\266nig <u.kleine-koenig@pengutronix.de>\n" + " M:\tUwe Kleine-K\303\266nig <u.kleine-koenig@pengutronix.de>\n" " R:\tPengutronix Kernel Team <kernel@pengutronix.de>\n" "diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig\n" "index fe2f17eb2b50..1b9fda08b92f 100644\n" @@ -225,7 +225,7 @@ "@@ -1,74 +0,0 @@\n" "-CONFIG_SYSVIPC=y\n" "-CONFIG_BSD_PROCESS_ACCT=y\n" - "-CONFIG_LOG_BUF_SHIFT\024\n" + "-CONFIG_LOG_BUF_SHIFT=14\n" "-CONFIG_EXPERT=y\n" "-CONFIG_MODULES=y\n" "-CONFIG_ARCH_EBSA110=y\n" @@ -234,7 +234,7 @@ "-CONFIG_LEDS=y\n" "-CONFIG_ZBOOT_ROM_TEXT=0x0\n" "-CONFIG_ZBOOT_ROM_BSS=0x0\n" - "-CONFIG_CMDLINE=\"root=/dev/nfs rw mem\026M console=ttyS1,38400n8\"\n" + "-CONFIG_CMDLINE=\"root=/dev/nfs rw mem=16M console=ttyS1,38400n8\"\n" "-CONFIG_FPE_NWFPE=y\n" "-CONFIG_FPE_FASTFPE=y\n" "-CONFIG_BINFMT_AOUT=y\n" @@ -970,7 +970,8 @@ "-\tdo {\n" "-\t\tv = base[UART_LSR << 2];\n" "-\t\tbarrier();\n" - "-\t} while ((v & (UART_LSR_TEMT|UART_LSR_THRE)) !-\t\t (UART_LSR_TEMT|UART_LSR_THRE));\n" + "-\t} while ((v & (UART_LSR_TEMT|UART_LSR_THRE)) !=\n" + "-\t\t (UART_LSR_TEMT|UART_LSR_THRE));\n" "-}\n" "-\n" "-/*\n" @@ -1039,7 +1040,7 @@ "-\n" "-\tret += 0xe8000000;\n" "-\n" - "-\tif ((a & 0x20000) = (a & 0x40000) >> 1)\n" + "-\tif ((a & 0x20000) == (a & 0x40000) >> 1)\n" "-\t\treturn (void __iomem *)ret;\n" "-\n" "-\tBUG();\n" @@ -1184,9 +1185,9 @@ "- * f0000405\t\t203 pnp read data\n" "- */\n" "-#define SUPERIO_PORT(p) \\\n" - "-\t(((p) >> 3) = (0x3f8 >> 3) || \\\n" - "-\t ((p) >> 3) = (0x2f8 >> 3) || \\\n" - "-\t ((p) >> 3) = (0x378 >> 3))\n" + "-\t(((p) >> 3) == (0x3f8 >> 3) || \\\n" + "-\t ((p) >> 3) == (0x2f8 >> 3) || \\\n" + "-\t ((p) >> 3) == (0x378 >> 3))\n" "-\n" "-/*\n" "- * We're addressing an 8 or 16-bit peripheral which tranfers\n" @@ -1516,4 +1517,4 @@ "-- \n" 2.27.0 -4510d78743767d9c0ac17c34883fb387509a007eaa2f4e4496e96d6bf3e7a5fa +e7396566be62dd8ac472f82f756cc5629488ef2e4361365b02eb3666e8c7e0c1
diff --git a/a/1.txt b/N2/1.txt index 8e593d9..801966a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -60,7 +60,7 @@ index e73636b75f29..12c6a9028ed2 100644 -F: drivers/net/ethernet/amd/am79c961a.* - ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT - M: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> + M: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> R: Pengutronix Kernel Team <kernel@pengutronix.de> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index fe2f17eb2b50..1b9fda08b92f 100644 @@ -197,7 +197,7 @@ index 731a22a55f4e..000000000000 @@ -1,74 +0,0 @@ -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y --CONFIG_LOG_BUF_SHIFT\x14 +-CONFIG_LOG_BUF_SHIFT=14 -CONFIG_EXPERT=y -CONFIG_MODULES=y -CONFIG_ARCH_EBSA110=y @@ -206,7 +206,7 @@ index 731a22a55f4e..000000000000 -CONFIG_LEDS=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 --CONFIG_CMDLINE="root=/dev/nfs rw mem\x16M console=ttyS1,38400n8" +-CONFIG_CMDLINE="root=/dev/nfs rw mem=16M console=ttyS1,38400n8" -CONFIG_FPE_NWFPE=y -CONFIG_FPE_FASTFPE=y -CONFIG_BINFMT_AOUT=y @@ -942,7 +942,8 @@ index 3ec12efe98a6..000000000000 - do { - v = base[UART_LSR << 2]; - barrier(); -- } while ((v & (UART_LSR_TEMT|UART_LSR_THRE)) !- (UART_LSR_TEMT|UART_LSR_THRE)); +- } while ((v & (UART_LSR_TEMT|UART_LSR_THRE)) != +- (UART_LSR_TEMT|UART_LSR_THRE)); -} - -/* @@ -1011,7 +1012,7 @@ index 3c44dd3596ea..000000000000 - - ret += 0xe8000000; - -- if ((a & 0x20000) = (a & 0x40000) >> 1) +- if ((a & 0x20000) == (a & 0x40000) >> 1) - return (void __iomem *)ret; - - BUG(); @@ -1156,9 +1157,9 @@ index 3c44dd3596ea..000000000000 - * f0000405 203 pnp read data - */ -#define SUPERIO_PORT(p) \ -- (((p) >> 3) = (0x3f8 >> 3) || \ -- ((p) >> 3) = (0x2f8 >> 3) || \ -- ((p) >> 3) = (0x378 >> 3)) +- (((p) >> 3) == (0x3f8 >> 3) || \ +- ((p) >> 3) == (0x2f8 >> 3) || \ +- ((p) >> 3) == (0x378 >> 3)) - -/* - * We're addressing an 8 or 16-bit peripheral which tranfers @@ -1487,3 +1488,9 @@ index fd7968635e6d..f22e37337030 100644 help -- 2.27.0 + + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N2/content_digest index 818c3e3..853e40f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,29 +1,29 @@ "ref\020201030151758.1241164-1-arnd@kernel.org\0" "From\0Arnd Bergmann <arnd@kernel.org>\0" "Subject\0[PATCH v2 01/15] ARM: remove ebsa110 platform\0" - "Date\0Fri, 30 Oct 2020 15:17:44 +0000\0" + "Date\0Fri, 30 Oct 2020 16:17:44 +0100\0" "To\0linux-kernel@vger.kernel.org\0" - "Cc\0Thomas Gleixner <tglx@linutronix.de>" - Arnd Bergmann <arnd@arndb.de> - Russell King <linux@armlinux.org.uk> - Tony Luck <tony.luck@intel.com> + "Cc\0Sam Creasey <sammy@sammy.net>" Fenghua Yu <fenghua.yu@intel.com> - Greg Ungerer <gerg@linux-m68k.org> - Finn Thain <fthain@telegraphics.com.au> - Philip Blundell <philb@gnu.org> - Joshua Thompson <funaho@jurai.org> - Sam Creasey <sammy@sammy.net> - James E.J. Bottomley <James.Bottomley@hansenpartnership.com> - Helge Deller <deller@gmx.de> - Daniel Lezcano <daniel.lezcano@linaro.org> - John Stultz <john.stultz@linaro.org> - Stephen Boyd <sboyd@kernel.org> Linus Walleij <linus.walleij@linaro.org> + Tony Luck <tony.luck@intel.com> linux-ia64@vger.kernel.org Parisc List <linux-parisc@vger.kernel.org> + Arnd Bergmann <arnd@arndb.de> + Stephen Boyd <sboyd@kernel.org> + Philip Blundell <philb@gnu.org> + Helge Deller <deller@gmx.de> + Daniel Lezcano <daniel.lezcano@linaro.org> + Russell King <linux@armlinux.org.uk> + Finn Thain <fthain@telegraphics.com.au> + James E.J. Bottomley <James.Bottomley@hansenpartnership.com> linux-m68k <linux-m68k@lists.linux-m68k.org> + John Stultz <john.stultz@linaro.org> Linux ARM <linux-arm-kernel@lists.infradead.org> - " Russell King <rmk+kernel@armlinux.org.uk>\0" + Thomas Gleixner <tglx@linutronix.de> + Russell King <rmk+kernel@armlinux.org.uk> + Greg Ungerer <gerg@linux-m68k.org> + " Joshua Thompson <funaho@jurai.org>\0" "\00:1\0" "b\0" "From: Arnd Bergmann <arnd@arndb.de>\n" @@ -88,7 +88,7 @@ "-F:\tdrivers/net/ethernet/amd/am79c961a.*\n" "-\n" " ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT\n" - " M:\tUwe Kleine-K\303\203\302\266nig <u.kleine-koenig@pengutronix.de>\n" + " M:\tUwe Kleine-K\303\266nig <u.kleine-koenig@pengutronix.de>\n" " R:\tPengutronix Kernel Team <kernel@pengutronix.de>\n" "diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig\n" "index fe2f17eb2b50..1b9fda08b92f 100644\n" @@ -225,7 +225,7 @@ "@@ -1,74 +0,0 @@\n" "-CONFIG_SYSVIPC=y\n" "-CONFIG_BSD_PROCESS_ACCT=y\n" - "-CONFIG_LOG_BUF_SHIFT\024\n" + "-CONFIG_LOG_BUF_SHIFT=14\n" "-CONFIG_EXPERT=y\n" "-CONFIG_MODULES=y\n" "-CONFIG_ARCH_EBSA110=y\n" @@ -234,7 +234,7 @@ "-CONFIG_LEDS=y\n" "-CONFIG_ZBOOT_ROM_TEXT=0x0\n" "-CONFIG_ZBOOT_ROM_BSS=0x0\n" - "-CONFIG_CMDLINE=\"root=/dev/nfs rw mem\026M console=ttyS1,38400n8\"\n" + "-CONFIG_CMDLINE=\"root=/dev/nfs rw mem=16M console=ttyS1,38400n8\"\n" "-CONFIG_FPE_NWFPE=y\n" "-CONFIG_FPE_FASTFPE=y\n" "-CONFIG_BINFMT_AOUT=y\n" @@ -970,7 +970,8 @@ "-\tdo {\n" "-\t\tv = base[UART_LSR << 2];\n" "-\t\tbarrier();\n" - "-\t} while ((v & (UART_LSR_TEMT|UART_LSR_THRE)) !-\t\t (UART_LSR_TEMT|UART_LSR_THRE));\n" + "-\t} while ((v & (UART_LSR_TEMT|UART_LSR_THRE)) !=\n" + "-\t\t (UART_LSR_TEMT|UART_LSR_THRE));\n" "-}\n" "-\n" "-/*\n" @@ -1039,7 +1040,7 @@ "-\n" "-\tret += 0xe8000000;\n" "-\n" - "-\tif ((a & 0x20000) = (a & 0x40000) >> 1)\n" + "-\tif ((a & 0x20000) == (a & 0x40000) >> 1)\n" "-\t\treturn (void __iomem *)ret;\n" "-\n" "-\tBUG();\n" @@ -1184,9 +1185,9 @@ "- * f0000405\t\t203 pnp read data\n" "- */\n" "-#define SUPERIO_PORT(p) \\\n" - "-\t(((p) >> 3) = (0x3f8 >> 3) || \\\n" - "-\t ((p) >> 3) = (0x2f8 >> 3) || \\\n" - "-\t ((p) >> 3) = (0x378 >> 3))\n" + "-\t(((p) >> 3) == (0x3f8 >> 3) || \\\n" + "-\t ((p) >> 3) == (0x2f8 >> 3) || \\\n" + "-\t ((p) >> 3) == (0x378 >> 3))\n" "-\n" "-/*\n" "- * We're addressing an 8 or 16-bit peripheral which tranfers\n" @@ -1514,6 +1515,12 @@ " \tselect WATCHDOG_CORE\n" " \thelp\n" "-- \n" - 2.27.0 + "2.27.0\n" + "\n" + "\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -4510d78743767d9c0ac17c34883fb387509a007eaa2f4e4496e96d6bf3e7a5fa +63b790a36efd1a6e285beecd854837b6e4f4fca194bbbefaf36fa6fa9be13cae
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.