Re: linux-next: manual merge of the net-next tree with the powerpc tree
Hi all,
On Fri, 18 Aug 2023 11:17:07 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/ethernet/freescale/fs_enet/fs_enet.h
>
> between commit:
>
> 60bc069c433f ("powerpc/include: Remove unneeded #include ")
>
> from the powerpc tree and commit:
>
> 7a76918371fe ("net: fs_enet: Move struct fs_platform_info into fs_enet.h")
>
> from the net-next 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/net/ethernet/freescale/fs_enet/fs_enet.h
> index aad96cb2ab4e,d371072fff60..
> --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
> +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
> @@@ -9,8 -10,8 +10,6 @@@
> #include
> #include
>
> - #include
> -#include
> --
> #ifdef CONFIG_CPM1
> #include
> #endif
This is now a conflict between the powerpc tree and Linus' tree.
--
Cheers,
Stephen Rothwell
pgpwiOAE1zrjd.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the net-next tree with the powerpc tree
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/freescale/fs_enet/fs_enet.h
between commit:
60bc069c433f ("powerpc/include: Remove unneeded #include ")
from the powerpc tree and commit:
7a76918371fe ("net: fs_enet: Move struct fs_platform_info into fs_enet.h")
from the net-next 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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/ethernet/freescale/fs_enet/fs_enet.h
index aad96cb2ab4e,d371072fff60..
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
@@@ -9,8 -10,8 +10,6 @@@
#include
#include
- #include
-#include
--
#ifdef CONFIG_CPM1
#include
#endif
pgppCvUj6WIuj.pgp
Description: OpenPGP digital signature
Re: linux-next: manual merge of the net-next tree with the powerpc tree
Hi all,
On Fri, 6 Mar 2020 10:21:58 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> fs/sysfs/group.c
>
> between commit:
>
> 9255782f7061 ("sysfs: Wrap __compat_only_sysfs_link_entry_to_kobj function
> to change the symlink name")
>
> from the powerpc tree and commit:
>
> 303a42769c4c ("sysfs: add sysfs_group{s}_change_owner()")
>
> from the net-next 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc fs/sysfs/group.c
> index 1e2a096057bc,5afe0e7ff7cd..
> --- a/fs/sysfs/group.c
> +++ b/fs/sysfs/group.c
> @@@ -478,4 -457,118 +479,118 @@@ int compat_only_sysfs_link_entry_to_kob
> kernfs_put(target);
> return PTR_ERR_OR_ZERO(link);
> }
> -EXPORT_SYMBOL_GPL(__compat_only_sysfs_link_entry_to_kobj);
> +EXPORT_SYMBOL_GPL(compat_only_sysfs_link_entry_to_kobj);
> +
> + static int sysfs_group_attrs_change_owner(struct kernfs_node *grp_kn,
> + const struct attribute_group *grp,
> + struct iattr *newattrs)
> + {
> + struct kernfs_node *kn;
> + int error;
> +
> + if (grp->attrs) {
> + struct attribute *const *attr;
> +
> + for (attr = grp->attrs; *attr; attr++) {
> + kn = kernfs_find_and_get(grp_kn, (*attr)->name);
> + if (!kn)
> + return -ENOENT;
> +
> + error = kernfs_setattr(kn, newattrs);
> + kernfs_put(kn);
> + if (error)
> + return error;
> + }
> + }
> +
> + if (grp->bin_attrs) {
> + struct bin_attribute *const *bin_attr;
> +
> + for (bin_attr = grp->bin_attrs; *bin_attr; bin_attr++) {
> + kn = kernfs_find_and_get(grp_kn,
> (*bin_attr)->attr.name);
> + if (!kn)
> + return -ENOENT;
> +
> + error = kernfs_setattr(kn, newattrs);
> + kernfs_put(kn);
> + if (error)
> + return error;
> + }
> + }
> +
> + return 0;
> + }
> +
> + /**
> + * sysfs_group_change_owner - change owner of an attribute group.
> + * @kobj: The kobject containing the group.
> + * @grp:The attribute group.
> + * @kuid: new owner's kuid
> + * @kgid: new owner's kgid
> + *
> + * Returns 0 on success or error code on failure.
> + */
> + int sysfs_group_change_owner(struct kobject *kobj,
> + const struct attribute_group *grp, kuid_t kuid,
> + kgid_t kgid)
> + {
> + struct kernfs_node *grp_kn;
> + int error;
> + struct iattr newattrs = {
> + .ia_valid = ATTR_UID | ATTR_GID,
> + .ia_uid = kuid,
> + .ia_gid = kgid,
> + };
> +
> + if (!kobj->state_in_sysfs)
> + return -EINVAL;
> +
> + if (grp->name) {
> + grp_kn = kernfs_find_and_get(kobj->sd, grp->name);
> + } else {
> + kernfs_get(kobj->sd);
> + grp_kn = kobj->sd;
> + }
> + if (!grp_kn)
> + return -ENOENT;
> +
> + error = kernfs_setattr(grp_kn, );
> + if (!error)
> + error = sysfs_group_attrs_change_owner(grp_kn, grp, );
> +
> + kernfs_put(grp_kn);
> +
> + return error;
> + }
> + EXPORT_SYMBOL_GPL(sysfs_group_change_owner);
> +
> + /**
> + * sysfs_groups_change_owner - change owner of a set of attribute groups.
> + * @kobj: The kobject containing the groups.
> + * @groups: The attribute groups.
> + * @kuid: new owner's kuid
> + * @kgid: new owner's kgid
> + *
> + * Returns 0 on success or error code on failure.
> + */
> + int sysfs_groups_change_owner(struct kobject *kobj,
> + const struct attribute_group **groups,
> + kuid_t kuid, kgid_t kgid)
> + {
> + int error = 0, i;
> +
> + if (!kobj->state_in_sysfs)
> + return -EINVAL;
> +
> + if (!groups)
> + return 0;
> +
> + for (i = 0; groups[i]; i++) {
> + error = sysfs_group_change_owner(kobj, groups[i], kuid, kgid);
> + if (error)
> + break;
> + }
> +
> + return error;
> + }
> + EXPORT_SYMBOL_GPL(sysfs_groups_change_owner);
This is now a conflict between the powerpc tree and Linus' tree.
--
Cheers,
Stephen Rothwell
pgpbZM_67Wxtq.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the net-next tree with the powerpc tree
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
fs/sysfs/group.c
between commit:
9255782f7061 ("sysfs: Wrap __compat_only_sysfs_link_entry_to_kobj function to
change the symlink name")
from the powerpc tree and commit:
303a42769c4c ("sysfs: add sysfs_group{s}_change_owner()")
from the net-next 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.
--
Cheers,
Stephen Rothwell
diff --cc fs/sysfs/group.c
index 1e2a096057bc,5afe0e7ff7cd..
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@@ -478,4 -457,118 +479,118 @@@ int compat_only_sysfs_link_entry_to_kob
kernfs_put(target);
return PTR_ERR_OR_ZERO(link);
}
-EXPORT_SYMBOL_GPL(__compat_only_sysfs_link_entry_to_kobj);
+EXPORT_SYMBOL_GPL(compat_only_sysfs_link_entry_to_kobj);
+
+ static int sysfs_group_attrs_change_owner(struct kernfs_node *grp_kn,
+ const struct attribute_group *grp,
+ struct iattr *newattrs)
+ {
+ struct kernfs_node *kn;
+ int error;
+
+ if (grp->attrs) {
+ struct attribute *const *attr;
+
+ for (attr = grp->attrs; *attr; attr++) {
+ kn = kernfs_find_and_get(grp_kn, (*attr)->name);
+ if (!kn)
+ return -ENOENT;
+
+ error = kernfs_setattr(kn, newattrs);
+ kernfs_put(kn);
+ if (error)
+ return error;
+ }
+ }
+
+ if (grp->bin_attrs) {
+ struct bin_attribute *const *bin_attr;
+
+ for (bin_attr = grp->bin_attrs; *bin_attr; bin_attr++) {
+ kn = kernfs_find_and_get(grp_kn,
(*bin_attr)->attr.name);
+ if (!kn)
+ return -ENOENT;
+
+ error = kernfs_setattr(kn, newattrs);
+ kernfs_put(kn);
+ if (error)
+ return error;
+ }
+ }
+
+ return 0;
+ }
+
+ /**
+ * sysfs_group_change_owner - change owner of an attribute group.
+ * @kobj: The kobject containing the group.
+ * @grp: The attribute group.
+ * @kuid: new owner's kuid
+ * @kgid: new owner's kgid
+ *
+ * Returns 0 on success or error code on failure.
+ */
+ int sysfs_group_change_owner(struct kobject *kobj,
+const struct attribute_group *grp, kuid_t kuid,
+kgid_t kgid)
+ {
+ struct kernfs_node *grp_kn;
+ int error;
+ struct iattr newattrs = {
+ .ia_valid = ATTR_UID | ATTR_GID,
+ .ia_uid = kuid,
+ .ia_gid = kgid,
+ };
+
+ if (!kobj->state_in_sysfs)
+ return -EINVAL;
+
+ if (grp->name) {
+ grp_kn = kernfs_find_and_get(kobj->sd, grp->name);
+ } else {
+ kernfs_get(kobj->sd);
+ grp_kn = kobj->sd;
+ }
+ if (!grp_kn)
+ return -ENOENT;
+
+ error = kernfs_setattr(grp_kn, );
+ if (!error)
+ error = sysfs_group_attrs_change_owner(grp_kn, grp, );
+
+ kernfs_put(grp_kn);
+
+ return error;
+ }
+ EXPORT_SYMBOL_GPL(sysfs_group_change_owner);
+
+ /**
+ * sysfs_groups_change_owner - change owner of a set of attribute groups.
+ * @kobj: The kobject containing the groups.
+ * @groups: The attribute groups.
+ * @kuid: new owner's kuid
+ * @kgid: new owner's kgid
+ *
+ * Returns 0 on success or error code on failure.
+ */
+ int sysfs_groups_change_owner(struct kobject *kobj,
+ const struct attribute_group **groups,
+ kuid_t kuid, kgid_t kgid)
+ {
+ int error = 0, i;
+
+ if (!kobj->state_in_sysfs)
+ return -EINVAL;
+
+ if (!groups)
+ return 0;
+
+ for (i = 0; groups[i]; i++) {
+ error = sysfs_group_change_owner(kobj, groups[i], kuid, kgid);
+ if (error)
+ break;
+ }
+
+ return error;
+ }
+ EXPORT_SYMBOL_GPL(sysfs_groups_change_owner);
pgpGyk52FBWn2.pgp
Description: OpenPGP digital signature
Re: linux-next: manual merge of the net-next tree with the powerpc tree
From: Stephen Rothwell s...@canb.auug.org.au Date: Fri, 9 Mar 2012 17:44:16 +1100 On Thu, 08 Mar 2012 22:15:34 -0800 (PST) David Miller da...@davemloft.net wrote: From: Stephen Rothwell s...@canb.auug.org.au Date: Fri, 9 Mar 2012 13:36:46 +1100 Today's linux-next merge of the net-next tree got a conflict in drivers/net/ethernet/ibm/iseries_veth.c between commit e92a665949f6 (net: powerpc: remove the legacy iSeries ethernet driver) from the powerpc tree and commit 41de8d4cff21 (drivers/net: Remove alloc_etherdev error messages) from the net-next tree. I just removed the file. If it makes life easier for anyone I can put the driver removal patch into net-next. In this case, I think it will actually help, thanks. Note that it won;t apply cleanly to your tree, but the fixup is easy :-) And I discovered that git am doesn't like the style of patch I did (without the body of the deleted file). If you just delete drivers/net/ethernet/ibm/iseries_veth.c before trying to apply the patch it will probably work. I took care of this the other night. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
linux-next: manual merge of the net-next tree with the powerpc tree
Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/ethernet/ibm/iseries_veth.c between commit e92a665949f6 (net: powerpc: remove the legacy iSeries ethernet driver) from the powerpc tree and commit 41de8d4cff21 (drivers/net: Remove alloc_etherdev error messages) from the net-next tree. I just removed the file. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp4opEXHOkAL.pgp Description: PGP signature ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: linux-next: manual merge of the net-next tree with the powerpc tree
From: Stephen Rothwell s...@canb.auug.org.au Date: Fri, 9 Mar 2012 13:36:46 +1100 Today's linux-next merge of the net-next tree got a conflict in drivers/net/ethernet/ibm/iseries_veth.c between commit e92a665949f6 (net: powerpc: remove the legacy iSeries ethernet driver) from the powerpc tree and commit 41de8d4cff21 (drivers/net: Remove alloc_etherdev error messages) from the net-next tree. I just removed the file. If it makes life easier for anyone I can put the driver removal patch into net-next. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: linux-next: manual merge of the net-next tree with the powerpc tree
Hi Dave, On Thu, 08 Mar 2012 22:15:34 -0800 (PST) David Miller da...@davemloft.net wrote: From: Stephen Rothwell s...@canb.auug.org.au Date: Fri, 9 Mar 2012 13:36:46 +1100 Today's linux-next merge of the net-next tree got a conflict in drivers/net/ethernet/ibm/iseries_veth.c between commit e92a665949f6 (net: powerpc: remove the legacy iSeries ethernet driver) from the powerpc tree and commit 41de8d4cff21 (drivers/net: Remove alloc_etherdev error messages) from the net-next tree. I just removed the file. If it makes life easier for anyone I can put the driver removal patch into net-next. In this case, I think it will actually help, thanks. Note that it won;t apply cleanly to your tree, but the fixup is easy :-) And I discovered that git am doesn't like the style of patch I did (without the body of the deleted file). If you just delete drivers/net/ethernet/ibm/iseries_veth.c before trying to apply the patch it will probably work. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpj4cAvY3lGm.pgp Description: PGP signature ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
