[3.16] Drop two patches that cause regressions

3 files changed, 0 insertions, 134 deletions

diff --git a/queue-3.16/arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch b/queue-3.16/arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch
deleted file mode 100644
index 48f8566e..00000000
--- a/queue-3.16/arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: "Andrew F. Davis" <afd@ti.com>
-Date: Wed, 29 Nov 2017 11:13:59 -0600
-Subject: ARM: dts: omap3-n900: Fix the audio CODEC's reset pin
-
-commit 7be4b5dc7ffa9499ac6ef33a5ffa9ff43f9b7057 upstream.
-
-The correct DT property for specifying a GPIO used for reset
-is "reset-gpios", fix this here.
-
-Fixes: 14e3e295b2b9 ("ARM: dts: omap3-n900: Add TLV320AIC3X support")
-
-Signed-off-by: Andrew F. Davis <afd@ti.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
----
- arch/arm/boot/dts/omap3-n900.dts | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/omap3-n900.dts
-+++ b/arch/arm/boot/dts/omap3-n900.dts
-@@ -427,7 +427,7 @@
- 	tlv320aic3x: tlv320aic3x@18 {
- 		compatible = "ti,tlv320aic3x";
- 		reg = <0x18>;
--		gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */
-+		reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */
- 		ai3x-gpio-func = <
- 			0 /* AIC3X_GPIO1_FUNC_DISABLED */
- 			5 /* AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT */
-@@ -444,7 +444,7 @@
- 	tlv320aic3x_aux: tlv320aic3x@19 {
- 		compatible = "ti,tlv320aic3x";
- 		reg = <0x19>;
--		gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */
-+		reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */
- 
- 		AVDD-supply = <&vmmc2>;
- 		DRVDD-supply = <&vmmc2>;
diff --git a/queue-3.16/btrfs-use-proper-endianness-accessors-for-super_copy.patch b/queue-3.16/btrfs-use-proper-endianness-accessors-for-super_copy.patch
deleted file mode 100644
index ad14792d..00000000
--- a/queue-3.16/btrfs-use-proper-endianness-accessors-for-super_copy.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From: Anand Jain <anand.jain@oracle.com>
-Date: Thu, 22 Feb 2018 21:58:42 +0800
-Subject: btrfs: use proper endianness accessors for super_copy
-
-commit 3c181c12c431fe33b669410d663beb9cceefcd1b upstream.
-
-The fs_info::super_copy is a byte copy of the on-disk structure and all
-members must use the accessor macros/functions to obtain the right
-value.  This was missing in update_super_roots and in sysfs readers.
-
-Moving between opposite endianness hosts will report bogus numbers in
-sysfs, and mount may fail as the root will not be restored correctly. If
-the filesystem is always used on a same endian host, this will not be a
-problem.
-
-Fix this by using the btrfs_set_super...() functions to set
-fs_info::super_copy values, and for the sysfs, use the cached
-fs_info::nodesize/sectorsize values.
-
-Fixes: df93589a17378 ("btrfs: export more from FS_INFO to sysfs")
-Signed-off-by: Anand Jain <anand.jain@oracle.com>
-Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
-Reviewed-by: David Sterba <dsterba@suse.com>
-[ update changelog ]
-Signed-off-by: David Sterba <dsterba@suse.com>
-[bwh: Backported to 3.16:
- - btrfs_fs_info doesn't have cached nodesize or sectorsize fields, so use
-   the accessor functions
- - Adjust context]
-Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
----
---- a/fs/btrfs/sysfs.c
-+++ b/fs/btrfs/sysfs.c
-@@ -406,7 +406,7 @@ static ssize_t btrfs_nodesize_show(struc
- {
- 	struct btrfs_fs_info *fs_info = to_fs_info(kobj);
- 
--	return snprintf(buf, PAGE_SIZE, "%u\n", fs_info->super_copy->nodesize);
-+	return snprintf(buf, PAGE_SIZE, "%u\n", btrfs_super_nodesize(fs_info->super_copy));
- }
- 
- BTRFS_ATTR_RW(nodesize, 0444, btrfs_nodesize_show, btrfs_no_store);
-@@ -416,7 +416,7 @@ static ssize_t btrfs_sectorsize_show(str
- {
- 	struct btrfs_fs_info *fs_info = to_fs_info(kobj);
- 
--	return snprintf(buf, PAGE_SIZE, "%u\n", fs_info->super_copy->sectorsize);
-+	return snprintf(buf, PAGE_SIZE, "%u\n", btrfs_super_sectorsize(fs_info->super_copy));
- }
- 
- BTRFS_ATTR_RW(sectorsize, 0444, btrfs_sectorsize_show, btrfs_no_store);
-@@ -426,7 +426,7 @@ static ssize_t btrfs_clone_alignment_sho
- {
- 	struct btrfs_fs_info *fs_info = to_fs_info(kobj);
- 
--	return snprintf(buf, PAGE_SIZE, "%u\n", fs_info->super_copy->sectorsize);
-+	return snprintf(buf, PAGE_SIZE, "%u\n", btrfs_super_sectorsize(fs_info->super_copy));
- }
- 
- BTRFS_ATTR_RW(clone_alignment, 0444, btrfs_clone_alignment_show, btrfs_no_store);
---- a/fs/btrfs/transaction.c
-+++ b/fs/btrfs/transaction.c
-@@ -1428,19 +1428,23 @@ static void update_super_roots(struct bt
- 
- 	super = root->fs_info->super_copy;
- 
-+	/* update latest btrfs_super_block::chunk_root refs */
- 	root_item = &root->fs_info->chunk_root->root_item;
--	super->chunk_root = root_item->bytenr;
--	super->chunk_root_generation = root_item->generation;
--	super->chunk_root_level = root_item->level;
-+	btrfs_set_super_chunk_root(super, root_item->bytenr);
-+	btrfs_set_super_chunk_root_generation(super, root_item->generation);
-+	btrfs_set_super_chunk_root_level(super, root_item->level);
- 
-+	/* update latest btrfs_super_block::root refs */
- 	root_item = &root->fs_info->tree_root->root_item;
--	super->root = root_item->bytenr;
--	super->generation = root_item->generation;
--	super->root_level = root_item->level;
-+	btrfs_set_super_root(super, root_item->bytenr);
-+	btrfs_set_super_generation(super, root_item->generation);
-+	btrfs_set_super_root_level(super, root_item->level);
-+
- 	if (btrfs_test_opt(root, SPACE_CACHE))
--		super->cache_generation = root_item->generation;
-+		btrfs_set_super_cache_generation(super, root_item->generation);
- 	if (root->fs_info->update_uuid_tree_gen)
--		super->uuid_tree_generation = root_item->generation;
-+		btrfs_set_super_uuid_tree_generation(super,
-+						     root_item->generation);
- }
- 
- int btrfs_transaction_in_commit(struct btrfs_fs_info *info)
diff --git a/queue-3.16/series b/queue-3.16/series
index 9bcc6b5c..7dce4695 100644
--- a/queue-3.16/series
+++ b/queue-3.16/series
@@ -67,7 +67,6 @@ perf-record-generate-perf_record_-mmap-comm-exec-with-delay.patch
 edac-octeon-fix-an-uninitialized-variable-warning.patch
 arm-dts-exynos-correct-trats2-panel-reset-line.patch
 perf-report-fix-d-output-for-user-metadata-events.patch
-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch
 power-supply-ab8500_charger-fix-an-error-handling-path.patch
 power-supply-ab8500_charger-bail-out-in-case-of-error-in.patch
 perf-annotate-fix-objdump-comment-parsing-for-intel-mov-dissassembly.patch
@@ -312,7 +311,6 @@ x86-xen-zero-msr_ia32_spec_ctrl-before-suspend.patch
 xen-pirq-fix-error-path-cleanup-when-binding-msis.patch
 kvm-s390-provide-io-interrupt-kvm_stat.patch
 btrfs-alloc_chunk-fix-dup-stripe-size-handling.patch
-btrfs-use-proper-endianness-accessors-for-super_copy.patch
 staging-android-ashmem-fix-lockdep-issue-during-llseek.patch
 ata-add-a-new-flag-to-destinguish-sas-controller.patch
 ata-do-not-schedule-hot-plug-if-it-is-a-sas-host.patch