From: Patrick McHardy <kaber@trash.net>
To: Jan Engelhardt <jengelh@medozas.de>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: pull request
Date: Thu, 12 Feb 2009 06:45:39 +0100 [thread overview]
Message-ID: <4993B783.7060207@trash.net> (raw)
In-Reply-To: <alpine.LSU.2.00.0902120633500.32504@fbirervta.pbzchgretzou.qr>
Jan Engelhardt wrote:
> On Thursday 2009-02-12 06:11, Patrick McHardy wrote:
>>>>> How do these interact with the Jamal's pending changes?
>>>> I think it should be fine as I am changing just the periphery here.
>>>> If it merges without git-pull stopping, after you applied his,
>>>> it's probably ok :)
>>>>
>>> OTOH, I suggest you could do it like Linus [states in his Git
>>> presentation at Google], that is, merging whatever happens to be
>>> first in the mailbox. I think that the statistical distribution
>>> is equal anyway.
>> Thats why I'm asking. He was first so it would only be fair to
>> apply his patches first. Your's are more though so might be more
>> work to fix up. The easiest way might be if you apply Jamal's
>> patches and I simply pull everything from you. You seem to have
>> more remarks about these patches than me anyways :)
>>
> Maybe I suggested too much :p
> But yeah, why not.
Great, thanks.
next prev parent reply other threads:[~2009-02-12 5:45 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-11 15:03 pull request jengelh
2009-02-11 15:03 ` [PATCH 1/8] libxtables: recognize IP6TABLES_LIB_DIR old-style environment variable jengelh
2009-02-11 15:03 ` [PATCH 2/8] build: move -ldl to proper LDADD jengelh
2009-02-11 15:03 ` [PATCH 3/8] libxtables: remove unused XT_LIB_DIR macro jengelh
2009-02-11 15:03 ` [PATCH 4/8] libxtables: decouple non-xtables parts from header jengelh
2009-02-11 15:03 ` [PATCH 5/8] src: remove iptables_rule_match indirection macro jengelh
2009-02-11 15:03 ` [PATCH 6/8] src: remove unused ipt_tryload macro jengelh
2009-02-11 15:03 ` [PATCH 7/8] libxtables: move compat defines to xtables.c jengelh
2009-02-11 15:03 ` [PATCH 8/8] src: consolidate duplicate code in iptables/internal.h jengelh
2009-02-11 15:06 ` pull request Patrick McHardy
2009-02-11 15:45 ` Jan Engelhardt
2009-02-11 23:40 ` Jan Engelhardt
2009-02-12 5:11 ` Patrick McHardy
2009-02-12 5:40 ` Jan Engelhardt
2009-02-12 5:45 ` Patrick McHardy [this message]
2009-02-12 5:29 ` Patrick McHardy
2009-02-12 5:33 ` Jan Engelhardt
2009-02-12 5:46 ` Patrick McHardy
2009-02-12 6:05 ` Jan Engelhardt
2009-02-12 6:10 ` Patrick McHardy
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=4993B783.7060207@trash.net \
--to=kaber@trash.net \
--cc=jengelh@medozas.de \
--cc=netfilter-devel@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).