From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, Kay Sievers <kay.sievers@vrfy•org>,
Jan Glauber <jang@linux•vnet.ibm.com>
Subject: linux-next: manual merge of the driver-core tree
Date: Fri, 18 Jul 2008 11:02:59 +1000 [thread overview]
Message-ID: <20080718110259.271e5c2d.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 612 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/s390/cio/qdio.c between commit
779e6e1c724d30e0fd1baca78b852e41e3a23c1d ("[S390] qdio: new qdio
driver.") from Linus' tree and commit
00bcc6c6a1b34a65803e997a142470531b0b4213 ("s390: bus_id -> dev_name
conversions") from the driver-core tree.
The former commit split the file into a set of other files (and removed
the original). I am guessing that there may be now some more dev_name
updates to be done.
--
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-18 1:03 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-18 1:02 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-07-22 0:56 linux-next: manual merge of the driver-core tree Stephen Rothwell
2008-07-22 3:14 ` Greg KH
2008-07-23 1:31 Stephen Rothwell
2008-07-23 4:21 ` Greg KH
2008-07-23 8:09 ` Stephen Rothwell
2008-07-23 14:04 ` Greg KH
2008-10-14 2:50 Stephen Rothwell
2008-10-14 3:51 ` Greg KH
2008-10-14 2:57 Stephen Rothwell
2008-10-14 3:02 Stephen Rothwell
2008-10-14 3:05 Stephen Rothwell
2008-10-14 3:09 Stephen Rothwell
2008-12-01 0:15 Stephen Rothwell
2008-12-01 9:23 ` Russell King
2008-12-01 11:17 ` Catalin Marinas
2008-12-01 17:32 ` Catalin Marinas
2008-12-01 23:31 ` Stephen Rothwell
2008-12-03 23:44 Stephen Rothwell
2008-12-04 4:21 ` Greg KH
2008-12-04 10:42 ` Paul Mackerras
2008-12-04 18:00 ` Greg KH
2009-01-04 23:28 ` Stephen Rothwell
2009-01-05 4:36 ` Greg KH
2009-01-05 5:57 ` Stephen Rothwell
2013-10-01 11:03 linux-next: Tree for Oct 1 Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the driver-core tree Thierry Reding
2013-10-01 13:54 ` Greg Kroah-Hartman
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=20080718110259.271e5c2d.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=jang@linux$(echo .)vnet.ibm.com \
--cc=kay.sievers@vrfy$(echo .)org \
--cc=linux-next@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