lkml.org 
[lkml]   [2021]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the block tree with the ide and kspp-gustavo trees
Hi all,

Today's linux-next merge of the block tree got conflicts in:

drivers/ide/Kconfig
drivers/ide/aec62xx.c
drivers/ide/alim15x3.c
drivers/ide/amd74xx.c
drivers/ide/atiixp.c
drivers/ide/cmd64x.c
drivers/ide/cs5520.c
drivers/ide/cs5530.c
drivers/ide/cs5535.c
drivers/ide/cs5536.c
drivers/ide/cy82c693.c
drivers/ide/delkin_cb.c
drivers/ide/hpt366.c
drivers/ide/ide-acpi.c
drivers/ide/ide-pci-generic.c
drivers/ide/it8172.c
drivers/ide/it8213.c
drivers/ide/it821x.c
drivers/ide/jmicron.c
drivers/ide/ns87415.c
drivers/ide/opti621.c
drivers/ide/pdc202xx_new.c
drivers/ide/pdc202xx_old.c
drivers/ide/piix.c
drivers/ide/sc1200.c
drivers/ide/serverworks.c
drivers/ide/setup-pci.c
drivers/ide/siimage.c
drivers/ide/sis5513.c
drivers/ide/sl82c105.c
drivers/ide/slc90e66.c
drivers/ide/triflex.c
drivers/ide/via82cxxx.c
include/linux/ide.h

between commits:

2c8cbe0b2971 ("IDE SUBSYSTEM: Replace HTTP links with HTTPS ones")
9a51ffe845e4 ("ide: use generic power management")
f9e09a0711ca ("ide: sc1200: use generic power management")
d41b375134a9 ("ide: delkin_cb: use generic power management")
6800cd8cbc6e ("ide-acpi: use %*ph to print small buffer")
731d5f441e1c ("ide: Fix fall-through warnings for Clang")

from the ide and kspp-gustavo trees and commits:

cabd10be0b9e ("m68k/mac: Replace macide driver with generic platform drivers")
44b1fbc0f5f3 ("m68k/q40: Replace q40ide driver with pata_falcon and falconide")
b7fb14d3ac63 ("ide: remove the legacy ide driver")

from the block tree.

I fixed it up (the block tree commits above removed these files) 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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2021-06-21 06:12    [W:0.079 / U:0.180 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site