On 2014-08-11 10:25, Chris Murphy wrote:
On Aug 11, 2014, at 10:04 AM, Filipe David Manana <fdmanana@xxxxxxxxx>
wrote:
On Mon, Aug 11, 2014 at 4:55 PM, Chris Murphy
<lists@xxxxxxxxxxxxxxxxx> wrote:
On Aug 11, 2014, at 2:46 AM, Filipe David Manana <fdmanana@xxxxxxxxx>
wrote:
On Mon, Aug 11, 2014 at 4:07 AM, Chris Murphy
<lists@xxxxxxxxxxxxxxxxx> wrote:
Can you try the following patch and confirm if it helps?
https://patchwork.kernel.org/patch/4705171/
This one applies without problems, I didn't build it because I saw
v4. The v4 patch I get:
+ patch -p1 -F1 -s
4 out of 4 hunks FAILED -- saving rejects to file
fs/btrfs/send.c.rej
Should v4 alone be applied over 3.16.0? Or each version in
succession?
Alone. How did you try to apply it to 3.16?
rpmbuild
https://fedoraproject.org/wiki/Building_a_custom_kernel
Gist is, save the patch, create patch filename entry into
kernel.spec, then run rpmbuild. rpmbuild uses 'patch -p1 -F1 -s' to
apply the patch. The v1 patch applies, as does Liu Bo's patch from
July 29 "Btrfs: fix regression of btrfs device replace" which I was
also going to test. But the v4 patch isn't applying.
Try "cd source_dir && git
am patchfile" if you didn't (e.g. you used patch command directly).
I'd kinda prefer to build an rpm since I need to test it on baremetal
for this bug, and a VM for the device replace bug.
Sorry, I don't know anything about fedora's way of kernel patching.
Either way, it seems the problem is simple to solve:
git clone
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
git checkout v3.16
git am /path/to/my_patch_file
git diff HEAD^..HEAD > /tmp/diff
The resulting patch file [1] /tmp/diff then applies cleanly with
"patch -p1 -F1 -s"
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
# from [PATCH v4] email
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 3c63b29..b29fc5c 100644
The lines numbers are all completely different also. I'll try the
patch from the above URL.
The above friendpaste URL patch has applied, and I'm now building.
Chris Murphy
--
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
