From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CCC4733F8C9 for ; Thu, 20 Nov 2025 13:39:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763645971; cv=none; b=NI/guqn0bZDt3T/tZPhRfpEHysrUyQne5ZZYwaPlVskFd30ZOfRq+fPFRI7mF0PUoSNpKVl6pc4ph08HHbDESffkbDfy+dp0okF/1WEGdEiMhLyaLG21zFh5NMkk0IhwCyOzjCBGBvbpxKYpWGdIREpLbRBeGHT7Bg47Qo5btAw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763645971; c=relaxed/simple; bh=uOyCs/hnZWgfk12QEhoByaY2C4isGQ6vB7DMqM5aDZI=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=j5N42tmjvjt0Bw5+UYX2tgh4LgcL/fQnB3BbS4YtCHLaQhnVMlaoxZ+2nUDH6qnEGeUo1+9BviYdILVJTPfZQIiOp9VdQeKBfZYJWN+NxWL2/yQ2XA5WZO1bdqSrQEW9Q9wqUpYa+eb3iizyjpUehhOK+NaE+1wFrlhuv25WnHw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LtB+EWua; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LtB+EWua" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A64EC113D0; Thu, 20 Nov 2025 13:39:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763645971; bh=uOyCs/hnZWgfk12QEhoByaY2C4isGQ6vB7DMqM5aDZI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LtB+EWuaSWSqY57sHGf0uhIFBAeO0BKYO38ySXT8Mj4LvkTWKCNYViIXZT5cA5vl7 N9eGOyDu7DEzMiS4NGXPugF7ZntSyIwZXW7H4i4GT04DhtEAa15MQeNziKCbi0YId9 f4NMH1buDwt8mXpunTs0Ge9mV7MNjcfNyY95/xU9dgqFHb6nyiwx10RsUrQTr7iTEN vf0gZJemfmUCMxKFBsaZtGZl8auq55owQTi8u0rbsCrQw0XkIHGDhXhmI4jE1Mgkyu BKhL6Ccv5fr5ll+p9dCnc0FDgUy5RjWa0HxysGmV+dbJVSZLf6kTQWRvjYerMY1d6H O9ZPArNSKIH7g== Date: Thu, 20 Nov 2025 13:39:27 +0000 From: Lee Jones To: Andy Shevchenko Cc: Binbin Zhou , linux-kernel@vger.kernel.org, Chong Qiao Subject: Re: [PATCH v2 1/2] mfd: ls2kbmc: Fully convert to use managed resources Message-ID: <20251120133927.GB661940@google.com> References: <20251113162713.3143777-1-andriy.shevchenko@linux.intel.com> <20251113162713.3143777-2-andriy.shevchenko@linux.intel.com> <20251119164703.GU1949330@google.com> <20251120085402.GW1949330@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: On Thu, 20 Nov 2025, Andy Shevchenko wrote: > On Thu, Nov 20, 2025 at 08:54:02AM +0000, Lee Jones wrote: > > On Wed, 19 Nov 2025, Andy Shevchenko wrote: > > > On Wed, Nov 19, 2025 at 04:47:03PM +0000, Lee Jones wrote: > > > > On Thu, 13 Nov 2025, Andy Shevchenko wrote: > > ... > > > > > > Fixes: 91a3e1f5453a ("mfd: ls2kbmc: Check for devm_mfd_add_devices() failure") > > > > > Fixes: d952bba3fbb5 ("mfd: ls2kbmc: Add Loongson-2K BMC reset function support") > > > > > Reviewed-by: Binbin Zhou > > > > > Signed-off-by: Andy Shevchenko > > > > > --- > > > > > drivers/mfd/ls2k-bmc-core.c | 28 +++++++--------------------- > > > > > 1 file changed, 7 insertions(+), 21 deletions(-) > > > > > > > > Still doesn't apply. I'm getting lots of conflicts. > > > > > > > > What base are you on? > > > > > > Linux Next which includes your -fixes branch. You probably need to merge either > > > it or v6.18-rc6 to the -next. Then the v1 will be okay to apply. > > > > Ah, yes, that explains it. > > > > > The bottom line is that without doing that we will have conflicts either in > > > Linux Next followed by merging by Linus or in your branches locally before > > > going to the above mentioned. > > > > > > Another possibility is cherry-pick patches from -fixes to -next. > > > > > > And alternative is to wait for -rc1 and rebase this on top of and > > > apply then. > > > Yes, if there is no urgency, > > It's up to you and the author of the code, it's a fix, but I don't think it's > too critical, we can wait, yes. > > > we can wait for the next merge window. > > It's a fix, do you mean to apply after -rc1 for v6.19-rcX? Yes, we can merged it though for-mfd-fixes. -- Lee Jones [李琼斯]