[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH] USB Mass Storage CBI support

From: Aleš Nesrsta
Subject: Re: [PATCH] USB Mass Storage CBI support
Date: Sat, 02 Oct 2010 23:25:21 +0200

Vladimir 'φ-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


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
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 ?)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]