linux-kernel - Re: linux-next: manual merge of the kmap

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]

Message-ID: <1328851607.12308.5.camel@cr0>
Date:	Fri, 10 Feb 2012 13:26:47 +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,
	Evgeniy Polyakov <zbr@...emap.net>
Subject: Re: linux-next: manual merge of the kmap_atomic tree with Linus'
 tree

On Fri, 2012-02-10 at 16:17 +1100, Stephen Rothwell wrote:
> Hi Cong,
> 
> Today's linux-next merge of the kmap_atomic tree got a conflict in
> drivers/staging/pohmelfs/inode.c between commit 67435319866f ("staging:
> pohmelfs: remove drivers/staging/pohmelfs") from Linus' tree and commit
> 709bc0d6b5c6 ("pohmelfs: remove the second argument of k[un]map_atomic
> ()") from the kmap_atomic tree.
> 
> The former removes the file, so I did that.

Ok, I will drop that commit.

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/