On 05/11/2015 12:22 PM, Darren Hart wrote: > On 5/11/15, 11:06 AM, "Shuah Khan" <shuahkh@xxxxxxxxxxxxxxx> wrote: > >> On 05/08/2015 04:09 PM, Darren Hart wrote: >>> The futextest testsuite [1] provides functional, stress, and >>> performance tests for the various futex op codes. Those tests will be of >>> more use to futex developers if they are included with the kernel >>> source. >>> >>> Copy the core infrastructure and the functional tests into selftests, >>> but adapt them for inclusion in the kernel: >>> >>> - Update the Makefile to include the run_tests target, remove reference >>> to the performance and stress tests from the contributed sources. >>> - Replace my dead IBM email address with my current Intel email address. >>> - Remove the warrantee and write-to paragraphs from the license blurbs. >>> - Remove the NAME section as the filename is easily determined. ;-) >>> - Make the whitespace usage consistent in a couple of places. >>> - Cleanup various CodingStyle violations. >>> >>> A future effort will explore moving the performance and stress tests >>> into the kernel. >>> >>> 1. http://git.kernel.org/cgit/linux/kernel/git/dvhart/futextest.git >>> >>> Cc: Shuah Khan <shuahkh@xxxxxxxxxxxxxxx> >>> Cc: linux-api@xxxxxxxxxxxxxxx >>> Cc: Ingo Molnar <mingo@xxxxxxx> >>> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> >>> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> >>> Cc: Davidlohr Bueso <dave@xxxxxxxxxxxx> >>> Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> >>> Signed-off-by: Darren Hart <dvhart@xxxxxxxxxxxxxxx> >>> --- >> >> Daren, >> >> I am seeing >> >> fatal: cannot convert from y to UTF-8 >> >> when I try to apply the patch. Did you use git send-email? > > Hi Shuah, > > I've seen that from one of my contributors earlier this month as well. I > dropped the Content... Header and it applied without problems. > > I created the patch using git format-patch and then sent them using git > send-email - via a script I've been using for years now... > > Checking the files locally: > $ file * > 0000-cover-letter.patch: ASCII text > 0001-selftests-Add-futex-functional-tests.patch: unified > diff output, UTF-8 Unicode text > 0002-selftest-futex-Update-Makefile-to-use-lib.mk.patch: unified > diff output, ASCII text > 0003-selftest-futex-Increment-ksft-pass-and-fail-counters.patch: unified > diff output, ASCII text > 0004-selftest-Add-futex-tests-to-the-top-level-Makefile.patch: unified > diff output, ASCII text > 0005-kselftest-Add-exit-code-defines.patch: unified > diff output, ASCII text > > > This shows that only the first in UTF-8 and the rest are ASCII. I presume > this is due to the Copyright notices in the original files: > > Copyright © International Business Machines Corp., 2006-2008 > > Which use © instead of (C). I just checked and there are 545 instances of > © in the kernel itself, so this should not present a problem. > > I apologize for the glitch in applying. If you use the pull request I > included that will avoid the mail transport issues, and I will be sure to > fix my scripts to avoid the issue in the future. > > If you want to use the patches directly, please have a look at 1 of 5 and > just remove the "Content..." header, and I think you'll find "git am" will > apply it without complaint. > Hi Daren, Removing the Content header got me past the utf error. However, git am complains: git am --signoff ../4.2_patches/futex_tests/PATCH_1_5selftestsAddfutexfunctionaltests.mbox Applying: selftests: Add futex functional tests /mnt/data/lkml/linux-kselftest/.git/rebase-apply/patch:1457: new blank line at EOF. + warning: 1 line adds whitespace errors. Could you look into these. Rest of the patches applied fine. thanks, -- Shuah -- Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) shuahkh@xxxxxxxxxxxxxxx | (970) 217-8978 -- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
