* Patch a file in the next branch
@ 2012-09-16 7:19 Franck Jullien
2012-09-16 7:26 ` Sascha Hauer
2012-09-16 7:34 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 2 replies; 5+ messages in thread
From: Franck Jullien @ 2012-09-16 7:19 UTC (permalink / raw)
To: barebox
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 ?
Franck.
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Patch a file in the next branch
2012-09-16 7:19 Patch a file in the next branch Franck Jullien
@ 2012-09-16 7:26 ` Sascha Hauer
2012-09-16 7:34 ` Jean-Christophe PLAGNIOL-VILLARD
1 sibling, 0 replies; 5+ messages in thread
From: Sascha Hauer @ 2012-09-16 7:26 UTC (permalink / raw)
To: Franck Jullien; +Cc: barebox
On Sun, Sep 16, 2012 at 09:19:18AM +0200, 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 ?
As long as you don't logically depend on a patch in next, please work on
master. I'll resolve the merge conflicts if any.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Patch a file in the next branch
2012-09-16 7:19 Patch a file in the next branch Franck Jullien
2012-09-16 7:26 ` Sascha Hauer
@ 2012-09-16 7:34 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-16 7:44 ` Sascha Hauer
1 sibling, 1 reply; 5+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-09-16 7:34 UTC (permalink / raw)
To: Franck Jullien; +Cc: barebox
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
Sacah will replace it
Best Regards,
J.
>
> Franck.
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Patch a file in the next branch
2012-09-16 7:34 ` Jean-Christophe PLAGNIOL-VILLARD
@ 2012-09-16 7:44 ` Sascha Hauer
2012-09-16 8:58 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 1 reply; 5+ messages in thread
From: Sascha Hauer @ 2012-09-16 7:44 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox
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.
>
> Sacah will replace it
Who's that guy?
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Patch a file in the next branch
2012-09-16 7:44 ` Sascha Hauer
@ 2012-09-16 8:58 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 0 replies; 5+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-09-16 8:58 UTC (permalink / raw)
To: Sascha Hauer; +Cc: barebox
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.
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-09-16 9:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-16 7:19 Patch a file in the next branch Franck Jullien
2012-09-16 7:26 ` Sascha Hauer
2012-09-16 7:34 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-16 7:44 ` Sascha Hauer
2012-09-16 8:58 ` Jean-Christophe PLAGNIOL-VILLARD
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox