Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 · c60c6a96b7 - Gogs: Go Git Service GfA electronic

Pārlūkot izejas kodu

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  apparmor: depends on NET

Linus Torvalds 15 gadi atpakaļ

vecāks

f43100ae39 06c22dadc6

revīzija

c60c6a96b7

1 mainītis faili ar 1 papildinājumiem un 1 dzēšanām

Dalītais skats Rādīt salīdzināšanas statistiku

						
							+ 1
							
							- 1
						
security/apparmor/Kconfig
							 
								Parādīt failu
							
				@@ -1,6 +1,6 @@
			
				 config SECURITY_APPARMOR
			
				 	bool "AppArmor support"
			
				-	depends on SECURITY
			
				+	depends on SECURITY && NET
			
				 	select AUDIT
			
				 	select SECURITY_PATH
			
				 	select SECURITYFS