The following changes since commit 317ddd256b9c24b0d78fa8018f80f1e495481a10:
Linux 3.10-rc5 (2013-06-08 17:41:04 -0700)
are available in the git repository at:
git://git.secretlab.ca/git/linux tags/devicetree-for-linus
for you to fetch changes up to 706b78f37fbed8d81b6061359f28a315fb9b1d73:
dtc: ensure #line directives don't consume data from the next line
(2013-06-13 22:12:15 +0100)
----------------------------------------------------------------
Device tree bug fixes to v3.10-rc5
This branch contains the following bug fixes:
- Fix locking vs. interrupts. Bug caught by lockdep checks
- Fix parsing of cpp #line directive output by dtc
- Fix 'make clean' for dtc temporary files.
There is also a commit that regenerates the dtc lexer and parser files
with Bison 2.5. The only purpose of this commit is to separate the
functional change in the dtc bug fix from the code generation change
caused by a different Bison version.
----------------------------------------------------------------
Benjamin Herrenschmidt (1):
of: Fix locking vs. interrupts
Grant Likely (2):
dtc: Update generated files to output from Bison 2.5
dtc: ensure #line directives don't consume data from the next line
Ian Campbell (1):
kbuild: make sure we clean up DTB temporary files
arch/sparc/kernel/prom_common.c | 5 +-
drivers/of/base.c | 15 +-
scripts/Makefile.lib | 8 +-
scripts/dtc/dtc-lexer.l | 2 +-
scripts/dtc/dtc-lexer.lex.c_shipped | 232 ++++++------
scripts/dtc/dtc-parser.tab.c_shipped | 715 +++++++++++++++++++----------------
scripts/dtc/dtc-parser.tab.h_shipped | 14 +-
7 files changed, 521 insertions(+), 470 deletions(-)
On Thu, 2013-06-13 at 23:22 +0100, Grant Likely wrote:
> Grant Likely (2):
> dtc: Update generated files to output from Bison 2.5
> dtc: ensure #line directives don't consume data from the next
Question. Are those fixes also in the upstream dtc from jdl ? Or have we
effectively forked it ?
Cheers,
Ben.
On 06/13/2013 04:52 PM, Benjamin Herrenschmidt wrote:
> On Thu, 2013-06-13 at 23:22 +0100, Grant Likely wrote:
>> Grant Likely (2):
>> dtc: Update generated files to output from Bison 2.5
>> dtc: ensure #line directives don't consume data from the next
>
> Question. Are those fixes also in the upstream dtc from jdl ? Or have we
> effectively forked it ?
Patch 1 just edits generated files which don't exist upstream (the
kernel checks them in, but upstream relies on the user running Bison/...
as part of make).
Patch 2 is a cherry-pick from upstream (plus regenerating some
difference generated files)
On Thu, Jun 13, 2013 at 11:52 PM, Benjamin Herrenschmidt
<[email protected]> wrote:
> On Thu, 2013-06-13 at 23:22 +0100, Grant Likely wrote:
>> Grant Likely (2):
>> dtc: Update generated files to output from Bison 2.5
>> dtc: ensure #line directives don't consume data from the next
>
> Question. Are those fixes also in the upstream dtc from jdl ? Or have we
> effectively forked it ?
cherry picked from dtc. In v3.11 we'll need a full resync from jdl.
g.