linux-kernel - Re: linux-next: manual merge of the drivers-x86 tree with the pm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <cb5df3a5-016d-60bf-5a77-1261e67fe24a@redhat.com>
Date:   Mon, 19 Sep 2022 08:05:23 +0100
From:   Hans de Goede <hdegoede@...hat.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Mark Gross <markgross@...nel.org>,
        "Rafael J. Wysocki" <rjw@...ysocki.net>
Cc:     Arvid Norlander <lkml@...pal.se>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        "Rafael J. Wysocki" <rafael.j.wysocki@...el.com>
Subject: Re: linux-next: manual merge of the drivers-x86 tree with the pm tree

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