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

Commit 4a3381fe authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master' into upstream

parents fea63e38 47a5c6fa
Loading
Loading
Loading
Loading
+3 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,9 @@
*.ko
*.ko
*.so
*.so
*.mod.c
*.mod.c
*.i
*.lst
*.symtypes


#
#
# Top-level generic files
# Top-level generic files
+2 −0
Original line number Original line Diff line number Diff line
@@ -308,6 +308,8 @@ then you just add a line saying


	Signed-off-by: Random J Developer <random@developer.example.org>
	Signed-off-by: Random J Developer <random@developer.example.org>


using your real name (sorry, no pseudonyms or anonymous contributions.)

Some people also put extra tags at the end.  They'll just be ignored for
Some people also put extra tags at the end.  They'll just be ignored for
now, but you can do this to mark internal company procedures or just
now, but you can do this to mark internal company procedures or just
point out some special detail about the sign-off. 
point out some special detail about the sign-off. 
+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ This driver is known to work with the following cards:
	* SA P400i
	* SA P400i
	* SA E200
	* SA E200
	* SA E200i
	* SA E200i
	* SA E500


If nodes are not already created in the /dev/cciss directory, run as root:
If nodes are not already created in the /dev/cciss directory, run as root:


+13 −0
Original line number Original line Diff line number Diff line
@@ -281,3 +281,16 @@ Why: The deferred output hooks are a layering violation causing unusual
Who:	Patrick McHardy <kaber@trash.net>
Who:	Patrick McHardy <kaber@trash.net>


---------------------------
---------------------------

What:	frame diverter
When:	November 2006
Why:	The frame diverter is included in most distribution kernels, but is
	broken. It does not correctly handle many things:
	- IPV6
	- non-linear skb's
	- network device RCU on removal
	- input frames not correctly checked for protocol errors
	It also adds allocation overhead even if not enabled.
	It is not clear if anyone is still using it.
Who:	Stephen Hemminger <shemminger@osdl.org>
+1 −0
Original line number Original line Diff line number Diff line
@@ -181,6 +181,7 @@ filled out, however:
	5  ELILO
	5  ELILO
	7  GRuB
	7  GRuB
	8  U-BOOT
	8  U-BOOT
	9  Xen


	Please contact <hpa@zytor.com> if you need a bootloader ID
	Please contact <hpa@zytor.com> if you need a bootloader ID
	value assigned.
	value assigned.
Loading