public inbox for linux-next@vger.kernel.org
 help / color / mirror / Atom feed
From: Hans de Goede <hdegoede@redhat.com>
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>
Subject: Re: linux-next: manual merge of the drivers-x86 tree with the pm tree
Date: Mon, 19 Sep 2022 08:05:23 +0100	[thread overview]
Message-ID: <cb5df3a5-016d-60bf-5a77-1261e67fe24a@redhat.com> (raw)
In-Reply-To: <20220919142017.77555449@canb.auug.org.au>

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


  reply	other threads:[~2022-09-19  7:05 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-19  4:20 linux-next: manual merge of the drivers-x86 tree with the pm tree Stephen Rothwell
2022-09-19  7:05 ` Hans de Goede [this message]
  -- 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=cb5df3a5-016d-60bf-5a77-1261e67fe24a@redhat.com \
    --to=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 \
    --cc=sfr@canb.auug.org.au \
    /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