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

2019-07-08 Thread Christoph Hellwig
Next time it would be really helpful if fixups to nvme documentation went through the nvme/block tree.. On Tue, Jul 09, 2019 at 10:08:30AM +1000, Stephen Rothwell wrote: > Hi all, > > On Tue, 25 Jun 2019 14:42:26 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the block tree

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

2019-07-08 Thread Stephen Rothwell
Hi all, On Tue, 25 Jun 2019 14:42:26 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the block tree got a conflict in: > > Documentation/fault-injection/nvme-fault-injection.txt > > between commit: > > 10ffebbed550 ("docs: fault-injection: convert docs to ReST and rename to

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

2019-06-24 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the block tree got a conflict in: Documentation/fault-injection/nvme-fault-injection.txt between commit: 10ffebbed550 ("docs: fault-injection: convert docs to ReST and rename to *.rst") from the jc_docs tree and commit: 7e31d8215fd8 ("Documentation: