From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alex Williamson <alex.williamson@redhat•com>,
David Miller <davem@davemloft•net>
Cc: Networking <netdev@vger•kernel.org>,
Leon Romanovsky <leon@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Lior Nahmanson <liorna@nvidia•com>, Raed Salem <raeds@nvidia•com>,
Saeed Mahameed <saeedm@nvidia•com>,
Yishai Hadas <yishaih@nvidia•com>
Subject: Re: linux-next: manual merge of the vfio tree with the net-next tree
Date: Mon, 12 Sep 2022 11:24:58 +1000 [thread overview]
Message-ID: <20220912112458.525b054e@canb.auug.org.au> (raw)
In-Reply-To: <20220909144436.6c08b042@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 591 bytes --]
Hi all,
On Fri, 9 Sep 2022 14:44:36 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the vfio tree got conflicts in:
>
> drivers/net/ethernet/mellanox/mlx5/core/fw.c
> drivers/net/ethernet/mellanox/mlx5/core/main.c
>
> between commit:
>
> 8ff0ac5be144 ("net/mlx5: Add MACsec offload Tx command support")
>
> from the net-next tree and commit:
>
> 939838632b91 ("net/mlx5: Query ADV_VIRTUALIZATION capabilities")
>
> from the vfio tree.
This latter commit is now also in the mlx5 tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2022-09-12 1:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-09 4:44 linux-next: manual merge of the vfio tree with the net-next tree Stephen Rothwell
2022-09-12 1:24 ` Stephen Rothwell [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=20220912112458.525b054e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alex.williamson@redhat$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=leon@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=liorna@nvidia$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=raeds@nvidia$(echo .)com \
--cc=saeedm@nvidia$(echo .)com \
--cc=yishaih@nvidia$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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