Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 30 Nov 2020 16:00:52 +0000
From:   Catalin Marinas <catalin.marinas@arm.com>
To:     Naresh Kamboju <naresh.kamboju@linaro.org>
Cc:     Linux-Next Mailing List <linux-next@vger.kernel.org>,
        open list <linux-kernel@vger.kernel.org>,
        Linux ARM <linux-arm-kernel@lists.infradead.org>,
        lkft-triage@lists.linaro.org, Arnd Bergmann <arnd@arndb.de>,
        Vincenzo Frascino <vincenzo.frascino@arm.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Will Deacon <will@kernel.org>, andreyknvl@google.com,
        Andrew Morton <akpm@linux-foundation.org>,
        Peter Collingbourne <pcc@google.com>, steven.price@arm.com
Subject: Re: [next] arm64: mte.c:176:17: error: 'struct thread_struct' has no
 member named 'sctlr_tcf0'
Message-ID: <20201130160052.GF3902@gaia>
References: <CA+G9fYuTS-Kmwy4wfNrFMLnon0v5No3KQeu262c9L91wOrcxkA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CA+G9fYuTS-Kmwy4wfNrFMLnon0v5No3KQeu262c9L91wOrcxkA@mail.gmail.com>
User-Agent: Mutt/1.10.1 (2018-07-13)
Precedence: bulk

On Mon, Nov 30, 2020 at 09:12:58PM +0530, Naresh Kamboju wrote:
> Linux next tag 20201130 arm64 build failed due to below error,
>   - gcc-9, gcc-10 and clang-10 build FAIL
>   - gcc-8 build PASS.
> 
> make --silent --keep-going --jobs=8
> O=/home/tuxbuild/.cache/tuxmake/builds/2/tmp ARCH=arm64
> CROSS_COMPILE=aarch64-linux-gnu- 'CC=sccache aarch64-linux-gnu-gcc'
> 'HOSTCC=sccache gcc'
> arch/arm64/kernel/mte.c: In function 'set_sctlr_el1_tcf0':
> arch/arm64/kernel/mte.c:176:17: error: 'struct thread_struct' has no
> member named 'sctlr_tcf0'
>   176 |  current->thread.sctlr_tcf0 = tcf0;

Thanks for the report. There is a bodged conflict resolution, it should
disappear when Stephen updates the -next tree.

-- 
Catalin