Patch a file in the next branch

Jean-Christophe PLAGNIOL-VILLARD plagnioj at jcrosoft.com
Sun Sep 16 04:58:39 EDT 2012


On 09:44 Sun 16 Sep     , Sascha Hauer wrote:
> On Sun, Sep 16, 2012 at 09:34:19AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > On 09:19 Sun 16 Sep     , Franck Jullien wrote:
> > > Hi,
> > > 
> > > In order to fix fat detection, I need to patch ff.c and filetype.c.
> > > However, ff.c is already patched in next (I need to modify the version
> > > already in next).
> > > Should I generate my patches against next or master ?
> > redo the patch as it more a v2 that an increment one
> 
> Probing a FAT with MBR is a new feature, being able to automatically
> detect it is a new feature aswell, so I see no reason to merge both
> patches.
yes but without it the mount will ne to force the type
and As discuss with Franch the ff.c should use the filetype so make in one
patch make more sense

Best Regards,
J.



More information about the barebox mailing list