linux-kernel - linux-next: manual merge of the staging 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: <20110210163527.3b2cc580.sfr@canb.auug.org.au>
Date:	Thu, 10 Feb 2011 16:35:27 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Nitin Gupta <ngupta@...are.org>,
	Robert Jennings <rcj@...ux.vnet.ibm.com>
Subject: linux-next: manual merge of the staging tree with the
 staging.current tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/zram/zram_drv.c between commit
5414e557fca545614ceedc3d3496f747457e2e3b ("staging: zram: fix data
corruption issue") from the staging.current tree and commit
2787f959d6c5fb258d964218ac75346019f49ee9 ("zram: Return zero'd pages on
new reads") from the staging tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/staging/zram/zram_drv.c
index 4bd8cbd,1017d6d..0000000
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@@ -235,8 -237,7 +238,8 @@@ static void zram_read(struct zram *zram
  		if (unlikely(!zram->table[index].page)) {
  			pr_debug("Read before write: sector=%lu, size=%u",
  				(ulong)(bio->bi_sector), bio->bi_size);
- 			/* Do nothing */
+ 			handle_zero_page(page);
 +			index++;
  			continue;
  		}
  
--
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/