Commit 6dc1c49d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'fbcon-locking-fixes' of ssh://people.freedesktop.org/~airlied/linux into drm-next 

This pulls in most of Linus tree up to -rc6, this fixes the worst lockdep
reported issues and re-enables fbcon lockdep.

(not the fbcon maintainer)
* 'fbcon-locking-fixes' of ssh://people.freedesktop.org/~airlied/linux: (529 commits)
  Revert "Revert "console: implement lockdep support for console_lock""
  fbcon: fix locking harder
  fb: Yet another band-aid for fixing lockdep mess
  fb: rework locking to fix lock ordering on takeover
parents cd17ef41 5845b81b

Documentation/device-mapper/dm-raid.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -141,3 +141,4 @@ Version History 
1.2.0	Handle creation of arrays that contain failed devices.

1.2.0	Handle creation of arrays that contain failed devices.

1.3.0	Added support for RAID 10

1.3.0	Added support for RAID 10

1.3.1	Allow device replacement/rebuild for RAID 10

1.3.1	Allow device replacement/rebuild for RAID 10

1.3.2   Fix/improve redundancy checking for RAID10

Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt

+3 −2
Original line number Original line Diff line number Diff line
@@ -81,7 +81,8 @@ PA31 TXD4 
Required properties for pin configuration node:

Required properties for pin configuration node:

- atmel,pins: 4 integers array, represents a group of pins mux and config

- atmel,pins: 4 integers array, represents a group of pins mux and config

  setting. The format is atmel,pins = <PIN_BANK PIN_BANK_NUM PERIPH CONFIG>.

  setting. The format is atmel,pins = <PIN_BANK PIN_BANK_NUM PERIPH CONFIG>.

  The PERIPH 0 means gpio.

  The PERIPH 0 means gpio, PERIPH 1 is periph A, PERIPH 2 is periph B...

  PIN_BANK 0 is pioA, PIN_BANK 1 is pioB...





Bits used for CONFIG:

Bits used for CONFIG:

PULL_UP		(1 << 0): indicate this pin need a pull up.

PULL_UP		(1 << 0): indicate this pin need a pull up.
@@ -126,7 +127,7 @@ pinctrl@fffff400 { 
		pinctrl_dbgu: dbgu-0 {

		pinctrl_dbgu: dbgu-0 {

			atmel,pins =

			atmel,pins =

				<1 14 0x1 0x0	/* PB14 periph A */

				<1 14 0x1 0x0	/* PB14 periph A */

				 1 15 0x1 0x1>;	/* PB15 periph with pullup */

				 1 15 0x1 0x1>;	/* PB15 periph A with pullup */

		};

		};

	};

	};

};

};

Documentation/filesystems/f2fs.txt

+9 −9
Original line number Original line Diff line number Diff line
@@ -175,9 +175,9 @@ consists of multiple segments as described below. 
                                            align with the zone size <-|

                                            align with the zone size <-|

                 |-> align with the segment size

                 |-> align with the segment size

     _________________________________________________________________________

     _________________________________________________________________________

    |            |            |    Node     |   Segment   |   Segment  |      |

    |            |            |   Segment   |    Node     |   Segment  |      |

    | Superblock | Checkpoint |   Address   |    Info.    |   Summary  | Main |

    | Superblock | Checkpoint |    Info.    |   Address   |   Summary  | Main |

    |    (SB)    |   (CP)     | Table (NAT) | Table (SIT) | Area (SSA) |      |

    |    (SB)    |   (CP)     | Table (SIT) | Table (NAT) | Area (SSA) |      |

    |____________|_____2______|______N______|______N______|______N_____|__N___|

    |____________|_____2______|______N______|______N______|______N_____|__N___|

                                                                       .      .

                                                                       .      .

                                                             .                .

                                                             .                .
@@ -200,14 +200,14 @@ consists of multiple segments as described below. 
 : It contains file system information, bitmaps for valid NAT/SIT sets, orphan

 : It contains file system information, bitmaps for valid NAT/SIT sets, orphan

   inode lists, and summary entries of current active segments.

   inode lists, and summary entries of current active segments.





- Node Address Table (NAT)

 : It is composed of a block address table for all the node blocks stored in

   Main area.



- Segment Information Table (SIT)

- Segment Information Table (SIT)

 : It contains segment information such as valid block count and bitmap for the

 : It contains segment information such as valid block count and bitmap for the

   validity of all the blocks.

   validity of all the blocks.





- Node Address Table (NAT)

 : It is composed of a block address table for all the node blocks stored in

   Main area.



- Segment Summary Area (SSA)

- Segment Summary Area (SSA)

 : It contains summary entries which contains the owner information of all the

 : It contains summary entries which contains the owner information of all the

   data and node blocks stored in Main area.

   data and node blocks stored in Main area.
@@ -236,13 +236,13 @@ For file system consistency, each CP points to which NAT and SIT copies are 
valid, as shown as below.

valid, as shown as below.





  +--------+----------+---------+

  +--------+----------+---------+

  |   CP   |    NAT   |   SIT   |

  |   CP   |    SIT   |   NAT   |

  +--------+----------+---------+

  +--------+----------+---------+

  .         .          .          .

  .         .          .          .

  .            .              .              .

  .            .              .              .

  .               .                 .                 .

  .               .                 .                 .

  +-------+-------+--------+--------+--------+--------+

  +-------+-------+--------+--------+--------+--------+

  | CP #0 | CP #1 | NAT #0 | NAT #1 | SIT #0 | SIT #1 |

  | CP #0 | CP #1 | SIT #0 | SIT #1 | NAT #0 | NAT #1 |

  +-------+-------+--------+--------+--------+--------+

  +-------+-------+--------+--------+--------+--------+

     |             ^                          ^

     |             ^                          ^

     |             |                          |

     |             |                          |

Documentation/hid/hid-sensor.txt

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

Documentation/kernel-parameters.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -2438,7 +2438,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			real-time workloads.  It can also improve energy

			real-time workloads.  It can also improve energy

			efficiency for asymmetric multiprocessors.

			efficiency for asymmetric multiprocessors.





	rcu_nocbs_poll	[KNL,BOOT]

	rcu_nocb_poll	[KNL,BOOT]

			Rather than requiring that offloaded CPUs

			Rather than requiring that offloaded CPUs

			(specified by rcu_nocbs= above) explicitly

			(specified by rcu_nocbs= above) explicitly

			awaken the corresponding "rcuoN" kthreads,

			awaken the corresponding "rcuoN" kthreads,