From: Greg KH <gregkh@linuxfoundation.org>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] Driver core patches for 4.21-rc1
Date: Fri, 28 Dec 2018 16:43:03 +0100 [thread overview]
Message-ID: <20181228154303.GA24860@kroah.com> (raw)
In-Reply-To: <20181228153609.GA23789@kroah.com>
On Fri, Dec 28, 2018 at 04:36:09PM +0100, Greg KH wrote:
> The following changes since commit 2595646791c319cadfdbf271563aac97d0843dc7:
>
> Linux 4.20-rc5 (2018-12-02 15:07:55 -0800)
>
> are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git tags/driver-core-4.21-rc1
>
> for you to fetch changes up to 16df1456aa858a86f398dbc7d27649eb6662b0cc:
>
> mm, memory_hotplug: update a comment in unregister_memory() (2018-12-20 16:33:18 +0100)
There's a merge conflict in here as well, in drivers/base/platform.c.
The resolution should be pretty straightfoward, keep this line:
looking something like this:
diff --cc drivers/base/platform.c
index 0fb5f140f1b0,e1ba610482c0..000000000000
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@@ -447,7 -447,8 +447,7 @@@ void platform_device_del(struct platfor
{
int i;
- if (pdev) {
+ if (!IS_ERR_OR_NULL(pdev)) {
- device_remove_properties(&pdev->dev);
device_del(&pdev->dev);
if (pdev->id_auto) {
thanks,
greg k-h
next prev parent reply other threads:[~2018-12-28 15:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-28 15:36 [GIT PULL] Driver core patches for 4.21-rc1 Greg KH
2018-12-28 15:43 ` Greg KH [this message]
2018-12-29 5:35 ` pr-tracker-bot
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=20181228154303.GA24860@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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