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

Reply via email to