Nick [Tue, 21 May 2019 10:02:08 +0000 (18:02 +0800)]
Merge tag 'v4.9.177' into khadas-vim3-4.9.y
This is the 4.9.177 stable release
Conflicts:
arch/x86/entry/vdso/Makefile
kernel/bpf/hashtab.c
net/core/fib_rules.c
Nick [Tue, 21 May 2019 09:59:19 +0000 (17:59 +0800)]
Merge tag 'v4.9.176' into khadas-vim3-4.9.y
This is the 4.9.176 stable release
Conflicts:
kernel/cpu.c
Nick [Tue, 21 May 2019 09:58:32 +0000 (17:58 +0800)]
Merge tag 'v4.9.175' into khadas-vim3-4.9.y
This is the 4.9.175 stable release
Nick [Tue, 21 May 2019 09:58:15 +0000 (17:58 +0800)]
Merge tag 'v4.9.174' into khadas-vim3-4.9.y
This is the 4.9.174 stable release
Conflicts:
arch/arm64/include/asm/system_misc.h
arch/arm64/mm/fault.c
Nick [Tue, 21 May 2019 09:55:09 +0000 (17:55 +0800)]
Merge tag 'v4.9.173' into khadas-vim3-4.9.y
This is the 4.9.173 stable release
Nick [Tue, 21 May 2019 09:55:07 +0000 (17:55 +0800)]
Merge tag 'v4.9.172' into khadas-vim3-4.9.y
This is the 4.9.172 stable release
Nick [Tue, 21 May 2019 09:55:04 +0000 (17:55 +0800)]
Merge tag 'v4.9.171' into khadas-vim3-4.9.y
This is the 4.9.171 stable release
Nick [Tue, 21 May 2019 09:54:57 +0000 (17:54 +0800)]
Merge tag 'v4.9.170' into khadas-vim3-4.9.y
This is the 4.9.170 stable release
Conflicts:
fs/ext4/ioctl.c
Nick [Tue, 21 May 2019 09:54:22 +0000 (17:54 +0800)]
Merge tag 'v4.9.169' into khadas-vim3-4.9.y
This is the 4.9.169 stable release
Conflicts:
arch/x86/entry/vdso/Makefile
Nick [Tue, 21 May 2019 09:53:45 +0000 (17:53 +0800)]
Merge tag 'v4.9.168' into khadas-vim3-4.9.y
This is the 4.9.168 stable release
Nick [Tue, 21 May 2019 09:53:29 +0000 (17:53 +0800)]
Merge tag 'v4.9.167' into khadas-vim3-4.9.y
This is the 4.9.167 stable release
Nick [Tue, 21 May 2019 09:53:26 +0000 (17:53 +0800)]
Merge tag 'v4.9.166' into khadas-vim3-4.9.y
This is the 4.9.166 stable release
Nick [Tue, 21 May 2019 09:53:24 +0000 (17:53 +0800)]
Merge tag 'v4.9.165' into khadas-vim3-4.9.y
This is the 4.9.165 stable release
Nick [Tue, 21 May 2019 09:53:20 +0000 (17:53 +0800)]
Merge tag 'v4.9.164' into khadas-vim3-4.9.y
This is the 4.9.164 stable release
Nick [Tue, 21 May 2019 09:53:16 +0000 (17:53 +0800)]
Merge tag 'v4.9.163' into khadas-vim3-4.9.y
This is the 4.9.163 stable release
Nick [Tue, 21 May 2019 09:53:13 +0000 (17:53 +0800)]
Merge tag 'v4.9.162' into khadas-vim3-4.9.y
This is the 4.9.162 stable release
Nick [Tue, 21 May 2019 09:53:00 +0000 (17:53 +0800)]
Merge tag 'v4.9.161' into khadas-vim3-4.9.y
This is the 4.9.161 stable release
Conflicts:
Makefile
arch/arm64/include/asm/arch_gicv3.h
Nick [Tue, 21 May 2019 09:48:22 +0000 (17:48 +0800)]
Merge tag 'v4.9.160' into khadas-vim3-4.9.y
This is the 4.9.160 stable release
Nick [Tue, 21 May 2019 09:48:18 +0000 (17:48 +0800)]
Merge tag 'v4.9.159' into khadas-vim3-4.9.y
This is the 4.9.159 stable release
Nick [Tue, 21 May 2019 09:48:15 +0000 (17:48 +0800)]
Merge tag 'v4.9.158' into khadas-vim3-4.9.y
This is the 4.9.158 stable release
Nick [Tue, 21 May 2019 09:48:12 +0000 (17:48 +0800)]
Merge tag 'v4.9.157' into khadas-vim3-4.9.y
This is the 4.9.157 stable release
Nick [Tue, 21 May 2019 09:48:09 +0000 (17:48 +0800)]
Merge tag 'v4.9.156' into khadas-vim3-4.9.y
This is the 4.9.156 stable release
Nick [Tue, 21 May 2019 09:48:06 +0000 (17:48 +0800)]
Merge tag 'v4.9.155' into khadas-vim3-4.9.y
This is the 4.9.155 stable release
Nick [Tue, 21 May 2019 09:48:03 +0000 (17:48 +0800)]
Merge tag 'v4.9.154' into khadas-vim3-4.9.y
This is the 4.9.154 stable release
Nick [Tue, 21 May 2019 09:48:00 +0000 (17:48 +0800)]
Merge tag 'v4.9.153' into khadas-vim3-4.9.y
This is the 4.9.153 stable release
Nick [Tue, 21 May 2019 09:47:45 +0000 (17:47 +0800)]
Merge tag 'v4.9.152' into khadas-vim3-4.9.y
This is the 4.9.152 stable release
Conflicts:
drivers/gpu/drm/drm_fb_helper.c
fs/f2fs/recovery.c
Nick [Tue, 21 May 2019 09:43:52 +0000 (17:43 +0800)]
Merge tag 'v4.9.151' into khadas-vim3-4.9.y
This is the 4.9.151 stable release
Nick [Tue, 21 May 2019 09:43:49 +0000 (17:43 +0800)]
Merge tag 'v4.9.150' into khadas-vim3-4.9.y
This is the 4.9.150 stable release
Nick [Tue, 21 May 2019 09:43:45 +0000 (17:43 +0800)]
Merge tag 'v4.9.149' into khadas-vim3-4.9.y
This is the 4.9.149 stable release
Nick [Tue, 21 May 2019 09:43:37 +0000 (17:43 +0800)]
Merge tag 'v4.9.148' into khadas-vim3-4.9.y
This is the 4.9.148 stable release
Conflicts:
drivers/mmc/core/mmc.c
Nick [Tue, 21 May 2019 09:43:12 +0000 (17:43 +0800)]
Merge tag 'v4.9.147' into khadas-vim3-4.9.y
This is the 4.9.147 stable release
Nick [Tue, 21 May 2019 09:43:09 +0000 (17:43 +0800)]
Merge tag 'v4.9.146' into khadas-vim3-4.9.y
This is the 4.9.146 stable release
Nick [Tue, 21 May 2019 09:43:05 +0000 (17:43 +0800)]
Merge tag 'v4.9.145' into khadas-vim3-4.9.y
This is the 4.9.145 stable release
Nick [Tue, 21 May 2019 09:42:48 +0000 (17:42 +0800)]
Merge tag 'v4.9.144' into khadas-vim3-4.9.y
This is the 4.9.144 stable release
Conflicts:
drivers/android/binder.c
fs/f2fs/checkpoint.c
fs/f2fs/data.c
fs/f2fs/f2fs.h
fs/f2fs/inode.c
fs/f2fs/node.c
fs/f2fs/segment.c
fs/f2fs/segment.h
fs/f2fs/super.c
Nick [Tue, 21 May 2019 09:11:29 +0000 (17:11 +0800)]
Merge tag 'v4.9.143' into khadas-vim3-4.9.y
This is the 4.9.143 stable release
Conflicts:
Makefile
drivers/firmware/efi/libstub/Makefile
Nick [Tue, 21 May 2019 09:09:15 +0000 (17:09 +0800)]
Merge tag 'v4.9.142' into khadas-vim3-4.9.y
This is the 4.9.142 stable release
Conflicts:
kernel/debug/kdb/kdb_io.c
Nick [Tue, 21 May 2019 09:08:18 +0000 (17:08 +0800)]
Merge tag 'v4.9.141' into khadas-vim3-4.9.y
This is the 4.9.141 stable release
Nick [Tue, 21 May 2019 09:08:16 +0000 (17:08 +0800)]
Merge tag 'v4.9.140' into khadas-vim3-4.9.y
This is the 4.9.140 stable release
Nick [Tue, 21 May 2019 09:08:00 +0000 (17:08 +0800)]
Merge tag 'v4.9.139' into khadas-vim3-4.9.y
This is the 4.9.139 stable release
Conflicts:
Makefile
arch/arm/include/asm/system_misc.h
arch/x86/Makefile
drivers/firmware/efi/libstub/Makefile
net/ipv6/route.c
Nick [Tue, 21 May 2019 08:54:43 +0000 (16:54 +0800)]
Merge tag 'v4.9.138' into khadas-vim3-4.9.y
This is the 4.9.138 stable release
Nick [Tue, 21 May 2019 08:54:39 +0000 (16:54 +0800)]
Merge tag 'v4.9.137' into khadas-vim3-4.9.y
This is the 4.9.137 stable release
Nick [Tue, 21 May 2019 08:54:36 +0000 (16:54 +0800)]
Merge tag 'v4.9.136' into khadas-vim3-4.9.y
This is the 4.9.136 stable release
Nick [Tue, 21 May 2019 08:54:27 +0000 (16:54 +0800)]
Merge tag 'v4.9.135' into khadas-vim3-4.9.y
This is the 4.9.135 stable release
Conflicts:
kernel/sched/cputime.c
Nick [Tue, 21 May 2019 08:53:22 +0000 (16:53 +0800)]
Merge tag 'v4.9.134' into khadas-vim3-4.9.y
This is the 4.9.134 stable release
Nick [Tue, 21 May 2019 08:52:47 +0000 (16:52 +0800)]
Merge tag 'v4.9.133' into khadas-vim3-4.9.y
This is the 4.9.133 stable release
Conflicts:
drivers/base/power/main.c
fs/f2fs/checkpoint.c
Nick [Tue, 21 May 2019 08:51:17 +0000 (16:51 +0800)]
Merge tag 'v4.9.132' into khadas-vim3-4.9.y
This is the 4.9.132 stable release
Nick [Tue, 21 May 2019 08:51:00 +0000 (16:51 +0800)]
Merge tag 'v4.9.131' into khadas-vim3-4.9.y
This is the 4.9.131 stable release
Conflicts:
drivers/thermal/of-thermal.c
include/linux/arm-smccc.h
Nick [Tue, 21 May 2019 08:45:07 +0000 (16:45 +0800)]
Merge tag 'v4.9.130' into khadas-vim3-4.9.y
This is the 4.9.130 stable release
Nick [Tue, 21 May 2019 08:45:03 +0000 (16:45 +0800)]
Merge tag 'v4.9.129' into khadas-vim3-4.9.y
This is the 4.9.129 stable release
Nick [Tue, 21 May 2019 08:44:45 +0000 (16:44 +0800)]
Merge tag 'v4.9.128' into khadas-vim3-4.9.y
This is the 4.9.128 stable release
Conflicts:
kernel/fork.c
Nick [Tue, 21 May 2019 08:42:34 +0000 (16:42 +0800)]
Merge tag 'v4.9.127' into khadas-vim3-4.9.y
This is the 4.9.127 stable release
Conflicts:
include/linux/pci_ids.h
lib/debugobjects.c
Nick [Tue, 21 May 2019 08:40:28 +0000 (16:40 +0800)]
Merge tag 'v4.9.126' into khadas-vim3-4.9.y
This is the 4.9.126 stable release
Nick [Tue, 21 May 2019 08:39:47 +0000 (16:39 +0800)]
Merge tag 'v4.9.125' into khadas-vim3-4.9.y
This is the 4.9.125 stable release
Conflicts:
arch/arm64/mm/init.c
fs/squashfs/file_cache.c
Nick [Tue, 21 May 2019 08:37:24 +0000 (16:37 +0800)]
Merge tag 'v4.9.124' into khadas-vim3-4.9.y
This is the 4.9.124 stable release
Conflicts:
arch/arm/configs/imx_v4_v5_defconfig
arch/arm/configs/imx_v6_v7_defconfig
Nick [Tue, 21 May 2019 08:37:05 +0000 (16:37 +0800)]
Merge tag 'v4.9.123' into khadas-vim3-4.9.y
This is the 4.9.123 stable release
Nick [Tue, 21 May 2019 08:37:02 +0000 (16:37 +0800)]
Merge tag 'v4.9.122' into khadas-vim3-4.9.y
This is the 4.9.122 stable release
Nick [Tue, 21 May 2019 08:36:58 +0000 (16:36 +0800)]
Merge tag 'v4.9.121' into khadas-vim3-4.9.y
This is the 4.9.121 stable release
Nick [Tue, 21 May 2019 08:36:35 +0000 (16:36 +0800)]
Merge tag 'v4.9.120' into khadas-vim3-4.9.y
This is the 4.9.120 stable release
Conflicts:
fs/ext4/ialloc.c
include/linux/compiler-clang.h
include/linux/cpu.h
kernel/softirq.c
Nick [Tue, 21 May 2019 08:17:29 +0000 (16:17 +0800)]
Merge tag 'v4.9.119' into khadas-vim3-4.9.y
This is the 4.9.119 stable release
Conflicts:
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Nick [Tue, 21 May 2019 08:16:34 +0000 (16:16 +0800)]
Revert "ANDROID: Squashfs: refactor page_actor"
This reverts commit
38840afd42c86ce39b70b286ee695ca821257666.
Nick [Tue, 21 May 2019 08:16:25 +0000 (16:16 +0800)]
Revert "ANDROID: Squashfs: replace buffer_head with BIO"
This reverts commit
6c8928f646c6b4a51f594f30c31f37b7e958dfbf.
Nick [Tue, 21 May 2019 08:16:09 +0000 (16:16 +0800)]
Revert "ANDROID: Squashfs: implement .readpages()"
This reverts commit
d840c1d77287f739323541777c56baf02b130d3d.
Nick [Tue, 21 May 2019 08:13:59 +0000 (16:13 +0800)]
Revert "ANDROID: Squashfs: optimize reading uncompressed data"
This reverts commit
60cc09a9e3fcc670d336a19eecaf9d4a81def90c.
Nick [Tue, 21 May 2019 08:09:59 +0000 (16:09 +0800)]
Merge tag 'v4.9.117' into khadas-vim3-4.9.y
This is the 4.9.117 stable release
Conflicts:
drivers/media/media-device.c
Nick [Tue, 21 May 2019 08:08:39 +0000 (16:08 +0800)]
Merge tag 'v4.9.116' into khadas-vim3-4.9.y
This is the 4.9.116 stable release
Nick [Tue, 21 May 2019 08:08:34 +0000 (16:08 +0800)]
Merge tag 'v4.9.115' into khadas-vim3-4.9.y
This is the 4.9.115 stable release
Nick [Tue, 21 May 2019 08:00:26 +0000 (16:00 +0800)]
Merge tag 'v4.9.114' into khadas-vim3-4.9.y
This is the 4.9.114 stable release
Conflicts:
arch/arm64/include/asm/assembler.h
arch/arm64/include/asm/cpucaps.h
arch/arm64/include/asm/cpufeature.h
arch/arm64/include/asm/percpu.h
include/linux/compiler-gcc.h
Nick [Sat, 18 May 2019 10:18:47 +0000 (18:18 +0800)]
arm64: config: VIM3/VIM3L: disable CONFIG_AMLOGIC_PAGE_TRACE
remove errors:
[ 0.000000] can't find symbol:arm_dma_alloc
[ 0.000000] can't find symbol:__alloc_from_contiguous
[ 0.000000] can't find symbol:cma_allocator_alloc
[ 0.000000] 0, addr:
ffffff8009af84c0 + 130, aml_cma_alloc_post_hook
[ 0.000000] 1, addr:
ffffff800960adc8 + 78, dma_alloc_from_contiguous
[ 0.000000] 2, addr:
ffffff8009218f48 + 2b8, cma_alloc
[ 0.000000] 3, addr:
ffffff8009212948 + 300, __kmalloc_track_caller
[ 0.000000] 4, addr:
ffffff800920fb38 + 300, __kmalloc
[ 0.000000] 5, addr:
ffffff800920f830 + 248, kmem_cache_alloc_trace
[ 0.000000] 6, addr:
ffffff800920f5e8 + 248, kmem_cache_alloc
[ 0.000000] 7, addr:
ffffff800920f560 + 88, __slab_alloc.isra.28.constprop.33
[ 0.000000] 8, addr:
ffffff800920f1b8 + 3a8, ___slab_alloc.constprop.34
[ 0.000000] 9, addr:
ffffff800920cf20 + 3c8, new_slab
[ 0.000000] 10, addr:
ffffff8009200220 + 70, vmalloc
[ 0.000000] 11, addr:
ffffff8009200138 + 70, vzalloc
[ 0.000000] 12, addr:
ffffff80091ffc08 + 290, __vmalloc_node_range
[ 0.000000] 13, addr:
ffffff80091e5028 + 138, kmalloc_order_trace
[ 0.000000] 14, addr:
ffffff80091e4ea8 + 180, kmalloc_order
[ 0.000000] 15, addr:
ffffff80091c5be8 + 168, __alloc_page_frag
[ 0.000000] 16, addr:
ffffff80091c5b80 + 68, alloc_pages_exact
[ 0.000000] 17, addr:
ffffff80091c5b50 + 30, get_zeroed_page
[ 0.000000] 18, addr:
ffffff80091c5b00 + 50, __get_free_pages
[ 0.000000] 19, addr:
ffffff80091c4d30 + dd0, __alloc_pages_nodemask
[ 0.000000] 20, addr:
ffffff800909baf0 + 258, __dma_alloc
Nick [Sat, 18 May 2019 09:39:12 +0000 (17:39 +0800)]
media/vout: when panel is not connected, set vout_mode_uboot to hdmimode
Nick [Sat, 18 May 2019 08:11:15 +0000 (16:11 +0800)]
media/vout: add kernel param 'panel_exist=' for panel detection
Nick [Fri, 17 May 2019 08:29:41 +0000 (16:29 +0800)]
arm64: config: VIM3/VIM3L: update configuration
Nick [Fri, 17 May 2019 08:21:07 +0000 (16:21 +0800)]
xen: Remove -fshort-wchar gcc flag
fixup make distclean error
drivers/xen/Makefile:13: *** Recursive variable 'LDFLAGS' references itself (eventually). Stop.
Nick [Fri, 17 May 2019 08:20:24 +0000 (16:20 +0800)]
vout: Fix hdmi display hotplug issue
Ray [Wed, 20 Feb 2019 14:16:11 +0000 (15:16 +0100)]
CEC: AOCEC libcec support
Nick [Fri, 17 May 2019 08:05:21 +0000 (16:05 +0800)]
arm64: config: VIM3/VIM3L: enable CONFIG_FHANDLE
Nick [Fri, 17 May 2019 08:02:49 +0000 (16:02 +0800)]
media: improve the video playback
Nick [Fri, 17 May 2019 07:56:56 +0000 (15:56 +0800)]
osd: support flexible fb size with free scale option
Nick [Fri, 17 May 2019 07:51:21 +0000 (15:51 +0800)]
vout: update current vout mode string
Nick [Fri, 17 May 2019 07:42:49 +0000 (15:42 +0800)]
force to set default 1080p60hz with invalid vmode setting
Nick [Fri, 17 May 2019 07:30:15 +0000 (15:30 +0800)]
osd: support flexible length of fb size
Nick [Fri, 17 May 2019 06:13:40 +0000 (14:13 +0800)]
fix amlogic driver build on GCC 7
Nick [Wed, 15 May 2019 13:33:19 +0000 (21:33 +0800)]
add media_modules
Nick [Wed, 15 May 2019 08:50:37 +0000 (16:50 +0800)]
vout: set default vout mode as HDMI always initialized
Nick [Fri, 17 May 2019 05:42:32 +0000 (13:42 +0800)]
arm64: dts: VIM3/VIM3L: fixup sound card
Nick [Fri, 17 May 2019 04:03:05 +0000 (12:03 +0800)]
arm64: dts: VIM3/VIM3L: disable alsaPORT-pdm
Nick [Fri, 10 May 2019 09:43:56 +0000 (17:43 +0800)]
VIM3/VIM3L: add GPU driver r12p0
Nick [Fri, 10 May 2019 06:02:17 +0000 (14:02 +0800)]
osd/fb: set default color format for Linux
Nick [Fri, 17 May 2019 03:50:42 +0000 (11:50 +0800)]
arm64: dts: VIM3/VIM3L: support 4k framebuffer
Nick [Thu, 9 May 2019 09:37:14 +0000 (17:37 +0800)]
fixup bootup issue when CONFIG_FRAMEBUFFER_CONSOLE enabled
Nick [Thu, 9 May 2019 07:13:45 +0000 (15:13 +0800)]
config: VIM3/VIM3L: enable framebuffer console
Nick [Tue, 7 May 2019 10:19:50 +0000 (18:19 +0800)]
DHD: VIM3/VIM3L: disable CONFIG_PATH_AUTO_SELECT
use config.txt to select configuration file
terry [Sat, 27 Apr 2019 14:41:13 +0000 (22:41 +0800)]
RTC: VIM3/VIM3L: add khadas hym8563 rtc driver support
Nick [Mon, 6 May 2019 08:42:37 +0000 (16:42 +0800)]
VIM3/VIM3L: add bcmdhd driver
version bcmdhd.1.579.77.41.1
Nick [Fri, 17 May 2019 03:44:23 +0000 (11:44 +0800)]
arm64: dts: VIM3/VIM3L: change SPDIF out pin from GPIOAO_10
Nick [Fri, 17 May 2019 03:32:00 +0000 (11:32 +0800)]
arm64: dts: VIM3/VIM3L: disable remote
Nick [Sat, 20 Apr 2019 15:12:33 +0000 (23:12 +0800)]
VIM3/VIM3L: add Khadas TS050 MIPI LCD support
Nick [Sat, 20 Apr 2019 10:02:58 +0000 (18:02 +0800)]
add tca6408a driver
terry [Sat, 27 Apr 2019 14:52:07 +0000 (22:52 +0800)]
USB: default always enable usb port power
Nick [Fri, 17 May 2019 03:04:42 +0000 (11:04 +0800)]
arm64: dts: VIM3/VIM3L: fixup M.2 reset pin
Nick [Sat, 20 Apr 2019 07:25:12 +0000 (15:25 +0800)]
arm64: config: VIM3/VIM3L: enable NVMe
projects / platform / kernel / linux-amlogic.git / log