From patchwork Mon Oct 5 18:07:02 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/2] UBUNTU: changelog -- explicitly note rebases and clean history From: Andy Whitcroft X-Patchwork-Id: 35041 Message-Id: <1254766022-15715-3-git-send-email-apw@canonical.com> To: kernel-team@lists.ubuntu.com Date: Mon, 5 Oct 2009 19:07:02 +0100 Ensure that all the recent rebases are called out in a consistent manner. Clean up our history so that joins cleanly with the current live changelog. Signed-off-by: Andy Whitcroft --- debian.master/changelog | 6 ++++++ debian.master/changelog.historical | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian.master/changelog b/debian.master/changelog index 2d25066..f2395c8 100644 --- a/debian.master/changelog +++ b/debian.master/changelog @@ -373,6 +373,10 @@ linux (2.6.31-7.27) karmic; urgency=low Replaces previous ksm patches from 2.6.31-6.25 * [Config] KSM=y + [ Upstream ] + + * Rebased against v2.6.31-rc7 + -- Tim Gardner Sat, 22 Aug 2009 20:32:11 -0600 linux (2.6.31-6.26) karmic; urgency=low @@ -445,6 +449,7 @@ linux (2.6.31-6.25) karmic; urgency=low * drop thinkpad ec and smapi support * drop appleir * [Config] update configs following rebase to v2.6.31-rc6 + * rebase to v2.6.31-rc6 [ Hugh Dickins ] @@ -477,6 +482,7 @@ linux (2.6.31-6.25) karmic; urgency=low [ Upstream Kernel Changes ] + * Rebased against v2.6.31-rc6 * ARM: Cleanup: Revert "ARM: Add more cache memory types macros" * ARM: Cleanup: Revert "Do not use OOB with MLC NAND" * ARM: Cleanup: Revert "ARM: Make ARM arch aware of ubuntu/ drivers" diff --git a/debian.master/changelog.historical b/debian.master/changelog.historical index 18eb949..9e3beaf 100644 --- a/debian.master/changelog.historical +++ b/debian.master/changelog.historical @@ -1,8 +1,3 @@ -linux (2.6.30-1.1) karmic; urgency=low - - * Initial release after rebasing against v2.6.30-rc3 - - -- Tim Gardner Thu, 12 Mar 2009 19:16:07 -0600 linux (2.6.28-9.31) jaunty; urgency=low