diff for duplicates of <f97f7947-db3b-07dd-157d-78ab9840a4dc@linuxfoundation.org> diff --git a/a/content_digest b/N1/content_digest index 81d5f31..4a6ce1f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,4 +1,4 @@ - "From\0skhan at linuxfoundation.org (Shuah Khan)\0" + "From\0skhan@linuxfoundation.org (Shuah Khan)\0" "Subject\0[GIT PULL] Kselftest second fixes update for Linux 5.2-rc4\0" "Date\0Fri, 7 Jun 2019 20:11:05 -0600\0" "\00:1\0" @@ -58,4 +58,4 @@ "Desc: not available\n" URL: <http://lists.linaro.org/pipermail/linux-kselftest-mirror/attachments/20190607/a5a1d000/attachment.bin> -a776f57a0e3dbfcf119e7cbee7cb572553bc8c61ca5983224ad3a6817487220c +4147efd4f3936dda5540f29e4170594716280b41bf4353f96889a808b5d96873
diff --git a/a/1.txt b/N2/1.txt index 0549b4d..9c51031 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -45,10 +45,3 @@ Shuah Khan (1): tools/testing/selftests/vm/Makefile | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------- --------------- next part -------------- -A non-text attachment was scrubbed... -Name: linux-kselftest-5.2-rc4-2.diff -Type: text/x-patch -Size: 453 bytes -Desc: not available -URL: <http://lists.linaro.org/pipermail/linux-kselftest-mirror/attachments/20190607/a5a1d000/attachment.bin> diff --git a/N2/2.hdr b/N2/2.hdr new file mode 100644 index 0000000..648fc65 --- /dev/null +++ b/N2/2.hdr @@ -0,0 +1,5 @@ +Content-Type: text/x-patch; + name="linux-kselftest-5.2-rc4-2.diff" +Content-Transfer-Encoding: 7bit +Content-Disposition: attachment; + filename="linux-kselftest-5.2-rc4-2.diff" diff --git a/N2/2.txt b/N2/2.txt new file mode 100644 index 0000000..f8911e4 --- /dev/null +++ b/N2/2.txt @@ -0,0 +1,15 @@ +diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile +index 05306c58ff9f..9534dc2bc929 100644 +--- a/tools/testing/selftests/vm/Makefile ++++ b/tools/testing/selftests/vm/Makefile +@@ -1,10 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + # Makefile for vm selftests + +-ifndef OUTPUT +- OUTPUT := $(shell pwd) +-endif +- + CFLAGS = -Wall -I ../../../../usr/include $(EXTRA_CFLAGS) + LDLIBS = -lrt + TEST_GEN_FILES = compaction_test diff --git a/a/content_digest b/N2/content_digest index 81d5f31..f214899 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,11 @@ - "From\0skhan at linuxfoundation.org (Shuah Khan)\0" + "From\0Shuah Khan <skhan@linuxfoundation.org>\0" "Subject\0[GIT PULL] Kselftest second fixes update for Linux 5.2-rc4\0" "Date\0Fri, 7 Jun 2019 20:11:05 -0600\0" - "\00:1\0" + "To\0Linus Torvalds <torvalds@linux-foundation.org>\0" + "Cc\0skhan@linuxfoundation.org" + Linux Kernel Mailing List <linux-kernel@vger.kernel.org> + " open list:KERNEL SELFTEST FRAMEWORK <linux-kselftest@vger.kernel.org>\0" + "\01:1\0" "b\0" "Hi Linus,\n" "\n" @@ -49,13 +53,24 @@ "\n" " tools/testing/selftests/vm/Makefile | 4 ----\n" " 1 file changed, 4 deletions(-)\n" - "----------------------------------------------------------------\n" - "-------------- next part --------------\n" - "A non-text attachment was scrubbed...\n" - "Name: linux-kselftest-5.2-rc4-2.diff\n" - "Type: text/x-patch\n" - "Size: 453 bytes\n" - "Desc: not available\n" - URL: <http://lists.linaro.org/pipermail/linux-kselftest-mirror/attachments/20190607/a5a1d000/attachment.bin> + ---------------------------------------------------------------- + "\01:2\0" + "fn\0linux-kselftest-5.2-rc4-2.diff\0" + "b\0" + "diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile\n" + "index 05306c58ff9f..9534dc2bc929 100644\n" + "--- a/tools/testing/selftests/vm/Makefile\n" + "+++ b/tools/testing/selftests/vm/Makefile\n" + "@@ -1,10 +1,6 @@\n" + " # SPDX-License-Identifier: GPL-2.0\n" + " # Makefile for vm selftests\n" + " \n" + "-ifndef OUTPUT\n" + "- OUTPUT := $(shell pwd)\n" + "-endif\n" + "-\n" + " CFLAGS = -Wall -I ../../../../usr/include $(EXTRA_CFLAGS)\n" + " LDLIBS = -lrt\n" + TEST_GEN_FILES = compaction_test -a776f57a0e3dbfcf119e7cbee7cb572553bc8c61ca5983224ad3a6817487220c +3cd4b3b58f47a716531242758803e61bc0991790c940deb5df163472b57edd1c
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox