linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Vinod Koul <vkoul@kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the slave-dma tree with Linus' tree
Date: Thu, 12 Mar 2020 09:16:01 +0200	[thread overview]
Message-ID: <68408777-afd4-78c0-9e15-fa7ac050bb17@ti.com> (raw)
In-Reply-To: <20200312162614.1b6b2b0e@canb.auug.org.au>

Hi Stephen, Vinod,

On 12/03/2020 7.26, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the slave-dma tree got a conflict in:
> 
>   drivers/dma/ti/k3-udma.c
> 
> between commit:
> 
>   16cd3c670183 ("dmaengine: ti: k3-udma: Workaround for RX teardown with stale data in peer")
> 
> from Linus' tree

In Linus' tree the drivers/dma/ti/k3-udma.c latest commit is:
8390318c04bb ("dmaengine: ti: k3-udma: Fix terminated transfer handling")

git log --oneline drivers/dma/ti/k3-udma.c shows:
8390318c04bb dmaengine: ti: k3-udma: Fix terminated transfer handling
c7450bb211f3 dmaengine: ti: k3-udma: Use the channel direction in pause/resume functions
6cf668a4ef82 dmaengine: ti: k3-udma: Use the TR counter helper for slave_sg and cyclic
a97934071fc3 dmaengine: ti: k3-udma: Move the TR counter calculation to helper function
16cd3c670183 dmaengine: ti: k3-udma: Workaround for RX teardown with stale data in peer
1c83767c9d41 dmaengine: ti: k3-udma: Use ktime/usleep_range based TX completion check
6c0157be02f0 dmaengine: ti: k3-udma: fix spelling mistake "limted" -> "limited"
d70241913413 dmaengine: ti: k3-udma: Add glue layer for non DMAengine users
25dcb5dd7b7c dmaengine: ti: New driver for K3 UDMA

> and commit:
> 
>   db8d9b4c9b30 ("dmaengine: ti: k3-udma: Implement custom dbg_summary_show for debugfs")

However slave-dma's next branch shows the following log for k3-udma.c:
db8d9b4c9b30 dmaengine: ti: k3-udma: Implement custom dbg_summary_show for debugfs
0ebcf1a274c5 dmaengine: ti: k3-udma: Implement support for atype (for virtualization)
6c0157be02f0 dmaengine: ti: k3-udma: fix spelling mistake "limted" -> "limited"
d70241913413 dmaengine: ti: k3-udma: Add glue layer for non DMAengine users
25dcb5dd7b7c dmaengine: ti: New driver for K3 UDMA

The 5.6-rc5 patches (1c83767c9d41...8390318c04bb) is not present in slave-dma/next which
causes the conflict.
 
> from the slave-dma 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.

I ended up with the exactly same resolution patch when merging dlave-dma/next
to Linus' tree.

Stephen, thank you!

Vinod, is there anything I can do?

- Péter

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

  reply	other threads:[~2020-03-12  7:16 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-12  5:26 linux-next: manual merge of the slave-dma tree with Linus' tree Stephen Rothwell
2020-03-12  7:16 ` Peter Ujfalusi [this message]
2020-03-13 12:42   ` Vinod Koul
  -- strict thread matches above, loose matches on Subject: below --
2019-06-11  6:32 Stephen Rothwell
2019-06-11 10:08 ` Vinod Koul
2019-02-26  4:24 Stephen Rothwell
2019-02-26 17:22 ` Vinod Koul
2019-01-23  2:41 Stephen Rothwell
2012-12-18 23:44 Stephen Rothwell
2012-03-27  0:45 Stephen Rothwell
2012-03-09  2:25 Stephen Rothwell
2011-08-26  1:46 Stephen Rothwell
2011-07-27  2:08 Stephen Rothwell
2011-07-27  3:12 ` Koul, Vinod
2011-07-27 16:25   ` Koul, Vinod
2011-07-27 20:19     ` Russell King - ARM Linux
2011-07-27 20:29       ` Grant Likely

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=68408777-afd4-78c0-9e15-fa7ac050bb17@ti.com \
    --to=peter.ujfalusi@ti.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=vkoul@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).