Re: linux-next: manual merge of the staging tree with the vfs tree

Greg KH
2020-03-12T07:36:44Z

On Thu, Mar 12, 2020 at 04:16:57PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got conflicts in:
>
> drivers/staging/exfat/Kconfig
> MAINTAINERS
>
> between commits:
>
> 88ab55f16aae ("MAINTAINERS: add exfat filesystem")
> 1a3c0509ce83 ("staging: exfat: make staging/exfat and fs/exfat mutually exclusive")
>
> from the vfs tree and commit:
>
> 590a95e418d1 ("staging: exfat: remove staging version of exfat filesystem")
>
> from the staging tree.
>
> I fixed it up (I removed the first file and 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.
>
> diff --cc MAINTAINERS
> index 4698de48c727,836f1e262b4e..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -6361,19 -6301,6 +6356,13 @@@ F: include/trace/events/mdio.
> F: include/uapi/linux/mdio.h
> F: include/uapi/linux/mii.h
>
> +EXFAT FILE SYSTEM
> +M: Namjae Jeon <namjae.jeon@samsung.com>
> +M: Sungjong Seo <sj1557.seo@samsung.com>
> +L: linux-fsdevel@vger.kernel.org
> +S: Maintained
> +F: fs/exfat/
> +
> - EXFAT FILE SYSTEM
> - M: Valdis Kletnieks <valdis.kletnieks@vt.edu>
> - L: linux-fsdevel@vger.kernel.org
> - S: Maintained
> - F: drivers/staging/exfat/
> -
> EXT2 FILE SYSTEM
> M: Jan Kara <jack@suse.com>
> L: linux-ext4@vger.kernel.org
>

Patch looks good to me, thanks!

greg k-h