Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0a92c17 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'sched/urgent' into sched/core 



Merge reason: Add fixes before applying dependent patches.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 544b4a1f 0c3b9168

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ modules.builtin 
*.gz

*.bz2

*.lzma

*.xz

*.lzo

*.patch

*.gcno

Documentation/networking/00-INDEX

+0 −6
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ decnet.txt 
	- info on using the DECnet networking layer in Linux.

depca.txt

	- the Digital DEPCA/EtherWORKS DE1?? and DE2?? LANCE Ethernet driver

dgrs.txt

	- the Digi International RightSwitch SE-X Ethernet driver

dmfe.txt

	- info on the Davicom DM9102(A)/DM9132/DM9801 fast ethernet driver.

e100.txt
@@ -50,8 +48,6 @@ e1000.txt 
	- info on Intel's E1000 line of gigabit ethernet boards

eql.txt

	- serial IP load balancing

ethertap.txt

	- the Ethertap user space packet reception and transmission driver

ewrk3.txt

	- the Digital EtherWORKS 3 DE203/4/5 Ethernet driver

filter.txt
@@ -104,8 +100,6 @@ tuntap.txt 
	- TUN/TAP device driver, allowing user space Rx/Tx of packets.

vortex.txt

	- info on using 3Com Vortex (3c590, 3c592, 3c595, 3c597) Ethernet cards.

wavelan.txt

	- AT&T GIS (nee NCR) WaveLAN card: An Ethernet-like radio transceiver

x25.txt

	- general info on X.25 development.

x25-iface.txt

Documentation/networking/dns_resolver.txt

+8 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ before the more general line given above as the first match is the one taken. 
	create	dns_resolver  	foo:*	*	/usr/sbin/dns.foo %k







=====

USAGE

=====
@@ -104,6 +103,14 @@ implemented in the module can be called after doing: 
     returned also.





===============================

READING DNS KEYS FROM USERSPACE

===============================



Keys of dns_resolver type can be read from userspace using keyctl_read() or

"keyctl read/print/pipe".





=========

MECHANISM

=========

MAINTAINERS

+11 −3
Original line number Diff line number Diff line
@@ -1467,6 +1467,7 @@ F: include/net/bluetooth/ 


BONDING DRIVER

M:	Jay Vosburgh <fubar@us.ibm.com>

M:	Andy Gospodarek <andy@greyhouse.net>

L:	netdev@vger.kernel.org

W:	http://sourceforge.net/projects/bonding/

S:	Supported
@@ -1692,6 +1693,13 @@ M: Andy Whitcroft <apw@canonical.com> 
S:	Supported

F:	scripts/checkpatch.pl



CHINESE DOCUMENTATION

M:	Harry Wei <harryxiyou@gmail.com>

L:	xiyoulinuxkernelgroup@googlegroups.com

L:	linux-kernel@zh-kernel.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/zh_CN/



CISCO VIC ETHERNET NIC DRIVER

M:	Vasanthy Kolluri <vkolluri@cisco.com>

M:	Roopa Prabhu <roprabhu@cisco.com>
@@ -2026,7 +2034,7 @@ F: Documentation/scsi/dc395x.txt 
F:	drivers/scsi/dc395x.*



DCCP PROTOCOL

M:	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>

M:	Gerrit Renker <gerrit@erg.abdn.ac.uk>

L:	dccp@vger.kernel.org

W:	http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp

S:	Maintained
@@ -5266,7 +5274,7 @@ S: Maintained 
F:	drivers/net/wireless/rtl818x/rtl8180/



RTL8187 WIRELESS DRIVER

M:	Herton Ronaldo Krzesinski <herton@mandriva.com.br>

M:	Herton Ronaldo Krzesinski <herton@canonical.com>

M:	Hin-Tak Leung <htl10@users.sourceforge.net>

M:	Larry Finger <Larry.Finger@lwfinger.net>

L:	linux-wireless@vger.kernel.org
@@ -6104,7 +6112,7 @@ S: Maintained 
F:	security/tomoyo/



TOPSTAR LAPTOP EXTRAS DRIVER

M:	Herton Ronaldo Krzesinski <herton@mandriva.com.br>

M:	Herton Ronaldo Krzesinski <herton@canonical.com>

L:	platform-driver-x86@vger.kernel.org

S:	Maintained

F:	drivers/platform/x86/topstar-laptop.c

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 38

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Flesh-Eating Bats with Fangs



# *DOCUMENTATION*