| Message ID | 20200203110012.5954-1-anand.jain@oracle.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | btrfs, sysfs cleanup and add dev_state | expand |
On Mon, Feb 03, 2020 at 07:00:08PM +0800, Anand Jain wrote: > Resend: > Patch 4/4 is already integrated without the cleanup and preparatory > patches (1,2,3)/4. So I am resending those 3 patches. And the changes > in patch 4/4 as in misc-next is imported into patch v5 4/4 here. Patch > 4/4 has the details of the changes. All the patches have been merged and now are in linus/master branch. I haven't reordered the patches so they're not in a group and the preparatory patches are about 10 commits above v5.5-rc7 which is the beginning of the branch.
On 2/4/20 1:16 AM, David Sterba wrote: > On Mon, Feb 03, 2020 at 07:00:08PM +0800, Anand Jain wrote: >> Resend: >> Patch 4/4 is already integrated without the cleanup and preparatory >> patches (1,2,3)/4. So I am resending those 3 patches. And the changes >> in patch 4/4 as in misc-next is imported into patch v5 4/4 here. Patch >> 4/4 has the details of the changes. > > All the patches have been merged and now are in linus/master branch. David, > I haven't reordered the patches so they're not in a group and the > preparatory patches are about 10 commits above v5.5-rc7 which is the > beginning of the branch. It will cause problem during bisect, without the preparatory patches the devid kobject lands under devices instead of under devinfo, that's how I noticed that preparatory patches are missing. Thanks, Anand
On Thu, Feb 06, 2020 at 02:31:02PM +0800, Anand Jain wrote: > > > On 2/4/20 1:16 AM, David Sterba wrote: > > On Mon, Feb 03, 2020 at 07:00:08PM +0800, Anand Jain wrote: > >> Resend: > >> Patch 4/4 is already integrated without the cleanup and preparatory > >> patches (1,2,3)/4. So I am resending those 3 patches. And the changes > >> in patch 4/4 as in misc-next is imported into patch v5 4/4 here. Patch > >> 4/4 has the details of the changes. > > > > All the patches have been merged and now are in linus/master branch. > > > David, > > > I haven't reordered the patches so they're not in a group and the > > preparatory patches are about 10 commits above v5.5-rc7 which is the > > beginning of the branch. > > > It will cause problem during bisect, without the preparatory patches > the devid kobject lands under devices instead of under devinfo, > that's how I noticed that preparatory patches are missing. I've tested current master and the device ids are indeed placed under device/ and there is no devinfo/, so this needs to be fixed. Preparatory patches I was referring to are: bc036bb33524 btrfs: sysfs, merge btrfs_sysfs_add devices_kobj and fsid be2cf92e0a2f btrfs: sysfs, rename btrfs_sysfs_add_device() c6761a9ed329 btrfs: sysfs, btrfs_sysfs_add_fsid() drop unused argument parent b5501504cb6a btrfs: sysfs, rename devices kobject holder to devices_kobj so I'll have another look at what you sent.
On 2/6/20 10:11 PM, David Sterba wrote: > On Thu, Feb 06, 2020 at 02:31:02PM +0800, Anand Jain wrote: >> >> >> On 2/4/20 1:16 AM, David Sterba wrote: >>> On Mon, Feb 03, 2020 at 07:00:08PM +0800, Anand Jain wrote: >>>> Resend: >>>> Patch 4/4 is already integrated without the cleanup and preparatory >>>> patches (1,2,3)/4. So I am resending those 3 patches. And the changes >>>> in patch 4/4 as in misc-next is imported into patch v5 4/4 here. Patch >>>> 4/4 has the details of the changes. >>> >>> All the patches have been merged and now are in linus/master branch. >> >> >> David, >> >>> I haven't reordered the patches so they're not in a group and the >>> preparatory patches are about 10 commits above v5.5-rc7 which is the >>> beginning of the branch. >> >> >> It will cause problem during bisect, without the preparatory patches >> the devid kobject lands under devices instead of under devinfo, >> that's how I noticed that preparatory patches are missing. > > I've tested current master and the device ids are indeed placed under > device/ and there is no devinfo/, so this needs to be fixed. > > Preparatory patches I was referring to are: > > bc036bb33524 btrfs: sysfs, merge btrfs_sysfs_add devices_kobj and fsid > be2cf92e0a2f btrfs: sysfs, rename btrfs_sysfs_add_device() > c6761a9ed329 btrfs: sysfs, btrfs_sysfs_add_fsid() drop unused argument parent > b5501504cb6a btrfs: sysfs, rename devices kobject holder to devices_kobj > > so I'll have another look at what you sent. > David, Busy? Can I ping on this? Those aren't the preparatory patches. The patches sent here applies nicely on misc-next with git revert 668e48af7a94 Thanks, Anand
On Tue, Feb 11, 2020 at 12:46:58PM +0800, Anand Jain wrote: > > I've tested current master and the device ids are indeed placed under > > device/ and there is no devinfo/, so this needs to be fixed. > > > > Preparatory patches I was referring to are: > > > > bc036bb33524 btrfs: sysfs, merge btrfs_sysfs_add devices_kobj and fsid > > be2cf92e0a2f btrfs: sysfs, rename btrfs_sysfs_add_device() > > c6761a9ed329 btrfs: sysfs, btrfs_sysfs_add_fsid() drop unused argument parent > > b5501504cb6a btrfs: sysfs, rename devices kobject holder to devices_kobj > > > > so I'll have another look at what you sent. > > > David, > > Busy? Can I ping on this? > > Those aren't the preparatory patches. The patches sent here applies > nicely on misc-next with git revert 668e48af7a94 Do you realize that patch 668e48af7a94 had been merged to linus/master at the time you sent the patchset a week ago? How can I do git revert? That was in the middle of merge window, 2 weeks after code freeze. If I don't merge a patch intentionally or by mistake, then you send me an incremental change. Please send update with this patch order: * "btrfs: sysfs, add UUID/devinfo kobject" * fixup of the device id files created under devices * the other cleanups
> * "btrfs: sysfs, add UUID/devinfo kobject" > * fixup of the device id files created under devices > * the other cleanups Done. Its here: https://patchwork.kernel.org/cover/11378051/