| Message ID | 20190228161511.22659-1-marcelo.cerri@canonical.com |
|---|---|
| Headers | show |
| Series | Update linux-gcp annotations file overlay | expand |
This appears to work fine and looks good to me. Acked-by: Kamal Mostafa <kamal@canonical.com> -Kamal On Thu, Feb 28, 2019 at 01:15:06PM -0300, Marcelo Henrique Cerri wrote: > BugLink: http://bugs.launchpad.net/bugs/1752072 > > This patch should be included after the patch: > > [X,B,C,D,unstable][PATCH] UBUNTU: [Packaging] config-check: Add an include directive > > For all other kernels, we can gradually move to this new approach of > having the custom kernel's annotations file including the master's > one. But bionic/linux-gcp is carrying an earlier version of that patch > and because of that it needs to be updated at the same time as the > patch is included. > > To make it possible to apply it before linux-gcp is rebased, the patch > set also reverts the initial version of the patch and adds the new > one. Those commit might be dropped after the rebase. > > Marcelo Henrique Cerri (5): > Revert "UBUNTU: [Packaging] config-check: allow overlay annotations > files" > UBUNTU: [Packaging] config-check: Add an include directive > UBUNTU: [Config] linux-gcp: Replace annotations symlink with overlay > UBUNTU: [Config] linux-gcp: Include master annotations to linux-gcp > annotations > UBUNTU: [Config] linux-gcp: Update annotations file > > debian.gcp/config/annotations | 85 ++++++++++++++++++++++- > debian.gcp/config/overlay.annotations | 43 ------------ > debian.gcp/reconstruct | 1 - > debian/scripts/config-check | 99 ++++++++++++++++++--------- > debian/source/options | 1 - > 5 files changed, 150 insertions(+), 79 deletions(-) > mode change 120000 => 100644 debian.gcp/config/annotations > delete mode 100644 debian.gcp/config/overlay.annotations > > -- > 2.17.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
Possibly a stupid question, but couldn't all of this have been achieved using scripts/kconfig/merge_config.sh and config fragments? On 2019-02-28 13:15:06 , Marcelo Henrique Cerri wrote: > BugLink: http://bugs.launchpad.net/bugs/1752072 > > This patch should be included after the patch: > > [X,B,C,D,unstable][PATCH] UBUNTU: [Packaging] config-check: Add an include directive > > For all other kernels, we can gradually move to this new approach of > having the custom kernel's annotations file including the master's > one. But bionic/linux-gcp is carrying an earlier version of that patch > and because of that it needs to be updated at the same time as the > patch is included. > > To make it possible to apply it before linux-gcp is rebased, the patch > set also reverts the initial version of the patch and adds the new > one. Those commit might be dropped after the rebase. > > Marcelo Henrique Cerri (5): > Revert "UBUNTU: [Packaging] config-check: allow overlay annotations > files" > UBUNTU: [Packaging] config-check: Add an include directive > UBUNTU: [Config] linux-gcp: Replace annotations symlink with overlay > UBUNTU: [Config] linux-gcp: Include master annotations to linux-gcp > annotations > UBUNTU: [Config] linux-gcp: Update annotations file > > debian.gcp/config/annotations | 85 ++++++++++++++++++++++- > debian.gcp/config/overlay.annotations | 43 ------------ > debian.gcp/reconstruct | 1 - > debian/scripts/config-check | 99 ++++++++++++++++++--------- > debian/source/options | 1 - > 5 files changed, 150 insertions(+), 79 deletions(-) > mode change 120000 => 100644 debian.gcp/config/annotations > delete mode 100644 debian.gcp/config/overlay.annotations > > -- > 2.17.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
On Sun, Mar 03, 2019 at 06:39:22PM -0500, Khaled Elmously wrote: > Possibly a stupid question, but couldn't all of this have been achieved using scripts/kconfig/merge_config.sh and config fragments? > I don't see how. The annotations file and the configs are different things. > > > > > On 2019-02-28 13:15:06 , Marcelo Henrique Cerri wrote: > > BugLink: http://bugs.launchpad.net/bugs/1752072 > > > > This patch should be included after the patch: > > > > [X,B,C,D,unstable][PATCH] UBUNTU: [Packaging] config-check: Add an include directive > > > > For all other kernels, we can gradually move to this new approach of > > having the custom kernel's annotations file including the master's > > one. But bionic/linux-gcp is carrying an earlier version of that patch > > and because of that it needs to be updated at the same time as the > > patch is included. > > > > To make it possible to apply it before linux-gcp is rebased, the patch > > set also reverts the initial version of the patch and adds the new > > one. Those commit might be dropped after the rebase. > > > > Marcelo Henrique Cerri (5): > > Revert "UBUNTU: [Packaging] config-check: allow overlay annotations > > files" > > UBUNTU: [Packaging] config-check: Add an include directive > > UBUNTU: [Config] linux-gcp: Replace annotations symlink with overlay > > UBUNTU: [Config] linux-gcp: Include master annotations to linux-gcp > > annotations > > UBUNTU: [Config] linux-gcp: Update annotations file > > > > debian.gcp/config/annotations | 85 ++++++++++++++++++++++- > > debian.gcp/config/overlay.annotations | 43 ------------ > > debian.gcp/reconstruct | 1 - > > debian/scripts/config-check | 99 ++++++++++++++++++--------- > > debian/source/options | 1 - > > 5 files changed, 150 insertions(+), 79 deletions(-) > > mode change 120000 => 100644 debian.gcp/config/annotations > > delete mode 100644 debian.gcp/config/overlay.annotations > > > > -- > > 2.17.1 > > > > > > -- > > kernel-team mailing list > > kernel-team@lists.ubuntu.com > > https://lists.ubuntu.com/mailman/listinfo/kernel-team
Since the bug mentioned on the patches was already used. I created a new one to be used instead: BugLink: http://bugs.launchpad.net/bugs/1820075 On Thu, Feb 28, 2019 at 01:15:06PM -0300, Marcelo Henrique Cerri wrote: > BugLink: http://bugs.launchpad.net/bugs/1752072 > > This patch should be included after the patch: > > [X,B,C,D,unstable][PATCH] UBUNTU: [Packaging] config-check: Add an include directive > > For all other kernels, we can gradually move to this new approach of > having the custom kernel's annotations file including the master's > one. But bionic/linux-gcp is carrying an earlier version of that patch > and because of that it needs to be updated at the same time as the > patch is included. > > To make it possible to apply it before linux-gcp is rebased, the patch > set also reverts the initial version of the patch and adds the new > one. Those commit might be dropped after the rebase. > > Marcelo Henrique Cerri (5): > Revert "UBUNTU: [Packaging] config-check: allow overlay annotations > files" > UBUNTU: [Packaging] config-check: Add an include directive > UBUNTU: [Config] linux-gcp: Replace annotations symlink with overlay > UBUNTU: [Config] linux-gcp: Include master annotations to linux-gcp > annotations > UBUNTU: [Config] linux-gcp: Update annotations file > > debian.gcp/config/annotations | 85 ++++++++++++++++++++++- > debian.gcp/config/overlay.annotations | 43 ------------ > debian.gcp/reconstruct | 1 - > debian/scripts/config-check | 99 ++++++++++++++++++--------- > debian/source/options | 1 - > 5 files changed, 150 insertions(+), 79 deletions(-) > mode change 120000 => 100644 debian.gcp/config/annotations > delete mode 100644 debian.gcp/config/overlay.annotations > > -- > 2.17.1 >
On 2/28/19 5:15 PM, Marcelo Henrique Cerri wrote: > BugLink: http://bugs.launchpad.net/bugs/1752072 > > This patch should be included after the patch: > > [X,B,C,D,unstable][PATCH] UBUNTU: [Packaging] config-check: Add an include directive > > For all other kernels, we can gradually move to this new approach of > having the custom kernel's annotations file including the master's > one. But bionic/linux-gcp is carrying an earlier version of that patch > and because of that it needs to be updated at the same time as the > patch is included. > > To make it possible to apply it before linux-gcp is rebased, the patch > set also reverts the initial version of the patch and adds the new > one. Those commit might be dropped after the rebase. > > Marcelo Henrique Cerri (5): > Revert "UBUNTU: [Packaging] config-check: allow overlay annotations > files" > UBUNTU: [Packaging] config-check: Add an include directive > UBUNTU: [Config] linux-gcp: Replace annotations symlink with overlay > UBUNTU: [Config] linux-gcp: Include master annotations to linux-gcp > annotations > UBUNTU: [Config] linux-gcp: Update annotations file > > debian.gcp/config/annotations | 85 ++++++++++++++++++++++- > debian.gcp/config/overlay.annotations | 43 ------------ > debian.gcp/reconstruct | 1 - > debian/scripts/config-check | 99 ++++++++++++++++++--------- > debian/source/options | 1 - > 5 files changed, 150 insertions(+), 79 deletions(-) > mode change 120000 => 100644 debian.gcp/config/annotations > delete mode 100644 debian.gcp/config/overlay.annotations > As discussed with Marcelo, this patch is also needed for cosmic/linux-gcp, so for {bionic,cosmic}/linux-gcp with the changes on the BugLink: Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
On 2/28/19 5:15 PM, Marcelo Henrique Cerri wrote: > BugLink: http://bugs.launchpad.net/bugs/1752072 > > This patch should be included after the patch: > > [X,B,C,D,unstable][PATCH] UBUNTU: [Packaging] config-check: Add an include directive > > For all other kernels, we can gradually move to this new approach of > having the custom kernel's annotations file including the master's > one. But bionic/linux-gcp is carrying an earlier version of that patch > and because of that it needs to be updated at the same time as the > patch is included. > > To make it possible to apply it before linux-gcp is rebased, the patch > set also reverts the initial version of the patch and adds the new > one. Those commit might be dropped after the rebase. > > Marcelo Henrique Cerri (5): > Revert "UBUNTU: [Packaging] config-check: allow overlay annotations > files" > UBUNTU: [Packaging] config-check: Add an include directive > UBUNTU: [Config] linux-gcp: Replace annotations symlink with overlay > UBUNTU: [Config] linux-gcp: Include master annotations to linux-gcp > annotations > UBUNTU: [Config] linux-gcp: Update annotations file > > debian.gcp/config/annotations | 85 ++++++++++++++++++++++- > debian.gcp/config/overlay.annotations | 43 ------------ > debian.gcp/reconstruct | 1 - > debian/scripts/config-check | 99 ++++++++++++++++++--------- > debian/source/options | 1 - > 5 files changed, 150 insertions(+), 79 deletions(-) > mode change 120000 => 100644 debian.gcp/config/annotations > delete mode 100644 debian.gcp/config/overlay.annotations > Applied to cosmic/linux-gcp/master-next branch, with the following bug link BugLink: http://bugs.launchpad.net/bugs/1820075 Thanks, Kleber
On 2019-02-28 13:15:06 , Marcelo Henrique Cerri wrote: > BugLink: http://bugs.launchpad.net/bugs/1752072 > > This patch should be included after the patch: > > [X,B,C,D,unstable][PATCH] UBUNTU: [Packaging] config-check: Add an include directive > > For all other kernels, we can gradually move to this new approach of > having the custom kernel's annotations file including the master's > one. But bionic/linux-gcp is carrying an earlier version of that patch > and because of that it needs to be updated at the same time as the > patch is included. > > To make it possible to apply it before linux-gcp is rebased, the patch > set also reverts the initial version of the patch and adds the new > one. Those commit might be dropped after the rebase. > > Marcelo Henrique Cerri (5): > Revert "UBUNTU: [Packaging] config-check: allow overlay annotations > files" > UBUNTU: [Packaging] config-check: Add an include directive > UBUNTU: [Config] linux-gcp: Replace annotations symlink with overlay > UBUNTU: [Config] linux-gcp: Include master annotations to linux-gcp > annotations > UBUNTU: [Config] linux-gcp: Update annotations file > > debian.gcp/config/annotations | 85 ++++++++++++++++++++++- > debian.gcp/config/overlay.annotations | 43 ------------ > debian.gcp/reconstruct | 1 - > debian/scripts/config-check | 99 ++++++++++++++++++--------- > debian/source/options | 1 - > 5 files changed, 150 insertions(+), 79 deletions(-) > mode change 120000 => 100644 debian.gcp/config/annotations > delete mode 100644 debian.gcp/config/overlay.annotations > > -- > 2.17.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
BugLink: http://bugs.launchpad.net/bugs/1752072 This patch should be included after the patch: [X,B,C,D,unstable][PATCH] UBUNTU: [Packaging] config-check: Add an include directive For all other kernels, we can gradually move to this new approach of having the custom kernel's annotations file including the master's one. But bionic/linux-gcp is carrying an earlier version of that patch and because of that it needs to be updated at the same time as the patch is included. To make it possible to apply it before linux-gcp is rebased, the patch set also reverts the initial version of the patch and adds the new one. Those commit might be dropped after the rebase. Marcelo Henrique Cerri (5): Revert "UBUNTU: [Packaging] config-check: allow overlay annotations files" UBUNTU: [Packaging] config-check: Add an include directive UBUNTU: [Config] linux-gcp: Replace annotations symlink with overlay UBUNTU: [Config] linux-gcp: Include master annotations to linux-gcp annotations UBUNTU: [Config] linux-gcp: Update annotations file debian.gcp/config/annotations | 85 ++++++++++++++++++++++- debian.gcp/config/overlay.annotations | 43 ------------ debian.gcp/reconstruct | 1 - debian/scripts/config-check | 99 ++++++++++++++++++--------- debian/source/options | 1 - 5 files changed, 150 insertions(+), 79 deletions(-) mode change 120000 => 100644 debian.gcp/config/annotations delete mode 100644 debian.gcp/config/overlay.annotations