From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dominik Brodowski <linux@dominikbrodowski•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Joe Perches <joe@perches•com>, David Miller <davem@davemloft•net>,
netdev@vger•kernel.org
Subject: linux-next: manual merge of the pcmcia tree with the net tree
Date: Thu, 16 Sep 2010 12:31:52 +1000 [thread overview]
Message-ID: <20100916123152.61d6e10a.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 588 bytes --]
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@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-09-16 2:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-16 2:31 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-09-16 2:31 linux-next: manual merge of the pcmcia tree with the net tree Stephen Rothwell
2010-04-07 4:17 Stephen Rothwell
2009-12-04 3:53 Stephen Rothwell
2009-11-30 2:16 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100916123152.61d6e10a.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=joe@perches$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@dominikbrodowski$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox