Re: [PATCH 00/13] Btrfs-progs: more patches for integration (integration-20130121)
On 01/24/2013 01:13 PM, David Sterba wrote: On Tue, Jan 22, 2013 at 03:14:35PM -0500, Gene Czarcinski wrote: On 01/21/2013 01:40 PM, David Sterba wrote: On Sun, Jan 20, 2013 at 04:04:05PM -0500, Gene Czarcinski wrote: I have done some additional scraping of the mailing list to identify some "low hanging fruit" which I consider should be merged into the btrfs-progs repository. Thanks, I went through them and put together into an integration branch git://repo.or.cz/btrfs-progs-unstable/devel.git integration-20130121 There is a problem with one of the patches: detect if the disk we are formatting is a ssd The commit comments appear to come from the patch I submitted. However, as I said in the submission, the patch for mkfs.c has to be "refitted" because of a conflict. The conflict is a result of the patch: Fix compiler warnings on PPC64 which relocated the include "kerncompat.h" to a different line in the mkfs.c file. These merge conflicts are inevitable and normal (though sometimes not that trivial). My initial aim was to build one linear branch only with fixes and git-merge the patches that add features, but this will not be easy to merge for much longer, so I'm going to do a linear integration branch so others can take them as checkpoint to base the various patchsets. Yes, trying to merge branches with lots of changes are effectively impossible (impractical?) as far as I am concerned. Unless it is simple I I understand exactly what is happening, I have found it easier/better to apply a set of patches one at a time and resolve problems manually. I just got the subvol show patches applied. I tried putting it into a separate branch and then doing a merge but I could not trust my results when I ran mergetool. And, BTW they subvol show patches to apply with not very many problems. My working branch currently has 44 commits over 91d9eec and subvol show added another ten. Gene -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 00/13] Btrfs-progs: more patches for integration (integration-20130121)
On Tue, Jan 22, 2013 at 03:14:35PM -0500, Gene Czarcinski wrote: > On 01/21/2013 01:40 PM, David Sterba wrote: > >On Sun, Jan 20, 2013 at 04:04:05PM -0500, Gene Czarcinski wrote: > >>>I have done some additional scraping of the mailing list to > >>>identify some "low hanging fruit" which I consider should > >>>be merged into the btrfs-progs repository. > >Thanks, I went through them and put together into an integration branch > > > > git://repo.or.cz/btrfs-progs-unstable/devel.git integration-20130121 > There is a problem with one of the patches: > detect if the disk we are formatting is a ssd > > The commit comments appear to come from the patch I submitted. However, as I > said in the submission, the patch for mkfs.c has to be "refitted" because of > a conflict. The conflict is a result of the patch: > Fix compiler warnings on PPC64 > which relocated the include "kerncompat.h" to a different line in the mkfs.c > file. These merge conflicts are inevitable and normal (though sometimes not that trivial). My initial aim was to build one linear branch only with fixes and git-merge the patches that add features, but this will not be easy to merge for much longer, so I'm going to do a linear integration branch so others can take them as checkpoint to base the various patchsets. david -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 00/13] Btrfs-progs: more patches for integration (integration-20130121)
On 01/21/2013 01:40 PM, David Sterba wrote: On Sun, Jan 20, 2013 at 04:04:05PM -0500, Gene Czarcinski wrote: >I have done some additional scraping of the mailing list to >identify some "low hanging fruit" which I consider should >be merged into the btrfs-progs repository. Thanks, I went through them and put together into an integration branch git://repo.or.cz/btrfs-progs-unstable/devel.git integration-20130121 There is a problem with one of the patches: detect if the disk we are formatting is a ssd The commit comments appear to come from the patch I submitted. However, as I said in the submission, the patch for mkfs.c has to be "refitted" because of a conflict. The conflict is a result of the patch: Fix compiler warnings on PPC64 which relocated the include "kerncompat.h" to a different line in the mkfs.c file. It appears that you used the original patch. I noticed that you merged from a different branch and I suspect that that branch did not have the "Fix compiler warnings" patch applied first. I suggest you use the patch I submitted. Gene -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 00/13] Btrfs-progs: more patches for integration (integration-20130121)
Thanks. I am currently running with all of my submissions and everything is working. I will pull your integration branch and switch to that instead of 13 patch set so I can test them. This will be on top of the "original" two sets of patches. Gene On 01/21/2013 01:40 PM, David Sterba wrote: On Sun, Jan 20, 2013 at 04:04:05PM -0500, Gene Czarcinski wrote: I have done some additional scraping of the mailing list to identify some "low hanging fruit" which I consider should be merged into the btrfs-progs repository. Thanks, I went through them and put together into an integration branch git://repo.or.cz/btrfs-progs-unstable/devel.git integration-20130121 I've modified the signed-off-by lines when I knew who was the author or contributed to the patch. Please let me know if I've messed the credits and fame attribution. There are three more patches that I've picked from my distro patch queue (and were sent to the list long ago) they're placed at the top of the shortlog. Arne Jansen (1): Btrfs-progs: bugfix for scrubbing single devices Wang Sheng-Hui (1): btrfs-progs: add malloc check in transaction.h/btrfs_start_transaction Goffredo Baroncelli (1): Ignore the error ENXIO and ENOMEDIUM during a devs scan Arvin Schnell (1): btrfs-progs: initialize data before send ioctl Danny Kukawka (1): btrfs-progs: Handle errors returned from open_ctree Jan Schmidt (2): Btrfs-progs: correcting misnamed parameter options for btrfs send Btrfs-progs: bugfix for subvolume parent determination in btrfs send Josef Bacik (2): Btrfs-progs: detect if the disk we are formatting is a ssd Btrfs-progs: add btrfs device ready command Nirbheek Chauhan (1): Btrfs-progs: fix resolving of loop devices Stefan Behrens (1): btrfs-progs: Add btrfs-show-super Ulrik (1): Btrfs-progs: correct btrfs receive usage string Wang Shilong (3): Btrfs-progs: fix arg parsing for btrfs qgroup limit commands Btrfs-progs: clean up reduplicate parse_qgroupid() and replace atoi with strtoull Btrfs-progs: check the relation of two group by real level numbers david -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Fwd: [PATCH 00/13] Btrfs-progs: more patches for integration (integration-20130121)
Hello, We are team of 5 students, interns at Green turtles technologies, interested in contributing to btrfs. Any space for contribution for btrfs testing ? we will be updating pogress twice in a week. Need suggestions on how to proceed. On Tue, Jan 22, 2013 at 12:10 AM, David Sterba wrote: > On Sun, Jan 20, 2013 at 04:04:05PM -0500, Gene Czarcinski wrote: >> I have done some additional scraping of the mailing list to >> identify some "low hanging fruit" which I consider should >> be merged into the btrfs-progs repository. > > Thanks, I went through them and put together into an integration branch > > git://repo.or.cz/btrfs-progs-unstable/devel.git integration-20130121 > > I've modified the signed-off-by lines when I knew who was the author or > contributed to the patch. Please let me know if I've messed the credits > and fame attribution. > > There are three more patches that I've picked from my distro patch queue (and > were sent to the list long ago) they're placed at the top of the shortlog. > > Arne Jansen (1): > Btrfs-progs: bugfix for scrubbing single devices > > Wang Sheng-Hui (1): > btrfs-progs: add malloc check in transaction.h/btrfs_start_transaction > > Goffredo Baroncelli (1): > Ignore the error ENXIO and ENOMEDIUM during a devs scan > > Arvin Schnell (1): > btrfs-progs: initialize data before send ioctl > > Danny Kukawka (1): > btrfs-progs: Handle errors returned from open_ctree > > Jan Schmidt (2): > Btrfs-progs: correcting misnamed parameter options for btrfs send > Btrfs-progs: bugfix for subvolume parent determination in btrfs send > > Josef Bacik (2): > Btrfs-progs: detect if the disk we are formatting is a ssd > Btrfs-progs: add btrfs device ready command > > Nirbheek Chauhan (1): > Btrfs-progs: fix resolving of loop devices > > Stefan Behrens (1): > btrfs-progs: Add btrfs-show-super > > Ulrik (1): > Btrfs-progs: correct btrfs receive usage string > > Wang Shilong (3): > Btrfs-progs: fix arg parsing for btrfs qgroup limit commands > Btrfs-progs: clean up reduplicate parse_qgroupid() and replace atoi > with strtoull > Btrfs-progs: check the relation of two group by real level numbers > > david > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Praneeth U 9448804728 -- Praneeth U 9448804728 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 00/13] Btrfs-progs: more patches for integration (integration-20130121)
On Sun, Jan 20, 2013 at 04:04:05PM -0500, Gene Czarcinski wrote: > I have done some additional scraping of the mailing list to > identify some "low hanging fruit" which I consider should > be merged into the btrfs-progs repository. Thanks, I went through them and put together into an integration branch git://repo.or.cz/btrfs-progs-unstable/devel.git integration-20130121 I've modified the signed-off-by lines when I knew who was the author or contributed to the patch. Please let me know if I've messed the credits and fame attribution. There are three more patches that I've picked from my distro patch queue (and were sent to the list long ago) they're placed at the top of the shortlog. Arne Jansen (1): Btrfs-progs: bugfix for scrubbing single devices Wang Sheng-Hui (1): btrfs-progs: add malloc check in transaction.h/btrfs_start_transaction Goffredo Baroncelli (1): Ignore the error ENXIO and ENOMEDIUM during a devs scan Arvin Schnell (1): btrfs-progs: initialize data before send ioctl Danny Kukawka (1): btrfs-progs: Handle errors returned from open_ctree Jan Schmidt (2): Btrfs-progs: correcting misnamed parameter options for btrfs send Btrfs-progs: bugfix for subvolume parent determination in btrfs send Josef Bacik (2): Btrfs-progs: detect if the disk we are formatting is a ssd Btrfs-progs: add btrfs device ready command Nirbheek Chauhan (1): Btrfs-progs: fix resolving of loop devices Stefan Behrens (1): btrfs-progs: Add btrfs-show-super Ulrik (1): Btrfs-progs: correct btrfs receive usage string Wang Shilong (3): Btrfs-progs: fix arg parsing for btrfs qgroup limit commands Btrfs-progs: clean up reduplicate parse_qgroupid() and replace atoi with strtoull Btrfs-progs: check the relation of two group by real level numbers david -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 00/13] Btrfs-progs: more patches for integration
I have done some additional scraping of the mailing list to identify some "low hanging fruit" which I consider should be merged into the btrfs-progs repository. All of the patches below were applied on top of the 19 bugfix patches pulled together by David Sterba and the 6 patches now part of the Fedora 18 btrfs-progs package. All of this compiles but further testing is obviously needed. For the most part, these patches are bugfixes and they all appeared resonable but inspection by other eyes would be appreciated. There is also one "simple" function addition in the form or the btrfs-show-super command. Arvin Schnell (1): trivial patch for btrfs-progs Chen Yang (1): Btrfs-progs: Fix a segmentation fault in btrfstune when is invalid. Gene Czarcinski (1): btrfs-show-super.c Goffredo Baroncelli (1): Add btrfs-show-super Jan Schmidt (2): Btrfs-progs: correcting misnamed parameter options for btrfs send Btrfs-progs: bugfix for subvolume parent determination in btrfs send Nageswara R Sastry (1): btrfs-progs: btrfs-image.c: Added NULL pointer check. Nirbheek Chauhan (1): Btrfs-progs: fix resolving of loop devices Ulrik (1): Btrfs-progs: correct btrfs receive usage string Wang Shilong (4): Btrfs-progs: fix arg parsing for btrfs qgroup limit commands Btrfs-progs: clean up reduplicate parse_qgroupid() and replace atoi with strtoull Btrfs-progs: check the relation of two group by real level numbers Btrfs-progs: disable qgroupid 0 for quota_tree -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
