Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the configfs tree with the vfs-fixes tree
@ 2019-09-12 13:44 Stephen Rothwell
  2019-09-12 13:47 ` Christoph Hellwig
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2019-09-12 13:44 UTC (permalink / raw)
  To: Christoph Hellwig, Al Viro
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

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

Hi all,

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

  fs/configfs/symlink.c

between commit:

  e272d4fb74d6 ("configfs: fix a deadlock in configfs_symlink()")

from the vfs-fixes tree and commit:

  351e5d869e5a ("configfs: fix a deadlock in configfs_symlink()")

from the configfs tree.

These are slightly different version of the same fix.

I fixed it up (I used the former version) 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] 3+ messages in thread

* Re: linux-next: manual merge of the configfs tree with the vfs-fixes tree
  2019-09-12 13:44 linux-next: manual merge of the configfs tree with the vfs-fixes tree Stephen Rothwell
@ 2019-09-12 13:47 ` Christoph Hellwig
  2019-09-13 21:58   ` Al Viro
  0 siblings, 1 reply; 3+ messages in thread
From: Christoph Hellwig @ 2019-09-12 13:47 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Christoph Hellwig, Al Viro, Linux Next Mailing List,
	Linux Kernel Mailing List

On Thu, Sep 12, 2019 at 11:44:12PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the configfs tree got a conflict in:
> 
>   fs/configfs/symlink.c
> 
> between commit:
> 
>   e272d4fb74d6 ("configfs: fix a deadlock in configfs_symlink()")
> 
> from the vfs-fixes tree and commit:

The configfs one has been rebased.  I also have another refactoring
after this one before the rest of Als patches, so you'll run into
more issues.

Al, can you drop the branch from your tree?

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

* Re: linux-next: manual merge of the configfs tree with the vfs-fixes tree
  2019-09-12 13:47 ` Christoph Hellwig
@ 2019-09-13 21:58   ` Al Viro
  0 siblings, 0 replies; 3+ messages in thread
From: Al Viro @ 2019-09-13 21:58 UTC (permalink / raw)
  To: Christoph Hellwig
  Cc: Stephen Rothwell, Linux Next Mailing List, Linux Kernel Mailing List

On Thu, Sep 12, 2019 at 03:47:16PM +0200, Christoph Hellwig wrote:
> On Thu, Sep 12, 2019 at 11:44:12PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the configfs tree got a conflict in:
> > 
> >   fs/configfs/symlink.c
> > 
> > between commit:
> > 
> >   e272d4fb74d6 ("configfs: fix a deadlock in configfs_symlink()")
> > 
> > from the vfs-fixes tree and commit:
> 
> The configfs one has been rebased.  I also have another refactoring
> after this one before the rest of Als patches, so you'll run into
> more issues.
> 
> Al, can you drop the branch from your tree?

Done.

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

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-12 13:44 linux-next: manual merge of the configfs tree with the vfs-fixes tree Stephen Rothwell
2019-09-12 13:47 ` Christoph Hellwig
2019-09-13 21:58   ` Al Viro

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 linux-next@archiver.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