Andrew Davis a57ba56bca arm64: dts: ti: k3-am64: Merge the two main_conf nodes ...

There are two nodes representing the same register space, this looks to
have been created by some merge or copy/paste error. Remove the second
instance of this node and move its children into the first instance.

Signed-off-by: Andrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20230802174521.236255-2-afd@ti.com
Signed-off-by: Nishanth Menon <nm@ti.com>

2023-08-05 14:17:09 -05:00

..

alpha

Merge branch 'expand-stack'

2023-06-28 20:35:21 -07:00

arc

Merge tag 'asm-generic-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2023-07-06 10:06:04 -07:00

arm

Merge tag 'asm-generic-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2023-07-06 10:06:04 -07:00

arm64

arm64: dts: ti: k3-am64: Merge the two main_conf nodes

2023-08-05 14:17:09 -05:00

csky

Merge tag 'csky-for-linus-6.5' of https://github.com/c-sky/csky-linux

2023-07-01 21:12:32 -07:00

hexagon

Merge branch 'expand-stack'

2023-06-28 20:35:21 -07:00

ia64

Merge tag 'kbuild-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2023-07-01 09:24:31 -07:00

loongarch

Merge tag 'asm-generic-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2023-07-06 10:06:04 -07:00

m68k

Merge tag 'asm-generic-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2023-07-06 10:06:04 -07:00

microblaze

Merge tag 'slab-for-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab

2023-06-29 16:34:12 -07:00

mips

Merge tag 'mips_6.5_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

2023-07-09 10:02:49 -07:00

nios2

Merge tag 'slab-for-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab

2023-06-29 16:34:12 -07:00

openrisc

Merge branch 'expand-stack'

2023-06-28 20:35:21 -07:00

parisc

parisc: syscalls: Avoid compiler warnings with W=1

2023-07-03 18:56:03 +02:00

powerpc

Merge tag 'powerpc-6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2023-07-07 10:00:30 -07:00

riscv

Merge tag 'riscv-for-linus-6.5-mw2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux

2023-07-07 10:07:19 -07:00

s390

Merge tag 's390-6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2023-07-06 13:18:30 -07:00

sh

Merge tag 'sh-for-v6.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux

2023-07-05 21:45:32 -07:00

sparc

Merge tag 'drm-next-2023-07-07' of git://anongit.freedesktop.org/drm/drm

2023-07-06 22:42:54 -07:00

um

Merge tag 'kbuild-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2023-07-01 09:24:31 -07:00

x86

Merge tag 'x86_urgent_for_v6.5_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2023-07-09 10:13:32 -07:00

xtensa

Merge tag 'powerpc-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2023-06-30 09:20:08 -07:00

.gitignore

…

Kconfig

Merge tag 'mm-nonmm-stable-2023-06-24-19-23' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2023-06-28 10:59:38 -07:00