From: Anthony PERARD Date: Tue, 20 Feb 2024 14:12:17 +0000 (+0000) Subject: ap-common: Switch to Linux 6.1 by default on Arm X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=95ee1714750bdbca7aa1d7b52ab1bf0637a63942;p=osstest.git ap-common: Switch to Linux 6.1 by default on Arm The "linux-arm-xen" tree currently point to Linux 5.4.17 + 3 commits: 69117aaf07f7 ("xen/privcmd: replace kcalloc() by kvcalloc() when allocating empty pages") bca5bc0229a6 ("xen/privcmd: fix error handling in mmap-resource processing") f0f0e602f7c9 ("xen/privcmd: drop "pages" parameter from xen_remap_pfn()") This stable version is old and doesn't build on Debian Bookworm. The 3 extra commits are present in at least Linux 5.15, so there's currently no reason to have a separate tree when we could use a stable tree that osstest can update regulary. So switch to 6.1. This will change the default Linux tree for all Arm jobs that aren't on "linux-*" osstest branches. Signed-off-by: Anthony PERARD Acked-by: Stefano Stabellini --- diff --git a/ap-common b/ap-common index 292553e..48a95a2 100644 --- a/ap-common +++ b/ap-common @@ -60,7 +60,7 @@ : ${PUSH_TREE_LINUX:=$XENBITS:/home/xen/git/linux-pvops.git} : ${BASE_TREE_LINUX:=git://xenbits.xen.org/linux-pvops.git} : ${BASE_TAG_LINUX:=tested/linux-4.19} -: ${BASE_TAG_LINUX_ARM:=tested/linux-arm-xen} +: ${BASE_TAG_LINUX_ARM:=tested/linux-6.1} if [ "x${TREE_LINUX}" = x ]; then : ${TREE_LINUX:=${BASE_TREE_LINUX}}