From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SbdCN-0005Zf-0r for garchives@archives.gentoo.org; Mon, 04 Jun 2012 19:44:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10095E062D; Mon, 4 Jun 2012 19:44:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 93263E062D for ; Mon, 4 Jun 2012 19:44:01 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1AF691B4025 for ; Mon, 4 Jun 2012 19:43:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D58DDE5404 for ; Mon, 4 Jun 2012 19:43:57 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1338838990.a4438ec946201eac5fda78f21d7014d4a46ebcdc.sping@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: a4438ec946201eac5fda78f21d7014d4a46ebcdc X-VCS-Branch: master Date: Mon, 4 Jun 2012 19:43:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f34f5c27-922f-4798-b56f-24a6d18eb2ba X-Archives-Hash: fdc146685919fe8a8b5651d6d1fa63fe commit: a4438ec946201eac5fda78f21d7014d4a46ebcdc Author: Sebastian Pipping pipping org> AuthorDate: Mon Jun 4 19:43:10 2012 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Mon Jun 4 19:43:10 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3Da4438ec9 Merge branch 'bug-418463' Conflicts: ChangeLog ChangeLog | 3 +++ defaults/linuxrc | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --cc ChangeLog index 76102bd,6047d4f..016128a --- a/ChangeLog +++ b/ChangeLog @@@ -5,11 -5,9 +5,14 @@@ # Distributed under the GPL v2 # $Id$ =20 + 02 Jun 2012; Sebastian Pipping defaults/linuxrc: + Support bind mounts from /etc/initramfs.mounts (bug #418463) +=20 + 02 Jun 2012; Sebastian Pipping arch/x86/modules_lo= ad, + arch/x86_64/modules_load, defaults/modules_load: + Make sure that cbc.ko and aes*.ko needed for cbc-essiv:sha256 (=3Ddef= ault) disk + encryption are included with the initramfs (bug #416973) + 28 May 2012; Sebastian Pipping gen_funcs.sh: Fix an e2fsprogs compilation leftover (bug #417095), reported by Juer= gen Rose =20