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

Commit 3f803abf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew Morton) 

Merge misc fixes from Andrew Morton.

* emailed patches from Andrew Morton akpm@linux-foundation.org>:
  mm: page_alloc: exempt GFP_THISNODE allocations from zone fairness
  mm: numa: bugfix for LAST_CPUPID_NOT_IN_PAGE_FLAGS
  MAINTAINERS: add and correct types of some "T:" entries
  MAINTAINERS: use tab for separator
  rapidio/tsi721: fix tasklet termination in dma channel release
  hfsplus: fix remount issue
  zram: avoid null access when fail to alloc meta
  sh: prefix sh-specific "CCR" and "CCR2" by "SH_"
  ocfs2: fix quota file corruption
  drivers/rtc/rtc-s3c.c: fix incorrect way of save/restore of S3C2410_TICNT for TYPE_S3C64XX
  kallsyms: fix absolute addresses for kASLR
  scripts/gen_initramfs_list.sh: fix flags for initramfs LZ4 compression
  mm: include VM_MIXEDMAP flag in the VM_SPECIAL list to avoid m(un)locking
  memcg: reparent charges of children before processing parent
  memcg: fix endless loop in __mem_cgroup_iter_next()
  lib/radix-tree.c: swapoff tmpfs radix_tree: remember to rcu_read_unlock
  dma debug: account for cachelines and read-only mappings in overlap tracking
  mm: close PageTail race
  MAINTAINERS: EDAC: add Mauro and Borislav as interim patch collectors
parents 0c0bd34a 27329369

MAINTAINERS

+53 −50
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ Descriptions of section entries: 
	L: Mailing list that is relevant to this area

	W: Web-page with status/info

	Q: Patchwork web based patch tracking system site

	T: SCM tree type and location.  Type is one of: git, hg, quilt, stgit, topgit.

	T: SCM tree type and location.

	   Type is one of: git, hg, quilt, stgit, topgit

	S: Status, one of the following:

	   Supported:	Someone is actually paid to look after this.

	   Maintained:	Someone actually looks after it.
@@ -2159,7 +2160,7 @@ F: Documentation/zh_CN/ 


CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER

M:	Peter Chen <Peter.Chen@freescale.com>

T:	git://github.com/hzpeterchen/linux-usb.git

T:	git git://github.com/hzpeterchen/linux-usb.git

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/usb/chipidea/
@@ -2382,7 +2383,7 @@ M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> 
M:	Daniel Lezcano <daniel.lezcano@linaro.org>

L:	linux-pm@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org

T:      git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git

S:	Maintained

F:	drivers/cpuidle/cpuidle-big_little.c
@@ -2391,7 +2392,7 @@ M: Rafael J. Wysocki <rjw@rjwysocki.net> 
M:	Daniel Lezcano <daniel.lezcano@linaro.org>

L:	linux-pm@vger.kernel.org

S:	Maintained

T:	git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git

F:	drivers/cpuidle/*

F:	include/linux/cpuidle.h
@@ -3095,6 +3096,8 @@ F: fs/ecryptfs/ 


EDAC-CORE

M:	Doug Thompson <dougthompson@xmission.com>

M:	Borislav Petkov <bp@alien8.de>

M:	Mauro Carvalho Chehab <m.chehab@samsung.com>

L:	linux-edac@vger.kernel.org

W:	bluesmoke.sourceforge.net

S:	Supported
@@ -4914,7 +4917,7 @@ F: drivers/staging/ktap/ 
KCONFIG

M:	"Yann E. MORIN" <yann.morin.1998@free.fr>

L:	linux-kbuild@vger.kernel.org

T:	git://gitorious.org/linux-kconfig/linux-kconfig

T:	git git://gitorious.org/linux-kconfig/linux-kconfig

S:	Maintained

F:	Documentation/kbuild/kconfig-language.txt

F:	scripts/kconfig/
@@ -5733,7 +5736,7 @@ L: linux-rdma@vger.kernel.org 
W:	http://www.mellanox.com

Q:	http://patchwork.ozlabs.org/project/netdev/list/

Q:	http://patchwork.kernel.org/project/linux-rdma/list/

T:	git://openfabrics.org/~eli/connect-ib.git

T:	git git://openfabrics.org/~eli/connect-ib.git

S:	Supported

F:	drivers/net/ethernet/mellanox/mlx5/core/

F:	include/linux/mlx5/
@@ -5743,7 +5746,7 @@ M: Eli Cohen <eli@mellanox.com> 
L:	linux-rdma@vger.kernel.org

W:	http://www.mellanox.com

Q:	http://patchwork.kernel.org/project/linux-rdma/list/

T:      git://openfabrics.org/~eli/connect-ib.git

T:	git git://openfabrics.org/~eli/connect-ib.git

S:	Supported

F:	include/linux/mlx5/

F:	drivers/infiniband/hw/mlx5/
@@ -9812,7 +9815,7 @@ ZR36067 VIDEO FOR LINUX DRIVER 
L:	mjpeg-users@lists.sourceforge.net

L:	linux-media@vger.kernel.org

W:	http://mjpeg.sourceforge.net/driver-zoran/

T:	Mercurial http://linuxtv.org/hg/v4l-dvb

T:	hg http://linuxtv.org/hg/v4l-dvb

S:	Odd Fixes

F:	drivers/media/pci/zoran/

arch/sh/include/cpu-sh2/cpu/cache.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#define SH_CACHE_ASSOC		8



#if defined(CONFIG_CPU_SUBTYPE_SH7619)

#define CCR		0xffffffec

#define SH_CCR		0xffffffec



#define CCR_CACHE_CE	0x01	/* Cache enable */

#define CCR_CACHE_WT	0x02    /* CCR[bit1=1,bit2=1] */

arch/sh/include/cpu-sh2a/cpu/cache.h

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
#define SH_CACHE_COMBINED	4

#define SH_CACHE_ASSOC		8



#define CCR		0xfffc1000 /* CCR1 */

#define CCR2		0xfffc1004

#define SH_CCR		0xfffc1000 /* CCR1 */

#define SH_CCR2		0xfffc1004



/*

 * Most of the SH-2A CCR1 definitions resemble the SH-4 ones. All others not

arch/sh/include/cpu-sh3/cpu/cache.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define SH_CACHE_COMBINED	4

#define SH_CACHE_ASSOC		8



#define CCR		0xffffffec	/* Address of Cache Control Register */

#define SH_CCR		0xffffffec	/* Address of Cache Control Register */



#define CCR_CACHE_CE	0x01	/* Cache Enable */

#define CCR_CACHE_WT	0x02	/* Write-Through (for P0,U0,P3) (else writeback) */

arch/sh/include/cpu-sh4/cpu/cache.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define SH_CACHE_COMBINED	4

#define SH_CACHE_ASSOC		8



#define CCR		0xff00001c	/* Address of Cache Control Register */

#define SH_CCR		0xff00001c	/* Address of Cache Control Register */

#define CCR_CACHE_OCE	0x0001	/* Operand Cache Enable */

#define CCR_CACHE_WT	0x0002	/* Write-Through (for P0,U0,P3) (else writeback)*/

#define CCR_CACHE_CB	0x0004	/* Copy-Back (for P1) (else writethrough) */