linux-kernel - linux-next: manual merge of the akpm-current tree with the microblaze tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20200226140942.1a944ba9@canb.auug.org.au>
Date:   Wed, 26 Feb 2020 14:09:42 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Michal Simek <monstr@...str.eu>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Masahiro Yamada <masahiroy@...nel.org>
Subject: linux-next: manual merge of the akpm-current tree with the
 microblaze tree

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  arch/microblaze/include/asm/Kbuild

between commits:

  59d85c0a3696 ("microblaze: Remove architecture tlb.h and use generic one")
  7e8f54cd4e26 ("microblaze: Remove empty headers")

from the microblaze tree and commit:

  3ece10f6aa9e ("asm-generic: make more kernel-space headers mandatory")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/microblaze/include/asm/Kbuild
index abb33619299b,f38696d2b462..000000000000
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@@ -1,40 -1,8 +1,11 @@@
  # SPDX-License-Identifier: GPL-2.0
  generated-y += syscall_table.h
- generic-y += bitops.h
- generic-y += bug.h
- generic-y += bugs.h
- generic-y += compat.h
- generic-y += device.h
- generic-y += div64.h
- generic-y += dma-mapping.h
- generic-y += emergency-restart.h
- generic-y += exec.h
  generic-y += extable.h
- generic-y += fb.h
- generic-y += hardirq.h
 +generic-y += hw_irq.h
- generic-y += irq_regs.h
- generic-y += irq_work.h
- generic-y += kdebug.h
- generic-y += kmap_types.h
- generic-y += kprobes.h
  generic-y += kvm_para.h
- generic-y += linkage.h
- generic-y += local.h
  generic-y += local64.h
  generic-y += mcs_spinlock.h
- generic-y += mm-arch-hooks.h
- generic-y += mmiowb.h
  generic-y += parport.h
- generic-y += percpu.h
- generic-y += preempt.h
- generic-y += serial.h
- generic-y += shmparam.h
  generic-y += syscalls.h
 +generic-y += tlb.h
- generic-y += topology.h
- generic-y += trace_clock.h
 +generic-y += user.h
- generic-y += vga.h
- generic-y += word-at-a-time.h
- generic-y += xor.h

Content of type "application/pgp-signature" skipped