Linus Torvalds
8b3c8ba3d8
ARM: SoC late changes for v4.1 ...
We were expecting to sit on this branch through most of the merge window since
the contents was merged into our tree late, but we ended up sitting on all of
our contents so it can go in with the rest.
The contents here is:
- A large branch of cleanups of the CM/PRM blocks on OMAP.
- A couple of patches plumbing up CM/PRM on OMAP5 and DRA7.
- A branch with DT updates for Freescale i.MX. including some shuffling from
.dts to .dtsi (include) files that causes a little churn.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJVNy2KAAoJEIwa5zzehBx3mE4P/A+Wk2ElKl0FH6Kz4Wmt5MOY
GPbIyd6jXTN/zbyAQxdPEQM7VvBh6GfgGTmNmcmfv2kacGJveAc7+UV0GSfW0XEO
haOIwSRvfCIW1d2pyphrFlRqzQsDDzJkVuiRo1DkFwICyKEabXNqGu1zjNaLmN3j
zw1DiAhe9ymywxayT5GBMevKU2a16Jgbzie6UfKKI5YO8Nqug13YI1as7n9SKrU4
wdi5b7kecgcfVlmYUrN9iqKg3oKTqRNSZDk/WsGvO/L5Mks0Xoc9v/K6rifNUMdd
CoigEznE1xgDvwPbAeXn4JiF/+JLVnDTZorsINQFIIAzHa2cZM1fMjT3x56IT0Y0
iIU3uWh8B/L2/qTPsqEBDFd/lBX/E3cND7lCIWCU0vwGWRzAh/Q+vRwdFfLoMOXh
npcw0hGS4KEWJ0sEX0xU9EvBUa5fb/CXT2xWBPVMV1Wb1QZLcquBRxFFNgh+GK2X
nmoZFiqfJDQWrMoNySo+MGyBzIYLtwxkRF0rsUvJ47cW2/+KXSHflTgllvEpQ/38
Ew3QmzCPlFuP7G1xiim9zSGvKIYhWV1fRUix1+FIE+on2d0TmdhqISHzCVU6ePxB
MZC8GwUww57i0hXXgirgrlN6moKaUC1DN7AwNrHQsJIi8aFXuFWbZAufRrV36Kwg
zsADWvSeOSWwea04MtkL
=ssbK
-----END PGP SIGNATURE-----
Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC late changes from Olof Johansson:
"We were expecting to sit on this branch through most of the merge
window since the contents was merged into our tree late, but we ended
up sitting on all of our contents so it can go in with the rest.
The contents here is:
- a large branch of cleanups of the CM/PRM blocks on OMAP.
- a couple of patches plumbing up CM/PRM on OMAP5 and DRA7.
- a branch with DT updates for Freescale i.MX. including some
shuffling from .dts to .dtsi (include) files that causes a little
churn"
* tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (78 commits)
ARM: OMAP2+: Fix booting with configs that don't have MFD_SYSCON
ARM: OMAP4+: control: add support for initializing control module via DT
ARM: dts: dra7: add minimal l4 bus layout with control module support
ARM: dts: omap5: add minimal l4 bus layout with control module support
ARM: OMAP4+: control: remove support for legacy pad read/write
ARM: OMAP4: display: convert display to use syscon for dsi muxing
ARM: dts: omap4: add minimal l4 bus layout with control module support
ARM: dts: am4372: add minimal l4 bus layout with control module support
ARM: dts: am43xx-epos-evm: fix pinmux node layout
ARM: dts: am33xx: add minimal l4 bus layout with control module support
ARM: dts: omap3: add minimal l4 bus layout with control module support
ARM: dts: omap24xx: add minimal l4 bus layout with control module support
ARM: OMAP2+: control: add syscon support for register accesses
ARM: OMAP2+: id: cache omap_type value
ARM: OMAP2+: control: remove API for getting control module base address
ARM: OMAP2+: clock: add low-level support for regmap
ARM: OMAP4+: PRM: get rid of cpu_is_omap44xx calls from interrupt init
ARM: OMAP4+: PRM: setup prm_features from the PRM init time flags
ARM: OMAP2+: CM: move SoC specific init calls within a generic API
ARM: OMAP4+: PRM: determine prm_device_inst based on DT compatibility
...
2015-04-22 09:24:55 -07:00
can: add combined rx/tx LED trigger support
2015-03-22 23:50:11 +01:00
ARM: SoC late changes for v4.1
2015-04-22 09:24:55 -07:00
fsl /bestcomm
gpio: move pincontrol calls to <linux/gpio/driver.h>
2015-03-19 09:45:54 +01:00
iio: add support for hardware fifo
2015-03-29 16:17:10 +01:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-04-17 15:50:54 -04:00
ARM: SoC driver updates for v4.1
2015-04-22 09:18:17 -07:00
net/mlx4_en: Add RX-ALL support
2015-04-02 16:25:04 -04:00
net/mlx5_core: Extend struct mlx5_interface to support multiple protocols
2015-04-02 16:33:43 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-04-15 09:00:47 -07:00
netlink: implement nla_put_in_addr and nla_put_in6_addr
2015-03-31 13:58:35 -04:00
netfilter: Pass nf_hook_state through arpt_do_table().
2015-04-04 13:26:52 -04:00
uapi: ebtables: don't include linux/if.h
2015-04-13 20:08:38 +02:00
netfilter: Pass nf_hook_state through ipt_do_table().
2015-04-04 12:47:04 -04:00
netfilter: Pass nf_hook_state through ip6t_do_table().
2015-04-04 12:52:06 -04:00
ARM: SoC cleanups for v4.1
2015-04-22 09:04:39 -07:00
power: max17042_battery: Use reg type instead of chip type
2015-04-06 17:46:27 +02:00
Merge remote-tracking branches 'regulator/topic/mode', 'regulator/topic/notifier', 'regulator/topic/palmas', 'regulator/topic/qcom' and 'regulator/topic/stw481x' into regulator-next
2015-04-10 19:16:03 +01:00
soc /ti
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-04-15 09:00:47 -07:00
sunrpc: make debugfs file creation failure non-fatal
2015-03-31 14:15:08 -04:00
Merge 4.0-rc7 into usb-next
2015-04-07 11:17:34 +02:00
uwb: Remove umc bus legacy suspend/resume support
2015-03-18 17:27:03 +01:00
include/linux: remove empty conditionals
2015-04-15 16:35:22 -07:00
device property: Make it possible to use secondary firmware nodes
2015-04-03 23:23:37 +02:00
fs: move struct kiocb to fs.h
2015-03-25 20:28:11 -04:00
arm-cci: Split the code for PMU vs driver support
2015-03-27 13:44:43 +00:00
libata: Implement support for sense data reporting
2015-03-27 11:59:22 -04:00
MIPS: BCM47xx: Move NVRAM header to the include/linux/.
2015-04-01 17:22:00 +02:00
lib/bitmap.c: bitmap_[empty,full]: remove code duplication
2015-04-17 09:03:56 -04:00
lib: find_*_bit reimplementation
2015-04-17 09:03:53 -04:00
blk-mq: fix iteration of busy bitmap
2015-04-17 08:31:12 -06:00
Defer processing of REQ_PREEMPT requests for blocked devices
2015-04-08 09:41:41 -07:00
bpf: Make internal bpf API independent of CONFIG_BPF_SYSCALL #ifdefs
2015-04-02 13:25:49 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-14 15:44:14 -04:00
kernel: conditionally support non-root users, groups and capabilities
2015-04-15 16:35:22 -07:00
cleancache: remove limit on the number of cleancache enabled filesystems
2015-04-14 16:49:03 -07:00
clk: clk-gpio-gate: Fix active low
2015-04-10 17:45:30 -07:00
clockevents: Cleanup dead cpu explicitely
2015-04-03 08:44:37 +02:00
mm: cma: constify and use correct signness in mm/cma.c
2015-04-14 16:49:04 -07:00
mm: allow compaction of unevictable pages
2015-04-15 16:35:17 -07:00
locking: Remove atomicy checks from {READ,WRITE}_ONCE
2015-03-27 09:42:01 +01:00
console: Add extensible console matching
2015-03-26 16:16:20 +01:00
cpu: Provide smpboot_thread_init() on !CONFIG_SMP kernels as well
2015-04-13 10:19:30 +02:00
cpuidle: remove state_count field from struct cpuidle_device
2015-04-03 13:15:50 +02:00
cpumask: resurrect CPU_MASK_CPU0
2015-04-16 12:33:51 +09:30
kernel: conditionally support non-root users, groups and capabilities
2015-04-15 16:35:22 -07:00
crypto: api - prevent helper ciphers from being used
2015-03-31 21:21:03 +08:00
VFS: Impose ordering on accesses of d_inode and d_flags
2015-04-15 15:05:28 -04:00
ipv4: dccp: handle ICMP messages on DCCP_NEW_SYN_RECV request sockets
2015-03-23 16:52:26 -04:00
PM / devfreq: event: Add const keyword for devfreq_event_ops structure
2015-03-30 17:09:41 +09:00
dm: remove unnecessary wrapper around blk_lld_busy
2015-03-31 12:03:49 -04:00
Power management and ACPI updates for v4.1-rc1
2015-04-14 20:21:54 -07:00
include/linux/dmapool.h: declare struct device
2015-04-07 16:45:33 -07:00
x86/efi: Add a "debug" option to the efi= cmdline
2015-04-01 12:46:22 +01:00
mm: fold arch_randomize_brk into ARCH_HAS_ELF_RANDOMIZE
2015-04-14 16:49:05 -07:00
f2fs: add F2FS_INLINE_DOTS to recover missing dot dentries
2015-04-10 15:08:57 -07:00
filter: introduce SKF_AD_VLAN_TPID BPF extension
2015-03-24 15:25:15 -04:00
Merge branch 'akpm' (patches from Andrew)
2015-04-17 09:04:38 -04:00
fs_pin: Allow for the possibility that m_list or s_list go unused.
2015-04-09 11:39:55 -05:00
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-04-14 14:37:47 -07:00
device property: Introduce firmware node type for platform data
2015-04-03 23:23:51 +02:00
mm: clarify __GFP_NOFAIL deprecation status
2015-04-14 16:49:04 -07:00
Merge branch 'for-4.1/sensor-hub' into for-linus
2015-04-13 23:43:34 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2015-04-14 09:25:26 -07:00
gpu: host1x: Export host1x_syncpt_read()
2015-04-02 18:46:20 +02:00
mm: hugetlb: cleanup using paeg_huge_active()
2015-04-15 16:35:19 -07:00
hv: remove the per-channel workqueue
2015-04-03 16:18:02 +02:00
Power management and ACPI updates for v4.1-rc1
2015-04-14 20:21:54 -07:00
if_link: Add an additional parameter to ifla_vf_info for RSS querying
2015-04-10 21:57:22 -07:00
net: Move check for multiple vlans to drivers
2015-03-29 13:33:22 -07:00
ipv4, ipv6: kill ip_mc_{join, leave}_group and ipv6_sock_mc_{join, drop}
2015-03-18 22:05:09 -04:00
genirq: Allow the irqchip state of an IRQ to be save/restored
2015-04-08 23:28:28 +02:00
Char/Misc driver patches for 4.1-rc1
2015-04-21 09:42:58 -07:00
Break up monolithic iommu table/lock into finer graularity pools and lock
2015-04-18 12:32:59 -07:00
iommu: Remove domain_init and domain_free iommu_ops
2015-03-31 15:32:16 +02:00
kernel/resource.c: remove deprecated __check_region() and friends
2015-04-15 16:35:22 -07:00
ipv6: introduce secret_stable to ipv6_devconf
2015-03-23 22:12:08 -04:00
irqchip core change for v4.1 (round 3)
2015-04-11 11:17:28 +02:00
irq_work: Fix build failure when CONFIG_IRQ_WORK is not defined
2015-03-23 10:55:21 +01:00
jhash: Update jhash_[321]words functions to use correct initval
2015-04-03 12:52:29 -04:00
jump_label: Allow jump labels to be used in assembly
2015-04-09 09:40:24 +02:00
memory: jz4780-nemc: driver for the NEMC on JZ4780 SoCs
2015-03-26 23:51:36 +01:00
mm/mempool.c: kasan: poison mempool elements
2015-04-15 16:35:20 -07:00
Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus
2015-04-21 09:44:55 -03:00
kernel.h: implement DIV_ROUND_CLOSEST_ULL
2015-04-17 09:03:55 -04:00
mm: consolidate all page-flags helpers in <linux/page-flags.h>
2015-04-15 16:35:17 -07:00
Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-04-14 13:58:48 -07:00
block: fix blk_stack_limits() regression due to lcm() change
2015-03-31 09:45:50 -06:00
leds: flash: Fix the size of sysfs_groups array
2015-03-30 11:55:48 -07:00
Merge branch 'for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2015-04-13 16:42:16 -07:00
memtest: use phys_addr_t for physical addresses
2015-04-14 16:49:06 -07:00
mm, hotplug: fix concurrent memory hot-add deadlock
2015-04-14 16:49:00 -07:00
mm, mempool: disallow mempools based on slab caches with constructors
2015-04-15 16:35:18 -07:00
mm: numa: remove migrate_ratelimited
2015-04-14 16:49:05 -07:00
misc: Add attribute groups
2015-03-25 11:44:52 +01:00
mm: new pfn_mkwrite same as page_mkwrite for VM_PFNMAP
2015-04-15 16:35:20 -07:00
mm: rcu-protected get_mm_exe_file()
2015-04-17 09:04:07 -04:00
mm: refactor zone_movable_is_highmem()
2015-04-15 16:35:16 -07:00
MIPS: Add CDMM bus support
2015-03-31 12:04:12 +02:00
Some clean ups and small fixes, but the biggest change is the addition
2015-04-14 10:49:03 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2015-04-18 11:20:31 -04:00
get rid of the size argument of sock_sendmsg()
2015-04-11 15:27:37 -04:00
net: remove unused 'dev' argument from netif_needs_gso()
2015-04-17 13:29:41 -04:00
netfilter: Pass socket pointer down through okfn().
2015-04-07 15:25:55 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-04-08 18:30:21 +02:00
netlink: Fix portid type in netlink_notify
2015-04-13 16:35:16 -04:00
nfs: generic_write_checks() shouldn't be done on swapout...
2015-04-15 15:04:27 -04:00
watchdog: introduce the hardlockup_detector_disable() function
2015-04-14 16:48:59 -07:00
NVMe: Meta data handling through submit io ioctl
2015-04-07 19:11:06 -06:00
Devicetree changes for v4.1
2015-04-18 08:30:10 -04:00
of: Explicitly include linux/types.h in of_graph.h
2015-03-26 12:14:56 -05:00
memcg: print cgroup information when system panics due to panic_on_oom
2015-04-14 16:49:05 -07:00
mm: hugetlb: cleanup using paeg_huge_active()
2015-04-15 16:35:19 -07:00
PCI/ACPI: Optimize device state transition delays
2015-04-08 16:25:25 -05:00
PCI: Don't clear ASPM bits when the FADT declares it's unsupported
2015-04-09 14:20:11 -05:00
powerpc updates for 4.1
2015-04-16 13:53:32 -05:00
perf: Add ITRACE_START record to indicate that tracing has started
2015-04-02 17:14:17 +02:00
Remove rest of exec domains.
2015-04-12 21:03:31 +02:00
add fixed_phy_update_state() - update state of fixed_phy
2015-04-03 15:08:20 -04:00
PM / sleep: add pm-trace support for suspending phase
2015-03-18 15:54:27 +01:00
driver core / PM: Add PM domain callbacks for device setup/cleanup
2015-03-22 22:14:12 +01:00
PM / domains: factor out code to get the generic PM domain from a struct device
2015-03-22 22:19:12 +01:00
PNP: Add helper macro for pnp_register_driver boilerplate
2015-03-18 22:39:16 +01:00
printk: comment pr_cont() stating it is only to continue a line
2015-04-15 16:35:23 -07:00
device property: Introduce firmware node type for platform data
2015-04-03 23:23:51 +02:00
pstore: Add pstore type id for PPC64 opal nvram partition
2015-03-23 14:06:10 +11:00
ptp: remove 32 bit get/set methods.
2015-03-31 12:01:19 -04:00
vfs: Add general support to enforce project quota limits
2015-03-18 21:55:08 +01:00
Merge branches 'doc.2015.02.26a', 'earlycb.2015.03.03a', 'fixes.2015.03.03a', 'gpexp.2015.02.26a', 'hotplug.2015.03.20a', 'sysidle.2015.02.26b' and 'tiny.2015.02.26a' into HEAD
2015-03-20 08:31:01 -07:00
kernel/reboot.c: add orderly_reboot for graceful reboot
2015-04-15 16:35:23 -07:00
rhashtable: provide len to obj_hashfn
2015-03-25 17:18:33 +01:00
mm: uninline and cleanup page-mapping related helpers
2015-04-15 16:35:19 -07:00
drivers/rtc: Provide y2038 safe rtc_class_ops.set_mmss() replacement
2015-04-03 08:18:24 +02:00
net: use jump label patching for ingress qdisc in __netif_receive_skb_core
2015-04-13 13:34:40 -04:00
Merge branch 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc
2015-04-15 13:53:55 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-04-15 09:00:47 -07:00
serial: 8250: Decouple RSA probe
2015-03-26 18:18:20 +01:00
earlycon: Fix __earlycon_table stride
2015-04-10 14:39:53 +02:00
net: add skb_checksum_complete_unset
2015-04-20 21:57:26 -04:00
mm, slab: correct config option in comment
2015-04-14 16:48:59 -07:00
smp: don't use 16-bit words for atomic accesses
2015-04-20 09:08:49 -07:00
new helper: msg_data_left()
2015-04-11 15:53:35 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2015-04-14 09:50:27 -07:00
stmmac: Read tx-fifo-depth and rx-fifo-depth from the devicetree
2015-04-16 13:58:42 -04:00
SCSI misc on 20150416
2015-04-16 19:02:04 -04:00
mm: rename deactivate_page to deactivate_file_page
2015-04-15 16:35:17 -07:00
kernel/sysctl.c: threads-max observe limits
2015-04-17 09:04:07 -04:00
sysfs: Document struct attribute_group
2015-03-25 13:28:58 +01:00
tcp: RFC7413 option support for Fast Open client
2015-04-07 18:36:39 -04:00
clockevents: Cleanup dead cpu explicitely
2015-04-03 08:44:37 +02:00
time: Add timerkeeper::tkr_raw
2015-03-27 09:45:07 +01:00
time, drivers/rtc: Don't bother with rtc_resume() for the nonstop clocksource
2015-04-03 08:18:34 +02:00
tracing: Add TRACE_DEFINE_ENUM() macro to map enums to their values
2015-04-08 09:39:56 -04:00
include/linux: remove empty conditionals
2015-04-15 16:35:22 -07:00
netns: constify net_hash_mix() and various callers
2015-03-18 22:00:34 -04:00
kernel: conditionally support non-root users, groups and capabilities
2015-04-15 16:35:22 -07:00
new helper: iov_iter_rw()
2015-04-11 22:29:44 -04:00
usb: define a generic USB_RESUME_TIMEOUT macro
2015-04-07 12:58:35 -05:00
util_macros.h: add find_closest() macro
2015-04-17 09:03:54 -04:00
VFIO updates for v4.1
2015-04-14 18:06:47 -07:00
vgaarb: Stub vga_set_legacy_decoding()
2015-04-07 11:14:38 -06:00
watchdog: Add watchdog enable/disable all functions
2015-04-02 17:33:15 +02:00
wlcore: remove wl12xx_platform_data
2015-03-24 09:48:14 -07:00
fs: add dirtytime_expire_seconds sysctl
2015-03-17 12:23:32 -04:00
zsmalloc: support compaction
2015-04-15 16:35:20 -07:00
