From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BAFC6C43462 for ; Tue, 13 Apr 2021 22:18:23 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4C64F613BA for ; Tue, 13 Apr 2021 22:18:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4C64F613BA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B9AB36B0036; Tue, 13 Apr 2021 18:18:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B729F6B006E; Tue, 13 Apr 2021 18:18:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9EC6F6B0071; Tue, 13 Apr 2021 18:18:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0132.hostedemail.com [216.40.44.132]) by kanga.kvack.org (Postfix) with ESMTP id 41EEB6B0036 for ; Tue, 13 Apr 2021 18:18:22 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id EC23D38FB02D for ; Tue, 13 Apr 2021 22:18:21 +0000 (UTC) X-FDA: 78028758402.12.5B8C20A Received: from mail-yb1-f174.google.com (mail-yb1-f174.google.com [209.85.219.174]) by imf02.hostedemail.com (Postfix) with ESMTP id 4982440002D2 for ; Tue, 13 Apr 2021 22:18:06 +0000 (UTC) Received: by mail-yb1-f174.google.com with SMTP id n12so19877612ybf.8 for ; Tue, 13 Apr 2021 15:18:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=bd7fqYh5LO3bEok4xPNV0VnP9oPXB8+3qeiCw3rycvA=; b=NQv+fC4YU97VEE09EwZmiFaWbjmZuWSfPJzeJjLWNlLOX+OpU1RaeKcr8wDaNmcZXY 63YEqgmc1527mdYd0g1j0ueTSEtlypS/prFx345wdlhhzP4rBuXAMku8E1J/cmlIvzVE Mo1VKAKfXSUC0jmd2KYUUtZglz4BnI6EW2mbXFUDpgXz9t0ZccGBUs73BawjNgwXB79a xBMQoLHS0Q0u1iUQhnPjjAdQ7wgjTj/w8MnrTGRNlfuNyWrFUOGL0M8ZWvuSDxxbxkr8 +pqN4yzli20q5hBScR068k/gprfr/p8/+6G8y9C6pT8kJR7aJwueIia/0N87qdrZbXqI 5dpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=bd7fqYh5LO3bEok4xPNV0VnP9oPXB8+3qeiCw3rycvA=; b=eOUXVuCA6YCbsw+mGS3/EHloqgyllv7lZE5haNN6SvRh77nnsFLGJ52/nQBBraRgRu 6d70NvR9Hq3DObyo1lIykZ9q7WLyv89bEzgRA4bMUNMmLUdXbkpZuZfwgmsiEjo2Pflu RcwwbwD0B7EmLQ/EQIZjMhbOI3i1zKWdwAxdVgzjU9M4UI5ndHsxKdLO3Gg8rJWkI63t /xfX5wCYGuPDYwu2/wRzTDtphd2K3aAIuYVjIML/FI1HFrPKir+aReogejsDS0p3KtOY o9+1W2A3FwOXOMBIFObIuhp2BxJ1zymm9G2DHLwP5u1YRZw/ZZz2Riye40biuybADxm1 2SHQ== X-Gm-Message-State: AOAM531q5s5nNTwYm0eqfW+Z6wBwiaZBiODUgUMzXHuiVn+vVOJ5KxfA IsSXo7TP+EU/UBMRuCvgbvfLUoGe/wUhQckNr+A= X-Google-Smtp-Source: ABdhPJyk67mnwYw+qePAAL4jHTp0oNni6Ua5ZFeVs93cD9K1ZOtNYqJ7Bz1Rp2ICBBl8rb4c03KHO2E66m29aI6EcIQ= X-Received: by 2002:a25:3357:: with SMTP id z84mr39122289ybz.260.1618352300905; Tue, 13 Apr 2021 15:18:20 -0700 (PDT) MIME-Version: 1.0 References: <20210412034813.EK9k9%akpm@linux-foundation.org> <7208c4e4-8ff1-7e0d-50ad-6b0aae872a6d@infradead.org> In-Reply-To: <7208c4e4-8ff1-7e0d-50ad-6b0aae872a6d@infradead.org> From: Andrii Nakryiko Date: Tue, 13 Apr 2021 15:18:10 -0700 Message-ID: Subject: Re: mmotm 2021-04-11-20-47 uploaded (bpf: xsk.c) To: Randy Dunlap Cc: Andrew Morton , broonie@kernel.org, mhocko@suse.cz, Stephen Rothwell , Linux Next Mailing List , linux-fsdevel@vger.kernel.org, Linux Memory Management List , open list , mm-commits@vger.kernel.org, bpf , "netdev@vger.kernel.org" , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 4982440002D2 X-Stat-Signature: 6scqugaec1g4fp9imfp6yepd8rkrzkgu Received-SPF: none (gmail.com>: No applicable sender policy available) receiver=imf02; identity=mailfrom; envelope-from=""; helo=mail-yb1-f174.google.com; client-ip=209.85.219.174 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618352286-804070 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Mon, Apr 12, 2021 at 9:38 AM Randy Dunlap 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 ar= e > > included in linux-next, consult the `series' file. Only the patches > > within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included i= n > > linux-next. > > > > > > A full copy of the full kernel tree with the linux-next and mmotm patch= es > > already applied is available through git within an hour of the mmotm > > release. Individual mmotm releases are tagged. The master branch alwa= ys > > 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 frequentl= y > > 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 =E2=80=98xsk_socket__create_shared=E2=80=99: > xsk.c:1027:7: error: redeclaration of =E2=80=98unmap=E2=80=99 with no lin= kage > bool unmap =3D umem->fill_save !=3D fill; > ^~~~~ > xsk.c:1020:7: note: previous declaration of =E2=80=98unmap=E2=80=99 was h= ere > bool unmap, rx_setup_done =3D false, tx_setup_done =3D false; > ^~~~~ > xsk.c:1028:7: error: redefinition of =E2=80=98rx_setup_done=E2=80=99 > bool rx_setup_done =3D false, tx_setup_done =3D false; > ^~~~~~~~~~~~~ > xsk.c:1020:14: note: previous definition of =E2=80=98rx_setup_done=E2=80= =99 was here > bool unmap, rx_setup_done =3D false, tx_setup_done =3D false; > ^~~~~~~~~~~~~ > xsk.c:1028:30: error: redefinition of =E2=80=98tx_setup_done=E2=80=99 > bool rx_setup_done =3D false, tx_setup_done =3D false; > ^~~~~~~~~~~~~ > xsk.c:1020:37: note: previous definition of =E2=80=98tx_setup_done=E2=80= =99 was here > bool unmap, rx_setup_done =3D false, tx_setup_done =3D 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? > > -- > ~Randy > Reported-by: Randy Dunlap