From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat•com>,
David Miller <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>
Cc: Networking <netdev@vger•kernel.org>,
Li RongQing <lirongqing@baidu•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the vhost tree with the net-next tree
Date: Tue, 9 Jul 2024 17:05:13 +1000 [thread overview]
Message-ID: <20240709170513.6335f7da@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 778 bytes --]
Hi all,
Today's linux-next merge of the vhost tree got a conflict in:
drivers/net/virtio_net.c
between commit:
d891317fe4fb ("virtio_net: Remove u64_stats_update_begin()/end() for stats fetch")
from the net-next tree and commit:
b76ecd081d7f ("virtio_net: Use u64_stats_fetch_begin() for stats fetch")
from the vhost tree.
I fixed it up (I used the former version) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-07-09 7:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-09 7:05 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-29 14:40 linux-next: manual merge of the vhost tree with the net-next tree Mark Brown
2025-07-17 6:15 Stephen Rothwell
2023-08-15 8:01 Stephen Rothwell
2023-06-23 3:04 Stephen Rothwell
2023-07-11 1:01 ` Stephen Rothwell
2019-04-03 4:22 Stephen Rothwell
2016-06-16 4:19 Stephen Rothwell
2013-04-29 7:29 Stephen Rothwell
2012-04-19 5:35 Stephen Rothwell
2012-04-19 5:40 ` Michael S. Tsirkin
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=20240709170513.6335f7da@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lirongqing@baidu$(echo .)com \
--cc=mst@redhat$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(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