From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Borislav Petkov <borislav.petkov@amd.com>
Subject: Re: linux-next: build failure after merge of the edac tree
Date: Tue, 01 Nov 2011 09:58:02 -0200 [thread overview]
Message-ID: <4EAFDECA.3040007@redhat.com> (raw)
In-Reply-To: <20111101170000.6e7301a30bc21e917631eb88@canb.auug.org.au>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Em 01-11-2011 04:00, Stephen Rothwell escreveu:
> Hi Mauro,
>
> After merging the edac tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> arch/x86/kernel/cpu/mcheck/mce.c:39:28: fatal error: linux/edac_mce.h: No such file or directory
>
> Caused by commit cdaf4f4e563c ("i7core_edac: Drop the edac_mce
> facility"). This commit removed the file include/linux/edac_mce.h which
> is still metioned by the above file (and MAINTAINERS). Grep is your
> friend.
Sorry, it were caused by a bad merge conflict resolution. The include
isn't need anymore.
The MAINTAINERS fix is indeed needed.
> I have used the version of the edac tree from next-20111025 for today.
I'm fixing both issues for tomorrow's next.
Thanks,
Mauro.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQIcBAEBAgAGBQJOr96/AAoJEGO08Bl/PELn/asQAIIqZ+yth5ZEka4FFAnuFOyI
Cez2u5rU5WKkxnlqn3lDjq5pBR5/uvVGqDvNFurTzGwFFqRb2SNDh4LL8m0nXJ8O
JF2zs7n6ZtO5h3KMy5j9PuDDQcwFf3FUB9WRY/4LvGINCqNit+inrdYcbSKB1NDD
M3nF63tdv4HmpsI/7iriKfeUwWYHoOkHYdXFoPRxGdSBabW0GpEtjMAtBw8E1DXG
1hdOTBnpOyH2m/XIsZwYav09BitdOH/OzoyRRDPvFVOuofvsOLPxAq649x4DCiTo
XBjMma9JyiiqXjKl2t7T16Vgvp0TSiB5i2LXfIZdMIjpWKvyoEVM6+E75woBgwyX
iEOKdRrvPIdO0lU7+rkrW0sKVKdZpmpJl0vAVYSApyxpS4yxeBsLxakzbI6RoCdC
IKSY8QbIe7mj5Mp4LmOxZ+kMXgdttSdeloVfOOQzEtMMLY6Gf5wiodz0uEy19ouX
iCE8KzZRVgcgop+reG/jqTNv0/RwGMbsOdiaog6PmVDZY8z3WVKkA7IS0tUHCT7E
oEY+MIaS/OmKhRXhzjAsdkghbKBruZS1ai+kZ5MOl7gkaN1mK0c2FFueda6oxxhV
4p00mEmL+jwyx8dIKEdOHMMnziRSOlU+8xQubAJLNDnimVJ0eHJXvKlHZIGaVQfp
1vMymFukiedpFWjKaU4J
=s7ei
-----END PGP SIGNATURE-----
next prev parent reply other threads:[~2011-11-01 11:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-01 6:00 linux-next: build failure after merge of the edac tree Stephen Rothwell
2011-11-01 11:58 ` Mauro Carvalho Chehab [this message]
2011-11-01 12:54 ` Borislav Petkov
2011-11-01 13:00 ` Mauro Carvalho Chehab
-- strict thread matches above, loose matches on Subject: below --
2024-02-27 2:43 Stephen Rothwell
2024-03-08 22:43 ` Yazen Ghannam
2024-03-09 9:46 ` Borislav Petkov
2024-03-11 13:06 ` Yazen Ghannam
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=4EAFDECA.3040007@redhat.com \
--to=mchehab@redhat.com \
--cc=borislav.petkov@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.