linux-kernel - linux-next: manual merge of the trivial tree with the net-current tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20091210143756.5a236829.sfr@canb.auug.org.au>
Date:	Thu, 10 Dec 2009 14:37:56 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Damian Lukowski <damian@....rwth-aachen.de>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	"André Goddard Rosa" <andre.goddard@...il.com>
Subject: linux-next: manual merge of the trivial tree with the net-current
 tree

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.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped