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

Message-Id: <20120106184055.3669727def69e424cd98690d@canb.auug.org.au>
Date:	Fri, 6 Jan 2012 18:40:55 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Cong Wang <amwang@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Haiyang Zhang <haiyangz@...rosoft.com>,
	"K. Y. Srinivasan" <kys@...rosoft.com>, Greg KH <greg@...ah.com>
Subject: linux-next: manual merge of the kmap_atomic tree with the staging
 tree

Hi Cong,

Today's linux-next merge of the kmap_atomic tree got conflicts in
drivers/net/hyperv/netvsc_drv.c and drivers/net/hyperv/rndis_filter.c
between commit 453263421f88 ("net/hyperv: Remove unnecessary kmap_atomic
in netvsc driver") from the staging tree and commit e91cd643d15d ("hv:
remove the second argument of k[un]map_atomic()") from the kmap_atomic
tree.

The former removed the code modified by the latter, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped