Changes in config

8c57a5e7b2820f349c95b8c8393fec1e0f4070d2 - Merge branch 'for-linus' into next

Tue, 19 Jul 2016 20:02:56 +0200

Merge branch 'for-linus' into nextSync up to bring in wacom_w8001 changes to avoid merge conflicts later. List of files: /linux/tools/testing/selftests/zram/config

6ea24cf79e055f0a62a64baa8587e2254a493c7b - Merge branch 'cec-defines' into for-linus

Sun, 19 Jun 2016 02:25:08 +0200

Merge branch 'cec-defines' into for-linusLet's bring in HDMI CEC defines to ease merging CEC support in the nextmerge window. List of files: /linux/tools/testing/selftests/zram/config

bc0868c62bb13834b20a864f684cced1f84a2412 - Merge branch 'for-4.7/pwm-regulator' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm into regulator-pwm

Tue, 03 May 2016 16:09:56 +0200

Merge branch 'for-4.7/pwm-regulator' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm into regulator-pwm List of files: /linux/tools/testing/selftests/zram/config

1cbc99dfe5d7d686fd022647f4e489b5eb8e9068 - Merge back cpufreq changes for v4.7.

Mon, 25 Apr 2016 15:44:01 +0200

Merge back cpufreq changes for v4.7. List of files: /linux/tools/testing/selftests/zram/config

9938b04472d5c59f8bd8152a548533a8599596a2 - Merge branch 'master' into for-next

Mon, 18 Apr 2016 11:18:55 +0200

Merge branch 'master' into for-nextSync with Linus' tree so that patches against newer codebase can be applied.Signed-off-by: Jiri Kosina List of files: /linux/tools/testing/selftests/zram/config

889fac6d67d46a5e781c08fb26fec9016db1c307 - Merge tag 'v4.6-rc3' into perf/core, to refresh the tree

Wed, 13 Apr 2016 08:57:03 +0200

Merge tag 'v4.6-rc3' into perf/core, to refresh the treeSigned-off-by: Ingo Molnar List of files: /linux/tools/testing/selftests/zram/config

39702853197b191bda32315260255053aa3e57f7 - Merge tag 'v4.6-rc3' into drm-intel-next-queued

Mon, 11 Apr 2016 19:21:06 +0200

Merge tag 'v4.6-rc3' into drm-intel-next-queuedLinux 4.6-rc3Backmerge requested by Chris Wilson to make his patches apply cleanly.Tiny conflict in vmalloc.c with the (properly acked and all) patch indrm-intel-next:commit 4da56b99d99e5a7df2b7f11e87bfea935f909732Author: Chris Wilson Date: Mon Apr 4 14:46:42 2016 +0100 mm/vmap: Add a notifier for when we run out of vmap address spaceand Linus' tree.Signed-off-by: Daniel Vetter List of files: /linux/tools/testing/selftests/zram/config

4b42fafc1cdc4aba38d4f147cb2f3f1a32cd4a15 - Merge branch 'pm-cpufreq-sched' into pm-cpufreq

Sat, 09 Apr 2016 01:08:02 +0200

Merge branch 'pm-cpufreq-sched' into pm-cpufreq List of files: /linux/tools/testing/selftests/zram/config

6ea7e3873e52902af9ee8c0837450fdb69d54140 - Merge branch 'fixes-base' into fixes

Tue, 05 Apr 2016 12:56:47 +0200

Merge branch 'fixes-base' into fixes List of files: /linux/tools/testing/selftests/zram/config

1809de7e7d37c585e01a1bcc583ea92b78fc759d - Merge tag 'for-v4.6-rc/omap-fixes-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v4.6/fixes

Wed, 30 Mar 2016 19:36:06 +0200

