Messages in this thread | | | Date | Fri, 28 Dec 2018 16:43:03 +0100 | From | Greg KH <> | Subject | Re: [GIT PULL] Driver core patches for 4.21-rc1 |
| |
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
| |