Linux v3.14-rc1-150-g34a9bff

5 files changed, 13 insertions, 154 deletions

diff --git a/config-arm-generic b/config-arm-generic
index 6bbfa913..0afd4451 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -158,6 +158,8 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
 
 # CONFIG_ARM_PTDUMP is not set
 
+# CONFIG_PATA_PLATFORM is not set
+
 ### turn off things which make no sense on embedded SoC
 
 # core
diff --git a/kernel.spec b/kernel.spec
index 75d3a9fa..56729ab6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -624,9 +624,6 @@ Patch25188: 0001-usb-phy-Quiet-unable-to-find-transceiver-message.patch
 Patch25189: ath9k-fix-bad-udelay.patch
 Patch25190: perf-fix-asm-hash-build.patch
 
-#rhbz 1055105
-Patch25191: kernfs-oops-fix.patch
-
 Patch25192: imx-hdmi-fix.patch
 Patch25193: fix-exynos-hdmi-build.patch
 
@@ -1276,9 +1273,6 @@ ApplyPatch 0001-usb-phy-Quiet-unable-to-find-transceiver-message.patch
 ApplyPatch ath9k-fix-bad-udelay.patch
 ApplyPatch perf-fix-asm-hash-build.patch
 
-#rhbz 1055105
-ApplyPatch kernfs-oops-fix.patch
-
 ApplyPatch imx-hdmi-fix.patch
 ApplyPatch fix-exynos-hdmi-build.patch
 
@@ -2061,6 +2055,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Sat Feb 08 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc1.git4.1
+- Linux v3.14-rc1-150-g34a9bff
+
 * Fri Feb 07 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc1.git3.1
 - Linux v3.14-rc1-86-g9343224
 
