Message ID | 1373659247-1775-1-git-send-email-swarren@wwwdotorg.org |
---|---|
State | New |
Headers | show |
On Fri, Jul 12, 2013 at 02:00:44PM -0600, Stephen Warren wrote: > I guess this patch changes the ABI. Should I include changes to bump the > ABI number before/as-part-of this patch, or is that something the Ubuntu > kernel maintainers expect to do themselves? > > I'm also slightly confused why the most recently tagged saucy release > kernel is 3.10.0-2.11, yet the ABI files in that tag are 3.10.0-2.10; > it seems like the ABI files only get renamed to match the kernel release > after each release is tagged. We'll handle the bumps naturally when pulling patches normally, though a warning it is a bumper is handy. The ABI files are the previous ABI always, ie the ABI as it was at the previous version, the new ones for the current version are generated during build and compared to whatever that previous version was as a sanity check. -apw
/me is looking at this set. -apw
Applied to Saucy master-next and unstable. -apw
diff --git a/debian.master/abi/3.10.0-2.10/armhf/generic.modules b/debian.master/abi/3.10.0-2.10/armhf/generic.modules index f78cb6d..71ced83 100644 --- a/debian.master/abi/3.10.0-2.10/armhf/generic.modules +++ b/debian.master/abi/3.10.0-2.10/armhf/generic.modules @@ -1967,7 +1967,6 @@ ocfs2_stackglue ocfs2_stack_o2cb ocfs2_stack_user ocrdma -of_serial old_belkin-sir omap omap2 diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 0b6e3b2..96dc679 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -68,6 +68,7 @@ CONFIG_RTC_DRV_CMOS=y # CONFIG_SATA_HIGHBANK is not set CONFIG_SCHED_SMT=y CONFIG_SCSI_SPI_ATTRS=y +CONFIG_SERIAL_OF_PLATFORM=m CONFIG_SMS_SIANO_DEBUGFS=y CONFIG_SND=m CONFIG_SND_COMPRESS_OFFLOAD=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index f632f3e..ea705b0 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -61,6 +61,7 @@ CONFIG_RTC_DRV_CMOS=m CONFIG_SATA_HIGHBANK=y # CONFIG_SCHED_SMT is not set CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SMS_SIANO_DEBUGFS=y CONFIG_SND=y CONFIG_SND_COMPRESS_OFFLOAD=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index c6d75cc..bc19a4b 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5306,7 +5306,6 @@ CONFIG_SERIAL_MAX310X=y CONFIG_SERIAL_MFD_HSU=m CONFIG_SERIAL_MRST_MAX3110=m CONFIG_SERIAL_NONSTANDARD=y -CONFIG_SERIAL_OF_PLATFORM=m CONFIG_SERIAL_OMAP=y CONFIG_SERIAL_OMAP_CONSOLE=y CONFIG_SERIAL_PCH_UART=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 3828808..aa72bef 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -66,6 +66,7 @@ CONFIG_RTC_DRV_CMOS=y # CONFIG_SATA_HIGHBANK is not set CONFIG_SCHED_SMT=y CONFIG_SCSI_SPI_ATTRS=y +CONFIG_SERIAL_OF_PLATFORM=m # CONFIG_SMS_SIANO_DEBUGFS is not set CONFIG_SND=m CONFIG_SND_COMPRESS_OFFLOAD=m