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

Commit 7f0ef026 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (updates from Andrew Morton) 

Merge first patch-bomb from Andrew Morton:
 - various misc bits
 - I'm been patchmonkeying ocfs2 for a while, as Joel and Mark have been
   distracted.  There has been quite a bit of activity.
 - About half the MM queue
 - Some backlight bits
 - Various lib/ updates
 - checkpatch updates
 - zillions more little rtc patches
 - ptrace
 - signals
 - exec
 - procfs
 - rapidio
 - nbd
 - aoe
 - pps
 - memstick
 - tools/testing/selftests updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (445 commits)
  tools/testing/selftests: don't assume the x bit is set on scripts
  selftests: add .gitignore for kcmp
  selftests: fix clean target in kcmp Makefile
  selftests: add .gitignore for vm
  selftests: add hugetlbfstest
  self-test: fix make clean
  selftests: exit 1 on failure
  kernel/resource.c: remove the unneeded assignment in function __find_resource
  aio: fix wrong comment in aio_complete()
  drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode
  drivers/memstick/host/r592.c: convert to module_pci_driver
  drivers/memstick/host/jmb38x_ms: convert to module_pci_driver
  pps-gpio: add device-tree binding and support
  drivers/pps/clients/pps-gpio.c: convert to module_platform_driver
  drivers/pps/clients/pps-gpio.c: convert to devm_* helpers
  drivers/parport/share.c: use kzalloc
  Documentation/accounting/getdelays.c: avoid strncpy in accounting tool
  aoe: update internal version number to v83
  aoe: update copyright date
  aoe: perform I/O completions in parallel
  ...
parents 862f0012 9307c295

Documentation/CodingStyle

+2 −1
Original line number Diff line number Diff line
@@ -389,7 +389,8 @@ Albeit deprecated by some people, the equivalent of the goto statement is 
used frequently by compilers in form of the unconditional jump instruction.



The goto statement comes in handy when a function exits from multiple

locations and some common work such as cleanup has to be done.

locations and some common work such as cleanup has to be done.  If there is no

cleanup needed then just return directly.



The rationale is:

Documentation/DocBook/kernel-locking.tmpl

+6 −1
Original line number Diff line number Diff line
@@ -1955,12 +1955,17 @@ machines due to caching. 
   </sect1>

  </chapter>



  <chapter id="apiref">

  <chapter id="apiref-mutex">

   <title>Mutex API reference</title>

!Iinclude/linux/mutex.h

!Ekernel/mutex.c

  </chapter>



  <chapter id="apiref-futex">

   <title>Futex API reference</title>

!Ikernel/futex.c

  </chapter>



  <chapter id="references">

   <title>Further reading</title>

Documentation/accounting/getdelays.c

+2 −2
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ int main(int argc, char *argv[]) 
	char *logfile = NULL;

	int loop = 0;

	int containerset = 0;

	char containerpath[1024];

	char *containerpath = NULL;

	int cfd = 0;

	int forking = 0;

	sigset_t sigset;
@@ -299,7 +299,7 @@ int main(int argc, char *argv[]) 
			break;

		case 'C':

			containerset = 1;

			strncpy(containerpath, optarg, strlen(optarg) + 1);

			containerpath = optarg;

			break;

		case 'w':

			logfile = strdup(optarg);

Documentation/cgroups/memory.txt

+3 −4
Original line number Diff line number Diff line
@@ -834,10 +834,9 @@ Test: 


12. TODO



1. Add support for accounting huge pages (as a separate controller)

2. Make per-cgroup scanner reclaim not-shared pages first

3. Teach controller to account for shared-pages

4. Start reclamation in the background when the limit is

1. Make per-cgroup scanner reclaim not-shared pages first

2. Teach controller to account for shared-pages

3. Start reclamation in the background when the limit is

   not yet hit but the usage is getting closer



Summary

Documentation/crypto/async-tx-api.txt

+0 −1
Original line number Diff line number Diff line
@@ -222,5 +222,4 @@ drivers/dma/: location for offload engine drivers 
include/linux/async_tx.h: core header file for the async_tx api

crypto/async_tx/async_tx.c: async_tx interface to dmaengine and common code

crypto/async_tx/async_memcpy.c: copy offload

crypto/async_tx/async_memset.c: memory fill offload

crypto/async_tx/async_xor.c: xor and xor zero sum offload