From patchwork Mon Apr 17 16:09:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 84351 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2253756vqo; Mon, 17 Apr 2023 09:34:53 -0700 (PDT) X-Google-Smtp-Source: AKy350ahu0v/j3lyu4gy1FCmEdW2oObRuVRngxxXphVbXmLEE8ZXHqaHWEXIrpTl72q7GjfzJ8l7 X-Received: by 2002:a05:6a21:3703:b0:f0:7b8:c77b with SMTP id yl3-20020a056a21370300b000f007b8c77bmr2456736pzb.59.1681749292872; Mon, 17 Apr 2023 09:34:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681749292; cv=none; d=google.com; s=arc-20160816; b=dk5ov5rsRDv7Tm/LleHxhJINDtwEYIriR1IZN5jBh8RbL7p1ryCSkgrWlJGu0MEUCJ 9hF5Haq+83oPXXn+3xOTsW0C5+dOuD+VtrCbS/QneB/mk7uN9C3NIsWAZyr9AGc7EkzM O8klHcYme6XjP4rzvOlEFXwT/RexHpM80Sfh8od7PFEzGG+2ATZ15XaeNgBVE+XP9eUA H8VROeMg/U4mNiOfjzeWF883DdnQQ41idSjMJeOVDu4NRbwbbucvdVi+nvkNGLFxXXGK D9P17hHzxEfDZIUjq/i+z9fvKw2OHYCdwM6F1XeXWDSiEdiNY4ZoZ09uSwquu/AR6N/v kR+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=CMtU/ujTL5RleCT/VuV0Cb7/tCiwDdqIyXvw9fujQzY=; b=c6aCl4kcZsuKU8ra3vHOaS5VmLiKdTbnKaDbGLcN0ay3hM0BV+71LmYVbGm3DerUve 2yC4Xx74mSbIBahmrUWy6Ju7UimjsTGwAaX18lZlw/rSWZAq0jN+Iuj3Fr+u5DlKkVId x7l5K0d8uvcN1DSSt3D41c2uThLyKFcbZyF6s6vDtOgn7r6/1jQfMdCcN0W5L3QEjr0e zWz8WyPAoj54tOTRY7Y7n93TRECSfOB96HmxEM/3TP/HjkZFgrqRTbbFrLtH0lxlNs5m 4P+oPLdZPTUZxKu3iN/JunmXEIjC/W7Nct8tC3osu5T1aiUDZPxOizyUIJMDwM+wd230 wXkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=g+KDJTbA; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a19-20020a631a53000000b0050be719abc9si12267281pgm.167.2023.04.17.09.34.39; Mon, 17 Apr 2023 09:34:52 -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=@kernel.org header.s=k20201202 header.b=g+KDJTbA; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230252AbjDQQJ2 (ORCPT + 99 others); Mon, 17 Apr 2023 12:09:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229875AbjDQQJ1 (ORCPT ); Mon, 17 Apr 2023 12:09:27 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CC6646AB; Mon, 17 Apr 2023 09:09:26 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8491D61E78; Mon, 17 Apr 2023 16:09:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40618C4339B; Mon, 17 Apr 2023 16:09:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681747764; bh=SgZElnsulqzJEQ+SjN/G4C6kbP5ZJN5SDWFrxmvGZf4=; h=From:To:Cc:Subject:Date:From; b=g+KDJTbASg5nOX3QqZM1MxqWu8Ruj4/4RPEvRuq3bb9xCTM+Vknngja+OLEx4A8th two0N4gvjeJd8FIPnQr84I+pbEhxEGq1RniD6rHq4DgPuiWqWbmDxORm3xCCB4Ufr/ Pn0yC4h5sc8pBXGXYtwoL55beIBbcVY3weuUZ9rYrQdXcHiPfWmck2u7U28A2s64Hg gbM8QaK4tJBnNZMIe5cCh+1PiakAiRygaG1DVtKxuf1wvSkW4geDp6zqHeIguiSsxO GXmXqbni2IMEubYuqCtvIAS4qyGeczp9axtzQpT3EFKYGR8UKsQPrBo1F0+vvLwtcn jq8KyZ3mntA9Q== From: broonie@kernel.org To: Greg KH Cc: Greg Kroah-Hartman , Jason Gunthorpe , Jason Gunthorpe , Joerg Roedel , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the driver-core tree with the iommu tree Date: Mon, 17 Apr 2023 17:09:20 +0100 Message-Id: <20230417160920.3387706-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SORTED_RECIPS,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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763441946574657702?= X-GMAIL-MSGID: =?utf-8?q?1763441946574657702?= Hi all, Today's linux-next merge of the driver-core tree got a conflict in: include/linux/iommu.h between commit: f7f9c054a227a ("iommu: Remove iommu_group_get_by_id()") from the iommu tree and commit: b18d0a0f92a8f ("iommu: make the pointer to struct bus_type constant") from the driver-core tree. I fixed it up (see below) 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. +++ b/include/linux/iommu.h @@@ -455,11 -455,12 +455,11 @@@ static inline const struct iommu_ops *d return dev->iommu->iommu_dev->ops; } - extern int bus_iommu_probe(struct bus_type *bus); - extern bool iommu_present(struct bus_type *bus); + extern int bus_iommu_probe(const struct bus_type *bus); + extern bool iommu_present(const struct bus_type *bus); extern bool device_iommu_capable(struct device *dev, enum iommu_cap cap); extern bool iommu_group_has_isolated_msi(struct iommu_group *group); - extern struct iommu_domain *iommu_domain_alloc(struct bus_type *bus); + extern struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus); -extern struct iommu_group *iommu_group_get_by_id(int id); extern void iommu_domain_free(struct iommu_domain *domain); extern int iommu_attach_device(struct iommu_domain *domain, struct device *dev); diff --cc include/linux/iommu.h index ad238d6e4677b,0fd4e6734d5b2..0000000000000 --- a/include/linux/iommu.h