On Tue, Nov 05, 2019 at 11:37:26AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the jc_docs tree got a conflict in: > > Documentation/admin-guide/perf/imx-ddr.rst > > between commits: > > 76d835fcd429 ("docs/perf: Add explanation for DDR_CAP_AXI_ID_FILTER_ENHANCED quirk") > ed0207a33add ("docs/perf: Add AXI ID filter capabilities information") > > from the arm-perf tree and commit: > > 0522e130b00a ("docs: perf: Add imx-ddr to documentation index") > > from the jc_docs 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. Looks fine to me, thanks. Jon -- are you ok living with this conflict? Will