From: Randy Dunlap <rdunlap@infradead.org>
To: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
broonie@kernel.org, mhocko@suse.cz,
Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
linux-fsdevel@vger.kernel.org,
Linux Memory Management List <linux-mm@kvack.org>,
open list <linux-kernel@vger.kernel.org>,
mm-commits@vger.kernel.org, bpf <bpf@vger.kernel.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>
Subject: Re: mmotm 2021-04-11-20-47 uploaded (bpf: xsk.c)
Date: Tue, 13 Apr 2021 15:44:26 -0700 [thread overview]
Message-ID: <034959c7-c70f-4d1b-0fe2-dcc00075807f@infradead.org> (raw)
In-Reply-To: <CAEf4BzZBHUX=8=FYwq0bp6GFkOTxCbtiJN31SSoWCsMyh7_hMg@mail.gmail.com>
On 4/13/21 3:18 PM, Andrii Nakryiko wrote:
> On Mon, Apr 12, 2021 at 9:38 AM Randy Dunlap <rdunlap@infradead.org> wrote:
>>
>> On 4/11/21 8:48 PM, akpm@linux-foundation.org wrote:
>>> The mm-of-the-moment snapshot 2021-04-11-20-47 has been uploaded to
>>>
>>> https://www.ozlabs.org/~akpm/mmotm/
>>>
>>> mmotm-readme.txt says
>>>
>>> README for mm-of-the-moment:
>>>
>>> https://www.ozlabs.org/~akpm/mmotm/
>>>
>>> This is a snapshot of my -mm patch queue. Uploaded at random hopefully
>>> more than once a week.
>>>
>>> You will need quilt to apply these patches to the latest Linus release (5.x
>>> or 5.x-rcY). The series file is in broken-out.tar.gz and is duplicated in
>>> https://ozlabs.org/~akpm/mmotm/series
>>>
>>> The file broken-out.tar.gz contains two datestamp files: .DATE and
>>> .DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss,
>>> followed by the base kernel version against which this patch series is to
>>> be applied.
>>>
>>> This tree is partially included in linux-next. To see which patches are
>>> included in linux-next, consult the `series' file. Only the patches
>>> within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in
>>> linux-next.
>>>
>>>
>>> A full copy of the full kernel tree with the linux-next and mmotm patches
>>> already applied is available through git within an hour of the mmotm
>>> release. Individual mmotm releases are tagged. The master branch always
>>> points to the latest release, so it's constantly rebasing.
>>>
>>> https://github.com/hnaz/linux-mm
>>>
>>> The directory https://www.ozlabs.org/~akpm/mmots/ (mm-of-the-second)
>>> contains daily snapshots of the -mm tree. It is updated more frequently
>>> than mmotm, and is untested.
>>>
>>> A git copy of this tree is also available at
>>>
>>> https://github.com/hnaz/linux-mm
>>
>> on x86_64:
>>
>> xsk.c: In function ‘xsk_socket__create_shared’:
>> xsk.c:1027:7: error: redeclaration of ‘unmap’ with no linkage
>> bool unmap = umem->fill_save != fill;
>> ^~~~~
>> xsk.c:1020:7: note: previous declaration of ‘unmap’ was here
>> bool unmap, rx_setup_done = false, tx_setup_done = false;
>> ^~~~~
>> xsk.c:1028:7: error: redefinition of ‘rx_setup_done’
>> bool rx_setup_done = false, tx_setup_done = false;
>> ^~~~~~~~~~~~~
>> xsk.c:1020:14: note: previous definition of ‘rx_setup_done’ was here
>> bool unmap, rx_setup_done = false, tx_setup_done = false;
>> ^~~~~~~~~~~~~
>> xsk.c:1028:30: error: redefinition of ‘tx_setup_done’
>> bool rx_setup_done = false, tx_setup_done = false;
>> ^~~~~~~~~~~~~
>> xsk.c:1020:37: note: previous definition of ‘tx_setup_done’ was here
>> bool unmap, rx_setup_done = false, tx_setup_done = false;
>> ^~~~~~~~~~~~~
>>
>>
>> Full randconfig file is attached.
>
> What SHA are you on? I checked that github tree, the source code there
> doesn't correspond to the errors here (i.e., there is no unmap
> redefinition on lines 1020 and 1027). Could it be some local merge
> conflict?
Yes, it seems to have been a merge problem in mmotm 2021-04-11.
It is fixed/OK in today's mmotm 2021-04013.
thanks.
--
~Randy
next prev parent reply other threads:[~2021-04-13 22:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-12 3:48 mmotm 2021-04-11-20-47 uploaded akpm
2021-04-12 7:21 ` mmotm 2021-04-11-20-47 uploaded (fs/io_uring.c) Randy Dunlap
2021-04-12 12:39 ` Jens Axboe
2021-04-12 15:13 ` Randy Dunlap
2021-04-12 16:38 ` mmotm 2021-04-11-20-47 uploaded (bpf: xsk.c) Randy Dunlap
2021-04-13 22:18 ` Andrii Nakryiko
2021-04-13 22:44 ` Randy Dunlap [this message]
2021-04-12 17:27 ` mmotm 2021-04-11-20-47 uploaded (ni_routes_test.c) Randy Dunlap
2021-04-13 9:16 ` Ian Abbott
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=034959c7-c70f-4d1b-0fe2-dcc00075807f@infradead.org \
--to=rdunlap@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=andrii.nakryiko@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=broonie@kernel.org \
--cc=daniel@iogearbox.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-next@vger.kernel.org \
--cc=mhocko@suse.cz \
--cc=mm-commits@vger.kernel.org \
--cc=netdev@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 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).