From: Jean Delvare <jdelvare@suse.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Christoph Hellwig <hch@lst.de>, Toshi Kani <toshi.kani@hpe.com>
Subject: Re: linux-next: manual merge of the pm tree with the dmi tree
Date: Fri, 01 Sep 2017 15:20:21 +0200 [thread overview]
Message-ID: <1504272021.4651.1.camel@suse.de> (raw)
In-Reply-To: <20170831110759.334c9fe2@canb.auug.org.au>
Hi Stephen,
On jeu., 2017-08-31 at 11:07 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> drivers/acpi/blacklist.c
>
> between commit:
>
> f996c4155d0d ("dmi: Mark all struct dmi_system_id instances const")
>
> from the dmi tree and commit:
>
> 5aa5911a0ed9 ("ACPI / blacklist: add acpi_match_platform_list()")
>
> from the pm tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
Below, where?
> 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.
--
Jean Delvare
SUSE L3 Support
next prev parent reply other threads:[~2017-09-01 13:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-31 1:07 linux-next: manual merge of the pm tree with the dmi tree Stephen Rothwell
2017-09-01 13:20 ` Jean Delvare [this message]
2017-09-04 6:37 ` Stephen Rothwell
2017-09-04 23:17 ` Kani, Toshimitsu
-- strict thread matches above, loose matches on Subject: below --
2017-08-07 1:40 Stephen Rothwell
2017-09-04 4:38 ` 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=1504272021.4651.1.camel@suse.de \
--to=jdelvare@suse.de \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=sfr@canb.auug.org.au \
--cc=toshi.kani@hpe.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.