From: Shuah Khan <skhan@linuxfoundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Shuah Khan <shuah@kernel.org>, David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: Networking <netdev@vger.kernel.org>,
Laura Nao <laura.nao@collabora.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Willem de Bruijn <willemb@google.com>,
Shuah Khan <skhan@linuxfoundation.org>
Subject: Re: linux-next: manual merge of the kselftest tree with the net-next tree
Date: Wed, 8 Jan 2025 16:40:10 -0700 [thread overview]
Message-ID: <057fdf09-ef2b-42fa-9300-dd7bf348362c@linuxfoundation.org> (raw)
In-Reply-To: <20250108144003.67532649@canb.auug.org.au>
On 1/7/25 20:40, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kselftest tree got a conflict in:
>
> tools/testing/selftests/kselftest/ktap_helpers.sh
>
> between commit:
>
> 912d6f669725 ("selftests/net: packetdrill: report benign debug flakes as xfail")
>
> from the net-next tree and commit:
>
> 279e9403c5bd ("selftests: Warn about skipped tests in result summary")
>
> from the kselftest tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
Thank you for finding this. I will mention this when I send pr to Linus.
thanks,
-- Shuah
next prev parent reply other threads:[~2025-01-08 23:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-08 3:40 linux-next: manual merge of the kselftest tree with the net-next tree Stephen Rothwell
2025-01-08 23:40 ` Shuah Khan [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-02-16 3:24 Stephen Rothwell
2017-02-22 14:54 ` Shuah Khan
2017-01-25 4:03 Stephen Rothwell
2017-01-25 7:39 ` Daniel Borkmann
2017-01-24 4:45 Stephen Rothwell
2017-01-24 15:17 ` Shuah Khan
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=057fdf09-ef2b-42fa-9300-dd7bf348362c@linuxfoundation.org \
--to=skhan@linuxfoundation.org \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=laura.nao@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sfr@canb.auug.org.au \
--cc=shuah@kernel.org \
--cc=willemb@google.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