From: Kalle Valo <kvalo@codeaurora.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Wireless <linux-wireless@vger.kernel.org>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Ido Schimmel <idosch@mellanox.com>,
Jakub Kicinski <kuba@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Michael Jeanson <mjeanson@efficios.com>
Subject: Re: linux-next: manual merge of the wireless-drivers tree with the net tree
Date: Fri, 16 Oct 2020 09:01:00 +0300 [thread overview]
Message-ID: <87imbazp43.fsf@codeaurora.org> (raw)
In-Reply-To: <20201016084419.3c6e048a@canb.auug.org.au> (Stephen Rothwell's message of "Fri, 16 Oct 2020 08:44:19 +1100")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the wireless-drivers tree got a conflict in:
>
> tools/testing/selftests/net/Makefile
>
> between commit:
>
> 1a01727676a8 ("selftests: Add VRF route leaking tests")
>
> from the net tree and commit:
>
> b7cc6d3c5c91 ("selftests: net: Add drop monitor test")
>
> from the wireless-drivers (presumably because it has merged part of the
> net-next tree) tree.
Correct, I fast forwarded wireless-drivers from net-next to prepare for
sending bug fixes in the end of the merge window. But I didn't realise
that it might break linux-next build, so wireless-drivers should always
follow net tree and not net-next. Sorry about that.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
prev parent reply other threads:[~2020-10-16 6:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 21:44 linux-next: manual merge of the wireless-drivers tree with the net tree Stephen Rothwell
2020-10-16 6:01 ` Kalle Valo [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=87imbazp43.fsf@codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=davem@davemloft.net \
--cc=idosch@mellanox.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=mjeanson@efficios.com \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).