linux-next: manual merge of the tip tree with the pm tree
Mark Brown
maintainerHi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/thermal/qcom/lmh.c
between commit:
80883ce8b1fd2 ("thermal/drivers/qcom/lmh: Remove spurious IRQF_ONESHOT")
from the pm tree and commit:
781b391557a74 ("thermal/qcom/lmh: Replace IRQF_ONESHOT with IRQF_NO_THREAD")
from the tip tree.
I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
drivers/thermal/qcom/lmh.c +0 -0
@@@ -220,7 -220,8 +220,7 @@@ static int lmh_probe(struct platform_de/* Disable the irq and let cpufreq enable it when ready to handle the interrupt */ irq_set_status_flags (lmh_data->irq,IRQ_NOAUTOEN ); ret =devm_request_irq (dev, lmh_data->irq, lmh_handle_irq, -IRQF_NO_THREAD |IRQF_NO_SUSPEND , -"lmh-irq" , lmh_data); + IRQF_NO_SUSPEND, "lmh-irq", lmh_data);if (ret) {dev_err (dev,"Error %d registering irq %x\n" , ret, lmh_data->irq);irq_domain_remove (lmh_data->domain);
Quoted 9 lines · Mark Brown
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/thermal/qcom/lmh.cbetween commit:
80883ce8b1fd2("thermal/drivers/qcom/lmh: Remove spuriousIRQF_ONESHOT")
I'll drop this one because I think that it's better to use IRQF_NO_THREAD in that driver.
Thanks!
Quoted 27 lines
from the pm tree and commit:
781b391557a74 ("thermal/qcom/lmh: Replace IRQF_ONESHOT with IRQF_NO_THREAD")from the tip tree.
I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
drivers/thermal/qcom/lmh.c +0
-0@@@ -220,7 -220,8 +220,7 @@@ static int lmh_probe(struct platform_de/* Disable the irq and let cpufreq enable it when ready to handle the interrupt */ irq_set_status_flags (lmh_data->irq,IRQ_NOAUTOEN ); ret =devm_request_irq (dev, lmh_data->irq, lmh_handle_irq, -IRQF_NO_THREAD |IRQF_NO_SUSPEND , -"lmh-irq" , lmh_data); + IRQF_NO_SUSPEND, "lmh-irq", lmh_data);if (ret) {dev_err (dev,"Error %d registering irq %x\n" , ret, lmh_data->irq);irq_domain_remove (lmh_data->domain);
Quoted 5 lines · Rafael J
Quoted 4 lines · Mark Brown
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
Quoted 8 lines
Quoted 5 lines
drivers/thermal/qcom/lmh.cbetween commit:
80883ce8b1fd2("thermal/drivers/qcom/lmh: Remove spuriousIRQF_ONESHOT")I'll drop this one because I think that it's better to use
IRQF_NO_THREADin that driver.
I second this. IRQF_NO_THREAD should be used.
Quoted 1 line
Thanks!
Sebastian