Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Thu, 2 Nov 2023 21:33:35 -0300
From:   Jason Gunthorpe <jgg@nvidia.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Joerg Roedel <joro@8bytes.org>,
        Joao Martins <joao.m.martins@oracle.com>,
        Joerg Roedel <jroedel@suse.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Nicolin Chen <nicolinc@nvidia.com>, Yi Liu <yi.l.liu@intel.com>
Subject: Re: linux-next: manual merge of the iommufd tree with the iommu tree
Message-ID: <20231103003335.GB4488@nvidia.com>
References: <20231027155522.6b2863a4@canb.auug.org.au>
 <20231027171522.692a58ec@canb.auug.org.au>
 <20231030182621.GV3952@nvidia.com>
 <20231031161214.25560598@canb.auug.org.au>
 <20231103105312.58a99ef5@canb.auug.org.au>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231103105312.58a99ef5@canb.auug.org.au>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?K/rP/AVRB2sa0gCyAy03J1u3XfWJ2a3o0VTVxKwS6jcHNZM5GcCxacpnXKLu?=
 =?us-ascii?Q?rSiv5/PSh8TBy2ZpuXKCaBKrrBRQsGeDT4780F689YoUPh3PfZiUL4xhvVdV?=
 =?us-ascii?Q?klUhTwWpjJl5YZVH9ljSyGbN1c6PVL9A5uiM5edGvaq3PTRIEfoAFb+TD0KA?=
 =?us-ascii?Q?m2+PO45LIUpWxKcXKP/pSODBmGMfJispTzxVcJTPTC/Xf9VyyHNEt7/1U+rK?=
 =?us-ascii?Q?3Mcv/pK1N0ndSPSZM1o2gM3l4v82PRaJtujA7DkjcaFjidCEGaEcX+69yaAV?=
 =?us-ascii?Q?IA9hW7tQ9nxjr2cTucOrMnxNw4E36VIkAZvpQoACJkU6oMvaTMyWgsZYtmqB?=
 =?us-ascii?Q?xpUCnxNbtH7r9Pr3ha7/jGYMSBAGnXy1oQQHVbodKnu5DI76daT5QNUGFmaF?=
 =?us-ascii?Q?0zTQowTydvhbMA81eW9PXfedzbueOsrbZ7CzEKq8Zv33/2MbeHBJMHtKPqUc?=
 =?us-ascii?Q?Jj07nadByJT7bUccMSXRYoWcOA5L/BCVHDGPdAwqexFOnsBL6PEvMzykkDZo?=
 =?us-ascii?Q?+U+G5EW1VewohZJ3pgzSwQS+ezL3CvdX+VrLdGUL4e2qnMRIzv0Pz4gimJDn?=
 =?us-ascii?Q?1qogz+HT2RjiFnzDCa0W5B3F/NlRL0SkhZS2iWfsvy60dnu6A3FFR8vc9xka?=
 =?us-ascii?Q?BYEqtYjFGhcdosZ36M4+BOVeqBYM7KjKAYpt1kN2ix46OgalXaMyuw4WhUNC?=
 =?us-ascii?Q?HXylALovpwjP3xmVroJExOaCB8SMsUuKfmQr6DbgSxoYihAl1ibBztjySNzO?=
 =?us-ascii?Q?SiJTkdT73cJqBy443XY4pWAtT1Ru6zXU7ttGzfD0kaFFSQzq7Jok4sil5UK2?=
 =?us-ascii?Q?fm2MkG/GdPbH3gQSsIiJVJ+9Lx62TqYYO1KiUh+kbMuDgMFADCz90qKTOrqN?=
 =?us-ascii?Q?MohHZfV9UDcIP6RJ/Bz80k2nTMNU2wGzRxIiriC5zTnzNNV9ZzPmtOjmuT9i?=
 =?us-ascii?Q?QIx1WSR2Ob8/UI4SJqjbGZ1+6XaPNU7DIVMEc6vxzacXIk55mYuU5MdCMr3k?=
 =?us-ascii?Q?AsWqWiyXD+kLhMHGh7F8wieAYm1yjYoeIFMNl+VFlzfAIkxMftx6W5CDQKCb?=
 =?us-ascii?Q?BmRlDu7QvRDwzU9Js/xOHJt6xil0e6VxzYyRBIXv01xnLfeOo8bY0lM7ddJk?=
 =?us-ascii?Q?bKuFoqOYjhdjrJMla3xwP5xKaamNuYJ0hH/WLXhTpw6j2IE/YIqiJ9Ccm7jj?=
 =?us-ascii?Q?HujjhIosmeMf7v29pCTirsgoFD5fNiIlS6rPjVlVZ/aSrYylxyCI1gpGNhFK?=
 =?us-ascii?Q?7bLiwrDrqHAoa1A8wHgncEXLXYI1HsHCoIsH8VWsIA/yZDYyjZiS70YPZtAR?=
 =?us-ascii?Q?xoCBu44mRbK3BONxpsOwmhT5aJ12VSecwexcoi3eBs4M9k1sAdBQ6AhX8/oJ?=
 =?us-ascii?Q?7sQ/CRoyiems6qDbwCtQIZ1pXnd0Z2PGFJExeaSfJoKpr8ErOAJsW/lXILhr?=
 =?us-ascii?Q?2C1dhJ9/ySaFOgxRhDlGNYYqGEWmxmxBhmcrYgMFfosgDgjLCxB/EjBE4Ko1?=
 =?us-ascii?Q?mcbK9DsGiiC7vT2Qw8Heqtw1RbdAvfnNoSouDuN5bQVFfC7DyNh8wK0wa+R0?=
 =?us-ascii?Q?eTypM5aAGWCkhzErCZo=3D?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dda0af61-8d25-4c5d-6093-08dbdc04846a
X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2023 00:33:36.3937
 (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: SluTw8eSkrtVv9MO27V5+wIPPHA8Kr8SDVywLcvpzvMkCKRcgwUey+RIJOgLD/Wc
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6282
X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 02 Nov 2023 17:34:05 -0700 (PDT)

On Fri, Nov 03, 2023 at 10:53:12AM +1100, Stephen Rothwell wrote:
> > I have used the conflict resolution below now.
> 
> This is now a conflict between the iommu tree and Linus' tree.

My PR has instructions for the resolution to both:

https://lore.kernel.org/linux-iommu/20231031131417.GA1815719@nvidia.com/

Thanks,
Jason