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

Commit 1ba7055a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.10-rc5 into tty-next

parents f0f6b803 317ddd25
Loading
Loading
Loading
Loading
+3 −3
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ command:
After a while you will start to get messages about current status or error like
After a while you will start to get messages about current status or error like
in the original code.
in the original code.


Note that running a new test will stop any in progress test.
Note that running a new test will not stop any in progress test.


The following command should return actual state of the test.
The following command should return actual state of the test.
	% cat /sys/kernel/debug/dmatest/run
	% cat /sys/kernel/debug/dmatest/run
@@ -52,8 +52,8 @@ To wait for test done the user may perform a busy loop that checks the state.


The module parameters that is supplied to the kernel command line will be used
The module parameters that is supplied to the kernel command line will be used
for the first performed test. After user gets a control, the test could be
for the first performed test. After user gets a control, the test could be
interrupted or re-run with same or different parameters. For the details see
re-run with the same or different parameters. For the details see the above
the above section "Part 2 - When dmatest is built as a module..."
section "Part 2 - When dmatest is built as a module..."


In both cases the module parameters are used as initial values for the test case.
In both cases the module parameters are used as initial values for the test case.
You always could check them at run-time by running
You always could check them at run-time by running
+3 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,9 @@ When mounting an XFS filesystem, the following options are accepted.
	removing extended attributes) the on-disk superblock feature
	removing extended attributes) the on-disk superblock feature
	bit field will be updated to reflect this format being in use.
	bit field will be updated to reflect this format being in use.


	CRC enabled filesystems always use the attr2 format, and so
	will reject the noattr2 mount option if it is set.

  barrier
  barrier
	Enables the use of block layer write barriers for writes into
	Enables the use of block layer write barriers for writes into
	the journal and unwritten extent conversion.  This allows for
	the journal and unwritten extent conversion.  This allows for
+25 −2
Original line number Original line Diff line number Diff line
@@ -147,6 +147,25 @@ Example signal handler:
      fix_the_problem(ucp->dar);
      fix_the_problem(ucp->dar);
    }
    }


When in an active transaction that takes a signal, we need to be careful with
the stack.  It's possible that the stack has moved back up after the tbegin.
The obvious case here is when the tbegin is called inside a function that
returns before a tend.  In this case, the stack is part of the checkpointed
transactional memory state.  If we write over this non transactionally or in
suspend, we are in trouble because if we get a tm abort, the program counter and
stack pointer will be back at the tbegin but our in memory stack won't be valid
anymore.

To avoid this, when taking a signal in an active transaction, we need to use
the stack pointer from the checkpointed state, rather than the speculated
state.  This ensures that the signal context (written tm suspended) will be
written below the stack required for the rollback.  The transaction is aborted
becuase of the treclaim, so any memory written between the tbegin and the
signal will be rolled back anyway.

For signals taken in non-TM or suspended mode, we use the
normal/non-checkpointed stack pointer.



Failure cause codes used by kernel
Failure cause codes used by kernel
==================================
==================================
@@ -155,14 +174,18 @@ These are defined in <asm/reg.h>, and distinguish different reasons why the
kernel aborted a transaction:
kernel aborted a transaction:


 TM_CAUSE_RESCHED       Thread was rescheduled.
 TM_CAUSE_RESCHED       Thread was rescheduled.
 TM_CAUSE_TLBI          Software TLB invalide.
 TM_CAUSE_FAC_UNAV      FP/VEC/VSX unavailable trap.
 TM_CAUSE_FAC_UNAV      FP/VEC/VSX unavailable trap.
 TM_CAUSE_SYSCALL       Currently unused; future syscalls that must abort
 TM_CAUSE_SYSCALL       Currently unused; future syscalls that must abort
                        transactions for consistency will use this.
                        transactions for consistency will use this.
 TM_CAUSE_SIGNAL        Signal delivered.
 TM_CAUSE_SIGNAL        Signal delivered.
 TM_CAUSE_MISC          Currently unused.
 TM_CAUSE_MISC          Currently unused.
 TM_CAUSE_ALIGNMENT     Alignment fault.
 TM_CAUSE_EMULATE       Emulation that touched memory.


These can be checked by the user program's abort handler as TEXASR[0:7].
These can be checked by the user program's abort handler as TEXASR[0:7].  If

bit 7 is set, it indicates that the error is consider persistent.  For example
a TM_CAUSE_ALIGNMENT will be persistent while a TM_CAUSE_RESCHED will not.q


GDB
GDB
===
===
+22 −3
Original line number Original line Diff line number Diff line
@@ -2890,8 +2890,8 @@ F: drivers/media/dvb-frontends/ec100*


ECRYPT FILE SYSTEM
ECRYPT FILE SYSTEM
M:	Tyler Hicks <tyhicks@canonical.com>
M:	Tyler Hicks <tyhicks@canonical.com>
M:	Dustin Kirkland <dustin.kirkland@gazzang.com>
L:	ecryptfs@vger.kernel.org
L:	ecryptfs@vger.kernel.org
W:	http://ecryptfs.org
W:	https://launchpad.net/ecryptfs
W:	https://launchpad.net/ecryptfs
S:	Supported
S:	Supported
F:	Documentation/filesystems/ecryptfs.txt
F:	Documentation/filesystems/ecryptfs.txt
@@ -3322,11 +3322,12 @@ F: drivers/net/wan/dlci.c
F:	drivers/net/wan/sdla.c
F:	drivers/net/wan/sdla.c


FRAMEBUFFER LAYER
FRAMEBUFFER LAYER
M:	Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
M:	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
M:	Tomi Valkeinen <tomi.valkeinen@ti.com>
L:	linux-fbdev@vger.kernel.org
L:	linux-fbdev@vger.kernel.org
W:	http://linux-fbdev.sourceforge.net/
W:	http://linux-fbdev.sourceforge.net/
Q:	http://patchwork.kernel.org/project/linux-fbdev/list/
Q:	http://patchwork.kernel.org/project/linux-fbdev/list/
T:	git git://github.com/schandinat/linux-2.6.git fbdev-next
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git
S:	Maintained
S:	Maintained
F:	Documentation/fb/
F:	Documentation/fb/
F:	Documentation/devicetree/bindings/fb/
F:	Documentation/devicetree/bindings/fb/
@@ -4447,6 +4448,16 @@ S: Maintained
F:	drivers/scsi/*iscsi*
F:	drivers/scsi/*iscsi*
F:	include/scsi/*iscsi*
F:	include/scsi/*iscsi*


ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
M:	Or Gerlitz <ogerlitz@mellanox.com>
M:	Roi Dayan <roid@mellanox.com>
L:	linux-rdma@vger.kernel.org
S:	Supported
W:	http://www.openfabrics.org
W:	www.open-iscsi.org
Q:	http://patchwork.kernel.org/project/linux-rdma/list/
F:	drivers/infiniband/ulp/iser

ISDN SUBSYSTEM
ISDN SUBSYSTEM
M:	Karsten Keil <isdn@linux-pingi.de>
M:	Karsten Keil <isdn@linux-pingi.de>
L:	isdn4linux@listserv.isdn4linux.de (subscribers-only)
L:	isdn4linux@listserv.isdn4linux.de (subscribers-only)
@@ -6087,7 +6098,15 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git
S:	Maintained
S:	Maintained
F:	arch/parisc/
F:	arch/parisc/
F:	Documentation/parisc/
F:	drivers/parisc/
F:	drivers/parisc/
F:	drivers/char/agp/parisc-agp.c
F:	drivers/input/serio/gscps2.c
F:	drivers/parport/parport_gsc.*
F:	drivers/tty/serial/8250/8250_gsc.c
F:	drivers/video/sti*
F:	drivers/video/console/sti*
F:	drivers/video/logo/logo_parisc*


PC87360 HARDWARE MONITORING DRIVER
PC87360 HARDWARE MONITORING DRIVER
M:	Jim Cromie <jim.cromie@gmail.com>
M:	Jim Cromie <jim.cromie@gmail.com>
+1 −1
Original line number Original line Diff line number Diff line
VERSION = 3
VERSION = 3
PATCHLEVEL = 10
PATCHLEVEL = 10
SUBLEVEL = 0
SUBLEVEL = 0
EXTRAVERSION = -rc3
EXTRAVERSION = -rc5
NAME = Unicycling Gorilla
NAME = Unicycling Gorilla


# *DOCUMENTATION*
# *DOCUMENTATION*
Loading