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=-6.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 C4643C2D0A3 for ; Tue, 3 Nov 2020 10:55:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6635522403 for ; Tue, 3 Nov 2020 10:55:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Ol04UUQS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728266AbgKCKz2 (ORCPT ); Tue, 3 Nov 2020 05:55:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728263AbgKCKz1 (ORCPT ); Tue, 3 Nov 2020 05:55:27 -0500 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B5B4C0617A6 for ; Tue, 3 Nov 2020 02:55:27 -0800 (PST) Received: by mail-wm1-x344.google.com with SMTP id h22so12327054wmb.0 for ; Tue, 03 Nov 2020 02:55:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=+KRoxaxWoP931pjhgr3QuPJCTEb7tuzgIbQbwmrzu9g=; b=Ol04UUQSfW6ux3RlOkA+C6+MmHfaKF74G+UFYH5yLKmlvLHa9sMqriK/aq/ywbcAuQ Xnk83l/kUwaPaQp0nU6bevo5gwJ7RO7DE0bc4PQQ3RCyXpudJDJojvMzMWavOa2nGuuS 8+vOwvYk800pCIgua1SGmBKC4pZ1dWYP9GhlO+88pvhqlOcTkrRXZekOqjHFVWBiD9O+ Z0M8wibCQ3rXXzu97iz1U0eNGMrZLHnjas9qzmEXARzZvBlx+OHVf3qqkPqVC0z6mA8Q bHUglms3pdQfbwweNAItA4ljBTit8bVGWWzNAnWRtUwv7x7O6zBsYC9ZMOc1Dk8pwXHL rHxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=+KRoxaxWoP931pjhgr3QuPJCTEb7tuzgIbQbwmrzu9g=; b=r9+xDQcscpi3FFg2vCLvPWPzqzfyb5MECy5k9ypwTeehpoJf+G6QEsK9MTB9w7siNf 7eSqmiAMwbbacTQjsUfpqoM5cWcfWkVgqvj2ugv4rdzznk/Cj0sKm3e4IkB8IBOZ5q5G 6UZ1Dz0+u7/lam0tF8CgGcmvDF33qzi9kadhV6zXOtbayqk6JUGc5YhUZvpzkTPD13yf o6g1qEIIAonyFv0IyundNzUXoFA5o3RJNikifKSP1Pj6l2TljcgtegEbaL6UwZyPRnCO i0o/vqeLNYI0bz9rurYU8Pa3eH6wEVzv+/vMzK0MS2i9aBrEfqGkc3XK2lmbnygEAhZx 5CQw== X-Gm-Message-State: AOAM5327XoSTGNXOPuru06TW0IbtklxOYXEhmKvEV9ZW5bcagJlTMGBn hIKkGY5Skk0wDzzG9h5nfyATtg== X-Google-Smtp-Source: ABdhPJyHMlpjYWcgrY1NvCUqCBWvWxQQy2Hu/2TVnz7K91UtDbRzNOBmUhJ1oX0oDJrv7tqX2td3sQ== X-Received: by 2002:a1c:b746:: with SMTP id h67mr2876554wmf.43.1604400926171; Tue, 03 Nov 2020 02:55:26 -0800 (PST) Received: from dell ([91.110.221.242]) by smtp.gmail.com with ESMTPSA id t5sm2638295wmg.19.2020.11.03.02.55.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 02:55:25 -0800 (PST) Date: Tue, 3 Nov 2020 10:55:23 +0000 From: Lee Jones To: Greg KH , Peilin Ye , Russell King - ARM Linux , Linux ARM , Linux Kernel Mailing List , stable Subject: Re: [PATCH v2 1/1] Fonts: Replace discarded const qualifier Message-ID: <20201103105523.GO4488@dell> References: <20201030181822.570402-1-lee.jones@linaro.org> <20201102183242.2031659-1-yepeilin.cs@gmail.com> <20201103085324.GL4488@dell> <20201103091538.GA2663113@kroah.com> <20201103095239.GW401619@phenom.ffwll.local> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20201103095239.GW401619@phenom.ffwll.local> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Tue, 03 Nov 2020, Daniel Vetter wrote: > On Tue, Nov 03, 2020 at 10:15:38AM +0100, Greg KH wrote: > > On Tue, Nov 03, 2020 at 09:58:18AM +0100, Daniel Vetter wrote: > > > On Tue, Nov 3, 2020 at 9:53 AM Lee Jones wrote: > > > > > > > > On Mon, 02 Nov 2020, Peilin Ye wrote: > > > > > > > > > From: Lee Jones > > > > > > > > > > Commit 6735b4632def ("Fonts: Support FONT_EXTRA_WORDS macros for built-in > > > > > fonts") introduced the following error when building rpc_defconfig (only > > > > > this build appears to be affected): > > > > > > > > > > `acorndata_8x8' referenced in section `.text' of arch/arm/boot/compressed/ll_char_wr.o: > > > > > defined in discarded section `.data' of arch/arm/boot/compressed/font.o > > > > > `acorndata_8x8' referenced in section `.data.rel.ro' of arch/arm/boot/compressed/font.o: > > > > > defined in discarded section `.data' of arch/arm/boot/compressed/font.o > > > > > make[3]: *** [/scratch/linux/arch/arm/boot/compressed/Makefile:191: arch/arm/boot/compressed/vmlinux] Error 1 > > > > > make[2]: *** [/scratch/linux/arch/arm/boot/Makefile:61: arch/arm/boot/compressed/vmlinux] Error 2 > > > > > make[1]: *** [/scratch/linux/arch/arm/Makefile:317: zImage] Error 2 > > > > > > > > > > The .data section is discarded at link time. Reinstating acorndata_8x8 as > > > > > const ensures it is still available after linking. Do the same for the > > > > > other 12 built-in fonts as well, for consistency purposes. > > > > > > > > > > Cc: > > > > > Cc: Russell King > > > > > Fixes: 6735b4632def ("Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts") > > > > > Signed-off-by: Lee Jones > > > > > Co-developed-by: Peilin Ye > > > > > Signed-off-by: Peilin Ye > > > > > --- > > > > > Changes in v2: > > > > > - Fix commit ID to 6735b4632def in commit message (Russell King > > > > > ) > > > > > - Add `const` back for all 13 built-in fonts (Daniel Vetter > > > > > ) > > > > > - Add a Fixes: tag > > > > > > > > > > lib/fonts/font_10x18.c | 2 +- > > > > > lib/fonts/font_6x10.c | 2 +- > > > > > lib/fonts/font_6x11.c | 2 +- > > > > > lib/fonts/font_6x8.c | 2 +- > > > > > lib/fonts/font_7x14.c | 2 +- > > > > > lib/fonts/font_8x16.c | 2 +- > > > > > lib/fonts/font_8x8.c | 2 +- > > > > > lib/fonts/font_acorn_8x8.c | 2 +- > > > > > lib/fonts/font_mini_4x6.c | 2 +- > > > > > lib/fonts/font_pearl_8x8.c | 2 +- > > > > > lib/fonts/font_sun12x22.c | 2 +- > > > > > lib/fonts/font_sun8x16.c | 2 +- > > > > > lib/fonts/font_ter16x32.c | 2 +- > > > > > 13 files changed, 13 insertions(+), 13 deletions(-) > > > > > > > > LGTM. > > > > > > > > Thanks for keeping my authorship. Much appreciated. > > > > > > Should I stuff this into drm-misc-fixes? Or will someone else pick > > > this up? Greg? > > > > > > I guess drm-misc-fixes might be easiest since there's a bunch of other > > > fbcon/font stuff in the queue in drm-misc from Peilin. > > > > You can take it: > > > > Reviewed-by: Greg Kroah-Hartman > > Applied to drm-misc-fixes, thanks everyone! Would you be kind enough to let us know when this lands in Mainline please? We'll need to back-port it to start fixing up our Stable kernels ASAP. TIA. -- Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog