diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-01-22 13:34:11 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-01-22 13:34:11 -0500 |
| commit | e6636acec46b79cd20b1bc5ee4f1f62e7fb54471 (patch) | |
| tree | 39800a0f3b440eb951b2e3037ae9533b0e335bd4 | |
| parent | 65296631482f80aaf4fadb08b36ab60ed7d8f23f (diff) | |
| download | kernel-e6636acec46b79cd20b1bc5ee4f1f62e7fb54471.tar.gz kernel-e6636acec46b79cd20b1bc5ee4f1f62e7fb54471.tar.xz kernel-e6636acec46b79cd20b1bc5ee4f1f62e7fb54471.zip | |
update to 2.6.38-rc2
| -rw-r--r-- | config-generic | 1 | ||||
| -rw-r--r-- | kernel.spec | 8 | ||||
| -rw-r--r-- | linux-2.6-serial-460800.patch | 4 | ||||
| -rw-r--r-- | sources | 3 |
4 files changed, 10 insertions, 6 deletions
diff --git a/config-generic b/config-generic index e58145719..45a0acac0 100644 --- a/config-generic +++ b/config-generic @@ -40,6 +40,7 @@ CONFIG_SYSCTL=y CONFIG_LOG_BUF_SHIFT=17 # CONFIG_IKCONFIG is not set # CONFIG_EMBEDDED is not set +# CONFIG_EXPERT is not set CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_EXTRA_PASS=y diff --git a/kernel.spec b/kernel.spec index a905fbbe4..10ff01664 100644 --- a/kernel.spec +++ b/kernel.spec @@ -82,9 +82,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%define rcrev 1 +%define rcrev 2 # The git snapshot level -%define gitrev 1 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1956,6 +1956,10 @@ fi # ||----w | # || || %changelog +* Sat Jan 22 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc2.git0.1 +- Linux 2.6.38-rc2 +- linux-2.6-serial-460800.patch, drivers/serial => drivers/tty/serial + * Thu Jan 20 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc1.git1.1 - Linux 2.6.38-rc1-git1, should fix boot failure in -rc1. diff --git a/linux-2.6-serial-460800.patch b/linux-2.6-serial-460800.patch index 17d67ef64..9aa392c9e 100644 --- a/linux-2.6-serial-460800.patch +++ b/linux-2.6-serial-460800.patch @@ -1,7 +1,7 @@ diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index 2209620..659c1bb 100644 ---- a/drivers/serial/8250.c -+++ b/drivers/serial/8250.c +--- a/drivers/tty/serial/8250.c ++++ b/drivers/tty/serial/8250.c @@ -7,6 +7,9 @@ * * Copyright (C) 2001 Russell King. @@ -1,3 +1,2 @@ c8ee37b4fdccdb651e0603d35350b434 linux-2.6.37.tar.bz2 -67dc1a2f59ebfd20aac1129b65ec3f0c patch-2.6.38-rc1.bz2 -76c4f18557a5d64174df6e749d05c6e9 patch-2.6.38-rc1-git1.bz2 +4651b1512e2fba1735713aca8f1007fc patch-2.6.38-rc2.bz2 |