MIME-Version: 1.0
In-Reply-To: <201202231431.44497.arnd@arndb.de>
References: <CAK=WgbZ2vfyiR0kXa4+-3y9etxQLBfD8b7QRR+r8VCpbOuBruA@mail.gmail.com>
 <201202231431.44497.arnd@arndb.de>
From: Ohad Ben-Cohen <ohad@wizery.com>
Date: Thu, 23 Feb 2012 16:54:41 +0200
Message-ID: <CAK=Wgbaa+kbYafudmwN9WHY2ezmt3UJdA2X9m4pQbfgb7EZV-w@mail.gmail.com>
Subject: Re: [GIT PULL] adding rpmsg and remoteproc to 3.4
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-kernel@vger.kernel.org,
        linux-arm <linux-arm-kernel@lists.infradead.org>,
        linux-omap@vger.kernel.org, "Grosen, Mark" <mgrosen@ti.com>,
        Brian Swetland <swetland@google.com>,
        Grant Likely <grant.likely@secretlab.ca>,
        Tony Lindgren <tony@atomide.com>,
        Rusty Russell <rusty@rustcorp.com.au>, Greg KH <greg@kroah.com>,
        akpm@linux-foundation.org, Stephen Boyd <sboyd@codeaurora.org>,
        Russell King <linux@arm.linux.org.uk>, "Shah, Bhavin" <bshah@ti.com>,
        Iliyan Malchev <malchev@google.com>, "Anna, Suman" <s-anna@ti.com>,
        "Guzman Lugo, Fernando" <fernando.lugo@ti.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Loic PALLARDY <loic.pallardy@stericsson.com>,
        Linus Walleij <linus.walleij@linaro.org>,
        Ludovic BARRE <ludovic.barre@stericsson.com>,
        Michal Simek <monstr@monstr.eu>, "Clark, Rob" <rob@ti.com>,
        John Williams <john.williams@petalogix.com>,
        Saravana Kannan <skannan@codeaurora.org>, arm@kernel.org
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 903
Lines: 19

On Thu, Feb 23, 2012 at 4:31 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> I've looked at the code again now and pulled it into the arm-soc
> tree as the next/rpmsg branch, queued for submission to Linus in
> the 3.4 merge window. There won't be any conflicts in linux-next
> because the commits are identical, ?so it doesn't matter whether
> you leave your branch in linux-next or now. ?If you have updates
> on top of this branch, I can apply them directly here.
>
> Let's see how things go after v3.4-rc1 ?before we decide whether
> you want to keep sending patches to arm-soc for v3.5 ?as well or
> whether you just use your own branch then.

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