* linux-next: manual merge of the counter-next tree with the counter-current tree
@ 2022-09-28 17:32 broonie
0 siblings, 0 replies; 2+ messages in thread
From: broonie @ 2022-09-28 17:32 UTC (permalink / raw)
To: William Breathitt Gray
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
William Breathitt Gray
Hi all,
Today's linux-next merge of the counter-next tree got a conflict in:
include/linux/counter.h
between commit:
8294b04153c33 ("counter: Realign counter_comp comment block to 80 characters")
from the counter-current tree and commits:
88f48f81d496f ("counter: Realign counter_comp comment block to 80 characters")
b6e53438badcb ("counter: Introduce the Signal polarity component")
3cebaa0b807a2 ("counter: Introduce the Count capture component")
a51fd608704bd ("counter: Introduce the COUNTER_COMP_ARRAY component type")
from the counter-next 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.
diff --cc include/linux/counter.h
index a81234bc8ea8e,c41fa602ed283..0000000000000
--- a/include/linux/counter.h
+++ b/include/linux/counter.h
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the counter-next tree with the counter-current tree
@ 2024-06-24 17:55 Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2024-06-24 17:55 UTC (permalink / raw)
To: William Breathitt Gray
Cc: David Lechner, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1411 bytes --]
Hi all,
Today's linux-next merge of the counter-next tree got a conflict in:
drivers/counter/ti-eqep.c
between commit:
0cf81c73e4c6a ("counter: ti-eqep: enable clock at probe")
from the counter-current tree and commit:
1c30c6d024726 ("counter: ti-eqep: implement over/underflow events")
from the counter-next 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.
diff --cc drivers/counter/ti-eqep.c
index 825ae22c3ebc7,9742ba9fc3072..0000000000000
--- a/drivers/counter/ti-eqep.c
+++ b/drivers/counter/ti-eqep.c
@@@ -6,8 -6,8 +6,9 @@@
*/
#include <linux/bitops.h>
+#include <linux/clk.h>
#include <linux/counter.h>
+ #include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/mod_devicetable.h>
#include <linux/module.h>
@@@ -377,8 -465,7 +466,8 @@@ static int ti_eqep_probe(struct platfor
struct counter_device *counter;
struct ti_eqep_cnt *priv;
void __iomem *base;
+ struct clk *clk;
- int err;
+ int err, irq;
counter = devm_counter_alloc(dev, sizeof(*priv));
if (!counter)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-06-24 17:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-28 17:32 linux-next: manual merge of the counter-next tree with the counter-current tree broonie
-- strict thread matches above, loose matches on Subject: below --
2024-06-24 17:55 Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox