diff for duplicates of <1471642454-5679-16-git-send-email-mcgrof@kernel.org> diff --git a/a/content_digest b/N1/content_digest index d4a9012..a207a44 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -49,7 +49,28 @@ jkosina@suse.cz korea.drzix@gmail.com linux-kbuild@vger.kernel.org - " ton\0" + tony.luck@intel.com + akpm@linux-foundation.org + linux-ia64@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-sh@vger.kernel.org + sparclinux@vger.kernel.org + catalin.marinas@arm.com + will.deacon@arm.com + rostedt@goodmis.org + jani.nikula@intel.com + mchehab@osg.samsung.com + markus.heiser@darmarit.de + acme@redhat.com + jolsa@kernel.org + msalter@redhat.com + chris@zankel.net + jcmvbkbc@gmail.com + linux-xtensa@linux-xtensa.org + paulus@samba.org + mpe@ellerman.id.au + James.Bottomley@hansenpartnership.com + " Luis R. Rodriguez <mcgrof@kernel.org>\0" "\00:1\0" "b\0" "From: \"Luis R. Rodriguez\" <mcgrof@kernel.org>\n" @@ -904,4 +925,4 @@ "-- \n" 2.9.2 -8816f6e95683db347f58cc0a53ace1720368484c78a0ccb76ba1446ddc50cfaa +0518e7e3e69619dc010fdeabae19958038326ee58a9fffdc6ab9712f2e1d2de0
diff --git a/a/1.txt b/N2/1.txt index 10bdfa1..60b358f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -24,8 +24,7 @@ and kicks as expected. Also ran ./ftracetest with no issues: $ sudo ./ftracetest -=== Ftrace unit tests === -[1] Basic trace file check [PASS] +== Ftrace unit tests =[1] Basic trace file check [PASS] [2] Basic test for tracers [PASS] [3] Basic trace clock test [PASS] [4] Basic event tracing check [PASS] @@ -826,12 +825,12 @@ index 42396a74405d..7f66cce79612 100644 --- a/scripts/recordmcount.c +++ b/scripts/recordmcount.c @@ -363,7 +363,7 @@ is_mcounted_section_name(char const *const txtname) - strcmp(".sched.text", txtname) == 0 || - strcmp(".spinlock.text", txtname) == 0 || - strcmp(".irqentry.text", txtname) == 0 || -- strcmp(".kprobes.text", txtname) == 0 || -+ strcmp(".text.rng.kprobes.any", txtname) == 0 || - strcmp(".text.unlikely", txtname) == 0; + strcmp(".sched.text", txtname) = 0 || + strcmp(".spinlock.text", txtname) = 0 || + strcmp(".irqentry.text", txtname) = 0 || +- strcmp(".kprobes.text", txtname) = 0 || ++ strcmp(".text.rng.kprobes.any", txtname) = 0 || + strcmp(".text.unlikely", txtname) = 0; } diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl diff --git a/a/content_digest b/N2/content_digest index d4a9012..95c7abd 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\01471642454-5679-1-git-send-email-mcgrof@kernel.org\0" "From\0mcgrof@kernel.org\0" "Subject\0[PATCH v4 15/16] kprobes: port .kprobes.text to section range\0" - "Date\0Fri, 19 Aug 2016 14:34:13 -0700\0" + "Date\0Fri, 19 Aug 2016 21:34:13 +0000\0" "To\0hpa@zytor.com" tglx@linutronix.de mingo@redhat.com @@ -78,8 +78,7 @@ "Also ran ./ftracetest with no issues:\n" "\n" "$ sudo ./ftracetest\n" - "=== Ftrace unit tests ===\n" - "[1] Basic trace file check [PASS]\n" + "== Ftrace unit tests =[1] Basic trace file check [PASS]\n" "[2] Basic test for tracers [PASS]\n" "[3] Basic trace clock test [PASS]\n" "[4] Basic event tracing check [PASS]\n" @@ -880,12 +879,12 @@ "--- a/scripts/recordmcount.c\n" "+++ b/scripts/recordmcount.c\n" "@@ -363,7 +363,7 @@ is_mcounted_section_name(char const *const txtname)\n" - " \t\tstrcmp(\".sched.text\", txtname) == 0 ||\n" - " \t\tstrcmp(\".spinlock.text\", txtname) == 0 ||\n" - " \t\tstrcmp(\".irqentry.text\", txtname) == 0 ||\n" - "-\t\tstrcmp(\".kprobes.text\", txtname) == 0 ||\n" - "+\t\tstrcmp(\".text.rng.kprobes.any\", txtname) == 0 ||\n" - " \t\tstrcmp(\".text.unlikely\", txtname) == 0;\n" + " \t\tstrcmp(\".sched.text\", txtname) = 0 ||\n" + " \t\tstrcmp(\".spinlock.text\", txtname) = 0 ||\n" + " \t\tstrcmp(\".irqentry.text\", txtname) = 0 ||\n" + "-\t\tstrcmp(\".kprobes.text\", txtname) = 0 ||\n" + "+\t\tstrcmp(\".text.rng.kprobes.any\", txtname) = 0 ||\n" + " \t\tstrcmp(\".text.unlikely\", txtname) = 0;\n" " }\n" " \n" "diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl\n" @@ -904,4 +903,4 @@ "-- \n" 2.9.2 -8816f6e95683db347f58cc0a53ace1720368484c78a0ccb76ba1446ddc50cfaa +84a1916f803447775a653b22cc992cf74fca5312a197f4cc04395e8a019571ab
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.