Patch a file in the next branch

[Sascha Hauer]

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 |