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 8D3C7C4345F for ; Mon, 29 Apr 2024 14:51:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:MIME-Version: References:Message-ID:In-Reply-To:Subject:cc:To:Date:From:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=XKeRPyFrLr+/bdc3yprBbmSXab1cVtgKO71azhOXZko=; b=1uBvkWO956Eo3rdVnUxoUNm/Bz TRvrNmkUuYbc7mXIVsx/ChH33f2iDafMAMl1Nh9cSYq1sqVksZI7csEuj7J8bp2fiR113VLmYg87q lRYM3HQxSrmS29rX8ZVudtsRk2/0gz/4OnvFJIuHpPt3qYht+4ouWnQG+uc6dJaLDFtcet41/iTw5 ovugxeWVgSRtZeLauMyI0MWUQN6mzxR6UkdGxOiC/OiZbVoxbgBVm4m459Ryo9AtDVuMPhbH1friR dmqWY4CgDEFQMPTT8Y/MqCbitJzuIJ+tbraED/u3j8C8NIZZ0TPKqvnhN7N51CfP5mI/pMhmVFIDk LLt+k/Ag==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s1SLj-00000003CMR-3r2P; Mon, 29 Apr 2024 14:51:23 +0000 Received: from mgamail.intel.com ([192.198.163.17]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s1SLh-00000003CLZ-0HUZ for linux-arm-kernel@lists.infradead.org; Mon, 29 Apr 2024 14:51:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1714402281; x=1745938281; h=from:date:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=pJPuvAxvq6t2LfZ0lSaha8rRl2Cjbgd6sgUyJR0F57I=; b=dXZJWuffFXSjevRJPKzvQ+9V5+h2BTtgWEAm1zAv+9fMNNRI7ATAy95E Kw3UWCREhBdVUxN8Xe82yU66B5fHZ9tY1hqYCrcagDyGae9+yDjR5t0i9 yzhXtwpzdkdj0UhB6JLD9PHvpmh3mwHVH4TbyhXTeA1yV75ZsnzynHl7O rhM5hDV6oWkeIPEFu0CSGxid3WKaCRaalpFbD/nCq7tpFD/3yybrboSRT TVusVPFKsrfhTLZXOFHW74jW7jjgs0QyjtrHs9LNglRSo6BII37nvXVuY V6S26uVEI/eyARXi4pM2xEv9sWJjyfs9aTyCawIRRPy6J2V6DcCjTAkxS A==; X-CSE-ConnectionGUID: Grj9gUYCSGOQEEysy3TljQ== X-CSE-MsgGUID: f5aiF8M2QBG4pJbs9vYrng== X-IronPort-AV: E=McAfee;i="6600,9927,11059"; a="9941740" X-IronPort-AV: E=Sophos;i="6.07,239,1708416000"; d="scan'208";a="9941740" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2024 07:51:20 -0700 X-CSE-ConnectionGUID: j+I079RvTY6USK5/eXE1Ng== X-CSE-MsgGUID: 7hlZdKHIRRihV1XXSG8fkw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,239,1708416000"; d="scan'208";a="26123028" Received: from ijarvine-desk1.ger.corp.intel.com (HELO localhost) ([10.245.247.45]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2024 07:51:17 -0700 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Date: Mon, 29 Apr 2024 17:51:13 +0300 (EEST) To: Andrew Lunn cc: linux-pci@vger.kernel.org, Bjorn Helgaas , Lorenzo Pieralisi , Rob Herring , =?ISO-8859-2?Q?Krzysztof_Wilczy=F1ski?= , Sebastian Hesselbarth , Gregory Clement , Russell King , linux-arm-kernel@lists.infradead.org, LKML Subject: Re: [PATCH 01/10] ARM: orion5x: Rename PCI_CONF_{REG,FUNC}() out of the way In-Reply-To: <1d3606e7-0cb5-4180-92ff-5b9cec7a64ad@lunn.ch> Message-ID: References: <20240429104633.11060-1-ilpo.jarvinen@linux.intel.com> <20240429104633.11060-2-ilpo.jarvinen@linux.intel.com> <1d3606e7-0cb5-4180-92ff-5b9cec7a64ad@lunn.ch> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="8323328-486568427-1714402273=:1286" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240429_075121_145910_C9953553 X-CRM114-Status: GOOD ( 15.14 ) 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 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323328-486568427-1714402273=:1286 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE On Mon, 29 Apr 2024, Andrew Lunn wrote: > On Mon, Apr 29, 2024 at 01:46:24PM +0300, Ilpo J=E4rvinen wrote: > > orion5x defines PCI_CONF_REG() and PCI_CONF_FUNC() that are problematic > > because PCI core is going to introduce defines with the same names. > >=20 > > Add ORION5X prefix to those defines to avoid name conflicts. > >=20 > > Note: as this is part of series that replaces the code in question > > anyway, only bare minimum renaming is done and other similarly named > > macros are not touched. > >=20 > > Signed-off-by: Ilpo J=E4rvinen >=20 > Hi Ilpo >=20 > What branch do these apply to? I wanted to test them, but i get hunks > rejected: >=20 > git am < 20240429104633.11060-1-ilpo.jarvinen@linux.intel.com.mbx > Applying: ARM: orion5x: Rename PCI_CONF_{REG,FUNC}() out of the way > Applying: ARM: orion5x: Use generic PCI Conf Type 1 helper > error: patch failed: arch/arm/mach-orion5x/pci.c:276 > error: arch/arm/mach-orion5x/pci.c: patch does not apply > Patch failed at 0002 ARM: orion5x: Use generic PCI Conf Type 1 helper >=20 > I tried linux-next, v6.9-rc6, pci:next Hi, On top of pci:main (so v6.9-rc1). "ARM: orion5x: Use generic PCI Conf Type 1 helper" should be only 4th=20 patch but your command seems to apply it as 2nd patch (is the mbx file=20 having them out-of-order?). --=20 i. --8323328-486568427-1714402273=:1286 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel --8323328-486568427-1714402273=:1286--