diff options
| author | Kyle McMartin <kmcmartin@redhat.com> | 2011-06-21 16:58:12 -0400 |
|---|---|---|
| committer | Kyle McMartin <kmcmartin@redhat.com> | 2011-06-21 17:00:48 -0400 |
| commit | e2875c52bdce5dbf903a0b4ad056a2e18f717812 (patch) | |
| tree | 131f2a8a73c8442d94fee08724e21df5816b5d90 | |
| parent | 11b539c9cb6adb7f4f911c675c5e4d662e24a861 (diff) | |
| download | kernel-e2875c52bdce5dbf903a0b4ad056a2e18f717812.tar.gz kernel-e2875c52bdce5dbf903a0b4ad056a2e18f717812.tar.xz kernel-e2875c52bdce5dbf903a0b4ad056a2e18f717812.zip | |
Update to 3.0-rc4
CONFIG_USB_NET_KALMIA =m
Fix context in linux-3.0-fix-uts-release.patch
| -rw-r--r-- | config-generic | 1 | ||||
| -rw-r--r-- | kernel.spec | 9 | ||||
| -rw-r--r-- | linux-3.0-fix-uts-release.patch | 2 | ||||
| -rw-r--r-- | sources | 3 |
4 files changed, 9 insertions, 6 deletions
diff --git a/config-generic b/config-generic index 2dd45c858..e7021fca8 100644 --- a/config-generic +++ b/config-generic @@ -1561,6 +1561,7 @@ CONFIG_RTL8187=m CONFIG_TMD_HERMES=m CONFIG_USB_ZD1201=m CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_USB_NET_KALMIA=m CONFIG_USB_NET_SMSC75XX=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set diff --git a/kernel.spec b/kernel.spec index 6d5c56383..5c08d21b1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -83,9 +83,9 @@ Summary: The Linux kernel # % define upstream_sublevel %(echo $((%{base_sublevel} + 1))) %define upstream_sublevel 0 # The rc snapshot level -%define rcrev 3 +%define rcrev 4 # The git snapshot level -%define gitrev 6 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel} %endif @@ -531,7 +531,7 @@ BuildRequires: rpm-build >= 4.4.2.1-4 %endif # Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2 -Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-3.0-rc3.tar.bz2 +Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-3.0-rc4.tar.bz2 Source11: genkey Source14: find-provides @@ -1877,6 +1877,9 @@ fi # and build. %changelog +* Tue Jun 21 2011 Kyle McMartin <kmcmartin@redhat.com> 3.0-0.rc4.git0.1 +- Linux 3.0-rc4 (getting closer...) + * Fri Jun 17 2011 Kyle McMartin <kmcmartin@redhat.com> 3.0-0.rc3.git6.1 - Update to 3.0-rc3-git6 diff --git a/linux-3.0-fix-uts-release.patch b/linux-3.0-fix-uts-release.patch index 9e10a2bb9..9a8a6f06c 100644 --- a/linux-3.0-fix-uts-release.patch +++ b/linux-3.0-fix-uts-release.patch @@ -7,6 +7,6 @@ index 0499c2e..86b01e8 100644 PATCHLEVEL = 0 -SUBLEVEL = 0 +SUBLEVEL = - EXTRAVERSION = -rc3-git6 + EXTRAVERSION = -rc4 NAME = Sneaky Weasel @@ -1,2 +1 @@ -b6c6b67b3b2272b90881fc653cc50156 linux-3.0-rc3.tar.bz2 -a6c0974bb156c6049afa79493d11c089 patch-3.0-rc3-git6.bz2 +3c872d52ae780852b474c26988343380 linux-3.0-rc4.tar.bz2 |