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: linux-next: manual merge of the pm tree with the dmi tree
Date: Mon, 7 Aug 2017 11:40:33 +1000 [thread overview]
Message-ID: <20170807114033.4d484e6c@canb.auug.org.au> (raw)
Hi Rafael,
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.
--
Cheers,
Stephen Rothwell
next reply other threads:[~2017-08-07 1:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-07 1:40 Stephen Rothwell [this message]
2017-09-04 4:38 ` linux-next: manual merge of the pm tree with the dmi tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
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=20170807114033.4d484e6c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hch@lst$(echo .)de \
--cc=jdelvare@suse$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lukas@wunner$(echo .)de \
--cc=rjw@rjwysocki$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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