linux-kernel - 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20120131142747.a2dd139403833a50939dbd17@canb.auug.org.au>
Date:	Tue, 31 Jan 2012 14:27:47 +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,
	Greg Kroah-Hartman <gregkh@...e.de>
Subject: linux-next: manual merge of the kmap_atomic tree with the
 staging.current tree

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.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped