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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20130821141715.a1b18a28965e341531775656@canb.auug.org.au>
Date:	Wed, 21 Aug 2013 14:17:15 +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,
	Masanari Iida <standby24x7@...il.com>,
	Manish Chopra <manish.chopra@...gic.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
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c between commit
068a8d197e00 ("qlcnic: Replace poll mode mailbox interface with interrupt
based mailbox interface") from the  tree and commit 0b1587b18bfe
("treewide: Fix typo in printk") from the trivial tree.

I fixed it up (the former removed the line fixed by the latter, 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