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

Commit c981c011 authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Merge tag 'ib-fbdev-drm-v4.19-deferred-console-takeover' of... 

Merge tag 'ib-fbdev-drm-v4.19-deferred-console-takeover' of https://github.com/bzolnier/linux

 into drm-misc-next

Immutable branch between fbdev and drm for the v4.19 merge window
(contains the deferred console takeover feature)

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.com>

# gpg: Signature made Thu 28 Jun 2018 10:24:50 AM -03
# gpg:                using RSA key 7E33B63FA047C20B
# gpg: Can't check signature: public key not found

# Conflicts:
#	drivers/gpu/drm/i915/i915_gem.c
#	drivers/gpu/drm/i915/intel_crt.c
#	drivers/gpu/drm/i915/intel_display.c
#	drivers/gpu/drm/i915/intel_lrc.c
Link: https://patchwork.freedesktop.org/patch/msgid/2462549.rLSfW9kX99@amdc3058
parents eab97669 83d83beb

Documentation/admin-guide/pm/intel_pstate.rst

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ argument is passed to the kernel in the command line. 
	That only is supported in some configurations, though (for example, if

	the `HWP feature is enabled in the processor <Active Mode With HWP_>`_,

	the operation mode of the driver cannot be changed), and if it is not

	supported in the current configuration, writes to this attribute with

	supported in the current configuration, writes to this attribute will

	fail with an appropriate error.



Interpretation of Policy Attributes

Documentation/core-api/kernel-api.rst

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ Resources Management 
MTRR Handling

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



.. kernel-doc:: arch/x86/kernel/cpu/mtrr/main.c

.. kernel-doc:: arch/x86/kernel/cpu/mtrr/mtrr.c

   :export:



Security Framework

Documentation/driver-api/infrastructure.rst

+2 −2
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ Device Drivers Base 
Device Drivers DMA Management

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



.. kernel-doc:: drivers/base/dma-coherent.c

.. kernel-doc:: kernel/dma/coherent.c

   :export:



.. kernel-doc:: drivers/base/dma-mapping.c

.. kernel-doc:: kernel/dma/mapping.c

   :export:



Device drivers PnP support

Documentation/fb/fbcon.txt

+7 −0
Original line number Diff line number Diff line
@@ -155,6 +155,13 @@ C. Boot options 
	used by text. By default, this area will be black. The 'color' value

	is an integer number that depends on the framebuffer driver being used.



6. fbcon=nodefer



	If the kernel is compiled with deferred fbcon takeover support, normally

	the framebuffer contents, left in place by the firmware/bootloader, will

	be preserved until there actually is some text is output to the console.

	This option causes fbcon to bind immediately to the fbdev device.



C. Attaching, Detaching and Unloading



Before going on how to attach, detach and unload the framebuffer console, an

Documentation/filesystems/cifs/AUTHORS

+4 −3
Original line number Diff line number Diff line
@@ -42,9 +42,11 @@ Jeff Layton (many, many fixes, as well as great work on the cifs Kerberos code) 
Scott Lovenberg

Pavel Shilovsky (for great work adding SMB2 support, and various SMB3 features)

Aurelien Aptel (for DFS SMB3 work and some key bug fixes)

Ronnie Sahlberg (for SMB3 xattr work and bug fixes)

Ronnie Sahlberg (for SMB3 xattr work, bug fixes, and lots of great work on compounding)

Shirish Pargaonkar (for many ACL patches over the years)

Sachin Prabhu (many bug fixes, including for reconnect, copy offload and security)

Paulo Alcantara

Long Li (some great work on RDMA, SMB Direct)





Test case and Bug Report contributors
@@ -58,5 +60,4 @@ mention to the Stanford Checker (SWAT) which pointed out many minor 
bugs in error paths.  Valuable suggestions also have come from Al Viro

and Dave Miller.



And thanks to the IBM LTC and Power test teams and SuSE testers for

finding multiple bugs during excellent stress test runs.
 
And thanks to the IBM LTC and Power test teams and SuSE and Citrix and RedHat testers for finding multiple bugs during excellent stress test runs.