From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>, Jean Delvare <jdelvare@suse.de>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Christoph Hellwig <hch@lst.de>, Lukas Wunner <lukas@wunner.de>
Subject: Re: linux-next: manual merge of the pm tree with the dmi tree
Date: Mon, 4 Sep 2017 14:38:22 +1000 [thread overview]
Message-ID: <20170904143822.3b04f2fb@canb.auug.org.au> (raw)
In-Reply-To: <20170807114033.4d484e6c@canb.auug.org.au>
Hi all,
On Mon, 7 Aug 2017 11:40:33 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> drivers/acpi/sbs.c
>
> between commit:
>
> f996c4155d0d ("dmi: Mark all struct dmi_system_id instances const")
>
> from the dmi tree and commit:
>
> 630b3aff8a51 ("treewide: Consolidate Apple DMI checks")
>
> from the pm tree.
>
> I fixed it up (the latter removed the declaration updated by 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.
Just a reminder that the above conflict still exists.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-09-04 4:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-07 1:40 linux-next: manual merge of the pm tree with the dmi tree Stephen Rothwell
2017-09-04 4:38 ` Stephen Rothwell [this message]
2017-08-31 1:07 Stephen Rothwell
2017-09-01 13:20 ` Jean Delvare
2017-09-04 6:37 ` Stephen Rothwell
2017-09-04 23:17 ` Kani, Toshimitsu
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=20170904143822.3b04f2fb@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hch@lst.de \
--cc=jdelvare@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lukas@wunner.de \
--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;
as well as URLs for NNTP newsgroup(s).