Merge tag 'for-v4.6-rc/omap-fixes-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v4.6/fixesARM: OMAP2+: first hwmod fix for v4.6-rcFix a longstanding bug in the hwmod code that could causehardware SYSCONFIG register values to not match the kernel'sidea of what they should be, and that could result in lowerperformance during IP block idle entry.Basic build, boot, and PM test logs are available here:http://www.pwsan.com/omap/testlogs/omap-hwmod-fixes-a-for-v4.6-rc/20160326231727/ List of files: /linux/tools/testing/selftests/zram/config

16b02d711f4059b8338ef967064195b47cae65ea - Merge tag 'v4.6-rc1'

Tue, 29 Mar 2016 23:53:03 +0200

Merge tag 'v4.6-rc1'Linux 4.6-rc1 List of files: /linux/tools/testing/selftests/zram/config

8041dcc881c928134c546ae85e6e59e65804357c - Merge tag 'v4.6-rc1' into for-linus-4.6

Tue, 29 Mar 2016 15:33:47 +0200

Merge tag 'v4.6-rc1' into for-linus-4.6Linux 4.6-rc1* tag 'v4.6-rc1': (12823 commits) Linux 4.6-rc1 f2fs/crypto: fix xts_tweak initialization NTB: Remove _addr functions from ntb_hw_amd orangefs: fix orangefs_superblock locking orangefs: fix do_readv_writev() handling of error halfway through orangefs: have ->kill_sb() evict the VFS side of things first orangefs: sanitize ->llseek() orangefs-bufmap.h: trim unused junk orangefs: saner calling conventions for getting a slot orangefs_copy_{to,from}_bufmap(): don't pass bufmap pointer orangefs: get rid of readdir_handle_s thp: fix typo in khugepaged_scan_pmd() MAINTAINERS: fill entries for KASAN mm/filemap: generic_file_read_iter(): check for zero reads unconditionally kasan: test fix: warn if the UAF could not be detected in kmalloc_uaf2 mm, kasan: stackdepot implementation. Enable stackdepot for SLAB arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections mm, kasan: add GFP flags to KASAN API mm, kasan: SLAB support kasan: modify kmalloc_large_oob_right(), add kmalloc_pagealloc_oob_right() ... List of files: /linux/tools/testing/selftests/zram/config

c78a85a8430e35aecd53e190a2f6b999062b1037 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Sun, 20 Mar 2016 02:05:24 +0100

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux List of files: /linux/tools/testing/selftests/zram/config

3d15cfdb1b77536c205d8e49c0312219ddf162ec - Merge tag 'linux-kselftest-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Fri, 18 Mar 2016 03:37:08 +0100

Merge tag 'linux-kselftest-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftestPull Kselftest updates from Shuah Khan: "This update for Kselftest adds: - A new feature to create test-specific kconfig fragments. This feature helps configure Kselftests to test specific Kernel Configuration options as opposed to defconfig. - A new test for Media Controller API - A few fixes"* tag 'linux-kselftest-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftests: media_dcevice_test fix usage information selftests: media_dcevice_test fix to handle ioctl failure case selftests: add missing .gitignore file or entry Makefile: add kselftest-merge selftests: create test-specific kconfig fragments selftests: breakpoint: add step_after_suspend_test selftests: add a new test for Media Controller API List of files: /linux/tools/testing/selftests/zram/config

8c749ce93ee69e789e46b3be98de9e0cbfcf8ed8 - selftests: create test-specific kconfig fragments

Fri, 08 Jan 2016 08:27:33 +0100

selftests: create test-specific kconfig fragmentsCreate the config file in each directory of testcase which needmore kernel configuration than the default defconfig. User coulduse these configs with merge_config.sh script:Enable config for specific testcase:(export ARCH=xxx #for cross compiling)./scripts/kconfig/merge_config.sh .config \ tools/testing/selftests/xxx/configEnable configs for all testcases:(export ARCH=xxx #for cross compiling)./scripts/kconfig/merge_config.sh .config \ tools/testing/selftests/*/configSigned-off-by: Bamvor Jian Zhang Reviewed-by: Shuah Khan Signed-off-by: Shuah Khan List of files: /linux/tools/testing/selftests/zram/config