MIME-Version: 1.0
References: <20220104111551.7f26e893@canb.auug.org.au> <d485fb62-b576-f9b6-13bc-709a2c409240@gmail.com>
 <20220104190220.45c8e0cf@canb.auug.org.au> <c905fd23-19c1-218f-819b-b8ae3434f48c@gmail.com>
In-Reply-To: <c905fd23-19c1-218f-819b-b8ae3434f48c@gmail.com>
From:   "Rafael J. Wysocki" <rafael@kernel.org>
Date:   Tue, 4 Jan 2022 15:57:08 +0100
Message-ID: <CAJZ5v0i4SNV+NRHW9f0epJu9UAALxD3C3abJjPTJM81Uy292EQ@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the pm tree
To:     Heiner Kallweit <hkallweit1@gmail.com>
Cc:     "Rafael J. Wysocki" <rafael@kernel.org>,
        "Rafael J. Wysocki" <rjw@rjwysocki.net>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux PM <linux-pm@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Tue, Jan 4, 2022 at 3:43 PM Heiner Kallweit <hkallweit1@gmail.com> wrote:
>
> On 04.01.2022 09:02, Stephen Rothwell wrote:
> > Hi Heiner,
> >
> > On Tue, 4 Jan 2022 08:29:28 +0100 Heiner Kallweit <hkallweit1@gmail.com> wrote:
> >>
> >> The patch in the pm tree annotating pm_runtime_resume_and_get() as __must_check
> >> follows some fixes of pm_runtime_resume_and_get() usage that went through other
> >> trees. These fixes are in linux-next but don't seem to be in the pm tree.
> >> We talk about:
> >> f04b4fb47d83 ("ASoC: sh: rz-ssi: Check return value of pm_runtime_resume_and_get()")
> >
> > In the sound-asoc tree.
> >
> >> 3d6b661330a7 ("crypto: stm32 - Revert broken pm_runtime_resume_and_get changes")
> >
> > In the crypto tree.
> >
> > Both those are merged into linux-next after the pm tree.  If Linus did
> > the same, the pm tree commit would break his build.  The only way you
> > can have that pm tree commit in linux-next is to ask Andrew Morton to
> > put it in the post linux-next part of his patch series.  Otherwise, it
> > needs to be removed form the pm tree and wait until after the next
> > merge window closes (or at least both the above trees have been merged
> > by Linus).
> >
> Rafael,
> can you take care of this?

Done.

I've dropped the commit in question from pm-core and I'm going to add
it back and submit by the end of the merge window.