From: Russell King <rmk@arm.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
linux-next@vger.kernel.org,
Catalin Marinas <catalin.marinas@arm.com>,
Kay Sievers <kay.sievers@vrfy.org>,
David Woodhouse <dwmw2@infradead.org>
Subject: Re: linux-next: manual merge of the driver-core tree
Date: Mon, 1 Dec 2008 09:23:14 +0000 [thread overview]
Message-ID: <20081201092314.GA28971@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20081201111552.8b1cbf9b.sfr@canb.auug.org.au>
On Mon, Dec 01, 2008 at 11:15:52AM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> 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). Maybe you, Russell and David Woodhouse could
> sort out who should coordinate these updates.
Or maybe Catalin rather than me.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
next prev parent reply other threads:[~2008-12-01 9:23 UTC|newest]
Thread overview: 34+ 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 [this message]
2008-12-01 11:17 ` Catalin Marinas
2008-12-01 17:32 ` Catalin Marinas
2008-12-01 23:31 ` Stephen Rothwell
-- 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-03 23:44 ` Stephen Rothwell
2008-12-04 4:21 ` Greg KH
2008-12-04 4:21 ` Greg KH
2008-12-04 10:42 ` Paul Mackerras
2008-12-04 10:42 ` Paul Mackerras
2008-12-04 18:00 ` Greg KH
2008-12-04 18:00 ` Greg KH
2009-01-04 23:28 ` Stephen Rothwell
2009-01-04 23:28 ` Stephen Rothwell
2009-01-05 4:36 ` Greg KH
2009-01-05 4:36 ` Greg KH
2009-01-05 5:57 ` Stephen Rothwell
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=20081201092314.GA28971@flint.arm.linux.org.uk \
--to=rmk@arm.linux.org.uk \
--cc=catalin.marinas@arm.com \
--cc=dwmw2@infradead.org \
--cc=greg@kroah.com \
--cc=kay.sievers@vrfy.org \
--cc=linux-next@vger.kernel.org \
--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.