linux-next: manual merge of the trivial tree with Linus' tree
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
mm/memcontrol.c between commit 747db954cab6 ("mm: memcontrol: use page
lists for uncharge batching") from Linus' tree and commit cc5ac3e15fa5
("mm: memcontrol: fix comment") from the trivial tree.
I fixed it up (the former removed the comment changed by the latter)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
signature.asc
Description: PGP signature
linux-next: manual merge of the trivial tree with Linus' tree
Hi Jiri, Today's linux-next merge of the trivial tree got a conflict in mm/memcontrol.c between commit 747db954cab6 (mm: memcontrol: use page lists for uncharge batching) from Linus' tree and commit cc5ac3e15fa5 (mm: memcontrol: fix comment) from the trivial tree. I fixed it up (the former removed the comment changed by the latter) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au signature.asc Description: PGP signature
linux-next: manual merge of the trivial tree with Linus' tree
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
Documentation/devicetree/bindings/arm/omap/omap.txt between commit
11e2191c2a6f ("ARM: dts: am437x-gp-evm: Add gp dts") from the tree and
commit c98be0c96db0 ("doc: spelling error changes") from the trivial tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc Documentation/devicetree/bindings/arm/omap/omap.txt
index 36ede19a1630,aa71962352ff..
--- a/Documentation/devicetree/bindings/arm/omap/omap.txt
+++ b/Documentation/devicetree/bindings/arm/omap/omap.txt
@@@ -117,8 -114,5 +117,8 @@@ Boards
- AM43x EPOS EVM
compatible = "ti,am43x-epos-evm", "ti,am4372", "ti,am43"
+- AM437x GP EVM
+ compatible = "ti,am437x-gp-evm", "ti,am4372", "ti,am43"
+
- - DRA7 EVM: Software Developement Board for DRA7XX
+ - DRA7 EVM: Software Development Board for DRA7XX
compatible = "ti,dra7-evm", "ti,dra7"
pgpxZXyTMUJ6T.pgp
Description: PGP signature
linux-next: manual merge of the trivial tree with Linus' tree
Hi Jiri, Today's linux-next merge of the trivial tree got a conflict in Documentation/devicetree/bindings/arm/omap/omap.txt between commit 11e2191c2a6f (ARM: dts: am437x-gp-evm: Add gp dts) from the tree and commit c98be0c96db0 (doc: spelling error changes) from the trivial tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc Documentation/devicetree/bindings/arm/omap/omap.txt index 36ede19a1630,aa71962352ff.. --- a/Documentation/devicetree/bindings/arm/omap/omap.txt +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt @@@ -117,8 -114,5 +117,8 @@@ Boards - AM43x EPOS EVM compatible = ti,am43x-epos-evm, ti,am4372, ti,am43 +- AM437x GP EVM + compatible = ti,am437x-gp-evm, ti,am4372, ti,am43 + - - DRA7 EVM: Software Developement Board for DRA7XX + - DRA7 EVM: Software Development Board for DRA7XX compatible = ti,dra7-evm, ti,dra7 pgpxZXyTMUJ6T.pgp Description: PGP signature
linux-next: manual merge of the trivial tree with Linus' tree
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 Rothwells...@canb.auug.org.au
diff --cc drivers/gpu/drm/qxl/Kconfig
index 66ac0ff95f5a,b5be757062b2..
--- 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.
pgpqylzTIl60S.pgp
Description: PGP signature
linux-next: manual merge of the trivial tree with Linus' tree
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 Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/qxl/Kconfig index 66ac0ff95f5a,b5be757062b2.. --- 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. pgpqylzTIl60S.pgp Description: PGP signature
linux-next: manual merge of the trivial tree with Linus' tree
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
kernel/irq/generic-chip.c between commit ccc414f83914 ("genirq: Add the
generic chip to the genirq docbook") from Linus' tree and commit
37074c5a1b99 ("irq/generic-chip: fix a few kernel-doc entries") from the
trivial tree.
I fixed it up (I just arbitrarily used Linus' tree version) and can
carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpWoYUp_gm_C.pgp
Description: PGP signature
linux-next: manual merge of the trivial tree with Linus' tree
Hi Jiri, Today's linux-next merge of the trivial tree got a conflict in kernel/irq/generic-chip.c between commit ccc414f83914 (genirq: Add the generic chip to the genirq docbook) from Linus' tree and commit 37074c5a1b99 (irq/generic-chip: fix a few kernel-doc entries) from the trivial tree. I fixed it up (I just arbitrarily used Linus' tree version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpWoYUp_gm_C.pgp Description: PGP signature
