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, Kay Sievers <kay.sievers@vrfy•org>,
Ursula Braun <braunu@de•ibm.com>, Greg KH <greg@kroah•com>
Subject: linux-next: manual merge of the s390 tree
Date: Tue, 1 Jul 2008 14:43:04 +1000 [thread overview]
Message-ID: <20080701144304.c5e1c7b7.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 509 bytes --]
Hi Martin,
Today's linux-next merge of the s390 tree got a conflict in
drivers/s390/net/netiucv.c between commit
b11b60b796cc45f9f34c9149b1becde0db9bcdde ("s390: bus_id -> dev_name
conversions") from the driver-core tree and commit
9b6fd7ada6c3e068120fa230a760c6238c1ec427 ("[S390] Cleanup netiucv printk
messages") from the s390 tree.
The latter removes some code that the former changes.
--
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-07-01 4:43 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-01 4:43 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-10-29 0:06 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=20080701144304.c5e1c7b7.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=braunu@de$(echo .)ibm.com \
--cc=greg@kroah$(echo .)com \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=kay.sievers@vrfy$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=schwidefsky@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