Commit 277a163c authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge tag 'v3.15-rc1' into patchwork 

Linux 3.15-rc1

* tag 'v3.15-rc1': (12180 commits)
  Linux 3.15-rc1
  mm: Initialize error in shmem_file_aio_read()
  cifs: Use min_t() when comparing "size_t" and "unsigned long"
  sym53c8xx_2: Set DID_REQUEUE return code when aborting squeue
  powerpc: Don't try to set LPCR unless we're in hypervisor mode
  futex: update documentation for ordering guarantees
  ceph: fix pr_fmt() redefinition
  vti: don't allow to add the same tunnel twice
  gre: don't allow to add the same tunnel twice
  drivers: net: xen-netfront: fix array initialization bug
  missing bits of "splice: fix racy pipe->buffers uses"
  cifs: fix the race in cifs_writev()
  ceph_sync_{,direct_}write: fix an oops on ceph_osdc_new_request() failure
  pktgen: be friendly to LLTX devices
  r8152: check RTL8152_UNPLUG
  net: sun4i-emac: add promiscuous support
  net/apne: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
  blackfin: cleanup board files
  bf609: clock: drop unused clock bit set/clear functions
  Blackfin: bf537: rename "CONFIG_ADT75"
  ...
parents a83b93a7 c9eaa447

CREDITS

+9 −2
Original line number Diff line number Diff line
@@ -2567,10 +2567,14 @@ S: 22 Seaview St 
S: Fullarton 5063

S: South Australia



N. Wolfgang Muees

N: Wolfgang Muees

E: wolfgang@iksw-muees.de

D: Auerswald USB driver



N: Paul Mundt

E: paul.mundt@gmail.com

D: SuperH maintainer



N: Ian A. Murdock

E: imurdock@gnu.ai.mit.edu

D: Creator of Debian distribution
@@ -2714,6 +2718,9 @@ N: Greg Page 
E: gpage@sovereign.org

D: IPX development and support



N: Venkatesh Pallipadi (Venki)

D: x86/HPET



N: David Parsons

E: orc@pell.chi.il.us

D: improved memory detection code.

Documentation/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -413,8 +413,6 @@ serial-console.txt 
	- how to set up Linux with a serial line console as the default.

sgi-ioc4.txt

	- description of the SGI IOC4 PCI (multi function) device.

sgi-visws.txt

	- short blurb on the SGI Visual Workstations.

sh/

	- directory with info on porting Linux to a new architecture.

smsc_ece1099.txt

Documentation/ABI/stable/sysfs-firmware-opal-dump

0 → 100644
+41 −0
Original line number Diff line number Diff line 
What:		/sys/firmware/opal/dump

Date:		Feb 2014

Contact:	Stewart Smith <stewart@linux.vnet.ibm.com>

Description:

		This directory exposes interfaces for interacting with

		the FSP and platform dumps through OPAL firmware interface.



		This is only for the powerpc/powernv platform.



		initiate_dump:	When '1' is written to it,

				we will initiate a dump.

				Read this file for supported commands.



		0xXX-0xYYYY:	A directory for dump of type 0xXX and

				id 0xYYYY (in hex). The name of this

				directory should not be relied upon to

				be in this format, only that it's unique

				among all dumps. For determining the type

				and ID of the dump, use the id and type files.

				Do not rely on any particular size of dump

				type or dump id.



		Each dump has the following files:

		id:		An ASCII representation of the dump ID

				in hex (e.g. '0x01')

		type:		An ASCII representation of the type of

				dump in the format "0x%x %s" with the ID

				in hex and a description of the dump type

				(or 'unknown').

				Type '0xffffffff unknown' is used when

				we could not get the type from firmware.

				e.g. '0x02 System/Platform Dump'

		dump:		A binary file containing the dump.

				The size of the dump is the size of this file.

		acknowledge:	When 'ack' is written to this, we will

				acknowledge that we've retrieved the

				dump to the service processor. It will

				then remove it, making the dump

				inaccessible.

				Reading this file will get a list of

				supported actions.

