Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp3091796rwd; Mon, 22 May 2023 08:31:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7bpg+KE7rBfYbiQGUsLrbRG0ZBPfp29bbGzqwIRwEP0T68CSGhK6Oj2w0UYMD/Z1M70r+U X-Received: by 2002:a17:902:b093:b0:1a9:2b7f:a594 with SMTP id p19-20020a170902b09300b001a92b7fa594mr10810635plr.29.1684769517616; Mon, 22 May 2023 08:31:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684769517; cv=none; d=google.com; s=arc-20160816; b=LC9jD46ESZqmNT9FTO0cVBAtyCoAbrSKcNWGQwtJdZ9DIWjp5v6A3VfKjpfjfouR5N 3sgFI+C6J1rSze+iSv7KBJb+zjiCQuVTLdvt6IdbDpWmiEZC6HA7zLtr22+LUUczv1Bl I9J+VyTC6nozAysfl1nzE0PNxGXh4iAfxnLY/kmrwWJT58TFD/KtoY7YMF6grAiNrSY/ 5cOODFvtDR3OiBJmKK5ACqddVBIl3rLsqnUobmGeZSzgBY163CifvuOaf3FtxKR43Lez fsnZJWTd/6/jEgmjqod0ESrOPKHBnqzrwikcaw6/Qltq1IRSjA4ecLQcfURoZEOZsOqZ vT1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=codxTc0zYbuqKDstZGa6khglhbkN2myGAJapvWH9bLQ=; b=vErOxzQ1XBpQLDPrDw2iYY3QLEFB361fLsMu3JeLAWUboCpGmYQBdZlxE1tFpzWJRl Wbou93koMKlL03I1vgtVsmuq4tGEIj9QVmsonhCDXwXzxuOgDJOC269omSPyjN8QTMZv 37hAH1608X1zm5vrIQCuGQI2XgzNq14orIrx5/teMn6sO2PJYNkHFC8r1kMwM1sULd8x mRyiGjJM2SQd7FkkYp+bUEm2BqP2ldmH/4U4P4ack5Rn3io+CSEZhDY6EoIqal+4Kksc a2CoL7Bjng+YojBNXLUXzxvakdxp8gubkRfJjz0ktHW1rBat2tQItCTgLOoQST7KcUOd 0GVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@8bytes.org header.s=default header.b=dqooSWkn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g7-20020a1709029f8700b001ac83d2b076si728160plq.337.2023.05.22.08.31.44; Mon, 22 May 2023 08:31:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@8bytes.org header.s=default header.b=dqooSWkn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233796AbjEVPYS (ORCPT + 99 others); Mon, 22 May 2023 11:24:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233485AbjEVPYR (ORCPT ); Mon, 22 May 2023 11:24:17 -0400 Received: from mail.8bytes.org (mail.8bytes.org [IPv6:2a01:238:42d9:3f00:e505:6202:4f0c:f051]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 84DEFA1 for ; Mon, 22 May 2023 08:24:16 -0700 (PDT) Received: from 8bytes.org (p200300c2773e310086ad4f9d2505dd0d.dip0.t-ipconnect.de [IPv6:2003:c2:773e:3100:86ad:4f9d:2505:dd0d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.8bytes.org (Postfix) with ESMTPSA id B6549248072; Mon, 22 May 2023 17:24:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=8bytes.org; s=default; t=1684769055; bh=ptyW7oCx/HCiX20PieqrlaUejHk1DbuuffHff0LY8CE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=dqooSWknRU1uMkmjiI7s7Tgiclq+xv4JVB2sL0S23XYozi+DU6Yc7A2mhhIozqvZf aeAhXLoI0o7VdF/vQdcBhu/bZz2jWxs/LpbFzmBUCe5GFuA9PUpW6OYJX+CgUy4gf2 uQBZwDdPl1nbVYB3Z0XWkYd2OJio58H7/lfouFfXAj8y9S7tV/rmNbDEPIpWGBK38P 8QhCjCpkZDep5UmMU33cHVfhF0y3gTH+ay7enYUsPus5ocn02SPYhkxgHROqf8HOJH g7JDTW4BFDS7963K97bJks8DPwpiS0bxscGdpeIOO/r/bb9kWukkg0gNQ7HPVIkHxI SQknXJEW9ta0Q== Date: Mon, 22 May 2023 17:24:14 +0200 From: Joerg Roedel To: Jerry Snitselaar Cc: linux-kernel@vger.kernel.org, iommu@lists.linux.dev, Suravee Suthikulpanit , Will Deacon , Robin Murphy Subject: Re: [PATCH] iommu: amd: Fix up merge conflict resolution Message-ID: References: <20230420192013.733331-1-jsnitsel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230420192013.733331-1-jsnitsel@redhat.com> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham 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: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Apr 20, 2023 at 12:20:13PM -0700, Jerry Snitselaar wrote: > drivers/iommu/amd/amd_iommu.h | 3 --- > 1 file changed, 3 deletions(-) Applied for 6.4, thanks. s