On Mon, Aug 11, 2014 at 9:30 PM, Chris Murphy <li...@colorremedies.com> wrote: > > On Aug 11, 2014, at 10:41 AM, li...@colorremedies.com wrote: >>>> >>>> https://friendpaste.com/Bgwdjk31P3pZHtArr341G >>> OK that friendpaste is completely different than the [PATCH v4] email. >>> # from above URL >>> diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c >>> index 6528aa6..95891c0 100644 > > > I can confirm that the above patch fixes the reported bug. > > I couldn't get this one to apply so it's not tested: > http://www.spinics.net/lists/linux-btrfs/msg36556.html
It's exactly the same as the diff you tried. The "git am" command is able to deal with any fuzz while the patch command can't (or not always at least). That patch is based on the integration branch, while the diff I pasted (and showed you to generate it) is for the v3.16 tag from linus' repository. Thanks for testing and reporting back. > > > Chris Murphy -- Filipe David Manana, "Reasonable men adapt themselves to the world. Unreasonable men adapt the world to themselves. That's why all progress depends on unreasonable men." -- 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
