Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1449229
| Path | csiph.com!1.us.feeder.erje.net!feeder.erje.net!2.eu.feeder.erje.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod |
|---|---|
| From | Al Viro <viro@ZenIV.linux.org.uk> |
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the vfs tree with the overlayfs tree |
| Date | Mon, 25 Jul 2016 02:40:01 +0200 |
| Message-ID | <rYC65-69G-3@gated-at.bofh.it> (permalink) |
| References | <rYBWp-66u-3@gated-at.bofh.it> |
| X-Original-To | Stephen Rothwell <sfr@canb.auug.org.au> |
| MIME-Version | 1.0 |
| Content-Type | text/plain; charset=us-ascii |
| Content-Disposition | inline |
| User-Agent | Mutt/1.6.1 (2016-04-27) |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 26 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | Miklos Szeredi <miklos@szeredi.hu>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Miklos Szeredi <mszeredi@redhat.com> |
| X-Original-Date | Mon, 25 Jul 2016 01:30:28 +0100 |
| X-Original-Message-ID | <20160725003028.GQ2356@ZenIV.linux.org.uk> |
| X-Original-References | <20160725102453.7fbe3ddd@canb.auug.org.au> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1449229 |
Show key headers only | View raw
On Mon, Jul 25, 2016 at 10:24:53AM +1000, Stephen Rothwell wrote:
> Hi Al,
>
> Today's linux-next merge of the vfs tree got a conflict in:
>
> fs/overlayfs/super.c
>
> between commit:
>
> e2475b7276d0 ("ovl: check mounter creds on underlying lookup")
>
> from the overlayfs tree and commit:
>
> b3ac9a85b31c ("qstr: constify instances in overlayfs")
>
> from the vfs tree.
>
> I fixed it up (see below) 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.
FWIW, if Miklos could pick that one-liner into overlayfs tree, I'd be only
happy to drop it from that queue.
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
linux-next: manual merge of the vfs tree with the overlayfs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-25 02:30 +0200
Re: linux-next: manual merge of the vfs tree with the overlayfs tree Al Viro <viro@ZenIV.linux.org.uk> - 2016-07-25 02:40 +0200
Re: linux-next: manual merge of the vfs tree with the overlayfs tree Miklos Szeredi <miklos@szeredi.hu> - 2016-07-25 10:10 +0200
csiph-web