All of lore.kernel.org
 help / color / mirror / Atom feed
From: Justin Iurman <justin.iurman@uliege.be>
To: Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org, davem@davemloft.net,
	yoshfuji@linux-ipv6.org, dsahern@kernel.org
Subject: Re: [PATCH net 0/2] Correct the IOAM behavior for undefined trace type bits
Date: Fri, 15 Oct 2021 19:03:58 +0200 (CEST)	[thread overview]
Message-ID: <1483539844.133216515.1634317438885.JavaMail.zimbra@uliege.be> (raw)
In-Reply-To: <20211014172800.26374a35@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>

>> (@Jakub @David: there will be a conflict for #2 when merging net->net-next, due
>> to commit [1]. The conflict is only 5-10 lines for #2 (#1 should be fine) inside
>> the file tools/testing/selftests/net/ioam6.sh, so quite short though possibly
>> ugly. Sorry for that, I didn't expect to post this one... Had I known, I'd have
>> made the opposite.)

Hi Jakub,

> Hi Justin, net was merged into net-next now, please double check the
> resolution. I think it's the same as Stephen's [1]. In the future please

Thanks for that, I just checked and it's indeed OK.

> try to include a tree way diff or instructions on how to do the merge.

Noted, thanks again.

> Thanks!
> 
> [1]
> https://lore.kernel.org/all/20211013104227.62c4d3af@canb.auug.org.au/

      reply	other threads:[~2021-10-15 17:04 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-11 18:04 [PATCH net 0/2] Correct the IOAM behavior for undefined trace type bits Justin Iurman
2021-10-11 18:04 ` [PATCH net 1/2] ipv6: ioam: move the check for undefined bits Justin Iurman
2021-10-11 18:04 ` [PATCH net 2/2] selftests: net: modify IOAM tests for undef bits Justin Iurman
2021-10-12 11:00 ` [PATCH net 0/2] Correct the IOAM behavior for undefined trace type bits patchwork-bot+netdevbpf
2021-10-15  0:28 ` Jakub Kicinski
2021-10-15 17:03   ` Justin Iurman [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=1483539844.133216515.1634317438885.JavaMail.zimbra@uliege.be \
    --to=justin.iurman@uliege.be \
    --cc=davem@davemloft.net \
    --cc=dsahern@kernel.org \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=yoshfuji@linux-ipv6.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.