linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Luis R. Rodriguez" <mcgrof@kernel.org>
To: akpm@linux-foundation.org
Cc: keescook@chromium.org, shuahkh@osg.samsung.com, shuah@kernel.org,
	sfr@canb.auug.org.au, orson.zhai@linaro.org,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	"Luis R. Rodriguez" <mcgrof@kernel.org>
Subject: [PATCH v2 0/6] test_sysctl: fix up merge conflicts
Date: Fri, 30 Jun 2017 15:44:25 -0700	[thread overview]
Message-ID: <20170630224431.17374-1-mcgrof@kernel.org> (raw)
In-Reply-To: <20170629123527.2196820e70818aeab51338e5@linux-foundation.org>

Andrew,

as requested, this addresses the merge conflict present on kselftest/next on
linux-next. The merge conflict was caused by Orson Zhai's patch titled,
"tools/testing/selftests/sysctl: Add pre-check to the value of writes_strict"
and my changes which shuffled the script around. I've made Orson's check a
function, and integrated his exit strategy to restore the production sysctl
writes_strict setting. To do this I've also added a PROD_SYCTL, which now users
can also override through an environment variable.

These changes are also present on my linux-next 20170630-test-sysctl branch
based on linux-next next20170630 [0]. If there are any questionms please let me
know.

[0] https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux-next.git/log/?h=20170630-test-sysctl

  Luis

Luis R. Rodriguez (6):
  test_sysctl: add dedicated proc sysctl test driver
  test_sysctl: add generic script to expand on tests
  test_sysctl: test against PAGE_SIZE for int
  test_sysctl: add simple proc_dointvec() case
  test_sysctl: add simple proc_douintvec() case
  test_sysctl: test against int proc_dointvec() array support

 lib/Kconfig.debug                               |  11 +
 lib/Makefile                                    |   1 +
 lib/test_sysctl.c                               | 148 +++++
 tools/testing/selftests/sysctl/Makefile         |   3 +-
 tools/testing/selftests/sysctl/common_tests     | 131 ----
 tools/testing/selftests/sysctl/config           |   1 +
 tools/testing/selftests/sysctl/run_numerictests |  10 -
 tools/testing/selftests/sysctl/run_stringtests  |  77 ---
 tools/testing/selftests/sysctl/sysctl.sh        | 774 ++++++++++++++++++++++++
 9 files changed, 936 insertions(+), 220 deletions(-)
 create mode 100644 lib/test_sysctl.c
 delete mode 100644 tools/testing/selftests/sysctl/common_tests
 create mode 100644 tools/testing/selftests/sysctl/config
 delete mode 100755 tools/testing/selftests/sysctl/run_numerictests
 delete mode 100755 tools/testing/selftests/sysctl/run_stringtests
 create mode 100755 tools/testing/selftests/sysctl/sysctl.sh

-- 
2.11.0

  parent reply	other threads:[~2017-06-30 22:44 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-28  8:31 linux-next: manual merge of the akpm-current tree with the kselftest tree Stephen Rothwell
2017-06-29 19:35 ` Andrew Morton
2017-06-30 22:43   ` Luis R. Rodriguez
2017-06-30 22:44   ` Luis R. Rodriguez [this message]
2017-06-30 22:44     ` [PATCH v2 1/6] test_sysctl: add dedicated proc sysctl test driver Luis R. Rodriguez
2017-06-30 22:44     ` [PATCH v2 2/6] test_sysctl: add generic script to expand on tests Luis R. Rodriguez
2017-06-30 22:44     ` [PATCH v2 3/6] test_sysctl: test against PAGE_SIZE for int Luis R. Rodriguez
2017-06-30 22:44     ` [PATCH v2 4/6] test_sysctl: add simple proc_dointvec() case Luis R. Rodriguez
2017-06-30 22:44     ` [PATCH v2 5/6] test_sysctl: add simple proc_douintvec() case Luis R. Rodriguez
2017-06-30 22:44     ` [PATCH v2 6/6] test_sysctl: test against int proc_dointvec() array support Luis R. Rodriguez

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170630224431.17374-1-mcgrof@kernel.org \
    --to=mcgrof@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=keescook@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=orson.zhai@linaro.org \
    --cc=sfr@canb.auug.org.au \
    --cc=shuah@kernel.org \
    --cc=shuahkh@osg.samsung.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).