From: broonie@kernel•org
To: Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Miquel Raynal <miquel.raynal@bootlin•com>,
Rob Herring <robh@kernel•org>,
Srinivas Kandagatla <srinivas.kandagatla@linaro•org>
Subject: linux-next: manual merge of the char-misc tree with the devicetree tree
Date: Fri, 14 Apr 2023 16:13:26 +0100 [thread overview]
Message-ID: <20230414151326.2134818-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
include/linux/of.h
between commit:
82174a0a9c5cf ("of: Move of_device_get_match_data() declaration")
from the devicetree tree and commit:
673aa1ed1c9b6 ("of: Rename of_modalias_node()")
from the char-misc 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/of.h
index bc2eb39dcf753,9b7a99499ef35..0000000000000
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@@ -370,8 -373,8 +370,9 @@@ extern int of_n_addr_cells(struct devic
extern int of_n_size_cells(struct device_node *np);
extern const struct of_device_id *of_match_node(
const struct of_device_id *matches, const struct device_node *node);
+extern const void *of_device_get_match_data(const struct device *dev);
- extern int of_modalias_node(struct device_node *node, char *modalias, int len);
+ extern int of_alias_from_compatible(const struct device_node *node, char *alias,
+ int len);
extern void of_print_phandle_args(const char *msg, const struct of_phandle_args *args);
extern int __of_parse_phandle_with_args(const struct device_node *np,
const char *list_name, const char *cells_name, int cell_count,
next reply other threads:[~2023-04-14 15:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-14 15:13 broonie [this message]
2023-04-15 5:52 ` linux-next: manual merge of the char-misc tree with the devicetree tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2025-01-07 3:43 Stephen Rothwell
2025-01-07 7:34 ` Greg KH
2023-04-11 3:57 Stephen Rothwell
2023-04-11 7:33 ` Greg KH
2023-04-11 7:41 ` Miquel Raynal
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=20230414151326.2134818-1-broonie@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miquel.raynal@bootlin$(echo .)com \
--cc=robh@kernel$(echo .)org \
--cc=srinivas.kandagatla@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