From 1ec90dfaed1ac7d192bc1bb70a01d5e96e02ac76 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 6 Apr 2015 23:34:58 +0000 Subject: [PATCH] Resolve remaining ABI changes Restore a #include dropped from fs/proc/generic.c which perturbed genksyms. Ignore the removal of exported static functions from snd-hda-controller which shouldn't be used OOT (they were only ever meant for use by other modules in that directory). svn path=/dists/sid/linux/; revision=22486 --- debian/changelog | 1 + debian/config/defines | 5 +++++ ...rocfs-avoid-abi-change-in-3.16.7-ckt8.patch | 18 ++++++++++++++++++ debian/patches/series | 2 ++ 4 files changed, 26 insertions(+) create mode 100644 debian/patches/debian/procfs-avoid-abi-change-in-3.16.7-ckt8.patch diff --git a/debian/changelog b/debian/changelog index a26a0d863..4c9999c4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -198,6 +198,7 @@ linux (3.16.7-ckt9-1) UNRELEASED; urgency=medium * [x86] Disable X86_VERBOSE_BOOTUP (Closes: #781953) * eMMC: Don't initialize partitions on RPMB flagged areas (Closes: #782038) * [x86] powercap / RAPL: change domain detection message (Closes: #781418) + * procfs: Avoid ABI change in 3.16.7-ckt8 -- Ian Campbell Wed, 18 Mar 2015 21:07:15 +0000 diff --git a/debian/config/defines b/debian/config/defines index f04e1cded..138d580cf 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -7,6 +7,11 @@ ignore-changes: module:drivers/net/wireless/iwlwifi/iwlwifi module:sound/i2c/other/snd-ak4113 module:sound/i2c/other/snd-ak4114 + azx_alloc_cmd_io + azx_free_cmd_io + azx_get_response + azx_init_cmd_io + azx_send_cmd # Apparently not used OOT __add_pages __remove_pages diff --git a/debian/patches/debian/procfs-avoid-abi-change-in-3.16.7-ckt8.patch b/debian/patches/debian/procfs-avoid-abi-change-in-3.16.7-ckt8.patch new file mode 100644 index 000000000..a7f643af4 --- /dev/null +++ b/debian/patches/debian/procfs-avoid-abi-change-in-3.16.7-ckt8.patch @@ -0,0 +1,18 @@ +From: Ben Hutchings +Date: Tue, 07 Apr 2015 00:20:38 +0100 +Subject: procfs: Avoid ABI change in 3.16.7-ckt8 + +genksyms is perturbed by removing this #include even though none of +its definitions are needed by exported functions... + +--- +--- a/fs/proc/generic.c ++++ b/fs/proc/generic.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/debian/patches/series b/debian/patches/series index f2a9b78b4..bf2d4f01e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -575,3 +575,5 @@ bugfix/x86/drm-i915-add-limited-color-range-readout-for-hdmi-dp.patch bugfix/all/hid-thingm-fix-workqueue-race-on-remove.patch debian/emmc-don-t-initialize-partitions-on-rpmb-flagged-areas.patch bugfix/x86/powercap-rapl-change-domain-detection-message.patch + +debian/procfs-avoid-abi-change-in-3.16.7-ckt8.patch