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

Commit 57d32616 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew Morton) into next 

Merge more updates from Andrew Morton:

 - Most of the rest of MM.

   This includes "mark remap_file_pages syscall as deprecated" but the
   actual "replace remap_file_pages syscall with emulation" is held
   back.  I guess we'll need to work out when to pull the trigger on
   that one.

 - various minor cleanups to obscure filesystems

 - the drivers/rtc queue

 - hfsplus updates

 - ufs, hpfs, fatfs, affs, reiserfs

 - Documentation/

 - signals

 - procfs

 - cpu hotplug

 - lib/idr.c

 - rapidio

 - sysctl

 - ipc updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (171 commits)
  ufs: sb mutex merge + mutex_destroy
  powerpc: update comments for generic idle conversion
  cris: update comments for generic idle conversion
  idle: remove cpu_idle() forward declarations
  nbd: zero from and len fields in NBD_CMD_DISCONNECT.
  mm: convert some level-less printks to pr_*
  MAINTAINERS: adi-buildroot-devel is moderated
  MAINTAINERS: add linux-api for review of API/ABI changes
  mm/kmemleak-test.c: use pr_fmt for logging
  fs/dlm/debug_fs.c: replace seq_printf by seq_puts
  fs/dlm/lockspace.c: convert simple_str to kstr
  fs/dlm/config.c: convert simple_str to kstr
  mm: mark remap_file_pages() syscall as deprecated
  mm: memcontrol: remove unnecessary memcg argument from soft limit functions
  mm: memcontrol: clean up memcg zoneinfo lookup
  mm/memblock.c: call kmemleak directly from memblock_(alloc|free)
  mm/mempool.c: update the kmemleak stack trace for mempool allocations
  lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations
  mm: introduce kmemleak_update_trace()
  mm/kmemleak.c: use %u to print ->checksum
  ...
parents 7b215de3 0244756e

Documentation/SubmittingPatches

+21 −1
Original line number Diff line number Diff line
@@ -132,6 +132,20 @@ Example: 
	platform_set_drvdata(), but left the variable "dev" unused,

	delete it.



If your patch fixes a bug in a specific commit, e.g. you found an issue using

git-bisect, please use the 'Fixes:' tag with the first 12 characters of the

SHA-1 ID, and the one line summary.

Example:



	Fixes: e21d2170f366 ("video: remove unnecessary platform_set_drvdata()")



The following git-config settings can be used to add a pretty format for

outputting the above style in the git log or git show commands



	[core]

		abbrev = 12

	[pretty]

		fixes = Fixes: %h (\"%s\")



3) Separate your changes.
@@ -443,7 +457,7 @@ person it names. This tag documents that potentially interested parties 
have been included in the discussion





14) Using Reported-by:, Tested-by:, Reviewed-by: and Suggested-by:

14) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:



If this patch fixes a problem reported by somebody else, consider adding a

Reported-by: tag to credit the reporter for their contribution.  Please
@@ -498,6 +512,12 @@ idea was not posted in a public forum. That said, if we diligently credit our 
idea reporters, they will, hopefully, be inspired to help us again in the

future.



A Fixes: tag indicates that the patch fixes an issue in a previous commit. It

is used to make it easy to determine where a bug originated, which can help

review a bug fix. This tag also assists the stable kernel team in determining

which stable kernel versions should receive your fix. This is the preferred

method for indicating a bug fixed by the patch. See #2 above for more details.





15) The canonical patch format

Documentation/cgroups/memory.txt

+7 −8
Original line number Diff line number Diff line
@@ -540,14 +540,13 @@ Note: 


5.3 swappiness



Similar to /proc/sys/vm/swappiness, but only affecting reclaim that is

triggered by this cgroup's hard limit.  The tunable in the root cgroup

corresponds to the global swappiness setting.



Please note that unlike the global swappiness, memcg knob set to 0

really prevents from any swapping even if there is a swap storage

available. This might lead to memcg OOM killer if there are no file

pages to reclaim.

Overrides /proc/sys/vm/swappiness for the particular group. The tunable

in the root cgroup corresponds to the global swappiness setting.



Please note that unlike during the global reclaim, limit reclaim

enforces that 0 swappiness really prevents from any swapping even if

there is a swap storage available. This might lead to memcg OOM killer

if there are no file pages to reclaim.



5.4 failcnt

Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ Required properties: 
- interrupts: rtc alarm/event interrupt

- #clock-cells: the value should be 0



Optional properties:

- clock-output-names: From common clock binding



Example:



hym8563: hym8563@51 {

Documentation/devicetree/bindings/rtc/xgene-rtc.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
* APM X-Gene Real Time Clock



RTC controller for the APM X-Gene Real Time Clock



Required properties:

- compatible : Should be "apm,xgene-rtc"

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

  region.

- interrupts: IRQ line for the RTC.

- #clock-cells: Should be 1.

- clocks: Reference to the clock entry.



Example:



rtcclk: rtcclk {

	compatible = "fixed-clock";

	#clock-cells = <1>;

	clock-frequency = <100000000>;

	clock-output-names = "rtcclk";

};



rtc: rtc@10510000 {

	compatible = "apm,xgene-rtc";

	reg = <0x0 0x10510000 0x0 0x400>;

	interrupts = <0x0 0x46 0x4>;

	#clock-cells = <1>;

	clocks = <&rtcclk 0>;

};

Documentation/filesystems/seq_file.txt

+9 −0
Original line number Diff line number Diff line
@@ -54,6 +54,15 @@ how the mechanism works without getting lost in other details. (Those 
wanting to see the full source for this module can find it at

http://lwn.net/Articles/22359/).



Deprecated create_proc_entry



Note that the above article uses create_proc_entry which was removed in

kernel 3.10. Current versions require the following update



-	entry = create_proc_entry("sequence", 0, NULL);

-	if (entry)

-		entry->proc_fops = &ct_file_ops;

+	entry = proc_create("sequence", 0, NULL, &ct_file_ops);



The iterator interface