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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20190503134123.1a8e0e32@canb.auug.org.au>
Date:   Fri, 3 May 2019 13:41:23 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jessica Yu <jeyu@...nel.org>, Al Viro <viro@...IV.linux.org.uk>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        David Howells <dhowells@...hat.com>, Tri Vo <trong@...roid.com>
Subject: linux-next: manual merge of the modules tree with the vfs tree

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

Content of type "application/pgp-signature" skipped