diff --git a/kernfs-oops-fix.patch b/kernfs-oops-fix.patch
deleted file mode 100644
index d6440ce2..00000000
--- a/kernfs-oops-fix.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-Path: news.gmane.org!not-for-mail
-From: Tejun Heo <tj@kernel.org>
-Newsgroups: gmane.linux.kernel,gmane.linux.usb.general
-Subject: [PATCH driver-core-linus] kernfs: make kernfs_deactivate() honor
- KERNFS_LOCKDEP flag
-Date: Wed, 29 Jan 2014 12:04:03 -0500
-Lines: 73
-Approved: news@gmane.org
-Message-ID: <20140129170403.GJ30842@htj.dyndns.org>
-References: <CAOJe8K20xx3o7HXH3E4pE3=G4pQ-nUf4LYF6sEwy5wYQE23+AA@mail.gmail.com>
- <Pine.LNX.4.44L0.1401291134070.11997-100000@netrider.rowland.org>
-NNTP-Posting-Host: plane.gmane.org
-Mime-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-X-Trace: ger.gmane.org 1391015061 4057 80.91.229.3 (29 Jan 2014 17:04:21 GMT)
-X-Complaints-To: usenet@ger.gmane.org
-NNTP-Posting-Date: Wed, 29 Jan 2014 17:04:21 +0000 (UTC)
-Cc: Denis Kirjanov <kda@linux-powerpc.org>,
-	linux-kernel@vger.kernel.org, USB list <linux-usb@vger.kernel.org>
-To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
-	Fabio Estevam <festevam@gmail.com>,
-	Alan Stern <stern@rowland.harvard.edu>
-Original-X-From: linux-kernel-owner@vger.kernel.org Wed Jan 29 18:04:27 2014
-Return-path: <linux-kernel-owner@vger.kernel.org>
-Envelope-to: glk-linux-kernel-3@plane.gmane.org
-Original-Received: from vger.kernel.org ([209.132.180.67])
-	by plane.gmane.org with esmtp (Exim 4.69)
-	(envelope-from <linux-kernel-owner@vger.kernel.org>)
-	id 1W8YYs-0005VX-Uk
-	for glk-linux-kernel-3@plane.gmane.org; Wed, 29 Jan 2014 18:04:27 +0100
-Original-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1752698AbaA2REJ (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>);
-	Wed, 29 Jan 2014 12:04:09 -0500
-Original-Received: from mail-qc0-f169.google.com ([209.85.216.169]:41377 "EHLO
-	mail-qc0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1751973AbaA2REH (ORCPT
-	<rfc822;linux-kernel@vger.kernel.org>);
-	Wed, 29 Jan 2014 12:04:07 -0500
-Original-Received: by mail-qc0-f169.google.com with SMTP id w7so3165568qcr.14
-        for <multiple recipients>; Wed, 29 Jan 2014 09:04:06 -0800 (PST)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20120113;
-        h=sender:date:from:to:cc:subject:message-id:references:mime-version
-         :content-type:content-disposition:in-reply-to:user-agent;
-        bh=Fh6SVzwapmccOTdEgQSF3oN1/EJKEwZvtYBUuXIZ0o4=;
-        b=rBrKrcnQDx5jOFp+S+kxTkHV0/kydN6rAWp8Hm4R/f1x8IEpY6l6pJIDqlk3yHcgh2
-         bGZkS+TswirT2pk1Gv4lcTtJRhjEXAr11bG9nr81fu1nQB/n7zVu+O/5TKLmSxBQAE0M
-         tLTNvWz1HcnTJstiZf2B5WUuAxF3x64eY6TNwCtqlE2U6PjtyBHi2bVnWPPD/zIrdhS1
-         tLtPw83syrLhuR0WloEZxUVcYcDxSJgK7IG82/attVP2vYZ6aPWj0H5fAO/pFCCdF7Xa
-         6WUCjRx6EmUfSmgc0FkJZwM9JC6IasvC8i13Xcewfpp1ZCVCaaR4/CR8oB9AWbHnKt7i
-         U/LQ==
-X-Received: by 10.224.165.133 with SMTP id i5mr13972741qay.75.1391015046591;
-        Wed, 29 Jan 2014 09:04:06 -0800 (PST)
-Original-Received: from htj.dyndns.org (207-38-225-25.c3-0.43d-ubr1.qens-43d.ny.cable.rcn.com. [207.38.225.25])
-        by mx.google.com with ESMTPSA id j65sm4205451qgj.18.2014.01.29.09.04.05
-        for <multiple recipients>
-        (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
-        Wed, 29 Jan 2014 09:04:05 -0800 (PST)
-Content-Disposition: inline
-In-Reply-To: <Pine.LNX.4.44L0.1401291134070.11997-100000@netrider.rowland.org>
-User-Agent: Mutt/1.5.21 (2010-09-15)
-Original-Sender: linux-kernel-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-kernel.vger.kernel.org>
-X-Mailing-List: linux-kernel@vger.kernel.org
-Xref: news.gmane.org gmane.linux.kernel:1637396 gmane.linux.usb.general:102347
-Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1637396>
-
-kernfs_deactivate() forgot to check whether KERNFS_LOCKDEP is set
-before performing lockdep annotations and ends up feeding
-uninitialized lockdep_map to lockdep triggering warning like the
-following on USB stick hotunplug.
-
- usb 1-2: USB disconnect, device number 2
- INFO: trying to register non-static key.
- the code is fine but needs lockdep annotation.
- turning off the locking correctness validator.
- CPU: 1 PID: 62 Comm: khubd Not tainted 3.13.0-work+ #82
- Hardware name: empty empty/S3992, BIOS 080011  10/26/2007
-  ffff880065ca7f60 ffff88013a4ffa08 ffffffff81cfb6bd 0000000000000002
-  ffff88013a4ffac8 ffffffff810f8530 ffff88013a4fc710 0000000000000002
-  ffff880100000000 ffffffff82a3db50 0000000000000001 ffff88013a4fc710
- Call Trace:
-  [<ffffffff81cfb6bd>] dump_stack+0x4e/0x7a
-  [<ffffffff810f8530>] __lock_acquire+0x1910/0x1e70
-  [<ffffffff810f931a>] lock_acquire+0x9a/0x1d0
-  [<ffffffff8127c75e>] kernfs_deactivate+0xee/0x130
-  [<ffffffff8127d4c8>] kernfs_addrm_finish+0x38/0x60
-  [<ffffffff8127d701>] kernfs_remove_by_name_ns+0x51/0xa0
-  [<ffffffff8127b4f1>] remove_files.isra.1+0x41/0x80
-  [<ffffffff8127b7e7>] sysfs_remove_group+0x47/0xa0
-  [<ffffffff8127b873>] sysfs_remove_groups+0x33/0x50
-  [<ffffffff8177d66d>] device_remove_attrs+0x4d/0x80
-  [<ffffffff8177e25e>] device_del+0x12e/0x1d0
-  [<ffffffff819722c2>] usb_disconnect+0x122/0x1a0
-  [<ffffffff819749b5>] hub_thread+0x3c5/0x1290
-  [<ffffffff810c6a6d>] kthread+0xed/0x110
-  [<ffffffff81d0a56c>] ret_from_fork+0x7c/0xb0
-
-Fix it by making kernfs_deactivate() perform lockdep annotations only
-if KERNFS_LOCKDEP is set.
-
-Signed-off-by: Tejun Heo <tj@kernel.org>
-Reported-by: Fabio Estevam <festevam@gmail.com>
-Reported-by: Alan Stern <stern@rowland.harvard.edu>
----
- fs/kernfs/dir.c |   12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
-index 5104cf5..bd6e18b 100644
---- a/fs/kernfs/dir.c
-+++ b/fs/kernfs/dir.c
-@@ -187,19 +187,23 @@ static void kernfs_deactivate(struct kernfs_node *kn)
- 
- 	kn->u.completion = (void *)&wait;
- 
--	rwsem_acquire(&kn->dep_map, 0, 0, _RET_IP_);
-+	if (kn->flags & KERNFS_LOCKDEP)
-+		rwsem_acquire(&kn->dep_map, 0, 0, _RET_IP_);
- 	/* atomic_add_return() is a mb(), put_active() will always see
- 	 * the updated kn->u.completion.
- 	 */
- 	v = atomic_add_return(KN_DEACTIVATED_BIAS, &kn->active);
- 
- 	if (v != KN_DEACTIVATED_BIAS) {
--		lock_contended(&kn->dep_map, _RET_IP_);
-+		if (kn->flags & KERNFS_LOCKDEP)
-+			lock_contended(&kn->dep_map, _RET_IP_);
- 		wait_for_completion(&wait);
- 	}
- 
--	lock_acquired(&kn->dep_map, _RET_IP_);
--	rwsem_release(&kn->dep_map, 1, _RET_IP_);
-+	if (kn->flags & KERNFS_LOCKDEP) {
-+		lock_acquired(&kn->dep_map, _RET_IP_);
-+		rwsem_release(&kn->dep_map, 1, _RET_IP_);
-+	}
- }
- 
- /**
diff --git a/makefile-after_link.patch b/makefile-after_link.patch
index 4c96701d..23406fc9 100644
--- a/makefile-after_link.patch
+++ b/makefile-after_link.patch
@@ -11,17 +11,18 @@ after each final link.  This includes vmlinux itself and vDSO images.
 
 Signed-off-by: Roland McGrath <roland@redhat.com>
 
+
 diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile
-index d8064af..04dcfe1 100644
+index 6d20b7d..863a01b 100644
 --- a/arch/arm64/kernel/vdso/Makefile
 +++ b/arch/arm64/kernel/vdso/Makefile
 @@ -48,7 +48,8 @@ $(obj-vdso): %.o: %.S
  
  # Actual build commands
  quiet_cmd_vdsold = VDSOL $@
--      cmd_vdsold = $(CC) $(c_flags) -Wl,-T $^ -o $@
-+      cmd_vdsold = $(CC) $(c_flags) -Wl,-T $^ -o $@ \
-+			$(if $(AFTER_LINK),; $(AFTER_LINK))
+-      cmd_vdsold = $(CC) $(c_flags) -Wl,-n -Wl,-T $^ -o $@
++      cmd_vdsold = $(CC) $(c_flags) -Wl,-n -Wl,-T $^ -o $@ \
++				   $(if $(AFTER_LINK),;$(AFTER_LINK))
  quiet_cmd_vdsoas = VDSOA $@
        cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $<
  
@@ -98,7 +99,7 @@ index fd14be1..1f3eb19 100644
  VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
  GCOV_PROFILE := n
 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
-index 0149949..e307cda 100644
+index 2dcb377..25e170e 100644
 --- a/scripts/link-vmlinux.sh
 +++ b/scripts/link-vmlinux.sh
 @@ -65,6 +65,10 @@ vmlinux_link()
diff --git a/sources b/sources
index 583b5210..903221d0 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 0ecbaf65c00374eb4a826c2f9f37606f  linux-3.13.tar.xz
 732d1952898b28d5ccc264cad77b0619  perf-man-3.13.tar.gz
 c3ef4db4edbf6ca3a01a0c392dd048b9  patch-3.14-rc1.xz
-c2bf432f4279d2dd6f9774b06ab312ce  patch-3.14-rc1-git3.xz
+59d408271069adeb5969ddcf48781a97  patch-3.14-rc1-git4.xz