linux-next: manual merge of the trivial tree with Linus' tree

[Stephen Rothwell]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/gpu/drm/qxl/Kconfig between commit 488574dbc47e ("gpu: fix qxl
missing crc32_le") from Linus' tree and commit 949b6183412c
("drivers/gpu/drm/qxl/Kconfig: reformat the help text") from the trivial
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/gpu/drm/qxl/Kconfig
index 66ac0ff95f5a,b5be757062b2..000000000000
--- a/drivers/gpu/drm/qxl/Kconfig
+++ b/drivers/gpu/drm/qxl/Kconfig
@@@ -5,9 -5,10 +5,11 @@@ config DRM_QX
  	select FB_SYS_COPYAREA
  	select FB_SYS_IMAGEBLIT
  	select FB_DEFERRED_IO
-         select DRM_KMS_HELPER
+ 	select DRM_KMS_HELPER
  	select DRM_KMS_FB_HELPER
-         select DRM_TTM
+ 	select DRM_TTM
 +	select CRC32
  	help
- 		QXL virtual GPU for Spice virtualization desktop integration. Do not enable this driver unless your distro ships a corresponding X.org QXL driver that can handle kernel modesetting.
+ 	  QXL virtual GPU for Spice virtualization desktop integration.
+ 	  Do not enable this driver unless your distro ships a corresponding
+ 	  X.org QXL driver that can handle kernel modesetting.

Attachment: pgp00000.pgp
Description: PGP signature