From: Martin Schwidefsky <schwidefsky@de.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
linux-next@vger.kernel.org, Kay Sievers <kay.sievers@vrfy.org>,
Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Subject: Re: linux-next: s390/driver-core merge conflict
Date: Thu, 29 May 2008 14:22:55 +0200 [thread overview]
Message-ID: <1212063775.16984.4.camel@localhost> (raw)
In-Reply-To: <20080529135839.aa17b44f.sfr@canb.auug.org.au>
On Thu, 2008-05-29 at 13:58 +1000, Stephen Rothwell wrote:
> Hi Martin,
>
> Today's linux-next merge of the s390 tree got conflicts in
> drivers/s390/block/dasd.c, drivers/s390/block/dasd_eckd.c,
> drivers/s390/block/dasd_fba.c, drivers/s390/char/tape_core.c,
> drivers/s390/cio/device_fsm.c, drivers/s390/net/claw.c,
> drivers/s390/net/ctcm_main.c and drivers/s390/net/lcs.c between commit
> bd24b944eb93549b1ca5becbf27c7373504f7eed ("driver-core: prepare for
> removal of 20 char limit from struct device") from the driver-core tree
> and commits 17ae2c0d4d27d73fb264e204e385bf5436349f36 ("[S390] cio:
> introduce fcx enabled scsw format") and
> 8e4dac6f0f36686984ed3f01b977259e3127433b ("[S390] cio: provide functions
> for fcx enabled I/O") from the s390 tree.
>
> I merged all the dev_name changes from driver-core into the s390 changes.
> Someone might like to check it.
It builds fine and it boots. Not too bad I would say.
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
next prev parent reply other threads:[~2008-05-29 12:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-29 3:58 linux-next: s390/driver-core merge conflict Stephen Rothwell
2008-05-29 12:22 ` Martin Schwidefsky [this message]
2008-05-29 13:05 ` 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=1212063775.16984.4.camel@localhost \
--to=schwidefsky@de.ibm.com \
--cc=greg@kroah.com \
--cc=kay.sievers@vrfy.org \
--cc=linux-next@vger.kernel.org \
--cc=peter.oberparleiter@de.ibm.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.