From: Jens Axboe <axboe@kernel.dk>
To: Eric Wheeler <bcache@lists.ewheeler.net>
Cc: Marc MERLIN <marc@merlins.org>,
linux-bcache@vger.kernel.org, Zhu Yanhai <zhu.yanhai@gmail.com>,
Kent Overstreet <kent.overstreet@gmail.com>,
Christoph Nelles <evilazrael@evilazrael.de>
Subject: Re: [PULL] bcache fixes for v4.5-rc6
Date: Wed, 2 Mar 2016 20:26:43 -0700 [thread overview]
Message-ID: <56D7AEF3.3040508@kernel.dk> (raw)
In-Reply-To: <alpine.LRH.2.11.1603021947130.3635@mail.ewheeler.net>
On 03/02/2016 07:09 PM, Eric Wheeler wrote:
> On Tue, 1 Mar 2016, Jens Axboe wrote:
>
>> On 02/29/2016 06:08 PM, Eric Wheeler wrote:
>>> Hi Jens,
>>>
>>> Can we still get these in for 4.5? One is a race, the other is just error
>>> handling.
>>>
>>> Please pull:
>>> git pull https://bitbucket.org/ewheelerinc/linux.git
>>> v4.5-rc6-bcache-fixes
>>>
>>> bcache: fix race of writeback thread starting before complete initialization
>>> bcache: cleaned up error handling around register_cache()
>>
>> They look simple enough, though I generally don't like collapsing things like
>> this:
>>
>> if ((ret = cache_alloc(sb, ca)) != 0)
>>
>> it's easy to screw up, doing
>>
>> ret = cache_alloc(sb, ca);
>> if (ret != 0)
>> ...
>
> Done. Rebased, fixed, and push --force'ed.
Cool, I will pull it in.
> BTW, Is there a better (preferred) way vs. push --force? Some say push
> --force can break things.
If you rebased, there's really no way around that, other than spinning a
new branch with the new changes. The rebase is what breaks things for
people, the --force is just a side effect since you have to do that to
push it to the same branch again. It's only really a concern if people
are continually pulling from you and developing on top of your branch,
for something like this, it's not a huge problem.
--
Jens Axboe
prev parent reply other threads:[~2016-03-03 3:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-01 1:08 [PULL] bcache fixes for v4.5-rc6 Eric Wheeler
2016-03-01 15:44 ` Jens Axboe
2016-03-03 2:09 ` Eric Wheeler
2016-03-03 3:26 ` Jens Axboe [this message]
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=56D7AEF3.3040508@kernel.dk \
--to=axboe@kernel.dk \
--cc=bcache@lists.ewheeler.net \
--cc=evilazrael@evilazrael.de \
--cc=kent.overstreet@gmail.com \
--cc=linux-bcache@vger.kernel.org \
--cc=marc@merlins.org \
--cc=zhu.yanhai@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.