Gentoo Archives: gentoo-commits

From: Richard Yao <ryao@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: arch/x86_64/, defaults/
Date: Fri, 31 Jul 2015 18:44:01
Message-Id: 1438368256.4dfd61bd3accf7727be429a9e351e113afa40644.ryao@gentoo
1 commit: 4dfd61bd3accf7727be429a9e351e113afa40644
2 Author: Richard Yao <ryao <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 18 18:12:19 2014 +0000
4 Commit: Richard Yao <ryao <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 31 18:44:16 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4dfd61bd
7
8 Customize configs
9
10 Signed-off-by: Richard Yao <ryao <AT> gentoo.org>
11
12 arch/x86_64/arch-config | 16 ++
13 defaults/kernel-generic-config | 357 +++++++++++++++++++++++++++++++----------
14 2 files changed, 289 insertions(+), 84 deletions(-)
15
16 diff --git a/arch/x86_64/arch-config b/arch/x86_64/arch-config
17 index b369851..322055b 100644
18 --- a/arch/x86_64/arch-config
19 +++ b/arch/x86_64/arch-config
20 @@ -2,6 +2,7 @@ CONFIG_EDAC_I7CORE=m
21 CONFIG_EDAC_SBRIDGE=m
22 CONFIG_EDAC_I7300=m
23 CONFIG_EFI=y
24 +CONFIG_EFI_STUB=y
25 CONFIG_DRM_I915_KMS=y
26 CONFIG_DRM_RADEON_KMS=y
27 CONFIG_MAXSMP=y
28 @@ -31,6 +32,10 @@ CONFIG_POWER_TRACER=y
29 CONFIG_HIGH_RES_TIMERS=y
30 CONFIG_HOTPLUG_PCI_PCIE=y
31 CONFIG_KVM=m
32 +CONFIG_KVM_INTEL=m
33 +CONFIG_KVM_AMD=m
34 +CONFIG_KVM_MMU_AUDIT=y
35 +CONFIG_KVM_DEVICE_ASSIGNMENT=y
36 CONFIG_PCIEPORTBUS=y
37 CONFIG_PCIEAER=y
38 CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
39 @@ -121,3 +126,14 @@ CONFIG_X86_INTEL_PSTATE=m
40 CONFIG_PVPANIC=y
41 CONFIG_FB_HYPERV=m
42 CONFIG_BLK_DEV_NVME=m
43 +CONFIG_MICROCODE=m
44 +CONFIG_X86_MCE_INTEL=y
45 +CONFIG_X86_MCE_AMD=y
46 +CONFIG_IA32_EMULATION=y
47 +CONFIG_IA32_AOUT=y
48 +CONFIG_X86_X32=y
49 +CONFIG_COMPAT=y
50 +CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
51 +CONFIG_X86_DEV_DMA_OPS=y
52 +CONFIG_IOSF_MBI=m
53 +CONFIG_COMPAT_NETLINK_MESSAGES=y
54
55 diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
56 index f9180a2..400bb4a 100644
57 --- a/defaults/kernel-generic-config
58 +++ b/defaults/kernel-generic-config
59 @@ -33,7 +33,8 @@ CONFIG_TASK_XACCT=y
60 CONFIG_TASK_IO_ACCOUNTING=y
61 CONFIG_SYSCTL=y
62 CONFIG_LOG_BUF_SHIFT=19
63 -# CONFIG_IKCONFIG is not set
64 +CONFIG_IKCONFIG=y
65 +CONFIG_IKCONFIG_PROC=y
66 # CONFIG_EMBEDDED is not set
67 CONFIG_KALLSYMS=y
68 CONFIG_KALLSYMS_ALL=y
69 @@ -152,6 +153,25 @@ CONFIG_MLX4_INFINIBAND=m
70 CONFIG_INFINIBAND_NES=m
71 # CONFIG_INFINIBAND_NES_DEBUG is not set
72
73 +CONFIG_EDAC=y
74 +CONFIG_EDAC_LEGACY_SYSFS=y
75 +# CONFIG_EDAC_DEBUG is not set
76 +CONFIG_EDAC_DECODE_MCE=m
77 +CONFIG_EDAC_MCE_INJ=m
78 +CONFIG_EDAC_MM_EDAC=m
79 +CONFIG_EDAC_AMD64=m
80 +CONFIG_EDAC_AMD64_ERROR_INJECTION=y
81 +CONFIG_EDAC_E752X=m
82 +CONFIG_EDAC_I82975X=m
83 +CONFIG_EDAC_I3000=m
84 +CONFIG_EDAC_I3200=m
85 +CONFIG_EDAC_X38=m
86 +CONFIG_EDAC_I5400=m
87 +CONFIG_EDAC_I7CORE=m
88 +CONFIG_EDAC_I5000=m
89 +CONFIG_EDAC_I5100=m
90 +CONFIG_EDAC_I7300=m
91 +
92 #
93 # Executable file formats
94 #
95 @@ -159,6 +179,9 @@ CONFIG_BINFMT_ELF=y
96 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
97 # CONFIG_BINFMT_AOUT is not set
98 CONFIG_BINFMT_MISC=y
99 +CONFIG_COREDUMP=y
100 +CONFIG_SYSVIPC_COMPAT=y
101 +CONFIG_KEYS_COMPAT=y
102
103 #
104 # Device Drivers
105 @@ -738,52 +761,103 @@ CONFIG_FIREWIRE_OHCI_DEBUG=y
106 #
107 CONFIG_NET=y
108
109 -CONFIG_TCP_CONG_ADVANCED=y
110 -CONFIG_TCP_CONG_BIC=m
111 -CONFIG_TCP_CONG_CUBIC=y
112 -CONFIG_TCP_CONG_HTCP=m
113 -CONFIG_TCP_CONG_HSTCP=m
114 -CONFIG_TCP_CONG_HYBLA=m
115 -CONFIG_TCP_CONG_ILLINOIS=m
116 -CONFIG_TCP_CONG_LP=m
117 -CONFIG_TCP_CONG_SCALABLE=m
118 -CONFIG_TCP_CONG_VEGAS=m
119 -CONFIG_TCP_CONG_VENO=m
120 -CONFIG_TCP_CONG_WESTWOOD=m
121 -CONFIG_TCP_CONG_YEAH=m
122 -
123 -CONFIG_TCP_MD5SIG=y
124 -
125 #
126 # Networking options
127 #
128 CONFIG_PACKET=y
129 +CONFIG_PACKET_DIAG=m
130 CONFIG_PACKET_MMAP=y
131 CONFIG_UNIX=y
132 +CONFIG_UNIX_DIAG=m
133 +CONFIG_XFRM=y
134 +CONFIG_XFRM_ALGO=y
135 +CONFIG_XFRM_USER=y
136 +CONFIG_XFRM_SUB_POLICY=y
137 +CONFIG_XFRM_MIGRATE=y
138 +CONFIG_XFRM_STATISTICS=y
139 +CONFIG_XFRM_IPCOMP=m
140 CONFIG_NET_KEY=m
141 CONFIG_NET_KEY_MIGRATE=y
142 CONFIG_INET=y
143 -CONFIG_INET_LRO=y
144 -CONFIG_INET_TUNNEL=m
145 -CONFIG_INET_DIAG=m
146 CONFIG_IP_MULTICAST=y
147 CONFIG_IP_ADVANCED_ROUTER=y
148 +CONFIG_IP_FIB_TRIE_STATS=y
149 CONFIG_IP_MULTIPLE_TABLES=y
150 CONFIG_IP_ROUTE_MULTIPATH=y
151 CONFIG_IP_ROUTE_VERBOSE=y
152 -CONFIG_IP_NF_SECURITY=m
153 +CONFIG_IP_ROUTE_CLASSID=y
154 # CONFIG_IP_PNP is not set
155 CONFIG_NET_IPIP=m
156 +CONFIG_NET_IPGRE_DEMUX=m
157 +CONFIG_NET_IP_TUNNEL=m
158 CONFIG_NET_IPGRE=m
159 CONFIG_NET_IPGRE_BROADCAST=y
160 CONFIG_IP_MROUTE=y
161 +CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
162 CONFIG_IP_PIMSM_V1=y
163 CONFIG_IP_PIMSM_V2=y
164 -# CONFIG_ARPD is not set
165 CONFIG_SYN_COOKIES=y
166 +CONFIG_NET_IPVTI=m
167 CONFIG_INET_AH=m
168 CONFIG_INET_ESP=m
169 CONFIG_INET_IPCOMP=m
170 +CONFIG_INET_XFRM_TUNNEL=m
171 +CONFIG_INET_TUNNEL=m
172 +CONFIG_INET_XFRM_MODE_TRANSPORT=m
173 +CONFIG_INET_XFRM_MODE_TUNNEL=m
174 +CONFIG_INET_XFRM_MODE_BEET=m
175 +CONFIG_INET_LRO=y
176 +CONFIG_INET_DIAG=m
177 +CONFIG_INET_UDP_DIAG=m
178 +CONFIG_TCP_CONG_ADVANCED=y
179 +CONFIG_TCP_CONG_BIC=m
180 +CONFIG_TCP_CONG_CUBIC=y
181 +CONFIG_TCP_CONG_WESTWOOD=m
182 +CONFIG_TCP_CONG_HTCP=m
183 +CONFIG_TCP_CONG_HSTCP=m
184 +CONFIG_TCP_CONG_HYBLA=m
185 +CONFIG_TCP_CONG_VEGAS=m
186 +CONFIG_TCP_CONG_SCALABLE=m
187 +CONFIG_TCP_CONG_LP=m
188 +CONFIG_TCP_CONG_VENO=m
189 +CONFIG_TCP_CONG_YEAH=m
190 +CONFIG_TCP_CONG_ILLINOIS=m
191 +CONFIG_DEFAULT_CUBIC=y
192 +# CONFIG_DEFAULT_RENO is not set
193 +CONFIG_DEFAULT_TCP_CONG="cubic"
194 +CONFIG_TCP_MD5SIG=y
195 +CONFIG_IPV6=y
196 +CONFIG_IPV6_ROUTER_PREF=y
197 +CONFIG_IPV6_ROUTE_INFO=y
198 +CONFIG_IPV6_OPTIMISTIC_DAD=y
199 +CONFIG_INET6_AH=m
200 +CONFIG_INET6_ESP=m
201 +CONFIG_INET6_IPCOMP=m
202 +CONFIG_IPV6_MIP6=m
203 +CONFIG_INET6_XFRM_TUNNEL=m
204 +CONFIG_INET6_TUNNEL=m
205 +CONFIG_INET6_XFRM_MODE_TRANSPORT=m
206 +CONFIG_INET6_XFRM_MODE_TUNNEL=m
207 +CONFIG_INET6_XFRM_MODE_BEET=m
208 +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
209 +CONFIG_IPV6_SIT=m
210 +CONFIG_IPV6_SIT_6RD=y
211 +CONFIG_IPV6_NDISC_NODETYPE=y
212 +CONFIG_IPV6_TUNNEL=m
213 +# CONFIG_IPV6_GRE is not set
214 +CONFIG_IPV6_MULTIPLE_TABLES=y
215 +# CONFIG_IPV6_SUBTREES is not set
216 +CONFIG_IPV6_MROUTE=y
217 +CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
218 +CONFIG_IPV6_PIMSM_V2=y
219 +CONFIG_NETLABEL=y
220 +CONFIG_NETWORK_SECMARK=y
221 +CONFIG_NETWORK_PHY_TIMESTAMPING=y
222 +CONFIG_NETFILTER=y
223 +# CONFIG_NETFILTER_DEBUG is not set
224 +CONFIG_NETFILTER_ADVANCED=y
225 +CONFIG_BRIDGE_NETFILTER=y
226 +
227 CONFIG_NETCONSOLE=m
228 CONFIG_NETCONSOLE_DYNAMIC=y
229 CONFIG_NETPOLL_TRAP=y
230 @@ -844,10 +918,65 @@ CONFIG_DECNET_ROUTER=y
231 CONFIG_BRIDGE=m
232 CONFIG_NETFILTER=y
233 CONFIG_NETFILTER_ADVANCED=y
234 -CONFIG_NF_CONNTRACK=m
235 CONFIG_NETFILTER_NETLINK=m
236 +CONFIG_NETFILTER_NETLINK_ACCT=m
237 CONFIG_NETFILTER_NETLINK_QUEUE=m
238 CONFIG_NETFILTER_NETLINK_LOG=m
239 +CONFIG_NF_CONNTRACK=m
240 +CONFIG_NF_CONNTRACK_MARK=y
241 +CONFIG_NF_CONNTRACK_SECMARK=y
242 +CONFIG_NF_CONNTRACK_ZONES=y
243 +CONFIG_NF_CONNTRACK_PROCFS=y
244 +CONFIG_NF_CONNTRACK_EVENTS=y
245 +# CONFIG_NF_CONNTRACK_TIMEOUT is not set
246 +CONFIG_NF_CONNTRACK_TIMESTAMP=y
247 +CONFIG_NF_CONNTRACK_LABELS=y
248 +CONFIG_NF_CT_PROTO_DCCP=m
249 +CONFIG_NF_CT_PROTO_GRE=m
250 +CONFIG_NF_CT_PROTO_SCTP=m
251 +CONFIG_NF_CT_PROTO_UDPLITE=m
252 +CONFIG_NF_CONNTRACK_AMANDA=m
253 +CONFIG_NF_CONNTRACK_FTP=m
254 +CONFIG_NF_CONNTRACK_H323=m
255 +CONFIG_NF_CONNTRACK_IRC=m
256 +CONFIG_NF_CONNTRACK_BROADCAST=m
257 +CONFIG_NF_CONNTRACK_NETBIOS_NS=m
258 +CONFIG_NF_CONNTRACK_SNMP=m
259 +CONFIG_NF_CONNTRACK_PPTP=m
260 +CONFIG_NF_CONNTRACK_SANE=m
261 +CONFIG_NF_CONNTRACK_SIP=m
262 +CONFIG_NF_CONNTRACK_TFTP=m
263 +CONFIG_NF_CT_NETLINK=m
264 +# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
265 +CONFIG_NF_CT_NETLINK_HELPER=m
266 +CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
267 +CONFIG_NF_NAT=m
268 +CONFIG_NF_NAT_NEEDED=y
269 +CONFIG_NF_NAT_PROTO_DCCP=m
270 +CONFIG_NF_NAT_PROTO_UDPLITE=m
271 +CONFIG_NF_NAT_PROTO_SCTP=m
272 +CONFIG_NF_NAT_AMANDA=m
273 +CONFIG_NF_NAT_FTP=m
274 +CONFIG_NF_NAT_IRC=m
275 +CONFIG_NF_NAT_SIP=m
276 +CONFIG_NF_NAT_TFTP=m
277 +CONFIG_NETFILTER_SYNPROXY=m
278 +CONFIG_NF_TABLES=m
279 +CONFIG_NF_TABLES_INET=m
280 +CONFIG_NFT_EXTHDR=m
281 +CONFIG_NFT_META=m
282 +CONFIG_NFT_CT=m
283 +CONFIG_NFT_RBTREE=m
284 +CONFIG_NFT_HASH=m
285 +CONFIG_NFT_COUNTER=m
286 +CONFIG_NFT_LOG=m
287 +CONFIG_NFT_LIMIT=m
288 +CONFIG_NFT_NAT=m
289 +CONFIG_NFT_QUEUE=m
290 +# CONFIG_NFT_REJECT is not set
291 +# CONFIG_NFT_REJECT_INET is not set
292 +CONFIG_NFT_COMPAT=m
293 +CONFIG_NETFILTER_XTABLES=y
294 CONFIG_NETFILTER_XTABLES=y
295 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
296 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
297 @@ -863,22 +992,32 @@ CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
298 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
299 CONFIG_NETFILTER_XT_TARGET_TRACE=m
300 CONFIG_NETFILTER_XT_TARGET_LED=m
301 +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
302 +CONFIG_NETFILTER_XT_MATCH_BPF=m
303 +CONFIG_NETFILTER_XT_MATCH_CGROUP=m
304 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
305 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
306 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
307 +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
308 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
309 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
310 +CONFIG_NETFILTER_XT_MATCH_CPU=m
311 CONFIG_NETFILTER_XT_MATCH_DCCP=m
312 +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
313 CONFIG_NETFILTER_XT_MATCH_DSCP=m
314 CONFIG_NETFILTER_XT_MATCH_ESP=m
315 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
316 CONFIG_NETFILTER_XT_MATCH_HELPER=m
317 +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
318 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
319 +CONFIG_NETFILTER_XT_MATCH_IPVS=m
320 +CONFIG_NETFILTER_XT_MATCH_L2TP=m
321 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
322 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
323 CONFIG_NETFILTER_XT_MATCH_MAC=m
324 CONFIG_NETFILTER_XT_MATCH_MARK=m
325 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
326 +CONFIG_NETFILTER_XT_MATCH_NFACCT=m
327 CONFIG_NETFILTER_XT_MATCH_OWNER=m
328 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
329 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
330 @@ -903,81 +1042,109 @@ CONFIG_BRIDGE_NETFILTER=y
331 #
332 # IP: Netfilter Configuration
333 #
334 +CONFIG_NF_DEFRAG_IPV4=m
335 CONFIG_NF_CONNTRACK_ENABLED=y
336 -
337 -# CONFIG_NF_CT_ACCT is not set
338 -CONFIG_NF_CONNTRACK_MARK=y
339 -CONFIG_NF_CONNTRACK_SECMARK=y
340 -CONFIG_NF_CONNTRACK_EVENTS=y
341 +CONFIG_NF_CONNTRACK_IPV4=m
342 # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
343 -CONFIG_NF_CONNTRACK_AMANDA=m
344 -CONFIG_NF_CONNTRACK_FTP=m
345 -CONFIG_NF_CONNTRACK_H323=m
346 -CONFIG_NF_CONNTRACK_IRC=m
347 -CONFIG_NF_CONNTRACK_NETBIOS_NS=m
348 -CONFIG_NF_CONNTRACK_PPTP=m
349 -CONFIG_NF_CONNTRACK_SANE=m
350 -CONFIG_NF_CONNTRACK_SIP=m
351 -CONFIG_NF_CONNTRACK_TFTP=m
352 -CONFIG_NF_CONNTRACK_IPV4=y
353 -CONFIG_NF_CONNTRACK_IPV6=y
354 -CONFIG_NF_NAT=m
355 -CONFIG_NF_NAT_SNMP_BASIC=m
356 -CONFIG_NF_CT_PROTO_DCCP=m
357 -CONFIG_NF_CT_PROTO_SCTP=m
358 -CONFIG_NF_CT_NETLINK=m
359 -CONFIG_NF_CT_PROTO_UDPLITE=m
360 -
361 +CONFIG_NF_TABLES_IPV4=m
362 +CONFIG_NFT_CHAIN_ROUTE_IPV4=m
363 +CONFIG_NFT_CHAIN_NAT_IPV4=m
364 +# CONFIG_NFT_REJECT_IPV4 is not set
365 +# CONFIG_NF_TABLES_ARP is not set
366 +CONFIG_IP_NF_IPTABLES=m
367 CONFIG_IP_NF_MATCH_ADDRTYPE=m
368 CONFIG_IP_NF_MATCH_AH=m
369 CONFIG_IP_NF_MATCH_ECN=m
370 CONFIG_IP_NF_MATCH_IPRANGE=m
371 CONFIG_IP_NF_MATCH_OWNER=m
372 CONFIG_IP_NF_MATCH_RECENT=m
373 +CONFIG_IP_NF_MATCH_RPFILTER=m
374 CONFIG_IP_NF_MATCH_TOS=m
375 CONFIG_IP_NF_MATCH_TTL=m
376 -CONFIG_IP_NF_TARGET_CLUSTERIP=m
377 +CONFIG_IP_NF_FILTER=m
378 +CONFIG_IP_NF_TARGET_REJECT=m
379 +CONFIG_IP_NF_TARGET_SYNPROXY=m
380 CONFIG_IP_NF_TARGET_MASQUERADE=m
381 -CONFIG_IP_NF_TARGET_REDIRECT=m
382 CONFIG_IP_NF_TARGET_NETMAP=m
383 +CONFIG_IP_NF_TARGET_REDIRECT=m
384 CONFIG_IP_NF_TARGET_SAME=m
385 CONFIG_IP_NF_TARGET_TOS=m
386 -CONFIG_IP_NF_TARGET_ECN=m
387 CONFIG_IP_NF_TARGET_LOG=m
388 CONFIG_IP_NF_TARGET_ULOG=m
389 -CONFIG_IP_NF_TARGET_REJECT=y
390 -CONFIG_IP_NF_TARGET_TTL=m
391 +CONFIG_NF_NAT_IPV4=m
392 +CONFIG_NF_NAT_SNMP_BASIC=m
393 +CONFIG_NF_NAT_PROTO_GRE=m
394 +CONFIG_NF_NAT_PPTP=m
395 +CONFIG_NF_NAT_H323=m
396 CONFIG_IP_NF_MANGLE=m
397 CONFIG_IP_NF_ARPTABLES=m
398 -CONFIG_IP_NF_ARPFILTER=m
399 -CONFIG_IP_NF_ARP_MANGLE=m
400 +CONFIG_IP_NF_TARGET_CLUSTERIP=m
401 +CONFIG_IP_NF_TARGET_ECN=m
402 +CONFIG_IP_NF_TARGET_TTL=m
403 CONFIG_IP_NF_QUEUE=m
404 CONFIG_IP_NF_RAW=m
405 -
406 -CONFIG_IP_NF_IPTABLES=m
407 -CONFIG_IP_NF_FILTER=y
408 +CONFIG_IP_NF_SECURITY=m
409 +CONFIG_IP_NF_ARPTABLES=m
410 +CONFIG_IP_NF_ARPFILTER=m
411 +CONFIG_IP_NF_ARP_MANGLE=m
412
413 #
414 # IPv6: Netfilter Configuration
415 #
416 -CONFIG_IP6_NF_FILTER=m
417 +CONFIG_NF_DEFRAG_IPV6=m
418 +CONFIG_NF_CONNTRACK_IPV6=m
419 +CONFIG_NF_TABLES_IPV6=m
420 +CONFIG_NFT_CHAIN_ROUTE_IPV6=m
421 +CONFIG_NFT_CHAIN_NAT_IPV6=m
422 +# CONFIG_NFT_REJECT_IPV6 is not set
423 CONFIG_IP6_NF_IPTABLES=m
424 -CONFIG_IP6_NF_MANGLE=m
425 CONFIG_IP6_NF_MATCH_AH=m
426 CONFIG_IP6_NF_MATCH_EUI64=m
427 CONFIG_IP6_NF_MATCH_FRAG=m
428 +CONFIG_IP6_NF_MATCH_OPTS=m
429 +CONFIG_IP6_NF_MATCH_OWNER=m
430 CONFIG_IP6_NF_MATCH_HL=m
431 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
432 CONFIG_IP6_NF_MATCH_MH=m
433 -CONFIG_IP6_NF_MATCH_OPTS=m
434 -CONFIG_IP6_NF_MATCH_OWNER=m
435 +CONFIG_IP6_NF_MATCH_RPFILTER=m
436 CONFIG_IP6_NF_MATCH_RT=m
437 +CONFIG_IP6_NF_TARGET_HL=m
438 +CONFIG_IP6_NF_FILTER=m
439 +CONFIG_IP6_NF_TARGET_LOG=m
440 +CONFIG_IP6_NF_TARGET_REJECT=m
441 +CONFIG_IP6_NF_TARGET_SYNPROXY=m
442 +CONFIG_IP6_NF_MANGLE=m
443 CONFIG_IP6_NF_QUEUE=m
444 CONFIG_IP6_NF_RAW=m
445 CONFIG_IP6_NF_SECURITY=m
446 -CONFIG_IP6_NF_TARGET_LOG=m
447 -CONFIG_IP6_NF_TARGET_REJECT=m
448 -CONFIG_IP6_NF_TARGET_HL=m
449 +CONFIG_NF_NAT_IPV6=m
450 +CONFIG_IP6_NF_TARGET_MASQUERADE=m
451 +CONFIG_IP6_NF_TARGET_NPT=m
452 +CONFIG_NF_TABLES_BRIDGE=m
453 +CONFIG_BRIDGE_NF_EBTABLES=m
454 +CONFIG_BRIDGE_EBT_BROUTE=m
455 +CONFIG_BRIDGE_EBT_T_FILTER=m
456 +CONFIG_BRIDGE_EBT_T_NAT=m
457 +CONFIG_BRIDGE_EBT_802_3=m
458 +CONFIG_BRIDGE_EBT_AMONG=m
459 +CONFIG_BRIDGE_EBT_ARP=m
460 +CONFIG_BRIDGE_EBT_IP=m
461 +CONFIG_BRIDGE_EBT_IP6=m
462 +CONFIG_BRIDGE_EBT_LIMIT=m
463 +CONFIG_BRIDGE_EBT_MARK=m
464 +CONFIG_BRIDGE_EBT_PKTTYPE=m
465 +CONFIG_BRIDGE_EBT_STP=m
466 +CONFIG_BRIDGE_EBT_VLAN=m
467 +CONFIG_BRIDGE_EBT_ARPREPLY=m
468 +CONFIG_BRIDGE_EBT_DNAT=m
469 +CONFIG_BRIDGE_EBT_MARK_T=m
470 +CONFIG_BRIDGE_EBT_REDIRECT=m
471 +CONFIG_BRIDGE_EBT_SNAT=m
472 +CONFIG_BRIDGE_EBT_LOG=m
473 +CONFIG_BRIDGE_EBT_ULOG=m
474 +CONFIG_BRIDGE_EBT_NFLOG=m
475 +CONFIG_IP_DCCP=m
476 +CONFIG_INET_DCCP_DIAG=m
477
478 #
479 # Bridge: Netfilter Configuration
480 @@ -2808,7 +2975,7 @@ CONFIG_USB_ISP1362_HCD=m
481 # USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
482 #
483 CONFIG_USB_ACM=m
484 -CONFIG_USB_PRINTER=m
485 +# CONFIG_USB_PRINTER is not set
486 CONFIG_USB_WDM=m
487 CONFIG_USB_TMC=m
488 # CONFIG_BLK_DEV_UB is not set
489 @@ -3155,13 +3322,14 @@ CONFIG_EXT4_FS_SECURITY=y
490 CONFIG_EXT4DEV_COMPAT=y
491 CONFIG_JBD2=y
492 CONFIG_FS_MBCACHE=y
493 -# CONFIG_REISERFS_FS is not set
494 -# CONFIG_REISERFS_CHECK is not set
495 -CONFIG_REISERFS_PROC_INFO=y
496 +CONFIG_REISERFS_FS=m
497 CONFIG_REISERFS_FS_XATTR=y
498 CONFIG_REISERFS_FS_POSIX_ACL=y
499 CONFIG_REISERFS_FS_SECURITY=y
500 -# CONFIG_JFS_FS is not set
501 +# CONFIG_REISERFS_CHECK is not set
502 +CONFIG_JFS_FS=m
503 +CONFIG_JFS_POSIX_ACL=y
504 +CONFIG_JFS_SECURITY=y
505 # CONFIG_JFS_DEBUG is not set
506 # CONFIG_JFS_STATISTICS is not set
507 CONFIG_JFS_POSIX_ACL=y
508 @@ -3172,7 +3340,8 @@ CONFIG_XFS_FS=m
509 CONFIG_XFS_QUOTA=y
510 CONFIG_XFS_POSIX_ACL=y
511 CONFIG_XFS_SECURITY=y
512 -# CONFIG_MINIX_FS is not set
513 +CONFIG_XFS_RT=y
514 +CONFIG_MINIX_FS=m
515 # CONFIG_ROMFS_FS is not set
516 CONFIG_QUOTA=y
517 CONFIG_QUOTA_NETLINK_INTERFACE=y
518 @@ -3186,7 +3355,7 @@ CONFIG_DNOTIFY=y
519 CONFIG_AUTOFS4_FS=m
520 # CONFIG_EXOFS_FS is not set
521 # CONFIG_EXOFS_DEBUG is not set
522 -# CONFIG_NILFS2_FS is not set
523 +CONFIG_NILFS2_FS=m
524
525 CONFIG_FSCACHE=m
526 CONFIG_FSCACHE_STATS=y
527 @@ -3213,7 +3382,7 @@ CONFIG_MSDOS_FS=m
528 CONFIG_VFAT_FS=m
529 CONFIG_FAT_DEFAULT_CODEPAGE=437
530 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
531 -# CONFIG_NTFS_FS is not set
532 +CONFIG_NTFS_FS=m
533
534 #
535 # Pseudo filesystems
536 @@ -3230,15 +3399,16 @@ CONFIG_DEBUG_FS=y
537 #
538 # Miscellaneous filesystems
539 #
540 -# CONFIG_ADFS_FS is not seta
541 -# CONFIG_AFFS_FS is not set
542 +CONFIG_ADFS_FS=m
543 +CONFIG_AFFS_FS=m
544 CONFIG_ECRYPT_FS=m
545 -# CONFIG_HFS_FS is not set
546 -# CONFIG_HFSPLUS_FS is not set
547 +CONFIG_HFS_FS=m
548 +CONFIG_HFSPLUS_FS=m
549 +CONFIG_HFSPLUS_FS_POSIX_ACL=y
550 # CONFIG_BEFS_FS is not set
551 # CONFIG_BEFS_DEBUG is not set
552 # CONFIG_BFS_FS is not set
553 -# CONFIG_EFS_FS is not set
554 +CONFIG_EFS_FS=m
555 CONFIG_JFFS2_FS=m
556 CONFIG_JFFS2_FS_DEBUG=0
557 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
558 @@ -3248,22 +3418,33 @@ CONFIG_JFFS2_SUMMARY=y
559 CONFIG_JFFS2_FS_XATTR=y
560 CONFIG_JFFS2_FS_POSIX_ACL=y
561 CONFIG_JFFS2_FS_SECURITY=y
562 +CONFIG_LOGFS=m
563 CONFIG_CRAMFS=m
564 CONFIG_SQUASHFS=m
565 +CONFIG_SQUASHFS_FILE_DIRECT=y
566 +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
567 +CONFIG_SQUASHFS_XATTR=y
568 +CONFIG_SQUASHFS_ZLIB=y
569 +CONFIG_SQUASHFS_LZO=y
570 +CONFIG_SQUASHFS_XZ=y
571 # CONFIG_SQUASHFS_EMBEDDED is not set
572 # CONFIG_VXFS_FS is not set
573 -# CONFIG_HPFS_FS is not set
574 -# CONFIG_QNX4FS_FS is not set
575 +CONFIG_HPFS_FS=m
576 +CONFIG_QNX4FS_FS=m
577 # CONFIG_QNX4FS_RW is not set
578 -# CONFIG_SYSV_FS is not set
579 -# CONFIG_UFS_FS is not set
580 +CONFIG_QNX6FS_FS=m
581 +CONFIG_SYSV_FS=m
582 +CONFIG_UFS_FS=m
583 # CONFIG_UFS_FS_WRITE is not set
584 # CONFIG_UFS_DEBUG is not set
585 -# CONFIG_9P_FS is not set
586 +CONFIG_9P_FS=m
587 +CONFIG_9P_FS_POSIX_ACL=y
588 +CONFIG_9P_FS_SECURITY=y
589 # CONFIG_9P_FSCACHE is not set
590 CONFIG_FUSE_FS=m
591 # CONFIG_OMFS_FS is not set
592 CONFIG_CUSE=m
593 +CONFIG_EFIVAR_FS=m
594
595 #
596 # Network File Systems
597 @@ -3414,6 +3595,7 @@ CONFIG_NLS_ASCII=y
598 CONFIG_PROFILING=y
599 CONFIG_OPROFILE=m
600 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
601 +CONFIG_JUMP_LABEL=y
602
603 #
604 # Kernel hacking
605 @@ -3422,6 +3604,7 @@ CONFIG_DEBUG_KERNEL=y
606 CONFIG_FRAME_WARN=1024
607 CONFIG_MAGIC_SYSRQ=y
608 CONFIG_DEBUG_INFO=y
609 +CONFIG_DEBUG_INFO_DWARF4=y
610 CONFIG_FRAME_POINTER=y
611 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
612 # CONFIG_DEBUG_DRIVER is not set
613 @@ -3438,6 +3621,7 @@ CONFIG_KGDB=y
614 CONFIG_KGDB_SERIAL_CONSOLE=y
615 CONFIG_KGDB_TESTS=y
616 # CONFIG_KGDB_TESTS_ON_BOOT is not set
617 +CONFIG_STRICT_DEVMEM=y
618
619 #
620 # Security options
621 @@ -3460,6 +3644,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y
622 CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536
623 # CONFIG_SECURITY_SMACK is not set
624 # CONFIG_SECURITY_TOMOYO is not set
625 +CONFIG_FHANDLE=y
626 CONFIG_AUDIT=y
627 CONFIG_AUDITSYSCALL=y
628
629 @@ -3590,7 +3775,7 @@ CONFIG_PROC_PID_CPUSET=y
630 # CONFIG_SYSFS_DEPRECATED_V2 is not set
631
632 CONFIG_RELAY=y
633 -# CONFIG_PRINTK_TIME is not set
634 +CONFIG_PRINTK_TIME=y
635
636 CONFIG_ENABLE_MUST_CHECK=y
637 # CONFIG_ENABLE_WARN_DEPRECATED is not set
638 @@ -3601,6 +3786,7 @@ CONFIG_HWMON=y
639 # CONFIG_HWMON_DEBUG_CHIP is not set
640 CONFIG_INOTIFY=y
641 CONFIG_INOTIFY_USER=y
642 +CONFIG_FANOTIFY=y
643
644 CONFIG_CONNECTOR=y
645 CONFIG_PROC_EVENTS=y
646 @@ -3830,6 +4016,7 @@ CONFIG_KPROBES=y
647
648 # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
649
650 +CONFIG_SECCOMP=y
651 CONFIG_HZ_1000=y
652
653 CONFIG_TIMER_STATS=y
654 @@ -3906,6 +4093,7 @@ CONFIG_DEBUG_SECTION_MISMATCH=y
655 # CONFIG_KPROBES_SANITY_TEST is not set
656 # CONFIG_BACKTRACE_SELF_TEST is not set
657 CONFIG_LATENCYTOP=y
658 +CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y
659 CONFIG_RESOURCE_COUNTERS=y
660 # CONFIG_COMPAT_BRK is not set
661
662 @@ -3942,7 +4130,7 @@ CONFIG_MEMSTICK_JMICRON_38X=m
663
664 CONFIG_THERMAL_HWMON=y
665
666 -CONFIG_OPTIMIZE_INLINING=y
667 +# CONFIG_OPTIMIZE_INLINING is not set
668
669 # FIXME: This should be x86/ia64 only
670 # CONFIG_HP_ILO is not set
671 @@ -4105,7 +4293,7 @@ CONFIG_SLOW_WORK=y
672 # CONFIG_CRASH_DUMP is not set
673 # CONFIG_CRASH is not set
674
675 -CONFIG_STRIP_ASM_SYMS=y
676 +# CONFIG_STRIP_ASM_SYMS is not set
677
678 # CONFIG_RCU_FANOUT_EXACT is not set
679
680 @@ -4149,6 +4337,7 @@ CONFIG_DEBUG_LIST=y
681 CONFIG_DEBUG_SHIRQ=y
682 # CONFIG_DEBUG_DEVRES is not set
683 CONFIG_DEBUG_RODATA_TEST=y
684 +CONFIG_DEBUG_SET_MODULE_RONX=y
685 CONFIG_DEBUG_NX_TEST=m
686 CONFIG_DEBUG_BOOT_PARAMS=y
687 CONFIG_DETECT_SOFTLOCKUP=y