Commit 1251704a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "15 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm, docs: update memory.stat description with workingset* entries
  mm: vmscan: scan until it finds eligible pages
  mm, thp: copying user pages must schedule on collapse
  dax: fix PMD data corruption when fault races with write
  dax: fix data corruption when fault races with write
  ext4: return to starting transaction in ext4_dax_huge_fault()
  mm: fix data corruption due to stale mmap reads
  dax: prevent invalidation of mapped DAX entries
  Tigran has moved
  mm, vmalloc: fix vmalloc users tracking properly
  mm/khugepaged: add missed tracepoint for collapse_huge_page_swapin
  gcov: support GCC 7.1
  mm, vmstat: Remove spurious WARN() during zoneinfo print
  time: delete current_fs_time()
  hwpoison, memcg: forcibly uncharge LRU pages
parents 0fcc3ab2 b340959e

Documentation/cgroup-v2.txt

+12 −0
Original line number Diff line number Diff line
@@ -918,6 +918,18 @@ PAGE_SIZE multiple when read back. 


		Number of major page faults incurred



	  workingset_refault



		Number of refaults of previously evicted pages



	  workingset_activate



		Number of refaulted pages that were immediately activated



	  workingset_nodereclaim



		Number of times a shadow node has been reclaimed



  memory.swap.current



	A read-only single value file which exists on non-root

Documentation/filesystems/bfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -54,4 +54,4 @@ The first 4 bytes should be 0x1badface. 
If you have any patches, questions or suggestions regarding this BFS

implementation please contact the author:



Tigran Aivazian <tigran@aivazian.fsnet.co.uk>
 
Tigran Aivazian <aivazian.tigran@gmail.com>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2483,7 +2483,7 @@ S: Maintained 
F:	drivers/net/ethernet/ec_bhf.c



BFS FILE SYSTEM

M:	"Tigran A. Aivazian" <tigran@aivazian.fsnet.co.uk>

M:	"Tigran A. Aivazian" <aivazian.tigran@gmail.com>

S:	Maintained

F:	Documentation/filesystems/bfs.txt

F:	fs/bfs/

arch/x86/kernel/cpu/microcode/amd.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 *  Author: Peter Oruba <peter.oruba@amd.com>

 *

 *  Based on work by:

 *  Tigran Aivazian <tigran@aivazian.fsnet.co.uk>

 *  Tigran Aivazian <aivazian.tigran@gmail.com>

 *

 *  early loader:

 *  Copyright (C) 2013 Advanced Micro Devices, Inc.

arch/x86/kernel/cpu/microcode/core.c

+1 −1
Original line number Diff line number Diff line 
/*

 * CPU Microcode Update Driver for Linux

 *

 * Copyright (C) 2000-2006 Tigran Aivazian <tigran@aivazian.fsnet.co.uk>

 * Copyright (C) 2000-2006 Tigran Aivazian <aivazian.tigran@gmail.com>

 *	      2006	Shaohua Li <shaohua.li@intel.com>

 *	      2013-2016	Borislav Petkov <bp@alien8.de>

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE