distro-tracking: update MAINTAINER info for base group

also add NO_UPDATE_REASON for packages marked #OK to stay with
an older version

Signed-off-by: Kevin Tian <kevin.tian@intel.com>

diff --git a/meta/conf/distro/include/private/distro_base_utils_1.inc b/meta/conf/distro/include/private/distro_base_utils_1.inc
index d99c583da2690dd5cfe6a53d39c0ec906f0338bf..40578c27c5799830f2832a4697b2b47efb311543 100644 (file)
--- a/meta/conf/distro/include/private/distro_base_utils_1.inc
+++ b/meta/conf/distro/include/private/distro_base_utils_1.inc
@@ -324,6 +324,7 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-makedevs = "n/a"
 RECIPE_LATEST_RELEASE_DATE_pn-makedevs = "n/a"
 RECIPE_COMMENTS_pn-makedevs = ""
 RECIPE_MAINTAINER_pn-makedevs = "Dongxiao Xu <dongxiao.xu@intel.com>"
+<<<<<<< HEAD:meta/conf/distro/include/private/distro_base_utils_1.inc
 
 RECIPE_STATUS_pn-cwautomacros = "green"
 DEPENDENCY_CHECK_pn-cwautomacros = "not done"