From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <axboe@kernel•dk>, David Miller <davem@davemloft•net>,
"Gustavo A. R. Silva" <gustavo@embeddedor•com>
Cc: "Alexander A. Klimov" <grandmaster@al2klimov•de>,
Andy Shevchenko <andriy.shevchenko@linux•intel.com>,
Christoph Hellwig <hch@lst•de>,
Finn Thain <fthain@linux-m68k•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Vaibhav Gupta <vaibhavgupta40@gmail•com>
Subject: linux-next: manual merge of the block tree with the ide and kspp-gustavo trees
Date: Mon, 21 Jun 2021 14:11:10 +1000 [thread overview]
Message-ID: <20210621141110.548ec3d0@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2021-06-21 4:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-21 4:11 Stephen Rothwell [this message]
2021-06-21 10:56 ` linux-next: manual merge of the block tree with the ide and kspp-gustavo trees Andy Shevchenko
2021-06-21 12:30 ` Stephen Rothwell
2021-06-28 11:36 ` Andy Shevchenko
2021-06-28 22:50 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210621141110.548ec3d0@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andriy.shevchenko@linux$(echo .)intel.com \
--cc=axboe@kernel$(echo .)dk \
--cc=davem@davemloft$(echo .)net \
--cc=fthain@linux-m68k$(echo .)org \
--cc=grandmaster@al2klimov$(echo .)de \
--cc=gustavo@embeddedor$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=vaibhavgupta40@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox