1*55e09902SWu XiangCheng.. include:: ../disclaimer-zh_CN.rst 2*55e09902SWu XiangCheng 3*55e09902SWu XiangCheng:Original: Documentation/maintainer/modifying-patches.rst 4*55e09902SWu XiangCheng 5*55e09902SWu XiangCheng:译者: 6*55e09902SWu XiangCheng 7*55e09902SWu XiangCheng 吴想成 Wu XiangCheng <bobwxc@email.cn> 8*55e09902SWu XiangCheng 9*55e09902SWu XiangCheng.. _modifyingpatches_zh: 10*55e09902SWu XiangCheng 11*55e09902SWu XiangCheng修改补丁 12*55e09902SWu XiangCheng======== 13*55e09902SWu XiangCheng 14*55e09902SWu XiangCheng如果你是子系统或者分支的维护者,由于代码在你的和提交者的树中并不完全相同, 15*55e09902SWu XiangCheng有时你需要稍微修改一下收到的补丁以合并它们。 16*55e09902SWu XiangCheng 17*55e09902SWu XiangCheng如果你严格遵守开发者来源证书的规则(c),你应该要求提交者重做,但这完全是会 18*55e09902SWu XiangCheng适得其反的时间、精力浪费。规则(b)允许你调整代码,但这样修改提交者的代码并 19*55e09902SWu XiangCheng让他背书你的错误是非常不礼貌的。为解决此问题,建议在你之前最后一个 20*55e09902SWu XiangChengSigned-off-by标签和你的之间添加一行,以指示更改的性质。这没有强制性要求,最 21*55e09902SWu XiangCheng好在描述前面加上你的邮件和/或姓名,用方括号括住整行,以明显指出你对最后一刻 22*55e09902SWu XiangCheng的更改负责。例如:: 23*55e09902SWu XiangCheng 24*55e09902SWu XiangCheng Signed-off-by: Random J Developer <random@developer.example.org> 25*55e09902SWu XiangCheng [lucky@maintainer.example.org: struct foo moved from foo.c to foo.h] 26*55e09902SWu XiangCheng Signed-off-by: Lucky K Maintainer <lucky@maintainer.example.org> 27*55e09902SWu XiangCheng 28*55e09902SWu XiangCheng如果您维护着一个稳定的分支,并希望同时明确贡献、跟踪更改、合并修复,并保护 29*55e09902SWu XiangCheng提交者免受责难,这种做法尤其有用。请注意,在任何情况下都不得更改作者的身份 30*55e09902SWu XiangCheng(From头),因为它会在变更日志中显示。 31*55e09902SWu XiangCheng 32*55e09902SWu XiangCheng向后移植(back-port)人员特别要注意:为了便于跟踪,请在提交消息的顶部(即主题行 33*55e09902SWu XiangCheng之后)插入补丁的来源,这是一种常见而有用的做法。例如,我们可以在3.x稳定版本 34*55e09902SWu XiangCheng中看到以下内容:: 35*55e09902SWu XiangCheng 36*55e09902SWu XiangCheng Date: Tue Oct 7 07:26:38 2014 -0400 37*55e09902SWu XiangCheng 38*55e09902SWu XiangCheng libata: Un-break ATA blacklist 39*55e09902SWu XiangCheng 40*55e09902SWu XiangCheng commit 1c40279960bcd7d52dbdf1d466b20d24b99176c8 upstream. 41*55e09902SWu XiangCheng 42*55e09902SWu XiangCheng下面是一个旧的内核在某补丁被向后移植后会出现的:: 43*55e09902SWu XiangCheng 44*55e09902SWu XiangCheng Date: Tue May 13 22:12:27 2008 +0200 45*55e09902SWu XiangCheng 46*55e09902SWu XiangCheng wireless, airo: waitbusy() won't delay 47*55e09902SWu XiangCheng 48*55e09902SWu XiangCheng [backport of 2.6 commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a] 49*55e09902SWu XiangCheng 50*55e09902SWu XiangCheng不管什么格式,这些信息都为人们跟踪你的树,以及试图解决你树中的错误的人提供了 51*55e09902SWu XiangCheng有价值的帮助。 52