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 S. Miller" <davem@davemloft•net>,
netdev@vger•kernel.org
Subject: linux-next: manual merge of the pcmcia tree with the net tree
Date: Fri, 4 Dec 2009 14:53:40 +1100 [thread overview]
Message-ID: <20091204145340.a5b73373.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 661 bytes --]
Hi Dominik,
Today's linux-next merge of the pcmcia tree got a conflict in
drivers/net/pcmcia/xirc2ps_cs.c between commit
8e95a2026f3b43f7c3d676adaccd2de9532e8dcc ("drivers/net: Move && and || to
end of previous line") from the net tree and commit
dddfbd824b96a25da0b2f1cf35c0be33ef2422fe ("pcmcia: convert net pcmcia
drivers to use new CIS helpers") from the pcmcia tree.
I fixed it up (by using the pcmcia tree version - since that removed the
conflicting code that was modified in the net tree commit) and can carry
the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2009-12-04 3:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-04 3:53 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-09-16 2:31 Stephen Rothwell
2010-04-07 4:17 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=20091204145340.a5b73373.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