From patchwork Tue Jan 2 23:03:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13509572 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 60C69C46CD2 for ; Tue, 2 Jan 2024 23:04:10 +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-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=OZ0ro2cUasiIVbu1z49LIgS8gRncY6I//2z45Gc9D+I=; b=TXR eDi3ilcHgsZB4Els3UcSgMHYfPY7o7+pjoVqBzTVmkOJBL6Rx15f8SSH4J+W9vjW3kJ6aYST6LloM 9RQysWzJN2LD1yfTeFFr2nomOXDfBRj+aqX7AtaPVe4Uuc0qw06eppu6Ly+SqZavIs1dxrub3CKdl 1PHMSDUuDBPn1plsv0H6HFzRsrRc+6wAbQyIg9yd4iE1QntiejPKjwBVvs1Py33wV9UEQVmfszIS9 nGffFSuMju8uE2OTCXDfkAyiVHeMsQKw7DBvtxT3IDqRcqXB9nrG5RoMGgav9630uiohGiunTBtn1 Rx9V63jK0hwwhHVnW5SOGQQTbuootjg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rKnnR-009GdZ-1D; Tue, 02 Jan 2024 23:03:41 +0000 Received: from mail.ozlabs.org ([2404:9400:2221:ea00::3] helo=gandalf.ozlabs.org) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rKnnN-009Gc1-36 for linux-arm-kernel@lists.infradead.org; Tue, 02 Jan 2024 23:03:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1704236607; bh=Yl+BIDdg260YOhWTGwAtZ/Up6ss/fNGvZoOG0rLjvPM=; h=Date:From:To:Cc:Subject:From; b=XBE+QBBuny6vDjM/BxjcW35nwrutCrPIO8oV3C5ZJ9IQj++xGr2bedZ2payeMCieI WTKzuAbEC3CTape+Rip3iwL9RD0AJUBHpIxeyL6E6J9AIRrzzy0JscB9sAgF5CWY7K twepkS6XjL3t3PKU7ySmwXyC/nceWl9zbgZW9B6sWV6xGacnnh+kDEwus9tyPOKDZC XVcTVB+OFQaPDsh6/+3inhK+iCAHr+3BAfsLpTjO3PdxM+Jp/y5I1dm17VSOPZMAP8 QntTOKhYFOpP4SHnmtSKrprZ7l5Nc0KOSBvmCVKeGwTuSra9V+qYZOwlH9iSPHP03x LqJUdA+jnfDGA== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4T4T0s6L0wz4wp0; Wed, 3 Jan 2024 10:03:25 +1100 (AEDT) Date: Wed, 3 Jan 2024 10:03:24 +1100 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann , Will Deacon Cc: ARM , Anshuman Khandual , Linus Walleij , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the arm-soc tree with the arm-perf tree Message-ID: <20240103100324.05f47bb8@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240102_150338_425177_860852AB X-CRM114-Status: GOOD ( 18.35 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the arm-soc tree got a conflict in: arch/arm/kernel/perf_event_v6.c between commit: 5cd7da19cb97 ("arm: perf: Remove PMU locking") from the arm-perf tree and commit: ced296f63635 ("ARM: Delete ARM11MPCore perf leftovers") from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc arch/arm/kernel/perf_event_v6.c index 8fc080c9e4fb,0cbf46233d6b..000000000000 --- a/arch/arm/kernel/perf_event_v6.c