diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-08-01 08:15:21 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-08-01 08:15:21 +0200 |
commit | cb4a49bf624c5e12053625d5b82386f5f7298711 (patch) | |
tree | 17c032bbf3f3bb6fc638b722b3a3726b5850dfb0 /baseconfig | |
parent | 49c54c11d011e7b21b56328b068037b953f7f166 (diff) | |
parent | 36c073a1ac9ca74727c34b27c98c071047ae72e2 (diff) | |
download | kernel-4.13.0-0.rc3.git0.1.vanilla.knurd.1.fc24.tar.gz kernel-4.13.0-0.rc3.git0.1.vanilla.knurd.1.fc24.tar.xz kernel-4.13.0-0.rc3.git0.1.vanilla.knurd.1.fc24.zip |
Merge remote-tracking branch 'origin/master'kernel-4.13.0-0.rc3.git0.1.vanilla.knurd.1.fc27kernel-4.13.0-0.rc3.git0.1.vanilla.knurd.1.fc26kernel-4.13.0-0.rc3.git0.1.vanilla.knurd.1.fc25kernel-4.13.0-0.rc3.git0.1.vanilla.knurd.1.fc24
Diffstat (limited to 'baseconfig')
-rw-r--r-- | baseconfig/s390x/CONFIG_CHECKPOINT_RESTORE | 1 | ||||
-rw-r--r-- | baseconfig/s390x/CONFIG_MEM_SOFT_DIRTY | 1 | ||||
-rw-r--r-- | baseconfig/x86/x86_64/CONFIG_AQTION | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/baseconfig/s390x/CONFIG_CHECKPOINT_RESTORE b/baseconfig/s390x/CONFIG_CHECKPOINT_RESTORE new file mode 100644 index 000000000..c554a09ce --- /dev/null +++ b/baseconfig/s390x/CONFIG_CHECKPOINT_RESTORE @@ -0,0 +1 @@ +CONFIG_CHECKPOINT_RESTORE=y diff --git a/baseconfig/s390x/CONFIG_MEM_SOFT_DIRTY b/baseconfig/s390x/CONFIG_MEM_SOFT_DIRTY new file mode 100644 index 000000000..356f2edd8 --- /dev/null +++ b/baseconfig/s390x/CONFIG_MEM_SOFT_DIRTY @@ -0,0 +1 @@ +CONFIG_MEM_SOFT_DIRTY=y diff --git a/baseconfig/x86/x86_64/CONFIG_AQTION b/baseconfig/x86/x86_64/CONFIG_AQTION new file mode 100644 index 000000000..7812ca016 --- /dev/null +++ b/baseconfig/x86/x86_64/CONFIG_AQTION @@ -0,0 +1 @@ +CONFIG_AQTION=m |