diff options
| author | Kyle McMartin <kmcmartin@redhat.com> | 2011-06-14 09:43:58 -0400 |
|---|---|---|
| committer | Kyle McMartin <kmcmartin@redhat.com> | 2011-06-14 09:54:44 -0400 |
| commit | 61c49032724ea62735fcf7ad8207c1321a783f6a (patch) | |
| tree | 08e10f2347883937c1a6164867e71455688bad7c /linux-3.0-fix-uts-release.patch | |
| parent | 33b31a1c76d9c7289003cb312be40d4e0a358c38 (diff) | |
| download | kernel-61c49032724ea62735fcf7ad8207c1321a783f6a.tar.gz kernel-61c49032724ea62735fcf7ad8207c1321a783f6a.tar.xz kernel-61c49032724ea62735fcf7ad8207c1321a783f6a.zip | |
Update to 3.0-rc3
Add another conflicts to deal with 2 digit
versions (libdm.)
Now that $SUBLEVEL in Makefile is optional, drop it and simplify
linux-3.0-fix-uts-release.patch
linux-2.6-i386-nx-emulation.patch: fix simple reject
drm-intel-eeebox-eb1007-quirk.patch,
revert-ftrace-remove-unnecessary-disabling-of-irqs.patch,
ath5k-disable-fast-channel-switching-by-default.patch: drop
upstream patches.
Diffstat (limited to 'linux-3.0-fix-uts-release.patch')
| -rw-r--r-- | linux-3.0-fix-uts-release.patch | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/linux-3.0-fix-uts-release.patch b/linux-3.0-fix-uts-release.patch index a4af0269a..7cbd902fc 100644 --- a/linux-3.0-fix-uts-release.patch +++ b/linux-3.0-fix-uts-release.patch @@ -1,34 +1,12 @@ diff --git a/Makefile b/Makefile -index afb8e0d..e435bf5 100644 +index badb923..7b2e16d 100644 --- a/Makefile +++ b/Makefile -@@ -1,6 +1,5 @@ +@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 0 - EXTRAVERSION = -rc2 ++SUBLEVEL = + EXTRAVERSION = -rc3 NAME = Sneaky Weasel -@@ -378,9 +377,9 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds - - # Read KERNELRELEASE from include/config/kernel.release (if it exists) - KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) --KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) -+KERNELVERSION = $(VERSION).$(PATCHLEVEL)$(EXTRAVERSION) - --export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION -+export VERSION PATCHLEVEL KERNELRELEASE KERNELVERSION - export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC - export CPP AR NM STRIP OBJCOPY OBJDUMP - export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE -@@ -1005,8 +1004,8 @@ endef - - define filechk_version.h - (echo \#define LINUX_VERSION_CODE $(shell \ -- expr $(VERSION) \* 65536 + $(PATCHLEVEL) \* 256 + $(SUBLEVEL)); \ -- echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';) -+ expr $(VERSION) \* 65536 + $(PATCHLEVEL) \* 256); \ -+ echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8))';) - endef - - include/linux/version.h: $(srctree)/Makefile FORCE |