From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 453ED3DA5A8 for ; Mon, 20 Jul 2026 09:56:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784541423; cv=none; b=tTbcdHP62T9vgZAfpAugglcGxZ0bm2entRlXt8ejiv5oSogM5khaMWMQrt3SBNWNY50WBuPVo3Nee0xU5CINoK+ilQfAYM5kjotVID//zJwK3KShP/2hWeK+G4jlqIF8RR/M3qdYTYApVTwa8dDU+nYaGLm4BBFCVrm0o5BBo4k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784541423; c=relaxed/simple; bh=txwM+PifFLtSEKNsLrJeD80BXLOLLbPqOYswmd87SFU=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=S7NIs9XUxRNnpzTibSZrwo+ANbUNsCqj74zYA1cRny5cRmhnB9sT6kn3oiCzZJ1Lj8Nt4knmEtUsoE3ZT/bwWuwtqTqnhX3x1eqsj7K4OG3BlM1YWV9a0mV+H1G2v4BVAhyt0mjqaaDcCGntFP63BO50/MTv6gwM5Pl7REqltok= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=oUCBMkcM; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="oUCBMkcM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3E99F1F00A3A; Mon, 20 Jul 2026 09:56:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784541417; bh=gJIMUeZyp6MFXdOLpX08FRfzToQS6Q/RwqWeljcY6zQ=; h=Subject:To:Cc:From:Date; b=oUCBMkcMnUjnBQiB8TZv0txt2XS1L0WnuxA/qZNH2pYtIi6y3FSlbN1nK/3Nk1nO1 x42Uza4r6hH91EIVxDzZX81/COdVg5H1hHBrJ61VcljZXyVNQ3bHshqv8lP1GrzW4R TnZlFLmdeo1vUf/J2JFIGcF0oDZgrEQ96gSso+PA= Subject: FAILED: patch "[PATCH] fbcon: Use correct type for vc_resize() return value" failed to apply to 5.15-stable tree To: yujiacheng3@huawei.com,deller@gmx.de,tzimmermann@suse.de Cc: From: Date: Mon, 20 Jul 2026 11:56:36 +0200 Message-ID: <2026072036-malt-rejoin-cd26@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 84202754fb1727dc3ee87f47104e4162ecc8ba3a # git commit -s git send-email --to '' --in-reply-to '2026072036-malt-rejoin-cd26@gregkh' --subject-prefix 'PATCH 5.15.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 84202754fb1727dc3ee87f47104e4162ecc8ba3a Mon Sep 17 00:00:00 2001 From: Jiacheng Yu Date: Thu, 14 May 2026 17:19:18 +0800 Subject: [PATCH] fbcon: Use correct type for vc_resize() return value The return value of vc_resize() is int, but fbcon_set_disp() stores it in an unsigned long variable. While the !ret check happens to work correctly by coincidence (negative values become large positive values), the types should match. Use int instead. Eliminates the following W=3 warning: drivers/video/fbdev/core/fbcon.c: In function 'fbcon_set_disp': drivers/video/fbdev/core/fbcon.c:1494:14: warning: implicit conversion from 'int' to 'unsigned long' [-Wconversion] Fixes: af0db3c1f898 ("fbdev: Fix vmalloc out-of-bounds write in fast_imageblit") Cc: stable@vger.kernel.org # v6.17+ Signed-off-by: Jiacheng Yu Reviewed-by: Thomas Zimmermann Signed-off-by: Helge Deller diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index b0e3e765360d..641687a734d5 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -1440,8 +1440,7 @@ static void fbcon_set_disp(struct fb_info *info, struct fb_var_screeninfo *var, struct vc_data **default_mode, *vc; struct vc_data *svc; struct fbcon_par *par = info->fbcon_par; - int rows, cols; - unsigned long ret = 0; + int rows, cols, ret; p = &fb_display[unit];