Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 28 Nov 2022 20:48:15 +0700
From:   Bagas Sanjaya <bagasdotme@gmail.com>
To:     Daniel Lezcano <daniel.lezcano@linaro.org>
Cc:     "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Zhang Rui <rui.zhang@intel.com>,
        "Rafael J. Wysocki" <rjw@rjwysocki.net>,
        Guenter Roeck <linux@roeck-us.net>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        rafael@kernel.org
Subject: Re: linux-next: manual merge of the thermal tree with the pm tree
Message-ID: <Y4S8H/hn1EJzw8fL@debian.me>
References: <20221117122904.6759427e@canb.auug.org.au>
 <20221128102212.39f90b0c@canb.auug.org.au>
 <1a60d0b2-c020-4fce-d7f2-3534c9e14c84@intel.com>
 <9ac3a182-fc30-0834-8555-a4ec334531ae@linaro.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="iynkTffpmch+ZImE"
Content-Disposition: inline
In-Reply-To: <9ac3a182-fc30-0834-8555-a4ec334531ae@linaro.org>
Precedence: bulk


--iynkTffpmch+ZImE
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, Nov 28, 2022 at 02:22:27PM +0100, Daniel Lezcano wrote:
>=20
> Hi,
>=20
> On 28/11/2022 13:51, Rafael J. Wysocki wrote:
> > Sorry about this, but I cannot fix it myself and Daniel is on an
> > extended leave.
> >=20
> > Can you just drop it permanently from linux-next and we'll sort this out
> > when Daniel is back?
>=20
> Yes sorry for that, I'll go back in a couple of days and sort this out
>=20

What about the upcoming merge window? At worst Linus has to figure
out how to solve this complex conflict when pulling either tree...

Linus has already said that there's likely -rc8 of current cycle [1],
so we have about two weeks to try sorting out the conflict and be ready
for PR to him.

Thanks.

[1]: https://lore.kernel.org/lkml/CAHk-=3DwgUZwX8Sbb8Zvm7FxWVfX6CGuE7x+E16V=
KoqL7Ok9vv7g@mail.gmail.com/

--=20
An old man doll... just what I always wanted! - Clara

--iynkTffpmch+ZImE
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEABYIAB0WIQSSYQ6Cy7oyFNCHrUH2uYlJVVFOowUCY4S8GQAKCRD2uYlJVVFO
ozF/AP9MjtCMVpS6NQ0HHZdsnhz/6b0F8+hiuk50iHG+x/jGHAD/R6Y/1/8yW9LV
2RIsodNU5iYgAIQGZLqd1hROJrTPmwI=
=Blrz
-----END PGP SIGNATURE-----

--iynkTffpmch+ZImE--