From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Jens Axboe <axboe@kernel•dk>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Weiping Zhang <zhangweiping@didiglobal•com>,
Kimberly Brown <kimbrownkd@gmail•com>
Subject: Re: linux-next: manual merge of the driver-core tree with the block tree
Date: Wed, 8 May 2019 12:25:55 +1000 [thread overview]
Message-ID: <20190508122555.5a19caea@canb.auug.org.au> (raw)
In-Reply-To: <20190429152400.281524b7@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1048 bytes --]
Hi all,
On Mon, 29 Apr 2019 15:24:00 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> block/blk-sysfs.c
>
> between commit:
>
> 4d25339e32a1 ("block: don't show io_timeout if driver has no timeout handler")
>
> from the block tree and commit:
>
> 800f5aa1e7e1 ("block: Replace all ktype default_attrs with groups")
>
> from the driver-core tree.
>
> I fixed it up (the former stopped using the default_attrs field, so I
> effectively reverted the latter changes to this file) 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.
This is now a conflict between the block tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-05-08 2:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-29 5:24 linux-next: manual merge of the driver-core tree with the block tree Stephen Rothwell
2019-05-08 2:25 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-12-05 2:11 Stephen Rothwell
2022-12-05 8:03 ` Greg KH
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=20190508122555.5a19caea@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=greg@kroah$(echo .)com \
--cc=kimbrownkd@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=zhangweiping@didiglobal$(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