On Sat, Aug 03, 2013 at 07:39:01AM -0400, Mike Audia wrote: > > > Another newbie question is which version of the kernel do I need to > > > have in order to cleanly apply this patch? I am finding that it fails > > > to apply to the current stable kernel code (as of now it is v3.10.4) > > > which makes me think your patch has to be applied to a newer one? Are > > > you patching against the linux git tree meaning I have to use the 3.11 > > > series to try your code? > > > > Try Josef's btrfs-next repo: > > > > > > https://btrfs.wiki.kernel.org/index.php/Btrfs_source_repositories#Integration_repository_.28btrfs-next.29 > > OK! I can patch successfully into that git repo: > > % cd /tmp/work > % git clone git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next.git > % cd btrfs > % patch -Np1 -i btrfs_add_mount_option_to_set_commit_interval.patch > patching file fs/btrfs/ctree.h > patching file fs/btrfs/disk-io.c > patching file fs/btrfs/super.c > Hunk #3 succeeded at 647 (offset 19 lines). > Hunk #4 succeeded at 1006 with fuzz 1 (offset 39 lines).
> If I am not mistaken, btrfs-next is the entire kernel's code? The > wiki suggests running anything compiled therein from the build dir. That'll be for the userspace tools, not the kernel. Obviously, one doesn't tend to run kernels from the command line. :) > If I want to compile this into the official 3.10.4 tree, how can I > do it? Add the "official" kernel repo as a remote to the same git repo (with git remote add), fetch that repo, create a new branch to work in, based on the btrfs-next branch, then merge in the other branch (or vice-versa). Note that btrfs-next is usually based on the latest released kernel anyway, so that's likely to be largely superfluous. Hugo. -- === Hugo Mills: hugo@... carfax.org.uk | darksatanic.net | lug.org.uk === PGP key: 65E74AC0 from wwwkeys.eu.pgp.net or http://www.carfax.org.uk --- A gentleman doesn't do damage unless he's paid for it. ---
signature.asc
Description: Digital signature
