Hi Josh,
Thanks - that's a merge conflict I overlooked, fixed in the resent version.
But, as Geert points out this breaks patch management tools. I'll resend
as v12 later.
Cheers,
Michael
Am 11.01.2023 um 06:00 schrieb Josh Juran:
On Jan 9, 2023, at 7:45 PM, Michael Schmitz <schmitzmic@xxxxxxxxx> wrote:
Add necessary arch Kconfig options, define TIF_SECCOMP trace
flag and provide basic seccomp filter support in asm/syscall.h
...
Signed-off-by: Michael Schmitz <schmitzmic@xxxxxxxxx>
--
Changes from v10:
- fix merge conflicts
...
The patch below adds, rather than removes, merge conflict markers. Am I missing something?
diff --git a/Documentation/features/seccomp/seccomp-filter/arch-support.txt b/Documentation/features/seccomp/seccomp-filter/arch-support.txt
index dc71bf7b1a7e..0c2ac424094d 100644
--- a/Documentation/features/seccomp/seccomp-filter/arch-support.txt
+++ b/Documentation/features/seccomp/seccomp-filter/arch-support.txt
@@ -13,8 +13,12 @@
| csky: | ok |
| hexagon: | TODO |
| ia64: | TODO |
+<<<<<<< HEAD
| loongarch: | ok |
| m68k: | TODO |
+=======
+ | m68k: | ok |
+>>>>>>> 596095b777b9... m68k: add kernel seccomp support
| microblaze: | TODO |
| mips: | ok |
| nios2: | TODO |
Cheers,
Josh
