| Message ID | 20240510000842.410729-9-edliaw@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c1457d9aad5ee2feafcf85aa9a58ab50500159d2 |
| Headers | show |
| Series | Define _GNU_SOURCE for sources using | expand |
On Fri, May 10, 2024 at 12:06:25AM +0000, Edward Liaw wrote: > _GNU_SOURCE is provided by lib.mk, so it should be dropped to prevent > redefinition warnings. > > Signed-off-by: Edward Liaw <edliaw@google.com> Applied to cgroup/for-6.10. Thanks.
On 5/13/24 11:02, Tejun Heo wrote: > On Fri, May 10, 2024 at 12:06:25AM +0000, Edward Liaw wrote: >> _GNU_SOURCE is provided by lib.mk, so it should be dropped to prevent >> redefinition warnings. >> >> Signed-off-by: Edward Liaw <edliaw@google.com> > > Applied to cgroup/for-6.10. > > Thanks. > Hi Tejun, Please don't include this in your PR to Linus. This patch series needs to go together as it is causing several build warns and some errors. thanks, -- Shuah
On Thu, May 16, 2024 at 09:50:06AM -0600, Shuah Khan wrote: > On 5/13/24 11:02, Tejun Heo wrote: > > On Fri, May 10, 2024 at 12:06:25AM +0000, Edward Liaw wrote: > > > _GNU_SOURCE is provided by lib.mk, so it should be dropped to prevent > > > redefinition warnings. > > > > > > Signed-off-by: Edward Liaw <edliaw@google.com> > > > > Applied to cgroup/for-6.10. > > > > Thanks. > > > > Hi Tejun, > > Please don't include this in your PR to Linus. This patch series needs > to go together as it is causing several build warns and some errors. I'm afraid it's too late. The PR is too late. Do you want me to send an amended PR with the commit reverted? If it's just temporary issues in selftests, maybe we can just wait it out? Thanks.
On 5/16/24 10:21, Tejun Heo wrote: > On Thu, May 16, 2024 at 09:50:06AM -0600, Shuah Khan wrote: >> On 5/13/24 11:02, Tejun Heo wrote: >>> On Fri, May 10, 2024 at 12:06:25AM +0000, Edward Liaw wrote: >>>> _GNU_SOURCE is provided by lib.mk, so it should be dropped to prevent >>>> redefinition warnings. >>>> >>>> Signed-off-by: Edward Liaw <edliaw@google.com> >>> >>> Applied to cgroup/for-6.10. >>> >>> Thanks. >>> >> >> Hi Tejun, >> >> Please don't include this in your PR to Linus. This patch series needs >> to go together as it is causing several build warns and some errors. > > I'm afraid it's too late. The PR is too late. Do you want me to send an > amended PR with the commit reverted? If it's just temporary issues in > selftests, maybe we can just wait it out? > I am exploring options and leaning towards reverting the patch daef47b89efd ("selftests: Compile kselftest headers with -D_GNU_SOURCE") Your amending the PR helps me if I have to send revert. I am sorry for the trouble. I can all of them together in a second update or after the merge window closes. thanks, -- Shuah
Hello, On Thu, May 16, 2024 at 10:31:13AM -0600, Shuah Khan wrote: > I am exploring options and leaning towards reverting the patch > > daef47b89efd ("selftests: Compile kselftest headers with -D_GNU_SOURCE") > > Your amending the PR helps me if I have to send revert. I am sorry > for the trouble. > > I can all of them together in a second update or after the merge window > closes. The cgroup commit is already pulled in unfortunately. Can you please handle the revert and whatever's necessary to fix up the situation? I'll ask you what to do with selftest patches from now on. Thank you.
On 5/16/24 11:45, Tejun Heo wrote: > Hello, > > On Thu, May 16, 2024 at 10:31:13AM -0600, Shuah Khan wrote: >> I am exploring options and leaning towards reverting the patch >> >> daef47b89efd ("selftests: Compile kselftest headers with -D_GNU_SOURCE") >> >> Your amending the PR helps me if I have to send revert. I am sorry >> for the trouble. >> >> I can all of them together in a second update or after the merge window >> closes. > > The cgroup commit is already pulled in unfortunately. Can you please handle > the revert and whatever's necessary to fix up the situation? I'll ask you > what to do with selftest patches from now on. > Thanks for the update. Yes I am working on fixing the situation and will send revert for cgroup test patch as well if necessary. No worries. It is not a problem for you to handle cgroup test patches in general. I will need your review anyway and letting you handle them reduces the overhead. This kind of framework change causes needs to be coordinated. I should have held back on the framework change on my part. thanks, -- Shuah
On 5/16/24 12:05, Shuah Khan wrote: > On 5/16/24 11:45, Tejun Heo wrote: >> Hello, >> >> On Thu, May 16, 2024 at 10:31:13AM -0600, Shuah Khan wrote: >>> I am exploring options and leaning towards reverting the patch >>> >>> daef47b89efd ("selftests: Compile kselftest headers with -D_GNU_SOURCE") >>> >>> Your amending the PR helps me if I have to send revert. I am sorry >>> for the trouble. >>> >>> I can all of them together in a second update or after the merge window >>> closes. >> >> The cgroup commit is already pulled in unfortunately. Can you please handle >> the revert and whatever's necessary to fix up the situation? I'll ask you >> what to do with selftest patches from now on. >> > > Thanks for the update. Yes I am working on fixing the situation and > will send revert for cgroup test patch as well if necessary. > > No worries. It is not a problem for you to handle cgroup test patches > in general. I will need your review anyway and letting you handle them > reduces the overhead. > > This kind of framework change causes needs to be coordinated. > I should have held back on the framework change on my part. > As mentioned in the other thread https://lore.kernel.org/linux-kselftest/24975952-b1fa-44a5-bac5-aef538ad0c09@linuxfoundation.org/T/#t I reverted the following patch and the framework change patch. https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git/log/?h=next Will send PR to Linus this weekend. "selftests/cgroup: Drop define _GNU_SOURCE" commit c1457d9aad5ee2feafcf85aa9a58ab50500159d2 thanks, -- Shuah
diff --git a/tools/testing/selftests/cgroup/cgroup_util.c b/tools/testing/selftests/cgroup/cgroup_util.c index 432db923bced..ce16a50ecff8 100644 --- a/tools/testing/selftests/cgroup/cgroup_util.c +++ b/tools/testing/selftests/cgroup/cgroup_util.c @@ -1,7 +1,4 @@ /* SPDX-License-Identifier: GPL-2.0 */ - -#define _GNU_SOURCE - #include <errno.h> #include <fcntl.h> #include <linux/limits.h> diff --git a/tools/testing/selftests/cgroup/test_core.c b/tools/testing/selftests/cgroup/test_core.c index a5672a91d273..de8baad46022 100644 --- a/tools/testing/selftests/cgroup/test_core.c +++ b/tools/testing/selftests/cgroup/test_core.c @@ -1,6 +1,4 @@ /* SPDX-License-Identifier: GPL-2.0 */ - -#define _GNU_SOURCE #include <linux/limits.h> #include <linux/sched.h> #include <sys/types.h> diff --git a/tools/testing/selftests/cgroup/test_cpu.c b/tools/testing/selftests/cgroup/test_cpu.c index dad2ed82f3ef..5a4a314f6af7 100644 --- a/tools/testing/selftests/cgroup/test_cpu.c +++ b/tools/testing/selftests/cgroup/test_cpu.c @@ -1,6 +1,4 @@ // SPDX-License-Identifier: GPL-2.0 - -#define _GNU_SOURCE #include <linux/limits.h> #include <sys/sysinfo.h> #include <sys/wait.h> diff --git a/tools/testing/selftests/cgroup/test_hugetlb_memcg.c b/tools/testing/selftests/cgroup/test_hugetlb_memcg.c index 856f9508ea56..80d05d50a42d 100644 --- a/tools/testing/selftests/cgroup/test_hugetlb_memcg.c +++ b/tools/testing/selftests/cgroup/test_hugetlb_memcg.c @@ -1,6 +1,4 @@ // SPDX-License-Identifier: GPL-2.0 -#define _GNU_SOURCE - #include <linux/limits.h> #include <sys/mman.h> #include <stdio.h> diff --git a/tools/testing/selftests/cgroup/test_kmem.c b/tools/testing/selftests/cgroup/test_kmem.c index 96693d8772be..2e453ac50c0d 100644 --- a/tools/testing/selftests/cgroup/test_kmem.c +++ b/tools/testing/selftests/cgroup/test_kmem.c @@ -1,6 +1,4 @@ // SPDX-License-Identifier: GPL-2.0 -#define _GNU_SOURCE - #include <linux/limits.h> #include <fcntl.h> #include <stdio.h> diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c index 41ae8047b889..c871630d62a3 100644 --- a/tools/testing/selftests/cgroup/test_memcontrol.c +++ b/tools/testing/selftests/cgroup/test_memcontrol.c @@ -1,6 +1,4 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#define _GNU_SOURCE - #include <linux/limits.h> #include <linux/oom.h> #include <fcntl.h> diff --git a/tools/testing/selftests/cgroup/test_zswap.c b/tools/testing/selftests/cgroup/test_zswap.c index 190096017f80..cfaa94e0a175 100644 --- a/tools/testing/selftests/cgroup/test_zswap.c +++ b/tools/testing/selftests/cgroup/test_zswap.c @@ -1,6 +1,4 @@ // SPDX-License-Identifier: GPL-2.0 -#define _GNU_SOURCE - #include <linux/limits.h> #include <unistd.h> #include <stdio.h>
_GNU_SOURCE is provided by lib.mk, so it should be dropped to prevent redefinition warnings. Signed-off-by: Edward Liaw <edliaw@google.com> --- tools/testing/selftests/cgroup/cgroup_util.c | 3 --- tools/testing/selftests/cgroup/test_core.c | 2 -- tools/testing/selftests/cgroup/test_cpu.c | 2 -- tools/testing/selftests/cgroup/test_hugetlb_memcg.c | 2 -- tools/testing/selftests/cgroup/test_kmem.c | 2 -- tools/testing/selftests/cgroup/test_memcontrol.c | 2 -- tools/testing/selftests/cgroup/test_zswap.c | 2 -- 7 files changed, 15 deletions(-)