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

* linux-next: manual merge of the modules tree with the vfs tree
@ 2019-05-03  3:41 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2019-05-03  3:41 UTC (permalink / raw)
  To: Jessica Yu, Al Viro
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	David Howells, Tri Vo

[-- Attachment #1: Type: text/plain, Size: 800 bytes --]

Hi all,

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

  include/linux/module.h

between commit:

  007ec26cdc9f ("vfs: Implement logging through fs_context")

from the vfs tree and commit:

  dadec066d8fa ("module: add stubs for within_module functions")

from the modules tree.

I fixed it up (both these commits added the stub for
within_module_core, so I just used the latter) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] only message in thread