Messages in this thread | | | Date | Mon, 22 Apr 2013 20:41:42 -0400 (EDT) | Subject | Re: linux-next: manual merge of the net-next tree with Linus' tree | From | David Miller <> |
| |
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 22 Apr 2013 13:03:24 +1000
> Today's linux-next merge of the net-next tree got a conflict in > net/ipv4/tcp_input.c between commit 12fb3dd9dc3c ("tcp: call > tcp_replace_ts_recent() from tcp_ack()") from Linus' tree and commit > 9b717a8d2450 ("tcp: TLP loss detection") from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
I took care of this during the net --> net-next merge, thanks!
| |