Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the set_fs tree with the battery tree
@ 2020-07-27 11:01 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2020-07-27 11:01 UTC (permalink / raw)
  To: Christoph Hellwig, Sebastian Reichel
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Yongqiang Liu


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

Hi all,

Today's linux-next merge of the set_fs tree got a conflict in:

  drivers/power/supply/da9030_battery.c

between commit:

  9d832cd36c60 ("power: Convert to DEFINE_SHOW_ATTRIBUTE")

from the battery tree and commit:

  4d4901c6d748 ("seq_file: switch over direct seq_read method calls to seq_read_iter")

from the set_fs tree.

I fixed it up (I just used the former) 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] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-27 11:01 linux-next: manual merge of the set_fs tree with the battery tree Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git