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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 426 bytes --]

Hi Borislav,

Today's linux-next merge of the edac-amd tree got a conflict in:

  drivers/edac/mce_amd_inj.c

between commits from Linus' tree and the same commits plus more from
the edac-amd tree.

I just dropped the edac-amd tree for today as it seems that it was just
rebased and a few commits dropped before Linus was asked to merge it.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Borislav Petkov]

Hi Stephen,

On Fri, Jun 26, 2015 at 05:08:39PM +1000, Stephen Rothwell wrote:
> Hi Borislav,
> 
> Today's linux-next merge of the edac-amd tree got a conflict in:
> 
>   drivers/edac/mce_amd_inj.c
> 
> between commits from Linus' tree and the same commits plus more from
> the edac-amd tree.
> 
> I just dropped the edac-amd tree for today as it seems that it was just
> rebased and a few commits dropped before Linus was asked to merge it.

yes, that's the right thing to do. If there's anything I should do to
let you know when to start merging it again, please let me know.

Thanks.

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 484 bytes --]

Hi Borislav,

On Fri, 26 Jun 2015 09:27:23 +0200 Borislav Petkov <bp@alien8.de> wrote:
> 
> yes, that's the right thing to do. If there's anything I should do to
> let you know when to start merging it again, please let me know.

I just fetch it every morning, so if you just want to set your for-next
branch to somewhere in Linus' tree (so it is effectively empty), then
that would be easiest for me.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Borislav Petkov]

On Fri, Jun 26, 2015 at 06:22:56PM +1000, Stephen Rothwell wrote:
> I just fetch it every morning, so if you just want to set your for-next
> branch to somewhere in Linus' tree (so it is effectively empty), then
> that would be easiest for me.

Done :-)

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 461 bytes --]

Hi Borislav,

On Fri, 26 Jun 2015 10:34:50 +0200 Borislav Petkov <bp@alien8.de> wrote:
>
> On Fri, Jun 26, 2015 at 06:22:56PM +1000, Stephen Rothwell wrote:
> > I just fetch it every morning, so if you just want to set your for-next
> > branch to somewhere in Linus' tree (so it is effectively empty), then
> > that would be easiest for me.
> 
> Done :-)

Excellent, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 542 bytes --]

Hi Borislav,

Today's linux-next merge of the edac-amd tree got a conflict in
drivers/edac/amd64_edac.c between commit
126b67b8d26f6623d199aa59279f2e3243f2144c ("amd64_edac: fix ECC checking")
from Linus' tree and commit 793a2a12b43aba669c8b2604a45f000a394f142d
("amd64_edac: cleanup amd64_check_ecc_enabled") from the edac-amd tree.

I don't think the fix in the former patch is required, so I just used the
latter version.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

[Borislav Petkov]

Hi Stephen,

On Wed, Aug 05, 2009 at 03:09:33PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the edac-amd tree got a conflict in
> drivers/edac/amd64_edac.c between commit
> 126b67b8d26f6623d199aa59279f2e3243f2144c ("amd64_edac: fix ECC checking")
> from Linus' tree and commit 793a2a12b43aba669c8b2604a45f000a394f142d
> ("amd64_edac: cleanup amd64_check_ecc_enabled") from the edac-amd tree.
> 
> I don't think the fix in the former patch is required, so I just used the
> latter version.

thanks and yes, you're right. The former patch is less intrusive
and we opted for that one since it is really late in the -rc cycle
but the latter cleans up stuff so that code flow becomes much more
understandable. I'll rediff later and sorry for the inconvenience.

By the way, I see that you're merging edac-amd before tip and I'm going
to need to rebase my tree against tip in the next couple of days since
it depends on a bunch of stuff in it, so could you please switch the
merge order of the two trees so that edac-amd goes after tip?

Thanks.

> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/



-- 
Regards/Gruss,
    Boris.