linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Mike Audia" <mikey_a@gmx.com>
To: "Hugo Mills" <hugo@carfax.org.uk>
Cc: linux-btrfs@vger.kernel.org, "David Sterba" <dsterba@suse.cz>,
	sbehrens@giantdisaster.de
Subject: Re: [PATCH v2] btrfs: add mount option to set commit interval
Date: Mon, 05 Aug 2013 08:02:58 -0400	[thread overview]
Message-ID: <20130805120258.96400@gmx.com> (raw)
In-Reply-To: <20130803115708.GA22967@carfax.org.uk>

>  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.

Thank you for the reply.  I am afraid what you've outlined is beyond my abilities.  I guess the patch is built against something newer than 3.10.5 which was just released yesterday since I get the similar rejection when patching into it:

patching file fs/btrfs/ctree.h
Hunk #1 succeeded at 1338 (offset -12 lines).
Hunk #2 succeeded at 1929 (offset -40 lines).
patching file fs/btrfs/disk-io.c
Hunk #1 succeeded at 1713 (offset -24 lines).
Hunk #2 FAILED at 1749.
Hunk #3 succeeded at 2172 with fuzz 1 (offset -17 lines).
1 out of 3 hunks FAILED -- saving rejects to file fs/btrfs/disk-io.c.rej
patching file fs/btrfs/super.c
Hunk #1 succeeded at 319 (offset -2 lines).
Hunk #2 succeeded at 360 (offset -2 lines).
Hunk #3 succeeded at 626 (offset -2 lines).
Hunk #4 succeeded at 968 (offset 1 line).

Is is safe for me to manually fix that particular hunk?


  reply	other threads:[~2013-08-05 12:02 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-03 11:39 [PATCH v2] btrfs: add mount option to set commit interval Mike Audia
2013-08-03 11:57 ` Hugo Mills
2013-08-05 12:02   ` Mike Audia [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-08-02 21:25 Mike Audia
2013-08-02 21:46 ` Zach Brown
2013-08-02 21:12 Mike Audia
2013-08-05 18:33 ` David Sterba
2013-08-01 15:42 [PATCH] " David Sterba
2013-08-01 16:14 ` [PATCH v2] " David Sterba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130805120258.96400@gmx.com \
    --to=mikey_a@gmx.com \
    --cc=dsterba@suse.cz \
    --cc=hugo@carfax.org.uk \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=sbehrens@giantdisaster.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).