Re: [GIT PULL] Driver core patches for 4.19-rc1
On Sat, Aug 18, 2018 at 05:57:58PM +0200, Greg KH wrote: > The following changes since commit acb1872577b346bd15ab3a3f8dff780d6cca4b70: > > Linux 4.18-rc7 (2018-07-29 14:44:52 -0700) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git > tags/driver-core-4.19-rc1 > > for you to fetch changes up to d2fc88a61b4ea99f574bde16e92718e22f312136: > > Merge 4.18-rc7 into driver-core-next (2018-07-30 10:08:09 +0200) > > > Driver core patches for 4.19-rc1 > > Here are all of the driver core and related patches for 4.19-rc1. > > ZNothing huge here, just a number of small cleanups and the ability to > now stop the deferred probing after init happens. > > All of these have been in linux-next for a while with only a merge issue > reported. That merge issue is in fs/sysfs/group.c and Stephen has > posted the diff of what it should be to resolve this. I'll follow up > with that diff to this pull request. Here's Stephen's email with the merge resolution that Rajat verified is correct: Date: Mon, 23 Jul 2018 15:12:24 +1000 From: Stephen Rothwell To: Greg KH , David Miller , Networking Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Dmitry Torokhov , Rajat Jain Subject: linux-next: manual merge of the driver-core tree with the net-next tree Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in: fs/sysfs/group.c between commit: 5f81880d5204 ("sysfs, kobject: allow creating kobject belonging to arbitrary users") from the net-next tree and commit: c855cf2759d2 ("sysfs: Fix internal_create_group() for named group updates") from the driver-core tree. I fixed it up (I think - 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. -- Cheers, Stephen Rothwell diff --cc fs/sysfs/group.c index c7a716c4acc9,38240410f831.. --- a/fs/sysfs/group.c +++ b/fs/sysfs/group.c @@@ -122,15 -118,23 +122,24 @@@ static int internal_create_group(struc kobj->name, grp->name ?: ""); return -EINVAL; } + kobject_get_ownership(kobj, &uid, &gid); if (grp->name) { - kn = kernfs_create_dir_ns(kobj->sd, grp->name, - S_IRWXU | S_IRUGO | S_IXUGO, - uid, gid, kobj, NULL); - if (IS_ERR(kn)) { - if (PTR_ERR(kn) == -EEXIST) - sysfs_warn_dup(kobj->sd, grp->name); - return PTR_ERR(kn); + if (update) { + kn = kernfs_find_and_get(kobj->sd, grp->name); + if (!kn) { + pr_warn("Can't update unknown attr grp name: %s/%s\n", + kobj->name, grp->name); + return -EINVAL; + } + } else { - kn = kernfs_create_dir(kobj->sd, grp->name, - S_IRWXU | S_IRUGO | S_IXUGO, - kobj); ++ kn = kernfs_create_dir_ns(kobj->sd, grp->name, ++S_IRWXU | S_IRUGO | S_IXUGO, ++uid, gid, kobj, NULL); + if (IS_ERR(kn)) { + if (PTR_ERR(kn) == -EEXIST) + sysfs_warn_dup(kobj->sd, grp->name); + return PTR_ERR(kn); + } } } else kn = kobj->sd;
[GIT PULL] Driver core patches for 4.19-rc1
The following changes since commit acb1872577b346bd15ab3a3f8dff780d6cca4b70: Linux 4.18-rc7 (2018-07-29 14:44:52 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git tags/driver-core-4.19-rc1 for you to fetch changes up to d2fc88a61b4ea99f574bde16e92718e22f312136: Merge 4.18-rc7 into driver-core-next (2018-07-30 10:08:09 +0200) Driver core patches for 4.19-rc1 Here are all of the driver core and related patches for 4.19-rc1. ZNothing huge here, just a number of small cleanups and the ability to now stop the deferred probing after init happens. All of these have been in linux-next for a while with only a merge issue reported. That merge issue is in fs/sysfs/group.c and Stephen has posted the diff of what it should be to resolve this. I'll follow up with that diff to this pull request. Signed-off-by: Greg Kroah-Hartman Benjamin Gaignard (1): base: core: Remove WARN_ON from link dependencies check Benjamin Herrenschmidt (1): drivers: core: Remove glue dirs from sysfs earlier Greg Kroah-Hartman (1): Merge 4.18-rc7 into driver-core-next Guenter Roeck (2): kernfs: Replace strncpy with memcpy kobject: Replace strncpy with memcpy Javier Martinez Canillas (1): driver core: add a debugfs entry to show deferred devices Joe Perches (1): device: Add #define dev_fmt similar to #define pr_fmt Luis R. Rodriguez (1): Documentation: update firmware loader fallback reference Pingfan Liu (1): drivers/base: stop new probing during shutdown Rajat Jain (1): sysfs: Fix internal_create_group() for named group updates Randy Dunlap (2): linux/device.h: fix kernel-doc notation warning sysfs.h: fix non-kernel-doc comment Rob Herring (6): driver core: allow stopping deferred probe after init dt-bindings: pinctrl: add a 'pinctrl-use-default' property pinctrl: Support stopping deferred probe after initcalls iommu: Stop deferring probe at end of initcalls iommu: Remove IOMMU_OF_DECLARE PM / Domains: Stop deferring probe at the end of initcall Shaokun Zhang (1): driver core: remove unnecessary function extern declare Sudeep Holla (1): drivers: base: cacheinfo: use OF property_read_u32 instead of get_property,read_number Todd Poynor (1): drivers: base: initcall_debug logs for driver probe times Wesley W. Terpstra (1): base: fix order of OF initialization Documentation/admin-guide/kernel-parameters.txt| 9 ++ .../bindings/pinctrl/pinctrl-bindings.txt | 6 + .../driver-api/firmware/fallback-mechanisms.rst| 7 +- drivers/base/base.h| 2 - drivers/base/cacheinfo.c | 24 ++-- drivers/base/core.c| 23 ++-- drivers/base/dd.c | 134 + drivers/base/init.c| 2 +- drivers/base/power/domain.c| 2 +- drivers/iommu/arm-smmu-v3.c| 2 - drivers/iommu/arm-smmu.c | 7 -- drivers/iommu/exynos-iommu.c | 2 - drivers/iommu/ipmmu-vmsa.c | 3 - drivers/iommu/msm_iommu.c | 2 - drivers/iommu/of_iommu.c | 21 +--- drivers/iommu/qcom_iommu.c | 2 - drivers/iommu/rockchip-iommu.c | 2 - drivers/pinctrl/devicetree.c | 15 ++- fs/kernfs/symlink.c| 2 +- fs/sysfs/group.c | 29 +++-- include/asm-generic/vmlinux.lds.h | 2 - include/linux/device.h | 107 +--- include/linux/kobject.h| 17 +++ include/linux/of_iommu.h | 4 - include/linux/sysfs.h | 6 +- lib/kobject.c | 2 +- 26 files changed, 273 insertions(+), 161 deletions(-)