Remove junk from constrained-to-confined.diff.

kernel-patches/for-mainline/constrained-to-confined.diff

@@ -19,42 +19,6 @@ Index: b/security/apparmor/apparmor.h
  					 AA_EXEC_PROFILE)
  
  /* Control parameters (0 or 1), settable thru module/boot flags or
-Index: b/security/apparmor/capability_names.h
-===================================================================
---- a/security/apparmor/capability_names.h
-+++ /dev/null
-@@ -1,31 +0,0 @@
--[0]  = "chown",
--[1]  = "dac_override",
--[2]  = "dac_read_search",
--[3]  = "fowner",
--[4]  = "fsetid",
--[5]  = "kill",
--[6]  = "setgid",
--[7]  = "setuid",
--[8]  = "setpcap",
--[9]  = "linux_immutable",
--[10]  = "net_bind_service",
--[11]  = "net_broadcast",
--[12]  = "net_admin",
--[13]  = "net_raw",
--[14]  = "ipc_lock",
--[15]  = "ipc_owner",
--[16]  = "sys_module",
--[17]  = "sys_rawio",
--[18]  = "sys_chroot",
--[19]  = "sys_ptrace",
--[20]  = "sys_pacct",
--[21]  = "sys_admin",
--[22]  = "sys_boot",
--[23]  = "sys_nice",
--[24]  = "sys_resource",
--[25]  = "sys_time",
--[26]  = "sys_tty_config",
--[27]  = "mknod",
--[28]  = "lease",
--[29]  = "audit_write",
--[30]  = "audit_control",
 Index: b/security/apparmor/main.c
 ===================================================================
 --- a/security/apparmor/main.c