From: "David S. Miller" <davem@davemloft.net>
To: akpm@osdl.org
Cc: linux-kernel@vger.kernel.org, laforge@gnumonks.org
Subject: Re: git-net-fixup.patch added to -mm tree
Date: Sun, 31 Jul 2005 22:25:04 -0700 (PDT) [thread overview]
Message-ID: <20050731.222504.77057517.davem@davemloft.net> (raw)
In-Reply-To: <20050731222125.37ab12e8.akpm@osdl.org>
From: Andrew Morton <akpm@osdl.org>
Date: Sun, 31 Jul 2005 22:21:25 -0700
> Actually, that patch is just a fixup for a patch reject from the net-2.6.14
> diff. I do that sometimes when I get sick of fixing up the same reject
> each time I pull the various trees.
>
> (I'm not sure _why_ I'm getting a reject applying that diff. Nothing else
> touches that file. git is not quite yet generating the linus->davem diff
> which I want..)
There is a tiny bit of conflicts between linux-2.6 and net-2.6.14,
because of some bug fixes that went into Linus's tree over the
past week.
I'll try to rebuild the net-2.6.14 tree if I get a chance before
heading off to the UK tomorrow. That should help things out for
you.
next prev parent reply other threads:[~2005-08-01 5:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200508010504.j7154m5B022440@shell0.pdx.osdl.net>
2005-08-01 5:12 ` David S. Miller
2005-08-01 5:21 ` Andrew Morton
2005-08-01 5:25 ` David S. Miller [this message]
2005-08-01 6:00 ` David S. Miller
2005-08-01 6:33 ` Harald Welte
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=20050731.222504.77057517.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=akpm@osdl.org \
--cc=laforge@gnumonks.org \
--cc=linux-kernel@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
all inboxes | Powered by JetHome®