* linux-next: manual merge of the security tree with the asm-generic tree
@ 2023-10-27 1:52 Stephen Rothwell
2023-10-28 15:30 ` Paul Moore
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2023-10-27 1:52 UTC (permalink / raw)
To: Paul Moore, Arnd Bergmann
Cc: Ard Biesheuvel, Casey Schaufler, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 761 bytes --]
Hi all,
Today's linux-next merge of the security tree got a conflict in:
arch/ia64/kernel/syscalls/syscall.tbl
between commit:
cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
from the asm-generic tree and commit:
6d54f25e4605 ("LSM: wireup Linux Security Module syscalls")
from the security tree.
I fixed it up (I just deleted the file) 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] 2+ messages in thread
* Re: linux-next: manual merge of the security tree with the asm-generic tree
2023-10-27 1:52 linux-next: manual merge of the security tree with the asm-generic tree Stephen Rothwell
@ 2023-10-28 15:30 ` Paul Moore
0 siblings, 0 replies; 2+ messages in thread
From: Paul Moore @ 2023-10-28 15:30 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, Ard Biesheuvel, Casey Schaufler,
Linux Kernel Mailing List, Linux Next Mailing List
On Thu, Oct 26, 2023 at 9:52 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the security tree got a conflict in:
>
> arch/ia64/kernel/syscalls/syscall.tbl
>
> between commit:
>
> cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
>
> from the asm-generic tree and commit:
>
> 6d54f25e4605 ("LSM: wireup Linux Security Module syscalls")
>
> from the security tree.
>
> I fixed it up (I just deleted the file) 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.
Thanks Stephen, I'll update the LSM tree if/when the ia64 code is
removed from Linus' tree.
--
paul-moore.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-28 15:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-27 1:52 linux-next: manual merge of the security tree with the asm-generic tree Stephen Rothwell
2023-10-28 15:30 ` Paul Moore
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).