From 024732751319ebe1f8c3aac9e4bd70c035da368c Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Thu, 12 Jun 2014 10:28:08 -0400 Subject: Linux v3.15-7378-g14208b0ec569 --- config-armv7 | 1 + kbuild-Add-recipe-cmd-an-at-less-cmd-variant.patch | 84 ---------------- kernel.spec | 7 +- sources | 2 +- x86-vdso-Fix-vdso_install.patch | 108 +++++++++++---------- 5 files changed, 61 insertions(+), 141 deletions(-) delete mode 100644 kbuild-Add-recipe-cmd-an-at-less-cmd-variant.patch diff --git a/config-armv7 b/config-armv7 index 095c1bc54..ce292f606 100644 --- a/config-armv7 +++ b/config-armv7 @@ -56,6 +56,7 @@ CONFIG_USB_MV_UDC=m CONFIG_MVEBU_MBUS=y CONFIG_USB_XHCI_MVEBU=m CONFIG_PHY_MVEBU_SATA=y +# CONFIG_AHCI_MVEBU is not set CONFIG_ARMADA_THERMAL=m CONFIG_DOVE_THERMAL=m CONFIG_DRM_ARMADA=m diff --git a/kbuild-Add-recipe-cmd-an-at-less-cmd-variant.patch b/kbuild-Add-recipe-cmd-an-at-less-cmd-variant.patch deleted file mode 100644 index dc6c2dd11..000000000 --- a/kbuild-Add-recipe-cmd-an-at-less-cmd-variant.patch +++ /dev/null @@ -1,84 +0,0 @@ - -Delivered-To: jwboyer@gmail.com -Received: by 10.76.6.212 with SMTP id d20csp275723oaa; - Wed, 11 Jun 2014 09:20:26 -0700 (PDT) -X-Received: by 10.68.202.194 with SMTP id kk2mr6443717pbc.156.1402503625476; - Wed, 11 Jun 2014 09:20:25 -0700 (PDT) -Return-Path: -Received: from bastion.fedoraproject.org (bastion02.fedoraproject.org. [209.132.181.3]) - by mx.google.com with ESMTP id hk10si7140166pac.55.2014.06.11.09.20.25 - for ; - Wed, 11 Jun 2014 09:20:25 -0700 (PDT) -Received-SPF: softfail (google.com: domain of transitioning luto@amacapital.net does not designate 209.132.181.3 as permitted sender) client-ip=209.132.181.3; -Authentication-Results: mx.google.com; - spf=softfail (google.com: domain of transitioning luto@amacapital.net does not designate 209.132.181.3 as permitted sender) smtp.mail=luto@amacapital.net -Received: by bastion02.phx2.fedoraproject.org (Postfix) - id F167F40A24; Wed, 11 Jun 2014 16:20:24 +0000 (UTC) -Delivered-To: jwboyer@fedoraproject.org -Received: from mx1.redhat.com (ext-mx12.extmail.prod.ext.phx2.redhat.com [10.5.110.17]) - by bastion02.phx2.fedoraproject.org (Postfix) with ESMTP id E054140A1F - for ; Wed, 11 Jun 2014 16:20:24 +0000 (UTC) -Received: from mail-pd0-f174.google.com (mail-pd0-f174.google.com [209.85.192.174]) - by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5BGKK9D017943 - for ; Wed, 11 Jun 2014 12:20:21 -0400 -Received: by mail-pd0-f174.google.com with SMTP id y10so1503744pdj.19 - for ; Wed, 11 Jun 2014 09:20:20 -0700 (PDT) -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20130820; - h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to - :references:in-reply-to:references; - bh=CQ9F+PXV6SvMruBV8gwiVUY2iUpI65+jqkUh4N/yL04=; - b=PJ/CK5msKabsmSWS6VSEgjtZ7jgX0BF/9CHTigKuAr0W/4IU0xN0osE/pc6Gny5slE - /0PZrvgDnSLczb+l7Ed2kovova/KZktb6EbUXeOJEYfKC9dhytsCYDG9tuLUvxEmgZfp - vOum3H1CA3ocdu+5qKvwem2WOdLu2+2t3i8KchcmsDZcWhK66eb8nro1LbbwWgdKsPSF - V5NT773uUJ23hy2/uGO6m/PiSIrc8skrgCEae6ugoL0M5r+H9UwfqvLlYB1PL+DJ2JPm - t4wLxV2XxD610nR3sXIs1urvX+/4xAG+2ZdC8NMi7+A2SVtku64rS/5UI30D00xfQoB6 - hYLg== -X-Gm-Message-State: ALoCoQnsNny2k21X9YSmrkqYkA6qcZffpVvIHQPZiz91j0A2KaYHwDQ4WNaxXqR1ZXSsLA8qPd+g -X-Received: by 10.66.172.229 with SMTP id bf5mr14570106pac.57.1402503620494; - Wed, 11 Jun 2014 09:20:20 -0700 (PDT) -Received: from localhost (50-76-60-73-ip-static.hfc.comcastbusiness.net. [50.76.60.73]) - by mx.google.com with ESMTPSA id fk4sm31444487pab.23.2014.06.11.09.20.19 - for - (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); - Wed, 11 Jun 2014 09:20:19 -0700 (PDT) -From: Andy Lutomirski -To: "H. Peter Anvin" , Josh Boyer -Cc: Michal Marek , linux-kbuild@vger.kernel.org, - "Linux-Kernel@Vger. Kernel. Org" , - Andy Lutomirski -Subject: [PATCH 1/2] kbuild: Add recipe-cmd, an @-less cmd variant -Date: Wed, 11 Jun 2014 09:20:06 -0700 -Message-Id: -X-Mailer: git-send-email 1.9.3 -In-Reply-To: -References: <5398749B.4090209@zytor.com> - -In-Reply-To: -References: -X-RedHat-Spam-Score: -2.01 (BAYES_00,DCC_REPUT_13_19,RCVD_IN_DNSWL_NONE,SPF_PASS,URIBL_BLOCKED) -X-Scanned-By: MIMEDefang 2.68 on 10.5.110.17 - -It's awkward to put $(call cmd,xyz) in a loop in a recipe because -the pesky at sign gets in the way. - -Signed-off-by: Andy Lutomirski ---- - scripts/Kbuild.include | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include -index 122f95c..3e60923 100644 ---- a/scripts/Kbuild.include -+++ b/scripts/Kbuild.include -@@ -194,6 +194,7 @@ echo-cmd = $(if $($(quiet)cmd_$(1)),\ - - # printing commands - cmd = @$(echo-cmd) $(cmd_$(1)) -+recipe-cmd = $(echo-cmd) $(cmd_$(1)) - - # Add $(obj)/ for paths that are not absolute - objectify = $(foreach o,$(1),$(if $(filter /%,$(o)),$(o),$(obj)/$(o))) --- -1.9.3 - diff --git a/kernel.spec b/kernel.spec index 1804b75e6..7d7d97c60 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,7 +67,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -638,7 +638,6 @@ Patch26005: eeepc-wmi-Add-no-backlight-quirk-for-Asus-H87I-PLUS-.patch Patch26013: acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch Patch26014: acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch -Patch26015: kbuild-Add-recipe-cmd-an-at-less-cmd-variant.patch Patch26016: x86-vdso-Fix-vdso_install.patch # END OF PATCH DEFINITIONS @@ -1358,7 +1357,6 @@ ApplyPatch eeepc-wmi-Add-no-backlight-quirk-for-Asus-H87I-PLUS-.patch ApplyPatch acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch ApplyPatch acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch -ApplyPatch kbuild-Add-recipe-cmd-an-at-less-cmd-variant.patch ApplyPatch x86-vdso-Fix-vdso_install.patch # END OF PATCH APPLICATIONS @@ -2233,6 +2231,9 @@ fi # ||----w | # || || %changelog +* Thu Jun 12 2014 Josh Boyer - 3.16.0-0.rc0.git3.1 +- Linux v3.15-7378-g14208b0ec569 + * Wed Jun 11 2014 Josh Boyer - 3.16.0-0.rc0.git2.1 - Linux v3.15-7283-gda85d191f58a diff --git a/sources b/sources index 0a6e46c88..de205755b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 97ca1625bb40368dc41b9a7971549071 linux-3.15.tar.xz ef8f4db937f521a7e323ec589536ba25 perf-man-3.15.tar.gz -b3e75b93713316b4c351b783cf2da139 patch-3.15-git2.xz +12ead2b79d5eddedbecad0426f96b49a patch-3.15-git3.xz diff --git a/x86-vdso-Fix-vdso_install.patch b/x86-vdso-Fix-vdso_install.patch index 07ea014d6..27ea765da 100644 --- a/x86-vdso-Fix-vdso_install.patch +++ b/x86-vdso-Fix-vdso_install.patch @@ -1,74 +1,72 @@ Delivered-To: jwboyer@gmail.com -Received: by 10.76.6.212 with SMTP id d20csp275722oaa; - Wed, 11 Jun 2014 09:20:25 -0700 (PDT) -X-Received: by 10.69.19.225 with SMTP id gx1mr6471089pbd.34.1402503625308; - Wed, 11 Jun 2014 09:20:25 -0700 (PDT) +Received: by 10.76.6.212 with SMTP id d20csp286438oaa; + Wed, 11 Jun 2014 12:25:34 -0700 (PDT) +X-Received: by 10.66.66.135 with SMTP id f7mr16103670pat.22.1402514734508; + Wed, 11 Jun 2014 12:25:34 -0700 (PDT) Return-Path: Received: from bastion.fedoraproject.org (bastion02.fedoraproject.org. [209.132.181.3]) - by mx.google.com with ESMTP id ql2si38457915pbb.240.2014.06.11.09.20.24 + by mx.google.com with ESMTP id px17si7599032pab.171.2014.06.11.12.25.34 for ; - Wed, 11 Jun 2014 09:20:25 -0700 (PDT) + Wed, 11 Jun 2014 12:25:34 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning luto@amacapital.net does not designate 209.132.181.3 as permitted sender) client-ip=209.132.181.3; Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning luto@amacapital.net does not designate 209.132.181.3 as permitted sender) smtp.mail=luto@amacapital.net Received: by bastion02.phx2.fedoraproject.org (Postfix) - id ABE9740A20; Wed, 11 Jun 2014 16:20:24 +0000 (UTC) + id E8FA440A1B; Wed, 11 Jun 2014 19:25:33 +0000 (UTC) Delivered-To: jwboyer@fedoraproject.org -Received: from mx1.redhat.com (ext-mx14.extmail.prod.ext.phx2.redhat.com [10.5.110.19]) - by bastion02.phx2.fedoraproject.org (Postfix) with ESMTP id 9199C40A1F - for ; Wed, 11 Jun 2014 16:20:24 +0000 (UTC) -Received: from mail-pd0-f182.google.com (mail-pd0-f182.google.com [209.85.192.182]) - by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5BGKMOu006187 - for ; Wed, 11 Jun 2014 12:20:22 -0400 -Received: by mail-pd0-f182.google.com with SMTP id y13so1508044pdi.41 - for ; Wed, 11 Jun 2014 09:20:22 -0700 (PDT) +Received: from mx1.redhat.com (ext-mx11.extmail.prod.ext.phx2.redhat.com [10.5.110.16]) + by bastion02.phx2.fedoraproject.org (Postfix) with ESMTP id C7A2B409CE + for ; Wed, 11 Jun 2014 19:25:33 +0000 (UTC) +Received: from mail-pb0-f41.google.com (mail-pb0-f41.google.com [209.85.160.41]) + by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5BJPWY6031412 + for ; Wed, 11 Jun 2014 15:25:32 -0400 +Received: by mail-pb0-f41.google.com with SMTP id ma3so134149pbc.14 + for ; Wed, 11 Jun 2014 12:25:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to - :references:in-reply-to:references; - bh=fvSn8VazUxkz9ExMYKy6+VgDXUnYm2e2axImee41iYo=; - b=doKgULGvb83kqKC2GoYr96Mlccfs3qcAuUmxMaHHgsoaLVoIpjQHWAR5Ljlf1urgNH - 5dpvJa3vFGXcfv0Vqz/23JTrdN80HDpaTWO/nqYRXsgAL8pv/eeqQSbcDCEmN7u+cxjE - oQN4uemKozS3d+oz85NkvcKfaNo9TClMYfVfUfmyTw/ozP5mwB3r7W1ETQtzX9JVvlTy - SMn54//MfdI8OLFUHIDCkm/wRcZWVTByQGV0KWNw0e6M4e5b9K1QdMrc6JRggwjb83Ac - Jcmkw8T0QAUEMcPJb9RG4FlSWnpWNibDkLv5JQQXBjkkJWr15hyDSAfSsA+oZZRtTIpA - nBeg== -X-Gm-Message-State: ALoCoQkMXf8ZMZ5uLDoOV8k+pACZwfbQeckbP3vuvgRzInhcXkweeCIrAi3AC/TDzSbLfaNVjprH -X-Received: by 10.69.31.97 with SMTP id kl1mr6531199pbd.162.1402503622428; - Wed, 11 Jun 2014 09:20:22 -0700 (PDT) + :references; + bh=3SQxyOCkOEd7ZqBxGm7GVdRdWte9s/+lnDgnWxAd/KE=; + b=aDS8HAiLCK/Rp4I/5iUikYimi8LKsU7iI7K+lCuBGaFVgUY6pa4zykb8A2q/aJWuZY + UDJbBhP0gnZ+xlKkVrRVa9iCwYAJHHf/Ipdidjs0lwFVTlSZuyxXR61vFdRhgN2HFtl9 + AHx95u6UKn2KLoVxtRU6ZiYMMpVacmmQlHh6iZcMsVq2C52qTBchO6r0rGMmeP0f69QZ + h86teTPCUlRQXQCUH9pvTEtmamygxGmf9VBYom8qD3KYuAlQkOGRTo7fwiRjgTHCXk92 + veKA7umfd4rqs9iIIi2qnh4NTonxfWG7lfJVW+j2Ep+gHfCm1hyuM5CVS8fybRvf2gv0 + gKNA== +X-Gm-Message-State: ALoCoQnKVS9+ljO89CTRxFu6zQ1VI6ucPd7i9b7bFnfJZAyZDVXkacL2IJbXQ11P4CBXW2DOSlaH +X-Received: by 10.68.201.10 with SMTP id jw10mr7480616pbc.25.1402514732325; + Wed, 11 Jun 2014 12:25:32 -0700 (PDT) Received: from localhost (50-76-60-73-ip-static.hfc.comcastbusiness.net. [50.76.60.73]) - by mx.google.com with ESMTPSA id ga1sm75742069pbb.82.2014.06.11.09.20.21 + by mx.google.com with ESMTPSA id id10sm76404116pbc.35.2014.06.11.12.25.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); - Wed, 11 Jun 2014 09:20:21 -0700 (PDT) + Wed, 11 Jun 2014 12:25:31 -0700 (PDT) From: Andy Lutomirski To: "H. Peter Anvin" , Josh Boyer Cc: Michal Marek , linux-kbuild@vger.kernel.org, "Linux-Kernel@Vger. Kernel. Org" , Andy Lutomirski -Subject: [PATCH 2/2] x86,vdso: Fix vdso_install -Date: Wed, 11 Jun 2014 09:20:07 -0700 -Message-Id: +Subject: [PATCH v2] x86,vdso: Fix vdso_install +Date: Wed, 11 Jun 2014 12:25:29 -0700 +Message-Id: <5d5e221e59be20a3a7ceb99452e74e233383e7b4.1402514715.git.luto@amacapital.net> X-Mailer: git-send-email 1.9.3 -In-Reply-To: -References: <5398749B.4090209@zytor.com> - -In-Reply-To: -References: -X-RedHat-Spam-Score: -2.01 (BAYES_00,DCC_REPUT_13_19,RCVD_IN_DNSWL_NONE,SPF_PASS,URIBL_BLOCKED) -X-Scanned-By: MIMEDefang 2.68 on 10.5.110.19 +In-Reply-To: +References: +X-RedHat-Spam-Score: -2.7 (BAYES_00,DCC_REPUT_13_19,RCVD_IN_DNSWL_LOW,SPF_PASS,URIBL_BLOCKED) +X-Scanned-By: MIMEDefang 2.68 on 10.5.110.16 -Rather than monkeying with barely-comprehensible static pattern -rules, just use an explicit loop. +The filenames are different now. Inspired by a patch from +Sam Ravnborg. +Reported-by: Josh Boyer Signed-off-by: Andy Lutomirski --- - arch/x86/vdso/Makefile | 20 +++++++------------- - 1 file changed, 7 insertions(+), 13 deletions(-) + arch/x86/vdso/Makefile | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile -index 9769df0..b1c70cc 100644 +index 9769df0..e3683d6 100644 --- a/arch/x86/vdso/Makefile +++ b/arch/x86/vdso/Makefile @@ -9,11 +9,6 @@ VDSOX32-$(CONFIG_X86_X32_ABI) := y @@ -83,27 +81,31 @@ index 9769df0..b1c70cc 100644 # files to link into the vdso vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o -@@ -176,15 +171,14 @@ VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \ +@@ -176,15 +171,20 @@ VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \ GCOV_PROFILE := n # -# Install the unstripped copy of vdso*.so listed in $(vdso-install-y). -+# Install the unstripped copies of vdso*.so listed in $(vdso-install-y). ++# Install the unstripped copies of vdso*.so. # -quiet_cmd_vdso_install = INSTALL $@ - cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/$@ -$(vdso-install-y): %.so: $(obj)/%.so.dbg FORCE -- @mkdir -p $(MODLIB)/vdso -- $(call cmd,vdso_install) -+quiet_cmd_vdso_install = INSTALL $(sofile) -+ cmd_vdso_install = cp $(obj)/$(sofile).dbg $(MODLIB)/vdso/$(sofile) ++quiet_cmd_vdso_install = INSTALL $(@:install_%=%) ++ cmd_vdso_install = cp $< $(MODLIB)/vdso/$(@:install_%=%) ++ ++vdso_img_insttargets := $(vdso_img_sodbg:%=install_%) ++ ++$(MODLIB)/vdso: FORCE + @mkdir -p $(MODLIB)/vdso ++ ++$(vdso_img_insttargets): install_%: $(obj)/% $(MODLIB)/vdso FORCE + $(call cmd,vdso_install) -PHONY += vdso_install $(vdso-install-y) -vdso_install: $(vdso-install-y) -+PHONY += vdso_install -+vdso_install: $(vdso_img_sodbg:%=$(obj)/%) FORCE -+ @mkdir -p $(MODLIB)/vdso -+ @$(foreach sofile,$(vdso_img_sodbg:%.dbg=%),$(call recipe-cmd,vdso_install);) ++PHONY += vdso_install $(vdso_img_insttargets) ++vdso_install: $(vdso_img_insttargets) FORCE clean-files := vdso32-syscall* vdso32-sysenter* vdso32-int80* -- -- cgit