This is the start of the stable review cycle for the 5.15.96 release.
There are 37 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Sat, 25 Feb 2023 14:15:30 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.96-rc2.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.15.96-rc2
Linus Torvalds <[email protected]>
bpf: add missing header file include
Vladimir Oltean <[email protected]>
Revert "net/sched: taprio: make qdisc_leaf() see the per-netdev-queue pfifo child qdiscs"
Nathan Chancellor <[email protected]>
lib/Kconfig.debug: Allow BTF + DWARF5 with pahole 1.21+
Nathan Chancellor <[email protected]>
lib/Kconfig.debug: Use CONFIG_PAHOLE_VERSION
Nathan Chancellor <[email protected]>
scripts/pahole-flags.sh: Use pahole-version.sh
Nathan Chancellor <[email protected]>
kbuild: Add CONFIG_PAHOLE_VERSION
Kees Cook <[email protected]>
ext4: Fix function prototype mismatch for ext4_feat_ktype
Paul Moore <[email protected]>
audit: update the mailing list in MAINTAINERS
Lukas Wunner <[email protected]>
wifi: mwifiex: Add missing compatible string for SD8787
Zhang Wensheng <[email protected]>
nbd: fix possible overflow on 'first_minor' in nbd_dev_add()
Alessandro Astone <[email protected]>
binder: Gracefully handle BINDER_TYPE_FDA objects with num_fds=0
Alessandro Astone <[email protected]>
binder: Address corner cases in deferred copy and fixup
Arnd Bergmann <[email protected]>
binder: fix pointer cast warning
Todd Kjos <[email protected]>
binder: defer copies of pre-patched txn data
Todd Kjos <[email protected]>
binder: read pre-translated fds from sender buffer
Dave Hansen <[email protected]>
uaccess: Add speculation barrier to copy_from_user()
Zheng Wang <[email protected]>
drm/i915/gvt: fix double free bug in split_2MB_gtt_entry
Michael Ellerman <[email protected]>
powerpc/64s/radix: Fix RWX mapping with relocated kernel
Michael Ellerman <[email protected]>
powerpc/64s/radix: Fix crash with unaligned relocated kernel
Michael Ellerman <[email protected]>
powerpc/vmlinux.lds: Add an explicit symbol for the SRWX boundary
Michael Ellerman <[email protected]>
powerpc/vmlinux.lds: Ensure STRICT_ALIGN_SIZE is at least page aligned
Christophe Leroy <[email protected]>
powerpc: use generic version of arch_is_kernel_initmem_freed()
Sean Anderson <[email protected]>
powerpc: dts: t208x: Disable 10G on MAC1 and MAC2
Marc Kleine-Budde <[email protected]>
can: kvaser_usb: hydra: help gcc-13 to figure out cmd_len
Jim Mattson <[email protected]>
KVM: VMX: Execute IBPB on emulated VM-exit when guest has IBRS
Sean Christopherson <[email protected]>
KVM: SVM: Skip WRMSR fastpath on VM-Exit if next RIP isn't valid
Sean Christopherson <[email protected]>
KVM: x86: Fail emulation during EMULTYPE_SKIP on any exception
Jason A. Donenfeld <[email protected]>
random: always mix cycle counter in add_latent_entropy()
Rahul Tanwar <[email protected]>
clk: mxl: syscon_node_to_regmap() returns error pointers
Sean Anderson <[email protected]>
powerpc: dts: t208x: Mark MAC1 and MAC2 as 10G
Rahul Tanwar <[email protected]>
clk: mxl: Fix a clk entry by adding relevant flags
Rahul Tanwar <[email protected]>
clk: mxl: Add option to override gate clks
Rahul Tanwar <[email protected]>
clk: mxl: Remove redundant spinlocks
Rahul Tanwar <[email protected]>
clk: mxl: Switch from direct readl/writel based IO to regmap based IO
Ankit Nautiyal <[email protected]>
drm/edid: Fix minimum bpc supported with DSC1.2 for HDMI sink
Bitterblue Smith <[email protected]>
wifi: rtl8xxxu: gen2: Turn on the rate control
Lucas Stach <[email protected]>
drm/etnaviv: don't truncate physical page address
-------------
Diffstat:
MAINTAINERS | 3 +-
Makefile | 4 +-
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi | 44 +++
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi | 44 +++
arch/powerpc/boot/dts/fsl/t2081si-post.dtsi | 20 +-
arch/powerpc/include/asm/sections.h | 14 +-
arch/powerpc/kernel/vmlinux.lds.S | 14 +-
arch/powerpc/mm/book3s32/mmu.c | 2 +-
arch/powerpc/mm/book3s64/radix_pgtable.c | 28 +-
arch/x86/kvm/svm/svm.c | 10 +-
arch/x86/kvm/vmx/nested.c | 11 +
arch/x86/kvm/vmx/vmx.c | 6 +-
arch/x86/kvm/x86.c | 4 +-
drivers/android/binder.c | 343 +++++++++++++++++++--
drivers/block/nbd.c | 23 +-
drivers/clk/x86/Kconfig | 5 +-
drivers/clk/x86/clk-cgu-pll.c | 23 +-
drivers/clk/x86/clk-cgu.c | 106 ++-----
drivers/clk/x86/clk-cgu.h | 46 +--
drivers/clk/x86/clk-lgm.c | 18 +-
drivers/gpu/drm/drm_edid.c | 3 +-
drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 4 +-
drivers/gpu/drm/i915/gvt/gtt.c | 17 +-
drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 33 +-
drivers/net/wireless/marvell/mwifiex/sdio.c | 1 +
.../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 8 +-
fs/ext4/sysfs.c | 7 +-
include/linux/nospec.h | 4 +
include/linux/random.h | 6 +-
init/Kconfig | 4 +
kernel/bpf/core.c | 3 +-
lib/Kconfig.debug | 4 +-
lib/usercopy.c | 7 +
net/sched/sch_taprio.c | 8 +-
scripts/pahole-flags.sh | 2 +-
scripts/pahole-version.sh | 13 +
36 files changed, 661 insertions(+), 231 deletions(-)
On 2/23/23 06:16, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 5.15.96 release.
> There are 37 patches in this series, all will be posted as a response
> to this one. If anyone has any issues with these being applied, please
> let me know.
>
> Responses should be made by Sat, 25 Feb 2023 14:15:30 +0000.
> Anything received after that time might be too late.
>
$ git describe
v5.15.95-38-gd6f4f9746d40
groeck@server:~/src/linux-stable$ !ls
ls -l scripts/pahole-version.sh
-rw-rw-r-- 1 groeck groeck 269 Feb 23 07:33 scripts/pahole-version.sh
This results in:
make[1]: Entering directory '/tmp/buildbot-builddir'
scripts/pahole-flags.sh: 10: /opt/buildbot/slave/stable-queue-5.15/build/scripts/pahole-version.sh: Permission denied
scripts/pahole-flags.sh: 12: [: Illegal number:
scripts/pahole-flags.sh: 16: [: Illegal number:
scripts/pahole-flags.sh: 20: [: Illegal number:
and all builds fail for me.
Guenter
On Thu, 23 Feb 2023 at 19:46, Greg Kroah-Hartman
<[email protected]> wrote:
>
> This is the start of the stable review cycle for the 5.15.96 release.
> There are 37 patches in this series, all will be posted as a response
> to this one. If anyone has any issues with these being applied, please
> let me know.
>
> Responses should be made by Sat, 25 Feb 2023 14:15:30 +0000.
> Anything received after that time might be too late.
>
> The whole patch series can be found in one patch at:
> https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.96-rc2.gz
> or in the git tree and branch at:
> git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y
> and the diffstat can be found below.
>
> thanks,
>
> greg k-h
Following build warnings / error notices on 5.15-rc2
anyone see these build issues ?
scripts/pahole-flags.sh: 10: scripts/pahole-version.sh: Permission denied
scripts/pahole-flags.sh: 12: [: Illegal number:
scripts/pahole-flags.sh: 16: [: Illegal number:
scripts/pahole-flags.sh: 20: [: Illegal number:
scripts/pahole-flags.sh: 10: scripts/pahole-version.sh: Permission denied
scripts/pahole-flags.sh: 12: [: Illegal number:
scripts/pahole-flags.sh: 16: [: Illegal number:
scripts/pahole-flags.sh: 20: [: Illegal number:
scripts/pahole-flags.sh: 10: scripts/pahole-version.sh: Permission denied
scripts/pahole-flags.sh: 12: [: Illegal number:
scripts/pahole-flags.sh: 16: [: Illegal number:
scripts/pahole-flags.sh: 20: [: Illegal number:
sh: 1: scripts/pahole-version.sh: Permission denied
init/Kconfig:97: syntax error
init/Kconfig:96: invalid statement
make[2]: *** [scripts/kconfig/Makefile:87: defconfig] Error 1
Need to bisect
--
commit 54fab3cc806aec70d7ce8440e511d56bd53a4081
Author: Nathan Chancellor <[email protected]>
Date: Tue Feb 1 13:56:21 2022 -0700
kbuild: Add CONFIG_PAHOLE_VERSION
commit 613fe169237785a4bb1d06397b52606b2967da53 upstream.
There are a few different places where pahole's version is turned into a
three digit form with the exact same command. Move this command into
scripts/pahole-version.sh to reduce the amount of duplication across the
tree.
Create CONFIG_PAHOLE_VERSION so the version code can be used in Kconfig
to enable and disable configuration options based on the pahole version,
which is already done in a couple of places.
Signed-off-by: Nathan Chancellor <[email protected]>
--
ls -l scripts/pahole*.sh
-rwxr-xr-x 1 naresh naresh 610 Feb 23 21:03 scripts/pahole-flags.sh
-rw-r--r-- 1 naresh naresh 269 Feb 23 21:03 scripts/pahole-version.sh
--
Linaro LKFT
https://lkft.linaro.org
On 2/23/23 08:40, Naresh Kamboju wrote:
> On Thu, 23 Feb 2023 at 19:46, Greg Kroah-Hartman
> <[email protected]> wrote:
>>
>> This is the start of the stable review cycle for the 5.15.96 release.
>> There are 37 patches in this series, all will be posted as a response
>> to this one. If anyone has any issues with these being applied, please
>> let me know.
>>
>> Responses should be made by Sat, 25 Feb 2023 14:15:30 +0000.
>> Anything received after that time might be too late.
>>
>> The whole patch series can be found in one patch at:
>> https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.96-rc2.gz
>> or in the git tree and branch at:
>> git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y
>> and the diffstat can be found below.
>>
>> thanks,
>>
>> greg k-h
>
> Following build warnings / error notices on 5.15-rc2
> anyone see these build issues ?
>
> scripts/pahole-flags.sh: 10: scripts/pahole-version.sh: Permission denied
> scripts/pahole-flags.sh: 12: [: Illegal number:
> scripts/pahole-flags.sh: 16: [: Illegal number:
> scripts/pahole-flags.sh: 20: [: Illegal number:
> scripts/pahole-flags.sh: 10: scripts/pahole-version.sh: Permission denied
> scripts/pahole-flags.sh: 12: [: Illegal number:
> scripts/pahole-flags.sh: 16: [: Illegal number:
> scripts/pahole-flags.sh: 20: [: Illegal number:
> scripts/pahole-flags.sh: 10: scripts/pahole-version.sh: Permission denied
> scripts/pahole-flags.sh: 12: [: Illegal number:
> scripts/pahole-flags.sh: 16: [: Illegal number:
> scripts/pahole-flags.sh: 20: [: Illegal number:
> sh: 1: scripts/pahole-version.sh: Permission denied
> init/Kconfig:97: syntax error
> init/Kconfig:96: invalid statement
> make[2]: *** [scripts/kconfig/Makefile:87: defconfig] Error 1
>
>
> Need to bisect
> --
>
> commit 54fab3cc806aec70d7ce8440e511d56bd53a4081
> Author: Nathan Chancellor <[email protected]>
> Date: Tue Feb 1 13:56:21 2022 -0700
>
> kbuild: Add CONFIG_PAHOLE_VERSION
>
> commit 613fe169237785a4bb1d06397b52606b2967da53 upstream.
>
> There are a few different places where pahole's version is turned into a
> three digit form with the exact same command. Move this command into
> scripts/pahole-version.sh to reduce the amount of duplication across the
> tree.
>
> Create CONFIG_PAHOLE_VERSION so the version code can be used in Kconfig
> to enable and disable configuration options based on the pahole version,
> which is already done in a couple of places.
>
> Signed-off-by: Nathan Chancellor <[email protected]>
>
> --
> ls -l scripts/pahole*.sh
> -rwxr-xr-x 1 naresh naresh 610 Feb 23 21:03 scripts/pahole-flags.sh
> -rw-r--r-- 1 naresh naresh 269 Feb 23 21:03 scripts/pahole-version.sh
>
>
>
> --
> Linaro LKFT
> https://lkft.linaro.org
>
+1 seeing the same:
./scripts/pahole-flags.sh: 10: ./scripts/pahole-version.sh: Permission denied
./scripts/pahole-flags.sh: 12: [: Illegal number:
./scripts/pahole-flags.sh: 16: [: Illegal number:
./scripts/pahole-flags.sh: 20: [: Illegal number:
thanks,
-- Shuah
On 2/23/23 08:45, Shuah Khan wrote:
> On 2/23/23 08:40, Naresh Kamboju wrote:
>> On Thu, 23 Feb 2023 at 19:46, Greg Kroah-Hartman
>> <[email protected]> wrote:
>>>
>>> This is the start of the stable review cycle for the 5.15.96 release.
>>> There are 37 patches in this series, all will be posted as a response
>>> to this one. If anyone has any issues with these being applied, please
>>> let me know.
>>>
>>> Responses should be made by Sat, 25 Feb 2023 14:15:30 +0000.
>>> Anything received after that time might be too late.
>>>
>>> The whole patch series can be found in one patch at:
>>> https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.96-rc2.gz
>>> or in the git tree and branch at:
>>> git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y
>>> and the diffstat can be found below.
>>>
>>> thanks,
>>>
>>> greg k-h
>>
>> Following build warnings / error notices on 5.15-rc2
>> anyone see these build issues ?
>>
>> scripts/pahole-flags.sh: 10: scripts/pahole-version.sh: Permission denied
>> scripts/pahole-flags.sh: 12: [: Illegal number:
>> scripts/pahole-flags.sh: 16: [: Illegal number:
>> scripts/pahole-flags.sh: 20: [: Illegal number:
>> scripts/pahole-flags.sh: 10: scripts/pahole-version.sh: Permission denied
>> scripts/pahole-flags.sh: 12: [: Illegal number:
>> scripts/pahole-flags.sh: 16: [: Illegal number:
>> scripts/pahole-flags.sh: 20: [: Illegal number:
>> scripts/pahole-flags.sh: 10: scripts/pahole-version.sh: Permission denied
>> scripts/pahole-flags.sh: 12: [: Illegal number:
>> scripts/pahole-flags.sh: 16: [: Illegal number:
>> scripts/pahole-flags.sh: 20: [: Illegal number:
>> sh: 1: scripts/pahole-version.sh: Permission denied
>> init/Kconfig:97: syntax error
>> init/Kconfig:96: invalid statement
>> make[2]: *** [scripts/kconfig/Makefile:87: defconfig] Error 1
>>
>>
>> Need to bisect
>> --
>>
>> commit 54fab3cc806aec70d7ce8440e511d56bd53a4081
>> Author: Nathan Chancellor <[email protected]>
>> Date: Tue Feb 1 13:56:21 2022 -0700
>>
>> kbuild: Add CONFIG_PAHOLE_VERSION
>>
>> commit 613fe169237785a4bb1d06397b52606b2967da53 upstream.
>>
>> There are a few different places where pahole's version is turned into a
>> three digit form with the exact same command. Move this command into
>> scripts/pahole-version.sh to reduce the amount of duplication across the
>> tree.
>>
>> Create CONFIG_PAHOLE_VERSION so the version code can be used in Kconfig
>> to enable and disable configuration options based on the pahole version,
>> which is already done in a couple of places.
>>
>> Signed-off-by: Nathan Chancellor <[email protected]>
>>
>> --
>> ls -l scripts/pahole*.sh
>> -rwxr-xr-x 1 naresh naresh 610 Feb 23 21:03 scripts/pahole-flags.sh
>> -rw-r--r-- 1 naresh naresh 269 Feb 23 21:03 scripts/pahole-version.sh
>>
>>
>>
>> --
>> Linaro LKFT
>> https://lkft.linaro.org
>>
> +1 seeing the same:
>
> ./scripts/pahole-flags.sh: 10: ./scripts/pahole-version.sh: Permission denied
> ./scripts/pahole-flags.sh: 12: [: Illegal number:
> ./scripts/pahole-flags.sh: 16: [: Illegal number:
> ./scripts/pahole-flags.sh: 20: [: Illegal number:
>
>
Okay figured out problem now. scripts/pahole-version.sh isn't executable.
Once I made that change make is working now:
chmod +x scripts/pahole-version.sh
thanks,
-- Shuah
On Thu, Feb 23, 2023 at 07:36:39AM -0800, Guenter Roeck wrote:
> On 2/23/23 06:16, Greg Kroah-Hartman wrote:
> > This is the start of the stable review cycle for the 5.15.96 release.
> > There are 37 patches in this series, all will be posted as a response
> > to this one. If anyone has any issues with these being applied, please
> > let me know.
> >
> > Responses should be made by Sat, 25 Feb 2023 14:15:30 +0000.
> > Anything received after that time might be too late.
> >
>
>
> $ git describe
> v5.15.95-38-gd6f4f9746d40
> groeck@server:~/src/linux-stable$ !ls
> ls -l scripts/pahole-version.sh
> -rw-rw-r-- 1 groeck groeck 269 Feb 23 07:33 scripts/pahole-version.sh
>
> This results in:
>
> make[1]: Entering directory '/tmp/buildbot-builddir'
> scripts/pahole-flags.sh: 10: /opt/buildbot/slave/stable-queue-5.15/build/scripts/pahole-version.sh: Permission denied
> scripts/pahole-flags.sh: 12: [: Illegal number:
> scripts/pahole-flags.sh: 16: [: Illegal number:
> scripts/pahole-flags.sh: 20: [: Illegal number:
>
> and all builds fail for me.
This is a fun thing, the patch shows it being set to 0755, so `git am`
should be doing the right thing here. Let me dig to see if I can change
something in my scripts to resolve this...
thanks,
greg k-h
On 2/23/23 08:33, Greg Kroah-Hartman wrote:
> On Thu, Feb 23, 2023 at 07:36:39AM -0800, Guenter Roeck wrote:
>> On 2/23/23 06:16, Greg Kroah-Hartman wrote:
>>> This is the start of the stable review cycle for the 5.15.96 release.
>>> There are 37 patches in this series, all will be posted as a response
>>> to this one. If anyone has any issues with these being applied, please
>>> let me know.
>>>
>>> Responses should be made by Sat, 25 Feb 2023 14:15:30 +0000.
>>> Anything received after that time might be too late.
>>>
>>
>>
>> $ git describe
>> v5.15.95-38-gd6f4f9746d40
>> groeck@server:~/src/linux-stable$ !ls
>> ls -l scripts/pahole-version.sh
>> -rw-rw-r-- 1 groeck groeck 269 Feb 23 07:33 scripts/pahole-version.sh
>>
>> This results in:
>>
>> make[1]: Entering directory '/tmp/buildbot-builddir'
>> scripts/pahole-flags.sh: 10: /opt/buildbot/slave/stable-queue-5.15/build/scripts/pahole-version.sh: Permission denied
>> scripts/pahole-flags.sh: 12: [: Illegal number:
>> scripts/pahole-flags.sh: 16: [: Illegal number:
>> scripts/pahole-flags.sh: 20: [: Illegal number:
>>
>> and all builds fail for me.
>
> This is a fun thing, the patch shows it being set to 0755, so `git am`
> should be doing the right thing here. Let me dig to see if I can change
> something in my scripts to resolve this...
We have had this happen, last time you explained that quilt did not
handle the file mode:
https://lore.kernel.org/all/[email protected]/
Anything we can do about this?
--
Florian
On 2/23/23 08:33, Greg Kroah-Hartman wrote:
> On Thu, Feb 23, 2023 at 07:36:39AM -0800, Guenter Roeck wrote:
>> On 2/23/23 06:16, Greg Kroah-Hartman wrote:
>>> This is the start of the stable review cycle for the 5.15.96 release.
>>> There are 37 patches in this series, all will be posted as a response
>>> to this one. If anyone has any issues with these being applied, please
>>> let me know.
>>>
>>> Responses should be made by Sat, 25 Feb 2023 14:15:30 +0000.
>>> Anything received after that time might be too late.
>>>
>>
>>
>> $ git describe
>> v5.15.95-38-gd6f4f9746d40
>> groeck@server:~/src/linux-stable$ !ls
>> ls -l scripts/pahole-version.sh
>> -rw-rw-r-- 1 groeck groeck 269 Feb 23 07:33 scripts/pahole-version.sh
>>
>> This results in:
>>
>> make[1]: Entering directory '/tmp/buildbot-builddir'
>> scripts/pahole-flags.sh: 10: /opt/buildbot/slave/stable-queue-5.15/build/scripts/pahole-version.sh: Permission denied
>> scripts/pahole-flags.sh: 12: [: Illegal number:
>> scripts/pahole-flags.sh: 16: [: Illegal number:
>> scripts/pahole-flags.sh: 20: [: Illegal number:
>>
>> and all builds fail for me.
>
> This is a fun thing, the patch shows it being set to 0755, so `git am`
> should be doing the right thing here. Let me dig to see if I can change
> something in my scripts to resolve this...
>
This isn't the first time this happens. I seem to recall that you mentioned
some time ago that whatever you use to apply patches (quilt ?) doesn't
handle executable permission bits correctly.
Guenter
On Thu, Feb 23, 2023 at 9:31 AM Guenter Roeck <[email protected]> wrote:
>
> This isn't the first time this happens. I seem to recall that you mentioned
> some time ago that whatever you use to apply patches (quilt ?) doesn't
> handle executable permission bits correctly.
Note that even though git itself does handle these things right, we've
also always said that if some old fogey wants to use tar-balls and
patches, that's supposed to still work.
I guess the same "old fogey" comment then covers quilt too.
End result: we should try to generally not execute our scripts
directly, but to explicitly state which interpreter it should use,
rather than then depend on the #! in the script itself to do it.
In fact, for shell scripting in particular, we go further than that,
and use $(CONFIG_SHELL)
Of course, in this case, it's actually using the Makefile '$(shell
..)' format, so I guess it looks a bit odd to write it as
$(shell $(CONFIG_SHELL) script..)
but I do think we should do it.
Now, independently of that I also think quilt should probably just
learn the git world order about file modes, because let's face it, git
_has_ taken over the world. Mwhahahhahahaahaaa!
Linus
On Thu, Feb 23, 2023 at 10:03:43AM -0800, Linus Torvalds wrote:
> On Thu, Feb 23, 2023 at 9:31 AM Guenter Roeck <[email protected]> wrote:
> >
> > This isn't the first time this happens. I seem to recall that you mentioned
> > some time ago that whatever you use to apply patches (quilt ?) doesn't
> > handle executable permission bits correctly.
>
> Note that even though git itself does handle these things right, we've
> also always said that if some old fogey wants to use tar-balls and
> patches, that's supposed to still work.
>
> I guess the same "old fogey" comment then covers quilt too.
>
> End result: we should try to generally not execute our scripts
> directly, but to explicitly state which interpreter it should use,
> rather than then depend on the #! in the script itself to do it.
>
> In fact, for shell scripting in particular, we go further than that,
> and use $(CONFIG_SHELL)
>
> Of course, in this case, it's actually using the Makefile '$(shell
> ..)' format, so I guess it looks a bit odd to write it as
>
> $(shell $(CONFIG_SHELL) script..)
>
> but I do think we should do it.
Right, we would also need CONFIG_SHELL within scripts/pahole-flags.sh
for scripts/pahole-version.sh, which is really what was blowing up here,
but the invocation of 'scripts/pahole-flags.sh' in Makefile needs it too
to avoid the same problem if it were added to an older kernel.
diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh
index 0d99ef17e4a5..ca3c311a3855 100755
--- a/scripts/pahole-flags.sh
+++ b/scripts/pahole-flags.sh
@@ -7,7 +7,7 @@ if ! [ -x "$(command -v ${PAHOLE})" ]; then
exit 0
fi
-pahole_ver=$($(dirname $0)/pahole-version.sh ${PAHOLE})
+pahole_ver=$(${CONFIG_SHELL} $(dirname $0)/pahole-version.sh ${PAHOLE})
if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then
# pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars
I can send a patch unless you want to take those changes directly, you
have half a commit message there already I think :)
Cheers,
Nathan
On Thu, Feb 23, 2023 at 11:47 AM Nathan Chancellor <[email protected]> wrote:
>
> I can send a patch unless you want to take those changes directly, you
> have half a commit message there already I think :)
Not being one of those old fogeys myself, I don't feel hugely motivated to care.
In fact, I think GNU patch implemented the git patch format extensions
more than a decade ago, so we might even simply decide that it's past
time to even worry about this at all.
In fact, with all the base infrastructure supporting git patches, I'm
not quite sure just _how_ quilt is able to apply patches without
dealing with mode bits.
Does quilt parse the patches and actively remove those lines before
applying them? Or does quilt have some actual built-in patch
application code that doesn't depend on GNU patch?
(Side note: GNU patch may support git patches, but I don't think GNU
diffutils will generate them, so I guess not all base infrastructure
supports that fancy new "mode" line)
Linus
On Thu, Feb 23, 2023 at 01:18:31PM -0800, Linus Torvalds wrote:
> On Thu, Feb 23, 2023 at 11:47 AM Nathan Chancellor <[email protected]> wrote:
> >
> > I can send a patch unless you want to take those changes directly, you
> > have half a commit message there already I think :)
>
> Not being one of those old fogeys myself, I don't feel hugely motivated to care.
>
> In fact, I think GNU patch implemented the git patch format extensions
> more than a decade ago, so we might even simply decide that it's past
> time to even worry about this at all.
>
> In fact, with all the base infrastructure supporting git patches, I'm
> not quite sure just _how_ quilt is able to apply patches without
> dealing with mode bits.
>
> Does quilt parse the patches and actively remove those lines before
> applying them? Or does quilt have some actual built-in patch
> application code that doesn't depend on GNU patch?
>
> (Side note: GNU patch may support git patches, but I don't think GNU
> diffutils will generate them, so I guess not all base infrastructure
> supports that fancy new "mode" line)
Quilt should be depending on patch here, I think it's something in my
set of "turn this series of patches into a mbox, split the mbox up into
patches" sequence that is causing the problem. I'll look into it in the
morning, but for now, I'm blaming my horrid scripts, not git or quilt
just yet...
thanks,
greg k-h
On Thu, Feb 23, 2023 at 1:24 PM Greg Kroah-Hartman
<[email protected]> wrote:
>
> Quilt should be depending on patch here, I think it's something in my
> set of "turn this series of patches into a mbox, split the mbox up into
> patches" sequence that is causing the problem.
Well, it might also be that quilt just re-generates the patch with
'diff', and then in the process loses the information again.
We can happily continue to support the "we lost the executable bit",
since it sounds like Nathan is willing to cook up a patch.
I'm just too lazy and personally unaffected to care (and too busy with
merges - excuses, excuses).
Linus
On 2/23/23 06:16, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 5.15.96 release.
> There are 37 patches in this series, all will be posted as a response
> to this one. If anyone has any issues with these being applied, please
> let me know.
>
> Responses should be made by Sat, 25 Feb 2023 14:15:30 +0000.
> Anything received after that time might be too late.
>
> The whole patch series can be found in one patch at:
> https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.96-rc2.gz
> or in the git tree and branch at:
> git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y
> and the diffstat can be found below.
>
> thanks,
>
> greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit kernels, build tested on
BMIPS_GENERIC:
Tested-by: Florian Fainelli <[email protected]>
with fixing the permissions of scripts/pahole-version.sh
--
Florian
On 2/23/23 07:16, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 5.15.96 release.
> There are 37 patches in this series, all will be posted as a response
> to this one. If anyone has any issues with these being applied, please
> let me know.
>
> Responses should be made by Sat, 25 Feb 2023 14:15:30 +0000.
> Anything received after that time might be too late.
>
> The whole patch series can be found in one patch at:
> https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.96-rc2.gz
> or in the git tree and branch at:
> git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y
> and the diffstat can be found below.
>
> thanks,
>
> greg k-h
>
Compiled and booted on my test system. No dmesg regressions.
Tested-by: Shuah Khan <[email protected]>
thanks,
-- Shuah
On Thu, Feb 23, 2023 at 9:16 AM Greg Kroah-Hartman
<[email protected]> wrote:
>
> This is the start of the stable review cycle for the 5.15.96 release.
> There are 37 patches in this series, all will be posted as a response
> to this one. If anyone has any issues with these being applied, please
> let me know.
>
> Responses should be made by Sat, 25 Feb 2023 14:15:30 +0000.
> Anything received after that time might be too late.
After making some scripts executable[1], 5.15.96-rc2 compiled and
booted on my x86_64 test system. No errors or regressions.
Tested-by: Slade Watkins <[email protected]>
[1] https://lore.kernel.org/stable/[email protected]/
Thanks,
-- Slade
On Thu, Feb 23, 2023 at 03:16:22PM +0100, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 5.15.96 release.
> There are 37 patches in this series, all will be posted as a response
> to this one. If anyone has any issues with these being applied, please
> let me know.
>
As others has pointed out, I have to apply scripts/pahole-version.sh file mode
fix myself. Regardless, successfully cross-compiled for arm64
(bcm2711_defconfig, GCC 10.2.0) and powerpc (ps3_defconfig, GCC 12.2.0).
Tested-by: Bagas Sanjaya <[email protected]>
--
An old man doll... just what I always wanted! - Clara
On Thu, Feb 23, 2023 at 01:39:42PM -0800, Linus Torvalds wrote:
> On Thu, Feb 23, 2023 at 1:24 PM Greg Kroah-Hartman
> <[email protected]> wrote:
> >
> > Quilt should be depending on patch here, I think it's something in my
> > set of "turn this series of patches into a mbox, split the mbox up into
> > patches" sequence that is causing the problem.
>
> Well, it might also be that quilt just re-generates the patch with
> 'diff', and then in the process loses the information again.
>
> We can happily continue to support the "we lost the executable bit",
> since it sounds like Nathan is willing to cook up a patch.
>
> I'm just too lazy and personally unaffected to care (and too busy with
> merges - excuses, excuses).
Ok, I figured it out. git is doing the right thing, my scripts are
doing the right thing, patch is doing the right thing, but quilt is
not looking at the permissions on the file at all when refreshing a
patch that has been applied to a tree.
This might be a configuration setting on my end for quilt, or a bug in
quilt, I'll try to track this down, but in the meantime, I've fixed up
the stable queue of patches and pushed out a -rc3 with this hopefully
all fixed up.
thanks,
greg k-h
On Fri, Feb 24, 2023 at 11:25:37AM +0100, Greg Kroah-Hartman wrote:
> On Thu, Feb 23, 2023 at 01:39:42PM -0800, Linus Torvalds wrote:
> > On Thu, Feb 23, 2023 at 1:24 PM Greg Kroah-Hartman
> > <[email protected]> wrote:
> > >
> > > Quilt should be depending on patch here, I think it's something in my
> > > set of "turn this series of patches into a mbox, split the mbox up into
> > > patches" sequence that is causing the problem.
> >
> > Well, it might also be that quilt just re-generates the patch with
> > 'diff', and then in the process loses the information again.
> >
> > We can happily continue to support the "we lost the executable bit",
> > since it sounds like Nathan is willing to cook up a patch.
> >
> > I'm just too lazy and personally unaffected to care (and too busy with
> > merges - excuses, excuses).
>
> Ok, I figured it out. git is doing the right thing, my scripts are
> doing the right thing, patch is doing the right thing, but quilt is
> not looking at the permissions on the file at all when refreshing a
> patch that has been applied to a tree.
>
> This might be a configuration setting on my end for quilt, or a bug in
> quilt, I'll try to track this down, but in the meantime, I've fixed up
> the stable queue of patches and pushed out a -rc3 with this hopefully
> all fixed up.
Ok, it's not quilt's fault, it's GNU diff's fault from what I can tell.
quilt relies on diff to generate the patch, and I can't figure out how
to get diff to notice file permissions at all. Am I just missing
an option to 'diff' somewhere that I can't find in the manual? What
tool originally generated diffs with the file permission settings that
patch can read if it wasn't 'diff'?
Anyway, quilt can handle replacing what it uses for 'diff', so I'll just
replace it with 'git diff' and that seems to solve the problem for me!
thanks,
greg k-h