Changes in Makefile

818b26588994d9d95743fca0a427f08ec6c1c41d - Merge branch 'next' into for-linus

Mon, 05 Jul 2021 08:05:31 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.14 merge window. List of files: /linux/arch/powerpc/kernel/ptrace/Makefile

c441bfb5f2866de71e092c1b9d866a65978dfe1a - Merge tag 'v5.13-rc3' into asoc-5.13

Wed, 09 Jun 2021 12:52:35 +0200

Merge tag 'v5.13-rc3' into asoc-5.13Linux 5.13-rc3 List of files: /linux/arch/powerpc/kernel/ptrace/Makefile

942baad211336efefb93a8369478888ab845c450 - Merge drm/drm-next into drm-intel-gt-next

Wed, 02 Jun 2021 09:18:45 +0200

Merge drm/drm-next into drm-intel-gt-nextPulling in -rc2 fixes and TTM changes that next upcoming patches dependon.Signed-off-by: Joonas Lahtinen List of files: /linux/arch/powerpc/kernel/ptrace/Makefile

cbb245239282870bc6f54d5137dfe0f84b48ea72 - Merge tag 'v5.12' into next

Tue, 25 May 2021 20:24:42 +0200

Merge tag 'v5.12' into nextSync up with mainline to get the latest device tree bindings and kernelAPIs. List of files: /linux/arch/powerpc/kernel/ptrace/Makefile

c37fe6aff89cb0d842993fe2f69e48bf3ebe0ab0 - Merge tag 'v5.13-rc2' into spi-5.13

Tue, 18 May 2021 18:24:52 +0200

Merge tag 'v5.13-rc2' into spi-5.13Linux 5.13-rc2 List of files: /linux/arch/powerpc/kernel/ptrace/Makefile

85ebe5aeef9b0bf4c91ff91652b32f9c54f71d34 - Merge branch 'fixes-rc1' into fixes

Tue, 18 May 2021 08:45:08 +0200

Merge branch 'fixes-rc1' into fixes List of files: /linux/arch/powerpc/kernel/ptrace/Makefile

d22fe808f9a3456f16015e79f1b86a10ce13099f - Merge drm/drm-next into drm-intel-next

Mon, 17 May 2021 23:48:02 +0200

Merge drm/drm-next into drm-intel-nextTime to get back in sync...Signed-off-by: Rodrigo Vivi List of files: /linux/arch/powerpc/kernel/ptrace/Makefile

0301201b7181a927b59421097a01ee98683aa67c - Merge tag 'asoc-v5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Mon, 26 Apr 2021 16:59:21 +0200

Merge tag 'asoc-v5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Updates for v5.13A lot of changes here for quite a quiet release in subsystem terms -there's been a lot of fixes and cleanups all over the subsystem bothfrom generic work and from people working on specific drivers. - More cleanup and consolidation work in the core and the generic card drivers from Morimoto-san. - Lots of cppcheck fixes for Pierre-Louis Brossart. - New drivers for Freescale i.MX DMA over rpmsg, Mediatek MT6358 accessory detection, and Realtek RT1019, RT1316, RT711 and RT715. List of files: /linux/arch/powerpc/kernel/ptrace/Makefile

355b60296143a090039211c5f0e1463f84aab65a - Merge drm/drm-next into drm-misc-next

Mon, 26 Apr 2021 14:03:09 +0200

Merge drm/drm-next into drm-misc-nextChristian needs some patches from drm/nextSigned-off-by: Maxime Ripard List of files: /linux/arch/powerpc/kernel/ptrace/Makefile

d0d252b8ca7a636640a7dca8606edf7c3bcfe0b8 - Merge tag 'v5.12-rc8' into sched/core, to pick up fixes

Tue, 20 Apr 2021 10:13:58 +0200

Merge tag 'v5.12-rc8' into sched/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/arch/powerpc/kernel/ptrace/Makefile

b7f8f259896f669f131713b0c74ba4d008daa71d - Merge tag 'v5.12-rc7' into ecryptfs/next

Mon, 19 Apr 2021 06:39:17 +0200

Merge tag 'v5.12-rc7' into ecryptfs/nextRequired to pick up idmapped mount changes which changed some functionparameters. List of files: /linux/arch/powerpc/kernel/ptrace/Makefile

