diff mbox series

linux-next: manual merge of the modules tree with the net-next tree

Message ID 20221114104633.4961d175@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the modules tree with the net-next tree |

Commit Message

Stephen Rothwell Nov. 13, 2022, 11:46 p.m. UTC 
  Hi all,

Today's linux-next merge of the modules tree got conflicts in:

  include/linux/module.h
  kernel/module/kallsyms.c

between commit:

  73feb8d5fa3b ("kallsyms: Make module_kallsyms_on_each_symbol generally available")

from the net-next tree and commit:

  90de88426f3c ("livepatch: Improve the search performance of module_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.
diff mbox series

Patch

diff --cc include/linux/module.h
index 35876e89eb93,3b312a1fcf59..000000000000
--- a/include/linux/module.h
diff --cc kernel/module/kallsyms.c
index 4523f99b0358,329cef573675..000000000000
--- a/kernel/module/kallsyms.c