Linus Torvalds
6f51ee709e
ARM: SoC/iommu configuration for 3.19 ...
The iomm-config branch contains work from Will Deacon, quoting his description:
This series adds automatic IOMMU and DMA-mapping configuration for
OF-based DMA masters described using the generic IOMMU devicetree
bindings. Although there is plenty of future work around splitting up
iommu_ops, adding default IOMMU domains and sorting out automatic IOMMU
group creation for the platform_bus, this is already useful enough for
people to port over their IOMMU drivers and start using the new probing
infrastructure (indeed, Marek has patches queued for the Exynos IOMMU).
The branch touches core ARM and IOMMU driver files, and the respective
maintainers (Russell King and Joerg Roedel) agreed to have the contents
merged through the arm-soc tree. The final version was ready just before
the merge window, so we ended up delaying it a bit longer than the rest,
but we don't expect to see regressions because this is just additional
infrastructure that will get used in drivers starting in 3.20 but is
unused so far.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIVAwUAVJCfoGCrR//JCVInAQIfvxAAhVeEKyhroIGiuCmylWK/TdXja+xO46g+
hkrijO0cPB5C7K45AW2a2aCUM0jSjr81dUprQ/uojr3xXxnJ59t7tDAXpKpFy8xi
5gb/wd/Cea90RtR1mUnNr/+P1sJKemcvmhCuib7111E5wd/s617bLd1+zgCuHguj
g733GjDE7SUSTEStviDg963pn+l2IartjhRPhAKmGWiLZA7RiWe35pzDTZGCApnd
yfZafXxn4IeUcxQUT6lAsW7xShzCUI2CZ8nZ4tG6YcyR2UNB5BVrPb1BAm6Eb28C
1WmyjnAAyXxc6pqPTalO+JctpS7ujjbtwlOOwgthKyKMfpFnqyavablDl6GvtHn8
NIa3HdnKQTXl9/nRXCvIjeWDyaZEZ5ueacfhMm4PWRSIkqKFVgwY18nNkOul9fuz
0UD9EuN0PPHV2hCIp9Kl3Jju5pi2EEzCt/Vn0YGsZTZuVOfREZ3izDtyKFg1tjif
AJ5kFRc1X+6hXNDUWUOmLOnjBvupbq2axFbLeAzQxla/O/0pwHWhiuqXu3uB4six
1Hlgt7yI7pob86VcQKTCg1v8kOvQTEuL2BtUWkCpbyrVSafYRVKwlUNnQlmu5F3c
sL14hhK9QSHyCmJ7yKchY104QVKmN8v3ks8PyUNoPxq57ChH4E6FVAZpMz08uF5V
mIWREpeIPNw=
=ELLq
-----END PGP SIGNATURE-----
Merge tag 'iommu-config-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC/iommu configuration update from Arnd Bergmann:
"The iomm-config branch contains work from Will Deacon, quoting his
description:
This series adds automatic IOMMU and DMA-mapping configuration for
OF-based DMA masters described using the generic IOMMU devicetree
bindings. Although there is plenty of future work around splitting up
iommu_ops, adding default IOMMU domains and sorting out automatic IOMMU
group creation for the platform_bus, this is already useful enough for
people to port over their IOMMU drivers and start using the new probing
infrastructure (indeed, Marek has patches queued for the Exynos IOMMU).
The branch touches core ARM and IOMMU driver files, and the respective
maintainers (Russell King and Joerg Roedel) agreed to have the
contents merged through the arm-soc tree.
The final version was ready just before the merge window, so we ended
up delaying it a bit longer than the rest, but we don't expect to see
regressions because this is just additional infrastructure that will
get used in drivers starting in 3.20 but is unused so far"
* tag 'iommu-config-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
iommu: store DT-probed IOMMU data privately
arm: dma-mapping: plumb our iommu mapping ops into arch_setup_dma_ops
arm: call iommu_init before of_platform_populate
dma-mapping: detect and configure IOMMU in of_dma_configure
iommu: fix initialization without 'add_device' callback
iommu: provide helper function to configure an IOMMU for an of master
iommu: add new iommu_ops callback for adding an OF device
dma-mapping: replace set_arch_dma_coherent_ops with arch_setup_dma_ops
iommu: provide early initialisation hook for IOMMU drivers
2014-12-16 14:53:01 -08:00
Char/Misc driver patches for 3.19-rc1
2014-12-14 16:43:47 -08:00
can: dev: Consolidate and unify state change handling
2014-12-07 21:22:09 +01:00
fsl /bestcomm
This is the bulk of GPIO changes for the v3.19 series:
2014-12-14 14:05:05 -08:00
USB patches for 3.19-rc1
2014-12-14 14:57:16 -08:00
Merge 3.18-rc7 into staging-work.
2014-12-02 16:20:59 -08:00
Merge branch 'irq-irqdomain-arm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-12-15 17:30:09 -08:00
lockd: eliminate LOCKD_DEBUG
2014-11-24 17:24:08 -05:00
sound updates for 3.19-rc1
2014-12-11 13:20:50 -08:00
net/mlx4: Add support for A0 steering
2014-12-11 14:47:36 -05:00
net/mlx5_core: Remove unused dev cap enum fields
2014-12-08 20:45:54 -05:00
mmc: core: Let mmc_send_tuning() to take struct mmc_host* as parameter
2014-12-08 09:11:04 +01:00
phy: remove the old lookup method
2014-11-22 13:58:39 +05:30
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-12-15 15:52:01 -08:00
Merge remote-tracking branches 'regulator/topic/sky81452' and 'regulator/topic/stub' into regulator-next
2014-12-05 11:14:43 +00:00
soc /ti
spi: core: Add spi_transfer_is_last() helper
2014-11-24 18:53:42 +00:00
sunrpc: add a debugfs rpc_xprt directory with an info file in it
2014-11-27 13:14:52 -05:00
USB patches for 3.19-rc1
2014-12-14 14:57:16 -08:00
Merge branch 'pm-runtime'
2014-12-08 20:00:44 +01:00
new helper: audit_file()
2014-11-19 13:01:26 -05:00
syscalls: implement execveat() system call
2014-12-13 12:42:51 -08:00
blk: introduce generic io stat accounting help function
2014-11-24 08:04:44 -07:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
bitops: Fix shift overflow in GENMASK macros
2014-11-16 09:55:39 +01:00
Merge branch 'for-3.19/core' of git://git.kernel.dk/linux-block
2014-12-13 14:14:23 -08:00
Merge branch 'for-3.19/core' of git://git.kernel.dk/linux-block
2014-12-13 14:14:23 -08:00
net: sock: allow eBPF programs to be attached to sockets
2014-12-05 21:47:32 -08:00
Merge branch 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2014-12-11 18:57:19 -08:00
clk-divider: Fix READ_ONLY when divider > 1
2014-11-17 11:13:52 -08:00
mm, compaction: simplify deferred compaction
2014-12-10 17:41:06 -08:00
syscalls: implement execveat() system call
2014-12-13 12:42:51 -08:00
coresight: fixed comments in coresight.h
2014-11-26 19:28:11 -08:00
cpufreq: Introduce ->ready() callback for cpufreq drivers
2014-11-29 23:38:38 +01:00
crypto: prefix module autoloading with "crypto-"
2014-11-24 22:43:57 +08:00
switch d_materialise_unique() users to d_splice_alias()
2014-11-19 13:01:20 -05:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
dm: add presuspend_undo hook to target_type
2014-11-19 11:24:59 -05:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
dma-mapping: detect and configure IOMMU in of_dma_configure
2014-12-01 16:50:45 +00:00
dmaengine: clarify the issue_pending expectations
2014-12-05 20:55:27 +05:30
iommu/vt-d: Implement DMAR unit hotplug framework
2014-11-18 11:18:35 +01:00
eeprom-93cx6: Add (read-only) support for 8-bit mode
2014-11-25 15:42:53 +01:00
binfmt_elf: allow arch code to examine PT_LOPROC ... PT_HIPROC headers
2014-11-24 07:45:02 +01:00
net: Add functions for handling padding frame and adding to length
2014-12-08 20:47:41 -05:00
ethtool: Support for configurable RSS hash function
2014-12-08 21:07:10 -05:00
fault-inject: add ratelimit option
2014-12-13 12:42:52 -08:00
include/linux/file.h: remove get_unused_fd() macro
2014-12-10 17:41:10 -08:00
net: sock: allow eBPF programs to be attached to sockets
2014-12-05 21:47:32 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2014-12-14 20:36:37 -08:00
fsnotify: remove destroy_list from fsnotify_mark
2014-12-13 12:42:53 -08:00
tracing: Add tp_printk cmdline to have tracepoints go to printk()
2014-12-15 10:17:38 -05:00
tracing: Add trace_seq_has_overflowed() and trace_handle_return()
2014-11-19 15:25:39 -05:00
mm, gfp: escalatedly define GFP_HIGHUSER and GFP_HIGHUSER_MOVABLE
2014-12-13 12:42:48 -08:00
net, lib: kill arch_fast_hash library bits
2014-12-10 15:17:46 -05:00
Merge branches 'for-3.19/hid-report-len', 'for-3.19/i2c-hid', 'for-3.19/lenovo', 'for-3.19/logitech', 'for-3.19/microsoft', 'for-3.19/plantronics', 'for-3.19/rmi', 'for-3.19/sony' and 'for-3.19/wacom' into for-linus
2014-12-12 11:15:33 +01:00
powerpc updates for 3.19
2014-12-11 17:48:14 -08:00
mm: hugetlb_cgroup: convert to lockless page counters
2014-12-10 17:41:04 -08:00
hyperv: Add support for vNIC hot removal
2014-12-08 20:24:11 -05:00
Merge branch 'i2c/for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-12-14 12:54:40 -08:00
mac80211: add parsing of TDLS specific IEs
2014-11-19 18:45:16 +01:00
ieee802154: rename and move WPAN_NUM_ defines
2014-11-17 09:49:17 +01:00
bridge: add new brport flag LEARNING_SYNC
2014-12-02 20:01:23 -08:00
vlan: introduce __vlan_insert_tag helper which does not free skb
2014-11-21 14:20:17 -05:00
inetdevice: fixed signed integer overflow
2014-11-14 17:08:58 -05:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-12-09 21:21:34 -08:00
integrity: provide a hook to load keys when rootfs is ready
2014-11-17 23:12:01 -05:00
linux/interrupt.h: remove the definition of unused tasklet_hi_enable
2014-12-12 15:15:41 -05:00
ARM: SoC/iommu configuration for 3.19
2014-12-16 14:53:01 -08:00
ipc/msg: increase MSGMNI, remove scaling
2014-12-13 12:42:52 -08:00
ipmi: Use the proper type for acpi_handle
2014-12-11 15:04:06 -06:00
ipmi: Remove the now unused priority from SMI sender
2014-12-11 15:04:11 -06:00
Merge branch 'irq-irqdomain-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-12-10 09:01:01 -08:00
irqdomain: Introduce helper function irq_domain_add_hierarchy()
2014-11-23 13:01:46 +01:00
genirq: Split out flow handler typedefs into seperate header file
2014-11-23 13:01:46 +01:00
printk: add and use LOGLEVEL_<level> defines for KERN_<LEVEL> equivalents
2014-12-10 17:41:11 -08:00
TTY/Serial driver patches for 3.19-rc1
2014-12-14 15:23:32 -08:00
sched/cputime: Fix cpu_timer_sample_group() double accounting
2014-11-16 10:04:18 +01:00
include/linux/kmemleak.h: needs slab.h
2014-12-13 12:42:47 -08:00
kvm: fix kvm_is_mmio_pfn() and rename to kvm_is_reserved_pfn()
2014-11-26 14:40:45 +01:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2014-12-15 18:28:25 -08:00
Merge branch 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2014-12-11 18:52:37 -08:00
Replace mentions of "list_struct" to "list_head"
2014-11-20 14:45:15 +01:00
mailbox: add tx_prepare client callback
2014-11-27 12:50:59 +05:30
bus: mvebu-mbus: provide a mechanism to save SDRAM window configuration
2014-11-30 16:40:11 +00:00
memcg: fix possible use-after-free in memcg_kmem_get_cache()
2014-12-13 12:42:49 -08:00
net: phy: micrel: add generic clock-mode-select support
2014-11-21 14:08:56 -05:00
mm: vmscan: invoke slab shrinkers from shrink_zone()
2014-12-13 12:42:48 -08:00
mm/debug-pagealloc: prepare boottime configurable on/off
2014-12-13 12:42:48 -08:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-12-15 15:52:01 -08:00
mm/page_ext: resurrect struct page extending code for debugging
2014-12-13 12:42:48 -08:00
PCI/MSI: Allow an msi_controller to be associated to an irq domain
2014-11-23 17:14:43 +01:00
ipvlan: move the device check function into netdevice.h
2014-12-09 16:10:06 -05:00
nfs: Add DEALLOCATE support
2014-11-25 16:38:32 -05:00
NFS: fix subtle change in COMMIT behavior
2014-11-24 17:00:42 -05:00
nfs: Add DEALLOCATE support
2014-11-25 16:38:32 -05:00
nfs: Add ALLOCATE support
2014-11-25 16:38:32 -05:00
Devicetree changes for v3.19
2014-12-11 13:06:58 -08:00
iommu: store DT-probed IOMMU data privately
2014-12-05 14:35:52 +00:00
of/reconfig: Add OF_DYNAMIC notifier for platform_bus_type
2014-11-24 22:25:06 +00:00
ARM: OMAP2+: Prepare to move GPMC to drivers by platform data header
2014-11-20 12:11:25 -08:00
mailbox/omap: adapt to the new mailbox framework
2014-11-27 12:51:04 +05:30
oom: don't assume that a coredumping thread will exit soon
2014-12-13 12:42:49 -08:00
mm: memcontrol: remove obsolete kmemcg pinning tricks
2014-12-10 17:41:05 -08:00
mm/page_owner: keep track of page owners
2014-12-13 12:42:48 -08:00
mm/page_owner: keep track of page owners
2014-12-13 12:42:48 -08:00
xen: features and fixes for 3.19-rc0
2014-12-11 18:15:33 -08:00
USB patches for 3.19-rc1
2014-12-14 14:57:16 -08:00
percpu: remove __get_cpu_var and __raw_get_cpu_var macros
2014-12-13 12:42:53 -08:00
Merge branch 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-12-11 18:36:26 -08:00
printk/percpu: Define printk_func when printk is not defined
2014-11-21 11:19:15 -05:00
perf: Improve the perf_sample_data struct layout
2014-11-16 11:42:04 +01:00
net: phy: add static data field to struct phy_driver
2014-11-21 14:08:55 -05:00
Replace mentions of "list_struct" to "list_head"
2014-11-20 14:45:15 +01:00
Merge branch 'pm-runtime'
2014-12-08 20:00:44 +01:00
Merge branch 'pm-runtime'
2014-12-08 20:00:44 +01:00
PM / OPP Introduce APIs to remove OPPs
2014-11-29 23:53:20 +01:00
PM: Drop CONFIG_PM_RUNTIME from the driver core
2014-12-04 00:46:58 +01:00
Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
2014-12-12 15:26:48 -08:00
This code is a fork from the trace-3.19 pull as it needed the trace_seq
2014-12-10 20:35:41 -08:00
pstore-ram: Allow optional mapping with pgprot_noncached
2014-12-11 13:38:31 -08:00
exit: ptrace: shift "reap dead" code from exit_ptrace() to forget_original_parent()
2014-12-10 17:41:10 -08:00
spi: spi-pxa2xx: SPI support for Intel Quark X1000
2014-11-26 18:07:45 +00:00
ratelimit: add initialization macro
2014-12-13 12:42:52 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2014-12-12 10:08:06 -08:00
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
2014-11-20 08:57:58 +01:00
regmap: ac97: Add generic AC'97 callbacks
2014-11-19 10:28:14 +00:00
rtc/lib: Provide y2038 safe rtc_tm_to_time()/rtc_time_to_tm() replacement
2014-11-21 12:00:00 -08:00
rtnetlink: delay RTM_DELLINK notification until after ndo_uninit()
2014-12-09 13:36:57 -05:00
syscalls: implement execveat() system call
2014-12-13 12:42:51 -08:00
seq-buf: Make seq_buf_bprintf() conditional on CONFIG_BINARY_PRINTF
2014-11-19 22:01:19 -05:00
serial: core: Add big-endian iotype
2014-11-25 17:06:40 -08:00
mm: vmscan: invoke slab shrinkers from shrink_zone()
2014-12-13 12:42:48 -08:00
net: Pull out core bits of __netdev_alloc_skb and add __napi_alloc_skb
2014-12-10 13:31:57 -05:00
memcg: fix possible use-after-free in memcg_kmem_get_cache()
2014-12-13 12:42:49 -08:00
net: introduce helper macro for_each_cmsghdr
2014-12-10 22:41:55 -05:00
spmi: Remove shutdown/suspend/resume kernel-doc
2014-11-26 19:33:57 -08:00
stacktrace: introduce snprint_stack_trace for buffer output
2014-12-13 12:42:48 -08:00
mm: move swp_entry_t definition to include/linux/mm_types.h
2014-12-13 12:42:47 -08:00
mm: page_cgroup: rename file to mm/swap_cgroup.c
2014-12-10 17:41:09 -08:00
syscalls: implement execveat() system call
2014-12-13 12:42:51 -08:00
syslog: Provide stub check_syslog_permissions
2014-11-17 10:28:04 -08:00
Merge branch 'for-davem-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-12-10 13:17:23 -05:00
time: Provide y2038 safe mktime() replacement
2014-11-21 11:59:58 -08:00
Merge branch 'timers-2038-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-12-10 10:13:28 -08:00
tracing: Use trace_seq_used() and seq_buf_used() instead of len
2014-11-19 22:01:15 -05:00
bury memcpy_toiovec()
2014-12-09 16:29:11 -05:00
USB / PM: Drop CONFIG_PM_RUNTIME from the USB core
2014-12-04 00:51:54 +01:00
ARM: vexpress: Remove non-DT code
2014-11-28 16:08:16 +01:00
virtio: drop legacy_only driver flag
2014-12-09 21:42:00 +02:00
virtio: memory access APIs
2014-12-09 12:05:24 +02:00
virtio: allow finalize_features to fail
2014-12-09 16:32:32 +02:00
mm,vmacache: count number of system-wide flushes
2014-12-13 12:42:48 -08:00
vmci: propagate msghdr all way down to __qp_memcpy_from_queue()
2014-12-09 16:28:23 -05:00
