)]}' { "commit": "81302defe34faec239c28cdac3a99a3dbbf64427", "tree": "e314cb0e6b1e136509a6a03bdf80e69614d95017", "parents": [ "f1fb3449efd5c49b48e35746bc7283eb9c73e3a0", "229641a6f1f09e27a1f12fba38980f33f4c92975" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Apr 01 19:45:11 2013 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Apr 01 19:45:11 2013 -0700" }, "message": "Merge branch \u0027wq/for-3.10\u0027 into block/for-3.10/core\n\nwq/for-3.10 includes v3.9-rc5 which contains a md raid5 change which\nconflicts with a commit in block/for-3.10/core. The two conflicting\ncommits are\n\n e3620a3ad5 (\"MD RAID5: Avoid accessing gendisk or queue structs when not available\")\n 2f6db2a707 (\"raid5: use bio_reset()\")\n\nThe conflict is trivial. The former removes \"if ()\" conditional above\ntrace_block_bio_remap() and the latter removes rbi-\u003ebi_next clearing\nright above that. We simply need to remove both \"if ()\" and\nrbi-\u003ebi_next clearing.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n", "tree_diff": [] }