From: Johannes Berg <johannes@sipsolutions.net>
To: "Wysocki, Rafael J" <rafael.j.wysocki@intel.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Kalle Valo <kvalo@kernel.org>,
Wireless <linux-wireless@vger.kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Miri Korenblit <miriam.rachel.korenblit@intel.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
"Rafael J. Wysocki" <rafael@kernel.org>
Subject: Re: linux-next: manual merge of the wireless-next tree with the pm tree
Date: Tue, 13 Feb 2024 18:13:57 +0100 [thread overview]
Message-ID: <82e78ebf5f84314e3fc1e6b8b1a76f948c9aeb22.camel@sipsolutions.net> (raw)
In-Reply-To: <e15b25c2-2ced-4f79-b541-61980a31f947@intel.com>
On Tue, 2024-02-13 at 18:03 +0100, Wysocki, Rafael J wrote:
> > >
> > > 2e171a57c312 ("iwlwifi: mvm: Drop unused fw_trips_index[] from iwl_mvm_thermal_device")
> > >
> > > from the pm tree
> > I guess we'll have to live with this conflict, unless Rafael you have a
> > feature branch for this I could pull in and resolve?
>
> Well, not yet, but I can add one if that helps.
>
Well if you have a branch that has the above commit and not too much
else, then I could pull it into wireless ... but chances are the common
base that we have is divergent enough that'd pull a whole bunch of other
things into the tree so that'd not be great.
Pretty sure even if the conflict survives to the end Linus could figure
it out? :)
johannes
next prev parent reply other threads:[~2024-02-13 17:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-13 0:08 Stephen Rothwell
2024-02-13 8:25 ` Johannes Berg
2024-02-13 17:03 ` Wysocki, Rafael J
2024-02-13 17:13 ` Johannes Berg [this message]
2024-02-13 17:34 ` Rafael J. Wysocki
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=82e78ebf5f84314e3fc1e6b8b1a76f948c9aeb22.camel@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=kvalo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=miriam.rachel.korenblit@intel.com \
--cc=rafael.j.wysocki@intel.com \
--cc=rafael@kernel.org \
--cc=rjw@rjwysocki.net \
--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
all inboxes | Powered by JetHome®