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

Commit efd0bf97 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.

The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.

Conflicts:
	drivers/net/ethernet/nvidia/forcedeth.c
	drivers/net/wireless/libertas/cfg.c
parents f8a15af0 6fe4c6d4

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ Juha Yrjola <juha.yrjola@solidboot.com> 
Kay Sievers <kay.sievers@vrfy.org>

Kenneth W Chen <kenneth.w.chen@intel.com>

Koushik <raghavendra.koushik@neterion.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Linas Vepstas <linas@austin.ibm.com>

Mark Brown <broonie@sirena.org.uk>
@@ -111,3 +112,4 @@ Uwe Kleine-König <ukl@pengutronix.de> 
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Yusuke Goda <goda.yusuke@renesas.com>

Documentation/ABI/testing/sysfs-block

+0 −13
Original line number Diff line number Diff line
@@ -206,16 +206,3 @@ Description: 
		when a discarded area is read the discard_zeroes_data

		parameter will be set to one. Otherwise it will be 0 and

		the result of reading a discarded area is undefined.
 
What:		/sys/block/<disk>/alias

Date:		Aug 2011

Contact:	Nao Nishijima <nao.nishijima.xt@hitachi.com>

Description:

		A raw device name of a disk does not always point a same disk

		each boot-up time. Therefore, users have to use persistent

		device names, which udev creates when the kernel finds a disk,

		instead of raw device name. However, kernel doesn't show those

		persistent names on its messages (e.g. dmesg).

		This file can store an alias of the disk and it would be

		appeared in kernel messages if it is set. A disk can have an

		alias which length is up to 255bytes. Users can use alphabets,

		numbers, "-" and "_" in alias name. This file is writeonce.

Documentation/DocBook/drm.tmpl

+168 −140

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/blockdev/cciss.txt

+6 −8
Original line number Diff line number Diff line
@@ -98,14 +98,12 @@ You must enable "SCSI tape drive support for Smart Array 5xxx" and 
"SCSI support" in your kernel configuration to be able to use SCSI

tape drives with your Smart Array 5xxx controller.



Additionally, note that the driver will not engage the SCSI core at init 

time.  The driver must be directed to dynamically engage the SCSI core via 

the /proc filesystem entry which the "block" side of the driver creates as 

/proc/driver/cciss/cciss* at runtime.  This is because at driver init time, 

the SCSI core may not yet be initialized (because the driver is a block 

driver) and attempting to register it with the SCSI core in such a case 

would cause a hang.  This is best done via an initialization script 

(typically in /etc/init.d, but could vary depending on distribution). 

Additionally, note that the driver will engage the SCSI core at init

time if any tape drives or medium changers are detected.  The driver may

also be directed to dynamically engage the SCSI core via the /proc filesystem

entry which the "block" side of the driver creates as

/proc/driver/cciss/cciss* at runtime.  This is best done via a script.



For example:



	for x in /proc/driver/cciss/cciss[0-9]*

Documentation/cgroups/freezer-subsystem.txt

+2 −2
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ demonstrate this problem using nested bash shells: 


	From a second, unrelated bash shell:

	$ kill -SIGSTOP 16690

	$ kill -SIGCONT 16990

	$ kill -SIGCONT 16690



	<at this point 16990 exits and causes 16644 to exit too>

	<at this point 16690 exits and causes 16644 to exit too>



This happens because bash can observe both signals and choose how it

responds to them.