From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Martin Schwidefsky <schwidefsky@de•ibm.com>,
Heiko Carstens <heiko.carstens@de•ibm.com>
Cc: linux-next@vger•kernel.org,
Frank Blaschka <frank.blaschka@de•ibm.com>,
Ursula Braun <ursula.braun@de•ibm.com>,
Jeff Garzik <jgarzik@redhat•com>,
"David S. Miller" <davem@davemloft•net>
Subject: linux-next: manual merge of the s390 tree
Date: Wed, 29 Oct 2008 11:06:38 +1100 [thread overview]
Message-ID: <20081029110638.f40c73d9.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 616 bytes --]
Hi Martin, Heiko,
Today's linux-next merge of the s390 tree got conflicts in
drivers/s390/net/qeth_l2_main.c and drivers/s390/net/qeth_l3_main.c
between commit 0f5623c9ebfc6576c5682ab3b335c57812f6c87e ("qeth: remove
non-recover-thread checkings") from the net-current tree and commit
fef944b54d0cf71d1f775532439f2e1c3ff3d29b ("[S390] convert qeth printks to
dev_xxx and pr_xxx macros.") from the s390 tree.
Overlapping removals. So I removed the whole sections i.e. used the
net-current version.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-10-29 0:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-29 0:06 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-12-01 22:39 linux-next: manual merge of the s390 tree Stephen Rothwell
2008-12-02 8:12 ` Martin Schwidefsky
2008-12-02 22:09 ` Stephen Rothwell
2008-11-19 23:13 Stephen Rothwell
2008-11-20 11:10 ` Martin Schwidefsky
2008-11-20 11:57 ` Stephen Rothwell
2008-07-01 4:43 Stephen Rothwell
2008-06-24 3:45 Stephen Rothwell
2008-06-24 4:27 ` Greg KH
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=20081029110638.f40c73d9.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=frank.blaschka@de$(echo .)ibm.com \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=jgarzik@redhat$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=schwidefsky@de$(echo .)ibm.com \
--cc=ursula.braun@de$(echo .)ibm.com \
/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