linux-sg2042/drivers/of
David S. Miller d98cae64e4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/wireless/ath/ath9k/Kconfig
	drivers/net/xen-netback/netback.c
	net/batman-adv/bat_iv_ogm.c
	net/wireless/nl80211.c

The ath9k Kconfig conflict was a change of a Kconfig option name right
next to the deletion of another option.

The xen-netback conflict was overlapping changes involving the
handling of the notify list in xen_netbk_rx_action().

Batman conflict resolution provided by Antonio Quartulli, basically
keep everything in both conflict hunks.

The nl80211 conflict is a little more involved.  In 'net' we added a
dynamic memory allocation to nl80211_dump_wiphy() to fix a race that
Linus reported.  Meanwhile in 'net-next' the handlers were converted
to use pre and post doit handlers which use a flag to determine
whether to hold the RTNL mutex around the operation.

However, the dump handlers to not use this logic.  Instead they have
to explicitly do the locking.  There were apparent bugs in the
conversion of nl80211_dump_wiphy() in that we were not dropping the
RTNL mutex in all the return paths, and it seems we very much should
be doing so.  So I fixed that whilst handling the overlapping changes.

To simplify the initial returns, I take the RTNL mutex after we try
to allocate 'tb'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-06-19 16:49:39 -07:00
..
Kconfig of_i2c: sparc: Allow OF_I2C for sparc 2012-12-07 09:17:55 -08:00
Makefile GPIO driver changes for v3.5 merge window 2012-05-24 14:01:46 -07:00
address.c of: fix spelling mistake in comment 2013-01-09 11:36:38 +01:00
base.c of: Fix locking vs. interrupts 2013-06-13 22:12:14 +01:00
device.c of: Output devicetree alias names in uevent 2013-02-06 11:06:35 +00:00
fdt.c drivers/of/fdt.c: re-use kernel's kbasename() 2012-12-17 17:15:18 -08:00
irq.c of/irq: sparse fixes 2012-10-17 15:53:02 -05:00
of_i2c.c of_i2c: Honour "status=disabled" property of device 2012-11-29 17:28:08 +00:00
of_mdio.c net: of_mdio: fix behavior on missing phy device 2013-05-08 13:13:29 -07:00
of_mtd.c of: mtd: nuke useless const qualifier 2012-07-10 10:32:06 -05:00
of_net.c phy: add reverse MII PHY connection type 2013-05-31 17:19:05 -07:00
of_pci.c of: of_pci.c needs export.h since it uses EXPORT_SYMBOLS 2011-10-31 19:31:14 -04:00
of_pci_irq.c OF: PCI: const usage needed by MIPS 2012-05-21 14:31:48 +01:00
of_private.h of: Output devicetree alias names in uevent 2013-02-06 11:06:35 +00:00
pdt.c Fix build when CONFIG_W1_MASTER_GPIO=m b exporting "allnodes" 2012-11-30 10:04:06 +00:00
platform.c Revert "of: use platform_device_add" 2013-02-17 20:03:27 +00:00
selftest.c of: Create function for counting number of phandles in a property 2013-02-13 10:09:31 +00:00