Documentation/ABI/stable/sysfs-firmware-opal-elog

0 → 100644
+60 −0
Original line number Diff line number Diff line 
What:		/sys/firmware/opal/elog

Date:		Feb 2014

Contact:	Stewart Smith <stewart@linux.vnet.ibm.com>

Description:

		This directory exposes error log entries retrieved

		through the OPAL firmware interface.



		Each error log is identified by a unique ID and will

		exist until explicitly acknowledged to firmware.



		Each log entry has a directory in /sys/firmware/opal/elog.



		Log entries may be purged by the service processor

		before retrieved by firmware or retrieved/acknowledged by

		Linux if there is no room for more log entries.



		In the event that Linux has retrieved the log entries

		but not explicitly acknowledged them to firmware and

		the service processor needs more room for log entries,

		the only remaining copy of a log message may be in

		Linux.



		Typically, a user space daemon will monitor for new

		entries, read them out and acknowledge them.



		The service processor may be able to store more log

		entries than firmware can, so after you acknowledge

		an event from Linux you may instantly get another one

		from the queue that was generated some time in the past.



		The raw log format is a binary format. We currently

		do not parse this at all in kernel, leaving it up to

		user space to solve the problem. In future, we may

		do more parsing in kernel and add more files to make

		it easier for simple user space processes to extract

		more information.



		For each log entry (directory), there are the following

		files:



		id:		An ASCII representation of the ID of the

				error log, in hex - e.g. "0x01".



		type:		An ASCII representation of the type id and

				description of the type of error log.

				Currently just "0x00 PEL" - platform error log.

				In the future there may be additional types.



		raw:		A read-only binary file that can be read

				to get the raw log entry. These are

				<16kb, often just hundreds of bytes and

				"average" 2kb.



		acknowledge:	Writing 'ack' to this file will acknowledge

				the error log to firmware (and in turn

				the service processor, if applicable).

				Shortly after acknowledging it, the log

				entry will be removed from sysfs.

				Reading this file will list the supported

				operations (curently just acknowledge).
 
 No newline at end of file

Documentation/ABI/testing/sysfs-block-zram

+30 −9
Original line number Diff line number Diff line
@@ -43,6 +43,36 @@ Description: 
		The invalid_io file is read-only and specifies the number of

		non-page-size-aligned I/O requests issued to this device.



What:		/sys/block/zram<id>/failed_reads

Date:		February 2014

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		The failed_reads file is read-only and specifies the number of

		failed reads happened on this device.



What:		/sys/block/zram<id>/failed_writes

Date:		February 2014

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		The failed_writes file is read-only and specifies the number of

		failed writes happened on this device.



What:		/sys/block/zram<id>/max_comp_streams

Date:		February 2014

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		The max_comp_streams file is read-write and specifies the

		number of backend's zcomp_strm compression streams (number of

		concurrent compress operations).



What:		/sys/block/zram<id>/comp_algorithm

Date:		February 2014

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		The comp_algorithm file is read-write and lets to show

		available and selected compression algorithms, change

		compression algorithm selection.



What:		/sys/block/zram<id>/notify_free

Date:		August 2010

Contact:	Nitin Gupta <ngupta@vflare.org>
@@ -53,15 +83,6 @@ Description: 
		is freed. This statistic is applicable only when this disk is

		being used as a swap disk.



What:		/sys/block/zram<id>/discard

Date:		August 2010

Contact:	Nitin Gupta <ngupta@vflare.org>

Description:

		The discard file is read-only and specifies the number of

		discard requests received by this device. These requests

		provide information to block device regarding blocks which are

		no longer used by filesystem.



What:		/sys/block/zram<id>/zero_pages

Date:		August 2010

Contact:	Nitin Gupta <ngupta@vflare.org>

CRA Git | Maintained and supported by SUSTech CRA and CCSE