Messages in this thread | ![/](/images/icornerl.gif) | | Date | Thu, 25 Aug 2011 15:23:21 +1000 | From | Stephen Rothwell <> | 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@canb.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;
| ![\](/images/icornerr.gif) |