From: Linus Torvalds Date: Sat, 8 Jul 2017 19:17:25 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=09b56d5a418b7ced4ca427c7cf8faf11df72364c;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm Pull ARM updates from Russell King: - add support for ftrace-with-registers, which is needed for kgraft and other ftrace tools - support for mremap() for the sigpage/vDSO so that checkpoint/restore can work - add timestamps to each line of the register dump output - remove the unused KTHREAD_SIZE from nommu - align the ARM bitops APIs with the generic API (using unsigned long pointers rather than void pointers) - make the configuration of userspace Thumb support an expert option so that we can default it on, and avoid some hard to debug userspace crashes * 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: ARM: 8684/1: NOMMU: Remove unused KTHREAD_SIZE definition ARM: 8683/1: ARM32: Support mremap() for sigpage/vDSO ARM: 8679/1: bitops: Align prototypes to generic API ARM: 8678/1: ftrace: Adds support for CONFIG_DYNAMIC_FTRACE_WITH_REGS ARM: make configuration of userspace Thumb support an expert option ARM: 8673/1: Fix __show_regs output timestamps --- 09b56d5a418b7ced4ca427c7cf8faf11df72364c