From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) (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 A038630F7E8 for ; Thu, 20 Nov 2025 09:12:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.12 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763629925; cv=none; b=JGREaH+08JW/DFW0dVlxDKqvzgrz+J2ZUWUhWaImrTgMybWa7gOpsC8oNZnTFHJq+EWSqsBsWrF0s1ttuy3zY44vIj/nhgzKIlRTyxma5uWdBcmdOdKGdT0reSFgSsw6PIPVxd3y/k9g4WEIE5lRWi+GuPrJ5SpVu6+M7gR8GeA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763629925; c=relaxed/simple; bh=Zc2qp4tBeavnYjr3gWzToMt2fMx2lUwScMHuCu9G6Fk=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=hX+dc97sdunVXz0PDMve/nRpstlex7HWMIrledYABR8L3Qu0Bp9LR9vNJHtT3/Zo+AOcoiq4Z2lik1hxWMvPLRTC1qU89yuQzncBEZVVe22xoX6Xp1ri+XhRzfsSd6dXAe/TpxT8vlHzqEeJTfzlSpx/8if66q+YKeRlMxK2kF8= 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=NJ1BVlgD; arc=none smtp.client-ip=192.198.163.12 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="NJ1BVlgD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1763629922; x=1795165922; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=Zc2qp4tBeavnYjr3gWzToMt2fMx2lUwScMHuCu9G6Fk=; b=NJ1BVlgD2zeJRPCKF69KXSii9s7gXs3hpLnEqKy4o3SRo/9fmsPPBtfc MGE8Q+FbT6FKNJpL95AsSLRLTWqzIHQ3Wa3m8CU7yhKTHhtsDDoUZGc1J FLoj6Hfo9exSdZwry8ccQutH2vMHbcyH8QXDOCoVMk/lSd+wiwZ+WznxU Fgye6YPQW+Q0vKxEhuC6tefdeBVAfjG0iDjIP3ZCa6MJUMRCPrMH+f5c8 3zpgIuO2xIQOJWaqyYTmQomIjLZFjajJ9/su3JcGduvDc8xFKrGTwt/u5 u5FR2/k4siiCK3AqK8Ogro0353N/2dVFu+LzMymYU2YoLfEuEiZ491lDy w==; X-CSE-ConnectionGUID: 6C96L77qSo+uyxwUrqvG0g== X-CSE-MsgGUID: xVd1OoPVTsKPoIFCtDB+VQ== X-IronPort-AV: E=McAfee;i="6800,10657,11618"; a="69560951" X-IronPort-AV: E=Sophos;i="6.19,317,1754982000"; d="scan'208";a="69560951" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2025 01:12:01 -0800 X-CSE-ConnectionGUID: GBR77ZAIRmOJ+f0cVo3sQw== X-CSE-MsgGUID: F5I4T5SlTnaqh65U4NJ+Bg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,317,1754982000"; d="scan'208";a="196276174" Received: from amilburn-desk.amilburn-desk (HELO localhost) ([10.245.244.97]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2025 01:11:59 -0800 Date: Thu, 20 Nov 2025 11:11:57 +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> 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: <20251120085402.GW1949330@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 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? -- With Best Regards, Andy Shevchenko