* linux-next: manual merge of the block tree with the ide and kspp-gustavo trees
@ 2021-06-21 4:11 Stephen Rothwell
2021-06-21 10:56 ` Andy Shevchenko
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2021-06-21 4:11 UTC (permalink / raw)
To: Jens Axboe, David Miller, Gustavo A. R. Silva
Cc: Alexander A. Klimov, Andy Shevchenko, Christoph Hellwig,
Finn Thain, Linux Kernel Mailing List, Linux Next Mailing List,
Vaibhav Gupta
[-- Attachment #1: Type: text/plain, Size: 2082 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the block tree with the ide and kspp-gustavo trees
2021-06-21 4:11 linux-next: manual merge of the block tree with the ide and kspp-gustavo trees Stephen Rothwell
@ 2021-06-21 10:56 ` Andy Shevchenko
2021-06-21 12:30 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Andy Shevchenko @ 2021-06-21 10:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jens Axboe, David Miller, Gustavo A. R. Silva,
Alexander A. Klimov, Andy Shevchenko, Christoph Hellwig,
Finn Thain, Linux Kernel Mailing List, Linux Next Mailing List,
Vaibhav Gupta
On Mon, Jun 21, 2021 at 7:13 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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:
As far as I can tell the IDE hasn't sent PR to LInus for a long time
(like a few release cycles). I don't know what happened there, though.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the block tree with the ide and kspp-gustavo trees
2021-06-21 10:56 ` Andy Shevchenko
@ 2021-06-21 12:30 ` Stephen Rothwell
2021-06-28 11:36 ` Andy Shevchenko
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2021-06-21 12:30 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Stephen Rothwell, Jens Axboe, David Miller, Gustavo A. R. Silva,
Alexander A. Klimov, Andy Shevchenko, Christoph Hellwig,
Finn Thain, Linux Kernel Mailing List, Linux Next Mailing List,
Vaibhav Gupta
[-- Attachment #1: Type: text/plain, Size: 1087 bytes --]
Hi Andy,
On Mon, 21 Jun 2021 13:56:13 +0300 Andy Shevchenko <andy.shevchenko@gmail.com> wrote:
>
> On Mon, Jun 21, 2021 at 7:13 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>
> > 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:
>
> As far as I can tell the IDE hasn't sent PR to LInus for a long time
> (like a few release cycles). I don't know what happened there, though.
Yeah, the top commit in the ide tree (which is intended to hold bug
fixes for Linus' tree) is dated 4 Aug 2020, so hopefully this will
prompt Dave to do something with it. There has been no ide "future
development" tree in linux-next since 2011.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the block tree with the ide and kspp-gustavo trees
2021-06-21 12:30 ` Stephen Rothwell
@ 2021-06-28 11:36 ` Andy Shevchenko
2021-06-28 22:50 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Andy Shevchenko @ 2021-06-28 11:36 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Stephen Rothwell, Jens Axboe, David Miller, Gustavo A. R. Silva,
Alexander A. Klimov, Christoph Hellwig, Finn Thain,
Linux Kernel Mailing List, Linux Next Mailing List,
Vaibhav Gupta
On Mon, Jun 21, 2021 at 10:30:45PM +1000, Stephen Rothwell wrote:
> On Mon, 21 Jun 2021 13:56:13 +0300 Andy Shevchenko <andy.shevchenko@gmail.com> wrote:
> > On Mon, Jun 21, 2021 at 7:13 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > > 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:
> >
> > As far as I can tell the IDE hasn't sent PR to LInus for a long time
> > (like a few release cycles). I don't know what happened there, though.
>
> Yeah, the top commit in the ide tree (which is intended to hold bug
> fixes for Linus' tree) is dated 4 Aug 2020, so hopefully this will
> prompt Dave to do something with it. There has been no ide "future
> development" tree in linux-next since 2011.
Yep, I think the best approach here may be to apply those (by sending a PR)
followed by marking subsystem orphaned or delete it entirely.
David, what are your thoughts?
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the block tree with the ide and kspp-gustavo trees
2021-06-28 11:36 ` Andy Shevchenko
@ 2021-06-28 22:50 ` Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2021-06-28 22:50 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Stephen Rothwell, Jens Axboe, David Miller, Gustavo A. R. Silva,
Alexander A. Klimov, Christoph Hellwig, Finn Thain,
Linux Kernel Mailing List, Linux Next Mailing List,
Vaibhav Gupta
[-- Attachment #1: Type: text/plain, Size: 1698 bytes --]
Hi all,
On Mon, 28 Jun 2021 14:36:16 +0300 Andy Shevchenko <andy.shevchenko@gmail.com> wrote:
>
> On Mon, Jun 21, 2021 at 10:30:45PM +1000, Stephen Rothwell wrote:
> > On Mon, 21 Jun 2021 13:56:13 +0300 Andy Shevchenko <andy.shevchenko@gmail.com> wrote:
> > > On Mon, Jun 21, 2021 at 7:13 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > > 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:
> > >
> > > As far as I can tell the IDE hasn't sent PR to LInus for a long time
> > > (like a few release cycles). I don't know what happened there, though.
> >
> > Yeah, the top commit in the ide tree (which is intended to hold bug
> > fixes for Linus' tree) is dated 4 Aug 2020, so hopefully this will
> > prompt Dave to do something with it. There has been no ide "future
> > development" tree in linux-next since 2011.
>
> Yep, I think the best approach here may be to apply those (by sending a PR)
> followed by marking subsystem orphaned or delete it entirely.
>
> David, what are your thoughts?
Well the conflicting block tree commits have now been merged into
Linus' tree and completely remove drivers/ide, so I will just remove
the ide tree from linux-next starting tomorrow.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-06-28 22:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-21 4:11 linux-next: manual merge of the block tree with the ide and kspp-gustavo trees Stephen Rothwell
2021-06-21 10:56 ` Andy Shevchenko
2021-06-21 12:30 ` Stephen Rothwell
2021-06-28 11:36 ` Andy Shevchenko
2021-06-28 22:50 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).