From: broonie@kernel•org
To: Greg KH <greg@kroah•com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Jason Gunthorpe <jgg@nvidia•com>, Jason Gunthorpe <jgg@ziepe•ca>,
Joerg Roedel <jroedel@suse•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the driver-core tree with the iommu tree
Date: Mon, 17 Apr 2023 17:09:20 +0100 [thread overview]
Message-ID: <20230417160920.3387706-1-broonie@kernel.org> (raw)
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.
diff --cc include/linux/iommu.h
index ad238d6e4677b,0fd4e6734d5b2..0000000000000
--- a/include/linux/iommu.h
+++ 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);
next reply other threads:[~2023-04-17 16:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-17 16:09 broonie [this message]
2023-04-18 6:21 ` linux-next: manual merge of the driver-core tree with the iommu tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2018-07-11 3:14 Stephen Rothwell
2018-07-11 10:58 ` Greg KH
2018-08-19 0:28 ` Stephen Rothwell
2014-05-28 7:55 Stephen Rothwell
2014-05-28 18:35 ` Greg KH
2013-02-06 5:25 Stephen Rothwell
2013-02-06 6:03 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230417160920.3387706-1-broonie@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=jgg@nvidia$(echo .)com \
--cc=jgg@ziepe$(echo .)ca \
--cc=jroedel@suse$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox