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 983DB823C2; Thu, 8 Feb 2024 18:15:00 +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=1707416100; cv=none; b=afITs8kgI26TNwJdnwXyo4upZjP/VEeNLFemnknhT77j/B5Zh3hKz5YKevAjY4f8944NADa6PIULqXePW6W9xlOE0oEYBZ62ObFksh+leLF3k86PJazLIBwZxNLTnKmi0diKiaMuEFA7wdxPyerUZHxoCof672C4/V93nyEo/f0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707416100; c=relaxed/simple; bh=aIG2zX5DjtaY+olsfT6pZkv89oJjkPLs6D2/TaAxBPI=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=MsLoz1vW/Eg1rCIWE6MmbwSiAwwt3zvbFSF4PBgIZdFxU66JxU+Jr5axOyJ6ob3dUGikusKjr8UtOCL32nrEWhtGesswKyMGNxtlu2XgGNgcHZ4LumLoj3a6Qd1TCRMO6S0YziT9X4yekdMcj7+qtCY1pUbmW8+dwa2Wg42KnYA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RiZmpKyy; 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="RiZmpKyy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65972C433C7; Thu, 8 Feb 2024 18:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707416100; bh=aIG2zX5DjtaY+olsfT6pZkv89oJjkPLs6D2/TaAxBPI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=RiZmpKyye/Vj5bRmKHgM0QYV+JJZNz7rU1CKKb3W9g+os4nMuORfFutfy9QOyM+OJ xDnMSOZ5k8c6ZxGpTPY38tHfwm+9Ril+24u4p9Acrb2bXIR4vPjlfgOvx3gk/JvY8V s7/tnCrqfLFSws4DGI3sWTRSfWV8rBwilJjZKYW/jDfGSMZ/DRSahVf7HySUDxPmR1 LtIswGErNeR+z0ohtzGwsm+6pNeUdFNNyixjhiRkY6fBnSI3BaxGOHjPtxn6/4WNXs CsoIcyltVUukepzC6Xca1UjDCgLyDq1oMyHJBKUwt9l4D4bv9M4ZdABwqWZpF12+hO 8By4XeBj1GkUg== Date: Thu, 8 Feb 2024 18:14:55 +0000 From: Lee Jones To: Andy Shevchenko Cc: Flavio Suligoi , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Thompson , Jingoo Han , Helge Deller Subject: Re: [PATCH v2 0/3] backlight: mp3309c: Allow to use on non-OF platforms Message-ID: <20240208181455.GA689448@google.com> References: <20240201151537.367218-1-andriy.shevchenko@linux.intel.com> <20240208113425.GK689448@google.com> <20240208173946.GX689448@google.com> Precedence: bulk X-Mailing-List: linux-fbdev@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, 08 Feb 2024, Andy Shevchenko wrote: > On Thu, Feb 08, 2024 at 05:39:46PM +0000, Lee Jones wrote: > > On Thu, 08 Feb 2024, Andy Shevchenko wrote: > > > On Thu, Feb 08, 2024 at 11:34:25AM +0000, Lee Jones wrote: > > > > On Thu, 01 Feb 2024, Andy Shevchenko wrote: > > ... > > > > > > backlight: mp3309c: Utilise temporary variable for struct device > > > > > > (1) > > > > > > > Set no longer applies. Please rebase, thanks. > > > > > > I got a contradictory messages: > > > 1) email that says that all had been applied; > > > 2) this email (that tells the complete opposite); > > > 3) the repository where the first two were applied. > > > > > > While you can amend your scripts, I think I need to rebase only the last patch > > > > This is what I assume happened: > > > > 1. Attempted to apply the set (as a set) > > 2. 2 commits applied cleanly > > 3. The final commit conflicted > > Which is really strange. I have just applied (with b4) on top of your changes > and no complains so far. > > $ git am ./v2_20240201_andriy_shevchenko_backlight_mp3309c_allow_to_use_on_non_of_platforms.mbx > Applying: backlight: mp3309c: Make use of device properties > Applying: backlight: mp3309c: use dev_err_probe() instead of dev_err() > Applying: backlight: mp3309c: Utilise temporary variable for struct device > > Can you show what b4 tells you about this? Fetching patch(es) Analyzing 14 messages in the thread Checking attestation on all messages, may take a moment... --- ✓ [PATCH v2 1/3] backlight: mp3309c: Make use of device properties + Reviewed-by: Daniel Thompson (✓ DKIM/linaro.org) + Link: https://lore.kernel.org/r/20240201151537.367218-2-andriy.shevchenko@linux.intel.com + Signed-off-by: Lee Jones ✓ [PATCH v2 2/3] backlight: mp3309c: use dev_err_probe() instead of dev_err() + Tested-by: Flavio Suligoi (✗ DKIM/asem.it) + Reviewed-by: Daniel Thompson (✓ DKIM/linaro.org) + Link: https://lore.kernel.org/r/20240201151537.367218-3-andriy.shevchenko@linux.intel.com + Signed-off-by: Lee Jones ✓ [PATCH v2 3/3] backlight: mp3309c: Utilise temporary variable for struct device + Link: https://lore.kernel.org/r/20240201151537.367218-4-andriy.shevchenko@linux.intel.com + Signed-off-by: Lee Jones --- ✓ Signed: DKIM/intel.com (From: andriy.shevchenko@linux.intel.com) --- Total patches: 3 Prepared a fake commit range for 3-way merge (672ecc5199b5..d507b9f4c5b9) --- Link: https://lore.kernel.org/r/20240201151537.367218-1-andriy.shevchenko@linux.intel.com Base: not specified Running through checkpatch.pl total: 0 errors, 0 warnings, 103 lines checked "[PATCH v2 1/3] backlight: mp3309c: Make use of device properties" has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 41 lines checked "[PATCH v2 2/3] backlight: mp3309c: use dev_err_probe() instead of" has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 81 lines checked "[PATCH v2 3/3] backlight: mp3309c: Utilise temporary variable for" has no obvious style problems and is ready for submission. Check the results (hit return to continue or Ctrl+c to exit) Applying patch(es) Applying: backlight: mp3309c: Make use of device properties Applying: backlight: mp3309c: use dev_err_probe() instead of dev_err() Applying: backlight: mp3309c: Utilise temporary variable for struct device Using index info to reconstruct a base tree... M drivers/video/backlight/mp3309c.c Checking patch drivers/video/backlight/mp3309c.c... Applied patch drivers/video/backlight/mp3309c.c cleanly. Falling back to patching base and 3-way merge... error: Your local changes to the following files would be overwritten by merge: drivers/video/backlight/mp3309c.c Please commit your changes or stash them before you merge. Aborting error: Failed to merge in the changes. Patch failed at 0003 backlight: mp3309c: Utilise temporary variable for struct device hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". -- Lee Jones [李琼斯]