linux-kernel - Re: Please submit platform trees for inclusion in arm-soc.git v3.1

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: <alpine.LFD.2.00.1107111815340.14596@xanadu.home>
Date:	Mon, 11 Jul 2011 18:17:30 -0400 (EDT)
From:	Nicolas Pitre <nicolas.pitre@...aro.org>
To:	Arnd Bergmann <arnd@...db.de>
cc:	Kevin Hilman <khilman@...com>, Russell King <rmk@....linux.org.uk>,
	Thomas Gleixner <tglx@...utronix.de>,
	linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org
Subject: Re: Please submit platform trees for inclusion in arm-soc.git v3.1

On Mon, 11 Jul 2011, Arnd Bergmann wrote:

> On Friday 08 July 2011, Kevin Hilman wrote:
> > > Time is running out for the current cycle, so any changes that you
> > > want to see merged in linux-3.1 through the arm-soc tree should be
> > > submitted in form of pull-requests very soon.
> > 
> > [...]
> > 
> > It looks like your "remove rmk/for-next" commit may not have been
> > totally complete.
> > 
> > Trying to merge your master branch and Russell's current for-next branch
> > still results in conflicts in files that should only be touched in
> > Russell's branch (specifically, these seem related to changes in
> > Russell's 'suspend' branch that is included in his 'for-next' branch.)
> 
> Yes, that's my fault for not fixing this up correctly after initially
> doing the incorrect pull.
> 
> I guess I'll throw away the current master branch and generate a new
> one. After discussing this with Russell, I think it's best to treat
> the master branch as temporary anyway unless Nicolas or Thomas come up
> with a good reason against doing this.

No objections.  However, to avoid confusion, I'd suggest getting rid of 
the branch called "master" entirely and call it something else.


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