Em Thu, 1 Dec 2016 11:48:46 +0100 Borislav Petkov <bp@xxxxxxxxx> escreveu: > On Wed, Nov 30, 2016 at 08:50:13AM -0200, Mauro Carvalho Chehab wrote: > > Fixed. If you have a stable branch, I can rebase it on the top > > of your patches, in order to avoid the confict at linux-next. > > http://git.kernel.org/cgit/linux/kernel/git/bp/bp.git/log/?h=for-next Thanks! > but with that fixed, shouldn't the merge work without a conflict? Well, we're removing some lines from one file and adding them on another one. Git is not smart enough to solve such conflicts automatically: CONFLICT (content): Merge conflict in drivers/edac/edac_mc.c Recorded preimage for 'drivers/edac/edac_mc.c' Automatic merge failed; fix conflicts and then commit the result. Anyway, I rebased my work on the top of your branch. The conflict is now gone: https://git.kernel.org/cgit/linux/kernel/git/mchehab/linux-edac.git/log/?h=linux_next You can see the generated documentation at: https://mchehab.fedorapeople.org/kernel_docs/admin-guide/ras.html (user and admin guide) and: https://mchehab.fedorapeople.org/kernel_docs/driver-api/edac.html (kernel API) However, rebasing over your tree showed a new documentation gap: ./include/linux/edac.h:144: warning: Enum value 'HW_EVENT_ERR_DEFERRED' not described in enum 'hw_event_mc_err_type' With was introduced by this commit: commit d12a969ebbfcfc25853c4147d42b388f758e8784 Author: Yazen Ghannam <Yazen.Ghannam@xxxxxxx> Date: Thu Nov 17 17:57:32 2016 -0500 EDAC, amd64: Add Deferred Error type Currently, deferred errors are classified as correctable in EDAC. Add a new error type for deferred errors so that they are correctly reported to the user. Signed-off-by: Yazen Ghannam <Yazen.Ghannam@xxxxxxx> Cc: Aravind Gopalakrishnan <aravindksg.lkml@xxxxxxxxx> Cc: linux-edac <linux-edac@xxxxxxxxxxxxxxx> Link: http://lkml.kernel.org/r/1479423463-8536-7-git-send-email-Yazen.Ghannam@xxxxxxx Signed-off-by: Borislav Petkov <bp@xxxxxxx> Yazen introduced a "deferred error" code (whatever it means), but didn't document what's that. Unfortunately, the patch description is also not clear enough about what a "deferred error" means or how userspace is supposed to handle it. Yazen, Could you please send us a patch adding a proper description for this new error code? Thanks! Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
