From: Sascha Hauer <s.hauer@pengutronix.de>
To: Franck Jullien <franck.jullien@gmail.com>
Cc: barebox <barebox@lists.infradead.org>
Subject: Re: Patch a file in the next branch
Date: Sun, 16 Sep 2012 09:26:09 +0200 [thread overview]
Message-ID: <20120916072609.GA6180@pengutronix.de> (raw)
In-Reply-To: <CAJfOKBxhsR6yQ0RSUgxYUayepN46g12fdUmerfS+4rnyvtRD3g@mail.gmail.com>
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
next prev parent reply other threads:[~2012-09-16 7:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-16 7:19 Franck Jullien
2012-09-16 7:26 ` Sascha Hauer [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120916072609.GA6180@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=franck.jullien@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox