From: Jiri Pirko <jiri@resnulli.us>
To: Cong Wang <xiyou.wangcong@gmail.com>
Cc: David Miller <davem@davemloft.net>,
Linux Kernel Network Developers <netdev@vger.kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Jiri Pirko <jiri@mellanox.com>
Subject: Re: More painful merges...
Date: Mon, 30 Oct 2017 17:41:31 +0100 [thread overview]
Message-ID: <20171030164131.GD4115@nanopsycho.orion> (raw)
In-Reply-To: <CAM_iQpUTauPL7Z_s-0kbp+nbg17fniMBhOyQ4tDVVmC=qFFy=g@mail.gmail.com>
Mon, Oct 30, 2017 at 04:58:25PM CET, xiyou.wangcong@gmail.com wrote:
>On Mon, Oct 30, 2017 at 5:15 AM, David Miller <davem@davemloft.net> wrote:
>>
>> BPF and tc action bug fixes in 'net' caused some extremely
>> painful merges with 'net-next'.
>>
>> Could the interested parties please take a look at 'net-next'
>> and send me any necessary fixes, as I did the best that I
>> could.
>>
>
>The tcf_block_put_ext() part looks good to me. I will run
>some tests to make sure.
Looks fine to me as well.
prev parent reply other threads:[~2017-10-30 16:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-30 12:15 More painful merges David Miller
2017-10-30 15:14 ` Alexei Starovoitov
2017-10-30 15:45 ` John Fastabend
2017-10-30 15:58 ` Cong Wang
2017-10-30 16:40 ` Cong Wang
2017-10-30 16:41 ` Jiri Pirko [this message]
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=20171030164131.GD4115@nanopsycho.orion \
--to=jiri@resnulli.us \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=jiri@mellanox.com \
--cc=john.fastabend@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=xiyou.wangcong@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox