From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
David Miller <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>
Cc: Networking <netdev@vger•kernel.org>,
Alexander Lobakin <aleksander.lobakin@intel•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Nam Cao <namcao@linutronix•de>
Subject: Re: linux-next: manual merge of the tip tree with the net-next tree
Date: Wed, 26 Mar 2025 16:01:24 +1100 [thread overview]
Message-ID: <20250326160124.29bb0250@canb.auug.org.au> (raw)
In-Reply-To: <20250228154312.06484c0d@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1705 bytes --]
Hi all,
On Fri, 28 Feb 2025 15:43:12 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> net/core/dev.c
>
> between commit:
>
> 388d31417ce0 ("net: gro: expose GRO init/cleanup to use outside of NAPI")
>
> from the net-next tree and commit:
>
> fe0b776543e9 ("netdev: Switch to use hrtimer_setup()")
>
> from the tip 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.
>
>
> diff --cc net/core/dev.c
> index d6d68a2d2355,03a7f867c7b3..000000000000
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@@ -7169,10 -7013,11 +7169,9 @@@ void netif_napi_add_weight_locked(struc
>
> INIT_LIST_HEAD(&napi->poll_list);
> INIT_HLIST_NODE(&napi->napi_hash_node);
> - hrtimer_init(&napi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
> - napi->timer.function = napi_watchdog;
> + hrtimer_setup(&napi->timer, napi_watchdog, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
> - init_gro_hash(napi);
> + gro_init(&napi->gro);
> napi->skb = NULL;
> - INIT_LIST_HEAD(&napi->rx_list);
> - napi->rx_count = 0;
> napi->poll = poll;
> if (weight > NAPI_POLL_WEIGHT)
> netdev_err_once(dev, "%s() called with weight %d\n", __func__,
This is now a conflict between Linus' tree and the net-next tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-03-26 5:01 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-28 4:43 linux-next: manual merge of the tip tree with the net-next tree Stephen Rothwell
2025-02-28 21:45 ` Jakub Kicinski
2025-03-26 5:01 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-07-22 1:42 Stephen Rothwell
2025-07-29 23:21 ` Stephen Rothwell
2025-07-04 6:28 Stephen Rothwell
2025-05-07 2:49 Stephen Rothwell
2025-05-07 6:06 ` Jiri Slaby
2025-05-28 6:13 ` Stephen Rothwell
2022-03-15 2:13 Stephen Rothwell
2022-01-10 1:12 Stephen Rothwell
2019-10-18 2:31 Stephen Rothwell
2019-10-18 5:00 ` Alexei Starovoitov
2019-02-15 2:20 Stephen Rothwell
2017-11-01 7:15 Stephen Rothwell
2017-11-01 8:18 ` Peter Zijlstra
2017-11-01 8:27 ` Ingo Molnar
2017-11-01 8:55 ` Peter Zijlstra
2017-11-01 9:04 ` Ingo Molnar
2017-11-01 10:57 ` Stephen Rothwell
2017-11-01 7:10 Stephen Rothwell
2017-10-30 20:55 Mark Brown
2017-11-13 6:00 ` Stephen Rothwell
2017-08-31 3:47 Stephen Rothwell
2017-09-05 0:05 ` Stephen Rothwell
2017-02-20 1:22 Stephen Rothwell
2017-02-20 9:02 ` Daniel Borkmann
2016-12-12 2:30 Stephen Rothwell
2016-12-01 3:46 Stephen Rothwell
2016-11-17 3:04 Stephen Rothwell
2015-04-07 7:11 Stephen Rothwell
2015-04-07 7:32 ` Daniel Borkmann
2015-04-07 16:10 ` Alexei Starovoitov
2015-04-07 7:04 Stephen Rothwell
2015-04-07 16:11 ` Alexei Starovoitov
2015-04-07 7:00 Stephen Rothwell
2015-04-07 7:30 ` Daniel Borkmann
2014-07-25 4:38 Stephen Rothwell
2014-05-05 4:29 Stephen Rothwell
2014-01-13 3:18 Stephen Rothwell
2014-01-13 3:20 ` Stephen Rothwell
2014-01-14 3:02 ` Stephen Rothwell
2014-01-14 4:51 ` H. Peter Anvin
2014-01-14 5:19 ` Stephen Rothwell
2014-01-14 5:19 ` David Miller
2014-01-14 5:44 ` Stephen Rothwell
2014-01-14 5:48 ` David Miller
2014-01-14 6:10 ` Stephen Rothwell
2013-11-08 4:58 Stephen Rothwell
2013-04-11 4:03 Stephen Rothwell
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=20250326160124.29bb0250@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=aleksander.lobakin@intel$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=hpa@zytor$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@redhat$(echo .)com \
--cc=namcao@linutronix$(echo .)de \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/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