FAILED: patch "[PATCH] i2c: nomadik: Remove a useless call in the remove function" failed to apply to 6.4-stable tree
The patch below does not apply to the 6.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.4.y git checkout FETCH_HEAD git cherry-pick -x 05f933d5f7318b03ff2028c1704dc867ac16f2c7 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2023072154-animal-dropkick-6a92@gregkh' --subject-prefix 'PATCH 6.4.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 05f933d5f7318b03ff2028c1704dc867ac16f2c7 Mon Sep 17 00:00:00 2001 From: Christophe JAILLET christophe.jaillet@wanadoo.fr Date: Tue, 4 Jul 2023 21:50:28 +0200 Subject: [PATCH] i2c: nomadik: Remove a useless call in the remove function
Since commit 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver"), there is no more request_mem_region() call in this driver.
So remove the release_mem_region() call from the remove function which is likely a left over.
Fixes: 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver") Cc: stable@vger.kernel.org # v3.6+ Acked-by: Linus Walleij linus.walleij@linaro.org Reviewed-by: Andi Shyti andi.shyti@kernel.org Signed-off-by: Christophe JAILLET christophe.jaillet@wanadoo.fr Signed-off-by: Wolfram Sang wsa@kernel.org
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 1e5fd23ef45c..212f412f1c74 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -1038,7 +1038,6 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
static void nmk_i2c_remove(struct amba_device *adev) { - struct resource *res = &adev->res; struct nmk_i2c_dev *dev = amba_get_drvdata(adev);
i2c_del_adapter(&dev->adap); @@ -1047,7 +1046,6 @@ static void nmk_i2c_remove(struct amba_device *adev) clear_all_interrupts(dev); /* disable the controller */ i2c_clr_bit(dev->virtbase + I2C_CR, I2C_CR_PE); - release_mem_region(res->start, resource_size(res)); }
static struct i2c_vendor_data vendor_stn8815 = {
Since commit 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver"), there is no more request_mem_region() call in this driver.
So remove the release_mem_region() call from the remove function which is likely a left over.
Fixes: 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver") Cc: stable@vger.kernel.org # v3.6+ Acked-by: Linus Walleij linus.walleij@linaro.org Reviewed-by: Andi Shyti andi.shyti@kernel.org Signed-off-by: Christophe JAILLET christophe.jaillet@wanadoo.fr --- The patch below that should fix a merge conflict related to commit 9c7174db4cdd1 ("i2c: nomadik: Use devm_clk_get_enabled()") has been HAND MODIFIED.
I hope it is fine, but is provided as-is. Especially line numbers should be wrong, but 'patch' should be able to deal with it. (sorry if it does not apply)
I guess that it should also apply to all previous branches.
I've left the commit description as it was. Not sure what to do with A-b and R-b tags. --- drivers/i2c/busses/i2c-nomadik.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 1e5fd23ef45c..212f412f1c74 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -1038,7 +1038,6 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
static void nmk_i2c_remove(struct amba_device *adev) { - struct resource *res = &adev->res; struct nmk_i2c_dev *dev = amba_get_drvdata(adev);
i2c_del_adapter(&dev->adap); @@ -1047,7 +1046,6 @@ static void nmk_i2c_remove(struct amba_device *adev) /* disable the controller */ i2c_clr_bit(dev->virtbase + I2C_CR, I2C_CR_PE); clk_disable_unprepare(dev->clk); - release_mem_region(res->start, resource_size(res)); }
static struct i2c_vendor_data vendor_stn8815 = {
On Fri, Jul 21, 2023 at 07:47:41PM +0200, Christophe JAILLET wrote:
Since commit 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver"), there is no more request_mem_region() call in this driver.
So remove the release_mem_region() call from the remove function which is likely a left over.
Fixes: 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver") Cc: stable@vger.kernel.org # v3.6+ Acked-by: Linus Walleij linus.walleij@linaro.org Reviewed-by: Andi Shyti andi.shyti@kernel.org Signed-off-by: Christophe JAILLET christophe.jaillet@wanadoo.fr
The patch below that should fix a merge conflict related to commit 9c7174db4cdd1 ("i2c: nomadik: Use devm_clk_get_enabled()") has been HAND MODIFIED.
I don't understand, that commit is not in the stable trees. What do you mean by "hand modified"?
I hope it is fine, but is provided as-is. Especially line numbers should be wrong, but 'patch' should be able to deal with it. (sorry if it does not apply)
I guess that it should also apply to all previous branches.
I've left the commit description as it was. Not sure what to do with A-b and R-b tags.
Why isn't this needed in Linus's tree?
confused,
greg k-h
Le 23/07/2023 à 22:34, Greg KH a écrit :
On Fri, Jul 21, 2023 at 07:47:41PM +0200, Christophe JAILLET wrote:
Since commit 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver"), there is no more request_mem_region() call in this driver.
So remove the release_mem_region() call from the remove function which is likely a left over.
Fixes: 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver") Cc: stable@vger.kernel.org # v3.6+ Acked-by: Linus Walleij linus.walleij@linaro.org Reviewed-by: Andi Shyti andi.shyti@kernel.org Signed-off-by: Christophe JAILLET christophe.jaillet@wanadoo.fr
The patch below that should fix a merge conflict related to commit 9c7174db4cdd1 ("i2c: nomadik: Use devm_clk_get_enabled()") has been HAND MODIFIED.
I don't understand, that commit is not in the stable trees. What do you mean by "hand modified"?
I mean that I took the file initially generated by git format-patch when I sent the patch against -next.
I updated the diff context from this file and left everything else as-is. I only added some (apparently unclear :) ) context below the ---.
Yes, precisely. My patch has been sent *after* 9c7174db4cdd1 in -next, and it depends on it.
The proposed modified patch for backport tries to deal with this missing part in older branches.
If 9c7174db4cdd1 was also backported, I think that my patch would apply cleanly.
I hope it is fine, but is provided as-is. Especially line numbers should be wrong, but 'patch' should be able to deal with it. (sorry if it does not apply)
I guess that it should also apply to all previous branches.
I've left the commit description as it was. Not sure what to do with A-b and R-b tags.
Why isn't this needed in Linus's tree?
I never said that.
It is one of the first time, if not the first one, I update a patch to ease backport. I only sent something for 6.4.y, but it must be valid for other branches as well. (i.e. # v3.6+)
The way I generated this backport proposal is likely not the correct approach. I choose to hand modify the initial git format-patch output. I think that I should have switched to the expected branch and apply a clean process from there.
Personalty, I don't really care if backported or not. I don't use these older kernel. I don't use this hardware (AFAIK :)). I proposed an updated patch to help, should it be helpful for you or any one else.
If I did it wrong, sorry for the noise.
No hard feeling, but I won't update this backport proposal, should something need to be fixed.
I consider I've already done my part of the job.
CJ
confused,
greg k-h
On Mon, Jul 24, 2023 at 10:20:12PM +0200, Marion & Christophe JAILLET wrote:
Le 23/07/2023 à 22:34, Greg KH a écrit :
On Fri, Jul 21, 2023 at 07:47:41PM +0200, Christophe JAILLET wrote:
Since commit 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver"), there is no more request_mem_region() call in this driver.
So remove the release_mem_region() call from the remove function which is likely a left over.
Fixes: 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver") Cc: stable@vger.kernel.org # v3.6+ Acked-by: Linus Walleij linus.walleij@linaro.org Reviewed-by: Andi Shyti andi.shyti@kernel.org Signed-off-by: Christophe JAILLET christophe.jaillet@wanadoo.fr
The patch below that should fix a merge conflict related to commit 9c7174db4cdd1 ("i2c: nomadik: Use devm_clk_get_enabled()") has been HAND MODIFIED.
I don't understand, that commit is not in the stable trees. What do you mean by "hand modified"?
I mean that I took the file initially generated by git format-patch when I sent the patch against -next.
I updated the diff context from this file and left everything else as-is. I only added some (apparently unclear :) ) context below the ---.
Yes, precisely. My patch has been sent *after* 9c7174db4cdd1 in -next, and it depends on it.
The proposed modified patch for backport tries to deal with this missing part in older branches.
If 9c7174db4cdd1 was also backported, I think that my patch would apply cleanly.
I hope it is fine, but is provided as-is. Especially line numbers should be wrong, but 'patch' should be able to deal with it. (sorry if it does not apply)
I guess that it should also apply to all previous branches.
I've left the commit description as it was. Not sure what to do with A-b and R-b tags.
Why isn't this needed in Linus's tree?
I never said that.
It is one of the first time, if not the first one, I update a patch to ease backport. I only sent something for 6.4.y, but it must be valid for other branches as well. (i.e. # v3.6+)
But what is the patch in Linus's tree? If it's not there yet, there's nothing we can do with this for stable backports. If it is there, we need the git commit id in Linus's tree.
Still confused,
greg k-h
Le 25/07/2023 à 09:09, Greg KH a écrit :
On Mon, Jul 24, 2023 at 10:20:12PM +0200, Marion & Christophe JAILLET wrote:
Le 23/07/2023 à 22:34, Greg KH a écrit :
On Fri, Jul 21, 2023 at 07:47:41PM +0200, Christophe JAILLET wrote:
Since commit 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver"), there is no more request_mem_region() call in this driver.
So remove the release_mem_region() call from the remove function which is likely a left over.
Fixes: 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver") Cc: stable@vger.kernel.org # v3.6+ Acked-by: Linus Walleij linus.walleij@linaro.org Reviewed-by: Andi Shyti andi.shyti@kernel.org Signed-off-by: Christophe JAILLET christophe.jaillet@wanadoo.fr
The patch below that should fix a merge conflict related to commit 9c7174db4cdd1 ("i2c: nomadik: Use devm_clk_get_enabled()") has been HAND MODIFIED.
I don't understand, that commit is not in the stable trees. What do you mean by "hand modified"?
I mean that I took the file initially generated by git format-patch when I sent the patch against -next.
I updated the diff context from this file and left everything else as-is. I only added some (apparently unclear :) ) context below the ---.
Yes, precisely. My patch has been sent *after* 9c7174db4cdd1 in -next, and it depends on it.
The proposed modified patch for backport tries to deal with this missing part in older branches.
If 9c7174db4cdd1 was also backported, I think that my patch would apply cleanly.
I hope it is fine, but is provided as-is. Especially line numbers should be wrong, but 'patch' should be able to deal with it. (sorry if it does not apply)
I guess that it should also apply to all previous branches.
I've left the commit description as it was. Not sure what to do with A-b and R-b tags.
Why isn't this needed in Linus's tree?
I never said that.
It is one of the first time, if not the first one, I update a patch to ease backport. I only sent something for 6.4.y, but it must be valid for other branches as well. (i.e. # v3.6+)
But what is the patch in Linus's tree? If it's not there yet, there's nothing we can do with this for stable backports. If it is there, we need the git commit id in Linus's tree.
Not sure to understand what you need.
In torvalds/linux.git/ : ======================
My initial patch is with the same commit id: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/dr...
The patch that cause the merge issue with older trees is this one. The patch above depends on it: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/dr...
The patch in Fixes: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/dr...
In stable/linux.git/ : ====================
My initial patch is with the same commit id: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/driv...
The patch that cause the merge issue with older trees is this one. The patch above depends on it: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/driv...
The patch in Fixes: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/driv...
In stable/linux.git/?h=linux-6.4.y : ==================================
My patch and the one it depends one are available there, obviously.
The patch in Fixes: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/driv...
The patch sent as "[PATCH 6.4.y] i2c: busses: i2c-nomadik:..." is commit 05f933d5f731 + a need part of 9c7174db4cdd.
If 9c7174db4cdd is backported as well (and applies cleanly), 05f933d5f731 should also work un-modified.
Still confused,
Confused as well.
CJ
greg k-h
Le 23/07/2023 à 22:34, Greg KH a écrit :
On Fri, Jul 21, 2023 at 07:47:41PM +0200, Christophe JAILLET wrote:
Since commit 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver"), there is no more request_mem_region() call in this driver.
So remove the release_mem_region() call from the remove function which is likely a left over.
Fixes: 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver") Cc: stable@vger.kernel.org # v3.6+ Acked-by: Linus Walleij linus.walleij@linaro.org Reviewed-by: Andi Shyti andi.shyti@kernel.org Signed-off-by: Christophe JAILLET christophe.jaillet@wanadoo.fr
The patch below that should fix a merge conflict related to commit 9c7174db4cdd1 ("i2c: nomadik: Use devm_clk_get_enabled()") has been HAND MODIFIED.
I don't understand, that commit is not in the stable trees. What do you mean by "hand modified"?
I hope it is fine, but is provided as-is. Especially line numbers should be wrong, but 'patch' should be able to deal with it. (sorry if it does not apply)
I guess that it should also apply to all previous branches.
I've left the commit description as it was. Not sure what to do with A-b and R-b tags.
Why isn't this needed in Linus's tree?
If *this* is the patch --> see my other reply.
If *this* is the A-b and R-b tags, knowing that it is a *modified version* of what they agreed, I'm not sure that the tags are still relevant. They agreed with the patch in a *given context*. That does not mean that an updated patch is still correct in another context and that they still agree with it.
That' why I wonder.
CJ
confused,
greg k-h
linux-stable-mirror@lists.linaro.org
-
Christophe JAILLET -
Greg KH -
gregkh＠linuxfoundation.org
-
Marion & Christophe JAILLET