From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Sterba <dsterba@suse.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: build failure after merge of the btrfs-kdave tree
Date: Tue, 2 Feb 2016 10:39:04 +1100 [thread overview]
Message-ID: <20160202103904.4cb77c87@canb.auug.org.au> (raw)
Hi David,
After merging the btrfs-kdave tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
fs/btrfs/reada.c:326:29: error: invalid storage class for function 'reada_find_extent'
static struct reada_extent *reada_find_extent(struct btrfs_root *root,
^
and lots of others.
Caused by commit:
cbf8f71bc8d5 ("Merge branch 'for-next-4.6-20160201' into for-next-20160201")
The following patches appear on bothe sides of the merge and there are
following changes in the for-next-4.6-20160201. The merge resolution
is just very bad (I don't know if git did that automatically or not)
and would have shown up if it was build tested.
4c22a2ccc220 btrfs: reada: bypass adding extent when all zones failed
d34d58265213 btrfs: reada: add all reachable mirrors into reada device list
2aafd08e648c btrfs: reada: Avoid many times of empty loop
dc9529f670fd btrfs: reada: Add missed segment checking in reada_find_zone
9f2c3244dcf1 btrfs: reada: Fix in-segment calculation for reada
e47319f6119c btrfs: reada: bypass adding extent when all zones failed
440f28b7523a btrfs: reada: add all reachable mirrors into reada device list
14a5db53a0fc btrfs: reada: Avoid many times of empty loop
730af4ef7c49 btrfs: reada: Add missed segment checking in reada_find_zone
a38b691f5d07 btrfs: reada: Fix in-segment calculation for reada
Please fix this up.
I have used the btrfs-kdave tree from next-20160201 for today.
--
Cheers,
Stephen Rothwell
next reply other threads:[~2016-02-01 23:39 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-01 23:39 Stephen Rothwell [this message]
2016-02-02 8:54 ` linux-next: build failure after merge of the btrfs-kdave tree David Sterba
2016-09-07 1:22 Stephen Rothwell
2016-09-09 11:11 ` David Sterba
2018-02-08 23:40 Stephen Rothwell
2018-02-08 23:48 ` David Sterba
2018-02-09 0:27 ` Stephen Rothwell
2018-06-26 22:59 Stephen Rothwell
2018-06-28 16:11 ` David Sterba
2018-06-28 23:58 ` Stephen Rothwell
2018-06-29 11:19 ` 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=20160202103904.4cb77c87@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dsterba@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@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 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).