From: Will Deacon <will.deacon@arm.com>
To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: catalin.marinas@arm.com, Arvind Yadav <arvind.yadav.cs@gmail.com>,
Hanjun Guo <hanjun.guo@linaro.org>,
sudeep.holla@arm.com, "Rafael J. Wysocki" <rjw@rjwysocki.net>,
linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org,
robin.murphy@arm.com
Subject: Re: [GIT PULL] ACPI IORT changes for v4.15
Date: Mon, 16 Oct 2017 16:04:57 +0100 [thread overview]
Message-ID: <20171016150456.GB10500@arm.com> (raw)
In-Reply-To: <20171013152937.GA13386@red-moon>
Hi Lorenzo,
On Fri, Oct 13, 2017 at 04:29:37PM +0100, Lorenzo Pieralisi wrote:
> Hi Catalin, Will,
>
> here are the ACPI IORT changes I have queued aimed at the v4.15 kernel
> release.
>
> Main changes:
>
> - SMMUv3 MSI enablement work based on IORT issue C spec updates
> (Hanjun Guo)
> - Clean-ups/rework in preparation for PMCG support (Lorenzo Pieralisi)
>
> Patches have a compile time dependency on the ACPICA tree that we handled
> through an ACPI_CA_VERSION guard; I will remove it at v4.15-rc1 when
> dependencies have settled.
>
> Reference discussion:
>
> http://lkml.kernel.org/r/20171013130445.GA27895@red-moon
>
> I expect no merge conflict with the arm64 tree for-next/core branch.
>
> Patches are based on v4.14-rc4 owing to an IORT dependency on a fix
> (ie commit 37f6b42e9c ("ACPI/IORT: Fix PCI ACS enablement")) that
> was merged in v4.14-rc4.
As discussed offline, given that this is a trivial one-line conflict as
opposed to a functional dependency, could you please send another pull
request based on -rc3? The arm64 for-next/core branch is already based on
that, and this doesn't seem like a good reason to pull in -rc4.
Cheers,
Will
prev parent reply other threads:[~2017-10-16 15:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-13 15:29 [GIT PULL] ACPI IORT changes for v4.15 Lorenzo Pieralisi
2017-10-16 15:04 ` Will Deacon [this message]
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=20171016150456.GB10500@arm.com \
--to=will.deacon@arm.com \
--cc=arvind.yadav.cs@gmail.com \
--cc=catalin.marinas@arm.com \
--cc=hanjun.guo@linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=rjw@rjwysocki.net \
--cc=robin.murphy@arm.com \
--cc=sudeep.holla@arm.com \
/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).