From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the pm tree
Date: Mon, 10 Dec 2018 09:58:53 +0100 [thread overview]
Message-ID: <9045374.omvoRxFOEf@aspire.rjw.lan> (raw)
In-Reply-To: <20181210161454.1c8ca97f@canb.auug.org.au>
On Monday, December 10, 2018 6:14:54 AM CET Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/base/platform.c
> u
> between commit:
>
> 2d51ac9086fd ("driver core: platform: Remove duplicated device_remove_properties() call")
>
> from the pm tree and commit:
>
> 99fef587ff98 ("driver core: platform: Respect return code of platform_device_register_full()")
>
> from the driver-core tree.
>
> I fixed it up (see below) 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.
The fix looks good to me, thank you!
next prev parent reply other threads:[~2018-12-10 8:59 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-10 5:14 linux-next: manual merge of the driver-core tree with the pm tree Stephen Rothwell
2018-12-10 8:58 ` Rafael J. Wysocki [this message]
2018-12-10 9:02 ` Andy Shevchenko
-- strict thread matches above, loose matches on Subject: below --
2019-07-01 8:32 Stephen Rothwell
2019-07-03 13:04 ` 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=9045374.omvoRxFOEf@aspire.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=andriy.shevchenko@linux.intel.com \
--cc=greg@kroah.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).