All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Marcin Mirosław" <marcin@mejor.pl>
To: Kent Overstreet <kent.overstreet@gmail.com>
Cc: linux-bcache@vger.kernel.org
Subject: Re: Compilation error: ERROR: "pagecache_add_put" [drivers/md/bcache/bcache.ko] undefined!
Date: Wed, 30 Mar 2016 09:56:30 +0200	[thread overview]
Message-ID: <56FB86AE.4090300@mejor.pl> (raw)
In-Reply-To: <20160329210139.GA8239@kmo-pixel>

W dniu 29.03.2016 o 23:01, Kent Overstreet pisze:
> On Tue, Mar 29, 2016 at 04:12:12PM +0200, Marcin Mirosław wrote:
>> Hi again!
>> Since commit 53b6273b131a864947a2c55a18c07e86487e0a87 I'm getting errors:
>> Kernel: arch/x86/boot/bzImage is ready  (#6)
>>   Building modules, stage 2.
>>   MODPOST 538 modules
>> ERROR: "pagecache_add_put" [drivers/md/bcache/bcache.ko] undefined!
> 
> Thanks, fixed.
> 
> Also pushed another small patch for the memory allocation failure in the lz4
> code - it ought to work reliably in practice now.

I didn't expect such fast fix for lz4:)
BTW, I'd like to ask how should I update my working tree via git. I run
git pull in tree to fetch your fix and (again) I got conflict:
git pull
remote: Counting objects: 251, done.
remote: Compressing objects: 100% (52/52), done.
remote: Total 251 (delta 219), reused 231 (delta 199)
Receiving objects: 100% (251/251), 36.73 KiB | 0 bytes/s, done.
Resolving deltas: 100% (219/219), completed with 63 local objects.
From https://evilpiepirate.org/git/linux-bcache
 + 800353d...97951d0 bcache-dev -> origin/bcache-dev  (forced update)
 + ad59dfd...eda3e8b bcache-dev-wip -> origin/bcache-dev-wip  (forced
update)
Auto-merging mm/filemap.c
CONFLICT (content): Merge conflict in mm/filemap.c
Auto-merging drivers/md/bcache/fs-io.c
CONFLICT (content): Merge conflict in drivers/md/bcache/fs-io.c
Auto-merging drivers/md/bcache/extents.h
CONFLICT (content): Merge conflict in drivers/md/bcache/extents.h
Automatic merge failed; fix conflicts and then commit the result.


How I should update bcache git tree?
Marcin

  reply	other threads:[~2016-03-30  8:02 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-29 14:12 Compilation error: ERROR: "pagecache_add_put" [drivers/md/bcache/bcache.ko] undefined! Marcin Mirosław
2016-03-29 21:01 ` Kent Overstreet
2016-03-30  7:56   ` Marcin Mirosław [this message]
2016-03-30  8:20     ` Kent Overstreet
2016-03-30  9:38       ` Marcin Mirosław
2016-03-30 10:14         ` Kent Overstreet
2016-03-30 13:09           ` Marcin Mirosław

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=56FB86AE.4090300@mejor.pl \
    --to=marcin@mejor.pl \
    --cc=kent.overstreet@gmail.com \
    --cc=linux-bcache@vger.kernel.org \
    /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.