From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, "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>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: linux-next: manual merge of the driver-core tree with the pm tree
Date: Mon, 1 Jul 2019 18:32:49 +1000 [thread overview]
Message-ID: <20190701183249.34c928ce@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 807 bytes --]
Hi all,
Today's linux-next merge of the driver-core tree got a conflict in:
drivers/acpi/sleep.c
between commit:
a3487d8f3063 ("ACPI / sleep: Switch to use acpi_dev_get_first_match_dev()")
from the pm tree and commit:
418e3ea157ef ("bus_find_device: Unify the match callback with class_find_device")
from the driver-core tree.
I fixed it up (the former removed the code modified by the latter) 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:[~2019-07-01 8:33 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-01 8:32 Stephen Rothwell [this message]
2019-07-03 13:04 ` linux-next: manual merge of the driver-core tree with the pm tree Andy Shevchenko
-- strict thread matches above, loose matches on Subject: below --
2018-12-10 5:14 Stephen Rothwell
2018-12-10 8:58 ` Rafael J. Wysocki
2018-12-10 9:02 ` Andy Shevchenko
2016-11-14 2:09 Stephen Rothwell
2016-11-14 21:07 ` Rafael J. Wysocki
2014-11-11 4:41 Stephen Rothwell
2014-12-02 18:10 ` Greg KH
2014-11-10 4:18 Stephen Rothwell
2014-11-10 4:40 ` Greg KH
2013-08-30 5:26 Stephen Rothwell
2013-08-30 6:02 ` Greg KH
2013-06-27 7:14 Stephen Rothwell
2013-06-27 15:36 ` Greg KH
2013-06-07 4:49 Stephen Rothwell
2013-06-07 17:38 ` Greg KH
2013-05-22 3:47 Stephen Rothwell
2013-05-22 4:02 ` Stephen Rothwell
2013-05-22 11:26 ` Rafael J. Wysocki
2013-02-11 4:42 Stephen Rothwell
2013-02-11 12:10 ` Rafael J. Wysocki
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=20190701183249.34c928ce@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=andriy.shevchenko@linux.intel.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=suzuki.poulose@arm.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 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).