netdev - iproute2 merge conflicts

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: <ffeb2330-9c1b-2ec6-e5a0-bfdd614b3fb1@gmail.com>
Date:   Fri, 16 Dec 2022 09:14:47 -0700
From:   David Ahern <dsahern@...il.com>
To:     Michal Wilczynski <michal.wilczynski@...el.com>
Cc:     Stephen Hemminger <stephen@...workplumber.org>,
        "netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: iproute2 merge conflicts

Hi Michal:

I merged main into next and hit a conflict with your recent patch set.
Can you take a look at devlink/devlink.c, cmd_port_fn_rate_add and
verify the conflict is correctly resolved?

Thanks,
David