linux-kernel - Re: [PATCH RESEND] mmc: dove: fix missing MACH

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20140523134152.GA8664@titan.lakedaemon.net>
Date:	Fri, 23 May 2014 09:41:52 -0400
From:	Jason Cooper <jason@...edaemon.net>
To:	Ulf Hansson <ulf.hansson@...aro.org>
Cc:	Olof Johansson <olof@...om.net>,
	Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>,
	Chris Ball <chris@...ntf.net>, Andrew Lunn <andrew@...n.ch>,
	Gregory Clement <gregory.clement@...e-electrons.com>,
	linux-mmc <linux-mmc@...r.kernel.org>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH RESEND] mmc: dove: fix missing MACH_DOVE dependency

On Fri, May 23, 2014 at 09:40:55AM +0200, Ulf Hansson wrote:
> On 23 May 2014 09:16, Olof Johansson <olof@...om.net> wrote:
> > On Thu, May 22, 2014 at 2:09 AM, Ulf Hansson <ulf.hansson@...aro.org> wrote:
> >> On 19 May 2014 20:02, Sebastian Hesselbarth
> >> <sebastian.hesselbarth@...il.com> wrote:
> >>> DT-enabled Dove moved over from ARCH_DOVE in mach-dove to MACH_DOVE in
> >>> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
> >>> DT-only MACH_DOVE Kconfig. This slipped through the cracks and now is
> >>> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc.
> >>>
> >>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>
> >>> Acked-by: Jason Cooper <jason@...edaemon.net>
> >>
> >> Thanks! Picked up for the PR I send to Chris.
> >
> > Ulf, you might consider adding your tree to linux-next if this is
> > going to be a common work flow for you guys.
> 
> That's done already. :-) There are patches which makes this visible in
> the MAINTAINERS as well, queued for 3.16.
> 
> git://git.linaro.org/people/ulf.hansson/mmc.git next
> 
> Though due to merge conflicts, during this release cycle, I didn't
> want to queue any patches besides for the mmci host driver.
> 
> >
> > It's partially up to Chris though, if he's OK with patches going into
> > your branch more or less being guaranteed to make it into his as well.
> >
> 
> Yes, we need to figure out a good work flow when using two separate
> trees. Thanks for bringing this up!

If you have any questions, please ask.  mvebu has been doing this for
several release cycles now, and I'm also doing it for irqchip now.

The biggest rule is that once you sign a tag and send a pull-request for
it, the branch is immutable up to and including that tag.

thx,

Jason.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/