Date:   Mon, 30 Jan 2023 14:00:11 -0400
From:   Jason Gunthorpe <jgg@nvidia.com>
To:     Alex Williamson <alex.williamson@redhat.com>
Cc:     Joerg Roedel <jroedel@suse.de>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Joerg Roedel <joro@8bytes.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Niklas Schnelle <schnelle@linux.ibm.com>
Subject: Re: linux-next: manual merge of the iommu tree with Linus' tree
Message-ID: <Y9gFqyDctgECQnSQ@nvidia.com>
References: <20230127141330.28b2c653@canb.auug.org.au>
 <Y9eEjCsWUWeFccGd@suse.de>
 <20230130105549.70044a51.alex.williamson@redhat.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230130105549.70044a51.alex.williamson@redhat.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?yUq9U6WpfixgNcTvn9YWYJD/XMUYU17e0IGEhhq8Y2X4VXs9MoHBkroCL3Nx?=
 =?us-ascii?Q?78BM8TBYma5WDe8O/cnquPWzBKBQMPL1phDEByNqQhKd431/eJLqaxglpbvn?=
 =?us-ascii?Q?8vie/Cc+2GR/gMDuLa5GorSW+d+ZY960i+E3ixqWaO7D4g+YfDO3riBCdGHd?=
 =?us-ascii?Q?rtgfw6/PjNP39gUq5AaDdimQwficL+ofD1GQgC6djYSHgBOgXnQrNKnN0I/R?=
 =?us-ascii?Q?vtAivBga6y+C+hYzqI42Z/nd/rv0nyYHlPwY5Fo05oko411aciWsyyDDPkpi?=
 =?us-ascii?Q?NLnmTNHSY3PR39eQYjEWgiS572oZXjQUX69HZjYP2P1UHRhG7H4nTJUJr9R/?=
 =?us-ascii?Q?Gvre+DJIa/hK4Tah2mDsAaME5fAxOuSSPYTvoQt+edmtpDUtSJgQ6814AIKn?=
 =?us-ascii?Q?25bt9UwK9SGdkSU8tOHA6MgOUhhzQYzgxC1dxssGBEUqjP4ATxKFeBHTwY6D?=
 =?us-ascii?Q?0QN77k/RxuMT083Lb7AwriorUsVnlCmeahQL3qI082Id02jHkK5jCu1rX0Y/?=
 =?us-ascii?Q?+ZK1n+Px7cBslN45oqJ54Tcd0ti4h0Jodz5PrZRSZOqfAONrEo2XWPOP+j+w?=
 =?us-ascii?Q?Cv8emKx2fvIyMcQ8Kb5cZkdeV5RzffIIBmsXEpwG3wcbTj4sM6qKPgavoVVk?=
 =?us-ascii?Q?GLekkstdfoIYwkiiwt5OuHKS+TcK+7oi0hcExyBS5e2i4IkzcEGXmcDBRV5e?=
 =?us-ascii?Q?l3qd6AjPPje4sCii069AIv/qwuDFH9tMLHD+81W+C4bxpCsBeC+ss0OtGxaf?=
 =?us-ascii?Q?o2FGqXbTv6XmPk1XQzFxso8nbNJzqMnIUcBj06pPnWjdJphM0N5AELH565PR?=
 =?us-ascii?Q?bA/zhnkAk6RgqDFgKQr1SuLH269KNEHPlqZmxIsfRW7V3uDcXnNmc31iiE2N?=
 =?us-ascii?Q?Fxmq1R5MbuzcUlBI5jVPNDsCWfnRBcvSC9wAVuCwUX+ltpch43H7pRQrioM7?=
 =?us-ascii?Q?DymMW08EapCJmoG5dI7Q98GHizBT+i/VmX2OelEHrqtxj4nxXrETz2kHdBi1?=
 =?us-ascii?Q?6EDvHkDf/vpjX9EnOdpKA+9cf9QVdcKw8vH2CceLZRcT3+NFixDHqfchtnJL?=
 =?us-ascii?Q?VPBR3GBGY7Q7BQELVlOtzM4OrUoq0usQ0xN0p/Jhu/mZulbvrCE6Dw6LKZ8w?=
 =?us-ascii?Q?x5Oc085ltE3WMV8IqOysDTxpJuqzrw0uLxyXXoNN4OfsI8Lnagpyy9cWZNpk?=
 =?us-ascii?Q?3N2aGnCYmy+Nmq30soCHGPBGqE3v1Cpg1Zb20BRjAOH+vLmJ1A1G8DpRDftf?=
 =?us-ascii?Q?/1wF9NpLYFEo6rLWqEJhRlvF8s142GOEVnuu6fEO4GAZh6H5cFbBlyZZ/85k?=
 =?us-ascii?Q?68iy9q2G/fKOi7IzzGz/5kEr1Tp9rP0K7QiWpoZg4uFRvj0lmUcly8r49WQh?=
 =?us-ascii?Q?MMNd9QbHxEoKdwAQKsnO9t8Er9ZXXjVp29Udizs7Z/6oeQPozu1QUEA01gBc?=
 =?us-ascii?Q?USWFW5B4Hp2tXYgBnsF+assA8ZLp0A5WT/+6ZZHzhpIxJBgLHBBNRGjKmb6i?=
 =?us-ascii?Q?z6ohHHkw/WlTaH6Mya/nvRynkjuat3dm7uqXVY9sm2hmtUgIyqH0sLYzsPWt?=
 =?us-ascii?Q?uQ3BpW/g0LV6KqF3S8uEz/LoOeQ9gyBnEZ//UZGP?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 22146114-2e0a-4e72-5e14-08db02ebd5ba
X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2023 18:00:13.0794
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: RCcU90qoy6kTXDRw6ftVMuADxRGMJIlFXs8AMoA8KuWZ3x3J8ljtQCFlHLly2IKh
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5303
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Jan 30, 2023 at 10:55:49AM -0700, Alex Williamson wrote:
> On Mon, 30 Jan 2023 09:49:16 +0100
> Joerg Roedel <jroedel@suse.de> wrote:
> 
> > Thanks for the report, Stephen.
> > 
> > Alex,
> > 
> > On Fri, Jan 27, 2023 at 02:13:30PM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > Today's linux-next merge of the iommu tree got a conflict in:
> > > 
> > >   drivers/vfio/vfio_iommu_type1.c
> > > 
> > > between commit:
> > > 
> > >   895c0747f726 ("vfio/type1: Respect IOMMU reserved regions in vfio_test_domain_fgsp()")
> > > 
> > > from Linus' tree and commit:
> > > 
> > >   1369459b2e21 ("iommu: Add a gfp parameter to iommu_map()")
> > > 
> > > from the iommu tree.  
> > 
> > In case you want to fix this up in your tree, the patch-set causing this
> > is in a separate branch in the IOMMU tree which you can merge into your
> > tree:
> > 
> > 	git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu-memory-accounting
> 
> Hi Joerg,
> 
> The conflict is with mainline, not my next branch.  The commit above
> went in as a fix for v6.2.  Thanks,

I usually sort out conflicts against the rc series when I send a PR, I
pulled Joerg's branch so I can deal with these conflicts, they are
trivial enough

There will be another -rc conflict from rdma as well:

https://lore.kernel.org/r/20230129093757.637354-1-yangyingliang@huawei.com

Jason