From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, Alan Cox <alan@lxorguk•ukuu.org.uk>,
David Howells <dhowells@redhat•com>
Subject: Re: linux-next: manual merge of the driver-core tree
Date: Wed, 23 Jul 2008 18:09:26 +1000 [thread overview]
Message-ID: <20080723180926.51c1bd08.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20080723113135.5e22bf4d.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1233 bytes --]
Hi Greg,
On Wed, 23 Jul 2008 11:31:35 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the driver-core tree got conflicts in 58
> files due to the partial merge into Linus' tree of the driver-core tree.
> The conflicts were all caused by the renamed of device_create_drvdata()
> to device_create() so I took the driver-core versions of almost all those
> files. The exceptions were drivers/char/tty_io.c,
> drivers/char/istallion.c, drivers/char/stallion.c and
> drivers/isdn/capi/capi.c which required a manual merge (I applied the
> rename by hand on top of the upstream version of the file in each case).
> Someone might like to check that I have it all right when I publish the
> tree.
>
> Hopefully this will be fixed up soon.
I think one way to avoid this in the future would be to move all the
patches that you have asked Linus to merge into the driver-core.current
series immediately you make the request (or even before). That would
separate my merge of the patches that are identical on both sides from
the patches that further change the same files.
--
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 prev parent reply other threads:[~2008-07-23 8:09 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-23 1:31 linux-next: manual merge of the driver-core tree Stephen Rothwell
2008-07-23 4:21 ` Greg KH
2008-07-23 8:09 ` Stephen Rothwell [this message]
2008-07-23 14:04 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
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
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
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-10-14 3:09 Stephen Rothwell
2008-10-14 3:05 Stephen Rothwell
2008-10-14 3:02 Stephen Rothwell
2008-10-14 2:57 Stephen Rothwell
2008-10-14 2:50 Stephen Rothwell
2008-10-14 3:51 ` Greg KH
2008-07-22 0:56 Stephen Rothwell
2008-07-22 3:14 ` Greg KH
2008-07-18 1:02 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=20080723180926.51c1bd08.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alan@lxorguk$(echo .)ukuu.org.uk \
--cc=dhowells@redhat$(echo .)com \
--cc=greg@kroah$(echo .)com \
--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