| Message ID | 1443562067-13523-1-git-send-email-tim.gardner@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 29.09.2015 23:27, tim.gardner@canonical.com wrote: > From: Tim Gardner <tim.gardner@canonical.com> > > BugLink: http://bugs.launchpad.net/bugs/1499869 > > This driver only works on arm64 platforms. > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > debian.master/abi/3.19.0-30.33/arm64/generic.modules | 1 - > debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules | 1 - > debian.master/abi/3.19.0-30.33/armhf/generic.modules | 1 - > debian.master/abi/3.19.0-30.33/i386/generic.modules | 1 - > debian.master/abi/3.19.0-30.33/i386/lowlatency.modules | 1 - > debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules | 1 - > debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules | 1 - > debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules | 1 - > debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules | 1 - > debian.master/abi/3.19.0-30.33/ppc64el/generic.modules | 1 - Suppose this is cheating it out of the previous ABI definition. Wondering whether adding ignore module files would not be cleaner... -Stefan > debian.master/config/amd64/config.common.amd64 | 2 +- > debian.master/config/annotations | 2 +- > debian.master/config/arm64/config.common.arm64 | 2 +- > debian.master/config/armhf/config.common.armhf | 2 +- > debian.master/config/i386/config.common.i386 | 2 +- > debian.master/config/powerpc/config.common.powerpc | 2 +- > debian.master/config/ppc64el/config.common.ppc64el | 2 +- > 17 files changed, 7 insertions(+), 17 deletions(-) > > diff --git a/debian.master/abi/3.19.0-30.33/arm64/generic.modules b/debian.master/abi/3.19.0-30.33/arm64/generic.modules > index 4fd6e78..d71fc0a 100644 > --- a/debian.master/abi/3.19.0-30.33/arm64/generic.modules > +++ b/debian.master/abi/3.19.0-30.33/arm64/generic.modules > @@ -2796,7 +2796,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules b/debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules > index 51868ae..4b5ce23 100644 > --- a/debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules > +++ b/debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules > @@ -2933,7 +2933,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/abi/3.19.0-30.33/armhf/generic.modules b/debian.master/abi/3.19.0-30.33/armhf/generic.modules > index 709201b..2a24096 100644 > --- a/debian.master/abi/3.19.0-30.33/armhf/generic.modules > +++ b/debian.master/abi/3.19.0-30.33/armhf/generic.modules > @@ -2979,7 +2979,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/abi/3.19.0-30.33/i386/generic.modules b/debian.master/abi/3.19.0-30.33/i386/generic.modules > index feeb2c8..79d1f80 100644 > --- a/debian.master/abi/3.19.0-30.33/i386/generic.modules > +++ b/debian.master/abi/3.19.0-30.33/i386/generic.modules > @@ -3136,7 +3136,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/abi/3.19.0-30.33/i386/lowlatency.modules b/debian.master/abi/3.19.0-30.33/i386/lowlatency.modules > index 1a9d4ad..39bb8f3 100644 > --- a/debian.master/abi/3.19.0-30.33/i386/lowlatency.modules > +++ b/debian.master/abi/3.19.0-30.33/i386/lowlatency.modules > @@ -3135,7 +3135,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules b/debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules > index c500f7a..e07119b 100644 > --- a/debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules > +++ b/debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules > @@ -2902,7 +2902,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules b/debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules > index 1a07285..8e250a0 100644 > --- a/debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules > +++ b/debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules > @@ -2878,7 +2878,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules b/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules > index 01acc65..a3ceab9 100644 > --- a/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules > +++ b/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules > @@ -2875,7 +2875,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules b/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules > index e5883e3..8ef0b0f 100644 > --- a/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules > +++ b/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules > @@ -2887,7 +2887,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/abi/3.19.0-30.33/ppc64el/generic.modules b/debian.master/abi/3.19.0-30.33/ppc64el/generic.modules > index f2edc5c..a7de774 100644 > --- a/debian.master/abi/3.19.0-30.33/ppc64el/generic.modules > +++ b/debian.master/abi/3.19.0-30.33/ppc64el/generic.modules > @@ -2820,7 +2820,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index 48ae1a2..53b41ca 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -101,7 +101,7 @@ CONFIG_RTC_DRV_CMOS=y > CONFIG_RTC_DRV_DS3232=m > CONFIG_RTC_DRV_PCF8523=m > CONFIG_RTC_DRV_TWL4030=m > -CONFIG_RTC_DRV_XGENE=y > +# CONFIG_RTC_DRV_XGENE is not set > CONFIG_SATA_AHCI_PLATFORM=m > CONFIG_SATA_SVW=m > CONFIG_SCHED_SMT=y > diff --git a/debian.master/config/annotations b/debian.master/config/annotations > index 52624b2..9f32a64 100644 > --- a/debian.master/config/annotations > +++ b/debian.master/config/annotations > @@ -1822,7 +1822,7 @@ CONFIG_RTC_DRV_TWL4030 p policy<{'armhf': 'y', '*': 'm'}> note<boot essential > CONFIG_RTC_DRV_OMAP p policy<{'armhf': 'y', '*': 'm'}> > CONFIG_RTC_DRV_S3C p policy<{'armhf': 'y', '*': 'm'}> > CONFIG_RTC_DRV_PL031 p policy<{'armhf': 'y', '*': 'm'}> > -CONFIG_RTC_DRV_XGENE p policy<{'amd64': 'y', '*': 'm'}> > +CONFIG_RTC_DRV_XGENE p policy<{'arm64': 'y', '*': 'n'}> > CONFIG_RTC_DRV_DS1374_WDT y > CONFIG_RTC_DRV_PCF8523 p policy<{'armhf-generic': 'y', '*': 'm'}> > CONFIG_RTC_DRV_OPAL p policy<{'powerpc-powerpc64-smp': 'y', 'ppc64el-generic': 'y'}> > diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 > index 248a1bb..6ef09c1 100644 > --- a/debian.master/config/arm64/config.common.arm64 > +++ b/debian.master/config/arm64/config.common.arm64 > @@ -93,7 +93,7 @@ CONFIG_RTC_DRV_DS3232=m > CONFIG_RTC_DRV_PCF8523=m > CONFIG_RTC_DRV_PL031=m > CONFIG_RTC_DRV_TWL4030=m > -CONFIG_RTC_DRV_XGENE=m > +CONFIG_RTC_DRV_XGENE=y > CONFIG_SATA_AHCI_PLATFORM=m > CONFIG_SATA_SVW=m > CONFIG_SCHED_SMT=y > diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf > index 9328885..d62aeaa 100644 > --- a/debian.master/config/armhf/config.common.armhf > +++ b/debian.master/config/armhf/config.common.armhf > @@ -90,7 +90,7 @@ CONFIG_RTC_DRV_CMOS=m > CONFIG_RTC_DRV_DS3232=m > CONFIG_RTC_DRV_PL031=y > CONFIG_RTC_DRV_TWL4030=y > -CONFIG_RTC_DRV_XGENE=m > +# CONFIG_RTC_DRV_XGENE is not set > CONFIG_SATA_AHCI_PLATFORM=y > CONFIG_SATA_SVW=m > # CONFIG_SCHED_SMT is not set > diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 > index e9ac2cd..fde391c 100644 > --- a/debian.master/config/i386/config.common.i386 > +++ b/debian.master/config/i386/config.common.i386 > @@ -100,7 +100,7 @@ CONFIG_RTC_DRV_CMOS=y > CONFIG_RTC_DRV_DS3232=m > CONFIG_RTC_DRV_PCF8523=m > CONFIG_RTC_DRV_TWL4030=m > -CONFIG_RTC_DRV_XGENE=m > +# CONFIG_RTC_DRV_XGENE is not set > CONFIG_SATA_AHCI_PLATFORM=m > CONFIG_SATA_SVW=m > CONFIG_SCHED_SMT=y > diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc > index f68be27..7411c67 100644 > --- a/debian.master/config/powerpc/config.common.powerpc > +++ b/debian.master/config/powerpc/config.common.powerpc > @@ -104,7 +104,7 @@ CONFIG_REGULATOR_TWL4030=m > CONFIG_RTC_DRV_CMOS=m > CONFIG_RTC_DRV_PCF8523=m > CONFIG_RTC_DRV_TWL4030=m > -CONFIG_RTC_DRV_XGENE=m > +# CONFIG_RTC_DRV_XGENE is not set > CONFIG_SATA_AHCI_PLATFORM=m > CONFIG_SATA_SVW=y > # CONFIG_SENSORS_SCH56XX_COMMON is not set > diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el > index dcce993..e6e00b9 100644 > --- a/debian.master/config/ppc64el/config.common.ppc64el > +++ b/debian.master/config/ppc64el/config.common.ppc64el > @@ -153,7 +153,7 @@ CONFIG_RTC_DRV_CMOS=m > CONFIG_RTC_DRV_DS3232=m > CONFIG_RTC_DRV_PCF8523=m > CONFIG_RTC_DRV_TWL4030=m > -CONFIG_RTC_DRV_XGENE=m > +# CONFIG_RTC_DRV_XGENE is not set > CONFIG_SATA_AHCI_PLATFORM=m > CONFIG_SATA_SVW=m > CONFIG_SCHED_SMT=y >
On 09/30/2015 12:23 AM, Stefan Bader wrote: > On 29.09.2015 23:27, tim.gardner@canonical.com wrote: >> From: Tim Gardner <tim.gardner@canonical.com> >> >> BugLink: http://bugs.launchpad.net/bugs/1499869 >> >> This driver only works on arm64 platforms. >> >> Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- >> debian.master/abi/3.19.0-30.33/arm64/generic.modules | 1 >> - debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules | >> 1 - debian.master/abi/3.19.0-30.33/armhf/generic.modules >> | 1 - debian.master/abi/3.19.0-30.33/i386/generic.modules >> | 1 - debian.master/abi/3.19.0-30.33/i386/lowlatency.modules >> | 1 - >> debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules | 1 >> - debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules | >> 1 - debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules >> | 1 - >> debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules | 1 >> - debian.master/abi/3.19.0-30.33/ppc64el/generic.modules | >> 1 - > > Suppose this is cheating it out of the previous ABI definition. > Wondering whether adding ignore module files would not be > cleaner... > I cannot think of why either method would have a tactical or strategic advantage. Therefore I went with the surgical approach so that the changes made were explicit. In my opinion, an ignore file obfuscates the solution.
On 30.09.2015 15:50, Tim Gardner wrote: > On 09/30/2015 12:23 AM, Stefan Bader wrote: >> On 29.09.2015 23:27, tim.gardner@canonical.com wrote: >>> From: Tim Gardner <tim.gardner@canonical.com> >>> >>> BugLink: http://bugs.launchpad.net/bugs/1499869 >>> >>> This driver only works on arm64 platforms. >>> >>> Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- >>> debian.master/abi/3.19.0-30.33/arm64/generic.modules | 1 >>> - debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules | >>> 1 - debian.master/abi/3.19.0-30.33/armhf/generic.modules >>> | 1 - debian.master/abi/3.19.0-30.33/i386/generic.modules >>> | 1 - debian.master/abi/3.19.0-30.33/i386/lowlatency.modules >>> | 1 - >>> debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules | 1 >>> - debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules | >>> 1 - debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules >>> | 1 - >>> debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules | 1 >>> - debian.master/abi/3.19.0-30.33/ppc64el/generic.modules | >>> 1 - >> >> Suppose this is cheating it out of the previous ABI definition. >> Wondering whether adding ignore module files would not be >> cleaner... >> > > I cannot think of why either method would have a tactical or strategic > advantage. Therefore I went with the surgical approach so that the > changes made were explicit. In my opinion, an ignore file obfuscates > the solution. > I was somehow thinking along the lines of the contents of the modules list in that abi directory represent the state of that upload. Which still had the module(s). And the goal is to drop them with the next upload. That is why I thought using ignore files to document the expected "will be missing on the next build" might be better...
On Wed, Sep 30, 2015 at 8:02 AM, Stefan Bader <stefan.bader@canonical.com> wrote: > On 30.09.2015 15:50, Tim Gardner wrote: >> On 09/30/2015 12:23 AM, Stefan Bader wrote: >>> On 29.09.2015 23:27, tim.gardner@canonical.com wrote: >>>> From: Tim Gardner <tim.gardner@canonical.com> >>>> >>>> BugLink: http://bugs.launchpad.net/bugs/1499869 >>>> >>>> This driver only works on arm64 platforms. >>>> >>>> Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- >>>> debian.master/abi/3.19.0-30.33/arm64/generic.modules | 1 >>>> - debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules | >>>> 1 - debian.master/abi/3.19.0-30.33/armhf/generic.modules >>>> | 1 - debian.master/abi/3.19.0-30.33/i386/generic.modules >>>> | 1 - debian.master/abi/3.19.0-30.33/i386/lowlatency.modules >>>> | 1 - >>>> debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules | 1 >>>> - debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules | >>>> 1 - debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules >>>> | 1 - >>>> debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules | 1 >>>> - debian.master/abi/3.19.0-30.33/ppc64el/generic.modules | >>>> 1 - >>> >>> Suppose this is cheating it out of the previous ABI definition. >>> Wondering whether adding ignore module files would not be >>> cleaner... >>> >> >> I cannot think of why either method would have a tactical or strategic >> advantage. Therefore I went with the surgical approach so that the >> changes made were explicit. In my opinion, an ignore file obfuscates >> the solution. >> > I was somehow thinking along the lines of the contents of the modules list in > that abi directory represent the state of that upload. Which still had the > module(s). And the goal is to drop them with the next upload. That is why I > thought using ignore files to document the expected "will be missing on the next > build" might be better... Would it be generally useful to also check modules.builtin to avoid bailing in the module->static case, or is that something we want to require an explicit metadata update?
On Tue, Sep 29, 2015 at 03:27:47PM -0600, tim.gardner@canonical.com wrote: > From: Tim Gardner <tim.gardner@canonical.com> > > BugLink: http://bugs.launchpad.net/bugs/1499869 > > This driver only works on arm64 platforms. > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > debian.master/abi/3.19.0-30.33/arm64/generic.modules | 1 - > debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules | 1 - > debian.master/abi/3.19.0-30.33/armhf/generic.modules | 1 - > debian.master/abi/3.19.0-30.33/i386/generic.modules | 1 - > debian.master/abi/3.19.0-30.33/i386/lowlatency.modules | 1 - > debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules | 1 - > debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules | 1 - > debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules | 1 - > debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules | 1 - > debian.master/abi/3.19.0-30.33/ppc64el/generic.modules | 1 - > debian.master/config/amd64/config.common.amd64 | 2 +- > debian.master/config/annotations | 2 +- > debian.master/config/arm64/config.common.arm64 | 2 +- > debian.master/config/armhf/config.common.armhf | 2 +- > debian.master/config/i386/config.common.i386 | 2 +- > debian.master/config/powerpc/config.common.powerpc | 2 +- > debian.master/config/ppc64el/config.common.ppc64el | 2 +- > 17 files changed, 7 insertions(+), 17 deletions(-) > > diff --git a/debian.master/abi/3.19.0-30.33/arm64/generic.modules b/debian.master/abi/3.19.0-30.33/arm64/generic.modules > index 4fd6e78..d71fc0a 100644 > --- a/debian.master/abi/3.19.0-30.33/arm64/generic.modules > +++ b/debian.master/abi/3.19.0-30.33/arm64/generic.modules > @@ -2796,7 +2796,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules b/debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules > index 51868ae..4b5ce23 100644 > --- a/debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules > +++ b/debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules > @@ -2933,7 +2933,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/abi/3.19.0-30.33/armhf/generic.modules b/debian.master/abi/3.19.0-30.33/armhf/generic.modules > index 709201b..2a24096 100644 > --- a/debian.master/abi/3.19.0-30.33/armhf/generic.modules > +++ b/debian.master/abi/3.19.0-30.33/armhf/generic.modules > @@ -2979,7 +2979,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/abi/3.19.0-30.33/i386/generic.modules b/debian.master/abi/3.19.0-30.33/i386/generic.modules > index feeb2c8..79d1f80 100644 > --- a/debian.master/abi/3.19.0-30.33/i386/generic.modules > +++ b/debian.master/abi/3.19.0-30.33/i386/generic.modules > @@ -3136,7 +3136,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/abi/3.19.0-30.33/i386/lowlatency.modules b/debian.master/abi/3.19.0-30.33/i386/lowlatency.modules > index 1a9d4ad..39bb8f3 100644 > --- a/debian.master/abi/3.19.0-30.33/i386/lowlatency.modules > +++ b/debian.master/abi/3.19.0-30.33/i386/lowlatency.modules > @@ -3135,7 +3135,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules b/debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules > index c500f7a..e07119b 100644 > --- a/debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules > +++ b/debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules > @@ -2902,7 +2902,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules b/debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules > index 1a07285..8e250a0 100644 > --- a/debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules > +++ b/debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules > @@ -2878,7 +2878,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules b/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules > index 01acc65..a3ceab9 100644 > --- a/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules > +++ b/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules > @@ -2875,7 +2875,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules b/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules > index e5883e3..8ef0b0f 100644 > --- a/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules > +++ b/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules > @@ -2887,7 +2887,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/abi/3.19.0-30.33/ppc64el/generic.modules b/debian.master/abi/3.19.0-30.33/ppc64el/generic.modules > index f2edc5c..a7de774 100644 > --- a/debian.master/abi/3.19.0-30.33/ppc64el/generic.modules > +++ b/debian.master/abi/3.19.0-30.33/ppc64el/generic.modules > @@ -2820,7 +2820,6 @@ rtc-v3020 > rtc-wm831x > rtc-wm8350 > rtc-x1205 > -rtc-xgene > rtd520 > rti800 > rti802 > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index 48ae1a2..53b41ca 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -101,7 +101,7 @@ CONFIG_RTC_DRV_CMOS=y > CONFIG_RTC_DRV_DS3232=m > CONFIG_RTC_DRV_PCF8523=m > CONFIG_RTC_DRV_TWL4030=m > -CONFIG_RTC_DRV_XGENE=y > +# CONFIG_RTC_DRV_XGENE is not set > CONFIG_SATA_AHCI_PLATFORM=m > CONFIG_SATA_SVW=m > CONFIG_SCHED_SMT=y > diff --git a/debian.master/config/annotations b/debian.master/config/annotations > index 52624b2..9f32a64 100644 > --- a/debian.master/config/annotations > +++ b/debian.master/config/annotations > @@ -1822,7 +1822,7 @@ CONFIG_RTC_DRV_TWL4030 p policy<{'armhf': 'y', '*': 'm'}> note<boot essential > CONFIG_RTC_DRV_OMAP p policy<{'armhf': 'y', '*': 'm'}> > CONFIG_RTC_DRV_S3C p policy<{'armhf': 'y', '*': 'm'}> > CONFIG_RTC_DRV_PL031 p policy<{'armhf': 'y', '*': 'm'}> > -CONFIG_RTC_DRV_XGENE p policy<{'amd64': 'y', '*': 'm'}> > +CONFIG_RTC_DRV_XGENE p policy<{'arm64': 'y', '*': 'n'}> > CONFIG_RTC_DRV_DS1374_WDT y > CONFIG_RTC_DRV_PCF8523 p policy<{'armhf-generic': 'y', '*': 'm'}> > CONFIG_RTC_DRV_OPAL p policy<{'powerpc-powerpc64-smp': 'y', 'ppc64el-generic': 'y'}> > diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 > index 248a1bb..6ef09c1 100644 > --- a/debian.master/config/arm64/config.common.arm64 > +++ b/debian.master/config/arm64/config.common.arm64 > @@ -93,7 +93,7 @@ CONFIG_RTC_DRV_DS3232=m > CONFIG_RTC_DRV_PCF8523=m > CONFIG_RTC_DRV_PL031=m > CONFIG_RTC_DRV_TWL4030=m > -CONFIG_RTC_DRV_XGENE=m > +CONFIG_RTC_DRV_XGENE=y > CONFIG_SATA_AHCI_PLATFORM=m > CONFIG_SATA_SVW=m > CONFIG_SCHED_SMT=y > diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf > index 9328885..d62aeaa 100644 > --- a/debian.master/config/armhf/config.common.armhf > +++ b/debian.master/config/armhf/config.common.armhf > @@ -90,7 +90,7 @@ CONFIG_RTC_DRV_CMOS=m > CONFIG_RTC_DRV_DS3232=m > CONFIG_RTC_DRV_PL031=y > CONFIG_RTC_DRV_TWL4030=y > -CONFIG_RTC_DRV_XGENE=m > +# CONFIG_RTC_DRV_XGENE is not set > CONFIG_SATA_AHCI_PLATFORM=y > CONFIG_SATA_SVW=m > # CONFIG_SCHED_SMT is not set > diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 > index e9ac2cd..fde391c 100644 > --- a/debian.master/config/i386/config.common.i386 > +++ b/debian.master/config/i386/config.common.i386 > @@ -100,7 +100,7 @@ CONFIG_RTC_DRV_CMOS=y > CONFIG_RTC_DRV_DS3232=m > CONFIG_RTC_DRV_PCF8523=m > CONFIG_RTC_DRV_TWL4030=m > -CONFIG_RTC_DRV_XGENE=m > +# CONFIG_RTC_DRV_XGENE is not set > CONFIG_SATA_AHCI_PLATFORM=m > CONFIG_SATA_SVW=m > CONFIG_SCHED_SMT=y > diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc > index f68be27..7411c67 100644 > --- a/debian.master/config/powerpc/config.common.powerpc > +++ b/debian.master/config/powerpc/config.common.powerpc > @@ -104,7 +104,7 @@ CONFIG_REGULATOR_TWL4030=m > CONFIG_RTC_DRV_CMOS=m > CONFIG_RTC_DRV_PCF8523=m > CONFIG_RTC_DRV_TWL4030=m > -CONFIG_RTC_DRV_XGENE=m > +# CONFIG_RTC_DRV_XGENE is not set > CONFIG_SATA_AHCI_PLATFORM=m > CONFIG_SATA_SVW=y > # CONFIG_SENSORS_SCH56XX_COMMON is not set > diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el > index dcce993..e6e00b9 100644 > --- a/debian.master/config/ppc64el/config.common.ppc64el > +++ b/debian.master/config/ppc64el/config.common.ppc64el > @@ -153,7 +153,7 @@ CONFIG_RTC_DRV_CMOS=m > CONFIG_RTC_DRV_DS3232=m > CONFIG_RTC_DRV_PCF8523=m > CONFIG_RTC_DRV_TWL4030=m > -CONFIG_RTC_DRV_XGENE=m > +# CONFIG_RTC_DRV_XGENE is not set > CONFIG_SATA_AHCI_PLATFORM=m > CONFIG_SATA_SVW=m > CONFIG_SCHED_SMT=y > -- > 2.5.0 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team Looks good to me.
On Wed, Sep 30, 2015 at 04:02:56PM +0200, Stefan Bader wrote: > > I cannot think of why either method would have a tactical or strategic > > advantage. Therefore I went with the surgical approach so that the > > changes made were explicit. In my opinion, an ignore file obfuscates > > the solution. > > > I was somehow thinking along the lines of the contents of the modules list in > that abi directory represent the state of that upload. Which still had the > module(s). And the goal is to drop them with the next upload. That is why I > thought using ignore files to document the expected "will be missing on the next > build" might be better... Removing them from the previous ABI makes that slightly inaccurate, but can correctly represent the modules only being missing in a subset of architectures/flavours. Putting them in the main module.ignore list keeps the ABI accurate, but prevents detection of accidental changes in other flavours. -apw
On 30.09.2015 23:46, Andy Whitcroft wrote: > On Wed, Sep 30, 2015 at 04:02:56PM +0200, Stefan Bader wrote: > >>> I cannot think of why either method would have a tactical or strategic >>> advantage. Therefore I went with the surgical approach so that the >>> changes made were explicit. In my opinion, an ignore file obfuscates >>> the solution. >>> >> I was somehow thinking along the lines of the contents of the modules list in >> that abi directory represent the state of that upload. Which still had the >> module(s). And the goal is to drop them with the next upload. That is why I >> thought using ignore files to document the expected "will be missing on the next >> build" might be better... > > Removing them from the previous ABI makes that slightly inaccurate, > but can correctly represent the modules only being missing in a subset > of architectures/flavours. Putting them in the main module.ignore list > keeps the ABI accurate, but prevents detection of accidental changes in > other flavours. That is why I thought we had the arch variant of modules ignore. But the naming was very confusing and I always had to look in some wiki document. But I don't want to delay this further. If the stable people are ok with that inaccuracy there is no reason I should not be. At the end of the day this takes away a module (on other arches) which could not be used anyway. -Stefan > > -apw >
Applied to the master-next branch of Vivid.
diff --git a/debian.master/abi/3.19.0-30.33/arm64/generic.modules b/debian.master/abi/3.19.0-30.33/arm64/generic.modules index 4fd6e78..d71fc0a 100644 --- a/debian.master/abi/3.19.0-30.33/arm64/generic.modules +++ b/debian.master/abi/3.19.0-30.33/arm64/generic.modules @@ -2796,7 +2796,6 @@ rtc-v3020 rtc-wm831x rtc-wm8350 rtc-x1205 -rtc-xgene rtd520 rti800 rti802 diff --git a/debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules b/debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules index 51868ae..4b5ce23 100644 --- a/debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules +++ b/debian.master/abi/3.19.0-30.33/armhf/generic-lpae.modules @@ -2933,7 +2933,6 @@ rtc-v3020 rtc-wm831x rtc-wm8350 rtc-x1205 -rtc-xgene rtd520 rti800 rti802 diff --git a/debian.master/abi/3.19.0-30.33/armhf/generic.modules b/debian.master/abi/3.19.0-30.33/armhf/generic.modules index 709201b..2a24096 100644 --- a/debian.master/abi/3.19.0-30.33/armhf/generic.modules +++ b/debian.master/abi/3.19.0-30.33/armhf/generic.modules @@ -2979,7 +2979,6 @@ rtc-v3020 rtc-wm831x rtc-wm8350 rtc-x1205 -rtc-xgene rtd520 rti800 rti802 diff --git a/debian.master/abi/3.19.0-30.33/i386/generic.modules b/debian.master/abi/3.19.0-30.33/i386/generic.modules index feeb2c8..79d1f80 100644 --- a/debian.master/abi/3.19.0-30.33/i386/generic.modules +++ b/debian.master/abi/3.19.0-30.33/i386/generic.modules @@ -3136,7 +3136,6 @@ rtc-v3020 rtc-wm831x rtc-wm8350 rtc-x1205 -rtc-xgene rtd520 rti800 rti802 diff --git a/debian.master/abi/3.19.0-30.33/i386/lowlatency.modules b/debian.master/abi/3.19.0-30.33/i386/lowlatency.modules index 1a9d4ad..39bb8f3 100644 --- a/debian.master/abi/3.19.0-30.33/i386/lowlatency.modules +++ b/debian.master/abi/3.19.0-30.33/i386/lowlatency.modules @@ -3135,7 +3135,6 @@ rtc-v3020 rtc-wm831x rtc-wm8350 rtc-x1205 -rtc-xgene rtd520 rti800 rti802 diff --git a/debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules b/debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules index c500f7a..e07119b 100644 --- a/debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules +++ b/debian.master/abi/3.19.0-30.33/powerpc/powerpc-e500mc.modules @@ -2902,7 +2902,6 @@ rtc-v3020 rtc-wm831x rtc-wm8350 rtc-x1205 -rtc-xgene rtd520 rti800 rti802 diff --git a/debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules b/debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules index 1a07285..8e250a0 100644 --- a/debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules +++ b/debian.master/abi/3.19.0-30.33/powerpc/powerpc-smp.modules @@ -2878,7 +2878,6 @@ rtc-v3020 rtc-wm831x rtc-wm8350 rtc-x1205 -rtc-xgene rtd520 rti800 rti802 diff --git a/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules b/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules index 01acc65..a3ceab9 100644 --- a/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules +++ b/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-emb.modules @@ -2875,7 +2875,6 @@ rtc-v3020 rtc-wm831x rtc-wm8350 rtc-x1205 -rtc-xgene rtd520 rti800 rti802 diff --git a/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules b/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules index e5883e3..8ef0b0f 100644 --- a/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules +++ b/debian.master/abi/3.19.0-30.33/powerpc/powerpc64-smp.modules @@ -2887,7 +2887,6 @@ rtc-v3020 rtc-wm831x rtc-wm8350 rtc-x1205 -rtc-xgene rtd520 rti800 rti802 diff --git a/debian.master/abi/3.19.0-30.33/ppc64el/generic.modules b/debian.master/abi/3.19.0-30.33/ppc64el/generic.modules index f2edc5c..a7de774 100644 --- a/debian.master/abi/3.19.0-30.33/ppc64el/generic.modules +++ b/debian.master/abi/3.19.0-30.33/ppc64el/generic.modules @@ -2820,7 +2820,6 @@ rtc-v3020 rtc-wm831x rtc-wm8350 rtc-x1205 -rtc-xgene rtd520 rti800 rti802 diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 48ae1a2..53b41ca 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -101,7 +101,7 @@ CONFIG_RTC_DRV_CMOS=y CONFIG_RTC_DRV_DS3232=m CONFIG_RTC_DRV_PCF8523=m CONFIG_RTC_DRV_TWL4030=m -CONFIG_RTC_DRV_XGENE=y +# CONFIG_RTC_DRV_XGENE is not set CONFIG_SATA_AHCI_PLATFORM=m CONFIG_SATA_SVW=m CONFIG_SCHED_SMT=y diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 52624b2..9f32a64 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -1822,7 +1822,7 @@ CONFIG_RTC_DRV_TWL4030 p policy<{'armhf': 'y', '*': 'm'}> note<boot essential CONFIG_RTC_DRV_OMAP p policy<{'armhf': 'y', '*': 'm'}> CONFIG_RTC_DRV_S3C p policy<{'armhf': 'y', '*': 'm'}> CONFIG_RTC_DRV_PL031 p policy<{'armhf': 'y', '*': 'm'}> -CONFIG_RTC_DRV_XGENE p policy<{'amd64': 'y', '*': 'm'}> +CONFIG_RTC_DRV_XGENE p policy<{'arm64': 'y', '*': 'n'}> CONFIG_RTC_DRV_DS1374_WDT y CONFIG_RTC_DRV_PCF8523 p policy<{'armhf-generic': 'y', '*': 'm'}> CONFIG_RTC_DRV_OPAL p policy<{'powerpc-powerpc64-smp': 'y', 'ppc64el-generic': 'y'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 248a1bb..6ef09c1 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -93,7 +93,7 @@ CONFIG_RTC_DRV_DS3232=m CONFIG_RTC_DRV_PCF8523=m CONFIG_RTC_DRV_PL031=m CONFIG_RTC_DRV_TWL4030=m -CONFIG_RTC_DRV_XGENE=m +CONFIG_RTC_DRV_XGENE=y CONFIG_SATA_AHCI_PLATFORM=m CONFIG_SATA_SVW=m CONFIG_SCHED_SMT=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 9328885..d62aeaa 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -90,7 +90,7 @@ CONFIG_RTC_DRV_CMOS=m CONFIG_RTC_DRV_DS3232=m CONFIG_RTC_DRV_PL031=y CONFIG_RTC_DRV_TWL4030=y -CONFIG_RTC_DRV_XGENE=m +# CONFIG_RTC_DRV_XGENE is not set CONFIG_SATA_AHCI_PLATFORM=y CONFIG_SATA_SVW=m # CONFIG_SCHED_SMT is not set diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index e9ac2cd..fde391c 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -100,7 +100,7 @@ CONFIG_RTC_DRV_CMOS=y CONFIG_RTC_DRV_DS3232=m CONFIG_RTC_DRV_PCF8523=m CONFIG_RTC_DRV_TWL4030=m -CONFIG_RTC_DRV_XGENE=m +# CONFIG_RTC_DRV_XGENE is not set CONFIG_SATA_AHCI_PLATFORM=m CONFIG_SATA_SVW=m CONFIG_SCHED_SMT=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index f68be27..7411c67 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -104,7 +104,7 @@ CONFIG_REGULATOR_TWL4030=m CONFIG_RTC_DRV_CMOS=m CONFIG_RTC_DRV_PCF8523=m CONFIG_RTC_DRV_TWL4030=m -CONFIG_RTC_DRV_XGENE=m +# CONFIG_RTC_DRV_XGENE is not set CONFIG_SATA_AHCI_PLATFORM=m CONFIG_SATA_SVW=y # CONFIG_SENSORS_SCH56XX_COMMON is not set diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index dcce993..e6e00b9 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -153,7 +153,7 @@ CONFIG_RTC_DRV_CMOS=m CONFIG_RTC_DRV_DS3232=m CONFIG_RTC_DRV_PCF8523=m CONFIG_RTC_DRV_TWL4030=m -CONFIG_RTC_DRV_XGENE=m +# CONFIG_RTC_DRV_XGENE is not set CONFIG_SATA_AHCI_PLATFORM=m CONFIG_SATA_SVW=m CONFIG_SCHED_SMT=y