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
Date: Mon, 19 Sep 2022 14:20:17 +1000 [thread overview]
Message-ID: <20220919142017.77555449@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 819 bytes --]
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) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-09-19 4:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-19 4:20 Stephen Rothwell [this message]
2022-09-19 7:05 ` linux-next: manual merge of the drivers-x86 tree with the pm tree Hans de Goede
-- strict thread matches above, loose matches on Subject: below --
2022-12-06 0:24 Stephen Rothwell
2022-03-03 2:32 Stephen Rothwell
2015-06-19 5:04 Michael Ellerman
2015-06-19 19:38 ` Darren Hart
2014-01-22 5:42 Stephen Rothwell
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=20220919142017.77555449@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lkml@vorpal.se \
--cc=markgross@kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=rjw@rjwysocki.net \
/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