Re: [Xen-devel] [GIT PULL] dma-mapping updates for 5.4

2019-09-19 Thread Michal Simek
On 20. 09. 19 1:17, Michael Ellerman wrote: > > > On 20 September 2019 6:33:50 am AEST, Linus Torvalds > wrote: >> On Wed, Sep 18, 2019 at 8:27 AM Christoph Hellwig >> wrote: >>> >>> please pull the dma-mapping updates for 5.4. >> >> Pulled. >> >>> In addition to the usual Kconfig conflics

Re: [Xen-devel] [GIT PULL] dma-mapping updates for 5.4

2019-09-19 Thread Michael Ellerman
On 20 September 2019 6:33:50 am AEST, Linus Torvalds wrote: >On Wed, Sep 18, 2019 at 8:27 AM Christoph Hellwig >wrote: >> >> please pull the dma-mapping updates for 5.4. > >Pulled. > >> In addition to the usual Kconfig conflics where you just want to keep >> both edits there are a few more

Re: [Xen-devel] [GIT PULL] dma-mapping updates for 5.4

2019-09-19 Thread pr-tracker-bot
The pull request you sent on Wed, 18 Sep 2019 08:27:48 -0700: > git://git.infradead.org/users/hch/dma-mapping.git tags/dma-mapping-5.4 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/671df189537883f36cf9c7d4f9495bfac0f86627 Thank you! -- Deet-doot-dot, I am a bot.

Re: [Xen-devel] [GIT PULL] dma-mapping updates for 5.4

2019-09-19 Thread Linus Torvalds
On Wed, Sep 18, 2019 at 8:27 AM Christoph Hellwig wrote: > > please pull the dma-mapping updates for 5.4. Pulled. > In addition to the usual Kconfig conflics where you just want to keep > both edits there are a few more interesting merge issues this time: > > - most importanly powerpc and

[Xen-devel] [GIT PULL] dma-mapping updates for 5.4

2019-09-18 Thread Christoph Hellwig
Hi Linus, please pull the dma-mapping updates for 5.4. In addition to the usual Kconfig conflics where you just want to keep both edits there are a few more interesting merge issues this time: - most importanly powerpc and microblaze add new callers of dma_atomic_pool_init, while this tree