Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1P29aE-0004pY-33 for mharc-grub-devel@gnu.org; Sat, 02 Oct 2010 17:25:30 -0400 Received: from [140.186.70.92] (port=60270 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P29aB-0004pI-88 for grub-devel@gnu.org; Sat, 02 Oct 2010 17:25:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P29a9-0001eC-Uw for grub-devel@gnu.org; Sat, 02 Oct 2010 17:25:27 -0400 Received: from smtp-out4.iol.cz ([194.228.2.92]:50610) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P29a9-0001dr-Jl for grub-devel@gnu.org; Sat, 02 Oct 2010 17:25:25 -0400 Received: from antivir6.iol.cz (unknown [192.168.30.215]) by smtp-out4.iol.cz (Postfix) with ESMTP id 9C735CE453C for ; Sat, 2 Oct 2010 21:25:23 +0000 (UTC) Received: from localhost (antivir6.iol.cz [127.0.0.1]) by antivir6.iol.cz (Postfix) with ESMTP id 8AB46720055 for ; Sat, 2 Oct 2010 23:25:23 +0200 (CEST) X-Virus-Scanned: amavisd-new at iol.cz Received: from antivir6.iol.cz ([127.0.0.1]) by localhost (antivir6.iol.cz [127.0.0.1]) (amavisd-new, port 10224) with LMTP id ME76IKv0n+xz for ; Sat, 2 Oct 2010 23:25:23 +0200 (CEST) Received: from port1.iol.cz (unknown [192.168.30.91]) by antivir6.iol.cz (Postfix) with ESMTP id 6215F720057 for ; Sat, 2 Oct 2010 23:25:23 +0200 (CEST) X-SBRS: None X-SBRS-none: None X-RECVLIST: MTA-OUT-IOL X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AuQMABVAp0xVRnXk/2dsb2JhbAAHgxeBAdFlkUeBIoMudAQ Received: from 228.117.broadband3.iol.cz (HELO [192.168.6.160]) ([85.70.117.228]) by port1.iol.cz with ESMTP; 02 Oct 2010 23:25:23 +0200 From: =?UTF-8?Q?Ale=C5=A1?= Nesrsta To: The development of GNU GRUB In-Reply-To: <4CA62A4E.5090008@gmail.com> References: <1285531907.4545.9.camel@pracovna> <4CA4FC38.8000308@gmail.com> <1285945596.6460.14.camel@pracovna> <4CA62A4E.5090008@gmail.com> Content-Type: text/plain; charset=utf-8 Date: Sat, 02 Oct 2010 23:25:21 +0200 Message-Id: <1286054722.6453.23.camel@pracovna> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Subject: Re: [PATCH] USB Mass Storage CBI support X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Oct 2010 21:25:28 -0000 Vladimir '=CF=86-coder/phcoder' Serbinenko wrote: > >> Other that this it can be merged into experimental. Be sure to push > >> branches/cbi and then merge branches/cbi into experimental Hi, it is done. But I am not 100% sure if I did it correctly - there is list what I did (I hope according to your suggestions): 1. I made cbi branch from trunk 2. I applied CBI patch to cbi repository and committed changes 3. I pushed cbi repository to bzr.savannah.gnu.org/srv/bzr/grub/branches/cbi 4. I merged cbi into experimental branch, commited changes and pushed. And there could be problem. Changes listed during merging were: M ChangeLog M grub-core/bus/usb/ohci.c M grub-core/bus/usb/uhci.c M grub-core/bus/usb/usbtrans.c M grub-core/disk/usbms.c M grub-core/loader/i386/linux.c M grub-core/term/efi/console.c M include/grub/scsi.h No problem with ohci.c, uhci.c, usbtrans.c, usbms.c, scsi.h (my changes) and probably no problem with ChangeLog (it is probably not critical in experimental branch - or ?). But what about replacing files "linux.c" and "console.c" - is it correct ? (I can imagine these files have older version in trunk - or is it not possible ?) Regards Ales