linux-kernel - linux-next: manual merge of the mips tree with the arm-soc 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>] [day] [month] [year] [list]

Message-ID: <20190905101849.24d501a6@canb.auug.org.au>
Date:   Thu, 5 Sep 2019 10:18:49 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Ralf Baechle <ralf@...ux-mips.org>,
        James Hogan <jhogan@...nel.org>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Paul Cercueil <paul@...pouillou.net>,
        Paul Burton <paul.burton@...s.com>
Subject: linux-next: manual merge of the mips tree with the arm-soc tree

Hi all,

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

  drivers/video/fbdev/Makefile

between commit:

  c7b46e0c33c5 ("fbdev: remove w90x900/nuc900 platform drivers")

from the arm-soc tree and commit:

  e305bff3a706 ("video/fbdev: Drop JZ4740 driver")

from the mips 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 drivers/video/fbdev/Makefile
index aab7155884ea,49502d6256cb..000000000000
--- a/drivers/video/fbdev/Makefile
+++ b/drivers/video/fbdev/Makefile
@@@ -116,7 -116,7 +116,6 @@@ obj-y                             += om
  obj-$(CONFIG_XEN_FBDEV_FRONTEND)  += xen-fbfront.o
  obj-$(CONFIG_FB_CARMINE)          += carminefb.o
  obj-$(CONFIG_FB_MB862XX)	  += mb862xx/
- obj-$(CONFIG_FB_JZ4740)		  += jz4740_fb.o
 -obj-$(CONFIG_FB_NUC900)           += nuc900fb.o
  obj-$(CONFIG_FB_PUV3_UNIGFX)      += fb-puv3.o
  obj-$(CONFIG_FB_HYPERV)		  += hyperv_fb.o
  obj-$(CONFIG_FB_OPENCORES)	  += ocfb.o

Content of type "application/pgp-signature" skipped