8203c7ce4ef2840929d38b447b4ccd384727f92b - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Sat, 17 Apr 2021 19:42:54 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netdrivers/net/ethernet/stmicro/stmmac/stmmac_main.c - keep the ZC code, drop the code related to reinitnet/bridge/netfilter/ebtables.c - fix build after move to net_genericSigned-off-by: Jakub Kicinski List of files: /linux/arch/powerpc/kernel/ptrace/Makefile

a00fcbc115f9c934fe92e96358a7f392bb5549f0 - Merge tag 'v5.12-rc7' into driver-core-next

Wed, 14 Apr 2021 19:53:39 +0200

Merge tag 'v5.12-rc7' into driver-core-nextWe need the driver core fix in here as well.Signed-off-by: Greg Kroah-Hartman List of files: /linux/arch/powerpc/kernel/ptrace/Makefile

213cc929cbfd7962164420b300f9a6c60aaff189 - Merge drm/drm-fixes into drm-next

Tue, 13 Apr 2021 23:06:34 +0200

Merge drm/drm-fixes into drm-nextmsm-next pull request has a baseline with stuff from -fixes, rollforward first.Some simple conflicts in amdgpu, ttm and one in i915 where git getsconfused and tries to add the same function twice.Signed-off-by: Daniel Vetter List of files: /linux/arch/powerpc/kernel/ptrace/Makefile

473b2922c7e54260268c9bb037d2ff9f327422ab - Merge remote-tracking branch 'torvalds/master' into perf/core

Tue, 13 Apr 2021 20:14:37 +0200

Merge remote-tracking branch 'torvalds/master' into perf/coreTo pick up fixes from perf/urgent that got into upstream.Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/arch/powerpc/kernel/ptrace/Makefile

14d34d2dbbe2d9144a65bae1549202d1717062e2 - Merge 5.12-rc7 into usb-next

Mon, 12 Apr 2021 08:15:27 +0200

Merge 5.12-rc7 into usb-nextWe need the USB fixes in here as well.Signed-off-by: Greg Kroah-Hartman List of files: /linux/arch/powerpc/kernel/ptrace/Makefile

95c7b07551879c8ad4d6dca10c02de46ddbf55a8 - Merge tag 'powerpc-5.12-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Sat, 10 Apr 2021 18:31:52 +0200

Merge tag 'powerpc-5.12-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linuxPull powerpc fixes from Michael Ellerman: "Some some more powerpc fixes for 5.12: - Fix an oops triggered by ptrace when CONFIG_PPC_FPU_REGS=n - Fix an oops on sigreturn when the VDSO is unmapped on 32-bit - Fix vdso_wrapper.o not being rebuilt everytime vdso.so is rebuilt Thanks to Christophe Leroy"* tag 'powerpc-5.12-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc/vdso: Make sure vdso_wrapper.o is rebuilt everytime vdso.so is rebuilt powerpc/signal32: Fix Oops on sigreturn with unmapped VDSO powerpc/ptrace: Don't return error when getting/setting FP regs without CONFIG_PPC_FPU_REGS List of files: /linux/arch/powerpc/kernel/ptrace/Makefile

3618250c8399cb36f4a0fbc48610a178307e1c64 - powerpc/ptrace: Don't return error when getting/setting FP regs without CONFIG_PPC_FPU_REGS

Wed, 31 Mar 2021 16:14:58 +0200

