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

Commit e6bca5a6 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge tag 'v3.10-rc6' into x86/cleanups 



Linux 3.10-rc6

We need a change that is the mainline tree for further work.

Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parents e8747f10 7d132055

Documentation/bcache.txt

+9 −3
Original line number Original line Diff line number Diff line
@@ -319,7 +319,10 @@ cache<0..n> 
  Symlink to each of the cache devices comprising this cache set. 

  Symlink to each of the cache devices comprising this cache set. 





cache_available_percent

cache_available_percent

  Percentage of cache device free.

  Percentage of cache device which doesn't contain dirty data, and could

  potentially be used for writeback.  This doesn't mean this space isn't used

  for clean cached data; the unused statistic (in priority_stats) is typically

  much lower.





clear_stats

clear_stats

  Clears the statistics associated with this cache

  Clears the statistics associated with this cache
@@ -423,8 +426,11 @@ nbuckets 
  Total buckets in this cache

  Total buckets in this cache





priority_stats

priority_stats

  Statistics about how recently data in the cache has been accessed.  This can

  Statistics about how recently data in the cache has been accessed.

  reveal your working set size.

  This can reveal your working set size.  Unused is the percentage of

  the cache that doesn't contain any data.  Metadata is bcache's

  metadata overhead.  Average is the average priority of cache buckets.

  Next is a list of quantiles with the priority threshold of each.





written

written

  Sum of all data that has been written to the cache; comparison with

  Sum of all data that has been written to the cache; comparison with

Documentation/devices.txt

+2 −6
Original line number Original line Diff line number Diff line
@@ -498,12 +498,8 @@ Your cooperation is appreciated. 




		Each device type has 5 bits (32 minors).

		Each device type has 5 bits (32 minors).





 13 block	8-bit MFM/RLL/IDE controller

 13 block	Previously used for the XT disk (/dev/xdN)

		  0 = /dev/xda		First XT disk whole disk

		Deleted in kernel v3.9.

		 64 = /dev/xdb		Second XT disk whole disk



		Partitions are handled in the same way as IDE disks

		(see major number 3).





 14 char	Open Sound System (OSS)

 14 char	Open Sound System (OSS)

		  0 = /dev/mixer	Mixer control

		  0 = /dev/mixer	Mixer control

Documentation/devicetree/bindings/rtc/atmel,at91rm9200-rtc.txt

+1 −1
Original line number Original line Diff line number Diff line 
Atmel AT91RM9200 Real Time Clock

Atmel AT91RM9200 Real Time Clock





Required properties:

Required properties:

- compatible: should be: "atmel,at91rm9200-rtc"

- compatible: should be: "atmel,at91rm9200-rtc" or "atmel,at91sam9x5-rtc"

- reg: physical base address of the controller and length of memory mapped

- reg: physical base address of the controller and length of memory mapped

  region.

  region.

- interrupts: rtc alarm/event interrupt

- interrupts: rtc alarm/event interrupt

Documentation/dmatest.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ command: 
After a while you will start to get messages about current status or error like

After a while you will start to get messages about current status or error like

in the original code.

in the original code.





Note that running a new test will stop any in progress test.

Note that running a new test will not stop any in progress test.





The following command should return actual state of the test.

The following command should return actual state of the test.

	% cat /sys/kernel/debug/dmatest/run

	% cat /sys/kernel/debug/dmatest/run
@@ -52,8 +52,8 @@ To wait for test done the user may perform a busy loop that checks the state. 




The module parameters that is supplied to the kernel command line will be used

The module parameters that is supplied to the kernel command line will be used

for the first performed test. After user gets a control, the test could be

for the first performed test. After user gets a control, the test could be

interrupted or re-run with same or different parameters. For the details see

re-run with the same or different parameters. For the details see the above

the above section "Part 2 - When dmatest is built as a module..."

section "Part 2 - When dmatest is built as a module..."





In both cases the module parameters are used as initial values for the test case.

In both cases the module parameters are used as initial values for the test case.

You always could check them at run-time by running

You always could check them at run-time by running

Documentation/filesystems/xfs.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,9 @@ When mounting an XFS filesystem, the following options are accepted. 
	removing extended attributes) the on-disk superblock feature

	removing extended attributes) the on-disk superblock feature

	bit field will be updated to reflect this format being in use.

	bit field will be updated to reflect this format being in use.





	CRC enabled filesystems always use the attr2 format, and so

	will reject the noattr2 mount option if it is set.



  barrier

  barrier

	Enables the use of block layer write barriers for writes into

	Enables the use of block layer write barriers for writes into

	the journal and unwritten extent conversion.  This allows for

	the journal and unwritten extent conversion.  This allows for