On 06/10/2012 10:46 AM, Chris Samuel wrote: > On Saturday 09 June 2012 16:24:19 Goffredo Baroncelli wrote: > >> This commit removes all the related code. > > This doesn't seem to apply cleanly with patch Did you pass the "-p1" switch to the patch command ? > (though git am > seems to apply it OK) to the git repo master from: > > git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git > > FYI patch complains thus: > > patching file INSTALL > patching file Makefile > patching file btrfs-show.c > patching file btrfs-vol.c > patching file btrfsctl.c > patching file Makefile > Hunk #1 FAILED at 6. > Hunk #2 FAILED at 17. > 2 out of 2 hunks FAILED -- saving rejects to file Makefile.rej > patching file btrfs-image.8.in > Hunk #1 FAILED at 31. > 1 out of 1 hunk FAILED -- saving rejects to file btrfs-image.8.in.rej > The next patch would delete the file btrfs-show.8.in, > which does not exist! Assume -R? [n] > Apply anyway? [n] > Skipping patch. > 1 out of 1 hunk ignored > patching file btrfsck.8.in > Hunk #1 FAILED at 14. > 1 out of 1 hunk FAILED -- saving rejects to file btrfsck.8.in.rej > The next patch would delete the file btrfsctl.8.in, > which does not exist! Assume -R? [n] > Apply anyway? [n] > Skipping patch. > 1 out of 1 hunk ignored > > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
