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;
Date:   Mon, 19 Sep 2022 14:20:17 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Hans de Goede <hdegoede@redhat.com>,
        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>
Subject: linux-next: manual merge of the drivers-x86 tree with the pm tree
Message-ID: <20220919142017.77555449@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/KRSLZuq1lXhmmebLcWZZQWM";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/KRSLZuq1lXhmmebLcWZZQWM
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 a=
cpi_backlight=3Dnative")

from the drivers-x86 tree.

I fixed it up (the latter change seems to incoporate the former) 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.

--=20
Cheers,
Stephen Rothwell

--Sig_/KRSLZuq1lXhmmebLcWZZQWM
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmMn7gIACgkQAVBC80lX
0GwBiQf/WE7jtl9g6KcVE70Hl5BwEP7WDeYT/NYcqFOCwjlZa20CMZdpiFWeYp5k
wYJi9Et/Qynr62tq/jlC/06myiWSdLmDqiu3OZv12IZ61B5SqDjqWwzfYnivyg7s
fvVNYSmb0cGrt5hVbkEwJD5LwG84B+EWnzyPvRIln2UUfFmSiqredqtv7Be82nxE
czarLGlg6opOb39maVF9M1cBcwyx5Ez7OiBBsUVUh90e24JIN9EvGU/t5OqOV9TJ
kLKBwlvnFfvHCaNL9EO1+MKtWG2eH+2gPlXfU8YGH7lBf1rdhitOsfFW/aDoLdde
4bu727xv5tJA66BaflcTMl0i0ij2Ww==
=XUFF
-----END PGP SIGNATURE-----

--Sig_/KRSLZuq1lXhmmebLcWZZQWM--