From: Mark Brown <broonie@kernel•org>
To: William Breathitt Gray <wbg@kernel•org>
Cc: David Lechner <dlechner@baylibre•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the counter-next tree with the counter-current tree
Date: Mon, 24 Jun 2024 18:55:15 +0100 [thread overview]
Message-ID: <ZnmzA0nM0Sn2Awkn@sirena.org.uk> (raw)
[-- 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 --]
next reply other threads:[~2024-06-24 17:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-24 17:55 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-09-28 17:32 linux-next: manual merge of the counter-next tree with the counter-current tree broonie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZnmzA0nM0Sn2Awkn@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=dlechner@baylibre$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=wbg@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox