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

Commit 5e580523 authored by Dave Airlie's avatar Dave Airlie
Browse files

Backmerge tag 'v4.7' into drm-next 

Linux 4.7

As requested by Daniel Vetter as the conflicts were getting messy.
parents c11dea5b 523d939e

Documentation/gdb-kernel-debugging.txt

+0 −21
Original line number Diff line number Diff line
@@ -139,27 +139,6 @@ Examples of using the Linux-provided gdb helpers 
      start_comm = "swapper/2\000\000\000\000\000\000"

    }



 o Dig into a radix tree data structure, such as the IRQ descriptors:

    (gdb) print (struct irq_desc)$lx_radix_tree_lookup(irq_desc_tree, 18)

    $6 = {

      irq_common_data = {

        state_use_accessors = 67584,

        handler_data = 0x0 <__vectors_start>,

        msi_desc = 0x0 <__vectors_start>,

        affinity = {{

            bits = {65535}

          }}

      },

      irq_data = {

        mask = 0,

        irq = 18,

        hwirq = 27,

        common = 0xee803d80,

        chip = 0xc0eb0854 <gic_data>,

        domain = 0xee808000,

        parent_data = 0x0 <__vectors_start>,

        chip_data = 0xc0eb0854 <gic_data>

      } <... trimmed ...>



List of commands and functions

------------------------------

Documentation/x86/intel_mpx.txt

+3 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ is how we expect the compiler, application and kernel to work together. 
   MPX-instrumented.

3) The kernel detects that the CPU has MPX, allows the new prctl() to

   succeed, and notes the location of the bounds directory. Userspace is

   expected to keep the bounds directory at that locationWe note it

   expected to keep the bounds directory at that location. We note it

   instead of reading it each time because the 'xsave' operation needed

   to access the bounds directory register is an expensive operation.

4) If the application needs to spill bounds out of the 4 registers, it
@@ -167,7 +167,7 @@ If a #BR is generated due to a bounds violation caused by MPX. 
We need to decode MPX instructions to get violation address and

set this address into extended struct siginfo.



The _sigfault feild of struct siginfo is extended as follow:

The _sigfault field of struct siginfo is extended as follow:



87		/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */

88		struct {
@@ -240,5 +240,5 @@ them at the same bounds table. 
This is allowed architecturally.  See more information "Intel(R) Architecture

Instruction Set Extensions Programming Reference" (9.3.4).



However, if users did this, the kernel might be fooled in to unmaping an

However, if users did this, the kernel might be fooled in to unmapping an

in-use bounds table since it does not recognize sharing.

Documentation/x86/tlb.txt

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ memory, it has two choices: 
    from areas other than the one we are trying to flush will be

    destroyed and must be refilled later, at some cost.

 2. Use the invlpg instruction to invalidate a single page at a

    time.  This could potentialy cost many more instructions, but

    time.  This could potentially cost many more instructions, but

    it is a much more precise operation, causing no collateral

    damage to other TLB entries.
@@ -19,7 +19,7 @@ Which method to do depends on a few things: 
    work.

 3. The size of the TLB.  The larger the TLB, the more collateral

    damage we do with a full flush.  So, the larger the TLB, the

    more attrative an individual flush looks.  Data and

    more attractive an individual flush looks.  Data and

    instructions have separate TLBs, as do different page sizes.

 4. The microarchitecture.  The TLB has become a multi-level

    cache on modern CPUs, and the global flushes have become more

Documentation/x86/x86_64/machinecheck

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ between all CPUs. 


check_interval

	How often to poll for corrected machine check errors, in seconds

	(Note output is hexademical). Default 5 minutes.  When the poller

	(Note output is hexadecimal). Default 5 minutes.  When the poller

	finds MCEs it triggers an exponential speedup (poll more often) on

	the polling interval.  When the poller stops finding MCEs, it

	triggers an exponential backoff (poll less often) on the polling

MAINTAINERS

+9 −4
Original line number Diff line number Diff line
@@ -595,6 +595,10 @@ S: Odd Fixes 
L:	linux-alpha@vger.kernel.org

F:	arch/alpha/



ALPS PS/2 TOUCHPAD DRIVER

R:	Pali Rohár <pali.rohar@gmail.com>

F:	drivers/input/mouse/alps.*



ALTERA MAILBOX DRIVER

M:	Ley Foon Tan <lftan@altera.com>

L:	nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
@@ -1698,8 +1702,6 @@ S: Maintained 
F:	drivers/edac/altera_edac.



ARM/STI ARCHITECTURE

M:	Srinivas Kandagatla <srinivas.kandagatla@gmail.com>

M:	Maxime Coquelin <maxime.coquelin@st.com>

M:	Patrice Chotard <patrice.chotard@st.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	kernel@stlinux.com
@@ -1732,6 +1734,7 @@ F: drivers/ata/ahci_st.c 


ARM/STM32 ARCHITECTURE

M:	Maxime Coquelin <mcoquelin.stm32@gmail.com>

M:	Alexandre Torgue <alexandre.torgue@st.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32.git
@@ -4511,7 +4514,7 @@ S: Orphan 
F:	fs/efs/



EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER

M:	Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>

M:	Douglas Miller <dougmill@linux.vnet.ibm.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ethernet/ibm/ehea/
@@ -7458,7 +7461,7 @@ F: drivers/scsi/megaraid.* 
F:	drivers/scsi/megaraid/



MELLANOX ETHERNET DRIVER (mlx4_en)

M: 	Eugenia Emantayev <eugenia@mellanox.com>

M:	Tariq Toukan <tariqt@mellanox.com>

L:	netdev@vger.kernel.org

S:	Supported

W:	http://www.mellanox.com
@@ -7510,6 +7513,7 @@ Q: http://patchwork.ozlabs.org/project/linux-mtd/list/ 
T:	git git://git.infradead.org/linux-mtd.git

T:	git git://git.infradead.org/l2-mtd.git

S:	Maintained

F:	Documentation/devicetree/bindings/mtd/

F:	drivers/mtd/

F:	include/linux/mtd/

F:	include/uapi/mtd/
@@ -8997,6 +9001,7 @@ L: linux-gpio@vger.kernel.org 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git

S:	Maintained

F:	Documentation/devicetree/bindings/pinctrl/

F:	Documentation/pinctrl.txt

F:	drivers/pinctrl/

F:	include/linux/pinctrl/