Linus Torvalds
0c46d68d19
Merge branch 'core-mutexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip ...
Pull WW mutex support from Ingo Molnar:
"This tree adds support for wound/wait style locks, which the graphics
guys would like to make use of in the TTM graphics subsystem.
Wound/wait mutexes are used when other multiple lock acquisitions of a
similar type can be done in an arbitrary order. The deadlock handling
used here is called wait/wound in the RDBMS literature: The older
tasks waits until it can acquire the contended lock. The younger
tasks needs to back off and drop all the locks it is currently
holding, ie the younger task is wounded.
See this LWN.net description of W/W mutexes:
https://lwn.net/Articles/548909/
The comments there outline specific usecases for this facility (which
have already been implemented for the DRM tree).
Also see Documentation/ww-mutex-design.txt for more details"
* 'core-mutexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking-selftests: Handle unexpected failures more strictly
mutex: Add more w/w tests to test EDEADLK path handling
mutex: Add more tests to lib/locking-selftest.c
mutex: Add w/w tests to lib/locking-selftest.c
mutex: Add w/w mutex slowpath debugging
mutex: Add support for wound/wait style locks
arch: Make __mutex_fastpath_lock_retval return whether fastpath succeeded or not
2013-07-02 16:09:13 -07:00
bcma: add more core IDs
2013-05-17 14:31:05 -04:00
libceph: use slab cache for osd client requests
2013-05-02 11:58:41 -05:00
Merge tag 'zynq-clk-for-3.11' of git://git.xilinx.com/linux-xlnx into next/soc
2013-06-07 18:21:51 -07:00
iio:common: Removed stuff macros, added num_data_channels on st_sensors struct and added support on one-shot sysfs reads to 3 byte channel
2013-06-05 18:41:23 +01:00
For 3.10 we have a few new MFD drivers for:
2013-05-05 17:36:20 -07:00
ARM SoC specific changes
2013-07-02 13:43:38 -07:00
net/mlx4: Strengthen VLAN tags/priorities enforcement in VST mode
2013-05-11 16:12:44 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2013-05-06 15:41:42 -07:00
- Lots of cleanups from Artem, including deletion of some obsolete drivers
2013-05-09 10:15:46 -07:00
netfilter: ipset: set match: add support to match the counters
2013-04-29 20:09:03 +02:00
pinctrl: generic: Fix typos and clarify comments
2013-05-14 13:40:45 +02:00
ARM SoC driver specific changes
2013-07-02 14:33:21 -07:00
ab8500_bmdata: Export abx500_res_to_temp tables for hwmon
2013-04-16 17:38:10 -07:00
Merge remote-tracking branch 'regulator/topic/max8952' into v3.9-rc8
2013-04-28 02:13:43 +01:00
Merge remote-tracking branch 'spi/fix/grant' into spi-linus
2013-05-13 18:27:18 +04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2013-04-23 14:09:39 -04:00
Merge branch 'nfs-for-next' of git://linux-nfs.org/~trondmy/nfs-2.6 into for-3.10
2013-04-29 16:23:34 -04:00
ARM SoC specific changes
2013-07-02 13:43:38 -07:00
Power management and ACPI updates for 3.10-rc1
2013-04-30 15:21:02 -07:00
dma: acpi-dma: parse CSRT to extract additional resources
2013-05-14 10:23:57 +05:30
aerdrv: Move cper_print_aer() call out of interrupt context
2013-05-30 10:51:20 -07:00
aio: kill ki_retry
2013-05-07 19:46:02 -07:00
drivers: bus: add ARM CCI support
2013-05-29 15:50:34 -04:00
audit: Make testing for a valid loginuid explicit.
2013-05-07 22:27:15 -04:00
new helper: read_code()
2013-04-29 15:40:23 -04:00
Merge branch 'for-3.10/core' of git://git.kernel.dk/linux-block
2013-05-08 10:13:35 -07:00
Merge branch 'for-3.10/core' of git://git.kernel.dk/linux-block
2013-05-08 10:13:35 -07:00
Revert "block: add missing block_bio_complete() tracepoint"
2013-04-18 09:00:26 -07:00
mm, nobootmem: clean-up of free_low_memory_core_early()
2013-04-29 15:54:39 -07:00
broadcom: add include guards to include/linux/brcmphy.h
2013-05-15 14:42:15 -07:00
mm: change invalidatepage prototype to accept length
2013-05-21 23:17:23 -04:00
cgroup: fix a subtle bug in descendant pre-order walk
2013-05-24 10:50:24 +09:00
mm: cleancache: clean up cleancache_enabled
2013-04-30 17:04:01 -07:00
Power management and ACPI updates for 3.10-rc1
2013-04-30 15:21:02 -07:00
ARM: arm-soc cleanup for 3.10
2013-05-02 09:03:55 -07:00
unify compat fanotify_mark(2), switch to COMPAT_SYSCALL_DEFINE
2013-05-09 13:46:38 -04:00
gcc4: disable __compiletime_object_size for GCC 4.6+
2013-04-29 18:28:13 -07:00
vt: delete unneeded function unregister_con_driver
2013-05-20 12:27:59 -07:00
kvm: Move guest entry/exit APIs to context_tracking
2013-05-31 11:32:30 +02:00
CPU hotplug: provide a generic helper to disable/enable CPU hotplug
2013-06-12 16:29:44 -07:00
thermal: cpu_cooling: improve line breaking
2013-04-27 09:25:59 +08:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2013-05-11 15:23:17 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
lib, net: make isodigit() public and use it
2013-04-29 18:28:19 -07:00
debug_locks.h: make warning more verbose
2013-04-29 15:54:27 -07:00
debugfs: add get/set for atomic types
2013-06-03 13:55:01 -07:00
dm: document iterate_devices
2013-05-10 14:37:17 +01:00
driver core: device.h: fix doc compilation warnings
2013-06-25 21:20:41 -07:00
dma-buf: Add debugfs support
2013-05-01 16:36:22 +05:30
Merge branch 'topic/of' into for-linus
2013-05-02 21:52:26 +05:30
dump_stack: implement arch-specific hardware description in task dumps
2013-04-30 17:04:02 -07:00
clocksource: dw_apb_timer_of: use clocksource_of_init
2013-06-12 13:47:38 +02:00
efi, pstore: Read data from variable store before memcpy()
2013-04-30 16:03:10 +01:00
aio: remove retry-based AIO
2013-05-07 18:38:27 -07:00
fat: restructure export_operations
2013-04-29 18:28:40 -07:00
f2fs: align data types between on-disk and in-memory block addresses
2013-05-28 15:03:04 +09:00
don't bother with deferred freeing of fdtables
2013-05-01 17:31:42 -04:00
sock_diag: fix filter code sent to userspace
2013-06-10 22:23:32 -07:00
firmware loader: don't export cache_firmware and uncache_firmware
2013-06-06 12:41:57 -07:00
FMC: add needed headers
2013-06-17 16:38:57 -07:00
fmc: avoid readl/writel namespace conflict
2013-06-19 20:30:32 -07:00
frontswap: get rid of swap_lock dependency
2013-04-30 17:04:00 -07:00
Lots of bug fixes, cleanups and optimizations. In the bug fixes
2013-07-02 09:39:34 -07:00
FS-Cache: The retrieval remaining-pages counter needs to be atomic_t
2013-06-19 14:16:47 +01:00
inotify: convert inotify_add_to_idr() to use idr_alloc_cyclic()
2013-04-29 18:28:41 -07:00
ftrace, kprobes: Fix a deadlock on ftrace_regex_lock
2013-05-09 20:10:22 -04:00
tracing: Modify soft-mode only if there's no other referrer
2013-05-09 20:14:25 -04:00
genalloc: add devres support, allow to find a managed pool by device
2013-04-29 18:28:13 -07:00
Convert selectors of GENERIC_GPIO to GPIOLIB
2013-04-16 18:47:14 +09:00
HID: debug: break out hid_dump_report() into hid-debug
2013-04-30 10:09:06 +02:00
HID: debug: fix RCU preemption issue
2013-05-06 13:07:33 +02:00
mm: thp: add split tail pages to shrink page list in page reclaim
2013-04-29 15:54:38 -07:00
futex: Take hugepages into account when generating futex_key
2013-06-25 23:11:19 +02:00
Drivers: hv: Add the GUID fot synthetic fibre channel device
2013-06-03 14:09:14 -07:00
ipv6: Kill ipv6 dependency of icmpv6_send().
2013-04-29 13:54:36 -04:00
Merge branch 'for-3.10/drivers' of git://git.kernel.dk/linux-block
2013-05-08 11:51:05 -07:00
mac80211: parse VHT channel switch IEs
2013-04-16 15:29:45 +02:00
net: core: move mac_pton() to lib/net_utils.c
2013-06-05 12:00:27 -07:00
team: fix checks in team_get_first_port_txable_rcu()
2013-06-12 00:56:27 -07:00
net: vlan: fix comment for vlan_ethhdr->h_vlan_proto
2013-06-19 23:16:50 -07:00
Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu', 'core' and 'arm/tegra' into next
2013-05-02 12:10:19 +02:00
resource: add release_mem_region_adjustable()
2013-04-29 15:54:37 -07:00
ipc: sysv shared memory limited to 8TiB
2013-05-01 08:12:58 -07:00
FMC: add needed headers
2013-06-17 16:38:57 -07:00
irqchip: Add irqchip_init dummy function
2013-06-06 10:23:58 +09:00
jbd/jbd2: relocate bit_spinlock header to jbd_common
2013-06-12 23:02:35 -04:00
jbd2: invalidate handle if jbd2_journal_restart() fails
2013-07-01 08:12:41 -04:00
jbd/jbd2: relocate bit_spinlock header to jbd_common
2013-06-12 23:02:35 -04:00
jbd,jbd2: fix oops in jbd2_journal_put_journal_head()
2013-05-13 09:45:01 -04:00
proc: Split kcore bits from linux/procfs.h into linux/kcore.h
2013-04-29 15:42:02 -04:00
net: core: move mac_pton() to lib/net_utils.c
2013-06-05 12:00:27 -07:00
x86, kdump: Retore crashkernel= to allocate under 896M
2013-04-17 12:35:33 -07:00
kmod: remove call_usermodehelper_fns()
2013-04-30 17:04:06 -07:00
Merge branch 'queue' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-05-16 07:55:07 -07:00
kthread: implement probe_kthread_data()
2013-04-30 17:04:02 -07:00
net: socket: move ktime2ts to ktime header api
2013-04-19 16:39:13 -04:00
kvm: Move guest entry/exit APIs to context_tracking
2013-05-31 11:32:30 +02:00
We get rid of the general module prefix confusion with a binary config option,
2013-05-05 10:58:06 -07:00
list: introduce list_first_entry_or_null
2013-05-31 17:31:52 -07:00
include/linux/math64.h: add div64_ul()
2013-06-12 16:29:47 -07:00
arm: mach-mv78xx0: convert to use the mvebu-mbus driver
2013-04-15 14:06:39 +00:00
memory hotplug: fix warnings
2013-04-30 17:04:00 -07:00
mm, hotplug: avoid compiling memory hotremove functions when disabled
2013-04-29 15:54:37 -07:00
mm: change invalidatepage prototype to accept length
2013-05-21 23:17:23 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-04-30 09:36:50 -07:00
PCI: Remove "extern" from function declarations
2013-04-23 09:50:30 -06:00
mutex: Add support for wound/wait style locks
2013-06-26 12:10:56 +02:00
mutex: Add w/w mutex slowpath debugging
2013-06-26 12:10:56 +02:00
net: rename random32 to prandom
2013-04-29 18:28:44 -07:00
net: Restore NETIF_F_* bit ordering.
2013-05-02 07:34:58 -07:00
net: fix kernel deadlock with interface rename and netdev name retrieval.
2013-06-26 13:42:54 -07:00
netfilter: add nf_ipv6_ops hook to fix xt_addrtype with IPv6
2013-05-23 11:58:55 +02:00
netlink: implement memory mapped recvmsg()
2013-04-19 14:57:58 -04:00
netpoll: convert mutex into a semaphore
2013-05-01 15:00:24 -04:00
NFSv4: Convert nfs41_free_stateid to use an asynchronous RPC call
2013-05-06 17:24:22 -04:00
include/linux/memory.h: implement register_hotmemory_notifier()
2013-04-29 15:54:36 -07:00
nubus: Kill nubus_proc_detach_device()
2013-05-04 14:47:26 -04:00
NVMe: Simplify Firmware Activate code slightly
2013-05-08 09:55:05 -04:00
ARM: arm-soc: late cleanups
2013-05-07 11:22:14 -07:00
of/pci: Provide support for parsing PCI DT ranges property
2013-05-19 20:29:55 +00:00
dma:of: Use a mutex to protect the of_dma_list
2013-05-02 21:50:38 +05:30
of/pci: Add of_pci_parse_bus_range() function
2013-05-19 20:30:10 +00:00
mailbox/omap: move the OMAP mailbox framework to drivers
2013-06-11 11:41:51 -05:00
vm: adjust ifdef for TINY_RCU
2013-04-29 15:54:28 -07:00
ata: arasan: remove the need for platform_data
2013-04-19 22:25:51 +02:00
PCI: acpiphp: Re-enumerate devices when host bridge receives Bus Check
2013-05-17 14:12:06 -06:00
PCI: Remove "extern" from function declarations
2013-04-17 10:21:17 -06:00
PCI: Remove "extern" from function declarations
2013-04-17 10:21:17 -06:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-05-01 14:08:52 -07:00
PCI: Remove "extern" from function declarations
2013-04-17 10:21:17 -06:00
[SCSI] bnx2fc: Include chip number in the symbolic name
2013-05-02 07:32:24 -07:00
PCI: Remove "extern" from function declarations
2013-04-17 10:21:17 -06:00
perf: Fix perf mmap bugs
2013-05-28 11:05:08 +02:00
aio: don't include aio.h in sched.h
2013-05-07 20:16:25 -07:00
platform_device: use a macro instead of platform_driver_register
2013-06-03 13:59:03 -07:00
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
power_supply: Populate supplied_from hierarchy from the device tree
2013-04-16 18:51:16 -07:00
tracing/context-tracking: Add preempt_schedule_context() for tracing
2013-06-19 12:55:10 +02:00
Add include dependencies to <linux/printk.h>.
2013-05-22 01:34:24 +02:00
proc: Move non-public stuff from linux/proc_fs.h to fs/proc/internal.h
2013-05-01 17:29:47 -04:00
proc: Split the namespace stuff out into linux/proc_ns.h
2013-05-01 17:29:39 -04:00
mm/shmem.c: remove an ifdef
2013-04-29 15:54:28 -07:00
remove unused random32() and srandom32()
2013-05-07 18:38:27 -07:00
rcu: Add _notrace variation of rcu_dereference_raw() and hlist_for_each_entry_rcu()
2013-05-28 22:47:13 -04:00
net: force a reload of first item in hlist_nulls_for_each_entry_rcu
2013-06-02 20:53:59 -07:00
rcu: Add _notrace variation of rcu_dereference_raw() and hlist_for_each_entry_rcu()
2013-05-28 22:47:13 -04:00
kernel/relay.c: move FIX_SIZE macro into relay.c
2013-04-30 17:04:09 -07:00
Merge branch 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2013-04-29 19:14:20 -07:00
rapidio: add enumeration/discovery start from user space
2013-05-24 16:22:50 -07:00
rapidio: make enumeration/discovery configurable
2013-05-24 16:22:50 -07:00
drivers/rtc/class.c: use struct device as the first argument for devm_rtc_device_register()
2013-04-29 18:28:22 -07:00
scatterlist: sg_set_buf() argument must be in linear mapping
2013-05-30 09:20:20 +02:00
Merge git://git.infradead.org/users/eparis/audit
2013-05-11 14:29:11 -07:00
FMC: add needed headers
2013-06-17 16:38:57 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2013-04-30 16:27:51 -07:00
serial: Move "uart_console" def to core header file.
2013-05-20 11:47:21 -07:00
serial: sh-sci: HSCIF support
2013-06-17 18:09:53 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
gre: fix a possible skb leak
2013-06-25 16:07:44 -07:00
slab: Return NULL for oversized allocations
2013-05-06 09:24:16 +03:00
smp.h: Use local_irq_{save,restore}() in !SMP version of on_each_cpu().
2013-06-14 19:24:42 -10:00
sock_diag: allow to dump bpf filters
2013-04-29 13:21:30 -04:00
net: Unbreak compat_sys_{send,recv}msg
2013-06-06 11:52:14 -07:00
splice: don't pass the address of ->f_pos to methods
2013-06-20 19:02:45 +04:00
lib/string_helpers: introduce generic string_unescape
2013-04-30 17:04:03 -07:00
sudmac: add support for SUDMAC
2013-04-30 15:50:12 +05:30
mm: thp: add split tail pages to shrink page list in page reclaim
2013-04-29 15:54:38 -07:00
mm: migration: add migrate_entry_wait_huge()
2013-06-12 16:29:46 -07:00
x86, kdump: Set crashkernel_low automatically
2013-04-17 12:35:32 -07:00
kmsg: honor dmesg_restrict sysctl on /dev/kmsg
2013-06-12 16:29:44 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2013-05-09 09:40:49 -07:00
nohz: Re-evaluate the tick for the new task after a context switch
2013-04-22 20:29:07 +02:00
time: Revert ALWAYS_USE_PERSISTENT_CLOCK compile time optimizaitons
2013-05-14 20:54:06 +02:00
hwrng: timeriomem - update to support more than one device
2013-04-25 21:01:45 +08:00
trace: Allow idle-safe tracepoints to be called from irq
2013-06-10 13:37:10 -07:00
n_tty: Encapsulate minimum_to_wake within N_TTY
2013-06-17 12:55:11 -07:00
n_tty: Encapsulate minimum_to_wake within N_TTY
2013-06-17 12:55:11 -07:00
mfd: ucb1400: Pass ucb1400-gpio data through ac97 bus
2013-04-19 00:40:07 +02:00
Move utf16 functions to kernel core and rename
2013-04-15 21:23:03 +01:00
Hoist memcpy_fromiovec/memcpy_toiovec into lib/
2013-05-20 10:24:22 +09:30
usb: add usb2 Link PM variables to sysfs and usb_device
2013-06-05 16:48:40 -07:00
Lots of virtio work which wasn't quite ready for last merge window. Plus
2013-05-02 14:14:04 -07:00
kexec, vmalloc: export additional vmalloc layer information
2013-04-29 15:54:34 -07:00
memcg: add memory.pressure_level events
2013-04-29 15:54:38 -07:00
mm: remove CONFIG_HOTPLUG ifdefs
2013-04-29 15:54:37 -07:00
Merge 3.10-rc3 into tty-next
2013-05-27 10:57:53 +09:00
vtime: Use consistent clocks among nohz accounting
2013-05-31 11:31:50 +02:00
FS-Cache patches 2013-07-02
2013-07-02 09:52:47 -07:00
workqueue: include workqueue info when printing debug dump of a worker task
2013-04-30 17:04:02 -07:00
sync: don't block the flusher thread waiting on IO
2013-07-02 09:16:42 -07:00
