* debian/changelog: Update version to 2.6.27~rc2-1~experimental.1.
* debian/patches/debian/scripts-kconfig-reportoldconfig.patch: Fix. * debian/patches/series/1~experimental.1: Remove merged patches. svn path=/dists/trunk/linux-2.6/; revision=12017
This commit is contained in:
parent
97f0bc6d5c
commit
ea4ccc213b
|
@ -1,4 +1,4 @@
|
|||
linux-2.6 (2.6.27~rc1-1~experimental.1) UNRELEASED; urgency=low
|
||||
linux-2.6 (2.6.27~rc2-1~experimental.1) UNRELEASED; urgency=low
|
||||
|
||||
[ maximilian attems ]
|
||||
* New upstream release
|
||||
|
|
|
@ -187,15 +187,14 @@ index fda6313..c9f3f3a 100644
|
|||
}
|
||||
break;
|
||||
case ask_silent:
|
||||
@@ -596,6 +698,10 @@ int main(int ac, char **av)
|
||||
@@ -596,6 +698,9 @@ int main(int ac, char **av)
|
||||
break;
|
||||
}
|
||||
|
||||
+
|
||||
+ if (report)
|
||||
+ report_changes();
|
||||
+
|
||||
if (conf_get_changed() && conf_write(NULL)) {
|
||||
if (conf_write(NULL)) {
|
||||
fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
|
||||
exit(1);
|
||||
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
+ bugfix/sparc/drivers_net-broken.patch
|
||||
#+ bugfix/ia64/hardcode-arch-script-output.patch
|
||||
+ bugfix/mips/disable-advansys.patch
|
||||
+ bugfix/mips/gbefb_fix_cmap_fifo_timeout.patch
|
||||
+ bugfix/arm/disable-dvb_b2c2_flexcop.patch
|
||||
+ bugfix/arm/disable-dvb_budget.patch
|
||||
+ bugfix/arm/disable-netxen_nic.patch
|
||||
|
@ -28,7 +27,6 @@
|
|||
+ bugfix/arm/disable-ath5k.patch
|
||||
+ bugfix/arm/disable-r6040.patch
|
||||
+ bugfix/arm/kurobox_fix_nr_controllers.patch
|
||||
+ bugfix/arm/xfs_pack_dir2_struct.patch
|
||||
+ bugfix/arm/ixp4xx_eth-build-fix.patch
|
||||
+ bugfix/arm/tsx09-fix-mac.patch
|
||||
+ features/arm/5281d0.patch
|
||||
|
|
Loading…
Reference in New Issue