[linux] 01/02: Ignore/fix ABI changes as appropriate

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 8ef7aab26bfae37baf69290bb143a28562feed32
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Oct 5 20:41:51 2015 +0100

    Ignore/fix ABI changes as appropriate
    
    sdhci and wireless driver interfaces shouldn't be used from OOT.
    The block change is a false positive from genksyms.
---
 debian/config/defines                              |  4 ++
 .../debian/block-fix-abi-change-in-4.2.2.patch     | 43 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 48 insertions(+)

diff --git a/debian/config/defines b/debian/config/defines
index f03709a..8572941 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -1,5 +1,9 @@
 [abi]
 abiname: 1
+ignore-changes:
+ module:drivers/mmc/host/sdhci
+ module:drivers/net/wireless/*
+ sdhci_pci_o2_*
 
 [base]
 arches:
diff --git a/debian/patches/debian/block-fix-abi-change-in-4.2.2.patch b/debian/patches/debian/block-fix-abi-change-in-4.2.2.patch
new file mode 100644
index 0000000..a71c557
--- /dev/null
+++ b/debian/patches/debian/block-fix-abi-change-in-4.2.2.patch
@@ -0,0 +1,43 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 05 Oct 2015 20:39:56 +0100
+Subject: block: Avoid ABI change in 4.2.2
+Forwarded: not-needed
+
+struct blk_flush_queue is only used in the block core; its definition
+is not available to OOT modules nor used by in-tree modules.  Hide the
+change from genksyms.
+
+Also hide a new #include from genksyms.
+
+---
+--- a/block/blk.h
++++ b/block/blk.h
+@@ -23,12 +23,15 @@ struct blk_flush_queue {
+ 	struct list_head	flush_data_in_flight;
+ 	struct request		*flush_rq;
+ 
++	spinlock_t		mq_flush_lock;
++
++#ifndef __GENKSYMS__
+ 	/*
+ 	 * flush_rq shares tag with this rq, both can't be active
+ 	 * at the same time
+ 	 */
+ 	struct request		*orig_rq;
+-	spinlock_t		mq_flush_lock;
++#endif
+ };
+ 
+ extern struct kmem_cache *blk_requestq_cachep;
+--- a/block/blk-flush.c
++++ b/block/blk-flush.c
+@@ -73,7 +73,9 @@
+ 
+ #include "blk.h"
+ #include "blk-mq.h"
++#ifndef __GENKSYMS__
+ #include "blk-mq-tag.h"
++#endif
+ 
+ /* FLUSH/FUA sequences */
+ enum {
diff --git a/debian/patches/series b/debian/patches/series
index 74cb37e..57b1ae5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -102,3 +102,4 @@ bugfix/x86/alsa-hda-disable-power_save_node-for-thinkpads.patch
 bugfix/all/netfilter-conntrack-use-nf_ct_tmpl_free-in-ct-synpro.patch
 bugfix/all/Initialize-msg-shm-IPC-objects-before-doing-ipc_addi.patch
 features/all/ath10k-add-qca6164-support.patch
+debian/block-fix-abi-change-in-4.2.2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git