From: David Sterba <dsterba@suse.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Sterba <dsterba@suse.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the btrfs tree
Date: Tue, 8 Nov 2022 12:21:02 +0100 [thread overview]
Message-ID: <20221108112102.GX5824@suse.cz> (raw)
In-Reply-To: <20221108094229.1b530fec@canb.auug.org.au>
On Tue, Nov 08, 2022 at 09:42:29AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the btrfs tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> ld: fs/btrfs/messages.o:(.opd+0x90): multiple definition of `abort_should_print_stack'; fs/btrfs/ctree.o:(.opd+0x270): first defined here
> ld: fs/btrfs/messages.o: in function `.abort_should_print_stack':
> messages.c:(.text.unlikely+0x55c): multiple definition of `.abort_should_print_stack'; fs/btrfs/ctree.o:ctree.c:(.text.unlikely+0x0): first defined here
>
> Caused by commit
>
> 8bb808c6ad91 ("btrfs: don't print stack trace when transaction is aborted due to ENOMEM")
>
> from the btrfs-fixes tree interacting with commit
>
> c6f1e8101ccc ("btrfs: don't print stack trace when transaction is aborted due to ENOMEM")
>
> from the btrfs tree.
>
> I applied the following merge fix for today.
Thanks. We have development branch that moved a lot of code and fixes to
mainline are in different files. Locally I see that for-next builds fine
because the next-fixes is not merged to it but the linux-next tree
merges both. I'll do more build checks, sorry for inconvenience.
next prev parent reply other threads:[~2022-11-08 11:21 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-07 22:42 linux-next: build failure after merge of the btrfs tree Stephen Rothwell
2022-11-08 11:21 ` David Sterba [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-12 23:36 Stephen Rothwell
2023-01-13 10:59 ` David Sterba
2022-09-06 19:44 Stephen Rothwell
2022-08-21 23:44 Stephen Rothwell
2021-10-27 10:09 Stephen Rothwell
2021-10-29 8:28 ` Stephen Rothwell
2021-10-29 9:52 ` David Sterba
2021-10-29 10:50 ` David Sterba
[not found] ` <CAHp75VdXJEuY86pFC+bLoGbAYuGsA+KqEV-g4Dca25HHD-njHA@mail.gmail.com>
2021-10-29 12:14 ` David Sterba
2021-10-31 4:30 ` Stephen Rothwell
2021-10-08 4:03 Stephen Rothwell
2021-10-08 5:56 ` Qu Wenruo
2020-04-21 0:25 Stephen Rothwell
2020-04-21 0:40 ` Qu Wenruo
2020-04-21 1:13 ` Stephen Rothwell
2020-04-21 1:33 ` Qu Wenruo
2020-04-21 1:55 ` Stephen Rothwell
2020-04-22 21:29 ` David Sterba
2020-04-24 5:17 ` Qu Wenruo
2020-02-19 22:23 Stephen Rothwell
2020-02-21 11:30 ` David Sterba
2020-02-21 11:33 ` David Sterba
2015-08-21 0:42 Stephen Rothwell
2012-12-16 23:00 Stephen Rothwell
2012-12-17 0:15 ` Chris Mason
2012-12-17 2:52 ` Chris Mason
2012-12-17 3:13 ` Stephen Rothwell
2012-12-17 3:38 ` Chris Mason
2012-12-17 2:01 ` Chris Mason
2012-10-01 4:22 Stephen Rothwell
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=20221108112102.GX5824@suse.cz \
--to=dsterba@suse.cz \
--cc=dsterba@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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.