Re: [PATCH v12 00/21] Introduce the lwIP network stack

[Tom Rini <trini@konsulko.com>]

[-- Attachment #1: Type: text/plain, Size: 2420 bytes --]

On Wed, Oct 09, 2024 at 04:02:50PM +0200, Jerome Forissier wrote:

> This is a rework of a patch series by Maxim Uvarov: "net/lwip: add lwip
> library for the network stack" [1]. The goal is to introduce the lwIP TCP/IP
> stack [2] [3] as an alternative to the current implementation in net/,
> selectable with Kconfig, and ultimately keep only lwIP if possible. Some
> reasons for doing so are:
> - Make the support of HTTPS in the wget command easier. Javier T. and
> Raymond M. (CC'd) have some additional lwIP and Mbed TLS patches to do
> so. With that it becomes possible to fetch and launch a distro installer
> such as Debian etc. using a secure, authenticated connection directly
> from the U-Boot shell. Several use cases:
>   * Authentication: prevent MITM attack (third party replacing the
> binary with a different one)
>   * Confidentiality: prevent third parties from grabbing a copy of the
> image as it is being downloaded
>   * Allow connection to servers that do not support plain HTTP anymore
> (this is becoming more and more common on the Internet these days)
> - Possibly benefit from additional features implemented in lwIP
> - Less code to maintain in U-Boot
> 
> Prior to applying this series, the lwIP stack needs to be added as a
> Git subtree with the following command:
> 
>  $ git subtree add --squash --prefix lib/lwip/lwip \
>    https://github.com/lwip-tcpip/lwip.git  STABLE-2_2_0_RELEASE 

Can you please rebase on top of current master and repost? For some
reason after I add the subtree and go for a b4 shazam on the series I
get:
Applying: net: lwip: tftp: bind to TFTP port only when in server mode
Using index info to reconstruct a base tree...
A       lib/lwip/lwip/src/apps/tftp/tftp.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): lib/lwip/lwip/src/apps/tftp/tftp.c deleted in HEAD and modified in net: lwip: tftp: bind to TFTP port only when in server mode. Version net: lwip: tftp: bind to TFTP port only when in server mode of lib/lwip/lwip/src/apps/tftp/tftp.c left in tree.
Patch failed at 0010 net: lwip: tftp: bind to TFTP port only when in server mode
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
error: Failed to merge in the changes.

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]