From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 15ED51C5F1B for ; Thu, 17 Apr 2025 10:34:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744886051; cv=none; b=FWhuNfn3aI4IB6oamVEEC3muHLQQbwxuBVcVARjpTUtO+m1dJozFmbjb2HO0y7Q+Wi4weVfFrYXaGi1RNd/pks/jQGLsjKr390HNbRkgJN2uMPvuAiShQ6+MM0Y0Wvce6baqvDwHyV/Vq67S/RyySsyaMcvh8WPWnLyEZxH++0k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744886051; c=relaxed/simple; bh=aATuYzP0zqbF495Z0xKIfyPOKjKOPa5H6x7WpnpI4RE=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=Nm+ihzHJZDGRn18WnnijtF4rlUb3gbAweJiQIXThZEehMLj/2on5eLjoh7plk8CZJr+GZCPuJBPItuQr9fMk9d1Eq1SMxGL9NhOYuciGyyMPodGdqjphXjChljkljZEFGvB8fcCXiVv6izjRsXYec04nkmshcMbcLjFbOiYWZRI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0rYLSxHy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="0rYLSxHy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7CA67C4CEE4; Thu, 17 Apr 2025 10:34:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744886050; bh=aATuYzP0zqbF495Z0xKIfyPOKjKOPa5H6x7WpnpI4RE=; h=Subject:To:Cc:From:Date:From; b=0rYLSxHy9Q2gkZPk2TLl1bhK0QAAmm/4wnXjUSRcMt5edFSHsLbJKURAMIxrUriax NqYUO7Hb2x4NnxIHhwc06Cp73bXZBgN+icItLHNHk7Ov9b5ve8TRgCuP73bXCp9zHz 9ag1G2Y+tvrtHbCDmKPxL8BHMFFk1hhd5/7nI00k= Subject: FAILED: patch "[PATCH] net: dsa: mv88e6xxx: fix VTU methods for 6320 family" failed to apply to 6.1-stable tree To: kabel@kernel.org,andrew@lunn.ch,kuba@kernel.org,stable@vger.kernel.org Cc: From: Date: Thu, 17 Apr 2025 12:33:43 +0200 Message-ID: <2025041743-pawing-crown-a394@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=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-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-6.1.y git checkout FETCH_HEAD git cherry-pick -x f9a457722cf5e3534be5ffab549d6b49737fca72 # git commit -s git send-email --to '' --in-reply-to '2025041743-pawing-crown-a394@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From f9a457722cf5e3534be5ffab549d6b49737fca72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Beh=C3=BAn?= Date: Mon, 17 Mar 2025 18:32:44 +0100 Subject: [PATCH] net: dsa: mv88e6xxx: fix VTU methods for 6320 family MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The VTU registers of the 6320 family use the 6352 semantics, not 6185. Fix it. Fixes: b8fee9571063 ("net: dsa: mv88e6xxx: add VLAN Get Next support") Signed-off-by: Marek Behún Cc: # 5.15.x Reviewed-by: Andrew Lunn Link: https://patch.msgid.link/20250317173250.28780-2-kabel@kernel.org Signed-off-by: Jakub Kicinski diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 5db96ca52505..06b17c3b2205 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -5169,8 +5169,8 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, - .vtu_getnext = mv88e6185_g1_vtu_getnext, - .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge, + .vtu_getnext = mv88e6352_g1_vtu_getnext, + .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, .gpio_ops = &mv88e6352_gpio_ops, .avb_ops = &mv88e6352_avb_ops, .ptp_ops = &mv88e6352_ptp_ops, @@ -5217,8 +5217,8 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, - .vtu_getnext = mv88e6185_g1_vtu_getnext, - .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge, + .vtu_getnext = mv88e6352_g1_vtu_getnext, + .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, .gpio_ops = &mv88e6352_gpio_ops, .avb_ops = &mv88e6352_avb_ops, .ptp_ops = &mv88e6352_ptp_ops,