netdev - net vs net-next conflicts while cross merging

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <f769256c-d51c-4983-b7a5-015add42ca35@redhat.com>
Date: Tue, 19 Nov 2024 14:15:07 +0100
From: Paolo Abeni <pabeni@...hat.com>
To: Russell King <linux@...linux.org.uk>, Jiawen Wu <jiawenwu@...stnetic.com>
Cc: "netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: net vs net-next conflicts while cross merging

Hi,

I just cross-merged net into net-next for the 6.13 PR. There was 2
conflicts:

include/linux/phy.h
41ffcd95015f net: phy: fix phylib's dual eee_enabled
21aa69e708b net: phy: convert eee_broken_modes to a linkmode bitmap

drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
2160428bcb20 net: txgbe: fix null pointer to pcs
2160428bcb20 net: txgbe: remove GPIO interrupt controller

@Russel, @Jiawen: could you please double check that the resolution is
correct?

I solved the phy.h conflict as reported here:
https://lore.kernel.org/all/20241118135512.1039208b@canb.auug.org.au/

Thanks!

Paolo