linux-kernel - Re: linux-next: manual merge of the kmap_atomic tree with the staging.current 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]

Date:	Tue, 31 Jan 2012 11:39:32 +0800
From:	Cong Wang <amwang@...hat.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Greg Kroah-Hartman <gregkh@...e.de>
Subject: Re: linux-next: manual merge of the kmap_atomic tree with the
 staging.current tree

On Tue, 2012-01-31 at 14:27 +1100, Stephen Rothwell wrote:
> Hi Cong,
> 
> Today's linux-next merge of the kmap_atomic tree got a conflict in
> drivers/staging/gma500/mmu.c between commit 344bc24c2947 ("staging:
> delete gma500 driver") from the staging.current tree and commit
> cb422c115787 ("gma500: remove the second argument of k[un]map_atomic()")
> from the kmap_atomic tree.
> 
> The former removes this file (as the driver has migrated out of staging),
> so I did that.
> 

Ok for me. Probably I need to remove that commit from my tree.

Thanks!

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