Messages in this thread | | | Date | Wed, 10 Jan 2024 11:13:38 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the security tree with the jc_docs tree |
| |
Hi all,
On Fri, 5 Jan 2024 13:11:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the security tree got a conflict in: > > Documentation/userspace-api/index.rst > > between commits: > > 77e075579e88 ("Documentation: move driver-api/isapnp to userspace-api/") > bb67bf1c4a56 ("Documentation: move driver-api/dcdbas to userspace-api/") > > from the jc_docs tree and commit: > > f3b8788cde61 ("LSM: Identify modules by more than name") > > from the security 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 Documentation/userspace-api/index.rst > index 74bc0716432e,8be8b1979194..000000000000 > --- a/Documentation/userspace-api/index.rst > +++ b/Documentation/userspace-api/index.rst > @@@ -30,9 -33,7 +30,10 @@@ place where this information is gathere > sysfs-platform_profile > vduse > futex2 > + tee > + isapnp > + dcdbas > + lsm > > .. only:: subproject and html >
This is now a conflict between the jc_docs tree and Linus' tree.
-- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |