)]}'
{
  "commit": "ab54ee80aa7585f9666ff4dd665441d7ce41f1e8",
  "tree": "163b8839044b453877166608f03f904af2c813c1",
  "parents": [
    "9c79330d930b5774aed8eb323daebecedce2e245"
  ],
  "author": {
    "name": "Heiko Carstens",
    "email": "heiko.carstens@de.ibm.com",
    "time": "Fri Feb 08 00:19:11 2013 +0000"
  },
  "committer": {
    "name": "David S. Miller",
    "email": "davem@davemloft.net",
    "time": "Fri Feb 08 14:22:05 2013 -0500"
  },
  "message": "atm/iphase: rename fregt_t -\u003e ffreg_t\n\nWe have conflicting type qualifiers for \"freg_t\" in s390\u0027s ptrace.h and the\niphase atm device driver, which causes the compile error below.\nUnfortunately the s390 typedef can\u0027t be renamed, since it\u0027s a user visible api,\nnor can I change the include order in s390 code to avoid the conflict.\n\nSo simply rename the iphase typedef to a new name. Fixes this compile error:\n\nIn file included from drivers/atm/iphase.c:66:0:\ndrivers/atm/iphase.h:639:25: error: conflicting type qualifiers for \u0027freg_t\u0027\nIn file included from next/arch/s390/include/asm/ptrace.h:9:0,\n                 from next/arch/s390/include/asm/lowcore.h:12,\n                 from next/arch/s390/include/asm/thread_info.h:30,\n                 from include/linux/thread_info.h:54,\n                 from include/linux/preempt.h:9,\n                 from include/linux/spinlock.h:50,\n                 from include/linux/seqlock.h:29,\n                 from include/linux/time.h:5,\n                 from include/linux/stat.h:18,\n                 from include/linux/module.h:10,\n                 from drivers/atm/iphase.c:43:\nnext/arch/s390/include/uapi/asm/ptrace.h:197:3: note: previous declaration of \u0027freg_t\u0027 was here\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nAcked-by: chas williams - CONTRACTOR \u003cchas@cmf.nrl.navy.mil\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "6a0955e6d4fc92231e59d36e0849dd46c9e0e60b",
      "old_mode": 33188,
      "old_path": "drivers/atm/iphase.h",
      "new_id": "53ecac5a2161d729fc957b8b4379a526ca89e0d3",
      "new_mode": 33188,
      "new_path": "drivers/atm/iphase.h"
    }
  ]
}
