From: Ben Widawsky <ben.widawsky@intel.com>
To: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Sasha Levin <sashal@kernel.org>,
linux-kernel@vger.kernel.org, stable@vger.kernel.org,
kernel test robot <lkp@intel.com>,
Dan Williams <dan.j.williams@intel.com>,
linux-doc@vger.kernel.org, linux-cxl@vger.kernel.org
Subject: Re: [PATCH AUTOSEL 5.14 03/25] cxl: Move cxl_core to new directory
Date: Tue, 14 Sep 2021 08:05:58 -0700 [thread overview]
Message-ID: <20210914150558.n3lbmmt7h6o2uz6a@intel.com> (raw)
In-Reply-To: <20210914095749.0000151f@Huawei.com>
On 21-09-14 09:57:49, Jonathan Cameron wrote:
> On Tue, 14 Sep 2021 09:56:23 +0100
> Jonathan Cameron <Jonathan.Cameron@Huawei.com> wrote:
>
> > On Mon, 13 Sep 2021 18:33:17 -0400
> > Sasha Levin <sashal@kernel.org> wrote:
> >
> > > From: Ben Widawsky <ben.widawsky@intel.com>
> > >
> > > [ Upstream commit 5161a55c069f53d88da49274cbef6e3c74eadea9 ]
> > >
> > > CXL core is growing, and it's already arguably unmanageable. To support
> > > future growth, move core functionality to a new directory and rename the
> > > file to represent just bus support. Future work will remove non-bus
> > > functionality.
> > >
> > > Note that mem.h is renamed to cxlmem.h to avoid a namespace collision
> > > with the global ARCH=um mem.h header.
> >
> > Not a fix...
> >
> > I'm guessing this got picked up on the basis of the Reported-by: tag?
> > I think that was added for a minor tweak as this went through review rather
> > than referring to the whole patch.
> Or possibly because it was a precursor to the fix in the next patch.
>
> Hmm. Ben, Dan, does it make sense for these two to go into stable?
>
> Jonathan
As of now, no, but having this will make future fixes much easier to cherry
pick.
>
> >
> > Jonathan
> >
> >
> > >
> > > Reported-by: kernel test robot <lkp@intel.com>
> > > Signed-off-by: Ben Widawsky <ben.widawsky@intel.com>
> > > Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> > > Link: https://lore.kernel.org/r/162792537866.368511.8915631504621088321.stgit@dwillia2-desk3.amr.corp.intel.com
> > > Signed-off-by: Dan Williams <dan.j.williams@intel.com>
> > > Signed-off-by: Sasha Levin <sashal@kernel.org>
> > > ---
> > > Documentation/driver-api/cxl/memory-devices.rst | 2 +-
> > > drivers/cxl/Makefile | 4 +---
> > > drivers/cxl/core/Makefile | 5 +++++
> > > drivers/cxl/{core.c => core/bus.c} | 4 ++--
> > > drivers/cxl/{mem.h => cxlmem.h} | 0
> > > drivers/cxl/pci.c | 2 +-
> > > drivers/cxl/pmem.c | 2 +-
> > > 7 files changed, 11 insertions(+), 8 deletions(-)
> > > create mode 100644 drivers/cxl/core/Makefile
> > > rename drivers/cxl/{core.c => core/bus.c} (99%)
> > > rename drivers/cxl/{mem.h => cxlmem.h} (100%)
> > >
> > > diff --git a/Documentation/driver-api/cxl/memory-devices.rst b/Documentation/driver-api/cxl/memory-devices.rst
> > > index 487ce4f41d77..a86e2c7c551a 100644
> > > --- a/Documentation/driver-api/cxl/memory-devices.rst
> > > +++ b/Documentation/driver-api/cxl/memory-devices.rst
> > > @@ -36,7 +36,7 @@ CXL Core
> > > .. kernel-doc:: drivers/cxl/cxl.h
> > > :internal:
> > >
> > > -.. kernel-doc:: drivers/cxl/core.c
> > > +.. kernel-doc:: drivers/cxl/core/bus.c
> > > :doc: cxl core
> > >
> > > External Interfaces
> > > diff --git a/drivers/cxl/Makefile b/drivers/cxl/Makefile
> > > index 32954059b37b..d1aaabc940f3 100644
> > > --- a/drivers/cxl/Makefile
> > > +++ b/drivers/cxl/Makefile
> > > @@ -1,11 +1,9 @@
> > > # SPDX-License-Identifier: GPL-2.0
> > > -obj-$(CONFIG_CXL_BUS) += cxl_core.o
> > > +obj-$(CONFIG_CXL_BUS) += core/
> > > obj-$(CONFIG_CXL_MEM) += cxl_pci.o
> > > obj-$(CONFIG_CXL_ACPI) += cxl_acpi.o
> > > obj-$(CONFIG_CXL_PMEM) += cxl_pmem.o
> > >
> > > -ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=CXL
> > > -cxl_core-y := core.o
> > > cxl_pci-y := pci.o
> > > cxl_acpi-y := acpi.o
> > > cxl_pmem-y := pmem.o
> > > diff --git a/drivers/cxl/core/Makefile b/drivers/cxl/core/Makefile
> > > new file mode 100644
> > > index 000000000000..ad137f96e5c8
> > > --- /dev/null
> > > +++ b/drivers/cxl/core/Makefile
> > > @@ -0,0 +1,5 @@
> > > +# SPDX-License-Identifier: GPL-2.0
> > > +obj-$(CONFIG_CXL_BUS) += cxl_core.o
> > > +
> > > +ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=CXL -I$(srctree)/drivers/cxl
> > > +cxl_core-y := bus.o
> > > diff --git a/drivers/cxl/core.c b/drivers/cxl/core/bus.c
> > > similarity index 99%
> > > rename from drivers/cxl/core.c
> > > rename to drivers/cxl/core/bus.c
> > > index a2e4d54fc7bc..0815eec23944 100644
> > > --- a/drivers/cxl/core.c
> > > +++ b/drivers/cxl/core/bus.c
> > > @@ -6,8 +6,8 @@
> > > #include <linux/pci.h>
> > > #include <linux/slab.h>
> > > #include <linux/idr.h>
> > > -#include "cxl.h"
> > > -#include "mem.h"
> > > +#include <cxlmem.h>
> > > +#include <cxl.h>
> > >
> > > /**
> > > * DOC: cxl core
> > > diff --git a/drivers/cxl/mem.h b/drivers/cxl/cxlmem.h
> > > similarity index 100%
> > > rename from drivers/cxl/mem.h
> > > rename to drivers/cxl/cxlmem.h
> > > diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c
> > > index 4cf351a3cf99..a945c5fda292 100644
> > > --- a/drivers/cxl/pci.c
> > > +++ b/drivers/cxl/pci.c
> > > @@ -12,9 +12,9 @@
> > > #include <linux/pci.h>
> > > #include <linux/io.h>
> > > #include <linux/io-64-nonatomic-lo-hi.h>
> > > +#include "cxlmem.h"
> > > #include "pci.h"
> > > #include "cxl.h"
> > > -#include "mem.h"
> > >
> > > /**
> > > * DOC: cxl pci
> > > diff --git a/drivers/cxl/pmem.c b/drivers/cxl/pmem.c
> > > index 0088e41dd2f3..9652c3ee41e7 100644
> > > --- a/drivers/cxl/pmem.c
> > > +++ b/drivers/cxl/pmem.c
> > > @@ -6,7 +6,7 @@
> > > #include <linux/ndctl.h>
> > > #include <linux/async.h>
> > > #include <linux/slab.h>
> > > -#include "mem.h"
> > > +#include "cxlmem.h"
> > > #include "cxl.h"
> > >
> > > /*
> >
>
next prev parent reply other threads:[~2021-09-14 15:07 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-13 22:33 [PATCH AUTOSEL 5.14 01/25] dmaengine: idxd: depends on !UML Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 02/25] dmaengine: sprd: Add missing MODULE_DEVICE_TABLE Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 03/25] cxl: Move cxl_core to new directory Sasha Levin
2021-09-14 8:56 ` Jonathan Cameron
2021-09-14 8:57 ` Jonathan Cameron
2021-09-14 15:05 ` Ben Widawsky [this message]
2021-09-14 15:40 ` Dan Williams
2021-09-14 17:00 ` Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 04/25] cxl/pci: Introduce cdevm_file_operations Sasha Levin
2021-09-14 15:42 ` Dan Williams
2021-09-14 17:01 ` Sasha Levin
2021-09-14 17:46 ` Dan Williams
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 05/25] gfs2: Switch to may_setattr in gfs2_setattr Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 06/25] dmaengine: ioat: depends on !UML Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 07/25] dmaengine: xilinx_dma: Set DMA mask for coherent APIs Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 08/25] s390: add kmemleak annotation in stack_alloc() Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 09/25] ASoC: audio-graph: respawn Platform Support Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 10/25] ACPI: PM: s2idle: Run both AMD and Microsoft methods if both are supported Sasha Levin
2021-09-21 14:57 ` Limonciello, Mario
2021-09-24 11:40 ` Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 11/25] ceph: fix memory leak on decode error in ceph_handle_caps Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 12/25] ceph: request Fw caps before updating the mtime in ceph_write_iter Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 13/25] ceph: remove the capsnaps when removing caps Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 14/25] ceph: lockdep annotations for try_nonblocking_invalidate Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 15/25] s390/unwind: use current_frame_address() to unwind current task Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 16/25] btrfs: update the bdev time directly when closing Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 17/25] btrfs: delay blkdev_put until after the device remove Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 18/25] btrfs: fix lockdep warning while mounting sprout fs Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 19/25] connector: send event on write to /proc/[pid]/comm Sasha Levin
2021-09-15 13:45 ` Eric W. Biederman
2021-09-16 0:36 ` Sasha Levin
2021-09-16 15:49 ` Eric W. Biederman
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 20/25] nilfs2: fix memory leak in nilfs_sysfs_create_device_group Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 21/25] nilfs2: fix NULL pointer in nilfs_##name##_attr_release Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 22/25] nilfs2: fix memory leak in nilfs_sysfs_create_##name##_group Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 23/25] nilfs2: fix memory leak in nilfs_sysfs_delete_##name##_group Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 24/25] nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.14 25/25] nilfs2: fix memory leak in nilfs_sysfs_delete_snapshot_group Sasha Levin
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=20210914150558.n3lbmmt7h6o2uz6a@intel.com \
--to=ben.widawsky@intel.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=dan.j.williams@intel.com \
--cc=linux-cxl@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lkp@intel.com \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®