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

Commit e0ea1365 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.2/fixes-rc2-v2' of... 

Merge tag 'omap-for-v4.2/fixes-rc2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Fixes for omaps, all dts changes except for one:

- Fix up LCD panel name for overo boards

- Three fixes for pepper board for regulators, freqeuncy
  scaling and audio input. Note that there is still one
  issue being worked on for booting with multi_v7_defconfig

- Add missing #iommu-cells for omap4 and 5

- Add missing HAVE_ARM_SCU for am43xx

* tag 'omap-for-v4.2/fixes-rc2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (210 commits)
  ARM: dts: Correct audio input route & set mic bias for am335x-pepper
  ARM: OMAP2+: Add HAVE_ARM_SCU for AM43XX
  ARM: dts: OMAP5: Add #iommu-cells property to IOMMUs
  ARM: dts: OMAP4: Add #iommu-cells property to IOMMUs
  ARM: dts: Fix frequency scaling on Gumstix Pepper
  ARM: dts: configure regulators for Gumstix Pepper
  ARM: dts: omap3: overo: Update LCD panel names
  + Linux 4.2-rc2

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e1749a75 9908ac3d

Documentation/power/swsusp.txt

+11 −2
Original line number Diff line number Diff line
@@ -410,8 +410,17 @@ Documentation/usb/persist.txt. 


Q: Can I suspend-to-disk using a swap partition under LVM?



A: No. You can suspend successfully, but you'll not be able to

resume. uswsusp should be able to work with LVM. See suspend.sf.net.

A: Yes and No.  You can suspend successfully, but the kernel will not be able

to resume on its own.  You need an initramfs that can recognize the resume

situation, activate the logical volume containing the swap volume (but not

touch any filesystems!), and eventually call



echo -n "$major:$minor" > /sys/power/resume



where $major and $minor are the respective major and minor device numbers of

the swap volume.



uswsusp works with LVM, too.  See http://suspend.sourceforge.net/



Q: I upgraded the kernel from 2.6.15 to 2.6.16. Both kernels were

compiled with the similar configuration files. Anyway I found that

MAINTAINERS

+20 −5
Original line number Diff line number Diff line
@@ -2564,19 +2564,31 @@ F: arch/powerpc/include/uapi/asm/spu*.h 
F:	arch/powerpc/oprofile/*cell*

F:	arch/powerpc/platforms/cell/



CEPH DISTRIBUTED FILE SYSTEM CLIENT

CEPH COMMON CODE (LIBCEPH)

M:	Ilya Dryomov <idryomov@gmail.com>

M:	"Yan, Zheng" <zyan@redhat.com>

M:	Sage Weil <sage@redhat.com>

L:	ceph-devel@vger.kernel.org

W:	http://ceph.com/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git

T:	git git://github.com/ceph/ceph-client.git

S:	Supported

F:	Documentation/filesystems/ceph.txt

F:	fs/ceph/

F:	net/ceph/

F:	include/linux/ceph/

F:	include/linux/crush/



CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH)

M:	"Yan, Zheng" <zyan@redhat.com>

M:	Sage Weil <sage@redhat.com>

M:	Ilya Dryomov <idryomov@gmail.com>

L:	ceph-devel@vger.kernel.org

W:	http://ceph.com/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git

T:	git git://github.com/ceph/ceph-client.git

S:	Supported

F:	Documentation/filesystems/ceph.txt

F:	fs/ceph/



CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:

L:	linux-usb@vger.kernel.org

S:	Orphan
@@ -6149,6 +6161,7 @@ L: linux-nvdimm@lists.01.org 
Q:	https://patchwork.kernel.org/project/linux-nvdimm/list/

S:	Supported

F:	drivers/nvdimm/pmem.c

F:	include/linux/pmem.h



LINUX FOR IBM pSERIES (RS/6000)

M:	Paul Mackerras <paulus@au.ibm.com>
@@ -6163,7 +6176,7 @@ M: Michael Ellerman <mpe@ellerman.id.au> 
W:	http://www.penguinppc.org/

L:	linuxppc-dev@lists.ozlabs.org

Q:	http://patchwork.ozlabs.org/project/linuxppc-dev/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git

S:	Supported

F:	Documentation/powerpc/

F:	arch/powerpc/
@@ -8368,10 +8381,12 @@ RADOS BLOCK DEVICE (RBD) 
M:	Ilya Dryomov <idryomov@gmail.com>

M:	Sage Weil <sage@redhat.com>

M:	Alex Elder <elder@kernel.org>

M:	ceph-devel@vger.kernel.org

L:	ceph-devel@vger.kernel.org

W:	http://ceph.com/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git

T:	git git://github.com/ceph/ceph-client.git

S:	Supported

F:	Documentation/ABI/testing/sysfs-bus-rbd

F:	drivers/block/rbd.c

F:	drivers/block/rbd_types.h

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 2

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Hurr durr I'ma sheep



# *DOCUMENTATION*

arch/arm/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -1693,6 +1693,12 @@ config HIGHMEM 
config HIGHPTE

	bool "Allocate 2nd-level pagetables from highmem"

	depends on HIGHMEM

	help

	  The VM uses one page of physical memory for each page table.

	  For systems with a lot of processes, this can use a lot of

	  precious low memory, eventually leading to low memory being

	  consumed by page tables.  Setting this option will allow

	  user-space 2nd level page tables to reside in high memory.



config HW_PERF_EVENTS

	bool "Enable hardware performance counter support for perf events"

arch/arm/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -1635,7 +1635,7 @@ config PID_IN_CONTEXTIDR 


config DEBUG_SET_MODULE_RONX

	bool "Set loadable kernel module data as NX and text as RO"

	depends on MODULES

	depends on MODULES && MMU

	---help---

	  This option helps catch unintended modifications to loadable

	  kernel module's text and read-only data. It also prevents execution