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]
Date:	Thu, 23 Feb 2012 14:31:44 +0000
From:	Arnd Bergmann <arnd@...db.de>
To:	"Ohad Ben-Cohen" <ohad@...ery.com>
Cc:	linux-kernel@...r.kernel.org,
	"linux-arm" <linux-arm-kernel@...ts.infradead.org>,
	linux-omap@...r.kernel.org, "Grosen, Mark" <mgrosen@...com>,
	Brian Swetland <swetland@...gle.com>,
	Grant Likely <grant.likely@...retlab.ca>,
	Tony Lindgren <tony@...mide.com>,
	Rusty Russell <rusty@...tcorp.com.au>,
	Greg KH <greg@...ah.com>, akpm@...ux-foundation.org,
	Stephen Boyd <sboyd@...eaurora.org>,
	Russell King <linux@....linux.org.uk>,
	"Shah, Bhavin" <bshah@...com>, Iliyan Malchev <malchev@...gle.com>,
	"Anna, Suman" <s-anna@...com>,
	"Guzman Lugo, Fernando" <fernando.lugo@...com>,
	Stephen Rothwell <sfr@...b.auug.org.au>,
	Loic PALLARDY <loic.pallardy@...ricsson.com>,
	Linus Walleij <linus.walleij@...aro.org>,
	Ludovic BARRE <ludovic.barre@...ricsson.com>,
	Michal Simek <monstr@...str.eu>, "Clark, Rob" <rob@...com>,
	John Williams <john.williams@...alogix.com>,
	Saravana Kannan <skannan@...eaurora.org>, arm@...nel.org
Subject: Re: [GIT PULL] adding rpmsg and remoteproc to 3.4

On Wednesday 22 February 2012, Ohad Ben-Cohen wrote:
> 
> Hi Arnd,
> 
> Please pull:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git rpmsg-for-3.4
> 
> To get the very basic rpmsg+remoteproc core functionality for 3.4.
> 
> This is basically the same stuff I sent for 3.3, with an additional
> fix and cleanup which were reported by Grant (and of course the two
> patches that fixed the 3.3 merge conflicts).
> 
> This entire patch set has been sitting in linux-next for quite some
> time. I'm not sure if it'd conflict with your tree when you pull it,
> but I can of course ask Stephen to remove my tree if things look ok to
> you.

Hi Ohad,

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.

	Arnd
--
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/

Powered by blists - more mailing lists