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 X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B5D1C433DF for ; Tue, 13 Oct 2020 03:34:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 172F02078E for ; Tue, 13 Oct 2020 03:34:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="IwsgF0M6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729092AbgJMDe4 (ORCPT ); Mon, 12 Oct 2020 23:34:56 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:43063 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727831AbgJMDez (ORCPT ); Mon, 12 Oct 2020 23:34:55 -0400 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4C9LlK1xnCz9sT6; Tue, 13 Oct 2020 14:34:53 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1602560093; bh=TLKoCaPSxp0kmcA1aXVlUi8eaXwplxbmD9WMBp6IImU=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=IwsgF0M6GlmUgjqo9pvfOyYHhx5c89EKR7Nni7CTKVPQcMhsBk2ES/ZM6g54emnGQ rzAWx4p8GnW5sRbS06/hJ3NTSQslZSCuZVJWAi3iQuMsoHIbzEQD7zZ0Yf0oxr0r41 2y+cNk0wut0YR4cfRYtF2ipyrK6ZVy8DHVVkC2zysOK3cYaRA+Mnb/Nmo7IehKYMnd bfBQn8FozxTGRZDeYZMoxaEDIwGE5UxTPi/gvsAXbuLDl2bpcVUrj3VAr4qygIe7N/ V3kPNl5sFva3lj4w9XlPnq62uLZC/WmUsfCyDPPbnCtY3kSfTJWfBVXvKJHCXDPbza bU9044fDdEqnQ== Date: Tue, 13 Oct 2020 14:34:52 +1100 From: Stephen Rothwell To: Bjorn Helgaas Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Jon Derrick , Lorenzo Pieralisi , Linux Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the tip tree with the pci tree Message-ID: <20201013143452.4ccade99@canb.auug.org.au> In-Reply-To: <20200925153510.5fe319ca@canb.auug.org.au> References: <20200925153510.5fe319ca@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/X+cTGpJwey=l8zl=do3XRun"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/X+cTGpJwey=l8zl=do3XRun Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Fri, 25 Sep 2020 15:35:10 +1000 Stephen Rothwell = wrote: > > Today's linux-next merge of the tip tree got a conflict in: >=20 > arch/x86/kernel/apic/msi.c >=20 > between commit: >=20 > 2705b8e4d46f ("x86/apic/msi: Use Real PCI DMA device when configuring I= RTE") >=20 > from the pci tree and commit: >=20 > 7ca435cf857d ("x86/irq: Cleanup the arch_*_msi_irqs() leftovers") >=20 > from the tip tree. >=20 > I fixed it up (the latter removed the code updated by the former, so I > did that) 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. This is now a conflict between the pci tree and Linus' tree. --=20 Cheers, Stephen Rothwell --Sig_/X+cTGpJwey=l8zl=do3XRun Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl+FIFwACgkQAVBC80lX 0GwHNgf+PPfMVNzf7U6FuXzC7yHcyWks6+jsYvIShkcpwUoEI8cmvEZV7dKgWG/e YA1ybV5HjropANKcM3dpr4yquc4IS+0L3QS7Cx0stkF2dVZcqhEN488Hy8I8tqFT PNu9sap36wpFjzT5rHjhknpqmCsEBshkBizQXZzSlbl+xFUrGjfeW46utxuDTgYk m+dAB+H33K7tA+Hlp3fDaYalFqd5/Fgi8auVhWaUPhZaDvvy4lgarprGpcdkMEpH IgnZdVP/dK1I6S2oU4vi5qToZa/51ZkJIdhGCumSIj2gzkCMCSRqQnvpXEeO3XyO FmvJ8gD9bT6UVVOSYYjJe5IYYLX4Fw== =YFu/ -----END PGP SIGNATURE----- --Sig_/X+cTGpJwey=l8zl=do3XRun--