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=-5.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 42F88C2D0A3 for ; Mon, 9 Nov 2020 16:07:41 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AED4E206CB for ; Mon, 9 Nov 2020 16:07:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sefl0Id9"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b="WQ8Lp+Ht" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AED4E206CB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=armlinux.org.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=gF1zuDk4q0Whz3OWVYYqyBA1megrOfBQeLdBVXP/dwg=; b=sefl0Id98NaXreS2RmdMwRx9+ o2HkuavKSJ4jfyUddy43u9/HRIIyGsY6Utd2zZGzzQaG+j2FdB5zRvRJa0s7gcOQrPS3BhhMRhJMs HT67mecfa6OimPlI0r3xU+ocYbwLc2XJPfsejmeVaO6zUp8HmQsJZ3OE+UaF3lbp4zCQAX303TyN8 OHpK/Xn8L9EPLzqs0RJs22VIAhPe4QbZQn4WVEjCb7dYlj9M6EPdY9iFhgQ1wlH1WjngogJXwLt2w ++eZ/kueSJHVY8zmcNFzrhEVg6bfR6wxRZazZipCEaigFMj1jPnFWveXEw/wvBVkIHCHQ53onH9WB 4bkXdSgqg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kc9hN-0006zX-94; Mon, 09 Nov 2020 16:07:17 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kc9hK-0006xm-Dy for linux-arm-kernel@lists.infradead.org; Mon, 09 Nov 2020 16:07:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Sender:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=sCgAeIe4xj+YSbbSBnoftllYArFeB2ell1ztf8OUr8Q=; b=WQ8Lp+HtXaAEFw3JCMm5Yr4Q5 yzuvx1KTybsUZ+BvoMQCcFrtAwNH6hgP+Ug+een3GS7btx4m+GRnnV1wARe0UvbNy3sRVe1Cutkes MVngbzHEr+3guMd0oPXAY7wJ4nwnlL2zm7Hm5W7PLTIV2KqofFbC/nEhl1Fmq7f9MQxkmI6NRqH74 gkVwOfQNaBA+xf0BLs84M8tAGQNAEq2xIP8Y2i7G2obp6Pw9Kq2xIvTrbA3NSGKUOdpG5AuLsP/le XShWj88Z9ue0E5dSD+S/71mUleN+3FiRnMOCD7p2K3z8I7Fn3jj1vDUHxL6WfSA6DMHGsmjGp5hv9 8uGEBgkqA==; Received: from shell.armlinux.org.uk ([fd8f:7570:feb6:1:5054:ff:fe00:4ec]:57588) by pandora.armlinux.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kc9gv-0008Rm-7B; Mon, 09 Nov 2020 16:06:49 +0000 Received: from linux by shell.armlinux.org.uk with local (Exim 4.92) (envelope-from ) id 1kc9gp-0000Yy-ND; Mon, 09 Nov 2020 16:06:43 +0000 Date: Mon, 9 Nov 2020 16:06:43 +0000 From: Russell King - ARM Linux admin To: Linus Walleij Subject: Re: [PATCH 2/5 v16] ARM: Replace string mem* functions for KASan Message-ID: <20201109160643.GY1551@shell.armlinux.org.uk> References: <20201019084140.4532-1-linus.walleij@linaro.org> <20201019084140.4532-3-linus.walleij@linaro.org> <20201106094434.GA3268933@ubuntu-m3-large-x86> <20201106151554.GU1551@shell.armlinux.org.uk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201109_110714_507991_01DFA966 X-CRM114-Status: GOOD ( 28.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephen Rothwell , Florian Fainelli , Ahmad Fatoum , Arnd Bergmann , Abbott Liu , Naresh Kamboju , kasan-dev , Mike Rapoport , Linux-Next Mailing List , Alexander Potapenko , Linux ARM , Andrey Ryabinin , Nathan Chancellor , Ard Biesheuvel , Dmitry Vyukov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Nov 09, 2020 at 05:02:09PM +0100, Linus Walleij wrote: > On Fri, Nov 6, 2020 at 4:16 PM Russell King - ARM Linux admin > wrote: > > On Fri, Nov 06, 2020 at 02:37:21PM +0100, Linus Walleij wrote: > > > > Aha. So shall we submit this to Russell? I figure that his git will not > > > build *without* the changes from mmotm? > > > > > > That tree isn't using git either is it? > > > > > > Is this one of those cases where we should ask Stephen R > > > to carry this patch on top of -next until the merge window? > > > > Another solution would be to drop 9017/2 ("Enable KASan for ARM") > > until the following merge window, and queue up the non-conflicing > > ARM KASan fixes in my "misc" branch along with the rest of KASan, > > and the conflicting patches along with 9017/2 in the following > > merge window. > > > > That means delaying KASan enablement another three months or so, > > but should result in less headaches about how to avoid build > > breakage with different bits going through different trees. > > > > Comments? > > I suppose I would survive deferring it. Or we could merge the > smaller enablement patch towards the end of the merge > window once the MM changes are in. > > If it is just *one* patch in the MM tree I suppose we could also > just apply that one patch also to the ARM tree, and then this > fixup on top. It does look a bit convoluted in the git history with > two hashes and the same patch twice, but it's what I've done > at times when there was no other choice that doing that or > deferring development. It works as long as the patches are > textually identical: git will cope. I thought there was a problem that if I applied the fix then my tree no longer builds without the changes in -mm? -- RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last! _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel