From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DFADEC4708D for ; Wed, 7 Dec 2022 21:52:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ORBf5Ub7mWyScKbIozzA4dHW4liefGYVhz7wN83m1S8=; b=QWTIwQZaFb33Jf JxEsfYELnXBusoxyNayGGr3eOzbtJb/6UzmxHGvoVLzzFjk9Yr0rJdDvWKZh9gEEOykXcAr/4b/c2 G79bktelFEnfoXXoliZbAN6+9Rq0Iw+AvHufpqIaE7QmadSWPWBAu0spMBQj9dzzeUiXTtYTbGg/Q TSdjcpKytQvF0W9NGO8MsDtZ8+l9tHqout984izBlBzsAzFVoUIDtEHHOYCeDvwk9s+tk74FOObxW +0ZHzukKWg6cXaC7QWxWhsoFcYEWIH5xzSpw+xyXsw2nT25S3zoetkwzG67tKM3xGxj6QzXaW+1X9 xJ5ahPIHErC729iuKWew==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p32KT-00DO0g-TF; Wed, 07 Dec 2022 21:51:50 +0000 Received: from out2.migadu.com ([2001:41d0:2:aacc::]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p32KQ-00DNpa-0Z for linux-arm-kernel@lists.infradead.org; Wed, 07 Dec 2022 21:51:47 +0000 Date: Wed, 7 Dec 2022 21:51:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1670449904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=f7P0kqsSYyYgMgn0HVqN0dW/Am5VL47EfwN3CgyuatQ=; b=FeI9pWzm2VOlZScgd6p3aQcHP+oSaSJ8yF3rH+FR4l9BzCLgT1bQYaP1BnReWiuavWfgm5 wP7tt6CQ93A/pW4pC/diMxXscHnyX6h3ovfEmxi9hJvkDYiU61YmoUe6kLx0OfS8AUlKiI C8xvBmN8RR1k2bGM6KLUDDk1A5JI/zI= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Oliver Upton To: Paolo Bonzini Cc: Marc Zyngier , Andrew Jones , Andrew Morton , Anshuman Khandual , Arnaldo Carvalho de Melo , Bagas Sanjaya , Ben Gardon , Catalin Marinas , Cornelia Huck , Fuad Tabba , Gavin Shan , Jakub Kicinski , James Morse , "Maciej S . Szmigiero" , Marek Szyprowski , Mark Brown , Mark Rutland , Peter Collingbourne , Peter Xu , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , Quentin Perret , Reiji Watanabe , Ricardo Koller , Ryan Roberts , Sean Christopherson , Steven Price , Usama Arif , Vincent Donnefort , Will Deacon , Zhiyuan Dai , Suzuki K Poulose , Alexandru Elisei , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvmarm@lists.linux.dev, kvm@vger.kernel.org Subject: Re: [GIT PULL] KVM/arm64 updates for 6.2 Message-ID: References: <20221205155845.233018-1-maz@kernel.org> <3230b8bd-b763-9ad1-769b-68e6555e4100@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <3230b8bd-b763-9ad1-769b-68e6555e4100@redhat.com> X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221207_135146_229769_B29437E3 X-CRM114-Status: GOOD ( 25.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Dec 06, 2022 at 06:41:21PM +0100, Paolo Bonzini wrote: > On 12/5/22 16:58, Marc Zyngier wrote: > > - There is a lot of selftest conflicts with your own branch, see: > > > > https://lore.kernel.org/r/20221201112432.4cb9ae42@canb.auug.org.au > > https://lore.kernel.org/r/20221201113626.438f13c5@canb.auug.org.au > > https://lore.kernel.org/r/20221201115741.7de32422@canb.auug.org.au > > https://lore.kernel.org/r/20221201120939.3c19f004@canb.auug.org.au > > https://lore.kernel.org/r/20221201131623.18ebc8d8@canb.auug.org.au > > > > for a rather exhaustive collection. > > Yeah, I saw them in Stephen's messages but missed your reply. > > In retrospect, at least Gavin's series for memslot_perf_test should have > been applied by both of us with a topic branch, but there's so many > conflicts all over the place that it's hard to single out one series. > It just happens. > > The only conflict in non-x86 code is the following one, please check > if I got it right. > > diff --git a/tools/testing/selftests/kvm/aarch64/page_fault_test.c b/tools/testing/selftests/kvm/aarch64/page_fault_test.c > index 05bb6a6369c2..0cda70bef5d5 100644 > --- a/tools/testing/selftests/kvm/aarch64/page_fault_test.c > +++ b/tools/testing/selftests/kvm/aarch64/page_fault_test.c > @@ -609,6 +609,8 @@ static void setup_memslots(struct kvm_vm *vm, struct test_params *p) > data_size / guest_page_size, > p->test_desc->data_memslot_flags); > vm->memslots[MEM_REGION_TEST_DATA] = TEST_DATA_MEMSLOT; > + > + ucall_init(vm, data_gpa + data_size); > } > static void setup_default_handlers(struct test_desc *test) > @@ -704,8 +706,6 @@ static void run_test(enum vm_guest_mode mode, void *arg) > setup_gva_maps(vm); > - ucall_init(vm, NULL); > - > reset_event_counts(); > /* > > > Special care is needed here because the test uses ____vm_create(). > > I haven't pushed to kvm/next yet to give you time to check, so the > merge is currently in kvm/queue only. Have a look at this series, which gets things building and actually passing again: https://lore.kernel.org/kvm/20221207214809.489070-1-oliver.upton@linux.dev/ > > - For the 6.3 cycle, we are going to experiment with Oliver taking > > care of most of the patch herding. I'm sure he'll do a great job, > > but if there is the odd mistake, please cut him some slack and blame > > me instead. > > Absolutely - you both have all the slack you need, synchronization > is harder than it seems. Appreciated! -- Thanks, Oliver _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel