Am 28.02.25 um 06:43 schrieb Lei Yang: > Hi Marcus > > Since your patches are about the virtual network, I'd like to test it, > but it conflicts (Please review the attachment to review more details) > when I apply it to the master branch. > My test based on this commit: > commit 1e15510b71c99c6e49134d756df91069f7d18141 (origin/master, origin/HEAD) > Merge: f09d694cf799 54e1b4becf5e > Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> > Date: Thu Feb 27 09:32:42 2025 -0800 > > Merge tag 'net-6.14-rc5' of > git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net > > Pull networking fixes from Jakub Kicinski: > "Including fixes from bluetooth. > Hi, thank you for including it in your tests. The mentioned commit is not yet in bpf-next, but I rebased my patch on latest mainline and attached the updated patch for the conflicting commit (now with proper formatting, hopefully). The conflict was just about a section that was removed right below my added line in network_helpers.h, so no functional change. ---
