invisiblek

/dts-v1/;

/ {
	#size-cells = <0x1>;
	qcom,board-id = <0x8 0x0>;
	#address-cells = <0x1>;
	qcom,msm-id = <0xd0 0x10000 0xd1 0x10000 0xd3 0x10000 0xd4 0x10000 0xd6 0x10000 0xd7 0x10000 0xd9 0x10000 0xda 0x10000>;
	compatible = "qcom,msm8974-mtp", "qcom,msm8974", "qcom,mtp";
	interrupt-parent = <0x1>;
	model = "Qualcomm MSM 8974Pro-AA/AB MTP";

invisiblek

From 3a2176cf287ed05ca55f163c1508d10b556b7a62 Mon Sep 17 00:00:00 2001
From: Richard Ross <[email protected]>
Date: Mon, 5 Jan 2015 19:09:34 -0600
Subject: [PATCH 1/1] Fix amps

Change-Id: I46396affc7bde52b6c866076e73aa3f520518e79
---
 libaudioamp/tfa9887.cpp | 440 ++++++++++++++++++++++++++++++++++++------------
 libaudioamp/tfa9887.h   | 112 +++++++++---
 2 files changed, 429 insertions(+), 123 deletions(-)

invisiblek

<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2006, Google Inc.
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
**     http://www.apache.org/licenses/LICENSE-2.0

invisiblek

/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 and
 * only version 2 as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.

invisiblek

#/bin/bash

set -e

git cherry-pick b73e52824c8920a5ff754e3c8ff68466a7dd61f9
git cherry-pick 4081363fbe84a7ebac6d3339dd2775df45d856d0
git cherry-pick 2ae4c673e3cbd69bc2decf6d7f5961f3c7b9b38b
git cherry-pick 9850cf4a8908886370b1f15aacf83d291f098c72
git cherry-pick 05796763b8d19b48bb4149bfb1aa1a91dd9faee6
git cherry-pick ec325b5270cd3ba01bce299d1ede1616f31813ea

invisiblek

diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig
index 9ed1bb1..5459168 100644
--- a/fs/ext4/Kconfig
+++ b/fs/ext4/Kconfig
@@ -82,4 +82,5 @@ config EXT4_DEBUG
 	  Enables run-time debugging support for the ext4 filesystem.
 
 	  If you select Y here, then you will be able to turn on debugging
-	  with a command such as "echo 1 > /sys/kernel/debug/ext4/mballoc-debug"
+	  with a command such as:

invisiblek

diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index cb0783f7..d33733e 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -591,7 +591,8 @@ ext4_fsblk_t ext4_count_free_clusters(struct super_block *sb)
 		if (bitmap_bh == NULL)
 			continue;
 
-		x = ext4_count_free(bitmap_bh, sb->s_blocksize);
+		x = ext4_count_free(bitmap_bh->b_data,

invisiblek

diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index cb0783f7..d33733e 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -591,7 +591,8 @@ ext4_fsblk_t ext4_count_free_clusters(struct super_block *sb)
 		if (bitmap_bh == NULL)
 			continue;
 
-		x = ext4_count_free(bitmap_bh, sb->s_blocksize);
+		x = ext4_count_free(bitmap_bh->b_data,

invisiblek

diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index cb0783f7..d33733e 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -591,7 +591,8 @@ ext4_fsblk_t ext4_count_free_clusters(struct super_block *sb)
 		if (bitmap_bh == NULL)
 			continue;
 
-		x = ext4_count_free(bitmap_bh, sb->s_blocksize);
+		x = ext4_count_free(bitmap_bh->b_data,

invisiblek

diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c
index 3c382b5..d0b8f98 100644
--- a/fs/ext4/ext4_jbd2.c
+++ b/fs/ext4/ext4_jbd2.c
@@ -113,15 +113,6 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line,
 		if (WARN_ON_ONCE(err)) {
 			ext4_journal_abort_handle(where, line, __func__, bh,
 						  handle, err);
-			ext4_error_inode(inode, where, line,
-					 bh->b_blocknr,