Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1476320
| From | Vinod Koul <vinod.koul@intel.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the tty tree with the slave-dma tree |
| Date | 2016-09-05 13:30 +0200 |
| Message-ID | <se0ga-34H-17@gated-at.bofh.it> (permalink) |
| References | <sdVTb-6R-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Mon, Sep 05, 2016 at 04:43:21PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> drivers/dma/imx-sdma.c
>
> between commit:
>
> 48dc77e2d4fc ("dmaengine: imx-sdma: convert callback to helper function")
>
> from the slave-dma tree and commit:
>
> 15f30f513111 ("dmaengine: imx-sdma - reduce transfer latency for DMA cyclic clients")
>
> from the tty 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.
Stephen,
The fix looks right to me.
Greg let me know if you would like me to merge this to avoid conflict
--
~Vinod
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
linux-next: manual merge of the tty tree with the slave-dma tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-09-05 08:50 +0200
Re: linux-next: manual merge of the tty tree with the slave-dma tree Vinod Koul <vinod.koul@intel.com> - 2016-09-05 13:30 +0200
Re: linux-next: manual merge of the tty tree with the slave-dma tree Greg KH <greg@kroah.com> - 2016-09-05 13:40 +0200
Re: linux-next: manual merge of the tty tree with the slave-dma tree Vinod Koul <vinod.koul@intel.com> - 2016-09-05 14:40 +0200
Re: linux-next: manual merge of the tty tree with the slave-dma tree Greg KH <greg@kroah.com> - 2016-09-05 16:00 +0200
Re: linux-next: manual merge of the tty tree with the slave-dma tree Vinod Koul <vinod.koul@intel.com> - 2016-09-05 17:50 +0200
Re: linux-next: manual merge of the tty tree with the slave-dma tree Vinod Koul <vinod.koul@intel.com> - 2016-09-09 13:50 +0200
Re: linux-next: manual merge of the tty tree with the slave-dma tree Greg KH <greg@kroah.com> - 2016-09-09 14:30 +0200
csiph-web