Re: linux-next: manual merge of the edac-amd tree with the edac tree

2016-12-01 Thread Yazen Ghannam
On Thu, Dec 01, 2016 at 07:15:01PM +0100, Borislav Petkov wrote: > On Thu, Dec 01, 2016 at 11:02:04AM -0500, Yazen Ghannam wrote: > > A deferred error is an uncorrectable error whose handling can be > > deferred, i.e. it's not urgent. This affects the system behavior, but > > I'm now thinking that

Re: linux-next: manual merge of the edac-amd tree with the edac tree

2016-12-01 Thread Borislav Petkov
On Thu, Dec 01, 2016 at 11:02:04AM -0500, Yazen Ghannam wrote: > A deferred error is an uncorrectable error whose handling can be > deferred, i.e. it's not urgent. This affects the system behavior, but > I'm now thinking that this shouldn't affect users' behavior. I think it > would be simpler to j

Re: linux-next: manual merge of the edac-amd tree with the edac tree

2016-12-01 Thread Yazen Ghannam
On Thu, Dec 01, 2016 at 10:06:17AM -0200, Mauro Carvalho Chehab wrote: > > 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 th

Re: linux-next: manual merge of the edac-amd tree with the edac tree

2016-12-01 Thread Mauro Carvalho Chehab
Em Thu, 1 Dec 2016 11:48:46 +0100 Borislav Petkov 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

Re: linux-next: manual merge of the edac-amd tree with the edac tree

2016-12-01 Thread Borislav Petkov
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 but with that fixed, should

Re: linux-next: manual merge of the edac-amd tree with the edac tree

2016-11-30 Thread Mauro Carvalho Chehab
Em Mon, 28 Nov 2016 09:27:35 +0100 Borislav Petkov escreveu: > On Mon, Nov 28, 2016 at 02:37:26PM +1100, Stephen Rothwell wrote: > > Hi Borislav, > > > > Today's linux-next merge of the edac-amd tree got a conflict in: > > > > drivers/edac/edac_mc.c > > > > between commit: > > > > ef91afa

Re: linux-next: manual merge of the edac-amd tree with the edac tree

2016-11-28 Thread Borislav Petkov
On Mon, Nov 28, 2016 at 02:37:26PM +1100, Stephen Rothwell wrote: > Hi Borislav, > > Today's linux-next merge of the edac-amd tree got a conflict in: > > drivers/edac/edac_mc.c > > between commit: > > ef91afa61088 ("edac: move documentation from edac_mc.c to edac_core.h") > > from the edac

linux-next: manual merge of the edac-amd tree with the edac tree

2016-11-27 Thread Stephen Rothwell
Hi Borislav, Today's linux-next merge of the edac-amd tree got a conflict in: drivers/edac/edac_mc.c between commit: ef91afa61088 ("edac: move documentation from edac_mc.c to edac_core.h") from the edac tree and commit: c73e8833bec5 ("EDAC, mc: Fix locking around mc_devices list") from