From: Jiri Kosina <jkosina@suse.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Damian Lukowski" <damian@tvk.rwth-aachen.de>,
"David Miller" <davem@davemloft.net>,
netdev@vger.kernel.org,
"\"André Goddard Rosa\"" <andre.goddard@gmail.com>
Subject: Re: linux-next: manual merge of the trivial tree with the net-current tree
Date: Thu, 10 Dec 2009 09:45:27 +0100 (CET) [thread overview]
Message-ID: <alpine.LNX.2.00.0912100944250.3755@pobox.suse.cz> (raw)
In-Reply-To: <20091210143756.5a236829.sfr@canb.auug.org.au>
On Thu, 10 Dec 2009, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> include/net/tcp.h between commit 2f7de5710a4d394920405febc2a9937c69e16dda
> ("tcp: Stalling connections: Move timeout calculation routine") from the
> net-current tree and commit af901ca181d92aac3a7dc265144a9081a86d8f39
> ("tree-wide: fix assorted typos all over the place") from the trivial
> tree.
>
> The former moves the comment that the latter corrects to
> net/ipv4/tcp_timer.c. I just used the net-current version and didn't
> bother fixing it up in its new location.
Hi,
Linus has merged trivial tree into his tree tonight, so I am afraid that
davem will have to fix the conflict when pulling Linus tree into
net-current.
Thanks,
--
Jiri Kosina
SUSE Labs, Novell Inc.
next prev parent reply other threads:[~2009-12-10 8:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-10 3:37 Stephen Rothwell
2009-12-10 8:45 ` Jiri Kosina [this message]
2009-12-10 11:14 ` Stephen Rothwell
2009-12-10 22:41 ` David Miller
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=alpine.LNX.2.00.0912100944250.3755@pobox.suse.cz \
--to=jkosina@suse.cz \
--cc=andre.goddard@gmail.com \
--cc=damian@tvk.rwth-aachen.de \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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®