diff options
Diffstat (limited to 'testing/testing.conf')
| -rw-r--r-- | testing/testing.conf | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/testing/testing.conf b/testing/testing.conf index 78c8dcabc..92b9693c1 100644 --- a/testing/testing.conf +++ b/testing/testing.conf @@ -24,11 +24,15 @@ fi : ${TESTDIR=/srv/strongswan-testing} # Kernel configuration +<<<<<<< Updated upstream : ${KERNELVERSION=4.18.9} +======= +: ${KERNELVERSION=4.15.9} +>>>>>>> Stashed changes : ${KERNEL=linux-$KERNELVERSION} : ${KERNELTARBALL=$KERNEL.tar.xz} -: ${KERNELCONFIG=$DIR/../config/kernel/config-4.18} -: ${KERNELPATCH=ha-4.16-abicompat.patch.bz2} +: ${KERNELCONFIG=$DIR/../config/kernel/config-4.15} +: ${KERNELPATCH=ha-4.15.6-abicompat.patch.bz2} # strongSwan version used in tests : ${SWANVERSION=5.7.0} |