Re: linux-next: manual merge of the rcu tree with the jc_docs tree

2020-09-03 Thread Paul E. McKenney
On Wed, Sep 02, 2020 at 02:31:01PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the rcu tree got a conflict in: > > Documentation/memory-barriers.txt > > between commit: > > 537f3a7cf48e ("docs/memory-barriers.txt: Fix references for DMA*.txt files") > > from

linux-next: manual merge of the rcu tree with the jc_docs tree

2020-09-01 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the rcu tree got a conflict in: Documentation/memory-barriers.txt between commit: 537f3a7cf48e ("docs/memory-barriers.txt: Fix references for DMA*.txt files") from the jc_docs tree and commit: 6f6705147bab ("docs: fix references for DMA*.txt files")