Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <cb5df3a5-016d-60bf-5a77-1261e67fe24a@redhat.com>
Date:   Mon, 19 Sep 2022 08:05:23 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.2.1
Subject: Re: linux-next: manual merge of the drivers-x86 tree with the pm tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Mark Gross <markgross@kernel.org>,
        "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc:     Arvid Norlander <lkml@vorpal.se>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
References: <20220919142017.77555449@canb.auug.org.au>
Content-Language: en-US
From:   Hans de Goede <hdegoede@redhat.com>
In-Reply-To: <20220919142017.77555449@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

Hi Stephen,

On 9/19/22 05:20, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the drivers-x86 tree got a conflict in:
> 
>   drivers/acpi/acpi_video.c
> 
> between commit:
> 
>   574160b8548d ("ACPI: video: Add Toshiba Satellite/Portege Z830 quirk")
> 
> from the pm tree and commit:
> 
>   c5b94f5b7819 ("ACPI: video: Change disable_backlight_sysfs_if quirks to acpi_backlight=native")
> 
> from the drivers-x86 tree.
> 
> I fixed it up (the latter change seems to incoporate the former)

Correct, the c5b94f5b7819 commit supersedes the 574160b8548d one.

Thanks you.

Regards,

Hans


> 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.
>