diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-09-01 15:17:24 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-09-01 15:17:24 -0400 |
| commit | 861ffc70d2fe2e606ad39543f2d1793a53e6d283 (patch) | |
| tree | a7aa7c9b47cce88bd68a735709b84f85b2a1f314 | |
| parent | 01b3ca6be6c833a0166021643ce80cab8820882f (diff) | |
| download | kernel-861ffc70d2fe2e606ad39543f2d1793a53e6d283.tar.gz kernel-861ffc70d2fe2e606ad39543f2d1793a53e6d283.tar.xz kernel-861ffc70d2fe2e606ad39543f2d1793a53e6d283.zip | |
Linux v4.2-2890-g361f7d175734
| -rw-r--r-- | config-x86-generic | 2 | ||||
| -rw-r--r-- | kbuild-AFTER_LINK.patch | 12 | ||||
| -rw-r--r-- | kernel.spec | 5 | ||||
| -rw-r--r-- | sources | 1 |
4 files changed, 15 insertions, 5 deletions
diff --git a/config-x86-generic b/config-x86-generic index fbe4c854c..94870d2eb 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -4,6 +4,8 @@ CONFIG_X86_EXTENDED_PLATFORM=y CONFIG_X86_GENERIC=y +# CONFIG_X86_LEGACY_VM86 is not set + CONFIG_HPET=y CONFIG_HPET_TIMER=y # CONFIG_HPET_MMAP is not set diff --git a/kbuild-AFTER_LINK.patch b/kbuild-AFTER_LINK.patch index 2dfb637e8..7a18fd241 100644 --- a/kbuild-AFTER_LINK.patch +++ b/kbuild-AFTER_LINK.patch @@ -1,3 +1,4 @@ +From 7877d76b409181af38d307b98d8fed1024f3c9c2 Mon Sep 17 00:00:00 2001 From: Roland McGrath <roland@redhat.com> Date: Mon, 6 Oct 2008 23:03:03 -0700 Subject: [PATCH] kbuild: AFTER_LINK @@ -62,7 +63,7 @@ index effca9404b17..713891a92d23 100644 cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $< diff --git a/arch/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Makefile -index 8ad2b34ad151..e153572ab351 100644 +index ee8a18e50a25..63e33fa049f8 100644 --- a/arch/s390/kernel/vdso32/Makefile +++ b/arch/s390/kernel/vdso32/Makefile @@ -43,7 +43,8 @@ $(obj-vdso32): %.o: %.S @@ -76,7 +77,7 @@ index 8ad2b34ad151..e153572ab351 100644 cmd_vdso32as = $(CC) $(a_flags) -c -o $@ $< diff --git a/arch/s390/kernel/vdso64/Makefile b/arch/s390/kernel/vdso64/Makefile -index 2a8ddfd12a5b..452ca53561fe 100644 +index c4b03f9ed228..550450fc2f95 100644 --- a/arch/s390/kernel/vdso64/Makefile +++ b/arch/s390/kernel/vdso64/Makefile @@ -43,7 +43,8 @@ $(obj-vdso64): %.o: %.S @@ -90,7 +91,7 @@ index 2a8ddfd12a5b..452ca53561fe 100644 cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $< diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile -index e97032069f88..9ea82f444dea 100644 +index a3d0767a6b29..078c9be1db8f 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -172,8 +172,9 @@ $(vdso32-images:%=$(obj)/%.dbg): $(obj)/vdso32-%.so.dbg: FORCE \ @@ -103,7 +104,7 @@ index e97032069f88..9ea82f444dea 100644 + $(if $(AFTER_LINK),; $(AFTER_LINK)) && \ + sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' - VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \ + VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=both) \ $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS) diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index 1a10d8ac8162..092d0c0cf72c 100755 @@ -120,3 +121,6 @@ index 1a10d8ac8162..092d0c0cf72c 100755 } +-- +2.4.3 + diff --git a/kernel.spec b/kernel.spec index ff76da3ce..0ee9499aa 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 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2053,6 +2053,9 @@ fi # # %changelog +* Tue Sep 01 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.3.0-0.rc0.git2.1 +- Linux v4.2-2890-g361f7d175734 + * Tue Sep 01 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.3.0-0.rc0.git1.1 - Linux v4.2-2744-g65a99597f044 - Reenable debugging options. @@ -1,2 +1,3 @@ 3d5ea06d767e2f35c999eeadafc76523 linux-4.2.tar.xz 4c964bfba54d65b5b54cc898baddecad perf-man-4.2.tar.gz +9bd53a296c6effcd6eac8b5ed92a59e7 patch-4.2-git2.xz |