From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Catalin Marinas <catalin.marinas@arm•com>
Cc: Greg KH <greg@kroah•com>,
linux-next@vger•kernel.org, Russell King <rmk@arm•linux.org.uk>,
Kay Sievers <kay.sievers@vrfy•org>,
David Woodhouse <dwmw2@infradead•org>
Subject: Re: linux-next: manual merge of the driver-core tree
Date: Tue, 2 Dec 2008 10:31:51 +1100 [thread overview]
Message-ID: <20081202103151.fb8f7227.sfr@canb.auug.org.au> (raw)
In-Reply-To: <1228152771.25929.109.camel@pc1117.cambridge.arm.com>
[-- Attachment #1: Type: text/plain, Size: 2144 bytes --]
Hi Catalin,
On Mon, 01 Dec 2008 17:32:51 +0000 Catalin Marinas <catalin.marinas@arm•com> wrote:
>
> On Mon, 2008-12-01 at 11:15 +1100, Stephen Rothwell wrote:
> > Today's linux-next merge of the driver-core tree got a conflict in
> > drivers/mtd/maps/integrator-flash.c between commit
> > ffc86cf850dcd0e181a69c6fa0217d6c7ddf9c85 ("Add armflash support for
> > multiple blocks of flash") from the arm tree and commit
> > 0b1ea7e6450b3cc2e87d1c7295439483d007bb6e ("mtd: struct device - replace
> > bus_id with dev_name(), dev_set_name()") from the driver-core tree.
> >
> > I fixed it up (see below).
>
> I'll send a separate patch on linux-mtd to make the third argument of
> mtd_concat_create a "const char *" to avoid a warning (dev_name returns
> const char *).
That would be good.
> > Maybe you, Russell and David Woodhouse could
> > sort out who should coordinate these updates.
>
> I dropped the patch from my series and I suspect Russell will re-merge
> my tree (there shouldn't be other conflicts via the arm tree).
>
> Now the question, where should I send the changes to integrator-flash.c
> to? I assume it's linux-mtd with ack from Russell.
I would guess that makes sense.
> Anyway, no matter who'll merge it, as long as it is based on the
> mainline kernel it will create a conflict in linux-next. Is the rule
> that there shouldn't be any conflicts in linux-next at this stage? The
> alternative is to get it merged via the driver-core tree.
There will always be conflicts between trees in linux-next. My concern
is to try to minimise them if possible. I can carry fixes to the merges
I do without to much pain and presumably Linus can cope with anything I
can. Conflicts against Linus' tree should be fixed as soon as makes
sense, but some conflicts between the other constituent trees of
linux-next can only be resolved during the next merge window.
(I usually put "and I can carry the fix as necessary" in my messages, but
I missed that in this case, sorry).
--
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-12-01 23:32 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-01 0:15 linux-next: manual merge of the driver-core tree 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 [this message]
-- 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-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-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-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=20081202103151.fb8f7227.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=catalin.marinas@arm$(echo .)com \
--cc=dwmw2@infradead$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=kay.sievers@vrfy$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
/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