Since the kernel patches have not been accepted yet, it seems better to revert these patches while they can still be cleanly reverted just in case the kernel patches are not accepted. If the kernel patches get accepted, then I will re-apply these patches. I should have waited for the kernel patches to be accepted before committing these in the first place. James Carter (8): Revert "libsepol/cil: add support for prefix/suffix filename transtions to CIL" Revert "checkpolicy,libsepol: add prefix/suffix support to module policy" Revert "checkpolicy,libsepol: add prefix/suffix support to kernel policy" Revert "libsepol: implement new module binary format of avrule" Revert "libsepol: implement new kernel binary format for avtab" Revert "checkpolicy,libsepol: move filename transition rules to avrule" Revert "checkpolicy,libsepol: move filename transitions to avtab" Revert "checkpolicy,libsepol: move transition to separate structure in avtab" checkpolicy/checkmodule.c | 9 - checkpolicy/module_compiler.c | 12 + checkpolicy/module_compiler.h | 1 + checkpolicy/policy_define.c | 211 +++++- checkpolicy/policy_define.h | 3 +- checkpolicy/policy_parse.y | 13 +- checkpolicy/policy_scan.l | 4 - checkpolicy/test/dismod.c | 39 +- checkpolicy/test/dispol.c | 106 ++- libsepol/cil/src/cil.c | 6 - libsepol/cil/src/cil_binary.c | 63 +- libsepol/cil/src/cil_build_ast.c | 26 +- libsepol/cil/src/cil_copy_ast.c | 1 - libsepol/cil/src/cil_internal.h | 4 - libsepol/cil/src/cil_policy.c | 17 +- libsepol/cil/src/cil_resolve_ast.c | 10 - libsepol/cil/src/cil_write_ast.c | 2 - libsepol/include/sepol/policydb/avtab.h | 19 +- libsepol/include/sepol/policydb/hashtab.h | 8 - libsepol/include/sepol/policydb/policydb.h | 50 +- libsepol/src/avrule_block.c | 1 + libsepol/src/avtab.c | 338 +--------- libsepol/src/conditional.c | 6 +- libsepol/src/expand.c | 153 +++-- libsepol/src/kernel_to_cil.c | 182 +++-- libsepol/src/kernel_to_common.h | 10 - libsepol/src/kernel_to_conf.c | 178 +++-- libsepol/src/link.c | 57 +- libsepol/src/module_to_cil.c | 86 ++- libsepol/src/optimize.c | 8 - libsepol/src/policydb.c | 479 +++++++++++--- libsepol/src/policydb_validate.c | 101 ++- libsepol/src/services.c | 5 +- libsepol/src/write.c | 735 +++++---------------- 34 files changed, 1390 insertions(+), 1553 deletions(-) -- 2.41.0