netdev - linux-next: manual merge of the trivial tree with the net-next 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 for Android: free password hash cracker in your pocket

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

Date:	Wed, 29 May 2013 12:33:17 +1000
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,
	Anatol Pomozov <anatol.pomozov@...il.com>,
	Masanari Iida <standby24x7@...il.com>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Subject: linux-next: manual merge of the trivial tree with the net-next tree

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
Documentation/networking/netlink_mmap.txt between commit 3dd17edea018
("doc:networking: Fix typo in documentation/networking") from the
net-next tree and commit f884ab15afdc ("doc: fix misspellings with
'codespell' tool") from the trivial tree.

The fix in the net-next tree was a superset of the one in the trivial
tree, so I used that and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped