On Mon, 23 Aug 2021 at 23:32, Michael Straube <straube.linux@xxxxxxxxx> wrote: > > On 8/24/21 12:21 AM, Phillip Potter wrote: > > On Mon, 23 Aug 2021 at 09:19, Michael Straube <straube.linux@xxxxxxxxx> wrote: > >> > >> The struct ip_options declared in ip.h is only unsed in the optlength > >> macro which is also defined in ip.h. All other definitions/declarations > >> in ip.h are duplicated from <include/uapi/linux/ip.h>. Remove the ip.h > >> header file and its includes. > >> > >> Signed-off-by: Michael Straube <straube.linux@xxxxxxxxx> > >> --- > > > > > Dear Michael, > > > > Thanks for the patch. Sorry, but it seems to conflict with your > > earlier patch titled: "[PATCH] staging: r8188eu: remove if_ether.h > > header file". They apply fine individually, but not together - can you > > confirm this is the case for you as well and not just me? > > > > Regards, > > Phil > > > > Hi Phillip, > > yes I can confirm, sorry about that. I will rework and send both patches > in a series. Thank you for testing and pointing out this conflict. > > best regards, > Michael No apology necessary, and thanks again for the patches. Regards, Phil
