From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Luis Chamberlain <mcgrof@kernel.org>, David Miller <davem@davemloft.net>
Cc: Networking <netdev@vger.kernel.org>,
Alexei Starovoitov <ast@kernel.org>, Jiri Olsa <jolsa@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Zhen Lei <thunder.leizhen@huawei.com>
Subject: linux-next: manual merge of the modules tree with the net-next tree
Date: Mon, 14 Nov 2022 10:52:49 +1100 [thread overview]
Message-ID: <20221114105249.4548adbc@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1431 bytes --]
Hi all,
Today's linux-next merge of the modules tree got a conflict in:
kernel/trace/ftrace.c
between commit:
3640bf8584f4 ("ftrace: Add support to resolve module symbols in ftrace_lookup_symbols")
from the net-next tree and commit:
477f7e48d4f4 ("kallsyms: Delete an unused parameter related to kallsyms_on_each_symbol()")
from the modules 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.
--
Cheers,
Stephen Rothwell
diff --cc kernel/trace/ftrace.c
index 705b990d264d,7a06991624d4..000000000000
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@@ -8257,12 -8257,7 +8257,11 @@@ struct kallsyms_data
size_t found;
};
+/* This function gets called for all kernel and module symbols
+ * and returns 1 in case we resolved all the requested symbols,
+ * 0 otherwise.
+ */
- static int kallsyms_callback(void *data, const char *name,
- struct module *mod, unsigned long addr)
+ static int kallsyms_callback(void *data, const char *name, unsigned long addr)
{
struct kallsyms_data *args = data;
const char **sym;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-11-13 23:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-13 23:52 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-11-13 23:46 linux-next: manual merge of the modules tree with the net-next tree Stephen Rothwell
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=20221114105249.4548adbc@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ast@kernel.org \
--cc=davem@davemloft.net \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=thunder.leizhen@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).