Commit e9738946 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "13 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: add missing __PAGETABLE_{PUD,PMD}_FOLDED defines
  mm: page_alloc: revert inadvertent !__GFP_FS retry behavior change
  kernel/sys.c: fix UNAME26 for 4.0
  mm: memcontrol: use "max" instead of "infinity" in control knobs
  zram: use proper type to update max_used_pages
  drivers/rtc/rtc-ds1685.c: fix conditional in ds1685_rtc_sysfs_time_regs_{show,store}
  nilfs2: fix potential memory overrun on inode
  scripts/gdb: add empty package initialization script
  rtc: ds1685: remove superfluous checks for out-of-range u8 values
  rtc: ds1685: fix ds1685_rtc_alarm_irq_enable build error
  memcg: fix low limit calculation
  mm/nommu: fix memory leak
  ocfs2: update web page + git tree in documentation
parents 895c8b7b c07af4f1

Documentation/cgroups/unified-hierarchy.txt

+2 −2
Original line number Diff line number Diff line
@@ -404,8 +404,8 @@ supported and the interface files "release_agent" and 
  be understood as an underflow into the highest possible value, -2 or

  -10M etc. do not work, so it's not consistent.



  memory.low, memory.high, and memory.max will use the string

  "infinity" to indicate and set the highest possible value.

  memory.low, memory.high, and memory.max will use the string "max" to

  indicate and set the highest possible value.



5. Planned Changes

Documentation/filesystems/dlmfs.txt

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ system. 


dlmfs is built with OCFS2 as it requires most of its infrastructure.



Project web page:    http://oss.oracle.com/projects/ocfs2

Tools web page:      http://oss.oracle.com/projects/ocfs2-tools

Project web page:    http://ocfs2.wiki.kernel.org

Tools web page:      https://github.com/markfasheh/ocfs2-tools

OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/



All code copyright 2005 Oracle except when otherwise noted.

Documentation/filesystems/ocfs2.txt

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ also make it attractive for non-clustered use. 
You'll want to install the ocfs2-tools package in order to at least

get "mount.ocfs2" and "ocfs2_hb_ctl".



Project web page:    http://oss.oracle.com/projects/ocfs2

Tools web page:      http://oss.oracle.com/projects/ocfs2-tools

Project web page:    http://ocfs2.wiki.kernel.org

Tools git tree:      https://github.com/markfasheh/ocfs2-tools

OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/



All code copyright 2005 Oracle except when otherwise noted.

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -7213,8 +7213,7 @@ ORACLE CLUSTER FILESYSTEM 2 (OCFS2) 
M:	Mark Fasheh <mfasheh@suse.com>

M:	Joel Becker <jlbec@evilplan.org>

L:	ocfs2-devel@oss.oracle.com (moderated for non-subscribers)

W:	http://oss.oracle.com/projects/ocfs2/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git

W:	http://ocfs2.wiki.kernel.org

S:	Supported

F:	Documentation/filesystems/ocfs2.txt

F:	Documentation/filesystems/dlmfs.txt

arch/frv/include/asm/pgtable.h

+2 −0
Original line number Diff line number Diff line
@@ -123,12 +123,14 @@ extern unsigned long empty_zero_page; 
#define PGDIR_MASK		(~(PGDIR_SIZE - 1))

#define PTRS_PER_PGD		64



#define __PAGETABLE_PUD_FOLDED

#define PUD_SHIFT		26

#define PTRS_PER_PUD		1

#define PUD_SIZE		(1UL << PUD_SHIFT)

#define PUD_MASK		(~(PUD_SIZE - 1))

#define PUE_SIZE		256



#define __PAGETABLE_PMD_FOLDED

#define PMD_SHIFT		26

#define PMD_SIZE		(1UL << PMD_SHIFT)

#define PMD_MASK		(~(PMD_SIZE - 1))

CRA Git | Maintained and supported by SUSTech CRA and CCSE