Linux-Next Archive on
 help / color / Atom feed
From: Will Deacon <>
To: Stephen Rothwell <>
Cc: Jonathan Corbet <>,
	Linux Next Mailing List <>,
	Linux Kernel Mailing List <>,
	Adam Zerella <>,
	Joakim Zhang <>
Subject: Re: linux-next: manual merge of the jc_docs tree with the arm-perf tree
Date: Tue, 5 Nov 2019 18:11:38 +0000
Message-ID: <20191105181137.GB32767@willie-the-truck> (raw)
In-Reply-To: <>

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?


  reply index

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-05  0:37 Stephen Rothwell
2019-11-05 18:11 ` Will Deacon [this message]
2019-11-05 19:13   ` Jonathan Corbet

Reply instructions:

You may reply publically 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:

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

  git send-email \
    --in-reply-to=20191105181137.GB32767@willie-the-truck \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Next Archive on

Archives are clonable:
	git clone --mirror linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ \
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:

AGPL code for this site: git clone