Revert "Revert "poky: subtree update:b23aa6b753..ad30a6d470""

This reverts commit 4873add6e11c1bd421c83cd08df589f1184aa673.

A fix has been put up for openbmc/openbmc#3720 so we can bring
this back now

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: If59020a5b502f70aa7149fbef4ad2f50824d1ce6
diff --git a/poky/documentation/conf.py b/poky/documentation/conf.py
index 80d5e8e..ebc26aa 100644
--- a/poky/documentation/conf.py
+++ b/poky/documentation/conf.py
@@ -1,6 +1,6 @@
 # Configuration file for the Sphinx documentation builder.
 #
-# SPDX-License-Identifier: CC-BY-2.0-UK
+# SPDX-License-Identifier: CC-BY-SA-2.0-UK
 #
 # This file only contains a selection of the most common options. For a full
 # list see the documentation: