Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

Pull device tree bug fixes and maintainership updates from Grant Likely:
"This branch contains a couple of minor bug fixes and documentation
additions, but the bulk of it are several changes to the MAINTAINERS
file regarding the subsystems I've been involved with"

* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
of/irq: init struct resource to 0 in of_irq_to_resource()
of/irq: Avoid calling list_first_entry() for empty list
of: add vendor prefixes for hisilicon
of: add vendor prefix for Qualcomm Atheros, Inc.
MAINTAINERS: Fix incorrect status tag
MAINTAINERS: Refactor device tree maintainership
MAINTAINERS: Change device tree mailing list
MAINTAINERS: Remove Grant Likely

+24 -14
+2
Documentation/devicetree/bindings/vendor-prefixes.txt
··· 26 26 fsl Freescale Semiconductor 27 27 GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc. 28 28 gef GE Fanuc Intelligent Platforms Embedded Systems, Inc. 29 + hisilicon Hisilicon Limited. 29 30 hp Hewlett Packard 30 31 ibm International Business Machines (IBM) 31 32 idt Integrated Device Technologies, Inc. ··· 44 43 onnn ON Semiconductor Corp. 45 44 picochip Picochip Ltd 46 45 powervr PowerVR (deprecated, use img) 46 + qca Qualcomm Atheros, Inc. 47 47 qcom Qualcomm, Inc. 48 48 ralink Mediatek/Ralink Technology Corp. 49 49 ramtron Ramtron International
+18 -12
MAINTAINERS
··· 3622 3622 F: include/uapi/linux/gigaset_dev.h 3623 3623 3624 3624 GPIO SUBSYSTEM 3625 - M: Grant Likely <grant.likely@linaro.org> 3626 3625 M: Linus Walleij <linus.walleij@linaro.org> 3627 3626 S: Maintained 3628 3627 L: linux-gpio@vger.kernel.org 3629 - T: git git://git.secretlab.ca/git/linux-2.6.git 3630 3628 F: Documentation/gpio.txt 3631 3629 F: drivers/gpio/ 3632 3630 F: include/linux/gpio* ··· 4470 4472 4471 4473 IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY) 4472 4474 M: Benjamin Herrenschmidt <benh@kernel.crashing.org> 4473 - M: Grant Likely <grant.likely@linaro.org> 4474 - T: git git://git.secretlab.ca/git/linux-2.6.git irqdomain/next 4475 4475 S: Maintained 4476 4476 F: Documentation/IRQ-domain.txt 4477 4477 F: include/linux/irqdomain.h ··· 4986 4990 4987 4991 LINUX FOR POWERPC EMBEDDED XILINX VIRTEX 4988 4992 L: linuxppc-dev@lists.ozlabs.org 4989 - S: Unmaintained 4993 + S: Orphan 4990 4994 F: arch/powerpc/*/*virtex* 4991 4995 F: arch/powerpc/*/*/*virtex* 4992 4996 ··· 5882 5886 M: Benoît Cousson <b-cousson@ti.com> 5883 5887 M: Tony Lindgren <tony@atomide.com> 5884 5888 L: linux-omap@vger.kernel.org 5885 - L: devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers) 5889 + L: devicetree@vger.kernel.org 5886 5890 S: Maintained 5887 5891 F: arch/arm/boot/dts/*omap* 5888 5892 F: arch/arm/boot/dts/*am3* ··· 6046 6050 OPEN FIRMWARE AND FLATTENED DEVICE TREE 6047 6051 M: Grant Likely <grant.likely@linaro.org> 6048 6052 M: Rob Herring <rob.herring@calxeda.com> 6049 - L: devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers) 6053 + L: devicetree@vger.kernel.org 6050 6054 W: http://fdt.secretlab.ca 6051 6055 T: git git://git.secretlab.ca/git/linux-2.6.git 6052 6056 S: Maintained 6053 - F: Documentation/devicetree 6054 - F: drivers/of 6057 + F: drivers/of/ 6055 6058 F: include/linux/of*.h 6056 - F: scripts/dtc 6059 + F: scripts/dtc/ 6057 6060 K: of_get_property 6058 6061 K: of_match_table 6062 + 6063 + OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS 6064 + M: Rob Herring <rob.herring@calxeda.com> 6065 + M: Pawel Moll <pawel.moll@arm.com> 6066 + M: Mark Rutland <mark.rutland@arm.com> 6067 + M: Stephen Warren <swarren@wwwdotorg.org> 6068 + M: Ian Campbell <ian.campbell@citrix.com> 6069 + L: devicetree@vger.kernel.org 6070 + S: Maintained 6071 + F: Documentation/devicetree/ 6072 + F: arch/*/boot/dts/ 6073 + F: include/dt-bindings/ 6059 6074 6060 6075 OPENRISC ARCHITECTURE 6061 6076 M: Jonas Bonn <jonas@southpole.se> ··· 7753 7746 7754 7747 SPI SUBSYSTEM 7755 7748 M: Mark Brown <broonie@kernel.org> 7756 - M: Grant Likely <grant.likely@linaro.org> 7757 7749 L: linux-spi@vger.kernel.org 7758 7750 T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git 7759 7751 Q: http://patchwork.kernel.org/project/spi-devel-general/list/ ··· 9294 9288 F: drivers/net/ethernet/xilinx/xilinx_axienet* 9295 9289 9296 9290 XILINX SYSTEMACE DRIVER 9297 - S: Unmaintained 9291 + S: Orphan 9298 9292 F: drivers/block/xsysace.c 9299 9293 9300 9294 XILINX UARTLITE SERIAL DRIVER
+4 -2
drivers/of/irq.c
··· 345 345 if (r && irq) { 346 346 const char *name = NULL; 347 347 348 + memset(r, 0, sizeof(*r)); 348 349 /* 349 350 * Get optional "interrupts-names" property to add a name 350 351 * to the resource. ··· 483 482 } 484 483 485 484 /* Get the next pending parent that might have children */ 486 - desc = list_first_entry(&intc_parent_list, typeof(*desc), list); 487 - if (list_empty(&intc_parent_list) || !desc) { 485 + desc = list_first_entry_or_null(&intc_parent_list, 486 + typeof(*desc), list); 487 + if (!desc) { 488 488 pr_err("of_irq_init: children remain, but no parents\n"); 489 489 break; 490 490 }