Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-28 16:52:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

m68knommu: updates and fixes for v6.10

Browse Source 
. remove use of kernel config option from uapi header
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEmsfM6tQwfNjBOxr3TiQVqaG9L4AFAmZMFsgACgkQTiQVqaG9
 L4AykQ//aOs9lTYHzNzbgJ9H+TLWa9EUFRGEpvKVCZQlE/MkjHzXeQhspNRlzjaa
 Uzs1n0X4DTs9FP1sOz76IlCbFq48YfJJuHd+88psjIB13J5Ov1ELGCGdF9c8Nbk8
 G1aDaVTlfD0CAWGL+wdz6aRY0HLBCnq3eA22Ab2TwVrSsmS0d8u9j2GNM/WhyMXe
 zs7j5219mzR9Q3tqDTgOZ/Bgjk7XmfHKq1CHisYK/4CqR2vEF/LMAcv+7Ct4aYSC
 lGvGyBrn7k8isCWeVN1rTOaC/CWmCFo9JMgA8xaL719TH95OCcTzgxIXhmMc/VvI
 5XQ84T5gUpQp3RaJDhUWwxWosoNV2fOIQqzEdbpBDb1AkEclmdMummwBKISXzQ+Q
 dz2ccDYb9MkcltdLjxxeqBqcvHSdvKNjHMkxAo6jWacd9UheqT2efkUvmbwlIx/q
 DkLyOd7niny2eMlxUwT3e3q3tnU1HMwJqwKp6wYGAWsWZ4fRrGuAOS1JA/hTApzY
 227CIequJpH4rZ3GaXfRkQ+pxKFoFho+9vnqeOMC8q7lcyRLNmKx3ubspqd65IGn
 6lbCq8NsE+v6B0uq6Ehme9HhAzWr1crMIRpyJHZA6SlY+RhoSkTx7oNKLf5/pNOD
 YJ9HZJ8DMn8siZd68t74l1hgqy0ORK+0WvOYYMJVHHb4kuvp5+E=
 =9nx3
 -----END PGP SIGNATURE-----

Merge tag 'm68knommu-for-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Pull m68knommu update from Greg Ungerer:

 . remove use of kernel config option from uapi header

* tag 'm68knommu-for-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: Avoid CONFIG_COLDFIRE switch in uapi header
This commit is contained in:
Linus Torvalds 2024-05-21 12:05:40 -07:00
commit 334e5639fc
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/m68k/include/uapi/asm/ptrace.h
View File

@ -39,7 +39,7 @@ struct pt_regs {
long d0;
long orig_d0;
long stkadj;
#ifdef CONFIG_COLDFIRE
#ifdef __mcoldfire__
unsigned format : 4; /* frame format specifier */
unsigned vector : 12; /* vector offset */
unsigned short sr;

1
scripts/headers_install.sh
View File

@ -74,7 +74,6 @@ arch/arc/include/uapi/asm/page.h:CONFIG_ARC_PAGE_SIZE_16K
arch/arc/include/uapi/asm/page.h:CONFIG_ARC_PAGE_SIZE_4K
arch/arc/include/uapi/asm/swab.h:CONFIG_ARC_HAS_SWAPE
arch/arm/include/uapi/asm/ptrace.h:CONFIG_CPU_ENDIAN_BE8
arch/m68k/include/uapi/asm/ptrace.h:CONFIG_COLDFIRE
arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_NO
arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_SUPPORT
arch/x86/include/uapi/asm/auxvec.h:CONFIG_IA32_EMULATION