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

Commit 675a9a9f authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge tag 'v4.2-rc2' into patchwork 

Linux 4.2-rc2

We need to backport changeset 31f02455, with fixes a bug at
include/linux/compiler.h that breaks sparse.

* tag 'v4.2-rc2': (221 commits)
  Linux 4.2-rc2
  Revert "drm/i915: Use crtc_state->active in primary check_plane func"
  freeing unlinked file indefinitely delayed
  fix a braino in ovl_d_select_inode()
  9p: don't leave a half-initialized inode sitting around
  tick/broadcast: Prevent NULL pointer dereference
  selinux: fix mprotect PROT_EXEC regression caused by mm change
  parisc: Fix some PTE/TLB race conditions and optimize __flush_tlb_range based on timing results
  stifb: Implement hardware accelerated copyarea
  nfit: add support for NVDIMM "latch" flag
  nfit: update block I/O path to use PMEM API
  tools/testing/nvdimm: add mock acpi_nfit_flush_address entries to nfit_test
  tools/testing/nvdimm: fix return code for unimplemented commands
  tools/testing/nvdimm: mock ioremap_wt
  pmem: add maintainer for include/linux/pmem.h
  Revert "Input: synaptics - allocate 3 slots to keep stability in image sensors"
  arm64: entry32: remove pointless register assignment
  MIPS: O32: Use compat_sys_getsockopt.
  MIPS: c-r4k: Extend way_string array
  MIPS: Pistachio: Support CDMM & Fast Debug Channel
  ...
parents 41cc14ba bc0195aa

Documentation/arm/sunxi/README

+17 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ SunXi family 
        + User Manual

          http://dl.linux-sunxi.org/A20/A20%20User%20Manual%202013-03-22.pdf



      - Allwinner A23

      - Allwinner A23 (sun8i)

        + Datasheet

          http://dl.linux-sunxi.org/A23/A23%20Datasheet%20V1.0%2020130830.pdf

        + User Manual
@@ -55,7 +55,23 @@ SunXi family 
        + User Manual

          http://dl.linux-sunxi.org/A31/A3x_release_document/A31s/IC/A31s%20User%20Manual%20%20V1.0%2020130322.pdf



      - Allwinner A33 (sun8i)

        + Datasheet

          http://dl.linux-sunxi.org/A33/A33%20Datasheet%20release%201.1.pdf

        + User Manual

          http://dl.linux-sunxi.org/A33/A33%20user%20manual%20release%201.1.pdf



      - Allwinner H3 (sun8i)

        + Datasheet

          http://dl.linux-sunxi.org/H3/Allwinner_H3_Datasheet_V1.0.pdf



    * Quad ARM Cortex-A15, Quad ARM Cortex-A7 based SoCs

      - Allwinner A80

        + Datasheet

	  http://dl.linux-sunxi.org/A80/A80_Datasheet_Revision_1.0_0404.pdf



    * Octa ARM Cortex-A7 based SoCs

      - Allwinner A83T

        + Not Supported

        + Datasheet

          http://dl.linux-sunxi.org/A83T/A83T_datasheet_Revision_1.1.pdf

Documentation/devicetree/bindings/arm/sunxi.txt

+2 −0
Original line number Diff line number Diff line
@@ -9,4 +9,6 @@ using one of the following compatible strings: 
  allwinner,sun6i-a31

  allwinner,sun7i-a20

  allwinner,sun8i-a23

  allwinner,sun8i-a33

  allwinner,sun8i-h3

  allwinner,sun9i-a80

Documentation/devicetree/bindings/memory-controllers/ti/emif.txt

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ of the EMIF IP and memory parts attached to it. 
Required properties:

- compatible	: Should be of the form "ti,emif-<ip-rev>" where <ip-rev>

  is the IP revision of the specific EMIF instance.

		  For am437x should be ti,emif-am4372.



- phy-type	: <u32> indicating the DDR phy type. Following are the

  allowed values

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

+21 −5
Original line number Diff line number Diff line
@@ -1614,6 +1614,7 @@ M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/boot/dts/vexpress*

F:	arch/arm64/boot/dts/arm/vexpress*

F:	arch/arm/mach-vexpress/

F:	*/*/vexpress*

F:	*/*/*/vexpress*
@@ -2562,19 +2563,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
@@ -6147,6 +6160,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>
@@ -6161,7 +6175,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/
@@ -8366,10 +8380,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