linux-kernel - Re: linux-next: manual merge of the samsung tree with the arm 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20100301093922.GA16639@flint.arm.linux.org.uk>
Date:	Mon, 1 Mar 2010 09:39:22 +0000
From:	Russell King <rmk+lkml@....linux.org.uk>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Ben Dooks <ben-linux@...ff.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Tony Lindgren <tony@...mide.com>,
	Kukjin Kim <kgene.kim@...sung.com>,
	Adityapratap Sharma <aditya.ps@...sung.com>,
	Atul Dahiya <atul.dahiya@...sung.com>
Subject: Re: linux-next: manual merge of the samsung tree with the arm tree

On Thu, Feb 25, 2010 at 10:48:19AM +1100, Stephen Rothwell wrote:
> Hi Ben,
> 
> Today's linux-next merge of the samsung tree got a conflict in
> arch/arm/mach-s5p6442/include/mach/debug-macro.S between commit
> 4e6d488af37980d224cbf298224db6173673f362 ("ARM: 5910/1: ARM: Add tmp
> register for addruart and loadsp") from the arm tree and commit
> 5f7f6a4a0df9b43051d57fdb8ea96c083247a08f ("ARM: S5P6442: Add Samsung
> S5P6442 CPU support") from the samsung tree.

You're getting this because I've dropped the branch containing all the
trees I'd merged over the last 3 months from the branch(es) you pull.

The PXA folk decided to rebase their tree and send Linus some of their
original commits independently of their previous pull - and their tree
was the first to be merged.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
--
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/