Skip to content

More OF merge patches

Grant Likely linux-devicetree linuxppc-dev sparclinux 1 version In review

Get series with b4
b4 am 20091105073728.10460.6061.stgit@angua

Versions newest first

  1. v1 Latest11 patches 9 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/11of/flattree: merge find_flat_dt_string and initial_boot_paramsarch/microblaze/Kconfig arch/microblaze/kernel/prom.c arch/powerpc/Kconfig +5 more+32 -202 replies
2/11of/flattree: merge of_scan_flat_dtarch/microblaze/kernel/prom.c arch/powerpc/kernel/prom.c drivers/of/fdt.c+65 -1221 reply
3/11of/flattree: merge of_get_flat_dt_rootarch/microblaze/kernel/prom.c arch/powerpc/kernel/prom.c drivers/of/fdt.c+16 -240 replies
4/11of/flattree: remove __init annotations from the header fileinclude/linux/of_fdt.h+7 -90 replies
5/11of/flattree: merge of_get_flat_dt_proparch/microblaze/kernel/prom.c arch/powerpc/kernel/prom.c drivers/of/fdt.c+43 -841 reply
6/11of/flattree: Merge of_flat_dt_is_compatiblearch/microblaze/kernel/prom.c arch/powerpc/kernel/prom.c drivers/of/fdt.c+24 -380 replies
7/11of/flattree: Merge unflatten_dt_nodearch/microblaze/kernel/prom.c arch/powerpc/kernel/prom.c drivers/of/fdt.c +1 more+204 -3891 reply
8/11of/flattree: Merge unflatten_device_treearch/microblaze/include/asm/prom.h arch/microblaze/kernel/prom.c arch/powerpc/kernel/prom.c +3 more+55 -1040 replies
9/11of: merge prom_{add,remove,modify}_propertyarch/microblaze/kernel/prom.c arch/powerpc/kernel/prom.c drivers/of/base.c+116 -2272 replies
10/11of: remove special case definition of of_read_ulong()include/linux/of.h+2 -50 replies
11/11of/flattree: Merge early_init_dt_check_for_initrd()arch/microblaze/kernel/prom.c arch/powerpc/kernel/prom.c drivers/of/fdt.c +1 more+38 -620 replies

Reviews trailers per patch

None of the 11 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchWolfram SangMichal Simek
SeriesR-b T-b
1/11
2/11
3/11
4/11
5/11
6/11
7/11
8/11
9/11
10/11
11/11

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 00/11] More OF merge patches

Round 2. Here is my 2nd set of merging OF code between PowerPC and Microblaze (no SPARC changes this time). Compile tested on ppc, microblaze and sparc. Boot tested on MPC5200 powerpc platform.

I've also pushed this series out to the test-devicetree branch on my git server if anyone cares to pull and test:

git://git.secretlab.ca/git/linux-2.6 test-devicetree

This is based on the next-devicetree branch which contains the first round of patches and is being pulled into linux-next.

Cheers,
g.

---

Grant Likely (11):
of/flattree: Merge early_init_dt_check_for_initrd()
of: remove special case definition of of_read_ulong()
of: merge prom_{add,remove,modify}_property of/flattree: Merge unflatten_device_tree of/flattree: Merge unflatten_dt_node
of/flattree: Merge of_flat_dt_is_compatible of/flattree: merge of_get_flat_dt_prop
of/flattree: remove __init annotations from the header file of/flattree: merge of_get_flat_dt_root
of/flattree: merge of_scan_flat_dt
of/flattree: merge find_flat_dt_string and initial_boot_params

 arch/microblaze/Kconfig            |    1 
 arch/microblaze/include/asm/prom.h |    1 
 arch/microblaze/kernel/prom.c      |  531 ------------------------------------
 arch/powerpc/Kconfig               |    1 
 arch/powerpc/kernel/prom.c         |  534 ------------------------------------
 drivers/of/Kconfig                 |    4 
 drivers/of/Makefile                |    1 
 drivers/of/base.c                  |  116 ++++++++
 drivers/of/fdt.c                   |  458 +++++++++++++++++++++++++++++++
 include/linux/of.h                 |   10 -
 include/linux/of_fdt.h             |   21 +
 11 files changed, 598 insertions(+), 1080 deletions(-)
 create mode 100644 drivers/of/fdt.c