From: Borislav Petkov <bp@alien8•de>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Mauro Carvalho Chehab <mchehab@osg•samsung.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: manual merge of the edac-amd tree with the edac tree
Date: Mon, 28 Nov 2016 09:27:35 +0100 [thread overview]
Message-ID: <20161128082734.bdl4dhothemm7ja5@pd.tnic> (raw)
In-Reply-To: <20161128143726.7fda1849@canb.auug.org.au>
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 tree and commit:
>
> c73e8833bec5 ("EDAC, mc: Fix locking around mc_devices list")
>
> from the edac-amd tree.
>
> I fixed it up (see below - there may be more fixes needed in
> edac_core.h) and can carry the fix as necessary. This is now fixed as
> far as linux-next is concerned, but any non trivial conflicts should be
> mentioned to your upstream maintainer when your tree is submitted for
> merging. You may also want to consider cooperating with the maintainer
> of the conflicting tree to minimise any particularly complex conflicts.
Just one issue which has nothing to do with linux-next. There's still
that in ef91afa61088:
> +/**
> + * edac_mc_find: Search for a mem_ctl_info structure whose index is @idx.
> + *
> + * @idx: index to be seek
> + *
> + * If found, return a pointer to the structure.
> + * Else return NULL.
> + *
> + * Caller must hold mem_ctls_mutex.
> + */
That last sentence in the comment is not true anymore - edac_mc_find()
is grabbing the mutex itself as it should be. Mauro, please fix that in
your tree.
Thanks.
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.
next prev parent reply other threads:[~2016-11-28 8:27 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-28 3:37 linux-next: manual merge of the edac-amd tree with the edac tree Stephen Rothwell
2016-11-28 8:27 ` Borislav Petkov [this message]
2016-11-30 10:50 ` Mauro Carvalho Chehab
2016-12-01 10:48 ` Borislav Petkov
2016-12-01 12:06 ` Mauro Carvalho Chehab
2016-12-01 16:02 ` Yazen Ghannam
2016-12-01 18:15 ` Borislav Petkov
2016-12-01 19:57 ` Yazen Ghannam
2016-12-01 20:24 ` [PATCH] EDAC: Document HW_EVENT_ERR_DEFERRED type Yazen Ghannam
2016-12-01 20:27 ` Borislav Petkov
2016-12-01 21:36 ` Mauro Carvalho Chehab
2016-12-01 21:49 ` Borislav Petkov
2016-12-01 22:00 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161128082734.bdl4dhothemm7ja5@pd.tnic \
--to=bp@alien8$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@osg$(echo .)samsung.com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox