archive mirror
 help / color / mirror / Atom feed
* linux-next: s390/driver-core merge conflict
@ 2008-05-29  3:58 Stephen Rothwell
  2008-05-29 12:22 ` Martin Schwidefsky
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2008-05-29  3:58 UTC (permalink / raw)
  To: Martin Schwidefsky, Greg KH; +Cc: linux-next, Kay Sievers, Peter Oberparleiter

[-- Attachment #1: Type: text/plain, Size: 913 bytes --]

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.

Stephen Rothwell          

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2008-05-29 13:06 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-05-29  3:58 linux-next: s390/driver-core merge conflict Stephen Rothwell
2008-05-29 12:22 ` Martin Schwidefsky
2008-05-29 13:05   ` Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).