powerpc/ptrace: Don't return error when getting/setting FP regs without CONFIG_PPC_FPU_REGSAn #ifdef CONFIG_PPC_FPU_REGS is missing in arch_ptrace() leadingto the following Oops because [REGSET_FPR] entry is not initialised innative_regsets[].[ 41.917608] BUG: Unable to handle kernel instruction fetch[ 41.922849] Faulting instruction address: 0xff8fd228[ 41.927760] Oops: Kernel access of bad area, sig: 11 [#1][ 41.933089] BE PAGE_SIZE=4K PREEMPT CMPC885[ 41.940753] Modules linked in:[ 41.943768] CPU: 0 PID: 366 Comm: gdb Not tainted 5.12.0-rc5-s3k-dev-01666-g7aac86a0f057-dirty #4835[ 41.952800] NIP: ff8fd228 LR: c004d9e0 CTR: ff8fd228[ 41.957790] REGS: caae9df0 TRAP: 0400 Not tainted (5.12.0-rc5-s3k-dev-01666-g7aac86a0f057-dirty)[ 41.966741] MSR: 40009032 CR: 82004248 XER: 20000000[ 41.973540][ 41.973540] GPR00: c004d9b4 caae9eb0 c1b64f60 c1b64520 c0713cd4 caae9eb8 c1bacdfc 00000004[ 41.973540] GPR08: 00000200 ff8fd228 c1bac700 00001032 28004242 1061aaf4 00000001 106d64a0[ 41.973540] GPR16: 00000000 00000000 7fa0a774 10610000 7fa0aef9 00000000 10610000 7fa0a538[ 41.973540] GPR24: 7fa0a580 7fa0a570 c1bacc00 c1b64520 c1bacc00 caae9ee8 00000108 c0713cd4[ 42.009685] NIP [ff8fd228] 0xff8fd228[ 42.013300] LR [c004d9e0] __regset_get+0x100/0x124[ 42.018036] Call Trace:[ 42.020443] [caae9eb0] [c004d9b4] __regset_get+0xd4/0x124 (unreliable)[ 42.026899] [caae9ee0] [c004da94] copy_regset_to_user+0x5c/0xb0[ 42.032751] [caae9f10] [c002f640] sys_ptrace+0xe4/0x588[ 42.037915] [caae9f30] [c0011010] ret_from_syscall+0x0/0x28[ 42.043422] --- interrupt: c00 at 0xfd1f8e4[ 42.047553] NIP: 0fd1f8e4 LR: 1004a688 CTR: 00000000[ 42.052544] REGS: caae9f40 TRAP: 0c00 Not tainted (5.12.0-rc5-s3k-dev-01666-g7aac86a0f057-dirty)[ 42.061494] MSR: 0000d032 CR: 48004442 XER: 00000000[ 42.068551][ 42.068551] GPR00: 0000001a 7fa0a040 77dad7e0 0000000e 00000170 00000000 7fa0a078 00000004[ 42.068551] GPR08: 00000000 108deb88 108dda40 106d6010 44004442 1061aaf4 00000001 106d64a0[ 42.068551] GPR16: 00000000 00000000 7fa0a774 10610000 7fa0aef9 00000000 10610000 7fa0a538[ 42.068551] GPR24: 7fa0a580 7fa0a570 1078fe00 1078fd70 1078fd70 00000170 0fdd3244 0000000d[ 42.104696] NIP [0fd1f8e4] 0xfd1f8e4[ 42.108225] LR [1004a688] 0x1004a688[ 42.111753] --- interrupt: c00[ 42.114768] Instruction dump:[ 42.117698] XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX[ 42.125443] XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX[ 42.133195] ---[ end trace d35616f22ab2100c ]---Adding the missing #ifdef is not good because gdb doesn't like gettingan error when getting registers.Instead, make ptrace return 0s when CONFIG_PPC_FPU_REGS is not set.Fixes: b6254ced4da6 ("powerpc/signal: Don't manage floating point regs when no FPU")Cc: stable@vger.kernel.orgSigned-off-by: Christophe Leroy Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/9121a44a2d50ba1af18d8aa5ada06c9a3bea8afd.1617200085.git.christophe.leroy@csgroup.eu List of files: /linux/arch/powerpc/kernel/ptrace/Makefile

cdd38c5f1ce4398ec58fec95904b75824daab7b5 - Merge remote-tracking branch 'net/master'

Wed, 24 Feb 2021 13:36:58 +0100

Merge remote-tracking branch 'net/master' List of files: /linux/arch/powerpc/kernel/ptrace/Makefile

d6310078d9f8c416e85f641a631aecf58f9c97ff - Merge branch 'for-5.12/google' into for-linus

Tue, 23 Feb 2021 11:33:13 +0100

Merge branch 'for-5.12/google' into for-linus- User experience improvements for hid-google from Nicolas Boichat List of files: /linux/arch/powerpc/kernel/ptrace/Makefile