Hi all,
On Wed, 11 Jul 2018 13:14:45 +1000 Stephen Rothwell
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
Hi all,
On Wed, 11 Jul 2018 13:14:45 +1000 Stephen Rothwell
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
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
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
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
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
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
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
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
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:
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
>
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
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
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
14 matches
Mail list logo
