Hi Linus,
please pull the following changes to your tree.
There are some patches in Andrew's queue which also touches microblaze
Kbuild which is also touched by this pull request. But I can't see any
issue in resolution of that conflict in linux-next.
I have tried to merge it with your current HEAD and I can't see any
issue. Please let me know if there is any problem.
Thanks,
Michal
The following changes since commit bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9:
Linux 5.6-rc1 (2020-02-09 16:08:48 -0800)
are available in the Git repository at:
git://git.monstr.eu/linux-2.6-microblaze.git tags/microblaze-v5.7-rc1
for you to fetch changes up to 9fd1a1c9b3f2a38a5357a13335e0b9e5f21d093b:
microblaze: Replace setup_irq() by request_irq() (2020-03-09 14:36:23
+0100)
----------------------------------------------------------------
Microblaze patches for 5.7-rc1
- Convert license headers to SPDX
- Cleanup header handling and use asm-generic one
- Get rid of earlyprintk residues
- Define barriers and use it in the code
- Get rid of setup_irq() for timer
- Various small addons and fixes
----------------------------------------------------------------
Arvind Sankar (1):
microblaze: Stop printing the virtual memory layout
Michal Simek (8):
microblaze: Kernel parameters should be parsed earlier
microblaze: Fix _reset() function
microblaze: Convert headers to SPDX license
microblaze: Remove architecture tlb.h and use generic one
microblaze: Remove early printk setup
microblaze: Remove empty headers
microblaze: Remove unused boot_cpuid variable
microblaze: Use asm generic cmpxchg.h for !SMP case
Stefan Asserhall (4):
microblaze: Define microblaze barrier
microblaze: Add sync to tlb operations
microblaze: Add missing irqflags.h header
microblaze: Define percpu sestion in linker file
afzal mohammed (1):
microblaze: Replace setup_irq() by request_irq()
arch/microblaze/include/asm/Kbuild | 4 +++-
arch/microblaze/include/asm/barrier.h | 13 +++++++++++++
arch/microblaze/include/asm/cache.h | 5 +----
arch/microblaze/include/asm/cacheflush.h | 6 +-----
arch/microblaze/include/asm/checksum.h | 5 +----
arch/microblaze/include/asm/cmpxchg.h | 40
+++-------------------------------------
arch/microblaze/include/asm/cpuinfo.h | 5 +----
arch/microblaze/include/asm/cputable.h | 1 -
arch/microblaze/include/asm/current.h | 5 +----
arch/microblaze/include/asm/delay.h | 7 +------
arch/microblaze/include/asm/dma.h | 5 +----
arch/microblaze/include/asm/elf.h | 5 +----
arch/microblaze/include/asm/entry.h | 5 +----
arch/microblaze/include/asm/exceptions.h | 5 +----
arch/microblaze/include/asm/fixmap.h | 5 +----
arch/microblaze/include/asm/flat.h | 5 +----
arch/microblaze/include/asm/hw_irq.h | 1 -
arch/microblaze/include/asm/io.h | 5 +----
arch/microblaze/include/asm/irq.h | 5 +----
arch/microblaze/include/asm/irqflags.h | 5 +----
arch/microblaze/include/asm/mmu.h | 5 +----
arch/microblaze/include/asm/mmu_context_mm.h | 5 +----
arch/microblaze/include/asm/module.h | 5 +----
arch/microblaze/include/asm/page.h | 5 +----
arch/microblaze/include/asm/pgalloc.h | 5 +----
arch/microblaze/include/asm/pgtable.h | 5 +----
arch/microblaze/include/asm/processor.h | 5 +----
arch/microblaze/include/asm/ptrace.h | 5 +----
arch/microblaze/include/asm/pvr.h | 5 +----
arch/microblaze/include/asm/registers.h | 5 +----
arch/microblaze/include/asm/sections.h | 5 +----
arch/microblaze/include/asm/setup.h | 7 +------
arch/microblaze/include/asm/string.h | 5 +----
arch/microblaze/include/asm/switch_to.h | 5 +----
arch/microblaze/include/asm/thread_info.h | 5 +----
arch/microblaze/include/asm/timex.h | 5 +----
arch/microblaze/include/asm/tlb.h | 17 -----------------
arch/microblaze/include/asm/tlbflush.h | 5 +----
arch/microblaze/include/asm/uaccess.h | 5 +----
arch/microblaze/include/asm/unaligned.h | 5 +----
arch/microblaze/include/asm/unistd.h | 5 +----
arch/microblaze/include/asm/unwind.h | 5 +----
arch/microblaze/include/asm/user.h | 1 -
arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c | 7 +------
arch/microblaze/kernel/cpu/pvr.c | 1 +
arch/microblaze/kernel/entry.S | 1 +
arch/microblaze/kernel/misc.S | 3 ++-
arch/microblaze/kernel/setup.c | 2 --
arch/microblaze/kernel/timer.c | 10 ++--------
arch/microblaze/kernel/vmlinux.lds.S | 3 +++
arch/microblaze/mm/init.c | 14 ++------------
51 files changed, 67 insertions(+), 236 deletions(-)
create mode 100644 arch/microblaze/include/asm/barrier.h
delete mode 100644 arch/microblaze/include/asm/cputable.h
delete mode 100644 arch/microblaze/include/asm/hw_irq.h
delete mode 100644 arch/microblaze/include/asm/tlb.h
delete mode 100644 arch/microblaze/include/asm/user.h
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs
The pull request you sent on Tue, 31 Mar 2020 16:54:39 +0200:
> git://git.monstr.eu/linux-2.6-microblaze.git tags/microblaze-v5.7-rc1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/a8222fd5b80c7ec83f257060670becbeea9b50b9
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker