linux-kernel - Re: linux-next: manual merge of the i.MX tree with the arm-soc tree

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] [day] [month] [year] [list]

Date:	Sun, 11 Sep 2011 13:34:10 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Uwe Kleine-König 
	<u.kleine-koenig@...gutronix.de>
Cc:	Sascha Hauer <s.hauer@...gutronix.de>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Fabio Estevam <fabio.estevam@...escale.com>,
	Arnd Bergmann <arnd@...db.de>,
	"Arnaud Patard (Rtp)" <arnaud.patard@...-net.org>
Subject: Re: linux-next: manual merge of the i.MX tree with the arm-soc tree

Hi Uwe,

On Fri, 9 Sep 2011 08:40:58 +0200 Uwe Kleine-König <u.kleine-koenig@...gutronix.de> wrote:
>
> Do you prefer that conflicts like these are resolved before you get
> them?
> (I.e. I could have done
> 
> 	git merge -s ours $somecommitfromthearmsoctree
> 
> but I wasn't sure that this is a good idea and so decided to wait until
> you write a mail about the conflict.)

No, these small conflicts are not a problem, so just leave them to me and
Arnd or Linus.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped