From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (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 E575824E4C6 for ; Thu, 20 Nov 2025 13:48:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763646521; cv=none; b=XEcECuq/3WiOT/aK1oBuQPyf0knuwDIAQM7LAJSXJ4z4b5mIKXQG0HQQpLg4wWguYRDD69wgVMcwM71++TkWuFY2216NRSYBPv2lBbfi+fPuzsBgQ4WyEBVMIKc1TsaxIdR5EXRKwyXxzSXQ+yyCGwtXGAr8pf2hCQq2R4D1L6g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763646521; c=relaxed/simple; bh=P3CiBFmERU3JlDAZJ51SfGm2Gzg5H4Y3zqW5ECHsCYg=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=BThV6UuSDfhieJJM9mT3fC8eBo5URLkbFUAdlAQmH7EFVRtZfU0PXCPEhSgun/YTcdZP0eNRDEwF533u3pT946v9toMNdVn7Qn2C2QUTMDwPol9pjPxgK8qG/tB8tq1YT/drJ/wxN/ad4CaRIz21nXQF0IDaJNw8vFwQpSfGZOk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=W+9uAcev; arc=none smtp.client-ip=192.198.163.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="W+9uAcev" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1763646520; x=1795182520; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=P3CiBFmERU3JlDAZJ51SfGm2Gzg5H4Y3zqW5ECHsCYg=; b=W+9uAcevAwtLf/UZPNbj5pKpcrGRNfSNqtEm1Y6KXYdHyUOD3Aq3p440 C0jwas/UGf5TUqBjan7nu2jHCIk74oVTSqYZgIyYFm//c0NYqMe8qMIGG mNa45pNo7FT0PYuRalLCxOP3bu/l8SwoB0vtCUMMvnnCl5UzyuRpyGBBo GNQL0tdNbJYNo4kHUodp6eIhhyK4Hfj5BScXG/ClqunXrgVmcK06D/8bf AAhy8tNF2G7i3OFNnkvoBVdkNFbVT0isAdX7JEXLUTlrcN0lrZyvGva4c UaIUIPO5rH6ApVxkq+8njTWXZkHGwycrV+WIJHiPbmXGoE7ieB8SNAGNR Q==; X-CSE-ConnectionGUID: rLotimbBSY65m4o+4vfJeg== X-CSE-MsgGUID: vEi7f6OVSL+BdG/NFzno4g== X-IronPort-AV: E=McAfee;i="6800,10657,11619"; a="65801102" X-IronPort-AV: E=Sophos;i="6.20,213,1758610800"; d="scan'208";a="65801102" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2025 05:48:39 -0800 X-CSE-ConnectionGUID: v5GLcVodQnWMzpUmd7QoHg== X-CSE-MsgGUID: 5Atut4ueQgaHcSXSRE2/PA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.20,213,1758610800"; d="scan'208";a="222018709" Received: from amilburn-desk.amilburn-desk (HELO localhost) ([10.245.244.97]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2025 05:48:37 -0800 Date: Thu, 20 Nov 2025 15:48:35 +0200 From: Andy Shevchenko To: Lee Jones 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: 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> <20251120133927.GB661940@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=us-ascii Content-Disposition: inline In-Reply-To: <20251120133927.GB661940@google.com> Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs, Bertel Jungin Aukio 5, 02600 Espoo On Thu, Nov 20, 2025 at 01:39:27PM +0000, Lee Jones wrote: > 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. Okay, let's wait for v6.19-rc1 then. -- With Best Regards, Andy Shevchenko