Received-SPF: pass (google.com: domain of linux-kernel+bounces-180893-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Message-ID: <2e5c9108-9ca4-4d7c-a062-2a9a5baaf06e@redhat.com>
Date: Thu, 16 May 2024 12:13:54 +0200
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v2 0/2] ACPI: EC: Install EC address space handler at the
 namespace root
To: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
 Linux ACPI <linux-acpi@vger.kernel.org>, LKML
 <linux-kernel@vger.kernel.org>,
 Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
 Mario Limonciello <mario.limonciello@amd.com>, Armin Wolf <w_armin@gmx.de>,
 Heikki Krogerus <heikki.krogerus@linux.intel.com>
References: <12437901.O9o76ZdvQC@kreacher>
 <5161bd95-d51e-49cc-bcbd-523fbb747e4b@redhat.com>
 <CAJZ5v0gf-oLcjT8dxnpjAyVfpUep5ST2mHDJy2dySBGCJwjMxg@mail.gmail.com>
 <b53b4fe4-e3b7-4939-a8ea-9eb55f0bece6@redhat.com>
 <CAJZ5v0i+ejMyj0j7RvVY7+g6eU8bQ9QLG=08fm78i9Ui1fEiVA@mail.gmail.com>
Content-Language: en-US, nl
From: Hans de Goede <hdegoede@redhat.com>
In-Reply-To: <CAJZ5v0i+ejMyj0j7RvVY7+g6eU8bQ9QLG=08fm78i9Ui1fEiVA@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Hi,

On 5/16/24 12:09 PM, Rafael J. Wysocki wrote:
> Hi,
> 
> On Thu, May 16, 2024 at 11:50 AM Hans de Goede <hdegoede@redhat.com> wrote:
>>
>> Hi,
>>
>> On 5/16/24 10:37 AM, Rafael J. Wysocki wrote:
>>> On Thu, May 16, 2024 at 10:35 AM Hans de Goede <hdegoede@redhat.com> wrote:
>>>>
>>>> Hi,
>>>>
>>>> On 5/15/24 9:39 PM, Rafael J. Wysocki wrote:
>>>>> Hi Everyone,
>>>>>
>>>>> This is an update of
>>>>>
>>>>> https://lore.kernel.org/linux-acpi/5787281.DvuYhMxLoT@kreacher/
>>>>>
>>>>> which was a follow up for the discussion in:
>>>>>
>>>>> https://lore.kernel.org/linux-acpi/CAJZ5v0hiXdv08PRcop7oSYqgr_g5rwzRTj7HgdNCCGjXeV44zA@mail.gmail.com/T/#t
>>>>>
>>>>> Patch [1/2] has been updated to avoid possible issues related to
>>>>> systems with defective platform firmware and patch [2/2] is a resend
>>>>> with a couple of tags added.
>>>>
>>>> Thanks, the series looks good to me:
>>>>
>>>> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
>>>>
>>>> for the series.
>>>>
>>>> I assume you are going to send this in as a fix for 6.10 ?
>>>
>>> Yes, I am.
>>>
>>>> In that case feel free to merge both patches through the
>>>> linux-pm tree.
>>>
>>> Thank you!
>>
>> Hmm, I just realized that this:
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/commit/?h=for-next&id=c663b26972eae7d2a614f584c92a266fe9a2d44c
>>
>> Is part of the main pdx86 pull-request for 6.10 which I'm going to
>> send to Linus in the next 10 minutes or so. So that is going to
>> conflict with your 2/2.
>>
>> Options:
>>
>> a) You only send 1/2 upstream as a fix and I'll then send a rebased
>> 2/2 upstream as part of the first pdx86 pull-request.
>>
>> b) You merge the git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
>> platform-drivers-x86-v6.10-1 tag (which is the tag for the pull-request
>> I'm about to send to Linus) and rebase on top of that before sending
>> a pull-request for both to Linus.
> 
> I would rather wait for Linus to merge your PR and merge my changes on
> top of his merge.

That is fine too. I just send out the pull-request so hopefully Linus will
merge it soon(ish).

Note (stating the obvious) when rebasing 2/2 you will pretty much need to
remove all the new code added by:

https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/commit/?id=c663b26972eae7d2a614f584c92a266fe9a2d44c

Regards,

Hans