linux-next: manual merge of the driver-core tree with the iommu tree

linux-next: manual merge of the driver-core tree with the iommu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 916 bytes --]

Hi all,

Today's linux-next merge of the driver-core tree got a conflict in:

  drivers/iommu/ipmmu-vmsa.c

between commits:

  0b8ac1409641 ("iommu/ipmmu-vmsa: Hook up r8a7796 DT matching code")
  3701c123e1c1 ("iommu/ipmmu-vmsa: Hook up r8a779(70|95) DT matching code")
  98dbffd39a65 ("iommu/ipmmu-vmsa: Hook up R8A77965 DT matching code")

from the iommu tree and commit:

  ac6bbf0cdf42 ("iommu: Remove IOMMU_OF_DECLARE")

from the driver-core tree.

I fixed it up (I removed the new IOMMU_OF_DECLARE() lines) 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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the driver-core tree with the iommu tree

[Greg KH]

On Wed, Jul 11, 2018 at 01:14:45PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the driver-core tree got a conflict in:
> 
>   drivers/iommu/ipmmu-vmsa.c
> 
> between commits:
> 
>   0b8ac1409641 ("iommu/ipmmu-vmsa: Hook up r8a7796 DT matching code")
>   3701c123e1c1 ("iommu/ipmmu-vmsa: Hook up r8a779(70|95) DT matching code")
>   98dbffd39a65 ("iommu/ipmmu-vmsa: Hook up R8A77965 DT matching code")
> 
> from the iommu tree and commit:
> 
>   ac6bbf0cdf42 ("iommu: Remove IOMMU_OF_DECLARE")
> 
> from the driver-core tree.
> 
> I fixed it up (I removed the new IOMMU_OF_DECLARE() lines) 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.

Resolution seems sane to me, thanks.

greg k-h

Re: linux-next: manual merge of the driver-core tree with the iommu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1110 bytes --]

Hi all,

On Wed, 11 Jul 2018 13:14:45 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the driver-core tree got a conflict in:
> 
>   drivers/iommu/ipmmu-vmsa.c
> 
> between commits:
> 
>   0b8ac1409641 ("iommu/ipmmu-vmsa: Hook up r8a7796 DT matching code")
>   3701c123e1c1 ("iommu/ipmmu-vmsa: Hook up r8a779(70|95) DT matching code")
>   98dbffd39a65 ("iommu/ipmmu-vmsa: Hook up R8A77965 DT matching code")
> 
> from the iommu tree and commit:
> 
>   ac6bbf0cdf42 ("iommu: Remove IOMMU_OF_DECLARE")
> 
> from the driver-core tree.
> 
> I fixed it up (I removed the new IOMMU_OF_DECLARE() lines) 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.

This is now a conflict between Linus' tree and the iommu tree.
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the driver-core tree with the iommu tree

[Greg KH]

On Mon, Apr 17, 2023 at 05:09:20PM +0100, broonie@kernel.org wrote:
> 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);

Merge looks good to me, thanks!

greg k-h

linux-next: manual merge of the driver-core tree with the iommu tree

[broonie]

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);

Re: linux-next: manual merge of the driver-core tree with the iommu tree

[Greg KH]

On Wed, May 28, 2014 at 05:55:31PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/iommu/exynos-iommu.c between commit 7222e8db2d50
> ("iommu/exynos: Fix build errors") from the iommu tree and commit
> 8283b4919e00 ("driver core: dev_set_drvdata can no longer fail") from
> the driver-core tree.
> 
> I fixed it up (the former removed the code changed by the latter) and
> can carry the fix as necessary (no action is required).

Sounds good, thanks.

greg k-h

linux-next: manual merge of the driver-core tree with the iommu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 503 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/iommu/exynos-iommu.c between commit 7222e8db2d50
("iommu/exynos: Fix build errors") from the iommu tree and commit
8283b4919e00 ("driver core: dev_set_drvdata can no longer fail") from
the driver-core tree.

I fixed it up (the former removed the code changed by the latter) and
can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the driver-core tree with the iommu tree

[Greg KH]

On Wed, Feb 06, 2013 at 04:25:23PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/iommu/tegra-smmu.c between commit a6870e928d1b ("iommu/tegra:
> smmu: Support variable MMIO ranges/blocks") from the iommu tree and
> commit bc5e6dea81b0 ("iommu: Convert to devm_ioremap_resource()") from
> the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me, thanks.

greg k-h

linux-next: manual merge of the driver-core tree with the iommu tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1313 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/iommu/tegra-smmu.c between commit a6870e928d1b ("iommu/tegra:
smmu: Support variable MMIO ranges/blocks") from the iommu tree and
commit bc5e6dea81b0 ("iommu: Convert to devm_ioremap_resource()") from
the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/iommu/tegra-smmu.c
index 7747283,f08dbcd..0000000
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@@ -1185,13 -1177,10 +1186,13 @@@ static int tegra_smmu_probe(struct plat
  		res = platform_get_resource(pdev, IORESOURCE_MEM, i);
  		if (!res)
  			return -ENODEV;
- 		smmu->regs[i] = devm_request_and_ioremap(&pdev->dev, res);
- 		if (!smmu->regs[i])
- 			return -EBUSY;
+ 		smmu->regs[i] = devm_ioremap_resource(&pdev->dev, res);
+ 		if (IS_ERR(smmu->regs[i]))
+ 			return PTR_ERR(smmu->regs[i]);
 +		smmu->rege[i] = smmu->regs[i] + resource_size(res) - 1;
  	}
 +	/* Same as "mc" 1st regiter block start address */
 +	smmu->regbase = (void __iomem *)((u32)smmu->regs[0] & ~PAGE_MASK);
  
  	err = of_get_dma_window(dev->of_node, NULL, 0, NULL, &base, &size);
  	if (err)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]