On 2020-12-01, at 14:36:39 +0100, Pablo Neira Ayuso wrote: > On Tue, Dec 01, 2020 at 01:49:21PM +0100, Jan Engelhardt wrote: > > On Tuesday 2020-12-01 09:49, Pablo Neira Ayuso wrote: > > >On Sat, Nov 21, 2020 at 12:11:51PM +0100, Jan Engelhardt wrote: > > >> True to the message of commit v5.10-rc1-105-g46d6c5ae953c, _do_ > > >> actually make use of state->sk when possible, such as in the REJECT > > >> modules. > > > > > >Could you rebase and resend a v2? I think this patch is clashing with > > >recent updates to add REJECT support for ingress. > > > > I observed no conflict when attempting the rebase command, either onto > > cb7fb043e69a (/pub/scm/linux/kernel/git/netdev/net-next.git #master) or > > f7583f02a538 (/pub/scm/linux/kernel/git/pablo/nf-next #master) > > I see, it does not apply via: > > git am netfilter-use-actual-socket-sk-for-REJECT-action.patch > > because patch shows: > > diff --git include/net/netfilter/ipv4/nf_reject.h include/net/netfilter/ipv4/nf_reject.h > index 40e0e0623f46..d8207a82d761 100644 > --- include/net/netfilter/ipv4/nf_reject.h > +++ include/net/netfilter/ipv4/nf_reject.h > > instead of: > > diff --git a/include/net/netfilter/ipv4/nf_reject.h b/include/net/netfilter/ipv4/nf_reject.h > index 40e0e0623f46..d8207a82d761 100644 > --- a/include/net/netfilter/ipv4/nf_reject.h > +++ b/include/net/netfilter/ipv4/nf_reject.h > > I just manually updated the patch so now it works. > > Is there a similar way to make patch -p0 for git-am BTW? git am -p0. J.
Attachment:
signature.asc
Description: PGP signature
