)]}'
{
  "commit": "7d731019218e49a9811f6d0adec4b1cfcb752bed",
  "tree": "a90bf478f8fe36543ba586db5fa2760ba129a180",
  "parents": [
    "62aa2b537c6f5957afd98e29f96897419ed5ebab"
  ],
  "author": {
    "name": "Artem Bityutskiy",
    "email": "artem.bityutskiy@linux.intel.com",
    "time": "Wed Feb 01 11:10:24 2012 -0800"
  },
  "committer": {
    "name": "Linus Torvalds",
    "email": "torvalds@linux-foundation.org",
    "time": "Wed Feb 01 11:10:24 2012 -0800"
  },
  "message": "mtd: fix merge conflict resolution breakage\n\nThis patch fixes merge conflict resolution breakage introduced by merge\nd3712b9dfcf4 (\"Merge tag \u0027for-linus\u0027 of git://github.com/prasad-joshi/logfs_upstream\").\n\nThe commit changed \u0027mtd_can_have_bb()\u0027 function and made it always\nreturn zero, which is incorrect.  Instead, we need it to return whether\nthe underlying flash device can have bad eraseblocks or not.  UBI needs\nthis information because it affects how it handles the underlying flash.\nE.g., if the underlying flash is NOR, it cannot have bad blocks and any\nwrite or erase error is fatal, and all we can do is to switch to R/O\nmode.  We do not need to reserve a pool of good eraseblocks for bad\neraseblocks handling, and so on.\n\nThis patch also removes \u0027mtd_can_have_bb()\u0027 invocations from Logfs to\nensure correct Logfs behavior.\n\nI\u0027ve tested that with this patch UBI works on top of NOR and NAND\nflashes emulated by mtdram and nandsim correspondingly.\n\nThis patch is based on patch from Linus Torvalds.\n\nSigned-off-by: Artem Bityutskiy \u003cartem.bityutskiy@linux.intel.com\u003e\nAcked-by: Jörn Engel \u003cjoern@logfs.org\u003e\nAcked-by: Prasad Joshi \u003cprasadjoshi.linux@gmail.com\u003e\nAcked-by: Brian Norris \u003ccomputersforpeace@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "e97404d611e0abf4f627d6c080aea0c0739422f0",
      "old_mode": 33188,
      "old_path": "fs/logfs/dev_mtd.c",
      "new_id": "9c501449450dc9be6891e5d9c1a035ca31b5687b",
      "new_mode": 33188,
      "new_path": "fs/logfs/dev_mtd.c"
    },
    {
      "type": "modify",
      "old_id": "221295208fd0bf18fd4302955558be0a3f4f05e9",
      "old_mode": 33188,
      "old_path": "include/linux/mtd/mtd.h",
      "new_id": "887ebe318c75e1d9b5a2cc14ec9dddfd1eca7b8a",
      "new_mode": 33188,
      "new_path": "include/linux/mtd/mtd.h"
    }
  ]
}