From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jeff Layton <jlayton@kernel•org>, Ilya Dryomov <idryomov@gmail•com>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Michal Hocko <mhocko@suse•com>,
Venky Shankar <vshankar@redhat•com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the ceph tree
Date: Mon, 17 Jan 2022 08:57:00 +1100 [thread overview]
Message-ID: <20220117085700.389949a8@canb.auug.org.au> (raw)
In-Reply-To: <20220114145502.2ab21d46@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2972 bytes --]
Hi all,
On Fri, 14 Jan 2022 14:55:02 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got conflicts in:
>
> include/linux/ceph/libceph.h
> net/ceph/ceph_common.c
>
> between commit:
>
> 4153c7fc937a ("libceph: rename parse_fsid() to ceph_parse_fsid() and export")
>
> from the ceph tree and commit:
>
> f9126de5849a ("mm: allow !GFP_KERNEL allocations for kvmalloc")
>
> from the akpm-current 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.
>
>
> diff --cc include/linux/ceph/libceph.h
> index 644f224eccf7,309acbcb5a8a..000000000000
> --- a/include/linux/ceph/libceph.h
> +++ b/include/linux/ceph/libceph.h
> @@@ -295,8 -295,6 +295,7 @@@ extern bool libceph_compatible(void *da
>
> extern const char *ceph_msg_type_name(int type);
> extern int ceph_check_fsid(struct ceph_client *client, struct ceph_fsid *fsid);
> - extern void *ceph_kvmalloc(size_t size, gfp_t flags);
> +extern int ceph_parse_fsid(const char *str, struct ceph_fsid *fsid);
>
> struct fs_parameter;
> struct fc_log;
> diff --cc net/ceph/ceph_common.c
> index decae43b4262,9441b4a4912b..000000000000
> --- a/net/ceph/ceph_common.c
> +++ b/net/ceph/ceph_common.c
> @@@ -190,34 -190,7 +190,7 @@@ int ceph_compare_options(struct ceph_op
> }
> EXPORT_SYMBOL(ceph_compare_options);
>
> - /*
> - * kvmalloc() doesn't fall back to the vmalloc allocator unless flags are
> - * compatible with (a superset of) GFP_KERNEL. This is because while the
> - * actual pages are allocated with the specified flags, the page table pages
> - * are always allocated with GFP_KERNEL.
> - *
> - * ceph_kvmalloc() may be called with GFP_KERNEL, GFP_NOFS or GFP_NOIO.
> - */
> - void *ceph_kvmalloc(size_t size, gfp_t flags)
> - {
> - void *p;
> -
> - if ((flags & (__GFP_IO | __GFP_FS)) == (__GFP_IO | __GFP_FS)) {
> - p = kvmalloc(size, flags);
> - } else if ((flags & (__GFP_IO | __GFP_FS)) == __GFP_IO) {
> - unsigned int nofs_flag = memalloc_nofs_save();
> - p = kvmalloc(size, GFP_KERNEL);
> - memalloc_nofs_restore(nofs_flag);
> - } else {
> - unsigned int noio_flag = memalloc_noio_save();
> - p = kvmalloc(size, GFP_KERNEL);
> - memalloc_noio_restore(noio_flag);
> - }
> -
> - return p;
> - }
> -
> -static int parse_fsid(const char *str, struct ceph_fsid *fsid)
> +int ceph_parse_fsid(const char *str, struct ceph_fsid *fsid)
> {
> int i = 0;
> char tmp[3];
This is now a conflict between the ceph tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2022-01-16 21:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-14 3:55 linux-next: manual merge of the akpm-current tree with the ceph tree Stephen Rothwell
2022-01-16 21:57 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220117085700.389949a8@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=idryomov@gmail$(echo .)com \
--cc=jlayton@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mhocko@suse$(echo .)com \
--cc=vshankar@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox