linux-kernel - linux-next: manual merge of the moduleh tree with the lt-mtd 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>] [day] [month] [year] [list]

Date:	Thu, 25 Aug 2011 15:23:21 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Gortmaker <paul.gortmaker@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Brian Norris <computersforpeace@...il.com>,
	Artem Bityutskiy <dedekind1@...il.com>
Subject: linux-next: manual merge of the moduleh tree with the lt-mtd tree

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
include/linux/mtd/mtd.h between commit 7f338a9bf785 ("mtd: style fixups
in multi-line comment, indentation") from the l2-mtd tree and commit
089f5643ba44 ("include: replace linux/module.h with "struct module"
wherever possible") from the moduleh tree.

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

diff --cc include/linux/mtd/mtd.h
index ff7bae0,af31170..0000000
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@@ -41,11 -40,11 +40,13 @@@
  
  #define MTD_FAIL_ADDR_UNKNOWN -1LL
  
+ struct module;
+ 
 -/* If the erase fails, fail_addr might indicate exactly which block failed.  If
 -   fail_addr = MTD_FAIL_ADDR_UNKNOWN, the failure was not at the device level or was not
 -   specific to any particular block. */
 +/*
 + * If the erase fails, fail_addr might indicate exactly which block failed. If
 + * fail_addr = MTD_FAIL_ADDR_UNKNOWN, the failure was not at the device level
 + * or was not specific to any particular block.
 + */
  struct erase_info {
  	struct mtd_info *mtd;
  	uint64_t addr;
--
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/