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
..
ABI
- Lots of cleanups from Artem, including deletion of some obsolete drivers
2013-05-09 10:15:46 -07:00
accounting
acpi
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2013-05-09 09:46:45 -07:00
aoe
arm
ARM: platform specific firmware interfaces for 3.10
2013-05-04 12:33:36 -07:00
arm64
auxdisplay
backlight
backlight: lp855x: remove duplicate platform data
2013-04-29 18:28:19 -07:00
blackfin
block
Documentation: cfq-iosched: update documentation help for cfq tunables
2013-04-09 14:57:06 +02:00
blockdev
nbd: update documentation and link to mailinglist
2013-02-27 19:10:22 -08:00
bus-devices
cdrom
cgroups
mm, memcg: add rss_huge stat to memory.stat
2013-05-07 18:38:26 -07:00
connector
console
cpu-freq
Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-05-05 13:23:27 -07:00
cpuidle
cpuidle: make a single register function for all
2013-04-23 13:45:22 +02:00
cris
crypto
development-process
device-mapper
DM RAID: Add message/status support for changing sync action
2013-04-24 11:42:43 +10:00
devicetree
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-06-19 16:49:39 -07:00
DocBook
cfg80211/mac80211: use cfg80211 wdev mutex in mac80211
2013-05-25 00:02:16 +02:00
driver-model
dvb
early-userspace
EDID
drm: Add 1600x1200 (UXGA) screen resolution to the built-in EDIDs
2013-04-12 14:06:16 +10:00
extcon
fault-injection
fb
filesystems
xfs: disable noattr2/attr2 mount options for CRC enabled filesystems
2013-06-06 10:51:34 -05:00
firmware_class
frv
hid
hwmon
hwmon: (lm75) Add support for the Dallas/Maxim DS7505
2013-05-04 14:49:36 +02:00
i2c
i2c: Fix my e-mail address in drivers and documentation
2013-03-22 11:18:34 +01:00
i2o
ia64
Fix example error_injection_tool
2013-04-02 09:39:55 -07:00
ide
infiniband
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-03-11 07:49:37 -07:00
ioctl
USB: cdc-wdm: implement IOCTL_WDM_MAX_COMMAND
2013-03-25 13:32:20 -07:00
isdn
ja_JP
kbuild
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2013-05-07 07:59:19 -07:00
kdump
Add size restriction to the kdump documentation
2013-04-02 09:40:03 -07:00
ko_KR
laptops
leds
leds: lp55xx: configure the clock detection
2013-04-01 11:04:53 -07:00
m68k
block: remove refs to XD disks from documentation
2013-05-17 15:17:12 +02:00
make
memory-devices
metag
metag: Basic documentation
2013-03-02 20:09:50 +00:00
mips
misc-devices
mei: bus: Add device enabling and disabling API
2013-04-08 16:57:15 -07:00
mmc
mmc: core: Add in support to expose PRV for v4 MMCs
2013-03-22 12:10:42 -04:00
mn10300
mtd
namespaces
netlabel
networking
net: add doc for ip_early_demux sysctl
2013-06-12 15:10:13 -07:00
nfc
parisc
PCI
pcmcia
power
PM / hibernate: Correct documentation
2013-05-14 01:58:43 +02:00
powerpc
powerpc/tm: Fix userspace stack corruption on signal delivery for active transactions
2013-06-01 08:29:23 +10:00
pps
prctl
pti
ptp
rapidio
rapidio: documentation update for enumeration changes
2013-05-24 16:22:50 -07:00
RCU
Merge commit ' 8700c95adb' into timers/nohz
2013-05-02 17:54:19 +02:00
s390
s390/cio: add condev keyword to cio_ignore
2013-05-02 15:50:20 +02:00
scheduler
scsi
[SCSI] qla2xxx: Update copyright dates information in LICENSE.qla2xxx file.
2013-04-06 11:31:30 +01:00
security
Smack: add support for modification of existing rules
2013-03-19 14:16:42 -07:00
serial
sh
sound
ASoC: Updates for v3.10
2013-04-15 19:45:16 +02:00
spi
sysctl
tipc: change socket buffer overflow control to respect sk_rcvbuf
2013-06-17 15:53:00 -07:00
target
thermal
Thermal: update documentation for thermal_zone_device_register
2013-04-27 09:16:04 +08:00
timers
nohz_full: Add documentation.
2013-04-27 16:41:43 -07:00
trace
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-04-30 09:36:50 -07:00
usb
USB: remove CONFIG_USB_SUSPEND from Documentation
2013-03-28 14:45:56 -07:00
vDSO
video4linux
[media] v4l2: Add a V4L2 driver for SI476X MFD
2013-04-18 21:20:34 -03:00
virtual
Merge tag 'kvm-3.10-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2013-05-05 14:47:31 -07:00
vm
mm: limit growth of 3% hardcoded other user reserve
2013-04-29 15:54:36 -07:00
w1
w1: w1_therm: Add force-pullup option for "broken" sensors
2013-02-18 13:55:24 -08:00
watchdog
watchdog: core: dt: add support for the timeout-sec dt property
2013-03-01 12:48:36 +01:00
wimax
x86
Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-04-30 08:35:20 -07:00
xtensa
xtensa: document MMUv3 setup sequence
2013-05-09 01:07:09 -07:00
zh_CN
gpio: update gpio Chinese documentation
2013-04-16 18:47:22 +09:00
.gitignore
00-INDEX
ImgTec Meta architecture changes for v3.9-rc1
2013-03-03 12:06:09 -08:00
applying-patches.txt
atomic_ops.txt
bad_memory.txt
basic_profiling.txt
bcache.txt
bcache: clarify free/available/unused space
2013-05-15 00:42:52 -07:00
binfmt_misc.txt
braille-console.txt
bt8xxgpio.txt
btmrvl.txt
BUG-HUNTING
bus-virt-phys-mapping.txt
cachetlb.txt
Changes
circular-buffers.txt
clk.txt
clk: add clk_ignore_unused option to keep boot clocks on
2013-04-27 23:03:43 -07:00
coccinelle.txt
Coccinelle: Add support to the SPFLAGS variable
2013-04-08 15:42:03 +02:00
CodingStyle
cpu-hotplug.txt
cpu-load.txt
cputopology.txt
crc32.txt
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt
devices.txt
block: remove refs to XD disks from documentation
2013-05-17 15:17:12 +02:00
digsig.txt
DMA-API-HOWTO.txt
Documentation/DMA-API-HOWTO.txt: fix typo
2013-02-27 19:10:23 -08:00
DMA-API.txt
DMA-attributes.txt
dma-buf-sharing.txt
dma-buf: replace dma_buf_export() with dma_buf_export_named()
2013-05-01 16:35:36 +05:30
DMA-ISA-LPC.txt
dmaengine.txt
dmatest.txt
dmatest: do not allow to interrupt ongoing tests
2013-06-08 02:13:44 +05:30
dontdiff
dynamic-debug-howto.txt
edac.txt
eisa.txt
email-clients.txt
flexible-arrays.txt
futex-requeue-pi.txt
gcov.txt
gpio.txt
Remove GENERIC_GPIO config option
2013-04-16 18:47:19 +09:00
highuid.txt
HOWTO
hw_random.txt
hwrng: Fix a wrong comment in Documentation/hw_random.txt
2013-03-10 18:16:36 +08:00
hwspinlock.txt
init.txt
initrd.txt
Intel-IOMMU.txt
intel_txt.txt
io-mapping.txt
io_ordering.txt
iostats.txt
iostats.txt: add easy-to-find description for field 6
2013-04-29 15:18:50 +02:00
IPMI.txt
ipmi: add options to disable openfirmware and PCI scanning
2013-02-27 19:10:21 -08:00
IRQ-affinity.txt
IRQ-domain.txt
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt
kernel-docs.txt
kernel-parameters.txt
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2013-06-12 16:42:39 -07:00
kernel-per-CPU-kthreads.txt
kthread: Document ways of reducing OS jitter due to per-CPU kthreads
2013-04-27 16:52:47 -07:00
kmemcheck.txt
kmemleak.txt
kobject.txt
kprobes.txt
kref.txt
ldm.txt
local_ops.txt
lockdep-design.txt
lockstat.txt
locking/stat: Fix a typo
2013-02-19 08:42:37 +01:00
lockup-watchdogs.txt
logo.gif
logo.txt
magic-number.txt
Makefile
ManagementStyle
md.txt
MD: Fix typos in MD documentation
2013-04-24 11:42:42 +10:00
media-framework.txt
memory-barriers.txt
memory-hotplug.txt
mono.txt
mutex-design.txt
nommu-mmap.txt
numastat.txt
oops-tracing.txt
padata.txt
parport-lowlevel.txt
parport.txt
percpu-rw-semaphore.txt
pi-futex.txt
pinctrl.txt
pinctrl: document the "GPIO mode" pitfall
2013-03-18 11:03:29 +01:00
pnp.txt
preempt-locking.txt
printk-formats.txt
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-04-30 13:47:37 -07:00
pwm.txt
ramoops.txt
rbtree.txt
remoteproc.txt
rfkill.txt
robust-futex-ABI.txt
robust-futexes.txt
rpmsg.txt
rt-mutex-design.txt
rt-mutex.txt
rtc.txt
SAK.txt
SecurityBugs
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
SM501.txt
smsc_ece1099.txt
sparse.txt
spinlocks.txt
stable_api_nonsense.txt
stable_kernel_rules.txt
static-keys.txt
SubmitChecklist
SubmittingDrivers
SubmittingPatches
checkpatch: add Suggested-by as a standard signature
2013-04-29 18:28:20 -07:00
svga.txt
sysfs-rules.txt
sysrq.txt
Documentation/sysrq: fix inconstistent help message of sysrq key
2013-04-30 17:04:10 -07:00
this_cpu_ops.txt
percpu: add documentation on this_cpu operations
2013-04-04 10:24:53 -07:00
unaligned-memory-access.txt
unicode.txt
unshare.txt
vfio.txt
VGA-softcursor.txt
vgaarbiter.txt
video-output.txt
vme_api.txt
volatile-considered-harmful.txt
workqueue.txt
xz.txt
zorro.txt