)]}'
{
  "commit": "65c64ce8ee642eb330a4c4d94b664725f2902b44",
  "tree": "c4ad98c2a7f839f3b968fae6eddeec8b5752ce49",
  "parents": [
    "7d6c429b263c2f735f3df8c282cc77a8659e5d74"
  ],
  "author": {
    "name": "Glauber Costa",
    "email": "glommer@parallels.com",
    "time": "Thu Dec 22 01:02:27 2011 +0000"
  },
  "committer": {
    "name": "David S. Miller",
    "email": "davem@davemloft.net",
    "time": "Thu Dec 22 22:37:18 2011 -0500"
  },
  "message": "Partial revert \"Basic kernel memory functionality for the Memory Controller\"\n\nThis reverts commit e5671dfae59b165e2adfd4dfbdeab11ac8db5bda.\n\nAfter a follow up discussion with Michal, it was agreed it would\nbe better to leave the kmem controller with just the tcp files,\ndeferring the behavior of the other general memory.kmem.* files\nfor a later time, when more caches are controlled. This is because\ngeneric kmem files are not used by tcp accounting and it is\nnot clear how other slab caches would fit into the scheme.\n\nWe are reverting the original commit so we can track the reference.\nPart of the patch is kept, because it was used by the later tcp\ncode. Conflicts are shown in the bottom. init/Kconfig is removed from\nthe revert entirely.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCC: Kirill A. Shutemov \u003ckirill@shutemov.name\u003e\nCC: Paul Menage \u003cpaul@paulmenage.org\u003e\nCC: Greg Thelen \u003cgthelen@google.com\u003e\nCC: Johannes Weiner \u003cjweiner@redhat.com\u003e\nCC: David S. Miller \u003cdavem@davemloft.net\u003e\n\nConflicts:\n\n\tDocumentation/cgroups/memory.txt\n\tmm/memcontrol.c\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "6922b6cb58e3a032e4b214afed16da63772e2f32",
      "old_mode": 33188,
      "old_path": "Documentation/cgroups/memory.txt",
      "new_id": "4d8774f6f48abd7aaf59e48335a1d0b9415832cd",
      "new_mode": 33188,
      "new_path": "Documentation/cgroups/memory.txt"
    },
    {
      "type": "modify",
      "old_id": "7266202fa7cf4f26147833cced4362cb302e72c0",
      "old_mode": 33188,
      "old_path": "mm/memcontrol.c",
      "new_id": "8cdc9156455c05bfd776d8269d2eed11dba1fd25",
      "new_mode": 33188,
      "new_path": "mm/memcontrol.c"
    }
  ]
}
