From: "Rafael J. Wysocki" <rjw@rjwysocki•net>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: David Miller <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>,
Networking <netdev@vger•kernel.org>,
Alex Elder <elder@linaro•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel•com>,
Sakari Ailus <sakari.ailus@linux•intel.com>
Subject: Re: linux-next: manual merge of the net-next tree with the pm tree
Date: Tue, 05 Mar 2024 11:52:48 +0100 [thread overview]
Message-ID: <4903748.31r3eYUQgx@kreacher> (raw)
In-Reply-To: <20240305112641.6248c6fd@canb.auug.org.au>
Hi Stephen,
On Tuesday, March 5, 2024 1:26:41 AM CET Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/ipa/ipa_smp2p.c
>
> between commit:
>
> c0ef3df8dbae ("PM: runtime: Simplify pm_runtime_get_if_active() usage")
>
> from the pm tree and commit:
>
> 5245f4fd28d1 ("net: ipa: don't save the platform device")
>
> from the net-next 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.
The conflict resolution looks good to me, thank you!
next prev parent reply other threads:[~2024-03-05 10:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-05 0:26 linux-next: manual merge of the net-next tree with the pm tree Stephen Rothwell
2024-03-05 10:52 ` Rafael J. Wysocki [this message]
2024-03-05 13:23 ` Alex Elder
-- strict thread matches above, loose matches on Subject: below --
2024-08-22 1:04 Stephen Rothwell
2024-08-22 8:17 ` Ido Schimmel
2023-04-03 1:44 Stephen Rothwell
2013-06-26 3:08 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=4903748.31r3eYUQgx@kreacher \
--to=rjw@rjwysocki$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=elder@linaro$(echo .)org \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=rafael.j.wysocki@intel$(echo .)com \
--cc=sakari.ailus@linux$(echo .)intel.com \
--cc=sfr@canb$(echo .)auug.org.au \
/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