LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: manual merge of the driver-core tree with the block tree
@ 2019-04-29  5:24 Stephen Rothwell
  2019-05-08  2:25 ` Stephen Rothwell
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2019-04-29  5:24 UTC (permalink / raw)
  To: Greg KH, Jens Axboe
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Weiping Zhang, Kimberly Brown

[-- Attachment #1: Type: text/plain, Size: 854 bytes --]

Hi all,

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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: linux-next: manual merge of the driver-core tree with the block tree
  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
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2019-05-08  2:25 UTC (permalink / raw)
  To: Greg KH, Jens Axboe
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Weiping Zhang, Kimberly Brown

[-- 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 --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-05-08  2:26 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 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).