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

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

Message-Id: <20091123120052.dd388203.sfr@canb.auug.org.au>
Date:	Mon, 23 Nov 2009 12:00:52 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Eric Dumazet <eric.dumazet@...il.com>
Subject: linux-next: manual merge of the net tree with the net-current tree

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/ieee802154/fakehard.c between commit
56cf54831fd1be105e89a9df899e3b22442da180 ("ieee802154: dont leak skbs in
ieee802154_fake_xmit()") from the net-current tree and commit
8964be4a9a5ca8cab1219bb046db2f6d1936227c ("net: rename skb->iif to
skb->skb_iif") from the net tree.

The former removed the code modified by the latter, so I used the former.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped