From: broonie@kernel•org
To: William Breathitt Gray <wbg@kernel•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
William Breathitt Gray <william.gray@linaro•org>
Subject: linux-next: manual merge of the counter-next tree with the counter-current tree
Date: Wed, 28 Sep 2022 18:32:48 +0100 [thread overview]
Message-ID: <20220928173248.236720-1-broonie@kernel.org> (raw)
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
next reply other threads:[~2022-09-28 17:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-28 17:32 broonie [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-06-24 17:55 linux-next: manual merge of the counter-next tree with the counter-current tree Mark Brown
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=20220928173248.236720-1-broonie@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=wbg@kernel$(echo .)org \
--cc=william.gray@linaro$(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