All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Jan Engelhardt <jengelh@inai.de>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH] netfilter: use actual socket sk for REJECT action
Date: Tue, 1 Dec 2020 14:36:39 +0100	[thread overview]
Message-ID: <20201201133639.GA1323@salvia> (raw)
In-Reply-To: <3s5q4s74-7q3n-69po-1q26-5qr718np489@vanv.qr>

On Tue, Dec 01, 2020 at 01:49:21PM +0100, Jan Engelhardt wrote:
> On Tuesday 2020-12-01 09:49, Pablo Neira Ayuso wrote:
>
> >Hi Jan,
> >
> >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?

Thanks.

  reply	other threads:[~2020-12-01 13:37 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-21 11:11 [PATCH] netfilter: use actual socket sk for REJECT action Jan Engelhardt
2020-12-01  8:49 ` Pablo Neira Ayuso
2020-12-01 12:49   ` Jan Engelhardt
2020-12-01 13:36     ` Pablo Neira Ayuso [this message]
2020-12-01 13:41       ` Jeremy Sowden
2020-12-01 14:31       ` Jan Engelhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201201133639.GA1323@salvia \
    --to=pablo@netfilter.org \
    --cc=jengelh@inai.de \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.