Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753620Ab0D1DY2 (ORCPT ); Tue, 27 Apr 2010 23:24:28 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:43703 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752939Ab0D1DY0 (ORCPT ); Tue, 27 Apr 2010 23:24:26 -0400 Date: Wed, 28 Apr 2010 13:24:23 +1000 From: Stephen Rothwell To: Jens Axboe Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ben Hutchings , Artem Bityutskiy , David Woodhouse , =?UTF-8?B?IkrDtnJuIEVuZ2VsIg==?= Subject: linux-next: manual merge of the block tree with the mtd tree Message-Id: <20100428132423.0cb8bd44.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.0; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2257 Lines: 67 Hi Jens, Today's linux-next merge of the block tree got a conflict in drivers/mtd/mtdcore.c between commit b520e412faaaad35641aeedd6059179f9f1b393c ("mtd: Replace static array of devices with an idr structure") from the mtd tree and commit a33eb6b91034c95b9b08576f68be170f995b2c7d ("Move mtd_bdi_*mappable to mtdcore.c") from the block tree. Just overlapping additions. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/mtd/mtdcore.c index 3c48193,b177e75..0000000 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@@ -16,13 -19,39 +19,41 @@@ #include #include #include +#include +#include + #include #include - #include "internal.h" #include "mtdcore.h" + /* + * backing device capabilities for non-mappable devices (such as NAND flash) + * - permits private mappings, copies are taken of the data + */ + struct backing_dev_info mtd_bdi_unmappable = { + .capabilities = BDI_CAP_MAP_COPY, + }; + + /* + * backing device capabilities for R/O mappable devices (such as ROM) + * - permits private mappings, copies are taken of the data + * - permits non-writable shared mappings + */ + struct backing_dev_info mtd_bdi_ro_mappable = { + .capabilities = (BDI_CAP_MAP_COPY | BDI_CAP_MAP_DIRECT | + BDI_CAP_EXEC_MAP | BDI_CAP_READ_MAP), + }; + + /* + * backing device capabilities for writable mappable devices (such as RAM) + * - permits private mappings, copies are taken of the data + * - permits non-writable shared mappings + */ + struct backing_dev_info mtd_bdi_rw_mappable = { + .capabilities = (BDI_CAP_MAP_COPY | BDI_CAP_MAP_DIRECT | + BDI_CAP_EXEC_MAP | BDI_CAP_READ_MAP | + BDI_CAP_WRITE_MAP), + }; static int mtd_cls_suspend(struct device *dev, pm_message_t state); static int mtd_cls_resume(struct device *dev); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/