netdev - linux-next: manual merge of the pcmcia tree with the net 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]

Date:	Thu, 16 Sep 2010 12:31:52 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Dominik Brodowski <linux@...inikbrodowski.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Joe Perches <joe@...ches.com>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Subject: linux-next: manual merge of the pcmcia tree with the net tree

Hi Dominik,

Today's linux-next merge of the pcmcia tree got a conflict in
drivers/net/pcmcia/pcnet_cs.c between commit
7136e11e0cf520ab3fc7b55a20e60c2ec5ea88e1 ("pcnet_cs: Use pr_fmt and
pr_<level>") from the net tree and commit
b76dc0546709aef18f123847680108c2fd33f203 ("pcmcia pcnet_cs: try setting
io_lines to 16 if card setup fails") from the pcmcia tree.

The latter used dev_notice/info (and moved the code) where the former
used pr_notice, so I used the latter.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped