Message ID | 20181211200847.GB5218@edgewater-inn.cambridge.arm.com (mailing list archive) |
---|---|
State | Mainlined, archived |
Commit | 89cddc563743cb1e0068867ac97013b2a5bf86aa |
Headers | show |
Series | [GIT,PULL] iommu/arm-smmu: Updates for 4.21 | expand |
On Tue, Dec 11, 2018 at 08:08:48PM +0000, Will Deacon wrote: > The following changes since commit 9ff01193a20d391e8dbce4403dd5ef87c7eaaca6: > > Linux 4.20-rc3 (2018-11-18 13:33:44 -0800) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git for-joerg/arm-smmu/updates Pulled, thanks Will. Btw, there was a merge conflict with the patches to unmodularize the IOMMU drivers in drivers/iommu/arm-smmu.c. I think I fixed it up, but it would be good if you can check it later when I pushed it out. Thanks, Joerg
On Wed, Dec 12, 2018 at 10:17:02AM +0100, Joerg Roedel wrote: > On Tue, Dec 11, 2018 at 08:08:48PM +0000, Will Deacon wrote: > > The following changes since commit 9ff01193a20d391e8dbce4403dd5ef87c7eaaca6: > > > > Linux 4.20-rc3 (2018-11-18 13:33:44 -0800) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git for-joerg/arm-smmu/updates > > Pulled, thanks Will. > > Btw, there was a merge conflict with the patches to unmodularize the > IOMMU drivers in drivers/iommu/arm-smmu.c. I think I fixed it up, but it > would be good if you can check it later when I pushed it out. Looks fine to me, thanks Joerg. Will