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

Commit 13e98fd1 authored by Radim Krčmář's avatar Radim Krčmář
Browse files

Merge tag 'kvm-arm-for-v4.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm 

KVM/ARM Fixes for v4.7-rc2

Fixes for the vgic, 2 of the patches address a bug introduced in v4.6
while the rest are for the new vgic.
parents e28e909c 05fb05a6

Documentation/ABI/stable/sysfs-class-ubi

+9 −0
Original line number Diff line number Diff line
@@ -107,6 +107,15 @@ Contact: Artem Bityutskiy <dedekind@infradead.org> 
Description:

		Number of physical eraseblocks reserved for bad block handling.



What:		/sys/class/ubi/ubiX/ro_mode

Date:		April 2016

KernelVersion:	4.7

Contact:	linux-mtd@lists.infradead.org

Description:

		Contains ASCII "1\n" if the read-only flag is set on this

		device, and "0\n" if it is cleared. UBI devices mark themselves

		as read-only when they detect an unrecoverable error.



What:		/sys/class/ubi/ubiX/total_eraseblocks

Date:		July 2006

KernelVersion:	2.6.22

Documentation/DocBook/gpu.tmpl

+6 −0
Original line number Diff line number Diff line
@@ -1626,6 +1626,12 @@ void intel_crt_init(struct drm_device *dev) 
!Pdrivers/gpu/drm/drm_dp_helper.c dp helpers

!Iinclude/drm/drm_dp_helper.h

!Edrivers/gpu/drm/drm_dp_helper.c

    </sect2>

    <sect2>

      <title>Display Port Dual Mode Adaptor Helper Functions Reference</title>

!Pdrivers/gpu/drm/drm_dp_dual_mode_helper.c dp dual mode helpers

!Iinclude/drm/drm_dp_dual_mode_helper.h

!Edrivers/gpu/drm/drm_dp_dual_mode_helper.c

    </sect2>

    <sect2>

      <title>Display Port MST Helper Functions Reference</title>

Documentation/devicetree/bindings/gpio/microchip,pic32-gpio.txt

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ gpio0: gpio0@1f860000 { 
	gpio-controller;

	interrupt-controller;

	#interrupt-cells = <2>;

	clocks = <&PBCLK4>;

	clocks = <&rootclk PB4CLK>;

	microchip,gpio-bank = <0>;

	gpio-ranges = <&pic32_pinctrl 0 0 16>;

};

Documentation/devicetree/bindings/mips/cpu_irq.txt

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ Required properties: 
- compatible : Should be "mti,cpu-interrupt-controller"



Example devicetree:

	cpu-irq: cpu-irq@0 {

	cpu-irq: cpu-irq {

		#address-cells = <0>;



		interrupt-controller;

Documentation/devicetree/bindings/mmc/microchip,sdhci-pic32.txt

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ Example: 
		compatible = "microchip,pic32mzda-sdhci";

		reg = <0x1f8ec000 0x100>;

		interrupts = <191 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&REFCLKO4>, <&PBCLK5>;

		clocks = <&rootclk REF4CLK>, <&rootclk PB5CLK>;

		clock-names = "base_clk", "sys_clk";

		bus-width = <4>;

		cap-sd-highspeed;