diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-04-19 16:41:04 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-04-19 16:41:04 +1000 |
| commit | 634de1db0e9bbeb90d7b01020e59ec3dab4d38a1 (patch) | |
| tree | e17a9dddf3fe8337ced2bffbc6e232d186412d0e | |
| parent | abf4553db8eb76d3609fc26300fa2a62c84c7e5c (diff) | |
Add linux-next specific files for 20220419next-20220419
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 345 | ||||
| -rw-r--r-- | Next/Trees | 347 | ||||
| -rw-r--r-- | Next/merge.log | 8052 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 8745 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..cf9a41b54c84 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,345 @@ +Name SHA1 +---- ---- +origin b2d229d4ddb17db541098b83524d901257e93845 +fixes d06c942efea40e1701ade200477a7449008d9f24 +kbuild-current 3123109284176b1532874591f7c81f3837bbdc17 +arc-current ac411e41ec065daa867b5668b6e71ea1aff7b36a +arm-current 9be4c88bb7924f68f88cfd47d925c2d046f51a73 +arm64-fixes 0ff74a23e08f909ce859039e860f53727dfed0dd +arm-soc-fixes 67e473a303e76d31bcd221ba76859bd898d152cb +drivers-memory-fixes 73039c6c7f36f90391626222438f5f32742e959e +tee-fixes 98268f2a2a9f1dddf20984f79fdc7b655d0e35fe +m68k-current 0d52a01a266ba21840c7cb02e1de39c503759dda +powerpc-fixes ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e +s390-fixes c68c63429319a923a3f23db64810ba608f5d20f7 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net cbe6c3a8f8f4315b96e46e1a1c70393c06d95a4c +bpf 425d239379db03d514cb1c476bfe7c320bb89dfc +ipsec 5bd8baab087dff657e05387aee802e70304cc813 +netfilter 05ae2fba821c4d122ab4ba3e52144e21586c4010 +ipvs 05ae2fba821c4d122ab4ba3e52144e21586c4010 +wireless ef27324e2cb7bb24542d6cb2571740eefe6b00dc +rdma-fixes ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e +sound-current 24d0c9f0e7de95fe3e3e0067cbea1cd5d413244b +sound-asoc-fixes 34f58092ccf176d41901b7ddbad0b65cf01cc2b1 +regmap-fixes 3123109284176b1532874591f7c81f3837bbdc17 +regulator-fixes 908b768f9a8ffca2ef69f3145e23a6a259f99ac3 +spi-fixes 8c235cc25087495c4288d94f547e9d3061004991 +pci-current 92597f97a40bf661bebceb92e26ff87c76d562d4 +driver-core.current ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e +tty.current cc994bb97587787b8f0c094a9bc6945d82075b1d +usb.current ec547af8a9ea6441864bad34172676b5652ceb96 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes f32c5a0423400e01f4d7c607949fa3a1f006e8fa +phy ce88613e5bd579478653a028291098143f2a5bdf +staging.current ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e +iio-fixes b5d6ba09b10d2ccb865ed9bc45941db0a41c6756 +counter-fixes ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e +char-misc.current ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e +soundwire-fixes 3123109284176b1532874591f7c81f3837bbdc17 +thunderbolt-fixes ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e +input-current 470776c6b03491a3e82c644737a6da5466b8b3eb +crypto-current aa8e73eed7d3084c18dd16d195748661c7e881b5 +vfio-fixes 1ef3342a934e235aca72b4bcc0d6854d80a65077 +kselftest-fixes ce64763c63854b4079f2e036638aa881a1fb3fbc +modules-fixes dc0ce6cc4b133f5f2beb8b47dacae13a7d283c2c +dmaengine-fixes 8fc5133d6d4da65cad6b73152fc714ad3d7f91c1 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 9fe4e0d3cbfe90152137963cc024ecb63db6e8e6 +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 3d59142ad94cf60b94b3dc94c19fdafa23aec8b1 +reset-fixes 03cb66463b5547b289099a95ac4ea591cca88ca9 +mips-fixes 3123109284176b1532874591f7c81f3837bbdc17 +at91-fixes 0c640d9544d0109da3889d71ae77301e556db977 +omap-fixes 46ff3df87215ff42c0cd2c4bdb7d74540384a69c +kvm-fixes 42dcbe7d8bac997eef4c379e61d9121a15ed4e36 +kvms390-fixes 0e9ff65f455dfd0a8aea5e7843678ab6fe097e21 +hwmon-fixes 4aaaaf0f279836f06d3b9d0ffeec7a1e1a04ceef +nvdimm-fixes d28820419ca332f856cdf8bef0cafed79c29ed05 +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes 873863d594c4b12aba19872c78fcaa65147fe9ae +vfs-fixes 9d2231c5d74e13b2a0546fee6737ee4446017903 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes b2dd71f9f728da695a86b8308feb4f39defe9019 +samsung-krzk-fixes 1a9f338f9cf96f8338d5592dee5fce222929e4f7 +pinctrl-samsung-fixes abb860ac7e3f022a233f34b12d035d49abfc114d +devicetree-fixes 652980b1541c5a02e6410647c7daf840c06d724a +scsi-fixes 70a3baeec4e89736be932a60d682d7ae27556f5c +drm-fixes b2d229d4ddb17db541098b83524d901257e93845 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 1acb34e7dd7720a1fff00cbd4d000ec3219dc9d6 +mmc-fixes ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes 3123109284176b1532874591f7c81f3837bbdc17 +hyperv-fixes eaa03d34535872d29004cb5cf77dc9dec1ba9a25 +soc-fsl-fixes a222fd8541394b36b13c89d1698d9530afd59a9c +risc-v-fixes 3123109284176b1532874591f7c81f3837bbdc17 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 3123109284176b1532874591f7c81f3837bbdc17 +spdx 3123109284176b1532874591f7c81f3837bbdc17 +gpio-brgl-fixes b2d229d4ddb17db541098b83524d901257e93845 +gpio-intel-fixes 0c2cae09a765b1c1d842eb9328982976ec735926 +pinctrl-intel-fixes 0be0b70df6611205ac392d0e21f7e077f3230ee6 +erofs-fixes 8b1ac84dcf2cf0fc86f29e92e5c63c4862de6e55 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 02c7efa43627163e489a8db87882445a0ff381f7 +ubifs-fixes c3c07fc25f37c157fde041b3a0c3dfcb1590cbce +memblock-fixes c94afc46cae7ad41b2ad6a99368147879f4b0e56 +cel-fixes 4d5004451ab2218eab94a30e1841462c9316ba19 +irqchip-fixes 544808f7e21cb9ccdb8f3aa7de594c05b1419061 +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +perf-current f58faed7fb3f784efdbf3b401368dcf51a6e28fa +efi-fixes 9feaf8b387ee0ece9c1d7add308776b502a35d0c +zstd-fixes 88a309465b3f05a100c3b81966982c0f9f5d23a6 +drm-misc-fixes f8e6b7babfeb40987e946bc1427609a9976017fa +kbuild 21b526ad634448369bbadc2f112ed2c716805e63 +perf 41204da4c16071be9090940b18f566832d46becc +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping 3cb4503a330159dc5cf2f8382181ccbabbbaa5b2 +asm-generic fba2689ee77e63b05e203b3f26079ef915e55660 +arc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm 012d2fb6c8c90adac502c0bb9abd3e815f6047ca +arm64 641d804157294d9b19bdfe6a2cdbd5d25939a048 +arm-perf 602c873eb52e5717057eb0971258c8eb7440c4a5 +arm-soc 21a9fd22697eac8e30fdc11e4e295619b1cffffa +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic ed532523b4584a400739ecc61b5048ef8e7042a2 +aspeed d9540eeaa3d15d8295895fc39e7fb90937623923 +at91 0c640d9544d0109da3889d71ae77301e556db977 +drivers-memory 03b8b406d86f5f2eefe4365c655bb48e63bafcc5 +imx-mxs 102072b8d2d2b3f99152f4039e86596b4e778d97 +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek 6ceb6a96db4e1309ff072cc5dea95e49ec9fe691 +mvebu 8885ae5142a487ef283aff2ec46e55c0528c75f8 +omap 75c1e9c05d21ef37c3c4af0aac5f0e5bb4bf9a3c +qcom 4fe0e35146406bb85ec55e66b6ed327423ae6f3e +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas a868de20e8c0b389498edad18108aa42815e79ee +reset 3f7bdc13154aefefe2c4f20b93df962146926063 +rockchip 80ff2eb434b6cd675026b13cf501388ec69a3659 +samsung-krzk e7d40b416c50fb7ae56bdefb6c03ccef1f9d2b20 +scmi da005f876630cb3a6d195e90c5d9353e689f3d15 +stm32 73ab99aad50cd05ed0bc230aea39c733ebb9711d +sunxi dd8742e8a17df95fea110259c42e9b83a3ae9239 +tee 17522923771d5c5c0544a648339b80ec56d56212 +tegra aee7f609222bb12e5e7020a528bf0f35256cf96c +ti d3e3116f253591a473873fab8363ecb998ddde13 +xilinx 3123109284176b1532874591f7c81f3837bbdc17 +clk 3123109284176b1532874591f7c81f3837bbdc17 +clk-imx 39772efd98adecbd5b8c6096d465d2fcbafbde6a +clk-renesas 59086e4193f4fc920a23d2045a473f62450b4269 +clk-samsung 45bd8166a1d821eb8fada3092514a7c8543f537c +csky e5981f206da3895c9d5c552fd2148f1b0d1c1682 +m68k 05d51e42df06f0211c7029ab9aa46c492ee85043 +m68knommu 3123109284176b1532874591f7c81f3837bbdc17 +microblaze 3123109284176b1532874591f7c81f3837bbdc17 +mips 3123109284176b1532874591f7c81f3837bbdc17 +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 862cf8d5fd98ed8ea8989726ed5da53761a9ed76 +parisc-hd e34799ccc1269c2789e8ffd50d6d2260d3d31f78 +powerpc ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e +soc-fsl 1ce93cb102e7fcf5d1849044d23ce92b5a71040a +risc-v 3123109284176b1532874591f7c81f3837bbdc17 +s390 270a625957419fd34798d9ad6f364eb0057b5c1d +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 82017457957a550d7d00dde419435dd74a890887 +xtensa 839769c35477d4acc2369e45000ca7b0b6af39a7 +pidfd 6009ff9e80205e358f7e8261c4806f3533be476b +fscrypt 63cec1389e116ae0e2a15e612a5b49651e04be3f +fscache 3123109284176b1532874591f7c81f3837bbdc17 +afs 26291c54e111ff6ba87a164d85d4a4e134b7315c +btrfs 9cff4a31dd1fbcfb5082dd59c5293aa7a045f3ec +ceph c4ffd8a5eb9492bf96b400670153b295d2158384 +cifs 9339faac6d206544601b939321059f60ba96a18d +configfs 84ec758fb2daa236026506868c8796b0500c047d +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs a1108dcd9373a98f7018aa4310076260b8ecfc0b +exfat 1d404b899e322a3fed5d7af243d83bb9e71b1b78 +ext3 f06e95c3a4ca43f9acccca33dc2117e8b924eda0 +ext4 c7cded845fc192cc35a1ca37c0cd957ee35abdf8 +f2fs bf628ee7b054c16305a0a27180f8d73a8bd221fb +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 0c4bcfdecb1ac0967619ee7ff44871d93c08c909 +gfs2 1b2de0791571a61c426bdeb9b0131b26e354d864 +jfs a53046291020ec41e09181396c1e829287b48d47 +ksmbd 02655a70b7cc0f534531ee65fa72692f4d31a944 +nfs ff053dbbaffec45c85e5bfe43306d26694a6433f +nfs-anna d19e0183a88306acda07f4a01fedeeffe2a2a06b +nfsd 5c2cb383394018ec6f18ebd2b7000c14e4f7ff9e +ntfs3 52e00ea6b26e45fb8159e3b57cdde8d3f9bdd8e9 +orangefs 40a74870b2d1d3d44e13b3b73c6571dd34f5614d +overlayfs 94fd19752b28aa66c98e7991734af91dfc529f8f +ubifs 705757274599e2e064dd3054aabc74e8af31a095 +v9fs 22e424feb6658c5d6789e45121830357809c59cb +xfs ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e +zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705 +iomap ebb7fb1557b1d03b906b668aa2164b51e6b7d19a +djw-vfs 49df34221804cfd6384135b28b03c9461a31d024 +file-locks 80d8e4d3f3133d2ce8ac83db6806b7bf62e3a1e1 +vfs fd78f28f9f506cf389614d8c4296837274cb61d2 +printk 84d7df104dbab9c3dda8f2c5b46f9a6fc256fe02 +pci 89905ffa454593cf61ad907980146d42bd79c772 +pstore 8126b1c73108bc691f5643df19071a59a69d0bc6 +hid e668210e6244782822a02110deded46738c0ced6 +i2c 05b42eff61a5224301432c5b01e28b45a00248df +i3c 6cbf8b38dfe3aabe330f2c356949bc4d6a1f034f +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging a1872eb1a376272c39142da0560f2932aded6da8 +jc_docs 6c757e9f55f02fbc226823f8d441cd03cc282109 +v4l-dvb 3d59142ad94cf60b94b3dc94c19fdafa23aec8b1 +v4l-dvb-next 3d59142ad94cf60b94b3dc94c19fdafa23aec8b1 +pm 5675fd487f2b221a27a44f6ac78bdb2e5f235052 +cpufreq-arm f2d9973abd735a34f8318ec4db5c71a6d29ca955 +cpupower 3123109284176b1532874591f7c81f3837bbdc17 +devfreq 5d521a307526871f5613d24a8e71babf1869c486 +opp 543256d239b4156bf5817049fb92138f6661f15f +thermal e08277df1e1aabe42fa9f84a9f661e9de4c3cf56 +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm e425ac99b1573692fc4bb5bda1040caccb127490 +rdma 98c8026331ceabe1df579940b81eec75eb49cdd9 +net-next a997157e42e3119b13c644549a3d8381a1d825d6 +bpf-next 241d50ec5d79b94694adf13853c1f55d0f0b85e6 +ipsec-next b58b1f563ab78955d37e9e43e02790a85c66ac05 +mlx5-next 2984287c4c19949d7eb451dcad0bd5c54a2a376f +netfilter-next 0c7b27616fbd64b3b86c59ad5441f82a1a0c4176 +ipvs-next 0c7b27616fbd64b3b86c59ad5441f82a1a0c4176 +bluetooth 495e70abe13bcfbc6b3beea2b29d30334c9548ac +wireless-next dc4246eff026699c48b27d5bae944b664a5c8035 +mtd 876a45a50a20659f79ac54750a68bb84342f3f2a +nand 51a4a71d974c25dc102216a52462ff6d53eced15 +spi-nor ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e +crypto b45b0a12200893732a0b0ec4a6df18521fd976ad +drm c54b39a565227538c52ead2349eb17d54aadd6f7 +drm-misc 40f458b7816bd3ddddc068998523b4e039c04818 +amdgpu d68cf992ded575928cf4ddf7c64faff0d8dcce14 +drm-intel b39d2c6202426b560641e5800c5523851b5db586 +drm-tegra b53c24f69199b88671293de503f1f999a762f4f9 +drm-msm 390d645877ffd6dcb55f162d618045b2779217b3 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 2829a9fcb738f742baad9d15de4c6eac84bcfd08 +fbdev 610323d8f6f8b479a04eec33fd67e4152beb7b65 +regmap bd941dfaae3503c6b707d8544696205f759e57a3 +sound faf5933c79545412ea63f0c3d15c261d104e1dde +sound-asoc 5d763a740e5b24e4a2ca04317255e7e941876338 +modules eeaec7801c421e17edda6e45a32d4a5596b633da +input 66ab05c75642712f382a17a887eb558caa6646e1 +block 7c8ea0124c1ba96468c8fd62502e5ca9a8f26382 +device-mapper 7d8342b5551a3d3c986f01074dcaa70fb4e24dcf +libata 8feecea4de7ee1bd9712947bb85d495b1d1e438d +pcmcia 3928cf08334ed895a31458cbebd8d4ec6d84c080 +mmc 0dcf1c1a6ec22bf66c2ff2c7e7de5a795b0c3861 +mfd d99460ed5cdcc28feba6b992630b04650e410902 +backlight 023a8830a62846e1cecc8da07e00c801dd0d7598 +battery 3123109284176b1532874591f7c81f3837bbdc17 +regulator b113137a1793e020c839c84e98ba0386a81581df +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor c2489617b3b9a546789ca00940b205d61c518c81 +integrity 29d1c2b47ef3b39a5bc58e060a4ee23ccf3d052e +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux 6a9e261cbbee08c499f2331910027e8c40c8f81f +smack ba6b652bd8633bc90390e1a02ae0c743ea00c429 +tomoyo ae5d03879e6308c9c3c9fd630dce72d3eb12e38e +tpmdd 8467b0ed6ce37f7e3f87aa3826627dc9cc55ecb2 +watchdog b2d229d4ddb17db541098b83524d901257e93845 +iommu 71ff461c3f41f6465434b9e980c01782763e7ad8 +audit 3123109284176b1532874591f7c81f3837bbdc17 +devicetree 548f8b21ae6053680c61fe7ca79e2380b0b3964e +mailbox 1b0d0f7c12d57763fe27200d0569c863f11d2b8a +spi 73f93db5c49b9f52c902e5dc6c750bf9832e0450 +tip 6a01118827476d242c55886e0f4809b99d821762 +clockevents 49c14f94ccfed1acf55a7dd592c00c58d38e5812 +edac 96b79f20138665dc55b11b82f450d5f997903d2f +irqchip de26a7424331493311c08625a700cf45d1eaf151 +ftrace c87857e214862a125208a4b1a510839d0c5a1bd4 +rcu e912cedc79ae9278ebbc660b07969f953431748d +kvm 5d6c7de6446e9ab3fb41d6f7d82770e50998f3de +kvm-arm 21ea457842759a236eefed2cfaa8cc7e5dc967a0 +kvms390 4aa5ac75bf79cbbc46369163eb2e3addbff0d434 +xen-tip 262fc47ac17461c8cdc71c70aff6c3ea45acb0b9 +percpu 4e1f82dce05b644d6886d5b3656446d8ec50db20 +workqueues bc35f7ef96284b8c963991357a9278a6beafca54 +drivers-x86 b0c07116c894325d40a218f558047f925e4b3bdb +chrome-platform 3123109284176b1532874591f7c81f3837bbdc17 +hsi 43c14f8d18a7ab26e8f0e960bfd8f4d0a9c57c4d +leds 3123109284176b1532874591f7c81f3837bbdc17 +ipmi af82f0f557885a3c021e756230b48de5c4c76347 +driver-core ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e +usb 3123109284176b1532874591f7c81f3837bbdc17 +thunderbolt 03941ed91c7231e4973fb50de6c349974405df4e +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 3123109284176b1532874591f7c81f3837bbdc17 +tty f398e0aa325c61fa20903833a5b534ecb8e6e418 +char-misc ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e +coresight c86dd9869128156696b4482b2a073790d3db2cfb +fpga 3123109284176b1532874591f7c81f3837bbdc17 +icc 2fb251c265608636fc961b7d38e1a03937e57371 +iio b28bc9ebbe2320f919e4f4cf70fafbc8a0ac328d +phy-next e72659b69f0650f8f0e7e1587e5f261d2a431697 +soundwire 60657fb9b19d4ff310bdebfd1fd5a075678c29fb +extcon 4a17c3246de780d249caca212419505eefa08395 +gnss 3123109284176b1532874591f7c81f3837bbdc17 +vfio f621eb13facb7681a79f4fec8ec6553ae160da76 +staging bed6d200f8ca38e1ecbdd8fb7e0564884002abd1 +mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +dmaengine d0a3ef604801e8e8564d15bdeb29497607a0d65a +cgroup 1be9b7206b7dbff54b223eee7ef3bc91b80433aa +scsi 70c954151828f8c319698e73894eddcb6a9462c6 +scsi-mkp 3a6a7187f09a0b1add76aaf4015f215a381ab616 +vhost 1c80cf031e0204fde471558ee40183695773ce13 +rpmsg 58b7c856519fe946620ee68dd0c37bd3c695484a +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl 4f3e79b36d7fdbc3315efe5612a01800931fa25d +gpio-intel edc5601db66411a8c9c6b08b3aacf7e154a34c6d +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl 4a6d01495a167762de1691eb51e0413954db20eb +pinctrl-intel 0be0b70df6611205ac392d0e21f7e077f3230ee6 +pinctrl-renesas d508ba2d0e57b894bbcbf5130ad096016f990792 +pinctrl-samsung abb860ac7e3f022a233f34b12d035d49abfc114d +pwm ed14d36498c8d15be098df4af9ca324f96e9de74 +userns 9def41809e95d345875f37d2245b4b17c62fedf1 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest 3123109284176b1532874591f7c81f3837bbdc17 +livepatching 0e1b951d6de0528a81d119634ad23f8f9fb6d423 +rtc 3123109284176b1532874591f7c81f3837bbdc17 +nvdimm ada8d8d337ee970860c9844126e634df8076aa11 +at24 3123109284176b1532874591f7c81f3837bbdc17 +ntb 10003e852471b1214f4383d79592497b3f4c7b39 +seccomp 8a3d3ea66f0d06eff26cd64e3712410daec1f4ae +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi f2af60bb7ce2fa5397f401cbf65725d9c87329a4 +slimbus 54bf672111eef18819fa6e562f68b2d6c449b05d +nvmem 2e26a810b679803c3a61b7b77f7b96879a4df521 +xarray 3ed4bb77156da0bc732847c8c9df92454c1fbeea +hyperv eeda29db98f429a3b6473117e6ce1c213ab614f2 +auxdisplay 13de23494f387315c6cfab6fe78fbed7d1b25586 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm 3123109284176b1532874591f7c81f3837bbdc17 +kunit 3123109284176b1532874591f7c81f3837bbdc17 +cfi e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +kunit-next 59729170afcd4900e08997a482467ffda8d88c7f +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi 2ab40dd15f1ce92235cc98efb0daa4a3af04463a +memblock 58ffc34896db2e5e49e6ae6bf8042f85504d84e8 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +cxl 05e815539f3f161585c13a9ab023341bade2c52f +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +zstd 88a309465b3f05a100c3b81966982c0f9f5d23a6 +efi 21b68da7bf4a0f27837a652565a76b9c95e54793 +unicode 5298d4bfe80f6ae6ae2777bcd1357b0022d98573 +slab b2a53d4ef8611831a9dc17b40db6306fdc15690c +random 0c6fa560a2f59b59bc49e27ab44b0b01e62e1389 +landlock 3123109284176b1532874591f7c81f3837bbdc17 +rust 011150424cd9db6089d9a3732a03a6d39ce6f1c9 +sysctl 383189718496c1fe163f378526f9b86dc7f0cf77 +folio 98ea02597b9967c0817d29fee2f96d21b9e59ca5 +execve 6045ab5fea4c849153ebeb0acb532da5f29d69c4 +bitmap f0b93f69ffda541720977e43db6a5ff3991c450b +kspp e6f3b3c9c109ed57230996cf4a4c1b8ae7e36a81 +kspp-gustavo 452d059ea2b6252f6743de3e9e81950d05ed8b18 +akpm-current 184c9e1ca40f3238180cae9338db853f24c185de +akpm c9b2894523e403c1d85d9b3f560c4af03d2ff89b diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..9037838acab1 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,347 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless git git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#main +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-fixes git https://gitlab.com/vilhelmgray/counter.git#fixes-togreg +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/fixes +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#main +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +gpio-sim git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/gpio-sim +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +folio-iomap git git://git.infradead.org/users/willy/linux.git#folio-iomap +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..f4325565dcac --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8052 @@ +$ date -R +Tue, 19 Apr 2022 07:45:52 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at a19944809fe9 Merge tag 'hardening-v5.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux +Merging origin/master (b2d229d4ddb1 Linux 5.18-rc3) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating a19944809fe9..b2d229d4ddb1 +Fast-forward (no commit created; -m option ignored) + .../bindings/arm/tegra/nvidia,tegra20-pmc.yaml | 1 - + Documentation/devicetree/bindings/bus/ti-sysc.yaml | 1 - + .../bindings/clock/samsung,exynos-audss-clock.yaml | 2 +- + .../bindings/clock/samsung,exynos-clock.yaml | 2 +- + .../bindings/clock/samsung,exynos-ext-clock.yaml | 2 +- + .../clock/samsung,exynos4412-isp-clock.yaml | 2 +- + .../bindings/clock/samsung,exynos5260-clock.yaml | 2 +- + .../bindings/clock/samsung,exynos5410-clock.yaml | 2 +- + .../bindings/clock/samsung,exynos5433-clock.yaml | 2 +- + .../bindings/clock/samsung,exynos7-clock.yaml | 2 +- + .../bindings/clock/samsung,exynos7885-clock.yaml | 2 +- + .../bindings/clock/samsung,exynos850-clock.yaml | 2 +- + .../devicetree/bindings/clock/samsung,s2mps11.yaml | 2 +- + .../clock/samsung,s5pv210-audss-clock.yaml | 2 +- + .../bindings/clock/samsung,s5pv210-clock.yaml | 2 +- + .../devfreq/event/samsung,exynos-nocp.yaml | 2 +- + .../devfreq/event/samsung,exynos-ppmu.yaml | 2 +- + .../bindings/display/msm/dpu-qcm2290.yaml | 4 +- + .../bindings/display/panel/panel-timing.yaml | 42 +-- + .../display/samsung/samsung,exynos-hdmi-ddc.yaml | 2 +- + .../display/samsung/samsung,exynos-hdmi.yaml | 2 +- + .../display/samsung/samsung,exynos-mixer.yaml | 2 +- + .../display/samsung/samsung,exynos5433-decon.yaml | 2 +- + .../display/samsung/samsung,exynos5433-mic.yaml | 2 +- + .../display/samsung/samsung,exynos7-decon.yaml | 2 +- + .../bindings/display/samsung/samsung,fimd.yaml | 2 +- + .../devicetree/bindings/extcon/maxim,max77843.yaml | 4 +- + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 5 +- + .../devicetree/bindings/hwmon/lltc,ltc4151.yaml | 2 +- + .../bindings/hwmon/microchip,mcp3021.yaml | 2 +- + .../devicetree/bindings/hwmon/sensirion,sht15.yaml | 2 +- + .../devicetree/bindings/hwmon/ti,tmp102.yaml | 2 +- + .../devicetree/bindings/hwmon/ti,tmp108.yaml | 2 +- + .../devicetree/bindings/hwmon/ti,tmp464.yaml | 5 +- + .../devicetree/bindings/i2c/i2c-exynos5.yaml | 2 +- + .../bindings/i2c/samsung,s3c2410-i2c.yaml | 2 +- + .../devicetree/bindings/iio/adc/adi,ad7476.yaml | 1 + + .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 12 +- + .../devicetree/bindings/iio/dac/adi,ad5360.yaml | 6 +- + .../devicetree/bindings/interconnect/qcom,rpm.yaml | 84 ++--- + .../bindings/interrupt-controller/mrvl,intc.yaml | 6 +- + .../samsung,exynos4210-combiner.yaml | 2 +- + .../devicetree/bindings/leds/maxim,max77693.yaml | 2 +- + Documentation/devicetree/bindings/media/coda.yaml | 1 - + .../bindings/media/mediatek,vcodec-decoder.yaml | 2 - + .../bindings/media/mediatek,vcodec-encoder.yaml | 3 - + .../media/mediatek,vcodec-subdev-decoder.yaml | 1 - + .../bindings/memory-controllers/brcm,dpfe-cpu.yaml | 2 +- + .../ddr/jedec,lpddr2-timings.yaml | 2 +- + .../memory-controllers/ddr/jedec,lpddr2.yaml | 2 +- + .../ddr/jedec,lpddr3-timings.yaml | 2 +- + .../memory-controllers/ddr/jedec,lpddr3.yaml | 2 +- + .../marvell,mvebu-sdram-controller.yaml | 2 +- + .../qca,ath79-ddr-controller.yaml | 2 +- + .../memory-controllers/renesas,h8300-bsc.yaml | 2 +- + .../memory-controllers/samsung,exynos5422-dmc.yaml | 2 +- + .../memory-controllers/synopsys,ddrc-ecc.yaml | 8 +- + .../memory-controllers/ti,da8xx-ddrctl.yaml | 2 +- + .../devicetree/bindings/mfd/maxim,max14577.yaml | 2 +- + .../devicetree/bindings/mfd/maxim,max77686.yaml | 2 +- + .../devicetree/bindings/mfd/maxim,max77693.yaml | 2 +- + .../devicetree/bindings/mfd/maxim,max77802.yaml | 2 +- + .../devicetree/bindings/mfd/maxim,max77843.yaml | 2 +- + .../bindings/mfd/samsung,exynos5433-lpass.yaml | 2 +- + .../devicetree/bindings/mfd/samsung,s2mpa01.yaml | 2 +- + .../devicetree/bindings/mfd/samsung,s2mps11.yaml | 2 +- + .../devicetree/bindings/mfd/samsung,s5m8767.yaml | 2 +- + .../bindings/mmc/nvidia,tegra20-sdhci.yaml | 2 + + .../devicetree/bindings/net/nfc/marvell,nci.yaml | 2 +- + .../devicetree/bindings/net/nfc/nxp,nci.yaml | 2 +- + .../devicetree/bindings/net/nfc/nxp,pn532.yaml | 2 +- + .../devicetree/bindings/net/nfc/nxp,pn544.yaml | 2 +- + .../devicetree/bindings/net/nfc/st,st-nci.yaml | 2 +- + .../devicetree/bindings/net/nfc/st,st21nfca.yaml | 2 +- + .../devicetree/bindings/net/nfc/st,st95hf.yaml | 2 +- + .../devicetree/bindings/net/nfc/ti,trf7970a.yaml | 2 +- + .../devicetree/bindings/net/snps,dwmac.yaml | 6 +- + .../bindings/net/socionext,uniphier-ave4.yaml | 57 +++- + .../devicetree/bindings/net/ti,davinci-mdio.yaml | 1 + + .../bindings/phy/nvidia,tegra20-usb-phy.yaml | 20 +- + .../devicetree/bindings/phy/qcom,usb-hs-phy.yaml | 32 +- + .../bindings/phy/samsung,dp-video-phy.yaml | 2 +- + .../bindings/phy/samsung,exynos-hdmi-phy.yaml | 2 +- + .../bindings/phy/samsung,exynos5250-sata-phy.yaml | 2 +- + .../bindings/phy/samsung,mipi-video-phy.yaml | 2 +- + .../devicetree/bindings/phy/samsung,usb2-phy.yaml | 2 +- + .../bindings/phy/samsung,usb3-drd-phy.yaml | 2 +- + .../devicetree/bindings/pinctrl/cirrus,madera.yaml | 11 +- + .../pinctrl/samsung,pinctrl-gpio-bank.yaml | 2 +- + .../bindings/pinctrl/samsung,pinctrl-pins-cfg.yaml | 2 +- + .../pinctrl/samsung,pinctrl-wakeup-interrupt.yaml | 2 +- + .../bindings/pinctrl/samsung,pinctrl.yaml | 2 +- + .../devicetree/bindings/power/renesas,apmu.yaml | 3 +- + .../devicetree/bindings/power/supply/bq2415x.yaml | 1 - + .../bindings/power/supply/maxim,max14577.yaml | 2 +- + .../bindings/power/supply/maxim,max77693.yaml | 2 +- + .../bindings/regulator/fixed-regulator.yaml | 34 +- + .../bindings/regulator/maxim,max14577.yaml | 2 +- + .../bindings/regulator/maxim,max77686.yaml | 2 +- + .../bindings/regulator/maxim,max77693.yaml | 2 +- + .../bindings/regulator/maxim,max77802.yaml | 2 +- + .../bindings/regulator/maxim,max77843.yaml | 2 +- + .../bindings/regulator/maxim,max8952.yaml | 2 +- + .../bindings/regulator/maxim,max8973.yaml | 2 +- + .../bindings/regulator/maxim,max8997.yaml | 2 +- + .../bindings/regulator/samsung,s2mpa01.yaml | 2 +- + .../bindings/regulator/samsung,s2mps11.yaml | 2 +- + .../bindings/regulator/samsung,s2mps13.yaml | 2 +- + .../bindings/regulator/samsung,s2mps14.yaml | 2 +- + .../bindings/regulator/samsung,s2mps15.yaml | 2 +- + .../bindings/regulator/samsung,s2mpu02.yaml | 2 +- + .../bindings/regulator/samsung,s5m8767.yaml | 2 +- + .../bindings/remoteproc/qcom,sc7280-wpss-pil.yaml | 4 +- + .../bindings/reset/hisilicon,hi3660-reset.yaml | 5 + + .../bindings/reset/socionext,uniphier-reset.yaml | 3 + + .../bindings/rng/samsung,exynos5250-trng.yaml | 2 +- + .../devicetree/bindings/rng/timeriomem_rng.yaml | 2 +- + .../bindings/soc/samsung/exynos-usi.yaml | 2 +- + .../devicetree/bindings/sound/samsung,arndale.yaml | 2 +- + .../bindings/sound/samsung,smdk5250.yaml | 2 +- + .../devicetree/bindings/sound/samsung,snow.yaml | 2 +- + .../devicetree/bindings/sound/samsung,tm2.yaml | 2 +- + .../devicetree/bindings/sound/st,stm32-sai.yaml | 6 +- + .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 2 - + .../bindings/spi/samsung,spi-peripheral-props.yaml | 2 +- + .../devicetree/bindings/spi/samsung,spi.yaml | 2 +- + Documentation/devicetree/bindings/sram/sram.yaml | 16 +- + .../bindings/thermal/samsung,exynos-thermal.yaml | 2 +- + .../bindings/usb/samsung,exynos-dwc3.yaml | 2 +- + .../bindings/usb/samsung,exynos-usb2.yaml | 2 +- + Documentation/filesystems/caching/backend-api.rst | 8 +- + Documentation/filesystems/caching/netfs-api.rst | 25 +- + Documentation/networking/bonding.rst | 4 +- + MAINTAINERS | 108 +++--- + Makefile | 2 +- + arch/arm/boot/dts/at91-kizbox3-hs.dts | 2 +- + arch/arm/boot/dts/at91-kizbox3_common.dtsi | 2 +- + arch/arm/boot/dts/at91-sam9_l9260.dts | 2 +- + arch/arm/boot/dts/da850-evm.dts | 2 +- + arch/arm/boot/dts/dm8168-evm.dts | 2 +- + arch/arm/boot/dts/imx28-ts4600.dts | 2 +- + arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 32 +- + .../boot/dts/imx6ul-phytec-segin-peb-av-02.dtsi | 4 +- + arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 4 +- + arch/arm/boot/dts/qcom-apq8064-pins.dtsi | 12 +- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 8 +- + arch/arm/boot/dts/spear1310-evb.dts | 2 +- + arch/arm/boot/dts/spear1340-evb.dts | 2 +- + arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi | 2 +- + arch/arm/boot/dts/stm32mp157c-ev1.dts | 4 +- + arch/arm/configs/gemini_defconfig | 5 +- + arch/arm/configs/imote2_defconfig | 365 --------------------- + arch/arm/configs/u8500_defconfig | 19 +- + arch/arm/mach-davinci/board-da850-evm.c | 4 +- + arch/arm/mach-ep93xx/clock.c | 6 +- + arch/arm/mach-iop32x/cp6.c | 2 + + arch/arm/mach-vexpress/spc.c | 28 +- + arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi | 8 +- + arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi | 8 +- + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 8 +- + .../dts/nvidia/tegra186-p3509-0000+p3636-0001.dts | 8 +- + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 6 +- + arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi | 6 +- + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 6 +- + arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi | 8 +- + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 8 +- + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 4 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 +- + .../arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 2 +- + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 2 +- + arch/s390/Kconfig | 19 ++ + arch/s390/Makefile | 2 + + arch/s390/configs/debug_defconfig | 8 +- + arch/s390/configs/defconfig | 6 +- + arch/s390/configs/zfcpdump_defconfig | 6 +- + arch/s390/include/asm/entry-common.h | 2 +- + arch/s390/include/asm/processor.h | 8 +- + arch/s390/include/asm/stacktrace.h | 2 +- + arch/s390/kernel/machine_kexec.c | 2 +- + arch/s390/kernel/processor.c | 4 + + arch/s390/lib/test_unwind.c | 2 +- + arch/x86/include/asm/io.h | 2 - + arch/x86/include/asm/msr-index.h | 4 +- + arch/x86/kernel/cpu/common.c | 2 + + arch/x86/kernel/cpu/cpu.h | 5 +- + arch/x86/kernel/cpu/intel.c | 7 - + arch/x86/kernel/cpu/tsx.c | 104 +++++- + arch/x86/kernel/crash_dump_64.c | 1 - + block/bio.c | 2 +- + block/blk-mq.c | 3 +- + block/ioctl.c | 2 +- + drivers/base/dd.c | 1 + + drivers/block/null_blk/main.c | 2 +- + drivers/char/random.c | 44 ++- + drivers/firmware/arm_scmi/clock.c | 5 +- + drivers/firmware/arm_scmi/driver.c | 3 +- + drivers/firmware/arm_scmi/optee.c | 8 +- + drivers/gpio/gpio-sim.c | 4 +- + drivers/gpio/gpiolib-acpi.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 + + .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 4 +- + drivers/gpu/drm/amd/display/dc/dc.h | 2 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 14 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 14 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 80 ++++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 34 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 3 + + drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 2 + + drivers/gpu/drm/msm/dp/dp_display.c | 6 + + drivers/gpu/drm/msm/dp/dp_panel.c | 20 +- + drivers/gpu/drm/msm/dp/dp_panel.h | 1 + + drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 2 +- + drivers/gpu/drm/msm/msm_gem.c | 1 + + drivers/i2c/busses/i2c-imx.c | 33 ++ + drivers/i2c/busses/i2c-ismt.c | 4 +- + drivers/i2c/busses/i2c-pasemi-core.c | 6 + + drivers/i2c/busses/i2c-qcom-geni.c | 6 +- + drivers/i2c/i2c-dev.c | 17 +- + drivers/md/dm-integrity.c | 7 +- + drivers/md/dm-ps-historical-service-time.c | 11 +- + drivers/md/dm-zone.c | 49 +-- + drivers/md/dm.c | 18 +- + drivers/memory/atmel-ebi.c | 23 +- + drivers/memory/fsl_ifc.c | 3 +- + drivers/memory/renesas-rpc-if.c | 10 +- + drivers/net/dsa/ocelot/felix.c | 23 ++ + drivers/net/dsa/ocelot/felix_vsc9959.c | 2 +- + drivers/net/dsa/realtek/Kconfig | 30 +- + drivers/net/dsa/realtek/realtek-smi.c | 5 - + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 8 +- + drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 24 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +- + drivers/net/ethernet/cadence/macb_main.c | 8 + + drivers/net/ethernet/faraday/ftgmac100.c | 10 +- + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 8 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 7 +- + drivers/net/ethernet/intel/ice/ice_arfs.c | 9 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 5 +- + drivers/net/ethernet/intel/ice/ice_main.c | 18 +- + drivers/net/ethernet/mellanox/mlxsw/i2c.c | 1 + + .../net/ethernet/microchip/lan966x/lan966x_mac.c | 6 +- + .../net/ethernet/microchip/lan966x/lan966x_main.c | 6 + + .../net/ethernet/microchip/lan966x/lan966x_ptp.c | 8 +- + .../ethernet/microchip/lan966x/lan966x_switchdev.c | 3 +- + drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.c | 8 - + drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.h | 4 + + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 13 +- + drivers/net/macvlan.c | 8 +- + drivers/net/mdio/fwnode_mdio.c | 5 + + drivers/net/phy/microchip_t1.c | 7 +- + drivers/net/tun.c | 2 +- + drivers/net/veth.c | 2 +- + drivers/net/vxlan/vxlan_core.c | 4 +- + drivers/net/wireless/ath/ath11k/mac.c | 22 +- + drivers/net/wireless/ath/ath9k/main.c | 2 +- + drivers/net/wireless/ath/ath9k/xmit.c | 33 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/pci.c | 2 +- + drivers/nvme/host/core.c | 27 +- + drivers/nvme/host/nvme.h | 5 + + drivers/nvme/host/pci.c | 9 +- + drivers/power/supply/power_supply_core.c | 6 + + drivers/power/supply/samsung-sdi-battery.c | 2 + + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 4 +- + drivers/reset/tegra/reset-bpmp.c | 9 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- + drivers/scsi/cxgbi/libcxgbi.c | 6 +- + drivers/scsi/libiscsi.c | 27 +- + drivers/scsi/libiscsi_tcp.c | 2 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 33 +- + drivers/scsi/qedi/qedi_iscsi.c | 69 ++-- + drivers/scsi/scsi_debug.c | 197 +++-------- + drivers/scsi/scsi_transport_iscsi.c | 239 ++++++++------ + drivers/vfio/pci/vfio_pci_core.c | 124 ++++--- + drivers/xen/balloon.c | 54 ++- + drivers/xen/unpopulated-alloc.c | 33 -- + fs/afs/write.c | 3 +- + fs/binfmt_elf.c | 4 +- + fs/btrfs/block-group.c | 40 ++- + fs/btrfs/block-group.h | 4 + + fs/btrfs/compression.c | 8 + + fs/btrfs/disk-io.c | 5 +- + fs/btrfs/extent-tree.c | 2 +- + fs/btrfs/inode.c | 9 +- + fs/btrfs/ioctl.c | 2 - + fs/btrfs/volumes.c | 2 + + fs/cachefiles/namei.c | 33 +- + fs/cachefiles/xattr.c | 2 +- + fs/cifs/cifsfs.c | 30 +- + fs/cifs/connect.c | 2 +- + fs/cifs/link.c | 3 + + fs/cifs/smb2ops.c | 9 +- + fs/cifs/trace.h | 7 + + fs/cifs/transport.c | 4 +- + fs/fscache/Kconfig | 3 - + fs/fscache/cache.c | 2 +- + fs/fscache/cookie.c | 4 +- + fs/fscache/internal.h | 4 + + fs/fscache/io.c | 5 +- + fs/io-wq.h | 1 - + fs/io_uring.c | 98 +++--- + fs/namei.c | 22 +- + include/asm-generic/unaligned.h | 2 +- + include/linux/fscache.h | 4 +- + include/linux/gpio/consumer.h | 8 +- + include/linux/kernel.h | 9 - + include/linux/kfence.h | 24 ++ + include/linux/t10-pi.h | 9 + + include/linux/timex.h | 2 +- + include/linux/vfio_pci_core.h | 2 + + include/net/flow_dissector.h | 2 + + include/scsi/libiscsi.h | 9 +- + include/scsi/scsi_transport_iscsi.h | 4 +- + include/sound/core.h | 1 + + include/sound/memalloc.h | 5 + + include/uapi/linux/io_uring.h | 1 + + kernel/cpu.c | 36 +- + kernel/dma/direct.h | 3 +- + kernel/irq/affinity.c | 5 +- + kernel/irq_work.c | 2 +- + kernel/smp.c | 2 +- + kernel/time/tick-sched.c | 6 +- + kernel/time/timer.c | 11 +- + mm/compaction.c | 10 +- + mm/filemap.c | 6 - + mm/hugetlb.c | 17 +- + mm/kasan/hw_tags.c | 5 +- + mm/kasan/kasan.h | 10 +- + mm/kfence/core.c | 21 -- + mm/kfence/kfence.h | 21 ++ + mm/kfence/report.c | 47 +++ + mm/kmemleak.c | 8 +- + mm/page_alloc.c | 2 +- + mm/page_io.c | 54 --- + mm/secretmem.c | 17 + + mm/shmem.c | 31 +- + mm/slab.c | 2 +- + mm/slab.h | 2 +- + mm/slab_common.c | 9 + + mm/slob.c | 2 +- + mm/slub.c | 2 +- + mm/vmalloc.c | 11 - + net/core/flow_dissector.c | 3 +- + net/core/rtnetlink.c | 3 + + net/dsa/dsa2.c | 23 +- + net/ipv6/ip6_output.c | 2 +- + net/mac80211/debugfs_sta.c | 2 +- + net/netfilter/nf_tables_api.c | 2 +- + net/netfilter/nft_socket.c | 7 +- + net/nfc/nci/core.c | 4 + + net/sched/cls_api.c | 2 +- + net/sched/cls_flower.c | 18 +- + net/sched/sch_taprio.c | 3 +- + net/sctp/sm_statefuns.c | 6 +- + net/sctp/socket.c | 2 +- + net/smc/af_smc.c | 14 +- + net/smc/smc_clc.c | 6 +- + net/smc/smc_pnet.c | 5 +- + net/wireless/nl80211.c | 3 +- + net/wireless/scan.c | 2 + + sound/core/init.c | 28 ++ + sound/core/memalloc.c | 111 ++++++- + sound/core/pcm_misc.c | 2 +- + sound/drivers/mtpav.c | 4 +- + sound/hda/hdac_i915.c | 29 +- + sound/hda/intel-dsp-config.c | 18 +- + sound/isa/galaxy/galaxy.c | 7 +- + sound/isa/sc6000.c | 7 +- + sound/oss/dmasound/dmasound.h | 6 - + sound/oss/dmasound/dmasound_core.c | 24 +- + sound/pci/ad1889.c | 10 +- + sound/pci/ali5451/ali5451.c | 10 +- + sound/pci/als300.c | 8 +- + sound/pci/als4000.c | 10 +- + sound/pci/atiixp.c | 10 +- + sound/pci/atiixp_modem.c | 10 +- + sound/pci/au88x0/au88x0.c | 8 +- + sound/pci/aw2/aw2-alsa.c | 8 +- + sound/pci/azt3328.c | 8 +- + sound/pci/bt87x.c | 10 +- + sound/pci/ca0106/ca0106_main.c | 10 +- + sound/pci/cmipci.c | 8 +- + sound/pci/cs4281.c | 10 +- + sound/pci/cs5535audio/cs5535audio.c | 10 +- + sound/pci/echoaudio/echoaudio.c | 9 +- + sound/pci/emu10k1/emu10k1x.c | 10 +- + sound/pci/ens1370.c | 10 +- + sound/pci/es1938.c | 10 +- + sound/pci/es1968.c | 10 +- + sound/pci/fm801.c | 10 +- + sound/pci/hda/patch_realtek.c | 2 + + sound/pci/ice1712/ice1724.c | 10 +- + sound/pci/intel8x0.c | 10 +- + sound/pci/intel8x0m.c | 10 +- + sound/pci/korg1212/korg1212.c | 8 +- + sound/pci/lola/lola.c | 10 +- + sound/pci/lx6464es/lx6464es.c | 8 +- + sound/pci/maestro3.c | 8 +- + sound/pci/nm256/nm256.c | 2 +- + sound/pci/oxygen/oxygen_lib.c | 12 +- + sound/pci/riptide/riptide.c | 8 +- + sound/pci/rme32.c | 8 +- + sound/pci/rme96.c | 10 +- + sound/pci/rme9652/hdsp.c | 8 +- + sound/pci/rme9652/hdspm.c | 8 +- + sound/pci/rme9652/rme9652.c | 8 +- + sound/pci/sis7019.c | 14 +- + sound/pci/sonicvibes.c | 10 +- + sound/pci/via82xx.c | 10 +- + sound/pci/via82xx_modem.c | 10 +- + sound/usb/pcm.c | 16 +- + sound/usb/usbaudio.h | 2 +- + sound/x86/intel_hdmi_audio.c | 7 +- + tools/arch/x86/include/asm/msr-index.h | 4 +- + tools/lib/perf/evlist.c | 3 +- + tools/perf/bench/numa.c | 136 ++++++-- + tools/perf/builtin-record.c | 22 +- + tools/perf/util/header.c | 51 +++ + tools/perf/util/header.h | 1 + + tools/perf/util/parse-events.c | 5 +- + tools/perf/util/stat.c | 3 +- + tools/testing/selftests/mqueue/mq_perf_tests.c | 25 +- + 430 files changed, 2750 insertions(+), 2115 deletions(-) + delete mode 100644 arch/arm/configs/imote2_defconfig +Merging fixes/fixes (d06c942efea4 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging kbuild-current/fixes (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (ac411e41ec06 ARC: atomic: cleanup atomic-llsc definitions) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Merge made by the 'ort' strategy. + arch/arc/boot/dts/hsdk.dts | 2 +- + arch/arc/include/asm/atomic-llsc.h | 32 ++++++++++++++++---------------- + arch/arc/include/asm/pgtable-levels.h | 3 --- + arch/arc/kernel/disasm.c | 3 +-- + arch/arc/kernel/entry.S | 1 + + arch/arc/kernel/signal.c | 2 +- + arch/arc/kernel/smp.c | 2 +- + arch/arc/kernel/unaligned.c | 2 +- + arch/arc/mm/cache.c | 2 +- + 9 files changed, 23 insertions(+), 26 deletions(-) +Merging arm-current/fixes (9be4c88bb792 ARM: 9191/1: arm/stacktrace, kasan: Silence KASAN warnings in unwind_frame()) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (0ff74a23e08f arm64: fix typos in comments) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Merge made by the 'ort' strategy. + arch/arm64/Kconfig | 15 ++++++++++++--- + drivers/perf/arm_pmu.c | 10 ++++------ + 2 files changed, 16 insertions(+), 9 deletions(-) +Merging arm-soc-fixes/arm/fixes (67e473a303e7 Merge tag 'at91-fixes-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Merge made by the 'ort' strategy. + .../devicetree/bindings/mfd/atmel-flexcom.txt | 2 +- + arch/arm/boot/dts/at91-dvk_su60_somc.dtsi | 2 +- + arch/arm/boot/dts/at91-q5xr5.dts | 2 +- + arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 2 +- + arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts | 2 +- + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 2 +- + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 8 ++-- + arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi | 2 +- + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 6 +-- + arch/arm/boot/dts/at91-sama5d4ek.dts | 2 +- + arch/arm/boot/dts/at91-sama7g5ek.dts | 4 +- + arch/arm/boot/dts/at91-vinco.dts | 2 +- + arch/arm/boot/dts/at91rm9200ek.dts | 4 +- + arch/arm/boot/dts/at91sam9260ek.dts | 2 +- + arch/arm/boot/dts/at91sam9261ek.dts | 2 +- + arch/arm/boot/dts/at91sam9263ek.dts | 2 +- + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 45 +++++++++++++++++++++- + arch/arm/boot/dts/at91sam9m10g45ek.dts | 2 +- + arch/arm/boot/dts/at91sam9n12ek.dts | 2 +- + arch/arm/boot/dts/at91sam9rlek.dts | 2 +- + arch/arm/boot/dts/at91sam9x5ek.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 10 ++++- + arch/arm/boot/dts/sama5d3xmb.dtsi | 2 +- + arch/arm/boot/dts/sama5d3xmb_cmp.dtsi | 2 +- + arch/arm/boot/dts/sama7g5.dtsi | 18 ++++----- + arch/arm/boot/dts/usb_a9263.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi | 40 ------------------- + arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi | 40 ------------------- + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 8 ++-- + .../boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 1 + + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 20 ---------- + .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 4 +- + .../boot/dts/freescale/imx8mm-venice-gw72xx.dtsi | 4 +- + .../boot/dts/freescale/imx8mm-venice-gw73xx.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 10 ++--- + arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 2 +- + drivers/bus/imx-weim.c | 3 +- + drivers/soc/imx/imx8m-blk-ctrl.c | 2 +- + drivers/tee/optee/ffa_abi.c | 1 + + 40 files changed, 115 insertions(+), 159 deletions(-) +Merging drivers-memory-fixes/fixes (73039c6c7f36 memory: renesas-rpc-if: Fix HF/OSPI data transfer in Manual Mode) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Merge made by the 'ort' strategy. + drivers/memory/renesas-rpc-if.c | 60 +++++++++++++++++++++++++++++++---------- + include/memory/renesas-rpc-if.h | 1 + + 2 files changed, 47 insertions(+), 14 deletions(-) +Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Merge made by the 'ort' strategy. +Merging m68k-current/for-linus (0d52a01a266b m68k: defconfig: Disable fbdev on Sun3/3x) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (ce522ba9ef7e Linux 5.18-rc2) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (c68c63429319 s390: enable CONFIG_HARDENED_USERCOPY in debug_defconfig) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Already up to date. +Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Already up to date. +Merging net/master (cbe6c3a8f8f4 net: atlantic: invert deep par in pm functions, preventing null derefs) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 -- + drivers/net/bonding/bond_main.c | 13 +++++++---- + drivers/net/ethernet/Kconfig | 26 +++++++++++----------- + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 8 +++---- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 4 ++-- + drivers/net/ethernet/intel/ice/ice_eswitch.c | 3 ++- + drivers/net/ethernet/intel/ice/ice_eswitch.h | 2 +- + drivers/net/ethernet/intel/ice/ice_nvm.c | 1 + + drivers/net/ethernet/intel/ice/ice_xsk.c | 7 +++++- + drivers/net/ethernet/intel/igc/igc_i225.c | 11 +++++++-- + drivers/net/ethernet/intel/igc/igc_phy.c | 4 ++-- + drivers/net/ethernet/intel/igc/igc_ptp.c | 15 ++++++++++++- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 2 +- + .../net/ethernet/microchip/lan966x/lan966x_main.c | 3 +++ + drivers/net/phy/microchip_t1.c | 1 + + include/net/esp.h | 2 -- + include/net/ip_tunnels.h | 11 +++++++-- + include/net/netns/ipv6.h | 4 ++-- + net/can/isotp.c | 10 ++++++++- + net/ipv4/esp4.c | 5 ++--- + net/ipv4/ip_gre.c | 4 ++-- + net/ipv4/ip_tunnel.c | 9 ++++---- + net/ipv6/esp6.c | 5 ++--- + net/ipv6/ip6_gre.c | 14 +++++++----- + net/ipv6/route.c | 11 ++++----- + net/l3mdev/l3mdev.c | 2 +- + net/openvswitch/flow_netlink.c | 2 +- + net/packet/af_packet.c | 13 +++++++---- + net/rxrpc/net_ns.c | 2 ++ + net/sched/cls_u32.c | 24 +++++++++++--------- + net/smc/af_smc.c | 4 +++- + net/xfrm/xfrm_policy.c | 4 +++- + 32 files changed, 147 insertions(+), 81 deletions(-) +Merging bpf/master (425d239379db bpf: Fix release of page_pool in BPF_PROG_RUN in test runner) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'ort' strategy. + net/bpf/test_run.c | 5 +++-- + net/xdp/xsk.c | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging ipsec/master (5bd8baab087d esp: limit skb_page_frag_refill use to a single page) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Already up to date. +Merging netfilter/master (05ae2fba821c netfilter: nft_socket: make cgroup match work in input too) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/master (05ae2fba821c netfilter: nft_socket: make cgroup match work in input too) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Already up to date. +Merging wireless/main (ef27324e2cb7 nfc: nci: add flush_workqueue to prevent uaf) +$ git merge -m Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/main +Already up to date. +Merging rdma-fixes/for-rc (ce522ba9ef7e Linux 5.18-rc2) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (24d0c9f0e7de ALSA: usb-audio: Limit max buffer and period sizes per time) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (34f58092ccf1 Merge remote-tracking branch 'asoc/for-5.17' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/firmware/cirrus/cs_dsp.c | 3 +- + include/sound/soc-component.h | 4 + + sound/soc/atmel/sam9g20_wm8731.c | 61 ----------- + sound/soc/codecs/cs35l41-lib.c | 10 +- + sound/soc/codecs/lpass-rx-macro.c | 14 ++- + sound/soc/codecs/lpass-tx-macro.c | 14 ++- + sound/soc/codecs/lpass-va-macro.c | 8 +- + sound/soc/codecs/msm8916-wcd-digital.c | 9 +- + sound/soc/codecs/rk817_codec.c | 2 +- + sound/soc/codecs/rt5682.c | 20 ++-- + sound/soc/codecs/rt5682s.c | 11 +- + sound/soc/codecs/rt711.c | 7 ++ + sound/soc/codecs/wcd934x.c | 26 +---- + sound/soc/codecs/wm8731.c | 19 ++-- + sound/soc/codecs/wm_adsp.c | 10 +- + sound/soc/fsl/fsl_sai.c | 2 +- + sound/soc/generic/simple-card-utils.c | 6 +- + sound/soc/intel/boards/sof_es8336.c | 117 ++++++++++++++++------ + sound/soc/intel/boards/sof_rt5682.c | 13 +++ + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 4 +- + sound/soc/meson/aiu-acodec-ctrl.c | 3 + + sound/soc/meson/aiu-codec-ctrl.c | 3 + + sound/soc/meson/aiu.c | 3 + + sound/soc/soc-core.c | 5 + + sound/soc/soc-dapm.c | 6 +- + sound/soc/soc-pcm.c | 2 +- + sound/soc/soc-topology.c | 4 +- + sound/soc/sof/sof-pci-dev.c | 9 +- + sound/soc/sof/topology.c | 50 ++++++++- + 29 files changed, 272 insertions(+), 173 deletions(-) +Merging regmap-fixes/for-linus (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (908b768f9a8f MAINTAINERS: Fix reviewer info for a few ROHM ICs) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (8c235cc25087 spi: atmel-quadspi: Fix the buswidth adjustment between spi-mem and controller) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/spi/atmel-quadspi.c | 3 +++ + drivers/spi/spi-cadence-quadspi.c | 19 +++++++++++++++++-- + drivers/spi/spi-intel-pci.c | 1 + + drivers/spi/spi-mtk-nor.c | 12 +++++++++++- + 4 files changed, 32 insertions(+), 3 deletions(-) +Merging pci-current/for-linus (92597f97a40b PCI/PM: Avoid putting Elo i2 PCIe Ports in D3cold) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Merge made by the 'ort' strategy. + drivers/pci/pci.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) +Merging driver-core.current/driver-core-linus (ce522ba9ef7e Linux 5.18-rc2) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (cc994bb97587 serial: 8250: Fix runtime PM for start_tx() for empty buffer) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Merge made by the 'ort' strategy. + drivers/tty/n_gsm.c | 246 ++++++++++++++++++------------------ + drivers/tty/serial/8250/8250_port.c | 4 +- + drivers/tty/serial/amba-pl011.c | 9 +- + drivers/tty/serial/imx.c | 2 +- + 4 files changed, 133 insertions(+), 128 deletions(-) +Merging usb.current/usb-linus (ec547af8a9ea USB: quirks: add STRING quirk for VCOM device) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'ort' strategy. + drivers/usb/cdns3/cdns3-gadget.c | 7 +++++-- + drivers/usb/core/quirks.c | 6 ++++++ + drivers/usb/host/xhci-hub.c | 2 +- + drivers/usb/host/xhci-ring.c | 1 + + drivers/usb/host/xhci.c | 11 +++++++++++ + 5 files changed, 24 insertions(+), 3 deletions(-) +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (f32c5a042340 USB: serial: option: add Telit 0x1057, 0x1058, 0x1075 compositions) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Merge made by the 'ort' strategy. + drivers/usb/serial/option.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging phy/fixes (ce88613e5bd5 phy: ti: Add missing pm_runtime_disable() in serdes_am654_probe) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Merge made by the 'ort' strategy. + drivers/phy/motorola/phy-mapphone-mdm6600.c | 3 ++- + drivers/phy/samsung/phy-exynos5250-sata.c | 21 +++++++++++++++------ + drivers/phy/ti/phy-am654-serdes.c | 2 +- + drivers/phy/ti/phy-omap-usb2.c | 2 +- + drivers/phy/ti/phy-ti-pipe3.c | 1 + + drivers/phy/ti/phy-tusb1210.c | 12 +++++++++--- + 6 files changed, 29 insertions(+), 12 deletions(-) +Merging staging.current/staging-linus (ce522ba9ef7e Linux 5.18-rc2) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (b5d6ba09b10d iio: imu: inv_icm42600: Fix I2C init possible nack) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/adc/ad7280a.c | 12 +++++----- + drivers/iio/chemical/scd4x.c | 5 +++- + drivers/iio/dac/ad3552r.c | 6 ++--- + drivers/iio/dac/ad5446.c | 2 +- + drivers/iio/dac/ad5592r-base.c | 2 +- + drivers/iio/dac/ltc2688.c | 2 +- + drivers/iio/dac/ti-dac5571.c | 28 ++++++++++++++-------- + drivers/iio/filter/Kconfig | 1 + + drivers/iio/imu/bmi160/bmi160_core.c | 20 +++++++++++----- + drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c | 15 +++++++----- + drivers/iio/magnetometer/ak8975.c | 1 + + drivers/iio/proximity/sx9324.c | 32 +++++++++++++++++++------ + drivers/iio/proximity/sx_common.c | 1 + + 13 files changed, 85 insertions(+), 42 deletions(-) +Merging counter-fixes/fixes-togreg (ce522ba9ef7e Linux 5.18-rc2) +$ git merge -m Merge branch 'fixes-togreg' of https://gitlab.com/vilhelmgray/counter.git counter-fixes/fixes-togreg +Already up to date. +Merging char-misc.current/char-misc-linus (ce522ba9ef7e Linux 5.18-rc2) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (ce522ba9ef7e Linux 5.18-rc2) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (470776c6b034 Input: add Marine Navigation Keycodes) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + drivers/input/keyboard/cypress-sf.c | 14 ++++++++++++++ + drivers/input/keyboard/omap4-keypad.c | 2 +- + include/uapi/linux/input-event-codes.h | 21 +++++++++++++++++++++ + 3 files changed, 36 insertions(+), 1 deletion(-) +Merging crypto-current/master (aa8e73eed7d3 crypto: x86/sm3 - Fixup SLS) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (1ef3342a934e vfio/pci: Fix vf_token mechanism when device-specific VF drivers are used) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (ce64763c6385 testing/selftests/mqueue: Fix mq_perf_tests to free the allocated cpu set) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (dc0ce6cc4b13 lib/test: use after free in register_test_dev_kmod()) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (8fc5133d6d4d dmaengine: dw-edma: Fix unaligned 64bit access) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Merge made by the 'ort' strategy. + drivers/dma/at_xdmac.c | 12 +++++++----- + drivers/dma/dw-edma/dw-edma-v0-core.c | 7 +++++-- + drivers/dma/idxd/device.c | 3 +-- + drivers/dma/imx-sdma.c | 32 ++++++++++++++++---------------- + drivers/dma/mediatek/mtk-uart-apdma.c | 9 ++++++--- + 5 files changed, 35 insertions(+), 28 deletions(-) +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (9fe4e0d3cbfe mtd: rawnand: fix ecc parameters for mt7622) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'ort' strategy. + drivers/mtd/nand/raw/mtk_ecc.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (3d59142ad94c media: dvb-usb: dib0700_devices: use an enum for the device number) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Merge made by the 'ort' strategy. + drivers/media/usb/dvb-usb/a800.c | 18 +- + drivers/media/usb/dvb-usb/af9005.c | 19 +- + drivers/media/usb/dvb-usb/az6027.c | 45 +- + drivers/media/usb/dvb-usb/cinergyT2-core.c | 10 +- + drivers/media/usb/dvb-usb/cxusb.c | 88 +--- + drivers/media/usb/dvb-usb/dib0700_devices.c | 428 +++++++++++-------- + drivers/media/usb/dvb-usb/dibusb-mb.c | 165 ++++---- + drivers/media/usb/dvb-usb/dibusb-mc.c | 88 ++-- + drivers/media/usb/dvb-usb/digitv.c | 13 +- + drivers/media/usb/dvb-usb/dtt200u.c | 56 ++- + drivers/media/usb/dvb-usb/dtv5100.c | 11 +- + drivers/media/usb/dvb-usb/dw2102.c | 84 ++-- + drivers/media/usb/dvb-usb/gp8psk.c | 36 +- + drivers/media/usb/dvb-usb/m920x.c | 51 ++- + drivers/media/usb/dvb-usb/nova-t-usb2.c | 18 +- + drivers/media/usb/dvb-usb/opera1.c | 15 +- + drivers/media/usb/dvb-usb/pctv452e.c | 22 +- + drivers/media/usb/dvb-usb/technisat-usb2.c | 11 +- + drivers/media/usb/dvb-usb/ttusb2.c | 36 +- + drivers/media/usb/dvb-usb/umt-010.c | 18 +- + drivers/media/usb/dvb-usb/vp702x.c | 23 +- + drivers/media/usb/dvb-usb/vp7045.c | 28 +- + include/media/dvb-usb-ids.h | 632 +++++++++++++++------------- + 23 files changed, 1071 insertions(+), 844 deletions(-) +Merging reset-fixes/reset/fixes (03cb66463b55 dt-bindings: reset: Add parent "resets" property as optional) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (0c640d9544d0 ARM: dts: at91: fix pinctrl phandles) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (46ff3df87215 ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Merge made by the 'ort' strategy. + arch/arm/boot/dts/am33xx-l4.dtsi | 2 ++ + arch/arm/boot/dts/am3517-evm.dts | 45 +++++++++++++++++++++--- + arch/arm/boot/dts/am3517-som.dtsi | 9 +++++ + arch/arm/boot/dts/dra7-l4.dtsi | 4 +-- + arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts | 15 ++++++++ + arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts | 15 ++++++++ + arch/arm/boot/dts/logicpd-som-lv.dtsi | 15 -------- + arch/arm/boot/dts/omap3-gta04.dtsi | 2 ++ + arch/arm/mach-omap2/omap4-common.c | 2 ++ + drivers/bus/ti-sysc.c | 16 ++++++++- + 10 files changed, 102 insertions(+), 23 deletions(-) +Merging kvm-fixes/master (42dcbe7d8bac KVM: x86: hyper-v: Avoid writing to TSC page without an active vCPU) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (0e9ff65f455d KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (4aaaaf0f2798 hwmon: (f71882fg) Fix negative temperature) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/hwmon/ti,tmp421.yaml | 7 +++---- + drivers/hwmon/adt7470.c | 4 ++-- + drivers/hwmon/asus_wmi_sensors.c | 2 +- + drivers/hwmon/f71882fg.c | 5 +++-- + drivers/hwmon/pmbus/xdpe12284.c | 2 +- + 5 files changed, 10 insertions(+), 10 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (d28820419ca3 cxl/pci: Drop shadowed variable) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (873863d594c4 Merge branch 'misc-5.18' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/inode.c +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (9d2231c5d74e lib/iov_iter: initialize "flags" in new pipe_buffer) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (b2dd71f9f728 tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Merge made by the 'ort' strategy. + tools/power/x86/intel-speed-select/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging samsung-krzk-fixes/fixes (1a9f338f9cf9 MAINTAINERS: update Krzysztof Kozlowski's email to Linaro) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (abb860ac7e3f pinctrl: samsung: staticize fsd_pin_ctrl) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Merge made by the 'ort' strategy. + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devicetree-fixes/dt/linus (652980b1541c dt-bindings: display: panel-timing: Define a single type for properties) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (70a3baeec4e8 scsi: iscsi: MAINTAINERS: Add Mike Christie as co-maintainer) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (b2d229d4ddb1 Linux 5.18-rc3) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (1acb34e7dd77 drm/i915: Sunset igpu legacy mmap support based on GRAPHICS_VER_FULL) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (ce522ba9ef7e Linux 5.18-rc2) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the 'ort' strategy. +Merging gnss-fixes/gnss-linus (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (eaa03d345358 Drivers: hv: vmbus: Replace smp_store_mb() with virt_store_mb()) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (a222fd854139 soc: fsl: qe: Check of ioremap return value) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (b2d229d4ddb1 Linux 5.18-rc3) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (0c2cae09a765 gpiolib: acpi: Convert type for pin to be unsigned) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (0be0b70df661 pinctrl: alderlake: Fix register offsets for ADL-N variant) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Merge made by the 'ort' strategy. + drivers/pinctrl/intel/pinctrl-alderlake.c | 60 ++++++++++++++++++++----------- + 1 file changed, 40 insertions(+), 20 deletions(-) +Merging erofs-fixes/fixes (8b1ac84dcf2c Documentation/ABI: sysfs-fs-erofs: Fix Sphinx errors) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-erofs | 5 +++-- + fs/erofs/zdata.c | 12 ++++-------- + fs/erofs/zdata.h | 2 +- + 3 files changed, 8 insertions(+), 11 deletions(-) +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (02c7efa43627 Documentation: kunit: fix path to .kunitconfig in start.rst) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (4d5004451ab2 SUNRPC: Fix the svc_deferred_event trace class) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc +Already up to date. +Merging irqchip-fixes/irq/irqchip-fixes (544808f7e21c irqchip/gic, gic-v3: Prevent GSI to SGI translations) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (f58faed7fb3f perf bench: Fix numa bench to fix usage of affinity for machines with #CPUs > 1K) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Already up to date. +Merging efi-fixes/urgent (9feaf8b387ee efi: fix return value of __setup handlers) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Merge made by the 'ort' strategy. + include/linux/zstd_lib.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (f8e6b7babfeb dma-buf-map: remove renamed header file) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/radeon/radeon_sync.c | 2 +- + include/linux/dma-buf-map.h | 266 ----------------------------------- + 2 files changed, 1 insertion(+), 267 deletions(-) + delete mode 100644 include/linux/dma-buf-map.h +Merging kbuild/for-next (21b526ad6344 kbuild: make *.mod not depend on *.o) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging Makefile +Merge made by the 'ort' strategy. + .gitignore | 1 + + Documentation/kbuild/kconfig-language.rst | 6 +++ + Makefile | 8 +-- + certs/Makefile | 4 +- + scripts/Makefile | 4 +- + scripts/Makefile.build | 88 +++++++++++++------------------ + scripts/Makefile.lib | 6 +-- + scripts/adjust_autoksyms.sh | 2 +- + scripts/gen_autoksyms.sh | 18 ++++--- + scripts/kconfig/gconf-cfg.sh | 12 ++--- + scripts/kconfig/mconf-cfg.sh | 16 +++--- + scripts/kconfig/nconf-cfg.sh | 16 +++--- + scripts/kconfig/qconf-cfg.sh | 14 ++--- + scripts/mod/modpost.c | 49 +++++------------ + scripts/mod/modpost.h | 4 -- + scripts/mod/sumversion.c | 11 +--- + tools/objtool/Makefile | 4 +- + usr/include/Makefile | 2 +- + 18 files changed, 113 insertions(+), 152 deletions(-) +Merging perf/perf/core (41204da4c160 perf test: Shell - Limit to only run executable scripts in tests) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Merge made by the 'ort' strategy. + tools/perf/arch/riscv/Makefile | 1 + + tools/perf/tests/builtin-test.c | 4 +- + tools/perf/util/genelf.h | 3 ++ + tools/perf/util/path.c | 14 ++++++- + tools/perf/util/path.h | 1 + + .../util/scripting-engines/trace-event-python.c | 49 ++++++++++++++++------ + 6 files changed, 57 insertions(+), 15 deletions(-) +Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (3cb4503a3301 x86: remove cruft from <asm/dma-mapping.h>) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Merge made by the 'ort' strategy. + arch/arm/mm/init.c | 6 +- + arch/arm/xen/mm.c | 26 +++--- + arch/arm64/mm/init.c | 6 +- + arch/ia64/include/asm/iommu_table.h | 7 -- + arch/ia64/mm/init.c | 4 +- + arch/mips/cavium-octeon/dma-octeon.c | 15 +-- + arch/mips/loongson64/dma.c | 2 +- + arch/mips/pci/pci-octeon.c | 2 +- + arch/mips/sibyte/common/dma.c | 2 +- + arch/powerpc/include/asm/svm.h | 4 - + arch/powerpc/include/asm/swiotlb.h | 1 + + arch/powerpc/kernel/dma-swiotlb.c | 1 + + arch/powerpc/mm/mem.c | 6 +- + arch/powerpc/platforms/pseries/setup.c | 3 - + arch/powerpc/platforms/pseries/svm.c | 26 +----- + arch/riscv/mm/init.c | 8 +- + arch/s390/mm/init.c | 3 +- + arch/x86/include/asm/dma-mapping.h | 12 --- + arch/x86/include/asm/gart.h | 5 +- + arch/x86/include/asm/iommu.h | 8 ++ + arch/x86/include/asm/iommu_table.h | 102 --------------------- + arch/x86/include/asm/swiotlb.h | 30 ------ + arch/x86/include/asm/xen/page.h | 5 - + arch/x86/include/asm/xen/swiotlb-xen.h | 2 - + arch/x86/kernel/Makefile | 2 - + arch/x86/kernel/amd_gart_64.c | 5 +- + arch/x86/kernel/aperture_64.c | 14 +-- + arch/x86/kernel/cpu/mshyperv.c | 8 -- + arch/x86/kernel/pci-dma.c | 114 ++++++++++++++++++----- + arch/x86/kernel/pci-iommu_table.c | 77 ---------------- + arch/x86/kernel/pci-swiotlb.c | 77 ---------------- + arch/x86/kernel/tboot.c | 1 - + arch/x86/kernel/vmlinux.lds.S | 12 --- + arch/x86/mm/mem_encrypt_amd.c | 3 - + arch/x86/pci/sta2x11-fixup.c | 2 +- + arch/x86/xen/Makefile | 2 - + arch/x86/xen/pci-swiotlb-xen.c | 96 -------------------- + drivers/iommu/amd/init.c | 6 -- + drivers/iommu/amd/iommu.c | 5 +- + drivers/iommu/intel/dmar.c | 6 +- + drivers/xen/swiotlb-xen.c | 132 +-------------------------- + include/linux/dmar.h | 6 +- + include/linux/swiotlb.h | 22 ++--- + include/trace/events/swiotlb.h | 29 ++---- + include/xen/arm/page.h | 1 - + include/xen/swiotlb-xen.h | 8 +- + kernel/dma/direct.h | 2 +- + kernel/dma/swiotlb.c | 161 +++++++++++++++------------------ + 48 files changed, 251 insertions(+), 826 deletions(-) + delete mode 100644 arch/ia64/include/asm/iommu_table.h + delete mode 100644 arch/x86/include/asm/iommu_table.h + delete mode 100644 arch/x86/include/asm/swiotlb.h + delete mode 100644 arch/x86/kernel/pci-iommu_table.c + delete mode 100644 arch/x86/kernel/pci-swiotlb.c + delete mode 100644 arch/x86/xen/pci-swiotlb-xen.c +Merging asm-generic/master (fba2689ee77e Merge branch 'remove-h8300' of git://git.infradead.org/users/hch/misc into asm-generic) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +CONFLICT (modify/delete): Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml deleted in asm-generic/master and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml left in tree. +Auto-merging MAINTAINERS +Auto-merging drivers/irqchip/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml +rm 'Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml' +$ git commit --no-edit -v -a +[master 722687f51e4c] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/clock/renesas,h8300-div-clock.txt | 24 -- + Documentation/devicetree/bindings/h8300/cpu.txt | 13 - + .../interrupt-controller/renesas,h8300h-intc.txt | 22 -- + .../interrupt-controller/renesas,h8s-intc.txt | 22 -- + .../memory-controllers/renesas,h8300-bsc.yaml | 35 -- + .../features/core/cBPF-JIT/arch-support.txt | 1 - + .../features/core/eBPF-JIT/arch-support.txt | 1 - + .../core/generic-idle-thread/arch-support.txt | 1 - + .../features/core/jump-labels/arch-support.txt | 1 - + .../core/thread-info-in-task/arch-support.txt | 1 - + .../features/core/tracehook/arch-support.txt | 1 - + .../features/debug/KASAN/arch-support.txt | 1 - + .../debug/debug-vm-pgtable/arch-support.txt | 1 - + .../debug/gcov-profile-all/arch-support.txt | 1 - + Documentation/features/debug/kcov/arch-support.txt | 1 - + Documentation/features/debug/kgdb/arch-support.txt | 1 - + .../features/debug/kmemleak/arch-support.txt | 1 - + .../debug/kprobes-on-ftrace/arch-support.txt | 1 - + .../features/debug/kprobes/arch-support.txt | 1 - + .../features/debug/kretprobes/arch-support.txt | 1 - + .../features/debug/optprobes/arch-support.txt | 1 - + .../features/debug/stackprotector/arch-support.txt | 1 - + .../features/debug/uprobes/arch-support.txt | 1 - + .../debug/user-ret-profiler/arch-support.txt | 1 - + .../features/io/dma-contiguous/arch-support.txt | 1 - + .../locking/cmpxchg-local/arch-support.txt | 1 - + .../features/locking/lockdep/arch-support.txt | 1 - + .../locking/queued-rwlocks/arch-support.txt | 1 - + .../locking/queued-spinlocks/arch-support.txt | 1 - + .../features/perf/kprobes-event/arch-support.txt | 1 - + .../features/perf/perf-regs/arch-support.txt | 1 - + .../features/perf/perf-stackdump/arch-support.txt | 1 - + .../sched/membarrier-sync-core/arch-support.txt | 1 - + .../features/sched/numa-balancing/arch-support.txt | 1 - + .../seccomp/seccomp-filter/arch-support.txt | 1 - + .../time/arch-tick-broadcast/arch-support.txt | 1 - + .../features/time/clockevents/arch-support.txt | 1 - + .../time/context-tracking/arch-support.txt | 1 - + .../features/time/irq-time-acct/arch-support.txt | 1 - + .../features/time/virt-cpuacct/arch-support.txt | 1 - + .../features/vm/ELF-ASLR/arch-support.txt | 1 - + .../features/vm/PG_uncached/arch-support.txt | 1 - + Documentation/features/vm/THP/arch-support.txt | 1 - + Documentation/features/vm/TLB/arch-support.txt | 1 - + .../features/vm/huge-vmap/arch-support.txt | 1 - + .../features/vm/ioremap_prot/arch-support.txt | 1 - + .../features/vm/pte_special/arch-support.txt | 1 - + MAINTAINERS | 11 - + arch/h8300/Kbuild | 5 - + arch/h8300/Kconfig | 49 --- + arch/h8300/Kconfig.cpu | 99 ----- + arch/h8300/Kconfig.debug | 2 - + arch/h8300/Makefile | 44 --- + arch/h8300/boot/Makefile | 27 -- + arch/h8300/boot/compressed/Makefile | 45 --- + arch/h8300/boot/compressed/head.S | 49 --- + arch/h8300/boot/compressed/misc.c | 76 ---- + arch/h8300/boot/compressed/vmlinux.lds | 35 -- + arch/h8300/boot/compressed/vmlinux.scr | 9 - + arch/h8300/boot/dts/Makefile | 6 - + arch/h8300/boot/dts/edosk2674.dts | 108 ----- + arch/h8300/boot/dts/h8300h_sim.dts | 97 ----- + arch/h8300/boot/dts/h8s_sim.dts | 100 ----- + arch/h8300/configs/edosk2674_defconfig | 48 --- + arch/h8300/configs/h8300h-sim_defconfig | 48 --- + arch/h8300/configs/h8s-sim_defconfig | 48 --- + arch/h8300/include/asm/Kbuild | 8 - + arch/h8300/include/asm/bitops.h | 179 --------- + arch/h8300/include/asm/bug.h | 13 - + arch/h8300/include/asm/byteorder.h | 7 - + arch/h8300/include/asm/cache.h | 12 - + arch/h8300/include/asm/elf.h | 102 ----- + arch/h8300/include/asm/flat.h | 36 -- + arch/h8300/include/asm/hash.h | 54 --- + arch/h8300/include/asm/io.h | 67 ---- + arch/h8300/include/asm/irq.h | 25 -- + arch/h8300/include/asm/irqflags.h | 97 ----- + arch/h8300/include/asm/kgdb.h | 45 --- + arch/h8300/include/asm/mmu_context.h | 6 - + arch/h8300/include/asm/page.h | 17 - + arch/h8300/include/asm/page_offset.h | 2 - + arch/h8300/include/asm/pgtable.h | 43 -- + arch/h8300/include/asm/processor.h | 126 ------ + arch/h8300/include/asm/ptrace.h | 39 -- + arch/h8300/include/asm/signal.h | 23 -- + arch/h8300/include/asm/smp.h | 1 - + arch/h8300/include/asm/string.h | 18 - + arch/h8300/include/asm/switch_to.h | 52 --- + arch/h8300/include/asm/syscall.h | 43 -- + arch/h8300/include/asm/thread_info.h | 102 ----- + arch/h8300/include/asm/tlb.h | 7 - + arch/h8300/include/asm/traps.h | 41 -- + arch/h8300/include/asm/user.h | 71 ---- + arch/h8300/include/asm/vmalloc.h | 4 - + arch/h8300/include/uapi/asm/Kbuild | 2 - + arch/h8300/include/uapi/asm/byteorder.h | 7 - + arch/h8300/include/uapi/asm/posix_types.h | 13 - + arch/h8300/include/uapi/asm/ptrace.h | 43 -- + arch/h8300/include/uapi/asm/sigcontext.h | 19 - + arch/h8300/include/uapi/asm/signal.h | 92 ----- + arch/h8300/include/uapi/asm/unistd.h | 8 - + arch/h8300/kernel/.gitignore | 2 - + arch/h8300/kernel/Makefile | 22 -- + arch/h8300/kernel/asm-offsets.c | 70 ---- + arch/h8300/kernel/entry.S | 433 --------------------- + arch/h8300/kernel/h8300_ksyms.c | 35 -- + arch/h8300/kernel/head_ram.S | 60 --- + arch/h8300/kernel/head_rom.S | 111 ------ + arch/h8300/kernel/irq.c | 99 ----- + arch/h8300/kernel/kgdb.c | 135 ------- + arch/h8300/kernel/module.c | 71 ---- + arch/h8300/kernel/process.c | 173 -------- + arch/h8300/kernel/ptrace.c | 199 ---------- + arch/h8300/kernel/ptrace_h.c | 256 ------------ + arch/h8300/kernel/ptrace_s.c | 44 --- + arch/h8300/kernel/setup.c | 213 ---------- + arch/h8300/kernel/signal.c | 287 -------------- + arch/h8300/kernel/sim-console.c | 31 -- + arch/h8300/kernel/syscalls.c | 15 - + arch/h8300/kernel/traps.c | 156 -------- + arch/h8300/kernel/vmlinux.lds.S | 69 ---- + arch/h8300/lib/Makefile | 9 - + arch/h8300/lib/abs.S | 21 - + arch/h8300/lib/ashldi3.c | 25 -- + arch/h8300/lib/ashrdi3.c | 25 -- + arch/h8300/lib/delay.c | 41 -- + arch/h8300/lib/libgcc.h | 78 ---- + arch/h8300/lib/lshrdi3.c | 24 -- + arch/h8300/lib/memcpy.S | 86 ---- + arch/h8300/lib/memset.S | 70 ---- + arch/h8300/lib/moddivsi3.S | 73 ---- + arch/h8300/lib/modsi3.S | 73 ---- + arch/h8300/lib/muldi3.c | 45 --- + arch/h8300/lib/mulsi3.S | 39 -- + arch/h8300/lib/ucmpdi2.c | 18 - + arch/h8300/lib/udivsi3.S | 77 ---- + arch/h8300/mm/Makefile | 6 - + arch/h8300/mm/fault.c | 57 --- + arch/h8300/mm/init.c | 95 ----- + arch/h8300/mm/memory.c | 52 --- + drivers/clk/Makefile | 1 - + drivers/clk/h8300/Makefile | 3 - + drivers/clk/h8300/clk-div.c | 57 --- + drivers/clk/h8300/clk-h8s2678.c | 145 ------- + drivers/clocksource/Kconfig | 20 - + drivers/clocksource/Makefile | 3 - + drivers/clocksource/h8300_timer16.c | 192 --------- + drivers/clocksource/h8300_timer8.c | 211 ---------- + drivers/clocksource/h8300_tpu.c | 158 -------- + drivers/irqchip/Kconfig | 11 - + drivers/irqchip/Makefile | 2 - + drivers/irqchip/irq-renesas-h8300h.c | 94 ----- + drivers/irqchip/irq-renesas-h8s.c | 102 ----- + drivers/net/ethernet/smsc/Kconfig | 4 +- + drivers/net/ethernet/smsc/smc91x.h | 11 - + drivers/tty/serial/Kconfig | 5 +- + init/Kconfig | 3 +- + tools/arch/h8300/include/asm/bitsperlong.h | 15 - + tools/arch/h8300/include/uapi/asm/mman.h | 7 - + 159 files changed, 5 insertions(+), 6922 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/renesas,h8300-div-clock.txt + delete mode 100644 Documentation/devicetree/bindings/h8300/cpu.txt + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,h8300h-intc.txt + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,h8s-intc.txt + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml + delete mode 100644 arch/h8300/Kbuild + delete mode 100644 arch/h8300/Kconfig + delete mode 100644 arch/h8300/Kconfig.cpu + delete mode 100644 arch/h8300/Kconfig.debug + delete mode 100644 arch/h8300/Makefile + delete mode 100644 arch/h8300/boot/Makefile + delete mode 100644 arch/h8300/boot/compressed/Makefile + delete mode 100644 arch/h8300/boot/compressed/head.S + delete mode 100644 arch/h8300/boot/compressed/misc.c + delete mode 100644 arch/h8300/boot/compressed/vmlinux.lds + delete mode 100644 arch/h8300/boot/compressed/vmlinux.scr + delete mode 100644 arch/h8300/boot/dts/Makefile + delete mode 100644 arch/h8300/boot/dts/edosk2674.dts + delete mode 100644 arch/h8300/boot/dts/h8300h_sim.dts + delete mode 100644 arch/h8300/boot/dts/h8s_sim.dts + delete mode 100644 arch/h8300/configs/edosk2674_defconfig + delete mode 100644 arch/h8300/configs/h8300h-sim_defconfig + delete mode 100644 arch/h8300/configs/h8s-sim_defconfig + delete mode 100644 arch/h8300/include/asm/Kbuild + delete mode 100644 arch/h8300/include/asm/bitops.h + delete mode 100644 arch/h8300/include/asm/bug.h + delete mode 100644 arch/h8300/include/asm/byteorder.h + delete mode 100644 arch/h8300/include/asm/cache.h + delete mode 100644 arch/h8300/include/asm/elf.h + delete mode 100644 arch/h8300/include/asm/flat.h + delete mode 100644 arch/h8300/include/asm/hash.h + delete mode 100644 arch/h8300/include/asm/io.h + delete mode 100644 arch/h8300/include/asm/irq.h + delete mode 100644 arch/h8300/include/asm/irqflags.h + delete mode 100644 arch/h8300/include/asm/kgdb.h + delete mode 100644 arch/h8300/include/asm/mmu_context.h + delete mode 100644 arch/h8300/include/asm/page.h + delete mode 100644 arch/h8300/include/asm/page_offset.h + delete mode 100644 arch/h8300/include/asm/pgtable.h + delete mode 100644 arch/h8300/include/asm/processor.h + delete mode 100644 arch/h8300/include/asm/ptrace.h + delete mode 100644 arch/h8300/include/asm/signal.h + delete mode 100644 arch/h8300/include/asm/smp.h + delete mode 100644 arch/h8300/include/asm/string.h + delete mode 100644 arch/h8300/include/asm/switch_to.h + delete mode 100644 arch/h8300/include/asm/syscall.h + delete mode 100644 arch/h8300/include/asm/thread_info.h + delete mode 100644 arch/h8300/include/asm/tlb.h + delete mode 100644 arch/h8300/include/asm/traps.h + delete mode 100644 arch/h8300/include/asm/user.h + delete mode 100644 arch/h8300/include/asm/vmalloc.h + delete mode 100644 arch/h8300/include/uapi/asm/Kbuild + delete mode 100644 arch/h8300/include/uapi/asm/byteorder.h + delete mode 100644 arch/h8300/include/uapi/asm/posix_types.h + delete mode 100644 arch/h8300/include/uapi/asm/ptrace.h + delete mode 100644 arch/h8300/include/uapi/asm/sigcontext.h + delete mode 100644 arch/h8300/include/uapi/asm/signal.h + delete mode 100644 arch/h8300/include/uapi/asm/unistd.h + delete mode 100644 arch/h8300/kernel/.gitignore + delete mode 100644 arch/h8300/kernel/Makefile + delete mode 100644 arch/h8300/kernel/asm-offsets.c + delete mode 100644 arch/h8300/kernel/entry.S + delete mode 100644 arch/h8300/kernel/h8300_ksyms.c + delete mode 100644 arch/h8300/kernel/head_ram.S + delete mode 100644 arch/h8300/kernel/head_rom.S + delete mode 100644 arch/h8300/kernel/irq.c + delete mode 100644 arch/h8300/kernel/kgdb.c + delete mode 100644 arch/h8300/kernel/module.c + delete mode 100644 arch/h8300/kernel/process.c + delete mode 100644 arch/h8300/kernel/ptrace.c + delete mode 100644 arch/h8300/kernel/ptrace_h.c + delete mode 100644 arch/h8300/kernel/ptrace_s.c + delete mode 100644 arch/h8300/kernel/setup.c + delete mode 100644 arch/h8300/kernel/signal.c + delete mode 100644 arch/h8300/kernel/sim-console.c + delete mode 100644 arch/h8300/kernel/syscalls.c + delete mode 100644 arch/h8300/kernel/traps.c + delete mode 100644 arch/h8300/kernel/vmlinux.lds.S + delete mode 100644 arch/h8300/lib/Makefile + delete mode 100644 arch/h8300/lib/abs.S + delete mode 100644 arch/h8300/lib/ashldi3.c + delete mode 100644 arch/h8300/lib/ashrdi3.c + delete mode 100644 arch/h8300/lib/delay.c + delete mode 100644 arch/h8300/lib/libgcc.h + delete mode 100644 arch/h8300/lib/lshrdi3.c + delete mode 100644 arch/h8300/lib/memcpy.S + delete mode 100644 arch/h8300/lib/memset.S + delete mode 100644 arch/h8300/lib/moddivsi3.S + delete mode 100644 arch/h8300/lib/modsi3.S + delete mode 100644 arch/h8300/lib/muldi3.c + delete mode 100644 arch/h8300/lib/mulsi3.S + delete mode 100644 arch/h8300/lib/ucmpdi2.c + delete mode 100644 arch/h8300/lib/udivsi3.S + delete mode 100644 arch/h8300/mm/Makefile + delete mode 100644 arch/h8300/mm/fault.c + delete mode 100644 arch/h8300/mm/init.c + delete mode 100644 arch/h8300/mm/memory.c + delete mode 100644 drivers/clk/h8300/Makefile + delete mode 100644 drivers/clk/h8300/clk-div.c + delete mode 100644 drivers/clk/h8300/clk-h8s2678.c + delete mode 100644 drivers/clocksource/h8300_timer16.c + delete mode 100644 drivers/clocksource/h8300_timer8.c + delete mode 100644 drivers/clocksource/h8300_tpu.c + delete mode 100644 drivers/irqchip/irq-renesas-h8300h.c + delete mode 100644 drivers/irqchip/irq-renesas-h8s.c + delete mode 100644 tools/arch/h8300/include/asm/bitsperlong.h + delete mode 100644 tools/arch/h8300/include/uapi/asm/mman.h +Merging arc/for-next (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (012d2fb6c8c9 Merge branch 'devel-stable' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/Kconfig.debug +CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug +Auto-merging arch/arm/boot/compressed/Makefile +CONFLICT (content): Merge conflict in arch/arm/boot/compressed/Makefile +Auto-merging arch/arm/include/asm/assembler.h +Auto-merging arch/arm/include/asm/cacheflush.h +Auto-merging arch/arm/include/asm/switch_to.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/switch_to.h +Auto-merging arch/arm/kernel/entry-armv.S +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/kernel/smp.c +Auto-merging arch/arm/kernel/stacktrace.c +Auto-merging arch/arm/kernel/traps.c +CONFLICT (content): Merge conflict in arch/arm/kernel/traps.c +Auto-merging arch/arm/kernel/traps.c +Auto-merging arch/arm/mach-s3c/mach-jive.c +Auto-merging arch/arm/mm/ioremap.c +Auto-merging drivers/irqchip/irq-nvic.c +Auto-merging lib/Kconfig +Resolved 'arch/arm/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6a597c381840] Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging arm64/for-next/core (641d80415729 Merge branch 'for-next/spectre-bhb' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (602c873eb52e perf: Replace acpi_bus_get_device()) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (21a9fd22697e Merge branch 'arm/fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Resolved 'arch/arm/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4406f0745576] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/syna.txt | 4 - + MAINTAINERS | 3 - + arch/arm/Kconfig | 88 +----- + arch/arm/Makefile | 7 +- + .../uncompress.h => boot/compressed/misc-ep93xx.h} | 70 +++-- + arch/arm/boot/compressed/misc.c | 4 + + arch/arm/configs/dove_defconfig | 2 + + arch/arm/configs/ep93xx_defconfig | 2 + + arch/arm/configs/iop32x_defconfig | 1 + + arch/arm/configs/ixp4xx_defconfig | 1 + + arch/arm/configs/mini2440_defconfig | 2 + + arch/arm/configs/s3c2410_defconfig | 3 + + arch/arm/configs/tct_hammer_defconfig | 2 + + arch/arm/mach-asm9260/Kconfig | 1 + + arch/arm/mach-aspeed/Kconfig | 2 +- + arch/arm/mach-at91/Kconfig | 3 +- + arch/arm/mach-clps711x/Kconfig | 1 + + arch/arm/mach-davinci/Kconfig | 1 + + arch/arm/mach-dove/Kconfig | 16 +- + arch/arm/mach-dove/Makefile | 2 + + arch/arm/mach-dove/include/mach/uncompress.h | 34 --- + arch/arm/mach-ep93xx/Kconfig | 13 + + arch/arm/mach-ep93xx/adssphere.c | 1 + + arch/arm/mach-ep93xx/core.c | 5 +- + arch/arm/mach-ep93xx/edb93xx.c | 8 + + .../mach-ep93xx/{include/mach => }/ep93xx-regs.h | 4 - + arch/arm/mach-ep93xx/gesbc9312.c | 1 + + arch/arm/mach-ep93xx/gpio-ep93xx.h | 2 +- + arch/arm/mach-ep93xx/include/mach/irqs.h | 79 ------ + arch/arm/mach-ep93xx/irqs.h | 76 +++++ + arch/arm/mach-ep93xx/micro9.c | 4 + + arch/arm/mach-ep93xx/simone.c | 1 + + arch/arm/mach-ep93xx/snappercl15.c | 1 + + arch/arm/mach-ep93xx/soc.h | 3 +- + arch/arm/mach-ep93xx/ts72xx.c | 3 +- + arch/arm/mach-ep93xx/vision_ep9307.c | 1 + + arch/arm/mach-exynos/Kconfig | 1 - + arch/arm/mach-gemini/Kconfig | 1 + + arch/arm/mach-highbank/Kconfig | 1 - + arch/arm/mach-hisi/Kconfig | 2 +- + arch/arm/mach-imx/Kconfig | 4 +- + arch/arm/mach-integrator/Kconfig | 125 --------- + arch/arm/mach-integrator/Makefile | 10 - + arch/arm/mach-iop32x/Kconfig | 18 +- + arch/arm/mach-iop32x/em7210.c | 1 + + arch/arm/mach-iop32x/glantank.c | 1 + + arch/arm/mach-iop32x/include/mach/irqs.h | 14 - + arch/arm/mach-iop32x/include/mach/uncompress.h | 25 -- + arch/arm/mach-iop32x/iq31244.c | 1 + + arch/arm/mach-iop32x/iq80321.c | 1 + + arch/arm/mach-iop32x/irqs.h | 2 + + arch/arm/mach-iop32x/n2100.c | 1 + + arch/arm/mach-ixp4xx/Kconfig | 22 +- + arch/arm/mach-ixp4xx/Makefile.boot | 4 - + arch/arm/mach-ixp4xx/include/mach/uncompress.h | 54 ---- + arch/arm/mach-keystone/Kconfig | 1 - + arch/arm/mach-lpc32xx/Kconfig | 1 + + arch/arm/mach-mmp/Kconfig | 2 +- + arch/arm/mach-moxart/Kconfig | 1 + + arch/arm/mach-mv78xx0/Kconfig | 1 + + arch/arm/mach-mvebu/Kconfig | 3 +- + arch/arm/mach-mxs/Kconfig | 1 + + arch/arm/mach-nomadik/Kconfig | 1 + + arch/arm/mach-npcm/Kconfig | 2 +- + arch/arm/mach-nspire/Kconfig | 1 + + arch/arm/mach-orion5x/Kconfig | 1 + + arch/arm/mach-oxnas/Kconfig | 2 +- + arch/arm/mach-qcom/Kconfig | 1 - + arch/arm/mach-realview/Kconfig | 103 ------- + arch/arm/mach-realview/Makefile | 8 - + arch/arm/mach-s3c/Kconfig.s3c24xx | 25 +- + arch/arm/mach-s3c/bast-ide.c | 2 +- + arch/arm/mach-s3c/bast-irq.c | 2 +- + arch/arm/mach-s3c/cpu.c | 2 +- + arch/arm/mach-s3c/dev-audio-s3c64xx.c | 2 +- + arch/arm/mach-s3c/dev-uart-s3c64xx.c | 2 +- + arch/arm/mach-s3c/devs.c | 2 +- + arch/arm/mach-s3c/gpio-samsung.c | 2 +- + arch/arm/mach-s3c/include/mach/io-s3c24xx.h | 50 ---- + arch/arm/mach-s3c/include/mach/io.h | 8 - + arch/arm/mach-s3c/irq-pm-s3c24xx.c | 2 +- + arch/arm/mach-s3c/irq-s3c24xx.c | 2 +- + .../arm/mach-s3c/{include/mach => }/irqs-s3c24xx.h | 18 +- + .../arm/mach-s3c/{include/mach => }/irqs-s3c64xx.h | 0 + arch/arm/mach-s3c/{include/mach => }/irqs.h | 0 + arch/arm/mach-s3c/mach-amlm5900.c | 2 + + arch/arm/mach-s3c/mach-anubis.c | 6 +- + arch/arm/mach-s3c/mach-anw6410.c | 2 +- + arch/arm/mach-s3c/mach-at2440evb.c | 1 + + arch/arm/mach-s3c/mach-bast.c | 6 +- + arch/arm/mach-s3c/mach-crag6410-module.c | 2 +- + arch/arm/mach-s3c/mach-crag6410.c | 2 +- + arch/arm/mach-s3c/mach-gta02.c | 1 + + arch/arm/mach-s3c/mach-h1940.c | 1 + + arch/arm/mach-s3c/mach-hmt.c | 2 +- + arch/arm/mach-s3c/mach-jive.c | 2 +- + arch/arm/mach-s3c/mach-mini2440.c | 3 +- + arch/arm/mach-s3c/mach-mini6410.c | 2 +- + arch/arm/mach-s3c/mach-n30.c | 2 + + arch/arm/mach-s3c/mach-ncp.c | 2 +- + arch/arm/mach-s3c/mach-nexcoder.c | 1 + + arch/arm/mach-s3c/mach-osiris.c | 6 +- + arch/arm/mach-s3c/mach-otom.c | 1 + + arch/arm/mach-s3c/mach-qt2410.c | 1 + + arch/arm/mach-s3c/mach-real6410.c | 2 +- + arch/arm/mach-s3c/mach-rx1950.c | 1 + + arch/arm/mach-s3c/mach-rx3715.c | 7 +- + arch/arm/mach-s3c/mach-smartq5.c | 2 +- + arch/arm/mach-s3c/mach-smartq7.c | 2 +- + arch/arm/mach-s3c/mach-smdk2410.c | 1 + + arch/arm/mach-s3c/mach-smdk2413.c | 3 + + arch/arm/mach-s3c/mach-smdk2416.c | 11 +- + arch/arm/mach-s3c/mach-smdk2440.c | 11 +- + arch/arm/mach-s3c/mach-smdk2443.c | 12 +- + arch/arm/mach-s3c/mach-smdk6400.c | 2 +- + arch/arm/mach-s3c/mach-smdk6410.c | 2 +- + arch/arm/mach-s3c/mach-tct_hammer.c | 1 + + arch/arm/mach-s3c/mach-vr1000.c | 6 +- + arch/arm/mach-s3c/mach-vstms.c | 1 + + arch/arm/mach-s3c/{include/mach => }/map-base.h | 6 + + arch/arm/mach-s3c/map-s3c24xx.h | 2 +- + arch/arm/mach-s3c/map-s3c64xx.h | 2 +- + arch/arm/mach-s3c/pl080.c | 2 +- + arch/arm/mach-s3c/pm-core-s3c24xx.h | 2 +- + arch/arm/mach-s3c/pm-s3c2412.c | 2 +- + arch/arm/mach-s3c/pm-s3c64xx.c | 2 +- + arch/arm/mach-s3c/pm.c | 2 +- + arch/arm/mach-s3c/s3c2443.c | 2 +- + arch/arm/mach-s3c/s3c24xx.h | 2 +- + arch/arm/mach-s3c/s3c64xx.c | 2 +- + arch/arm/mach-s3c/simtec-usb.c | 2 +- + arch/arm/mach-socfpga/Kconfig | 1 - + arch/arm/mach-spear/Kconfig | 2 +- + arch/arm/mach-sunxi/Kconfig | 3 +- + arch/arm/mach-versatile/Kconfig | 309 +++++++++++++++++++++ + arch/arm/mach-versatile/Makefile | 32 ++- + .../Makefile.boot | 0 + arch/arm/{mach-vexpress => mach-versatile}/dcscb.c | 4 +- + .../dcscb_setup.S | 2 - + .../{plat-versatile => mach-versatile}/headsmp.S | 2 - + .../{plat-versatile => mach-versatile}/hotplug.c | 2 +- + .../cm.h => mach-versatile/integrator-cm.h} | 0 + .../integrator-hardware.h} | 0 + .../core.c => mach-versatile/integrator.c} | 8 +- + .../common.h => mach-versatile/integrator.h} | 0 + .../integrator_ap.c | 8 +- + .../integrator_cp.c | 8 +- + .../platsmp-realview.c} | 2 +- + .../platsmp-vexpress.c} | 7 +- + .../{plat-versatile => mach-versatile}/platsmp.c | 4 +- + .../include/plat => mach-versatile}/platsmp.h | 2 - + .../realview-dt.c => mach-versatile/realview.c} | 0 + arch/arm/{mach-vexpress => mach-versatile}/spc.c | 0 + arch/arm/{mach-vexpress => mach-versatile}/spc.h | 0 + .../arm/{mach-vexpress => mach-versatile}/tc2_pm.c | 2 - + .../{mach-vexpress => mach-versatile}/v2m-mps2.c | 0 + arch/arm/{mach-vexpress => mach-versatile}/v2m.c | 2 +- + .../mach-versatile/{versatile_dt.c => versatile.c} | 0 + .../core.h => mach-versatile/vexpress.h} | 0 + arch/arm/mach-vexpress/Kconfig | 81 ------ + arch/arm/mach-vexpress/Makefile | 19 -- + arch/arm/mach-vt8500/Kconfig | 1 + + arch/arm/mach-zynq/Kconfig | 1 - + arch/arm/mm/Kconfig | 28 +- + arch/arm/plat-versatile/Makefile | 5 - + arch/arm64/boot/dts/synaptics/as370.dtsi | 173 ------------ + 166 files changed, 717 insertions(+), 1115 deletions(-) + rename arch/arm/{mach-ep93xx/include/mach/uncompress.h => boot/compressed/misc-ep93xx.h} (51%) + delete mode 100644 arch/arm/mach-dove/include/mach/uncompress.h + rename arch/arm/mach-ep93xx/{include/mach => }/ep93xx-regs.h (94%) + delete mode 100644 arch/arm/mach-ep93xx/include/mach/irqs.h + create mode 100644 arch/arm/mach-ep93xx/irqs.h + delete mode 100644 arch/arm/mach-integrator/Kconfig + delete mode 100644 arch/arm/mach-integrator/Makefile + delete mode 100644 arch/arm/mach-iop32x/include/mach/irqs.h + delete mode 100644 arch/arm/mach-iop32x/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-ixp4xx/Makefile.boot + delete mode 100644 arch/arm/mach-ixp4xx/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-realview/Kconfig + delete mode 100644 arch/arm/mach-realview/Makefile + delete mode 100644 arch/arm/mach-s3c/include/mach/io-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/include/mach/io.h + rename arch/arm/mach-s3c/{include/mach => }/irqs-s3c24xx.h (95%) + rename arch/arm/mach-s3c/{include/mach => }/irqs-s3c64xx.h (100%) + rename arch/arm/mach-s3c/{include/mach => }/irqs.h (100%) + rename arch/arm/mach-s3c/{include/mach => }/map-base.h (87%) + rename arch/arm/{mach-vexpress => mach-versatile}/Makefile.boot (100%) + rename arch/arm/{mach-vexpress => mach-versatile}/dcscb.c (97%) + rename arch/arm/{mach-vexpress => mach-versatile}/dcscb_setup.S (95%) + rename arch/arm/{plat-versatile => mach-versatile}/headsmp.S (94%) + rename arch/arm/{plat-versatile => mach-versatile}/hotplug.c (98%) + rename arch/arm/{mach-integrator/cm.h => mach-versatile/integrator-cm.h} (100%) + rename arch/arm/{mach-integrator/hardware.h => mach-versatile/integrator-hardware.h} (100%) + rename arch/arm/{mach-integrator/core.c => mach-versatile/integrator.c} (95%) + rename arch/arm/{mach-integrator/common.h => mach-versatile/integrator.h} (100%) + rename arch/arm/{mach-integrator => mach-versatile}/integrator_ap.c (97%) + rename arch/arm/{mach-integrator => mach-versatile}/integrator_cp.c (96%) + rename arch/arm/{mach-realview/platsmp-dt.c => mach-versatile/platsmp-realview.c} (98%) + rename arch/arm/{mach-vexpress/platsmp.c => mach-versatile/platsmp-vexpress.c} (96%) + rename arch/arm/{plat-versatile => mach-versatile}/platsmp.c (97%) + rename arch/arm/{plat-versatile/include/plat => mach-versatile}/platsmp.h (87%) + rename arch/arm/{mach-realview/realview-dt.c => mach-versatile/realview.c} (100%) + rename arch/arm/{mach-vexpress => mach-versatile}/spc.c (100%) + rename arch/arm/{mach-vexpress => mach-versatile}/spc.h (100%) + rename arch/arm/{mach-vexpress => mach-versatile}/tc2_pm.c (99%) + rename arch/arm/{mach-vexpress => mach-versatile}/v2m-mps2.c (100%) + rename arch/arm/{mach-vexpress => mach-versatile}/v2m.c (97%) + rename arch/arm/mach-versatile/{versatile_dt.c => versatile.c} (100%) + rename arch/arm/{mach-vexpress/core.h => mach-versatile/vexpress.h} (100%) + delete mode 100644 arch/arm/mach-vexpress/Kconfig + delete mode 100644 arch/arm/mach-vexpress/Makefile + delete mode 100644 arch/arm/plat-versatile/Makefile + delete mode 100644 arch/arm64/boot/dts/synaptics/as370.dtsi +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next +Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts +Merge made by the 'ort' strategy. +Merging amlogic/for-next (ed532523b458 Merge branch 'v5.18/fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/meson8-minix-neo-x8.dts | 2 +- + arch/arm64/boot/dts/amlogic/Makefile | 38 +++++++++++----------- + .../dts/amlogic/meson-axg-jethome-jethub-j100.dts | 16 ++++++--- + .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 2 +- + .../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 2 +- + .../amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 6 ++++ + .../amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 2 +- + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 33 +++++++++++++++++++ + .../boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 2 +- + 11 files changed, 77 insertions(+), 30 deletions(-) +Merging aspeed/for-next (d9540eeaa3d1 Merge branches 'nuvoton-dt-for-v5.18' and 'dt-for-v5.18' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Auto-merging arch/arm/boot/dts/aspeed-g4.dtsi +Auto-merging arch/arm/boot/dts/aspeed-g5.dtsi +Auto-merging arch/arm/boot/dts/aspeed-g6.dtsi +Merge made by the 'ort' strategy. + arch/arm/boot/dts/aspeed-ast2600-evb.dts | 18 ++++++++++++++++++ + arch/arm/boot/dts/aspeed-g4.dtsi | 6 ++++++ + arch/arm/boot/dts/aspeed-g5.dtsi | 7 +++++++ + arch/arm/boot/dts/aspeed-g6.dtsi | 19 +++++++++++++++++++ + 4 files changed, 50 insertions(+) +Merging at91/at91-next (0c640d9544d0 ARM: dts: at91: fix pinctrl phandles) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Already up to date. +Merging drivers-memory/for-next (03b8b406d86f Merge branch 'mem-ctrl-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. + .../memory-controllers/renesas,rpc-if.yaml | 5 ++++ + drivers/memory/emif.c | 11 +-------- + drivers/memory/renesas-rpc-if.c | 28 +++++++--------------- + drivers/memory/samsung/exynos5422-dmc.c | 5 ++-- + 4 files changed, 16 insertions(+), 33 deletions(-) +Merging imx-mxs/for-next (102072b8d2d2 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 83 +- + arch/arm/boot/dts/Makefile | 11 +- + arch/arm/boot/dts/imx28-evk.dts | 2 +- + arch/arm/boot/dts/imx28-m28evk.dts | 2 +- + arch/arm/boot/dts/imx28-sps1.dts | 2 +- + arch/arm/boot/dts/imx6dl-colibri-aster.dts | 113 ++ + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 110 +- + arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts | 46 + + arch/arm/boot/dts/imx6dl-colibri-iris.dts | 152 +++ + arch/arm/boot/dts/imx6dl-colibri-v1_1-eval-v3.dts | 31 - + arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts | 6 +- + arch/arm/boot/dts/imx6dl-rex-basic.dts | 2 +- + arch/arm/boot/dts/imx6dl-victgo.dts | 85 +- + arch/arm/boot/dts/imx6q-ba16.dtsi | 2 +- + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 2 +- + arch/arm/boot/dts/imx6q-cm-fx6.dts | 2 +- + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +- + arch/arm/boot/dts/imx6q-dms-ba16.dts | 2 +- + arch/arm/boot/dts/imx6q-gw5400-a.dts | 2 +- + arch/arm/boot/dts/imx6q-marsboard.dts | 2 +- + arch/arm/boot/dts/imx6q-rex-pro.dts | 2 +- + arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-colibri-v1_1-uhs.dtsi | 44 - + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 771 ++++++++--- + arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 5 - + arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 51 +- + arch/arm/boot/dts/imx6sl-evk.dts | 2 +- + arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 2 +- + arch/arm/boot/dts/imx6sx-sdb-reva.dts | 4 +- + arch/arm/boot/dts/imx6sx-sdb.dts | 4 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi | 2 +- + .../boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi | 2 +- + .../boot/dts/imx6ul-phytec-segin-peb-av-02.dtsi | 3 +- + arch/arm/boot/dts/imx6ul-tqma6ul-common.dtsi | 211 +++ + arch/arm/boot/dts/imx6ul-tqma6ul1-mba6ulx.dts | 55 + + arch/arm/boot/dts/imx6ul-tqma6ul1.dtsi | 37 + + arch/arm/boot/dts/imx6ul-tqma6ul2-mba6ulx.dts | 15 + + arch/arm/boot/dts/imx6ul-tqma6ul2.dtsi | 71 + + arch/arm/boot/dts/imx6ul-tqma6ul2l-mba6ulx.dts | 15 + + arch/arm/boot/dts/imx6ul-tqma6ul2l.dtsi | 71 + + arch/arm/boot/dts/imx6ul-tqma6ulx-common.dtsi | 43 + + arch/arm/boot/dts/imx6ul-tqma6ulxl-common.dtsi | 48 + + arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi | 2 +- + arch/arm/boot/dts/imx6ull-phytec-tauri-emmc.dts | 20 + + arch/arm/boot/dts/imx6ull-phytec-tauri-nand.dts | 20 + + arch/arm/boot/dts/imx6ull-phytec-tauri.dtsi | 588 +++++++++ + arch/arm/boot/dts/imx6ull-tqma6ull2-mba6ulx.dts | 15 + + arch/arm/boot/dts/imx6ull-tqma6ull2.dtsi | 76 ++ + arch/arm/boot/dts/imx6ull-tqma6ull2l-mba6ulx.dts | 15 + + arch/arm/boot/dts/imx6ull-tqma6ull2l.dtsi | 76 ++ + arch/arm/boot/dts/imx7s.dtsi | 2 +- + arch/arm/boot/dts/mba6ulx.dtsi | 571 ++++++++ + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm64/boot/dts/freescale/Makefile | 7 + + .../dts/freescale/fsl-ls1028a-kontron-sl28.dts | 9 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 - + arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 10 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8-ss-vpu.dtsi | 74 ++ + .../dts/freescale/imx8mm-data-modul-edm-sbc.dts | 996 ++++++++++++++ + arch/arm64/boot/dts/freescale/imx8mm-emcon.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 20 + + .../boot/dts/freescale/imx8mm-kontron-n801x-s.dts | 2 +- + .../dts/freescale/imx8mm-kontron-n801x-som.dtsi | 2 +- + .../boot/dts/freescale/imx8mm-venice-gw73xx.dtsi | 1 + + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 3 + + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 3 + + .../boot/dts/freescale/imx8mm-verdin-dahlia.dtsi | 2 +- + .../boot/dts/freescale/imx8mm-verdin-wifi.dtsi | 26 +- + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 411 +++--- + .../boot/dts/freescale/imx8mn-bsh-smm-s2pro.dts | 90 ++ + arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk.dts | 114 ++ + arch/arm64/boot/dts/freescale/imx8mn-evk.dts | 54 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 27 + + .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 1 + + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 6 +- + .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 896 +++++++++++++ + .../boot/dts/freescale/imx8mp-verdin-dahlia.dtsi | 129 ++ + .../boot/dts/freescale/imx8mp-verdin-dev.dtsi | 46 + + .../dts/freescale/imx8mp-verdin-nonwifi-dahlia.dts | 18 + + .../dts/freescale/imx8mp-verdin-nonwifi-dev.dts | 18 + + .../boot/dts/freescale/imx8mp-verdin-nonwifi.dtsi | 54 + + .../dts/freescale/imx8mp-verdin-wifi-dahlia.dts | 18 + + .../boot/dts/freescale/imx8mp-verdin-wifi-dev.dts | 18 + + .../boot/dts/freescale/imx8mp-verdin-wifi.dtsi | 82 ++ + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 1380 ++++++++++++++++++++ + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 121 +- + .../arm64/boot/dts/freescale/imx8mq-librem5-r4.dts | 4 + + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 15 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 7 + + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 25 + + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 24 + + drivers/bus/imx-weim.c | 2 +- + drivers/soc/imx/gpcv2.c | 430 +++++- + 109 files changed, 7958 insertions(+), 730 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6dl-colibri-aster.dts + create mode 100644 arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts + create mode 100644 arch/arm/boot/dts/imx6dl-colibri-iris.dts + delete mode 100644 arch/arm/boot/dts/imx6dl-colibri-v1_1-eval-v3.dts + delete mode 100644 arch/arm/boot/dts/imx6qdl-colibri-v1_1-uhs.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul-common.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul1-mba6ulx.dts + create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul1.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul2-mba6ulx.dts + create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul2.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul2l-mba6ulx.dts + create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul2l.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ulx-common.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ulxl-common.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-tauri-emmc.dts + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-tauri-nand.dts + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-tauri.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-tqma6ull2-mba6ulx.dts + create mode 100644 arch/arm/boot/dts/imx6ull-tqma6ull2.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-tqma6ull2l-mba6ulx.dts + create mode 100644 arch/arm/boot/dts/imx6ull-tqma6ull2l.dtsi + create mode 100644 arch/arm/boot/dts/mba6ulx.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-vpu.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-dahlia.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-nonwifi-dahlia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-nonwifi-dev.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-nonwifi.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi-dahlia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi-dev.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi +Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (6ceb6a96db4e Merge branch 'v5.17-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. +Merging mvebu/for-next (8885ae5142a4 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Auto-merging arch/arm64/boot/dts/marvell/armada-37xx.dtsi +Merge made by the 'ort' strategy. +Merging omap/for-next (75c1e9c05d21 Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/omap/prcm.txt | 7 +- + .../devicetree/bindings/clock/ti-clkctrl.txt | 4 +- + .../devicetree/bindings/clock/ti/clockdomain.txt | 3 + + .../devicetree/bindings/clock/ti/composite.txt | 3 + + .../bindings/clock/ti/fixed-factor-clock.txt | 1 + + .../devicetree/bindings/clock/ti/gate.txt | 1 + + .../devicetree/bindings/clock/ti/interface.txt | 1 + + Documentation/devicetree/bindings/clock/ti/mux.txt | 1 + + arch/arm/boot/dts/am33xx-clocks.dtsi | 373 +++++++---- + arch/arm/boot/dts/am43xx-clocks.dtsi | 339 ++++++---- + arch/arm/boot/dts/dra7xx-clocks.dtsi | 693 ++++++++++++++------- + arch/arm/boot/dts/omap443x-clocks.dtsi | 1 + + arch/arm/boot/dts/omap446x-clocks.dtsi | 2 + + arch/arm/boot/dts/omap44xx-clocks.dtsi | 173 ++++- + arch/arm/boot/dts/omap54xx-clocks.dtsi | 160 ++++- + 15 files changed, 1275 insertions(+), 487 deletions(-) +Merging qcom/for-next (4fe0e3514640 Merge branches 'arm64-for-5.19', 'arm64-defconfig-for-5.19', 'clk-for-5.19', 'defconfig-for-5.19', 'drivers-for-5.19', 'dts-for-5.19' and 'arm64-fixes-for-5.18' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/boot/dts/qcom-ipq8064.dtsi +Auto-merging arch/arm64/boot/dts/qcom/msm8996.dtsi +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/qcom.yaml | 21 + + .../devicetree/bindings/clock/qcom,rpmcc.txt | 63 - + .../devicetree/bindings/clock/qcom,rpmcc.yaml | 75 ++ + .../bindings/clock/qcom,sc7280-lpasscorecc.yaml | 172 +++ + .../devicetree/bindings/firmware/qcom,scm.txt | 3 +- + .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + + .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 5 +- + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 2 +- + .../bindings/remoteproc/qcom,wcnss-pil.txt | 2 +- + .../devicetree/bindings/soc/qcom/qcom,geni-se.yaml | 22 +- + .../devicetree/bindings/soc/qcom/qcom,gsbi.txt | 87 -- + .../devicetree/bindings/soc/qcom/qcom,gsbi.yaml | 132 ++ + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 11 +- + .../devicetree/bindings/soc/qcom/qcom,smd.txt | 98 -- + .../devicetree/bindings/soc/qcom/qcom,smd.yaml | 137 ++ + .../devicetree/bindings/soc/qcom/qcom,smsm.txt | 104 -- + .../devicetree/bindings/soc/qcom/qcom,smsm.yaml | 138 ++ + .../devicetree/bindings/soc/qcom/qcom,wcnss.txt | 131 -- + .../devicetree/bindings/soc/qcom/qcom,wcnss.yaml | 137 ++ + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts | 294 +++++ + arch/arm/boot/dts/qcom-apq8064.dtsi | 16 +- + arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 2 +- + arch/arm/boot/dts/qcom-apq8084.dtsi | 2 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 4 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts | 2 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi | 4 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c1.dts | 2 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi | 4 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 42 +- + arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi | 2 +- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 12 +- + arch/arm/boot/dts/qcom-mdm9615.dtsi | 4 +- + arch/arm/boot/dts/qcom-msm8226.dtsi | 9 + + arch/arm/boot/dts/qcom-msm8660.dtsi | 1 + + arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts | 2 +- + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 44 +- + arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts | 66 +- + .../boot/dts/qcom-msm8974-sony-xperia-amami.dts | 2 +- + .../boot/dts/qcom-msm8974-sony-xperia-castor.dts | 2 +- + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 2 +- + arch/arm/boot/dts/qcom-msm8974.dtsi | 8 +- + arch/arm/boot/dts/qcom-pm8226.dtsi | 41 + + arch/arm/boot/dts/qcom-pmx65.dtsi | 32 + + arch/arm/boot/dts/qcom-sdx65-mtp.dts | 221 ++++ + arch/arm/boot/dts/qcom-sdx65.dtsi | 191 +++ + arch/arm/configs/qcom_defconfig | 8 + + arch/arm64/boot/dts/qcom/Makefile | 5 +- + arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 6 + + arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts | 2 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 34 +- + arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 2 +- + arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi | 2 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 42 +- + arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 59 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 102 +- + arch/arm64/boot/dts/qcom/msm8953.dtsi | 52 +- + arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 36 +- + arch/arm64/boot/dts/qcom/msm8992.dtsi | 24 +- + .../dts/qcom/msm8994-huawei-angler-rev-101.dts | 7 +- + .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 89 +- + arch/arm64/boot/dts/qcom/msm8994.dtsi | 126 +- + .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 18 +- + .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 36 +- + arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 9 + + .../arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts | 9 + + arch/arm64/boot/dts/qcom/msm8996.dtsi | 250 ++-- + .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 31 + + arch/arm64/boot/dts/qcom/pm8350.dtsi | 31 + + arch/arm64/boot/dts/qcom/pm8350b.dtsi | 31 + + arch/arm64/boot/dts/qcom/pm8350c.dtsi | 32 +- + arch/arm64/boot/dts/qcom/pm8450.dtsi | 59 + + arch/arm64/boot/dts/qcom/pmr735a.dtsi | 32 +- + arch/arm64/boot/dts/qcom/pmr735b.dtsi | 31 + + arch/arm64/boot/dts/qcom/qcs404.dtsi | 94 +- + arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 229 ++++ + .../qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts | 2 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts | 4 - + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 4 - + .../boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 4 - + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 - + .../dts/qcom/{sc7280-crd.dts => sc7280-crd-r3.dts} | 7 +- + arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 313 +++++ + .../dts/qcom/sc7280-herobrine-herobrine-r0.dts | 1352 -------------------- + .../dts/qcom/sc7280-herobrine-herobrine-r1.dts | 30 + + .../boot/dts/qcom/sc7280-herobrine-villager-r0.dts | 296 +++++ + arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 69 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dts | 2 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 10 + + arch/arm64/boot/dts/qcom/sc7280.dtsi | 194 ++- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sdm660.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 1 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 34 +- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 239 +++- + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 61 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 328 +++++ + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 12 + + .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 30 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 10 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 3 - + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 41 + + arch/arm64/boot/dts/qcom/sm8450-qrd.dts | 10 + + arch/arm64/boot/dts/qcom/sm8450.dtsi | 395 +++++- + arch/arm64/configs/defconfig | 16 + + drivers/clk/qcom/Kconfig | 10 + + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/clk-regmap-mux.c | 78 ++ + drivers/clk/qcom/clk-regmap-mux.h | 3 + + drivers/clk/qcom/gcc-sc7280.c | 6 +- + drivers/clk/qcom/gcc-sm8450.c | 6 +- + drivers/clk/qcom/lpassaudiocc-sc7280.c | 838 ++++++++++++ + drivers/clk/qcom/lpasscorecc-sc7280.c | 431 +++++++ + drivers/firmware/qcom_scm.c | 4 + + drivers/soc/qcom/llcc-qcom.c | 1 + + drivers/soc/qcom/pdr_interface.c | 11 +- + drivers/soc/qcom/rpmhpd.c | 16 + + drivers/soc/qcom/smem.c | 305 +++-- + drivers/soc/qcom/smp2p.c | 1 + + drivers/soc/qcom/smsm.c | 1 + + drivers/soc/qcom/socinfo.c | 2 + + .../dt-bindings/clock/qcom,lpassaudiocc-sc7280.h | 43 + + .../dt-bindings/clock/qcom,lpasscorecc-sc7280.h | 26 + + include/dt-bindings/power/qcom-rpmpd.h | 8 + + 124 files changed, 6634 insertions(+), 2472 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,rpmcc.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7280-lpasscorecc.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smd.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smd.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smsm.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smsm.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.yaml + create mode 100644 arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts + create mode 100644 arch/arm/boot/dts/qcom-pmx65.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8450.dtsi + rename arch/arm64/boot/dts/qcom/{sc7280-crd.dts => sc7280-crd-r3.dts} (88%) + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts + create mode 100644 drivers/clk/qcom/lpassaudiocc-sc7280.c + create mode 100644 drivers/clk/qcom/lpasscorecc-sc7280.c + create mode 100644 include/dt-bindings/clock/qcom,lpassaudiocc-sc7280.h + create mode 100644 include/dt-bindings/clock/qcom,lpasscorecc-sc7280.h +Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/bcm2711-rpi-400.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging renesas/next (a868de20e8c0 Merge branches 'renesas-arm-dt-for-v5.19' and 'renesas-dt-bindings-for-v5.19' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/renesas.yaml | 2 + + .../bindings/power/renesas,rzg2l-sysc.yaml | 5 +- + arch/arm/boot/dts/r8a7743.dtsi | 1 + + arch/arm/boot/dts/r8a7744.dtsi | 1 + + arch/arm/boot/dts/r8a7745.dtsi | 1 + + arch/arm/boot/dts/r8a77470.dtsi | 1 + + arch/arm/boot/dts/r8a7790.dtsi | 1 + + arch/arm/boot/dts/r8a7791.dtsi | 1 + + arch/arm/boot/dts/r8a7792.dtsi | 1 + + arch/arm/boot/dts/r8a7793.dtsi | 1 + + arch/arm/boot/dts/r8a7794.dtsi | 1 + + arch/arm64/boot/dts/renesas/Makefile | 2 + + arch/arm64/boot/dts/renesas/draak.dtsi | 58 ++ + arch/arm64/boot/dts/renesas/ebisu.dtsi | 58 ++ + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 17 + + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 17 + + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 42 ++ + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 17 + + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 17 + + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 17 + + .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 12 +- + arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 24 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 57 ++ + .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 20 + + .../boot/dts/renesas/r8a779f0-spider-ethernet.dtsi | 15 + + arch/arm64/boot/dts/renesas/r8a779f0-spider.dts | 10 + + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 103 ++++ + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 481 +++++++++++++++++ + arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts | 97 ++++ + arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts | 76 --- + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 584 ++++++++++++++++++++- + arch/arm64/boot/dts/renesas/r9a07g054l2-smarc.dts | 8 - + arch/arm64/boot/dts/renesas/rz-smarc-common.dtsi | 16 - + arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 19 + + .../boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi | 64 ++- + arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi | 61 +++ + arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 27 + + .../boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi | 63 +++ + arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi | 233 ++++++++ + arch/arm64/boot/dts/renesas/rzg2ul-smarc.dtsi | 24 + + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 49 ++ + arch/arm64/boot/dts/renesas/ulcb.dtsi | 49 ++ + arch/arm64/configs/defconfig | 1 + + drivers/soc/renesas/Kconfig | 6 + + drivers/soc/renesas/renesas-soc.c | 13 + + include/dt-bindings/clock/r9a07g043-cpg.h | 184 +++++++ + 51 files changed, 2421 insertions(+), 141 deletions(-) + create mode 100644 arch/arm64/boot/dts/renesas/r8a779f0-spider-ethernet.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g043.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts + create mode 100644 arch/arm64/boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2ul-smarc.dtsi + create mode 100644 include/dt-bindings/clock/r9a07g043-cpg.h +Merging reset/reset/next (3f7bdc13154a dt-bindings: reset: uniphier-glue: Clean up clocks, resets, and their names using compatible string) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Merge made by the 'ort' strategy. + .../bindings/reset/amlogic,meson-reset.yaml | 1 + + .../reset/socionext,uniphier-glue-reset.yaml | 52 ++++++--- + drivers/reset/Kconfig | 2 +- + drivers/reset/core.c | 15 ++- + drivers/reset/reset-meson.c | 6 + + drivers/reset/reset-simple.c | 1 + + drivers/reset/reset-uniphier-glue.c | 75 ++++++------- + include/dt-bindings/reset/amlogic,meson-s4-reset.h | 125 +++++++++++++++++++++ + 8 files changed, 220 insertions(+), 57 deletions(-) + create mode 100644 include/dt-bindings/reset/amlogic,meson-s4-reset.h +Merging rockchip/for-next (80ff2eb434b6 Merge branch 'v5.18-armsoc/dtsfixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 5 + + .../bindings/clock/rockchip,rk3399-cru.yaml | 33 +- + .../devicetree/bindings/soc/rockchip/grf.yaml | 3 + + arch/arm/boot/dts/rk3036.dtsi | 4 +- + arch/arm/boot/dts/rk3188-bqedison2qc.dts | 3 +- + arch/arm/boot/dts/rk322x.dtsi | 2 +- + arch/arm/mach-rockchip/platsmp.c | 2 +- + arch/arm64/boot/dts/rockchip/Makefile | 3 +- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 3 +- + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 7 + + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 12 + + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 28 ++ + arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 3 +- + .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 3 +- + arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 3 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi | 25 + + arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 3 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 3 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 27 +- + arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 37 ++ + arch/arm64/boot/dts/rockchip/rk3566.dtsi | 11 + + arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 142 +++++- + arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 46 ++ + arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 502 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 23 + + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 63 ++- + drivers/soc/rockchip/grf.c | 17 + + drivers/soc/rockchip/pm_domains.c | 6 +- + 31 files changed, 978 insertions(+), 47 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +Merging samsung-krzk/for-next (e7d40b416c50 Merge branch 'next/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging arch/arm/configs/mini2440_defconfig +Auto-merging arch/arm/configs/s3c2410_defconfig +Auto-merging arch/arm/mach-s3c/Kconfig.s3c24xx +Auto-merging arch/arm/mach-s3c/pm-s3c64xx.c +Merge made by the 'ort' strategy. + .../bindings/soc/samsung/exynos-usi.yaml | 2 +- + arch/arm/boot/dts/exynos3250.dtsi | 3 +- + arch/arm/boot/dts/exynos4.dtsi | 4 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 4 +- + arch/arm/boot/dts/exynos4412-odroidx.dts | 8 +-- + arch/arm/boot/dts/exynos5250.dtsi | 8 +-- + arch/arm/boot/dts/exynos5260.dtsi | 3 +- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 4 +- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 7 +-- + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 6 +-- + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 6 +-- + arch/arm/boot/dts/exynos54xx.dtsi | 3 +- + arch/arm/boot/dts/nspire-classic.dtsi | 10 ++-- + arch/arm/boot/dts/nspire-cx.dts | 4 +- + arch/arm/boot/dts/nspire.dtsi | 60 +++++++++++----------- + arch/arm/boot/dts/ox820.dtsi | 2 +- + arch/arm/boot/dts/s5pv210-aquila.dts | 3 +- + arch/arm/boot/dts/s5pv210-aries.dtsi | 11 ++-- + arch/arm/boot/dts/s5pv210-goni.dts | 6 +-- + arch/arm/boot/dts/s5pv210.dtsi | 40 ++++++--------- + arch/arm/boot/dts/socfpga.dtsi | 2 +- + arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +- + arch/arm/configs/mini2440_defconfig | 3 +- + arch/arm/configs/s3c2410_defconfig | 2 + + arch/arm/mach-s3c/Kconfig | 8 --- + arch/arm/mach-s3c/Kconfig.s3c24xx | 2 - + arch/arm/mach-s3c/iotiming-s3c2410.c | 2 +- + arch/arm/mach-s3c/pm-s3c64xx.c | 2 +- + arch/arm/mach-s3c/s3c24xx.c | 2 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 3 +- + arch/arm64/boot/dts/exynos/exynos850-e850-96.dts | 5 ++ + arch/arm64/boot/dts/exynos/exynos850.dtsi | 19 +------ + arch/arm64/boot/dts/tesla/fsd.dtsi | 2 +- + 33 files changed, 110 insertions(+), 138 deletions(-) +Merging scmi/for-linux-next (da005f876630 Merge tag 'scmi-fixes-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. +Merging stm32/stm32-next (73ab99aad50c ARM: dts: stm32: Switch DWMAC RMII clock to MCO2 on DHCOM) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 49 ++++++++++++++++++++++++++++ + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 22 ++++++++++--- + 2 files changed, 67 insertions(+), 4 deletions(-) +Merging sunxi/sunxi/for-next (dd8742e8a17d Merge branch 'sunxi/dt-for-5.19' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 + + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 1 + + .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 24 ++--- + arch/arm/boot/dts/suniv-f1c100s-licheepi-nano.dts | 31 ++++++ + arch/arm/boot/dts/suniv-f1c100s.dtsi | 104 +++++++++++++++++++-- + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 30 ++++++ + drivers/clk/sunxi-ng/ccu-sun6i-rtc.c | 1 + + 7 files changed, 171 insertions(+), 25 deletions(-) +Merging tee/next (17522923771d Merge branch 'fixes' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Merge made by the 'ort' strategy. + drivers/tee/Kconfig | 5 +---- + drivers/tee/optee/call.c | 2 +- + drivers/tee/tee_shm.c | 35 +++++++++++++++++++++++++---------- + 3 files changed, 27 insertions(+), 15 deletions(-) +Merging tegra/for-next (aee7f609222b Merge branch for-5.19/arm64/dt into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/tegra_defconfig | 3 +- + arch/arm/mach-tegra/platsmp.c | 2 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 10 ++ + .../arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi | 12 +++ + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 28 ++++++ + drivers/memory/tegra/Makefile | 2 + + drivers/memory/tegra/mc.c | 3 + + drivers/memory/tegra/mc.h | 7 +- + drivers/memory/tegra/tegra186-emc.c | 3 + + drivers/memory/tegra/tegra234.c | 101 +++++++++++++++++++++ + drivers/soc/tegra/fuse/fuse-tegra.c | 8 +- + drivers/soc/tegra/fuse/fuse-tegra30.c | 17 +++- + drivers/soc/tegra/pmc.c | 33 +++++-- + include/dt-bindings/clock/tegra234-clock.h | 8 ++ + include/dt-bindings/reset/tegra234-reset.h | 2 + + 16 files changed, 224 insertions(+), 16 deletions(-) + create mode 100644 drivers/memory/tegra/tegra234.c +Merging ti/ti-next (d3e3116f2535 soc: ti: knav_dma: Use pm_runtime_resume_and_get instead of pm_runtime_get_sync) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Auto-merging drivers/reset/Kconfig +Merge made by the 'ort' strategy. + drivers/reset/Kconfig | 2 +- + drivers/soc/ti/knav_dma.c | 29 +++++++++++++---------------- + drivers/soc/ti/knav_qmss_queue.c | 16 +++++++--------- + drivers/soc/ti/omap_prm.c | 7 ++----- + drivers/soc/ti/pruss.c | 3 +-- + drivers/soc/ti/ti_sci_pm_domains.c | 2 ++ + drivers/soc/ti/wkup_m3_ipc.c | 4 +--- + 7 files changed, 27 insertions(+), 36 deletions(-) +Merging xilinx/for-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Already up to date. +Merging clk/clk-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (39772efd98ad clk: imx8mp: Add DISP2 pixel clock) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Merge made by the 'ort' strategy. + drivers/clk/imx/clk-composite-8m.c | 19 ++++++++------- + drivers/clk/imx/clk-imx7d.c | 1 - + drivers/clk/imx/clk-imx8mm.c | 3 ++- + drivers/clk/imx/clk-imx8mn.c | 41 +++++++++++++++++++++++++++++++- + drivers/clk/imx/clk-imx8mp.c | 8 ++++--- + drivers/clk/imx/clk-imx8mq.c | 5 ++-- + drivers/clk/imx/clk-scu.c | 4 +++- + drivers/clk/imx/clk.c | 5 ++++ + drivers/clk/imx/clk.h | 1 + + include/dt-bindings/clock/imx8mn-clock.h | 16 ++++++++++++- + include/dt-bindings/clock/imx8mp-clock.h | 4 +++- + 11 files changed, 88 insertions(+), 19 deletions(-) +Merging clk-renesas/renesas-clk (59086e4193f4 clk: renesas: r9a07g043: Add SDHI clock and reset entries) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + .../bindings/clock/renesas,rzg2l-cpg.yaml | 7 +- + drivers/clk/renesas/Kconfig | 7 +- + drivers/clk/renesas/Makefile | 1 + + drivers/clk/renesas/r8a774a1-cpg-mssr.c | 9 +- + drivers/clk/renesas/r8a774b1-cpg-mssr.c | 9 +- + drivers/clk/renesas/r8a774c0-cpg-mssr.c | 8 +- + drivers/clk/renesas/r8a774e1-cpg-mssr.c | 9 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 9 +- + drivers/clk/renesas/r8a7796-cpg-mssr.c | 9 +- + drivers/clk/renesas/r8a77965-cpg-mssr.c | 9 +- + drivers/clk/renesas/r8a77980-cpg-mssr.c | 10 +- + drivers/clk/renesas/r8a77990-cpg-mssr.c | 7 + + drivers/clk/renesas/r8a77995-cpg-mssr.c | 11 +- + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 11 +- + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 9 +- + drivers/clk/renesas/r9a07g043-cpg.c | 220 +++++++++++++++++++++ + drivers/clk/renesas/rcar-gen3-cpg.h | 5 +- + drivers/clk/renesas/rzg2l-cpg.c | 10 +- + drivers/clk/renesas/rzg2l-cpg.h | 1 + + 19 files changed, 304 insertions(+), 57 deletions(-) + create mode 100644 drivers/clk/renesas/r9a07g043-cpg.c +Merging clk-samsung/for-next (45bd8166a1d8 clk: samsung: Add initial Exynos7885 clock driver) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Already up to date. +Merging csky/linux-next (e5981f206da3 csky: atomic: Add conditional atomic operations' optimization) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Merge made by the 'ort' strategy. + arch/csky/Kconfig | 8 + + arch/csky/abiv1/Makefile | 2 - + arch/csky/abiv1/memcpy.S | 347 -------------------------------------- + arch/csky/abiv1/strksyms.c | 6 - + arch/csky/abiv2/Makefile | 2 + + arch/csky/abiv2/strksyms.c | 4 +- + arch/csky/include/asm/atomic.h | 249 +++++++++++++++++++++++++++ + arch/csky/include/asm/barrier.h | 11 +- + arch/csky/include/asm/cmpxchg.h | 64 ++++++- + arch/csky/include/asm/io.h | 12 +- + arch/csky/kernel/Makefile | 2 +- + arch/csky/kernel/io.c | 91 ++++++++++ + arch/csky/kernel/module.c | 2 +- + arch/csky/kernel/probes/kprobes.c | 2 +- + arch/csky/kernel/probes/uprobes.c | 2 +- + arch/csky/kernel/process.c | 1 - + arch/csky/lib/Makefile | 3 + + arch/csky/lib/string.c | 134 +++++++++++++++ + arch/csky/mm/dma-mapping.c | 1 - + 19 files changed, 572 insertions(+), 371 deletions(-) + delete mode 100644 arch/csky/abiv1/memcpy.S + delete mode 100644 arch/csky/abiv1/strksyms.c + create mode 100644 arch/csky/include/asm/atomic.h + create mode 100644 arch/csky/kernel/io.c + create mode 100644 arch/csky/lib/string.c +Merging m68k/for-next (05d51e42df06 m68k: Introduce a virtual m68k machine) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Auto-merging drivers/clocksource/Kconfig +Auto-merging drivers/clocksource/Makefile +Merge made by the 'ort' strategy. + arch/m68k/Kbuild | 1 + + arch/m68k/Kconfig.machine | 17 ++++ + arch/m68k/configs/virt_defconfig | 68 +++++++++++++ + arch/m68k/include/asm/config.h | 2 + + arch/m68k/include/asm/io.h | 3 + + arch/m68k/include/asm/irq.h | 3 +- + arch/m68k/include/asm/pgtable_mm.h | 7 ++ + arch/m68k/include/asm/setup.h | 44 ++++++-- + arch/m68k/include/asm/virt.h | 25 +++++ + arch/m68k/include/uapi/asm/bootinfo-virt.h | 18 ++++ + arch/m68k/include/uapi/asm/bootinfo.h | 1 + + arch/m68k/kernel/Makefile | 1 + + arch/m68k/kernel/head.S | 31 ++++++ + arch/m68k/kernel/setup_mm.c | 7 ++ + arch/m68k/mm/kmap.c | 21 ++-- + arch/m68k/virt/Makefile | 6 ++ + arch/m68k/virt/config.c | 130 ++++++++++++++++++++++++ + arch/m68k/virt/ints.c | 155 +++++++++++++++++++++++++++++ + arch/m68k/virt/platform.c | 72 ++++++++++++++ + drivers/clocksource/Kconfig | 7 ++ + drivers/clocksource/Makefile | 1 + + drivers/clocksource/timer-goldfish.c | 153 ++++++++++++++++++++++++++++ + drivers/rtc/rtc-goldfish.c | 44 ++++---- + drivers/tty/goldfish.c | 20 ++-- + include/clocksource/timer-goldfish.h | 31 ++++++ + include/linux/goldfish.h | 15 ++- + 26 files changed, 825 insertions(+), 58 deletions(-) + create mode 100644 arch/m68k/configs/virt_defconfig + create mode 100644 arch/m68k/include/asm/virt.h + create mode 100644 arch/m68k/include/uapi/asm/bootinfo-virt.h + create mode 100644 arch/m68k/virt/Makefile + create mode 100644 arch/m68k/virt/config.c + create mode 100644 arch/m68k/virt/ints.c + create mode 100644 arch/m68k/virt/platform.c + create mode 100644 drivers/clocksource/timer-goldfish.c + create mode 100644 include/clocksource/timer-goldfish.h +Merging m68knommu/for-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git nios2/for-next +Already up to date. +Merging openrisc/for-next (862cf8d5fd98 openrisc/boot: Remove unnecessary initialisation in memcpy().) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (e34799ccc126 parisc: Change MAX_ADDRESS to become unsigned long long) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/Kconfig | 1 + + arch/parisc/configs/generic-32bit_defconfig | 4 +++- + arch/parisc/configs/generic-64bit_defconfig | 3 ++- + arch/parisc/include/asm/cache.h | 1 + + arch/parisc/include/asm/cacheflush.h | 5 +++-- + arch/parisc/include/asm/pgtable.h | 2 +- + arch/parisc/kernel/cache.c | 17 ++++++++++++++++- + arch/parisc/kernel/pacache.S | 3 --- + arch/parisc/kernel/processor.c | 11 +++++++++-- + drivers/video/console/sticore.c | 21 +++++++++++++++++++++ + 10 files changed, 57 insertions(+), 11 deletions(-) +Merging powerpc/next (ce522ba9ef7e Linux 5.18-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging soc-fsl/next (1ce93cb102e7 soc: fsl: qe: Check of ioremap return value) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging risc-v/for-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging s390/for-next (270a62595741 Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Merge made by the 'ort' strategy. +Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master +Already up to date. +Merging uml/linux-next (82017457957a um: run_helper: Write error message to kernel log on exec failure on host) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (839769c35477 xtensa: fix a7 clobbering in coprocessor context load/store) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'ort' strategy. + arch/xtensa/kernel/coprocessor.S | 4 ++-- + arch/xtensa/kernel/jump_label.c | 2 +- + arch/xtensa/platforms/iss/console.c | 8 -------- + 3 files changed, 3 insertions(+), 11 deletions(-) +Merging pidfd/for-next (6009ff9e8020 Merge branch 'fs.mount_setattr.fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging fscrypt/master (63cec1389e11 fscrypt: split up FS_CRYPTO_BLOCK_SIZE) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master +Merge made by the 'ort' strategy. + fs/crypto/crypto.c | 10 +++++----- + fs/crypto/fname.c | 11 +++++++++-- + fs/ubifs/ubifs.h | 2 +- + include/linux/fscrypt.h | 12 +++++++++++- + 4 files changed, 26 insertions(+), 9 deletions(-) +Merging fscache/fscache-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Already up to date. +Merging afs/afs-next (26291c54e111 Linux 5.17-rc2) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (9cff4a31dd1f Merge branch 'for-next-next-v5.18-20220412' into for-next-20220412) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/inode.c +Merge made by the 'ort' strategy. + fs/btrfs/acl.c | 39 +- + fs/btrfs/block-group.c | 67 +- + fs/btrfs/check-integrity.c | 172 +++-- + fs/btrfs/check-integrity.h | 6 +- + fs/btrfs/compression.c | 36 +- + fs/btrfs/ctree.c | 100 ++- + fs/btrfs/ctree.h | 120 +++- + fs/btrfs/delalloc-space.c | 9 +- + fs/btrfs/dev-replace.c | 52 +- + fs/btrfs/dir-item.c | 31 +- + fs/btrfs/disk-io.c | 71 +- + fs/btrfs/disk-io.h | 4 +- + fs/btrfs/extent-tree.c | 9 +- + fs/btrfs/extent_io.c | 441 ++++++------ + fs/btrfs/extent_io.h | 7 +- + fs/btrfs/file.c | 280 +++----- + fs/btrfs/free-space-cache.c | 7 +- + fs/btrfs/inode.c | 1565 ++++++++++++++++++++++--------------------- + fs/btrfs/ioctl.c | 239 +++---- + fs/btrfs/props.c | 40 +- + fs/btrfs/props.h | 4 - + fs/btrfs/qgroup.c | 7 +- + fs/btrfs/qgroup.h | 12 +- + fs/btrfs/raid56.c | 782 ++++++++++++--------- + fs/btrfs/raid56.h | 9 +- + fs/btrfs/reflink.c | 23 +- + fs/btrfs/relocation.c | 19 +- + fs/btrfs/root-tree.c | 3 +- + fs/btrfs/scrub.c | 783 +++++++++++----------- + fs/btrfs/send.c | 227 ++----- + fs/btrfs/space-info.c | 11 +- + fs/btrfs/space-info.h | 6 + + fs/btrfs/subpage.c | 55 +- + fs/btrfs/subpage.h | 2 + + fs/btrfs/super.c | 6 +- + fs/btrfs/sysfs.c | 43 +- + fs/btrfs/tree-checker.c | 55 ++ + fs/btrfs/tree-checker.h | 1 + + fs/btrfs/tree-log.c | 12 +- + fs/btrfs/volumes.c | 93 +-- + fs/btrfs/volumes.h | 11 +- + fs/btrfs/xattr.c | 40 +- + fs/btrfs/zoned.c | 27 + + fs/btrfs/zoned.h | 12 +- + include/linux/fs.h | 5 + + 45 files changed, 2856 insertions(+), 2687 deletions(-) +Merging ceph/master (c4ffd8a5eb94 ceph: remove incorrect session state check) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'ort' strategy. + fs/ceph/caps.c | 3 +++ + fs/ceph/mds_client.c | 6 ------ + net/ceph/osd_client.c | 6 +++++- + 3 files changed, 8 insertions(+), 7 deletions(-) +Merging cifs/for-next (9339faac6d20 cifs: Use kzalloc instead of kmalloc/memset) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/cifs/transport.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Already up to date. +Merging erofs/dev (a1108dcd9373 erofs: rename ctime to mtime) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (1d404b899e32 exfat: reduce block requests when zeroing a cluster) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + block/bdev.c | 7 +++++++ + fs/exfat/exfat_fs.h | 1 + + fs/exfat/fatent.c | 41 +++++++++++++++++------------------------ + fs/exfat/misc.c | 10 ++++++++-- + fs/exfat/namei.c | 27 +-------------------------- + fs/exfat/super.c | 9 ++++++++- + include/linux/blkdev.h | 1 + + 7 files changed, 43 insertions(+), 53 deletions(-) +Merging ext3/for_next (f06e95c3a4ca Merge fsnotify cleanup from Bang Li.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. +Merging ext4/dev (c7cded845fc1 ext4: truncate during setxattr leads to kernel panic) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/super.c +Merge made by the 'ort' strategy. + fs/ext4/ext4.h | 2 +- + fs/ext4/extents.c | 32 +++++++++++++++++++++++++------- + fs/ext4/inode.c | 7 ++++++- + fs/ext4/super.c | 1 + + fs/ext4/xattr.c | 34 ++++++++++++++++++++++++++++++++-- + 5 files changed, 65 insertions(+), 11 deletions(-) +Merging f2fs/dev (bf628ee7b054 fs: f2fs: remove WARN_ON in f2fs_is_valid_blkaddr) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'ort' strategy. + Documentation/filesystems/f2fs.rst | 70 ------------------ + fs/f2fs/checkpoint.c | 12 +-- + fs/f2fs/data.c | 33 ++++++--- + fs/f2fs/f2fs.h | 29 ++++---- + fs/f2fs/file.c | 58 +++++++++++++-- + fs/f2fs/gc.c | 82 ++++++++++++++++++--- + fs/f2fs/namei.c | 10 ++- + fs/f2fs/node.c | 2 + + fs/f2fs/segment.c | 147 ++++++++----------------------------- + fs/f2fs/segment.h | 3 + + fs/f2fs/super.c | 32 +------- + include/trace/events/f2fs.h | 94 ++++++++++++++++++++++++ + 12 files changed, 302 insertions(+), 270 deletions(-) +Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Already up to date. +Merging fuse/for-next (0c4bcfdecb1a fuse: fix pipe buffer lifetime for direct_io) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Already up to date. +Merging gfs2/for-next (1b2de0791571 gfs2: Mark the remaining process-independent glock holders as GL_NOPID) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + fs/gfs2/file.c | 7 +++++-- + fs/gfs2/glock.c | 39 +++++++++++++++++++++++++++++---------- + fs/gfs2/glock.h | 1 + + fs/gfs2/inode.c | 7 +++++-- + fs/gfs2/lops.c | 5 +++-- + fs/gfs2/ops_fstype.c | 14 ++++++++------ + fs/gfs2/quota.c | 13 +++++-------- + fs/gfs2/recovery.c | 22 ++++++++++------------ + fs/gfs2/super.c | 3 ++- + fs/gfs2/util.c | 5 +++-- + 10 files changed, 71 insertions(+), 45 deletions(-) +Merging jfs/jfs-next (a53046291020 jfs: prevent NULL deref in diFree) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (02655a70b7cc ksmbd: set fixed sector size to FS_SECTOR_SIZE_INFORMATION) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + fs/ksmbd/misc.c | 40 +++++++++++++++++++++++++++++++--------- + fs/ksmbd/misc.h | 3 ++- + fs/ksmbd/oplock.c | 30 ------------------------------ + fs/ksmbd/oplock.h | 2 -- + fs/ksmbd/smb2pdu.c | 34 ++++++++++++++++------------------ + fs/ksmbd/vfs.c | 6 ++---- + fs/ksmbd/vfs_cache.c | 2 +- + fs/ksmbd/vfs_cache.h | 1 - + 8 files changed, 52 insertions(+), 66 deletions(-) +Merging nfs/linux-next (ff053dbbaffe SUNRPC: Move the call to xprt_send_pagedata() out of xprt_sock_sendmsg()) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (d19e0183a883 NFS: Do not report writeback errors in nfs_getattr()) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/for-next (5c2cb3833940 SUNRPC: Remove svc_rqst::rq_xprt_hlen) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Merge made by the 'ort' strategy. + fs/nfsd/vfs.c | 10 ++-------- + include/linux/sunrpc/cache.h | 8 ++++---- + include/linux/sunrpc/svc.h | 2 -- + include/trace/events/sunrpc.h | 12 +++++------- + net/sunrpc/cache.c | 18 +++++++++++++++++- + net/sunrpc/debugfs.c | 3 +++ + net/sunrpc/fail.h | 2 +- + net/sunrpc/svc_xprt.c | 10 ++++------ + net/sunrpc/svcsock.c | 11 ----------- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 1 - + 10 files changed, 36 insertions(+), 41 deletions(-) +Merging ntfs3/master (52e00ea6b26e fs/ntfs3: Update valid size if -EIOCBQUEUED) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/inode.c +Merge made by the 'ort' strategy. + fs/ntfs3/file.c | 12 +++-- + fs/ntfs3/frecord.c | 10 ++-- + fs/ntfs3/fslog.c | 6 ++- + fs/ntfs3/inode.c | 8 +++- + fs/ntfs3/xattr.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++------- + 5 files changed, 145 insertions(+), 27 deletions(-) +Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (94fd19752b28 ovl: don't fail copy up if no fileattr support on upper) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (705757274599 ubifs: rename_whiteout: correct old_dir size computing) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (22e424feb665 Revert "fs/9p: search open fids first") +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging xfs/for-next (ce522ba9ef7e Linux 5.18-rc2) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Already up to date. +Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Auto-merging fs/zonefs/super.c +CONFLICT (content): Merge conflict in fs/zonefs/super.c +Resolved 'fs/zonefs/super.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f1042873736c] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git +$ git diff -M --stat --summary HEAD^.. +Merging iomap/iomap-for-next (ebb7fb1557b1 xfs, iomap: limit individual ioend chain lengths in writeback) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (80d8e4d3f313 fs/locks: fix fcntl_getlk64/fcntl_setlk64 stub prototypes) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. +Merging vfs/for-next (fd78f28f9f50 Merge branch 'work.namei' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging fs/internal.h +Auto-merging fs/namei.c +Auto-merging fs/namespace.c +Auto-merging fs/namespace.c +Auto-merging fs/nfs/nfs4file.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + arch/alpha/kernel/osf_sys.c | 1 + + fs/fsopen.c | 4 ++-- + fs/internal.h | 1 + + fs/namei.c | 11 ++--------- + fs/namespace.c | 13 ++++--------- + fs/nfs/nfs4file.c | 4 ++-- + include/linux/fs.h | 11 ----------- + include/linux/mount.h | 29 +++++++++++++++++------------ + kernel/usermode_driver.c | 4 ++-- + security/smack/smackfs.c | 1 + + 10 files changed, 32 insertions(+), 47 deletions(-) +Merging printk/for-next (84d7df104dba Merge branch 'for-5.19' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/core-api/index.rst | 1 + + Documentation/core-api/printk-index.rst | 137 ++++++++++++++++++++++++++++++++ + MAINTAINERS | 2 + + 3 files changed, 140 insertions(+) + create mode 100644 Documentation/core-api/printk-index.rst +Merging pci/next (89905ffa4545 Merge branch 'remotes/lorenzo/pci/rockchip') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/pci/layerscape-pci.txt | 65 +++++++++++++--------- + .../devicetree/bindings/pci/qcom,pcie.txt | 5 +- + arch/x86/include/asm/e820/api.h | 5 ++ + arch/x86/kernel/resource.c | 25 ++++++--- + arch/x86/pci/acpi.c | 5 ++ + drivers/pci/controller/cadence/pcie-cadence-ep.c | 3 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 3 +- + drivers/pci/controller/dwc/pcie-qcom.c | 15 +++-- + drivers/pci/controller/dwc/pcie-tegra194.c | 9 --- + drivers/pci/controller/pcie-mediatek.c | 1 + + drivers/pci/controller/pcie-rockchip-ep.c | 3 +- + drivers/pci/hotplug/pnv_php.c | 1 + + drivers/pci/hotplug/rpadlpar_core.c | 1 + + drivers/pci/hotplug/rpaphp_core.c | 2 + + drivers/pci/hotplug/rpaphp_pci.c | 1 + + drivers/pci/hotplug/rpaphp_slot.c | 1 + + drivers/pci/p2pdma.c | 25 +++++---- + drivers/pci/pci-acpi.c | 41 ++++++++++---- + drivers/pci/pci-driver.c | 10 ++-- + drivers/pci/quirks.c | 47 ++++++++++++++++ + 20 files changed, 185 insertions(+), 83 deletions(-) +Merging pstore/for-next/pstore (8126b1c73108 pstore: Don't use semaphores in always-atomic-context code) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (e668210e6244 Merge branch 'for-5.18/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 - + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-multitouch.c | 6 +++ + drivers/hid/hid-uclogic-core.c | 83 ++++++++++++++++++++++-------- + drivers/hid/hid-uclogic-params.c | 40 ++++++++++++--- + drivers/hid/hid-uclogic-params.h | 90 ++++++++++++++++++++++++++++++--- + drivers/hid/hid-uclogic-rdesc.c | 65 +++++++++++++++++++++--- + drivers/hid/hid-uclogic-rdesc.h | 20 ++++++-- + drivers/hid/intel-ish-hid/ipc/hw-ish.h | 2 + + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 2 + + 10 files changed, 261 insertions(+), 49 deletions(-) +Merging i2c/i2c/for-next (05b42eff61a5 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/i2c/qcom,i2c-qup.txt | 40 -------- + .../devicetree/bindings/i2c/qcom,i2c-qup.yaml | 89 +++++++++++++++++ + drivers/i2c/busses/i2c-meson.c | 111 +++++++++++++++------ + drivers/i2c/busses/i2c-rcar.c | 31 +++++- + 4 files changed, 198 insertions(+), 73 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/i2c/qcom,i2c-qup.txt + create mode 100644 Documentation/devicetree/bindings/i2c/qcom,i2c-qup.yaml +Merging i3c/i3c/next (6cbf8b38dfe3 i3c: fix uninitialized variable use in i2c setup) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (a1872eb1a376 hwmon: (intel-m10-bmc-hwmon) use devm_hwmon_sanitize_name()) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Merge made by the 'ort' strategy. + Documentation/hwmon/aquacomputer_d5next.rst | 4 + + Documentation/hwmon/hwmon-kernel-api.rst | 16 + + drivers/hwmon/Kconfig | 8 +- + drivers/hwmon/aquacomputer_d5next.c | 433 ++++++++++++++++++++++++---- + drivers/hwmon/asus-ec-sensors.c | 3 +- + drivers/hwmon/hwmon.c | 53 ++++ + drivers/hwmon/intel-m10-bmc-hwmon.c | 11 +- + drivers/hwmon/jc42.c | 2 + + drivers/hwmon/peci/dimmtemp.c | 13 +- + include/linux/hwmon.h | 3 + + 10 files changed, 475 insertions(+), 71 deletions(-) +Merging jc_docs/docs-next (6c757e9f55f0 docs/scheduler: fix unit error) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.rst | 11 +- + Documentation/admin-guide/kernel-parameters.txt | 318 ++++++++------- + Documentation/dev-tools/testing-overview.rst | 63 +++ + Documentation/doc-guide/kernel-doc.rst | 2 + + Documentation/doc-guide/sphinx.rst | 5 +- + Documentation/driver-api/thermal/intel_dptf.rst | 2 +- + Documentation/fault-injection/fault-injection.rst | 14 +- + Documentation/kernel-hacking/hacking.rst | 36 +- + Documentation/kernel-hacking/locking.rst | 5 +- + .../process/embargoed-hardware-issues.rst | 2 +- + Documentation/process/submitting-patches.rst | 5 +- + Documentation/scheduler/sched-stats.rst | 8 +- + .../zh_CN/admin-guide/mm/damon/reclaim.rst | 4 +- + .../zh_CN/admin-guide/mm/damon/usage.rst | 291 +++++++++++++- + Documentation/translations/zh_CN/index.rst | 2 +- + Documentation/translations/zh_CN/locking/index.rst | 42 ++ + .../translations/zh_CN/locking/spinlocks.rst | 149 +++++++ + Documentation/translations/zh_CN/process/howto.rst | 2 +- + .../translations/zh_CN/scheduler/index.rst | 2 + + .../translations/zh_CN/scheduler/sched-debug.rst | 51 +++ + .../translations/zh_CN/scheduler/schedutil.rst | 165 ++++++++ + .../translations/zh_CN/vm/damon/design.rst | 7 +- + Documentation/translations/zh_CN/vm/frontswap.rst | 196 +++++++++ + .../translations/zh_CN/vm/hugetlbfs_reserv.rst | 436 +++++++++++++++++++++ + Documentation/translations/zh_CN/vm/hwpoison.rst | 166 ++++++++ + Documentation/translations/zh_CN/vm/index.rst | 25 +- + .../translations/zh_CN/vm/memory-model.rst | 135 +++++++ + .../translations/zh_CN/vm/mmu_notifier.rst | 97 +++++ + .../zh_CN/vm/overcommit-accounting.rst | 86 ++++ + Documentation/translations/zh_CN/vm/page_frags.rst | 38 ++ + Documentation/translations/zh_CN/vm/page_owner.rst | 116 ++++++ + .../translations/zh_CN/vm/page_table_check.rst | 56 +++ + .../translations/zh_CN/vm/remap_file_pages.rst | 32 ++ + .../zh_CN/vm/split_page_table_lock.rst | 96 +++++ + Documentation/translations/zh_CN/vm/z3fold.rst | 31 ++ + Documentation/translations/zh_CN/vm/zsmalloc.rst | 78 ++++ + Documentation/vm/arch_pgtable_helpers.rst | 10 +- + Documentation/w1/slaves/w1_therm.rst | 9 +- + Documentation/x86/exception-tables.rst | 23 +- + 39 files changed, 2579 insertions(+), 237 deletions(-) + create mode 100644 Documentation/translations/zh_CN/locking/index.rst + create mode 100644 Documentation/translations/zh_CN/locking/spinlocks.rst + create mode 100644 Documentation/translations/zh_CN/scheduler/sched-debug.rst + create mode 100644 Documentation/translations/zh_CN/scheduler/schedutil.rst + create mode 100644 Documentation/translations/zh_CN/vm/frontswap.rst + create mode 100644 Documentation/translations/zh_CN/vm/hugetlbfs_reserv.rst + create mode 100644 Documentation/translations/zh_CN/vm/hwpoison.rst + create mode 100644 Documentation/translations/zh_CN/vm/memory-model.rst + create mode 100644 Documentation/translations/zh_CN/vm/mmu_notifier.rst + create mode 100644 Documentation/translations/zh_CN/vm/overcommit-accounting.rst + create mode 100644 Documentation/translations/zh_CN/vm/page_frags.rst + create mode 100644 Documentation/translations/zh_CN/vm/page_owner.rst + create mode 100644 Documentation/translations/zh_CN/vm/page_table_check.rst + create mode 100644 Documentation/translations/zh_CN/vm/remap_file_pages.rst + create mode 100644 Documentation/translations/zh_CN/vm/split_page_table_lock.rst + create mode 100644 Documentation/translations/zh_CN/vm/z3fold.rst + create mode 100644 Documentation/translations/zh_CN/vm/zsmalloc.rst +Merging v4l-dvb/master (3d59142ad94c media: dvb-usb: dib0700_devices: use an enum for the device number) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (3d59142ad94c media: dvb-usb: dib0700_devices: use an enum for the device number) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (5675fd487f2b Merge branch 'thermal-misc' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging drivers/pci/pci-acpi.c +Merge made by the 'ort' strategy. + Documentation/firmware-guide/acpi/enumeration.rst | 3 +- + Documentation/power/energy-model.rst | 24 ++- + arch/x86/kernel/acpi/boot.c | 2 +- + arch/x86/kernel/cpu/mce/apei.c | 8 +- + drivers/acpi/acpica/acapps.h | 4 +- + drivers/acpi/acpica/accommon.h | 2 +- + drivers/acpi/acpica/acconvert.h | 2 +- + drivers/acpi/acpica/acdebug.h | 2 +- + drivers/acpi/acpica/acdispat.h | 2 +- + drivers/acpi/acpica/acevents.h | 2 +- + drivers/acpi/acpica/acglobal.h | 2 +- + drivers/acpi/acpica/achware.h | 2 +- + drivers/acpi/acpica/acinterp.h | 2 +- + drivers/acpi/acpica/aclocal.h | 2 +- + drivers/acpi/acpica/acmacros.h | 2 +- + drivers/acpi/acpica/acnamesp.h | 2 +- + drivers/acpi/acpica/acobject.h | 2 +- + drivers/acpi/acpica/acopcode.h | 2 +- + drivers/acpi/acpica/acparser.h | 2 +- + drivers/acpi/acpica/acpredef.h | 2 +- + drivers/acpi/acpica/acresrc.h | 2 +- + drivers/acpi/acpica/acstruct.h | 2 +- + drivers/acpi/acpica/actables.h | 2 +- + drivers/acpi/acpica/acutils.h | 2 +- + drivers/acpi/acpica/amlcode.h | 2 +- + drivers/acpi/acpica/amlresrc.h | 2 +- + drivers/acpi/acpica/dbhistry.c | 2 +- + drivers/acpi/acpica/dsargs.c | 2 +- + drivers/acpi/acpica/dscontrol.c | 2 +- + drivers/acpi/acpica/dsdebug.c | 2 +- + drivers/acpi/acpica/dsfield.c | 2 +- + drivers/acpi/acpica/dsinit.c | 2 +- + drivers/acpi/acpica/dsmethod.c | 2 +- + drivers/acpi/acpica/dsobject.c | 2 +- + drivers/acpi/acpica/dsopcode.c | 2 +- + drivers/acpi/acpica/dspkginit.c | 2 +- + drivers/acpi/acpica/dswexec.c | 4 +- + drivers/acpi/acpica/dswload.c | 2 +- + drivers/acpi/acpica/dswload2.c | 2 +- + drivers/acpi/acpica/dswscope.c | 2 +- + drivers/acpi/acpica/dswstate.c | 2 +- + drivers/acpi/acpica/evevent.c | 2 +- + drivers/acpi/acpica/evglock.c | 2 +- + drivers/acpi/acpica/evgpe.c | 2 +- + drivers/acpi/acpica/evgpeblk.c | 2 +- + drivers/acpi/acpica/evgpeinit.c | 2 +- + drivers/acpi/acpica/evgpeutil.c | 2 +- + drivers/acpi/acpica/evhandler.c | 2 +- + drivers/acpi/acpica/evmisc.c | 2 +- + drivers/acpi/acpica/evregion.c | 2 +- + drivers/acpi/acpica/evrgnini.c | 2 +- + drivers/acpi/acpica/evxface.c | 2 +- + drivers/acpi/acpica/evxfevnt.c | 2 +- + drivers/acpi/acpica/evxfgpe.c | 2 +- + drivers/acpi/acpica/evxfregn.c | 2 +- + drivers/acpi/acpica/exconcat.c | 2 +- + drivers/acpi/acpica/exconfig.c | 61 ++++--- + drivers/acpi/acpica/exconvrt.c | 2 +- + drivers/acpi/acpica/excreate.c | 2 +- + drivers/acpi/acpica/exdebug.c | 2 +- + drivers/acpi/acpica/exdump.c | 2 +- + drivers/acpi/acpica/exfield.c | 2 +- + drivers/acpi/acpica/exfldio.c | 4 +- + drivers/acpi/acpica/exmisc.c | 2 +- + drivers/acpi/acpica/exmutex.c | 2 +- + drivers/acpi/acpica/exnames.c | 2 +- + drivers/acpi/acpica/exoparg1.c | 23 ++- + drivers/acpi/acpica/exoparg2.c | 2 +- + drivers/acpi/acpica/exoparg3.c | 2 +- + drivers/acpi/acpica/exoparg6.c | 2 +- + drivers/acpi/acpica/exprep.c | 2 +- + drivers/acpi/acpica/exregion.c | 2 +- + drivers/acpi/acpica/exresnte.c | 2 +- + drivers/acpi/acpica/exresolv.c | 2 +- + drivers/acpi/acpica/exresop.c | 2 +- + drivers/acpi/acpica/exserial.c | 2 +- + drivers/acpi/acpica/exstore.c | 2 +- + drivers/acpi/acpica/exstoren.c | 2 +- + drivers/acpi/acpica/exstorob.c | 2 +- + drivers/acpi/acpica/exsystem.c | 40 +++-- + drivers/acpi/acpica/extrace.c | 2 +- + drivers/acpi/acpica/exutils.c | 2 +- + drivers/acpi/acpica/hwacpi.c | 2 +- + drivers/acpi/acpica/hwesleep.c | 2 +- + drivers/acpi/acpica/hwgpe.c | 2 +- + drivers/acpi/acpica/hwregs.c | 2 +- + drivers/acpi/acpica/hwsleep.c | 2 +- + drivers/acpi/acpica/hwtimer.c | 2 +- + drivers/acpi/acpica/hwvalid.c | 2 +- + drivers/acpi/acpica/hwxface.c | 2 +- + drivers/acpi/acpica/hwxfsleep.c | 2 +- + drivers/acpi/acpica/nsarguments.c | 2 +- + drivers/acpi/acpica/nsconvert.c | 2 +- + drivers/acpi/acpica/nsdump.c | 2 +- + drivers/acpi/acpica/nsdumpdv.c | 2 +- + drivers/acpi/acpica/nsinit.c | 2 +- + drivers/acpi/acpica/nsload.c | 2 +- + drivers/acpi/acpica/nsparse.c | 2 +- + drivers/acpi/acpica/nspredef.c | 2 +- + drivers/acpi/acpica/nsprepkg.c | 2 +- + drivers/acpi/acpica/nsrepair.c | 2 +- + drivers/acpi/acpica/nsrepair2.c | 2 +- + drivers/acpi/acpica/nsutils.c | 2 +- + drivers/acpi/acpica/nswalk.c | 2 +- + drivers/acpi/acpica/nsxfname.c | 2 +- + drivers/acpi/acpica/psargs.c | 2 +- + drivers/acpi/acpica/psloop.c | 2 +- + drivers/acpi/acpica/psobject.c | 2 +- + drivers/acpi/acpica/psopcode.c | 6 +- + drivers/acpi/acpica/psopinfo.c | 2 +- + drivers/acpi/acpica/psparse.c | 2 +- + drivers/acpi/acpica/psscope.c | 2 +- + drivers/acpi/acpica/pstree.c | 2 +- + drivers/acpi/acpica/psutils.c | 2 +- + drivers/acpi/acpica/pswalk.c | 2 +- + drivers/acpi/acpica/psxface.c | 2 +- + drivers/acpi/acpica/tbdata.c | 2 +- + drivers/acpi/acpica/tbfadt.c | 2 +- + drivers/acpi/acpica/tbfind.c | 2 +- + drivers/acpi/acpica/tbinstal.c | 2 +- + drivers/acpi/acpica/tbprint.c | 2 +- + drivers/acpi/acpica/tbutils.c | 2 +- + drivers/acpi/acpica/tbxface.c | 2 +- + drivers/acpi/acpica/tbxfload.c | 2 +- + drivers/acpi/acpica/tbxfroot.c | 2 +- + drivers/acpi/acpica/utaddress.c | 2 +- + drivers/acpi/acpica/utalloc.c | 2 +- + drivers/acpi/acpica/utascii.c | 2 +- + drivers/acpi/acpica/utbuffer.c | 2 +- + drivers/acpi/acpica/utcache.c | 2 +- + drivers/acpi/acpica/utcopy.c | 2 +- + drivers/acpi/acpica/utdebug.c | 2 +- + drivers/acpi/acpica/utdecode.c | 2 +- + drivers/acpi/acpica/uteval.c | 2 +- + drivers/acpi/acpica/utglobal.c | 2 +- + drivers/acpi/acpica/uthex.c | 2 +- + drivers/acpi/acpica/utids.c | 2 +- + drivers/acpi/acpica/utinit.c | 2 +- + drivers/acpi/acpica/utlock.c | 2 +- + drivers/acpi/acpica/utobject.c | 2 +- + drivers/acpi/acpica/utosi.c | 3 +- + drivers/acpi/acpica/utpredef.c | 2 +- + drivers/acpi/acpica/utprint.c | 2 +- + drivers/acpi/acpica/uttrack.c | 2 +- + drivers/acpi/acpica/utuuid.c | 2 +- + drivers/acpi/acpica/utxface.c | 2 +- + drivers/acpi/acpica/utxfinit.c | 2 +- + drivers/acpi/apei/erst-dbg.c | 3 +- + drivers/acpi/apei/erst.c | 77 ++++++++- + drivers/acpi/bus.c | 6 + + drivers/acpi/device_pm.c | 72 +++++--- + drivers/acpi/pci_root.c | 2 + + drivers/acpi/property.c | 54 ++++-- + drivers/acpi/spcr.c | 1 + + drivers/acpi/sysfs.c | 25 ++- + drivers/base/power/common.c | 8 +- + drivers/base/power/runtime.c | 53 ++++-- + drivers/base/property.c | 185 ++++++++++----------- + drivers/cpufreq/cpufreq_governor.c | 20 ++- + drivers/cpufreq/cpufreq_governor.h | 1 + + drivers/cpufreq/intel_pstate.c | 1 + + drivers/cpufreq/mediatek-cpufreq-hw.c | 4 +- + drivers/cpufreq/pasemi-cpufreq.c | 1 - + drivers/cpufreq/pmac32-cpufreq.c | 2 +- + drivers/cpufreq/pmac64-cpufreq.c | 2 +- + drivers/cpufreq/ppc_cbe_cpufreq.c | 1 - + drivers/cpufreq/ppc_cbe_cpufreq_pmi.c | 2 +- + drivers/cpufreq/scmi-cpufreq.c | 4 +- + drivers/cpuidle/cpuidle-psci.c | 46 +++++ + drivers/iio/chemical/scd30.h | 5 +- + drivers/iio/chemical/scd30_core.c | 10 +- + drivers/iio/chemical/scd30_i2c.c | 3 +- + drivers/iio/chemical/scd30_serial.c | 3 +- + drivers/of/property.c | 34 ++++ + drivers/opp/of.c | 6 +- + drivers/pci/pci-acpi.c | 3 + + drivers/powercap/dtpm_cpu.c | 2 +- + drivers/thermal/cpufreq_cooling.c | 2 +- + drivers/thermal/devfreq_cooling.c | 33 ++-- + drivers/thermal/hisi_thermal.c | 6 +- + .../intel/int340x_thermal/int3400_thermal.c | 24 +-- + include/acpi/acbuffer.h | 2 +- + include/acpi/acconfig.h | 2 +- + include/acpi/acexcep.h | 2 +- + include/acpi/acnames.h | 2 +- + include/acpi/acoutput.h | 2 +- + include/acpi/acpi.h | 2 +- + include/acpi/acpi_bus.h | 3 + + include/acpi/acpiosxf.h | 2 +- + include/acpi/acpixf.h | 4 +- + include/acpi/acrestyp.h | 2 +- + include/acpi/actbl.h | 2 +- + include/acpi/actbl1.h | 18 +- + include/acpi/actbl2.h | 175 ++++++++++++++----- + include/acpi/actbl3.h | 2 +- + include/acpi/actypes.h | 19 ++- + include/acpi/acuuid.h | 2 +- + include/acpi/apei.h | 2 + + include/acpi/platform/acenv.h | 2 +- + include/acpi/platform/acenvex.h | 2 +- + include/acpi/platform/acgcc.h | 2 +- + include/acpi/platform/acgccex.h | 2 +- + include/acpi/platform/acintel.h | 2 +- + include/acpi/platform/aclinux.h | 2 +- + include/acpi/platform/aclinuxex.h | 2 +- + include/linux/energy_model.h | 35 +++- + include/linux/fwnode.h | 15 +- + include/linux/pm.h | 14 +- + include/linux/pm_runtime.h | 10 +- + include/linux/property.h | 12 +- + include/linux/suspend.h | 44 ++++- + kernel/power/Makefile | 6 +- + kernel/power/energy_model.c | 63 +++---- + kernel/power/main.c | 29 ---- + kernel/power/process.c | 3 - + kernel/power/snapshot.c | 12 +- + tools/power/acpi/common/cmfsize.c | 2 +- + tools/power/acpi/common/getopt.c | 2 +- + .../acpi/os_specific/service_layers/oslinuxtbl.c | 2 +- + .../acpi/os_specific/service_layers/osunixdir.c | 2 +- + .../acpi/os_specific/service_layers/osunixmap.c | 2 +- + .../acpi/os_specific/service_layers/osunixxf.c | 2 +- + tools/power/acpi/tools/acpidump/acpidump.h | 2 +- + tools/power/acpi/tools/acpidump/apdump.c | 2 +- + tools/power/acpi/tools/acpidump/apfiles.c | 2 +- + tools/power/acpi/tools/acpidump/apmain.c | 2 +- + 226 files changed, 1086 insertions(+), 587 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (f2d9973abd73 cpufreq: mediatek: Enable clocks and regulators) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Auto-merging arch/arm64/boot/dts/nvidia/tegra234.dtsi +Merge made by the 'ort' strategy. + .../arm/tegra/nvidia,tegra-ccplex-cluster.yaml | 52 +++++ + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 7 + + drivers/cpufreq/mediatek-cpufreq.c | 147 ++++++------ + drivers/cpufreq/qcom-cpufreq-hw.c | 62 ++++-- + drivers/cpufreq/tegra194-cpufreq.c | 246 +++++++++++++++++---- + 5 files changed, 402 insertions(+), 112 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra-ccplex-cluster.yaml +Merging cpupower/cpupower (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (5d521a307526 PM / devfreq: rk3399_dmc: Avoid static (reused) profile) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/devfreq/rk3399_dmc.txt | 212 ------------ + .../memory-controllers/rockchip,rk3399-dmc.yaml | 384 +++++++++++++++++++++ + drivers/devfreq/rk3399_dmc.c | 299 +++++++--------- + 3 files changed, 518 insertions(+), 377 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/devfreq/rk3399_dmc.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/rockchip,rk3399-dmc.yaml +Merging opp/opp/linux-next (543256d239b4 PM: opp: simplify with dev_err_probe()) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Auto-merging drivers/opp/of.c +Merge made by the 'ort' strategy. + drivers/opp/core.c | 14 +++++--------- + drivers/opp/of.c | 2 +- + 2 files changed, 6 insertions(+), 10 deletions(-) +Merging thermal/thermal/linux-next (e08277df1e1a thermal/drivers/thermal_of: Add change_mode ops support for thermal_of sensor) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Merge made by the 'ort' strategy. + .../bindings/thermal/qcom-spmi-adc-tm5.yaml | 110 ++++- + .../devicetree/bindings/thermal/qcom-tsens.yaml | 4 +- + .../devicetree/bindings/thermal/rzg2l-thermal.yaml | 1 + + drivers/iio/adc/qcom-vadc-common.c | 11 + + drivers/thermal/broadcom/bcm2711_thermal.c | 5 +- + drivers/thermal/k3_bandgap.c | 5 + + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 486 +++++++++++++++++++-- + drivers/thermal/qcom/tsens.c | 3 + + drivers/thermal/rcar_thermal.c | 17 +- + drivers/thermal/thermal_of.c | 12 + + include/linux/iio/adc/qcom-vadc-common.h | 2 + + include/linux/thermal.h | 3 + + 12 files changed, 609 insertions(+), 50 deletions(-) +Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging dlm/next (e425ac99b157 fs: dlm: cast resource pointer to uintptr_t) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Merge made by the 'ort' strategy. + fs/dlm/dir.c | 2 +- + fs/dlm/dlm_internal.h | 66 +++--- + fs/dlm/lock.c | 620 ++++++++++++++++++++++++++------------------------ + fs/dlm/lockspace.c | 12 + + fs/dlm/lockspace.h | 1 + + fs/dlm/lowcomms.c | 12 +- + fs/dlm/member.c | 11 +- + fs/dlm/midcomms.c | 61 ++--- + fs/dlm/plock.c | 178 +++++++-------- + fs/dlm/rcom.c | 120 +++++----- + fs/dlm/recover.c | 49 ++-- + fs/dlm/requestqueue.c | 20 +- + fs/dlm/user.c | 16 +- + fs/dlm/util.c | 92 +------- + fs/dlm/util.h | 8 +- + 15 files changed, 613 insertions(+), 655 deletions(-) +Merging rdma/for-next (98c8026331ce RDMA/rxe: Remove reliable datagram support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging drivers/infiniband/sw/rdmavt/qp.c +Merge made by the 'ort' strategy. + drivers/infiniband/core/nldev.c | 2 +- + drivers/infiniband/core/sa_query.c | 16 ++-- + drivers/infiniband/core/uverbs_cmd.c | 2 +- + drivers/infiniband/core/verbs.c | 8 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 2 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 1 - + drivers/infiniband/hw/cxgb4/provider.c | 8 +- + drivers/infiniband/hw/hfi1/verbs.c | 4 +- + drivers/infiniband/hw/irdma/hw.c | 4 - + drivers/infiniband/hw/irdma/main.h | 1 - + drivers/infiniband/hw/irdma/puda.c | 7 +- + drivers/infiniband/hw/irdma/verbs.c | 4 +- + drivers/infiniband/hw/mlx4/main.c | 8 +- + drivers/infiniband/hw/mlx5/main.c | 15 ++- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +- + drivers/infiniband/hw/qedr/verbs.c | 3 +- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 11 +-- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 6 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 15 +-- + drivers/infiniband/hw/usnic/usnic_uiom.h | 3 +- + drivers/infiniband/sw/rdmavt/qp.c | 6 +- + drivers/infiniband/sw/rxe/rxe.c | 1 + + drivers/infiniband/sw/rxe/rxe_mw.c | 8 ++ + drivers/infiniband/sw/rxe/rxe_opcode.c | 2 - + drivers/infiniband/sw/rxe/rxe_param.h | 2 - + drivers/infiniband/sw/rxe/rxe_qp.c | 14 +-- + drivers/infiniband/sw/rxe/rxe_recv.c | 1 - + drivers/infiniband/sw/rxe/rxe_req.c | 4 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 5 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 1 - + drivers/infiniband/sw/rxe/rxe_verbs.h | 2 - + drivers/infiniband/sw/siw/siw_verbs.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 1 + + drivers/infiniband/ulp/ipoib/ipoib_main.c | 5 +- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 6 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 2 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 8 +- + drivers/infiniband/ulp/isert/ib_isert.c | 2 +- + drivers/infiniband/ulp/srp/ib_srp.c | 8 +- + drivers/nvme/host/rdma.c | 4 +- + drivers/nvme/target/rdma.c | 4 +- + fs/cifs/smbdirect.c | 2 +- + include/rdma/ib_verbs.h | 136 +++++++++++++++------------ + include/rdma/opa_vnic.h | 3 +- + include/uapi/rdma/ib_user_verbs.h | 42 +++++++++ + net/rds/ib.c | 4 +- + net/sunrpc/xprtrdma/frwr_ops.c | 2 +- + 47 files changed, 214 insertions(+), 187 deletions(-) +Merging net-next/master (a997157e42e3 docs: net: dsa: describe issues with checksum offload) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Auto-merging MAINTAINERS +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/net/ethernet/microchip/lan966x/lan966x_main.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/microchip/lan966x/lan966x_main.c +Auto-merging include/rdma/ib_verbs.h +Auto-merging net/can/isotp.c +Auto-merging net/ipv6/route.c +Auto-merging net/packet/af_packet.c +Auto-merging net/sunrpc/svcsock.c +Recorded preimage for 'drivers/net/ethernet/microchip/lan966x/lan966x_main.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/net/ethernet/microchip/lan966x/lan966x_main.c'. +[master f474dfacac3f] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + .../arm/mediatek/mediatek,mt7622-pcie-mirror.yaml | 42 + + .../bindings/arm/mediatek/mediatek,mt7622-wed.yaml | 50 + + .../devicetree/bindings/net/mediatek-net.txt | 10 + + .../devicetree/bindings/net/mscc,miim.yaml | 61 + + .../devicetree/bindings/net/mscc-miim.txt | 26 - + .../networking/device_drivers/ethernet/index.rst | 1 + + .../device_drivers/ethernet/marvell/octeon_ep.rst | 35 + + .../networking/devlink/devlink-linecard.rst | 122 + + Documentation/networking/devlink/index.rst | 1 + + Documentation/networking/dsa/dsa.rst | 17 + + Documentation/networking/ethtool-netlink.rst | 8 + + Documentation/networking/ip-sysctl.rst | 27 + + MAINTAINERS | 7 + + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 32 +- + arch/arm64/include/asm/insn.h | 9 + + arch/arm64/lib/insn.c | 67 +- + arch/arm64/net/bpf_jit.h | 17 + + arch/arm64/net/bpf_jit_comp.c | 255 ++- + arch/mips/configs/gpr_defconfig | 2 - + arch/mips/configs/mtx1_defconfig | 2 - + drivers/atm/Kconfig | 25 - + drivers/atm/Makefile | 1 - + drivers/atm/ambassador.c | 2400 -------------------- + drivers/atm/ambassador.h | 648 ------ + drivers/infiniband/core/device.c | 2 - + .../infiniband/core/uverbs_std_types_flow_action.c | 383 +--- + drivers/infiniband/hw/mlx5/fs.c | 223 +- + drivers/infiniband/hw/mlx5/main.c | 31 - + drivers/isdn/mISDN/socket.c | 2 +- + drivers/net/dsa/mt7530.c | 330 ++- + drivers/net/dsa/mt7530.h | 26 +- + drivers/net/dsa/qca8k.c | 145 +- + drivers/net/dsa/qca8k.h | 12 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 10 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 304 ++- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 16 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 191 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h | 16 +- + drivers/net/ethernet/cadence/macb_main.c | 22 +- + drivers/net/ethernet/calxeda/xgmac.c | 2 +- + .../ethernet/chelsio/inline_crypto/chtls/chtls.h | 2 +- + .../chelsio/inline_crypto/chtls/chtls_io.c | 22 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 33 +- + drivers/net/ethernet/ibm/ibmvnic.c | 310 ++- + drivers/net/ethernet/ibm/ibmvnic.h | 54 +- + drivers/net/ethernet/intel/i40e/i40e.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_common.c | 1 + + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 5 +- + drivers/net/ethernet/intel/i40e/i40e_devids.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 + + drivers/net/ethernet/intel/i40e/i40e_main.c | 25 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 49 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 + + drivers/net/ethernet/intel/ice/ice_main.c | 4 +- + drivers/net/ethernet/intel/ice/ice_switch.c | 489 ++-- + drivers/net/ethernet/intel/ice/ice_switch.h | 12 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 29 +- + drivers/net/ethernet/marvell/Kconfig | 2 + + drivers/net/ethernet/marvell/Makefile | 1 + + drivers/net/ethernet/marvell/mvneta.c | 20 +- + drivers/net/ethernet/marvell/octeon_ep/Kconfig | 20 + + drivers/net/ethernet/marvell/octeon_ep/Makefile | 9 + + .../net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c | 737 ++++++ + .../net/ethernet/marvell/octeon_ep/octep_config.h | 204 ++ + .../ethernet/marvell/octeon_ep/octep_ctrl_mbox.c | 245 ++ + .../ethernet/marvell/octeon_ep/octep_ctrl_mbox.h | 170 ++ + .../ethernet/marvell/octeon_ep/octep_ctrl_net.c | 194 ++ + .../ethernet/marvell/octeon_ep/octep_ctrl_net.h | 299 +++ + .../net/ethernet/marvell/octeon_ep/octep_ethtool.c | 463 ++++ + .../net/ethernet/marvell/octeon_ep/octep_main.c | 1176 ++++++++++ + .../net/ethernet/marvell/octeon_ep/octep_main.h | 357 +++ + .../marvell/octeon_ep/octep_regs_cn9k_pf.h | 367 +++ + drivers/net/ethernet/marvell/octeon_ep/octep_rx.c | 508 +++++ + drivers/net/ethernet/marvell/octeon_ep/octep_rx.h | 199 ++ + drivers/net/ethernet/marvell/octeon_ep/octep_tx.c | 335 +++ + drivers/net/ethernet/marvell/octeon_ep/octep_tx.h | 284 +++ + .../net/ethernet/marvell/prestera/prestera_acl.c | 7 - + .../ethernet/marvell/prestera/prestera_flower.c | 18 + + .../ethernet/marvell/prestera/prestera_router.c | 11 +- + drivers/net/ethernet/mediatek/Kconfig | 4 + + drivers/net/ethernet/mediatek/Makefile | 5 + + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 131 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 14 +- + drivers/net/ethernet/mediatek/mtk_ppe.c | 369 ++- + drivers/net/ethernet/mediatek/mtk_ppe.h | 89 +- + drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c | 1 - + drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 189 +- + drivers/net/ethernet/mediatek/mtk_wed.c | 878 +++++++ + drivers/net/ethernet/mediatek/mtk_wed.h | 135 ++ + drivers/net/ethernet/mediatek/mtk_wed_debugfs.c | 175 ++ + drivers/net/ethernet/mediatek/mtk_wed_ops.c | 8 + + drivers/net/ethernet/mediatek/mtk_wed_regs.h | 251 ++ + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 58 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 12 +- + .../net/ethernet/mellanox/mlx5/core/accel/accel.h | 36 - + .../net/ethernet/mellanox/mlx5/core/accel/ipsec.c | 179 -- + .../net/ethernet/mellanox/mlx5/core/accel/ipsec.h | 96 - + .../mellanox/mlx5/core/accel/ipsec_offload.h | 38 - + .../net/ethernet/mellanox/mlx5/core/accel/tls.c | 125 - + .../net/ethernet/mellanox/mlx5/core/accel/tls.h | 156 -- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 1 - + .../net/ethernet/mellanox/mlx5/core/en/params.c | 19 +- + .../mellanox/mlx5/core/en_accel/en_accel.h | 11 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 30 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 31 +- + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 5 +- + .../mellanox/mlx5/core/en_accel/ipsec_fs.h | 7 +- + .../mlx5/core/{accel => en_accel}/ipsec_offload.c | 95 +- + .../mellanox/mlx5/core/en_accel/ipsec_offload.h | 14 + + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 245 +- + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 3 - + .../mellanox/mlx5/core/en_accel/ipsec_stats.c | 63 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.c | 71 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 86 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 2 +- + .../core/en_accel/{tls_stats.c => ktls_stats.c} | 51 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 20 +- + .../mellanox/mlx5/core/en_accel/ktls_txrx.h | 28 +- + .../mellanox/mlx5/core/en_accel/ktls_utils.h | 1 - + .../net/ethernet/mellanox/mlx5/core/en_accel/tls.c | 247 -- + .../net/ethernet/mellanox/mlx5/core/en_accel/tls.h | 132 -- + .../mellanox/mlx5/core/en_accel/tls_rxtx.c | 390 ---- + .../mellanox/mlx5/core/en_accel/tls_rxtx.h | 91 - + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 24 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 61 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 1 - + .../net/ethernet/mellanox/mlx5/core/fpga/core.h | 3 - + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.c | 1582 ------------- + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.h | 62 - + drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c | 622 ----- + drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.h | 74 - + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 2 - + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 15 +- + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 18 +- + drivers/net/ethernet/mellanox/mlxsw/Makefile | 3 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 56 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 62 +- + drivers/net/ethernet/mellanox/mlxsw/core_env.c | 476 ++-- + drivers/net/ethernet/mellanox/mlxsw/core_env.h | 43 +- + drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 227 +- + .../net/ethernet/mellanox/mlxsw/core_linecards.c | 1005 ++++++++ + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 176 +- + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 39 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 459 +++- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 282 ++- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 10 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 35 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 35 +- + drivers/net/ethernet/mellanox/mlxsw/trap.h | 6 + + drivers/net/ethernet/microchip/lan966x/Makefile | 2 +- + .../net/ethernet/microchip/lan966x/lan966x_fdma.c | 842 +++++++ + .../net/ethernet/microchip/lan966x/lan966x_main.c | 58 +- + .../net/ethernet/microchip/lan966x/lan966x_main.h | 117 + + .../net/ethernet/microchip/lan966x/lan966x_port.c | 3 + + .../net/ethernet/microchip/lan966x/lan966x_regs.h | 106 + + .../net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h | 26 +- + .../ethernet/qlogic/qed/qed_nvmetcp_ip_services.c | 4 +- + drivers/net/ethernet/sfc/ef10.c | 2 +- + drivers/net/ethernet/sfc/efx.h | 1 - + drivers/net/ethernet/sfc/efx_channels.c | 52 +- + drivers/net/ethernet/sfc/efx_channels.h | 4 - + drivers/net/ethernet/sfc/efx_common.c | 4 +- + drivers/net/ethernet/sfc/falcon/rx.c | 4 +- + drivers/net/ethernet/sfc/farch.c | 1 + + drivers/net/ethernet/sfc/mcdi_pcol.h | 4 +- + drivers/net/ethernet/sfc/net_driver.h | 5 - + drivers/net/ethernet/sfc/tx.c | 3 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 18 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 24 +- + drivers/net/ethernet/ti/Kconfig | 1 + + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 33 +- + drivers/net/ethernet/ti/am65-cpsw-qos.c | 180 ++ + drivers/net/ethernet/ti/am65-cpsw-qos.h | 8 + + drivers/net/ethernet/ti/cpsw.c | 38 +- + drivers/net/ethernet/ti/cpsw_ale.c | 66 + + drivers/net/ethernet/ti/cpsw_ale.h | 2 + + drivers/net/ethernet/ti/cpsw_new.c | 39 +- + drivers/net/ethernet/ti/cpsw_priv.c | 223 +- + drivers/net/ethernet/ti/cpsw_priv.h | 9 +- + drivers/net/ethernet/ti/davinci_emac.c | 9 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 55 +- + drivers/net/ethernet/xscale/ptp_ixp46x.c | 2 +- + drivers/net/geneve.c | 10 +- + drivers/net/hyperv/hyperv_net.h | 69 +- + drivers/net/hyperv/netvsc.c | 16 +- + drivers/net/hyperv/netvsc_bpf.c | 101 +- + drivers/net/hyperv/netvsc_drv.c | 150 +- + drivers/net/mdio/mdio-aspeed.c | 123 +- + drivers/net/mdio/mdio-mscc-miim.c | 81 +- + drivers/net/netdevsim/fib.c | 9 +- + drivers/net/phy/micrel.c | 221 ++ + drivers/net/phy/phylink.c | 28 - + drivers/net/ppp/pppoe.c | 3 +- + drivers/net/usb/cdc_ether.c | 3 +- + drivers/net/usb/qmi_wwan.c | 2 +- + drivers/net/usb/rndis_host.c | 47 +- + drivers/net/wan/Kconfig | 28 - + drivers/net/wan/Makefile | 2 - + drivers/net/wan/lmc/Makefile | 18 - + drivers/net/wan/lmc/lmc.h | 33 - + drivers/net/wan/lmc/lmc_debug.c | 65 - + drivers/net/wan/lmc/lmc_debug.h | 52 - + drivers/net/wan/lmc/lmc_ioctl.h | 255 --- + drivers/net/wan/lmc/lmc_main.c | 2009 ---------------- + drivers/net/wan/lmc/lmc_media.c | 1206 ---------- + drivers/net/wan/lmc/lmc_proto.c | 106 - + drivers/net/wan/lmc/lmc_proto.h | 18 - + drivers/net/wan/lmc/lmc_var.h | 468 ---- + include/linux/ethtool.h | 4 + + include/linux/icmpv6.h | 11 +- + include/linux/ipv6.h | 1 + + include/linux/mlx5/accel.h | 35 +- + include/linux/mlx5/driver.h | 3 - + include/linux/mlx5/mlx5_ifc_fpga.h | 211 -- + include/linux/mlx5/port.h | 2 +- + include/linux/netdevice.h | 89 +- + include/linux/phylink.h | 6 - + include/linux/skbuff.h | 50 +- + include/linux/soc/mediatek/mtk_wed.h | 131 ++ + include/linux/usb/rndis_host.h | 1 + + include/linux/usb/usbnet.h | 1 + + include/net/act_api.h | 3 +- + include/net/devlink.h | 48 + + include/net/if_inet6.h | 8 + + include/net/ip_fib.h | 4 +- + include/net/netfilter/nf_conntrack.h | 8 +- + include/net/page_pool.h | 21 + + include/net/ping.h | 4 +- + include/net/pkt_cls.h | 6 +- + include/net/rtnetlink.h | 16 +- + include/net/sctp/sctp.h | 2 +- + include/net/sock.h | 12 +- + include/net/strparser.h | 4 + + include/net/tc_act/tc_gact.h | 15 + + include/net/tc_act/tc_skbedit.h | 12 + + include/net/tcp.h | 33 +- + include/net/tls.h | 15 +- + include/net/udp.h | 8 +- + include/rdma/ib_verbs.h | 8 - + include/trace/events/skb.h | 21 +- + include/trace/events/tcp.h | 47 +- + include/uapi/linux/btf.h | 4 +- + include/uapi/linux/devlink.h | 23 + + include/uapi/linux/ethtool_netlink.h | 1 + + include/uapi/linux/if_link.h | 5 + + include/uapi/linux/ipv6.h | 1 + + include/uapi/linux/neighbour.h | 2 + + include/uapi/linux/netlink.h | 1 + + include/uapi/linux/tipc_config.h | 28 +- + kernel/bpf/bpf_iter.c | 30 +- + kernel/bpf/stackmap.c | 2 - + kernel/bpf/verifier.c | 61 +- + kernel/trace/bpf_trace.c | 6 +- + lib/test_bpf.c | 315 ++- + net/appletalk/ddp.c | 3 +- + net/atm/common.c | 2 +- + net/ax25/af_ax25.c | 3 +- + net/bluetooth/af_bluetooth.c | 3 +- + net/bluetooth/hci_sock.c | 3 +- + net/bridge/br_device.c | 1 + + net/bridge/br_fdb.c | 157 +- + net/bridge/br_mdb.c | 12 +- + net/bridge/br_netlink.c | 9 +- + net/bridge/br_private.h | 18 +- + net/bridge/br_switchdev.c | 3 +- + net/bridge/br_sysfs_br.c | 6 +- + net/caif/caif_socket.c | 2 +- + net/can/bcm.c | 5 +- + net/can/isotp.c | 4 +- + net/can/j1939/socket.c | 2 +- + net/can/raw.c | 6 +- + net/core/datagram.c | 5 +- + net/core/dev.c | 22 +- + net/core/dev.h | 91 + + net/core/dev_addr_lists.c | 2 + + net/core/dev_ioctl.c | 2 + + net/core/devlink.c | 653 +++++- + net/core/filter.c | 2 +- + net/core/link_watch.c | 1 + + net/core/net-procfs.c | 2 + + net/core/net-sysfs.c | 1 + + net/core/page_pool.c | 78 +- + net/core/rtnetlink.c | 120 +- + net/core/sock.c | 35 +- + net/core/sysctl_net_core.c | 2 + + net/dccp/dccp.h | 4 +- + net/dccp/proto.c | 6 +- + net/ethernet/eth.c | 2 +- + net/ethtool/netlink.h | 2 +- + net/ethtool/rings.c | 54 +- + net/ieee802154/socket.c | 8 +- + net/ipv4/Kconfig | 1 - + net/ipv4/af_inet.c | 5 +- + net/ipv4/fib_semantics.c | 4 +- + net/ipv4/fib_trie.c | 10 +- + net/ipv4/fou.c | 1 - + net/ipv4/icmp.c | 75 +- + net/ipv4/ip_forward.c | 13 +- + net/ipv4/ip_input.c | 1 + + net/ipv4/netfilter/nft_fib_ipv4.c | 4 + + net/ipv4/ping.c | 38 +- + net/ipv4/raw.c | 4 +- + net/ipv4/route.c | 10 +- + net/ipv4/tcp.c | 27 +- + net/ipv4/tcp_bbr.c | 20 +- + net/ipv4/tcp_bic.c | 14 +- + net/ipv4/tcp_bpf.c | 15 +- + net/ipv4/tcp_cdg.c | 30 +- + net/ipv4/tcp_cong.c | 30 +- + net/ipv4/tcp_cubic.c | 22 +- + net/ipv4/tcp_dctcp.c | 11 +- + net/ipv4/tcp_highspeed.c | 18 +- + net/ipv4/tcp_htcp.c | 10 +- + net/ipv4/tcp_hybla.c | 18 +- + net/ipv4/tcp_illinois.c | 12 +- + net/ipv4/tcp_input.c | 166 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv4/tcp_lp.c | 6 +- + net/ipv4/tcp_metrics.c | 12 +- + net/ipv4/tcp_nv.c | 24 +- + net/ipv4/tcp_output.c | 30 +- + net/ipv4/tcp_rate.c | 2 +- + net/ipv4/tcp_scalable.c | 4 +- + net/ipv4/tcp_vegas.c | 21 +- + net/ipv4/tcp_veno.c | 24 +- + net/ipv4/tcp_westwood.c | 3 +- + net/ipv4/tcp_yeah.c | 30 +- + net/ipv4/udp.c | 11 +- + net/ipv4/udp_bpf.c | 17 +- + net/ipv4/udp_impl.h | 4 +- + net/ipv6/addrconf.c | 40 +- + net/ipv6/af_inet6.c | 5 +- + net/ipv6/exthdrs.c | 44 +- + net/ipv6/icmp.c | 31 +- + net/ipv6/ip6_input.c | 41 +- + net/ipv6/ip6_output.c | 9 +- + net/ipv6/ip6_tunnel.c | 2 - + net/ipv6/ndisc.c | 20 +- + net/ipv6/netfilter/nft_fib_ipv6.c | 4 + + net/ipv6/raw.c | 4 +- + net/ipv6/route.c | 6 +- + net/ipv6/tcp_ipv6.c | 2 +- + net/ipv6/udp.c | 4 +- + net/ipv6/udp_impl.h | 4 +- + net/iucv/af_iucv.c | 3 +- + net/key/af_key.c | 2 +- + net/l2tp/l2tp_ip.c | 4 +- + net/l2tp/l2tp_ip6.c | 4 +- + net/l2tp/l2tp_ppp.c | 3 +- + net/mctp/af_mctp.c | 2 +- + net/mctp/test/route-test.c | 8 +- + net/mpls/af_mpls.c | 3 +- + net/mptcp/mptcp_diag.c | 105 +- + net/mptcp/pm.c | 19 +- + net/mptcp/pm_netlink.c | 43 +- + net/mptcp/protocol.c | 22 +- + net/mptcp/protocol.h | 1 + + net/mptcp/sockopt.c | 6 - + net/netfilter/nf_conntrack_bpf.c | 22 +- + net/netfilter/nf_conntrack_ecache.c | 19 +- + net/netfilter/nf_conntrack_netlink.c | 68 +- + net/netfilter/nf_log_syslog.c | 136 +- + net/netfilter/nf_tables_api.c | 6 +- + net/netfilter/nfnetlink_cttimeout.c | 14 +- + net/netfilter/nft_bitwise.c | 13 +- + net/netfilter/nft_fib.c | 4 + + net/netlink/af_netlink.c | 3 +- + net/netrom/af_netrom.c | 3 +- + net/nfc/core.c | 1 + + net/nfc/llcp_sock.c | 3 +- + net/nfc/rawsock.c | 3 +- + net/packet/af_packet.c | 2 +- + net/phonet/datagram.c | 4 +- + net/phonet/pep.c | 7 +- + net/qrtr/af_qrtr.c | 3 +- + net/rose/af_rose.c | 3 +- + net/sched/act_api.c | 4 +- + net/sched/act_csum.c | 3 +- + net/sched/act_ct.c | 3 +- + net/sched/act_gact.c | 13 +- + net/sched/act_gate.c | 3 +- + net/sched/act_mirred.c | 4 +- + net/sched/act_mpls.c | 10 +- + net/sched/act_pedit.c | 4 +- + net/sched/act_police.c | 20 +- + net/sched/act_sample.c | 3 +- + net/sched/act_skbedit.c | 10 +- + net/sched/act_tunnel_key.c | 4 +- + net/sched/act_vlan.c | 4 +- + net/sched/cls_api.c | 22 +- + net/sched/cls_flower.c | 14 +- + net/sched/cls_matchall.c | 19 +- + net/sched/sch_generic.c | 12 +- + net/sctp/socket.c | 16 +- + net/sctp/ulpevent.c | 2 +- + net/sunrpc/svcsock.c | 2 +- + net/sunrpc/xprtsock.c | 2 +- + net/tls/tls_device.c | 6 +- + net/tls/tls_sw.c | 485 ++-- + net/unix/af_unix.c | 11 +- + net/unix/unix_bpf.c | 5 +- + net/vmw_vsock/vmci_transport.c | 5 +- + net/x25/af_x25.c | 3 +- + net/xfrm/espintcp.c | 4 +- + samples/bpf/Makefile | 10 +- + samples/bpf/syscall_tp_user.c | 3 + + samples/bpf/xdp_router_ipv4.bpf.c | 180 ++ + samples/bpf/xdp_router_ipv4_kern.c | 186 -- + samples/bpf/xdp_router_ipv4_user.c | 455 ++-- + tools/bpf/bpftool/feature.c | 2 +- + tools/bpf/bpftool/link.c | 3 + + tools/bpf/bpftool/prog.c | 1 + + tools/include/uapi/linux/btf.h | 4 +- + tools/lib/bpf/Build | 3 +- + tools/lib/bpf/Makefile | 2 +- + tools/lib/bpf/btf.c | 6 +- + tools/lib/bpf/libbpf.c | 488 +++- + tools/lib/bpf/libbpf.h | 41 +- + tools/lib/bpf/libbpf.map | 1 + + tools/lib/bpf/libbpf_internal.h | 30 + + tools/lib/bpf/usdt.bpf.h | 259 +++ + tools/lib/bpf/usdt.c | 1335 +++++++++++ + tools/testing/selftests/bpf/Makefile | 25 +- + .../selftests/bpf/prog_tests/attach_probe.c | 85 +- + tools/testing/selftests/bpf/prog_tests/for_each.c | 12 + + tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 17 +- + tools/testing/selftests/bpf/prog_tests/netcnt.c | 2 +- + .../selftests/bpf/prog_tests/test_global_funcs.c | 1 + + .../selftests/bpf/prog_tests/uprobe_autoattach.c | 49 + + tools/testing/selftests/bpf/prog_tests/usdt.c | 421 ++++ + .../bpf/progs/for_each_map_elem_write_key.c | 27 + + tools/testing/selftests/bpf/progs/linked_funcs1.c | 8 + + tools/testing/selftests/bpf/progs/linked_funcs2.c | 8 + + .../selftests/bpf/progs/perf_event_stackmap.c | 4 +- + tools/testing/selftests/bpf/progs/profiler.inc.h | 5 +- + .../selftests/bpf/progs/test_attach_probe.c | 41 +- + .../testing/selftests/bpf/progs/test_bpf_cookie.c | 4 +- + .../selftests/bpf/progs/test_global_func17.c | 16 + + .../bpf/progs/test_ksyms_btf_write_check.c | 18 +- + .../selftests/bpf/progs/test_l4lb_noinline.c | 2 +- + tools/testing/selftests/bpf/progs/test_sk_assign.c | 4 +- + .../selftests/bpf/progs/test_task_pt_regs.c | 2 +- + .../selftests/bpf/progs/test_uprobe_autoattach.c | 73 + + .../selftests/bpf/progs/test_urandom_usdt.c | 70 + + tools/testing/selftests/bpf/progs/test_usdt.c | 96 + + .../selftests/bpf/progs/test_usdt_multispec.c | 32 + + .../selftests/bpf/progs/test_xdp_noinline.c | 12 +- + tools/testing/selftests/bpf/progs/trigger_bench.c | 2 +- + tools/testing/selftests/bpf/sdt-config.h | 6 + + tools/testing/selftests/bpf/sdt.h | 513 +++++ + .../selftests/bpf/test_bpftool_synctypes.py | 2 +- + tools/testing/selftests/bpf/test_cgroup_storage.c | 3 +- + tools/testing/selftests/bpf/test_offload.py | 2 +- + tools/testing/selftests/bpf/test_progs.c | 6 +- + tools/testing/selftests/bpf/test_progs.h | 2 + + tools/testing/selftests/bpf/testing_helpers.c | 2 +- + tools/testing/selftests/bpf/trace_helpers.c | 9 +- + tools/testing/selftests/bpf/urandom_read.c | 63 +- + tools/testing/selftests/bpf/urandom_read_aux.c | 9 + + tools/testing/selftests/bpf/urandom_read_lib1.c | 13 + + tools/testing/selftests/bpf/urandom_read_lib2.c | 8 + + .../drivers/net/mlxsw/devlink_linecard.sh | 280 +++ + tools/testing/selftests/net/Makefile | 1 + + tools/testing/selftests/net/fib_rule_tests.sh | 12 +- + tools/testing/selftests/net/forwarding/Makefile | 1 + + .../testing/selftests/net/forwarding/bridge_mdb.sh | 103 + + tools/testing/selftests/net/mptcp/diag.sh | 38 + + .../selftests/net/ndisc_unsolicited_na_test.sh | 255 +++ + tools/testing/selftests/netfilter/nft_fib.sh | 50 + + 474 files changed, 23165 insertions(+), 16406 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-pcie-mirror.yaml + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-wed.yaml + create mode 100644 Documentation/devicetree/bindings/net/mscc,miim.yaml + delete mode 100644 Documentation/devicetree/bindings/net/mscc-miim.txt + create mode 100644 Documentation/networking/device_drivers/ethernet/marvell/octeon_ep.rst + create mode 100644 Documentation/networking/devlink/devlink-linecard.rst + delete mode 100644 drivers/atm/ambassador.c + delete mode 100644 drivers/atm/ambassador.h + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/Kconfig + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/Makefile + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_config.h + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.c + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.h + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_main.c + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_main.h + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_rx.c + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_rx.h + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_tx.c + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_tx.h + create mode 100644 drivers/net/ethernet/mediatek/mtk_wed.c + create mode 100644 drivers/net/ethernet/mediatek/mtk_wed.h + create mode 100644 drivers/net/ethernet/mediatek/mtk_wed_debugfs.c + create mode 100644 drivers/net/ethernet/mediatek/mtk_wed_ops.c + create mode 100644 drivers/net/ethernet/mediatek/mtk_wed_regs.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/accel.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec.c + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec_offload.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/tls.c + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/tls.h + rename drivers/net/ethernet/mellanox/mlx5/core/{accel => en_accel}/ipsec_offload.c (84%) + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.h + rename drivers/net/ethernet/mellanox/mlx5/core/en_accel/{tls_stats.c => ktls_stats.c} (63%) + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/core_linecards.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c + delete mode 100644 drivers/net/wan/lmc/Makefile + delete mode 100644 drivers/net/wan/lmc/lmc.h + delete mode 100644 drivers/net/wan/lmc/lmc_debug.c + delete mode 100644 drivers/net/wan/lmc/lmc_debug.h + delete mode 100644 drivers/net/wan/lmc/lmc_ioctl.h + delete mode 100644 drivers/net/wan/lmc/lmc_main.c + delete mode 100644 drivers/net/wan/lmc/lmc_media.c + delete mode 100644 drivers/net/wan/lmc/lmc_proto.c + delete mode 100644 drivers/net/wan/lmc/lmc_proto.h + delete mode 100644 drivers/net/wan/lmc/lmc_var.h + create mode 100644 include/linux/soc/mediatek/mtk_wed.h + create mode 100644 net/core/dev.h + create mode 100644 samples/bpf/xdp_router_ipv4.bpf.c + delete mode 100644 samples/bpf/xdp_router_ipv4_kern.c + create mode 100644 tools/lib/bpf/usdt.bpf.h + create mode 100644 tools/lib/bpf/usdt.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/uprobe_autoattach.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/usdt.c + create mode 100644 tools/testing/selftests/bpf/progs/for_each_map_elem_write_key.c + create mode 100644 tools/testing/selftests/bpf/progs/test_global_func17.c + create mode 100644 tools/testing/selftests/bpf/progs/test_uprobe_autoattach.c + create mode 100644 tools/testing/selftests/bpf/progs/test_urandom_usdt.c + create mode 100644 tools/testing/selftests/bpf/progs/test_usdt.c + create mode 100644 tools/testing/selftests/bpf/progs/test_usdt_multispec.c + create mode 100644 tools/testing/selftests/bpf/sdt-config.h + create mode 100644 tools/testing/selftests/bpf/sdt.h + create mode 100644 tools/testing/selftests/bpf/urandom_read_aux.c + create mode 100644 tools/testing/selftests/bpf/urandom_read_lib1.c + create mode 100644 tools/testing/selftests/bpf/urandom_read_lib2.c + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/devlink_linecard.sh + create mode 100755 tools/testing/selftests/net/forwarding/bridge_mdb.sh + create mode 100755 tools/testing/selftests/net/ndisc_unsolicited_na_test.sh +Merging bpf-next/for-next (0fb53aabc5fc xsk: Drop ternary operator from xskq_cons_has_entries) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging drivers/net/ethernet/intel/ice/ice_xsk.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging net/xdp/xsk.c +Merge made by the 'ort' strategy. + arch/riscv/net/bpf_jit.h | 67 +++++++++ + arch/riscv/net/bpf_jit_comp64.c | 110 +++++++++++---- + drivers/net/ethernet/intel/i40e/i40e_txrx_common.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 38 +++-- + drivers/net/ethernet/intel/ice/ice_txrx.h | 1 + + drivers/net/ethernet/intel/ice/ice_xsk.c | 53 ++++--- + .../net/ethernet/intel/ixgbe/ixgbe_txrx_common.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 52 ++++--- + .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +- + kernel/bpf/bpf_iter.c | 2 +- + kernel/bpf/bpf_struct_ops.c | 4 +- + kernel/bpf/hashtab.c | 2 +- + kernel/bpf/syscall.c | 87 ++++++++++++ + kernel/bpf/task_iter.c | 1 - + kernel/sysctl.c | 79 ----------- + net/xdp/xsk.c | 4 +- + net/xdp/xsk_queue.h | 4 +- + samples/bpf/cpustat_user.c | 1 - + samples/bpf/hbm.c | 5 +- + samples/bpf/ibumad_user.c | 1 - + samples/bpf/map_perf_test_user.c | 1 - + samples/bpf/offwaketime_user.c | 1 - + samples/bpf/sockex2_user.c | 1 - + samples/bpf/sockex3_user.c | 1 - + samples/bpf/spintest_user.c | 1 - + samples/bpf/syscall_tp_user.c | 1 - + samples/bpf/task_fd_query_user.c | 1 - + samples/bpf/test_lru_dist.c | 1 - + samples/bpf/test_map_in_map_user.c | 1 - + samples/bpf/test_overhead_user.c | 1 - + samples/bpf/tracex2_user.c | 1 - + samples/bpf/tracex3_user.c | 1 - + samples/bpf/tracex4_user.c | 1 - + samples/bpf/tracex5_user.c | 1 - + samples/bpf/tracex6_user.c | 1 - + samples/bpf/xdp1_user.c | 1 - + samples/bpf/xdp_adjust_tail_user.c | 1 - + samples/bpf/xdp_monitor_user.c | 1 - + samples/bpf/xdp_redirect_cpu_user.c | 1 - + samples/bpf/xdp_redirect_map_multi_user.c | 1 - + samples/bpf/xdp_redirect_user.c | 1 - + samples/bpf/xdp_router_ipv4_user.c | 1 - + samples/bpf/xdp_rxq_info_user.c | 1 - + samples/bpf/xdp_sample_pkts_user.c | 1 - + samples/bpf/xdp_sample_user.c | 1 - + samples/bpf/xdp_tx_iptunnel_user.c | 1 - + samples/bpf/xdpsock_user.c | 9 +- + samples/bpf/xsk_fwd.c | 7 +- + tools/bpf/bpftool/common.c | 8 -- + tools/bpf/bpftool/feature.c | 2 - + tools/bpf/bpftool/main.c | 6 +- + tools/bpf/bpftool/main.h | 2 - + tools/bpf/bpftool/map.c | 2 - + tools/bpf/bpftool/pids.c | 1 - + tools/bpf/bpftool/prog.c | 3 - + tools/bpf/bpftool/struct_ops.c | 2 - + tools/bpf/runqslower/runqslower.c | 18 +-- + tools/include/uapi/asm/bpf_perf_event.h | 2 + + tools/lib/bpf/bpf_tracing.h | 23 +++ + tools/lib/bpf/libbpf.c | 2 +- + tools/lib/bpf/usdt.c | 76 ++++++++++ + tools/testing/selftests/bpf/bench.c | 1 - + tools/testing/selftests/bpf/bpf_rlimit.h | 28 ---- + tools/testing/selftests/bpf/flow_dissector_load.c | 6 +- + tools/testing/selftests/bpf/get_cgroup_id_user.c | 4 +- + .../testing/selftests/bpf/prog_tests/arg_parsing.c | 107 ++++++++++++++ + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 4 +- + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 6 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 1 - + tools/testing/selftests/bpf/prog_tests/snprintf.c | 4 +- + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 1 - + tools/testing/selftests/bpf/test_cgroup_storage.c | 4 +- + tools/testing/selftests/bpf/test_dev_cgroup.c | 4 +- + tools/testing/selftests/bpf/test_lpm_map.c | 4 +- + tools/testing/selftests/bpf/test_lru_map.c | 4 +- + tools/testing/selftests/bpf/test_progs.c | 157 ++++++++++----------- + tools/testing/selftests/bpf/test_progs.h | 16 ++- + .../selftests/bpf/test_skb_cgroup_id_user.c | 4 +- + tools/testing/selftests/bpf/test_sock.c | 4 +- + tools/testing/selftests/bpf/test_sock_addr.c | 4 +- + tools/testing/selftests/bpf/test_sockmap.c | 5 +- + tools/testing/selftests/bpf/test_sysctl.c | 4 +- + tools/testing/selftests/bpf/test_tag.c | 4 +- + .../selftests/bpf/test_tcp_check_syncookie_user.c | 4 +- + tools/testing/selftests/bpf/test_tcpnotify_user.c | 1 - + tools/testing/selftests/bpf/test_verifier_log.c | 5 +- + tools/testing/selftests/bpf/testing_helpers.c | 89 ++++++++++++ + tools/testing/selftests/bpf/testing_helpers.h | 8 ++ + tools/testing/selftests/bpf/xdp_redirect_multi.c | 1 - + tools/testing/selftests/bpf/xdping.c | 8 +- + tools/testing/selftests/bpf/xdpxceiver.c | 6 +- + 92 files changed, 795 insertions(+), 411 deletions(-) + delete mode 100644 tools/testing/selftests/bpf/bpf_rlimit.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/arg_parsing.c +$ git reset --hard HEAD^ +HEAD is now at f474dfacac3f Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +Merging next-20220414 version of bpf-next +$ git merge -m next-20220414/bpf-next 241d50ec5d79b94694adf13853c1f55d0f0b85e6 +Merge made by the 'ort' strategy. + arch/riscv/net/bpf_jit.h | 67 +++++++++ + arch/riscv/net/bpf_jit_comp64.c | 110 +++++++++++---- + kernel/bpf/bpf_iter.c | 2 +- + kernel/bpf/bpf_struct_ops.c | 4 +- + kernel/bpf/hashtab.c | 2 +- + kernel/bpf/syscall.c | 87 ++++++++++++ + kernel/bpf/task_iter.c | 1 - + kernel/sysctl.c | 79 ----------- + samples/bpf/cpustat_user.c | 1 - + samples/bpf/hbm.c | 5 +- + samples/bpf/ibumad_user.c | 1 - + samples/bpf/map_perf_test_user.c | 1 - + samples/bpf/offwaketime_user.c | 1 - + samples/bpf/sockex2_user.c | 1 - + samples/bpf/sockex3_user.c | 1 - + samples/bpf/spintest_user.c | 1 - + samples/bpf/syscall_tp_user.c | 1 - + samples/bpf/task_fd_query_user.c | 1 - + samples/bpf/test_lru_dist.c | 1 - + samples/bpf/test_map_in_map_user.c | 1 - + samples/bpf/test_overhead_user.c | 1 - + samples/bpf/tracex2_user.c | 1 - + samples/bpf/tracex3_user.c | 1 - + samples/bpf/tracex4_user.c | 1 - + samples/bpf/tracex5_user.c | 1 - + samples/bpf/tracex6_user.c | 1 - + samples/bpf/xdp1_user.c | 1 - + samples/bpf/xdp_adjust_tail_user.c | 1 - + samples/bpf/xdp_monitor_user.c | 1 - + samples/bpf/xdp_redirect_cpu_user.c | 1 - + samples/bpf/xdp_redirect_map_multi_user.c | 1 - + samples/bpf/xdp_redirect_user.c | 1 - + samples/bpf/xdp_router_ipv4_user.c | 1 - + samples/bpf/xdp_rxq_info_user.c | 1 - + samples/bpf/xdp_sample_pkts_user.c | 1 - + samples/bpf/xdp_sample_user.c | 1 - + samples/bpf/xdp_tx_iptunnel_user.c | 1 - + samples/bpf/xdpsock_user.c | 9 +- + samples/bpf/xsk_fwd.c | 7 +- + tools/bpf/bpftool/common.c | 8 -- + tools/bpf/bpftool/feature.c | 2 - + tools/bpf/bpftool/main.c | 6 +- + tools/bpf/bpftool/main.h | 2 - + tools/bpf/bpftool/map.c | 2 - + tools/bpf/bpftool/pids.c | 1 - + tools/bpf/bpftool/prog.c | 3 - + tools/bpf/bpftool/struct_ops.c | 2 - + tools/bpf/runqslower/runqslower.c | 18 +-- + tools/include/uapi/asm/bpf_perf_event.h | 2 + + tools/lib/bpf/bpf_tracing.h | 23 +++ + tools/lib/bpf/libbpf.c | 2 +- + tools/lib/bpf/usdt.c | 76 ++++++++++ + tools/testing/selftests/bpf/bench.c | 1 - + tools/testing/selftests/bpf/bpf_rlimit.h | 28 ---- + tools/testing/selftests/bpf/flow_dissector_load.c | 6 +- + tools/testing/selftests/bpf/get_cgroup_id_user.c | 4 +- + .../testing/selftests/bpf/prog_tests/arg_parsing.c | 107 ++++++++++++++ + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 4 +- + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 6 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 1 - + tools/testing/selftests/bpf/prog_tests/snprintf.c | 4 +- + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 1 - + tools/testing/selftests/bpf/test_cgroup_storage.c | 4 +- + tools/testing/selftests/bpf/test_dev_cgroup.c | 4 +- + tools/testing/selftests/bpf/test_lpm_map.c | 4 +- + tools/testing/selftests/bpf/test_lru_map.c | 4 +- + tools/testing/selftests/bpf/test_progs.c | 157 ++++++++++----------- + tools/testing/selftests/bpf/test_progs.h | 16 ++- + .../selftests/bpf/test_skb_cgroup_id_user.c | 4 +- + tools/testing/selftests/bpf/test_sock.c | 4 +- + tools/testing/selftests/bpf/test_sock_addr.c | 4 +- + tools/testing/selftests/bpf/test_sockmap.c | 5 +- + tools/testing/selftests/bpf/test_sysctl.c | 4 +- + tools/testing/selftests/bpf/test_tag.c | 4 +- + .../selftests/bpf/test_tcp_check_syncookie_user.c | 4 +- + tools/testing/selftests/bpf/test_tcpnotify_user.c | 1 - + tools/testing/selftests/bpf/test_verifier_log.c | 5 +- + tools/testing/selftests/bpf/testing_helpers.c | 89 ++++++++++++ + tools/testing/selftests/bpf/testing_helpers.h | 8 ++ + tools/testing/selftests/bpf/xdp_redirect_multi.c | 1 - + tools/testing/selftests/bpf/xdping.c | 8 +- + tools/testing/selftests/bpf/xdpxceiver.c | 6 +- + 82 files changed, 696 insertions(+), 350 deletions(-) + delete mode 100644 tools/testing/selftests/bpf/bpf_rlimit.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/arg_parsing.c +Merging ipsec-next/master (b58b1f563ab7 xfrm: rework default policy structure) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (2984287c4c19 net/mlx5: Remove not-implemented IPsec capabilities) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (0c7b27616fbd selftests: netfilter: add fib expression forward test case) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Already up to date. +Merging ipvs-next/master (0c7b27616fbd selftests: netfilter: add fib expression forward test case) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master +Already up to date. +Merging bluetooth/master (495e70abe13b Bluetooth: btusb: Set HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN for QCA) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btbcm.c | 52 +++++++++++++++++++++++++++++++++++++++- + drivers/bluetooth/btintel.c | 2 +- + drivers/bluetooth/btmtksdio.c | 2 +- + drivers/bluetooth/btusb.c | 5 ++++ + drivers/bluetooth/hci_qca.c | 4 ++-- + include/net/bluetooth/hci.h | 9 +++++++ + include/net/bluetooth/hci_core.h | 8 +++++-- + net/bluetooth/hci_conn.c | 2 +- + net/bluetooth/hci_sync.c | 31 ++++++++++++++++++++++++ + net/bluetooth/mgmt_util.c | 2 +- + net/bluetooth/sco.c | 23 +++++++++++------- + 11 files changed, 122 insertions(+), 18 deletions(-) +Merging wireless-next/main (dc4246eff026 rtw89: pci: correct return value handling of rtw89_write16_mdio_mask()) +$ git merge -m Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/main +Auto-merging MAINTAINERS +Auto-merging drivers/net/wireless/ath/ath11k/mac.c +Auto-merging drivers/net/wireless/ath/ath9k/main.c +Auto-merging drivers/net/wireless/ath/ath9k/xmit.c +Auto-merging net/mac80211/debugfs_sta.c +Auto-merging net/wireless/nl80211.c +Merge made by the 'ort' strategy. + .../{staging => }/net/wireless/silabs,wfx.yaml | 2 +- + MAINTAINERS | 4 +- + drivers/net/wireless/Kconfig | 1 + + drivers/net/wireless/Makefile | 1 + + drivers/net/wireless/ath/ar5523/ar5523.c | 4 +- + drivers/net/wireless/ath/ath10k/ahb.c | 9 +- + drivers/net/wireless/ath/ath10k/core.c | 25 + + drivers/net/wireless/ath/ath10k/hw.h | 2 + + drivers/net/wireless/ath/ath10k/mac.c | 76 +- + drivers/net/wireless/ath/ath10k/usb.c | 27 + + drivers/net/wireless/ath/ath11k/Makefile | 6 +- + drivers/net/wireless/ath/ath11k/core.c | 372 ++++- + drivers/net/wireless/ath/ath11k/core.h | 132 +- + drivers/net/wireless/ath/ath11k/debugfs.c | 4 + + drivers/net/wireless/ath/ath11k/htc.c | 6 + + drivers/net/wireless/ath/ath11k/hw.h | 23 +- + drivers/net/wireless/ath/ath11k/mac.c | 547 ++++++-- + drivers/net/wireless/ath/ath11k/mac.h | 3 +- + drivers/net/wireless/ath/ath11k/mhi.c | 285 ++-- + drivers/net/wireless/ath/ath11k/mhi.h | 17 +- + drivers/net/wireless/ath/ath11k/pci.c | 982 +++----------- + drivers/net/wireless/ath/ath11k/pci.h | 28 +- + drivers/net/wireless/ath/ath11k/pcic.c | 741 ++++++++++ + drivers/net/wireless/ath/ath11k/pcic.h | 46 + + drivers/net/wireless/ath/ath11k/peer.c | 373 ++++- + drivers/net/wireless/ath/ath11k/peer.h | 10 +- + drivers/net/wireless/ath/ath11k/qmi.c | 19 +- + drivers/net/wireless/ath/ath11k/reg.c | 44 +- + drivers/net/wireless/ath/ath11k/reg.h | 2 +- + drivers/net/wireless/ath/ath11k/wmi.c | 635 ++++++++- + drivers/net/wireless/ath/ath11k/wmi.h | 366 ++++- + drivers/net/wireless/ath/ath11k/wow.c | 763 +++++++++++ + drivers/net/wireless/ath/ath11k/wow.h | 45 + + drivers/net/wireless/ath/ath6kl/htc_mbox.c | 2 +- + drivers/net/wireless/ath/ath9k/ahb.c | 8 +- + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 9 +- + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 85 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 2 + + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 9 +- + drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 10 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 25 +- + drivers/net/wireless/ath/ath9k/debug_sta.c | 4 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 20 +- + drivers/net/wireless/ath/ath9k/mac.h | 6 +- + drivers/net/wireless/ath/ath9k/main.c | 2 +- + drivers/net/wireless/ath/ath9k/reg.h | 10 +- + drivers/net/wireless/ath/ath9k/xmit.c | 6 +- + drivers/net/wireless/ath/carl9170/main.c | 8 +- + drivers/net/wireless/ath/carl9170/tx.c | 5 +- + drivers/net/wireless/ath/wcn36xx/hal.h | 7 +- + drivers/net/wireless/ath/wcn36xx/main.c | 160 ++- + drivers/net/wireless/ath/wcn36xx/smd.c | 92 +- + drivers/net/wireless/ath/wcn36xx/smd.h | 2 + + drivers/net/wireless/ath/wcn36xx/txrx.c | 29 + + drivers/net/wireless/ath/wcn36xx/txrx.h | 1 + + drivers/net/wireless/broadcom/b43/phy_n.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/phy.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 39 +- + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 64 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 119 +- + drivers/net/wireless/intel/ipw2x00/libipw_tx.c | 2 +- + drivers/net/wireless/intel/iwlegacy/3945-rs.c | 6 +- + drivers/net/wireless/intel/iwlegacy/4965-rs.c | 22 +- + drivers/net/wireless/intel/iwlegacy/common.c | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 22 +- + drivers/net/wireless/intel/iwlwifi/dvm/rxon.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/sta.c | 4 +- + .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/filter.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/sta.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 10 +- + drivers/net/wireless/intel/iwlwifi/mei/sap.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 38 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 38 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 35 +- + drivers/net/wireless/intel/iwlwifi/mvm/sf.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 31 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 6 +- + drivers/net/wireless/intersil/orinoco/airport.c | 1 + + drivers/net/wireless/mac80211_hwsim.c | 4 +- + drivers/net/wireless/marvell/mwifiex/11h.c | 2 + + drivers/net/wireless/marvell/mwl8k.c | 48 +- + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 16 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 83 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 4 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 140 +- + drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 2 +- + drivers/net/wireless/mediatek/mt7601u/mac.c | 2 +- + drivers/net/wireless/mediatek/mt7601u/tx.c | 4 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 8 +- + drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 2 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 146 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 44 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 40 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 15 +- + drivers/net/wireless/realtek/rtlwifi/rc.c | 20 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 26 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 26 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 30 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 26 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 26 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 26 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 30 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 6 +- + drivers/net/wireless/realtek/rtw88/bf.c | 2 +- + drivers/net/wireless/realtek/rtw88/fw.c | 11 +- + drivers/net/wireless/realtek/rtw88/fw.h | 4 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 44 +- + drivers/net/wireless/realtek/rtw88/main.c | 70 +- + drivers/net/wireless/realtek/rtw88/main.h | 6 +- + drivers/net/wireless/realtek/rtw88/pci.c | 5 +- + drivers/net/wireless/realtek/rtw88/phy.c | 2 +- + drivers/net/wireless/realtek/rtw88/reg.h | 2 + + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 4 + + .../net/wireless/realtek/rtw88/rtw8821c_table.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8821ce.c | 4 + + drivers/net/wireless/realtek/rtw88/rx.c | 3 +- + drivers/net/wireless/realtek/rtw88/tx.c | 31 +- + drivers/net/wireless/realtek/rtw88/tx.h | 4 + + drivers/net/wireless/realtek/rtw89/cam.c | 57 +- + drivers/net/wireless/realtek/rtw89/cam.h | 4 + + drivers/net/wireless/realtek/rtw89/coex.c | 24 +- + drivers/net/wireless/realtek/rtw89/core.c | 172 ++- + drivers/net/wireless/realtek/rtw89/core.h | 171 ++- + drivers/net/wireless/realtek/rtw89/debug.c | 70 +- + drivers/net/wireless/realtek/rtw89/fw.c | 260 +++- + drivers/net/wireless/realtek/rtw89/fw.h | 376 ++++- + drivers/net/wireless/realtek/rtw89/mac.c | 707 +++++++--- + drivers/net/wireless/realtek/rtw89/mac.h | 81 +- + drivers/net/wireless/realtek/rtw89/mac80211.c | 4 +- + drivers/net/wireless/realtek/rtw89/pci.c | 630 +++++++-- + drivers/net/wireless/realtek/rtw89/pci.h | 245 ++++ + drivers/net/wireless/realtek/rtw89/phy.c | 101 +- + drivers/net/wireless/realtek/rtw89/reg.h | 1430 +++++++++++++++++++- + drivers/net/wireless/realtek/rtw89/regd.c | 513 ++++--- + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 77 +- + .../net/wireless/realtek/rtw89/rtw8852a_table.c | 581 ++++++++ + drivers/net/wireless/realtek/rtw89/rtw8852ae.c | 32 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 172 ++- + drivers/net/wireless/realtek/rtw89/rtw8852ce.c | 32 + + drivers/net/wireless/realtek/rtw89/ser.c | 250 +++- + drivers/net/wireless/realtek/rtw89/txrx.h | 107 ++ + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 12 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 8 +- + drivers/net/wireless/silabs/Kconfig | 18 + + drivers/net/wireless/silabs/Makefile | 3 + + .../{staging => net/wireless/silabs}/wfx/Kconfig | 0 + .../{staging => net/wireless/silabs}/wfx/Makefile | 0 + drivers/{staging => net/wireless/silabs}/wfx/bh.c | 0 + drivers/{staging => net/wireless/silabs}/wfx/bh.h | 0 + drivers/{staging => net/wireless/silabs}/wfx/bus.h | 0 + .../wireless/silabs}/wfx/bus_sdio.c | 0 + .../{staging => net/wireless/silabs}/wfx/bus_spi.c | 0 + .../{staging => net/wireless/silabs}/wfx/data_rx.c | 0 + .../{staging => net/wireless/silabs}/wfx/data_rx.h | 0 + .../{staging => net/wireless/silabs}/wfx/data_tx.c | 0 + .../{staging => net/wireless/silabs}/wfx/data_tx.h | 0 + .../{staging => net/wireless/silabs}/wfx/debug.c | 0 + .../{staging => net/wireless/silabs}/wfx/debug.h | 0 + .../{staging => net/wireless/silabs}/wfx/fwio.c | 0 + .../{staging => net/wireless/silabs}/wfx/fwio.h | 0 + .../wireless/silabs}/wfx/hif_api_cmd.h | 0 + .../wireless/silabs}/wfx/hif_api_general.h | 0 + .../wireless/silabs}/wfx/hif_api_mib.h | 0 + .../{staging => net/wireless/silabs}/wfx/hif_rx.c | 0 + .../{staging => net/wireless/silabs}/wfx/hif_rx.h | 0 + .../{staging => net/wireless/silabs}/wfx/hif_tx.c | 0 + .../{staging => net/wireless/silabs}/wfx/hif_tx.h | 0 + .../wireless/silabs}/wfx/hif_tx_mib.c | 0 + .../wireless/silabs}/wfx/hif_tx_mib.h | 0 + .../{staging => net/wireless/silabs}/wfx/hwio.c | 0 + .../{staging => net/wireless/silabs}/wfx/hwio.h | 0 + drivers/{staging => net/wireless/silabs}/wfx/key.c | 0 + drivers/{staging => net/wireless/silabs}/wfx/key.h | 0 + .../{staging => net/wireless/silabs}/wfx/main.c | 0 + .../{staging => net/wireless/silabs}/wfx/main.h | 0 + .../{staging => net/wireless/silabs}/wfx/queue.c | 0 + .../{staging => net/wireless/silabs}/wfx/queue.h | 0 + .../{staging => net/wireless/silabs}/wfx/scan.c | 0 + .../{staging => net/wireless/silabs}/wfx/scan.h | 0 + drivers/{staging => net/wireless/silabs}/wfx/sta.c | 8 +- + drivers/{staging => net/wireless/silabs}/wfx/sta.h | 0 + .../{staging => net/wireless/silabs}/wfx/traces.h | 0 + drivers/{staging => net/wireless/silabs}/wfx/wfx.h | 0 + drivers/net/wireless/st/cw1200/sta.c | 4 +- + drivers/net/wireless/ti/wlcore/cmd.c | 8 +- + drivers/net/wireless/ti/wlcore/debugfs.c | 52 +- + drivers/net/wireless/ti/wlcore/main.c | 16 +- + drivers/staging/Kconfig | 1 - + drivers/staging/Makefile | 1 - + drivers/staging/wfx/TODO | 6 - + include/net/mac80211.h | 90 +- + net/mac80211/agg-rx.c | 12 +- + net/mac80211/agg-tx.c | 6 +- + net/mac80211/airtime.c | 4 +- + net/mac80211/cfg.c | 33 +- + net/mac80211/chan.c | 8 +- + net/mac80211/debugfs.c | 1 + + net/mac80211/debugfs_sta.c | 12 +- + net/mac80211/eht.c | 6 +- + net/mac80211/ethtool.c | 4 +- + net/mac80211/he.c | 8 +- + net/mac80211/ht.c | 8 +- + net/mac80211/ibss.c | 26 +- + net/mac80211/key.c | 9 +- + net/mac80211/mesh_hwmp.c | 2 +- + net/mac80211/mesh_plink.c | 24 +- + net/mac80211/mlme.c | 18 +- + net/mac80211/ocb.c | 2 +- + net/mac80211/rate.c | 8 +- + net/mac80211/rc80211_minstrel_ht.c | 23 +- + net/mac80211/rx.c | 131 +- + net/mac80211/s1g.c | 4 +- + net/mac80211/sta_info.c | 110 +- + net/mac80211/sta_info.h | 155 ++- + net/mac80211/status.c | 41 +- + net/mac80211/tdls.c | 26 +- + net/mac80211/trace.h | 4 +- + net/mac80211/tx.c | 26 +- + net/mac80211/vht.c | 78 +- + net/wireless/nl80211.c | 1 + + 240 files changed, 11268 insertions(+), 3478 deletions(-) + rename Documentation/devicetree/bindings/{staging => }/net/wireless/silabs,wfx.yaml (98%) + create mode 100644 drivers/net/wireless/ath/ath11k/pcic.c + create mode 100644 drivers/net/wireless/ath/ath11k/pcic.h + create mode 100644 drivers/net/wireless/silabs/Kconfig + create mode 100644 drivers/net/wireless/silabs/Makefile + rename drivers/{staging => net/wireless/silabs}/wfx/Kconfig (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/Makefile (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/bh.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/bh.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/bus.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/bus_sdio.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/bus_spi.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/data_rx.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/data_rx.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/data_tx.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/data_tx.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/debug.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/debug.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/fwio.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/fwio.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hif_api_cmd.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hif_api_general.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hif_api_mib.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hif_rx.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hif_rx.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx_mib.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx_mib.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hwio.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/hwio.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/key.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/key.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/main.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/main.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/queue.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/queue.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/scan.c (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/scan.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/sta.c (99%) + rename drivers/{staging => net/wireless/silabs}/wfx/sta.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/traces.h (100%) + rename drivers/{staging => net/wireless/silabs}/wfx/wfx.h (100%) + delete mode 100644 drivers/staging/wfx/TODO +Merging mtd/mtd/next (876a45a50a20 dt-bindings: mtd: jedec, spi-nor: remove unneeded properties) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 8 - + drivers/mtd/maps/Kconfig | 9 - + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/ixp4xx.c | 262 --------------------- + drivers/mtd/mtdpart.c | 3 + + drivers/mtd/parsers/bcm47xxpart.c | 2 +- + 6 files changed, 4 insertions(+), 281 deletions(-) + delete mode 100644 drivers/mtd/maps/ixp4xx.c +Merging nand/nand/next (51a4a71d974c mtd: rawnand: omap_elm: Add compatible for AM64 ELM) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/mtd/elm.txt | 16 --- + Documentation/devicetree/bindings/mtd/ti,elm.yaml | 72 ++++++++++ + drivers/mtd/nand/raw/davinci_nand.c | 2 +- + drivers/mtd/nand/raw/nand_base.c | 9 +- + drivers/mtd/nand/raw/omap_elm.c | 1 + + drivers/mtd/nand/spi/gigadevice.c | 158 +++++++++++++++++++++- + 6 files changed, 236 insertions(+), 22 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mtd/elm.txt + create mode 100644 Documentation/devicetree/bindings/mtd/ti,elm.yaml +Merging spi-nor/spi-nor/next (ce522ba9ef7e Linux 5.18-rc2) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (b45b0a122008 crypto: arm64/sm4 - Fix wrong dependency of NEON/CE implementation) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Merge made by the 'ort' strategy. + Documentation/ABI/testing/debugfs-hisi-hpre | 14 + + Documentation/ABI/testing/debugfs-hisi-sec | 14 + + Documentation/ABI/testing/debugfs-hisi-zip | 14 + + Documentation/ABI/testing/sysfs-driver-ccp | 87 +++ + arch/arm64/crypto/Kconfig | 16 +- + arch/arm64/crypto/Makefile | 8 +- + arch/arm64/crypto/sm4-ce-cipher-core.S | 36 ++ + arch/arm64/crypto/sm4-ce-cipher-glue.c | 82 +++ + arch/arm64/crypto/sm4-ce-core.S | 688 ++++++++++++++++++++- + arch/arm64/crypto/sm4-ce-glue.c | 386 ++++++++++-- + arch/arm64/crypto/sm4-neon-core.S | 487 +++++++++++++++ + arch/arm64/crypto/sm4-neon-glue.c | 442 +++++++++++++ + arch/x86/crypto/blowfish_glue.c | 8 +- + arch/x86/crypto/camellia_glue.c | 8 +- + arch/x86/crypto/serpent_avx2_glue.c | 8 +- + arch/x86/crypto/twofish_glue.c | 8 +- + arch/x86/crypto/twofish_glue_3way.c | 8 +- + crypto/Kconfig | 18 +- + crypto/Makefile | 6 +- + crypto/crypto_engine.c | 1 + + {lib/crypto => crypto}/sm3.c | 0 + {lib/crypto => crypto}/sm4.c | 10 +- + crypto/testmgr.c | 75 ++- + drivers/char/hw_random/Kconfig | 13 + + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/mpfs-rng.c | 104 ++++ + drivers/crypto/cavium/nitrox/nitrox_main.c | 10 +- + drivers/crypto/ccp/psp-dev.c | 49 +- + drivers/crypto/ccp/psp-dev.h | 22 + + drivers/crypto/ccp/sp-pci.c | 62 ++ + drivers/crypto/ccree/cc_buffer_mgr.c | 27 +- + drivers/crypto/ccree/cc_driver.c | 24 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 222 +++++-- + drivers/crypto/hisilicon/qm.c | 245 +++++++- + drivers/crypto/hisilicon/sec2/sec_main.c | 108 +++- + drivers/crypto/hisilicon/sgl.c | 6 +- + drivers/crypto/hisilicon/zip/zip_main.c | 185 +++++- + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 15 +- + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h | 4 - + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c | 15 +- + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.h | 4 - + drivers/crypto/qat/qat_common/adf_accel_devices.h | 4 +- + drivers/crypto/qat/qat_common/adf_common_drv.h | 18 +- + drivers/crypto/qat/qat_common/adf_gen2_hw_data.c | 13 + + drivers/crypto/qat/qat_common/adf_gen2_hw_data.h | 6 + + drivers/crypto/qat/qat_common/adf_gen2_pfvf.c | 78 ++- + drivers/crypto/qat/qat_common/adf_gen4_pfvf.c | 61 +- + drivers/crypto/qat/qat_common/adf_isr.c | 21 +- + drivers/crypto/qat/qat_common/adf_pfvf_msg.h | 4 +- + drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c | 6 +- + drivers/crypto/qat/qat_common/adf_sriov.c | 16 +- + drivers/crypto/qat/qat_common/adf_vf_isr.c | 1 + + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 126 ++-- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 4 - + drivers/crypto/ux500/hash/hash_core.c | 4 +- + include/crypto/sm4.h | 4 + + include/linux/hisi_acc_qm.h | 18 + + lib/crypto/Kconfig | 6 - + lib/crypto/Makefile | 6 - + 59 files changed, 3496 insertions(+), 440 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-ccp + create mode 100644 arch/arm64/crypto/sm4-ce-cipher-core.S + create mode 100644 arch/arm64/crypto/sm4-ce-cipher-glue.c + create mode 100644 arch/arm64/crypto/sm4-neon-core.S + create mode 100644 arch/arm64/crypto/sm4-neon-glue.c + rename {lib/crypto => crypto}/sm3.c (100%) + rename {lib/crypto => crypto}/sm4.c (94%) + create mode 100644 drivers/char/hw_random/mpfs-rng.c +Merging drm/drm-next (c54b39a56522 Merge tag 'drm-intel-next-2022-04-13-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/display/bridge/ite,it66121.yaml | 3 + + .../bindings/display/bridge/toshiba,tc358767.yaml | 22 +- + .../display/panel/leadtek,ltk035c5444t.yaml | 59 ++ + .../bindings/display/sitronix,st7735r.yaml | 6 +- + Documentation/gpu/drm-mm.rst | 9 + + Documentation/gpu/drm-uapi.rst | 4 +- + Documentation/gpu/i915.rst | 14 +- + MAINTAINERS | 11 + + arch/x86/Kconfig | 6 + + arch/x86/boot/video-vesa.c | 4 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/dma-buf/dma-buf.c | 2 +- + drivers/dma-buf/dma-resv.c | 142 +++- + drivers/dma-buf/st-dma-resv.c | 64 +- + drivers/firmware/Kconfig | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 49 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 78 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 - + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 2 +- + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 13 +- + drivers/gpu/drm/bridge/Kconfig | 2 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 1 + + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 20 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 36 +- + drivers/gpu/drm/bridge/chipone-icn6211.c | 497 +++++++++++-- + drivers/gpu/drm/bridge/ite-it66121.c | 629 ++++++++++++++++- + drivers/gpu/drm/bridge/lontium-lt9611.c | 49 +- + drivers/gpu/drm/bridge/nwl-dsi.c | 30 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 7 +- + drivers/gpu/drm/bridge/panel.c | 3 + + drivers/gpu/drm/bridge/parade-ps8622.c | 7 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 9 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 51 +- + drivers/gpu/drm/bridge/tc358762.c | 9 +- + drivers/gpu/drm/bridge/tc358764.c | 104 +-- + drivers/gpu/drm/bridge/tc358767.c | 585 +++++++++++++-- + drivers/gpu/drm/bridge/tc358775.c | 11 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 17 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 8 +- + drivers/gpu/drm/dp/drm_dp.c | 58 +- + drivers/gpu/drm/drm_atomic.c | 20 + + drivers/gpu/drm/drm_atomic_uapi.c | 4 - + drivers/gpu/drm/drm_blend.c | 2 +- + drivers/gpu/drm/drm_bridge_connector.c | 4 +- + drivers/gpu/drm/drm_edid.c | 620 +++++++++------- + drivers/gpu/drm/drm_format_helper.c | 76 +- + drivers/gpu/drm/drm_gem.c | 80 --- + drivers/gpu/drm/drm_gem_atomic_helper.c | 18 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 2 +- + drivers/gpu/drm/drm_modes.c | 17 + + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 5 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 67 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 63 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.h | 3 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 241 ++----- + drivers/gpu/drm/exynos/exynos_drm_mic.c | 22 + + drivers/gpu/drm/gma500/cdv_device.c | 11 +- + drivers/gpu/drm/gma500/cdv_intel_crt.c | 6 +- + drivers/gpu/drm/gma500/cdv_intel_display.c | 9 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 6 +- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 5 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 5 +- + drivers/gpu/drm/gma500/framebuffer.c | 10 +- + drivers/gpu/drm/gma500/gem.c | 161 ++++- + drivers/gpu/drm/gma500/gem.h | 13 +- + drivers/gpu/drm/gma500/gma_display.c | 53 +- + drivers/gpu/drm/gma500/gma_display.h | 10 +- + drivers/gpu/drm/gma500/gtt.c | 295 ++++---- + drivers/gpu/drm/gma500/gtt.h | 8 +- + drivers/gpu/drm/gma500/oaktrail_crtc.c | 25 +- + drivers/gpu/drm/gma500/oaktrail_device.c | 1 - + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 1 - + drivers/gpu/drm/gma500/oaktrail_lvds.c | 16 +- + drivers/gpu/drm/gma500/opregion.c | 5 +- + drivers/gpu/drm/gma500/power.c | 15 +- + drivers/gpu/drm/gma500/psb_device.c | 29 +- + drivers/gpu/drm/gma500/psb_drv.c | 29 +- + drivers/gpu/drm/gma500/psb_drv.h | 90 +-- + drivers/gpu/drm/gma500/psb_intel_display.c | 39 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 5 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 6 +- + drivers/gpu/drm/gma500/psb_irq.c | 94 +-- + drivers/gpu/drm/gma500/psb_irq.h | 19 +- + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/display/g4x_dp.c | 73 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 36 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 24 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 16 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 140 ++-- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 3 +- + drivers/gpu/drm/i915/display/intel_audio.c | 45 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 3 +- + drivers/gpu/drm/i915/display/intel_bios.c | 506 +++++++++---- + drivers/gpu/drm/i915/display/intel_bw.c | 312 +++++--- + drivers/gpu/drm/i915/display/intel_bw.h | 12 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 96 +-- + drivers/gpu/drm/i915/display/intel_cdclk.h | 2 + + drivers/gpu/drm/i915/display/intel_color.c | 95 ++- + drivers/gpu/drm/i915/display/intel_color.h | 3 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 35 +- + drivers/gpu/drm/i915/display/intel_connector.c | 4 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 8 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 27 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 32 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 40 +- + drivers/gpu/drm/i915/display/intel_display.c | 784 ++++++++++----------- + drivers/gpu/drm/i915/display/intel_display.h | 3 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 302 +++----- + drivers/gpu/drm/i915/display/intel_display_power.c | 541 +++----------- + drivers/gpu/drm/i915/display/intel_display_power.h | 37 +- + .../drm/i915/display/intel_display_power_well.c | 113 +++ + .../drm/i915/display/intel_display_power_well.h | 153 ++++ + drivers/gpu/drm/i915/display/intel_display_trace.h | 9 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 43 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 131 +++- + drivers/gpu/drm/i915/display/intel_dmc.h | 10 +- + drivers/gpu/drm/i915/display/intel_dmc_regs.h | 30 + + drivers/gpu/drm/i915/display/intel_dp.c | 581 +++++++++------ + .../gpu/drm/i915/display/intel_dp_link_training.c | 31 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 8 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 44 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 144 ++-- + drivers/gpu/drm/i915/display/intel_dpt.c | 2 +- + drivers/gpu/drm/i915/display/intel_drrs.c | 406 ++++------- + drivers/gpu/drm/i915/display/intel_drrs.h | 20 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 7 +- + drivers/gpu/drm/i915/display/intel_dsi.c | 24 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 7 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 49 +- + drivers/gpu/drm/i915/display/intel_fb.c | 68 +- + drivers/gpu/drm/i915/display/intel_fb.h | 1 + + drivers/gpu/drm/i915/display/intel_fbc.c | 96 ++- + drivers/gpu/drm/i915/display/intel_fbc.h | 2 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 8 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 142 ++-- + drivers/gpu/drm/i915/display/intel_hdcp.c | 1 + + drivers/gpu/drm/i915/display/intel_hdmi.c | 3 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 57 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 22 +- + drivers/gpu/drm/i915/display/intel_panel.c | 359 ++++++---- + drivers/gpu/drm/i915/display/intel_panel.h | 33 +- + drivers/gpu/drm/i915/display/intel_pch_display.c | 99 ++- + drivers/gpu/drm/i915/display/intel_pch_display.h | 10 + + drivers/gpu/drm/i915/display/intel_plane_initial.c | 1 + + drivers/gpu/drm/i915/display/intel_psr.c | 183 ++++- + drivers/gpu/drm/i915/display/intel_psr.h | 5 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 88 +-- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 8 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 51 +- + drivers/gpu/drm/i915/display/intel_tv.c | 12 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 21 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 24 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 4 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 22 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 266 +++++-- + drivers/gpu/drm/i915/display/vlv_dsi.c | 15 +- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 13 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 2 + + drivers/gpu/drm/i915/gem/i915_gem_object.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_region.c | 2 + + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 8 + + drivers/gpu/drm/i915/gem/i915_gem_tiling.h | 2 + + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gemfs.c | 3 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 10 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 7 +- + .../gpu/drm/i915/gem/selftests/i915_gem_migrate.c | 5 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 1 + + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 3 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 11 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 7 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 5 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 + + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 54 +- + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 1 - + drivers/gpu/drm/i915/gt/intel_gtt.c | 12 + + drivers/gpu/drm/i915/gt/intel_gtt.h | 2 + + drivers/gpu/drm/i915/gt/intel_rc6.c | 5 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 3 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 13 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 9 +- + drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c | 10 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 3 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 5 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 5 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c | 6 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 3 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 14 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c | 20 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 + + drivers/gpu/drm/i915/gvt/handlers.c | 20 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 2 + + drivers/gpu/drm/i915/i915_debugfs.c | 18 +- + drivers/gpu/drm/i915/i915_driver.c | 5 +- + drivers/gpu/drm/i915/i915_driver.h | 4 + + drivers/gpu/drm/i915/i915_drv.h | 122 +--- + drivers/gpu/drm/i915/i915_gpu_error.c | 21 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 6 + + drivers/gpu/drm/i915/i915_params.c | 7 +- + drivers/gpu/drm/i915/i915_pci.c | 39 +- + drivers/gpu/drm/i915/i915_pmu.c | 5 +- + drivers/gpu/drm/i915/i915_reg.h | 133 ++-- + drivers/gpu/drm/i915/i915_suspend.c | 4 - + drivers/gpu/drm/i915/i915_utils.c | 11 + + drivers/gpu/drm/i915/i915_utils.h | 37 +- + drivers/gpu/drm/i915/i915_vma.c | 10 +- + drivers/gpu/drm/i915/intel_device_info.c | 11 +- + drivers/gpu/drm/i915/intel_device_info.h | 1 + + drivers/gpu/drm/i915/intel_dram.c | 10 +- + drivers/gpu/drm/i915/intel_memory_region.c | 2 + + drivers/gpu/drm/i915/intel_memory_region.h | 2 +- + drivers/gpu/drm/i915/intel_pch.c | 3 +- + drivers/gpu/drm/i915/intel_pcode.c | 4 +- + drivers/gpu/drm/i915/intel_pm.c | 526 +++++++------- + drivers/gpu/drm/i915/intel_pm.h | 1 + + drivers/gpu/drm/i915/intel_step.c | 7 + + drivers/gpu/drm/i915/intel_uncore.c | 27 +- + drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c | 4 +- + drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 2 - + drivers/gpu/drm/i915/selftests/i915_active.c | 3 +- + .../gpu/drm/i915/selftests/intel_memory_region.c | 7 + + drivers/gpu/drm/i915/vlv_suspend.c | 3 +- + drivers/gpu/drm/imx/imx-ldb.c | 3 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 34 +- + drivers/gpu/drm/lima/lima_gem.c | 10 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 43 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 12 + + drivers/gpu/drm/meson/meson_drv.c | 2 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 18 +- + drivers/gpu/drm/nouveau/dispnv50/atom.h | 6 +- + drivers/gpu/drm/nouveau/dispnv50/crc.c | 27 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 14 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 9 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 2 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 198 +++--- + drivers/gpu/drm/omapdrm/omap_gem.h | 3 +- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 5 +- + drivers/gpu/drm/omapdrm/omap_overlay.c | 2 +- + drivers/gpu/drm/panel/Kconfig | 9 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 30 +- + drivers/gpu/drm/panel/panel-edp.c | 2 + + drivers/gpu/drm/panel/panel-innolux-ej030na.c | 31 +- + drivers/gpu/drm/panel/panel-newvision-nv3052c.c | 482 +++++++++++++ + drivers/gpu/drm/panel/panel-truly-nt35597.c | 3 +- + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 4 + + drivers/gpu/drm/qxl/qxl_kms.c | 4 +- + drivers/gpu/drm/qxl/qxl_release.c | 2 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 6 +- + drivers/gpu/drm/radeon/radeon_cs.c | 4 + + drivers/gpu/drm/radeon/radeon_display.c | 7 +- + drivers/gpu/drm/radeon/radeon_object.c | 8 + + drivers/gpu/drm/radeon/radeon_vm.c | 2 +- + drivers/gpu/drm/scheduler/sched_main.c | 2 + + drivers/gpu/drm/selftests/test-drm_buddy.c | 10 +- + drivers/gpu/drm/solomon/Kconfig | 2 +- + drivers/gpu/drm/solomon/ssd130x.c | 42 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 8 +- + drivers/gpu/drm/tiny/repaper.c | 2 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 225 +++--- + drivers/gpu/drm/ttm/ttm_bo_util.c | 13 +- + drivers/gpu/drm/ttm/ttm_device.c | 82 +-- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 15 +- + drivers/gpu/drm/ttm/ttm_resource.c | 197 +++++- + drivers/gpu/drm/ttm/ttm_tt.c | 12 +- + drivers/gpu/drm/v3d/v3d_gem.c | 15 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 14 +- + drivers/gpu/drm/vc4/vc4_drv.h | 15 +- + drivers/gpu/drm/vc4/vc4_gem.c | 9 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 442 ++++++++++-- + drivers/gpu/drm/vc4/vc4_hdmi.h | 23 +- + drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 2 +- + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 6 + + drivers/gpu/drm/vc4/vc4_hvs.c | 127 ++-- + drivers/gpu/drm/vc4/vc4_irq.c | 5 + + drivers/gpu/drm/vc4/vc4_kms.c | 48 +- + drivers/gpu/drm/vc4/vc4_regs.h | 28 +- + drivers/gpu/drm/vc4/vc4_trace.h | 95 +++ + drivers/gpu/drm/vgem/vgem_fence.c | 12 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 2 + + drivers/gpu/drm/virtio/virtgpu_gem.c | 9 + + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 16 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 13 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 20 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 23 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 28 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 27 +- + drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 81 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 445 +++++++++--- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 29 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 36 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 19 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 27 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 +- + drivers/infiniband/core/umem_dmabuf.c | 8 +- + drivers/iommu/intel/iommu.c | 2 +- + drivers/video/fbdev/Kconfig | 14 +- + drivers/video/fbdev/core/fb_defio.c | 9 +- + include/drm/dp/drm_dp_helper.h | 2 + + include/drm/drm_atomic.h | 27 +- + include/drm/drm_edid.h | 12 +- + include/drm/drm_file.h | 2 +- + include/drm/drm_format_helper.h | 5 +- + include/drm/drm_gem.h | 5 - + include/drm/drm_mipi_dsi.h | 2 + + include/drm/drm_modes.h | 2 + + include/drm/drm_modeset_helper_vtables.h | 2 +- + include/drm/gpu_scheduler.h | 1 + + include/drm/i915_drm.h | 3 +- + include/drm/i915_pciids.h | 4 +- + include/drm/ttm/ttm_bo_api.h | 62 +- + include/drm/ttm/ttm_bo_driver.h | 29 +- + include/drm/ttm/ttm_device.h | 11 - + include/drm/ttm/ttm_resource.h | 74 ++ + include/drm/ttm/ttm_tt.h | 4 +- + include/linux/dma-buf.h | 4 +- + include/linux/dma-resv.h | 73 +- + include/linux/efi.h | 4 - + include/uapi/drm/drm_fourcc.h | 47 ++ + include/uapi/drm/vmwgfx_drm.h | 9 +- + 343 files changed, 10108 insertions(+), 6439 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/leadtek,ltk035c5444t.yaml + create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_well.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_well.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dmc_regs.h + create mode 100644 drivers/gpu/drm/panel/panel-newvision-nv3052c.c +Merging drm-misc/for-linux-next (40f458b7816b Merge drm/drm-next into drm-misc-next) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/radeon/radeon_sync.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_sync.c +Resolved 'drivers/gpu/drm/radeon/radeon_sync.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 24a567e1aa53] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/solomon,ssd1307fb.yaml | 13 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + drivers/dma-buf/dma-buf.c | 24 +- + drivers/dma-buf/dma-resv.c | 403 +++++------- + drivers/dma-buf/st-dma-resv.c | 111 +--- + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 55 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 97 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 359 ++++++----- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h | 89 +++ + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +- + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 10 +- + drivers/gpu/drm/arm/malidp_crtc.c | 5 +- + drivers/gpu/drm/arm/malidp_planes.c | 14 +- + drivers/gpu/drm/bridge/Kconfig | 1 + + drivers/gpu/drm/bridge/chipone-icn6211.c | 96 ++- + drivers/gpu/drm/bridge/display-connector.c | 15 + + drivers/gpu/drm/dp/drm_dp.c | 33 +- + drivers/gpu/drm/drm_buddy.c | 3 + + drivers/gpu/drm/drm_crtc_helper.c | 12 +- + drivers/gpu/drm/drm_edid.c | 358 +++++++---- + drivers/gpu/drm/drm_gem.c | 3 +- + drivers/gpu/drm/drm_gem_atomic_helper.c | 2 +- + drivers/gpu/drm/drm_modes.c | 4 +- + drivers/gpu/drm/drm_vblank.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 10 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_busy.c | 10 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 42 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 20 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 6 +- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 3 +- + .../gpu/drm/i915/gem/selftests/i915_gem_migrate.c | 5 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 4 +- + drivers/gpu/drm/i915/i915_deps.c | 2 +- + drivers/gpu/drm/i915/i915_request.c | 3 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 2 +- + drivers/gpu/drm/i915/i915_vma.c | 17 +- + .../gpu/drm/i915/selftests/intel_memory_region.c | 3 +- + drivers/gpu/drm/ingenic/Kconfig | 9 + + drivers/gpu/drm/ingenic/Makefile | 1 + + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 28 +- + drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c | 103 +++ + drivers/gpu/drm/lima/lima_gem.c | 7 +- + drivers/gpu/drm/msm/msm_gem.c | 3 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/base917c.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 17 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_prime.c | 17 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c | 2 +- + drivers/gpu/drm/panel/panel-lvds.c | 31 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 3 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 2 +- + drivers/gpu/drm/qxl/qxl_debugfs.c | 3 +- + drivers/gpu/drm/qxl/qxl_release.c | 3 +- + drivers/gpu/drm/radeon/radeon_display.c | 3 +- + drivers/gpu/drm/radeon/radeon_gem.c | 9 +- + drivers/gpu/drm/radeon/radeon_mn.c | 4 +- + drivers/gpu/drm/radeon/radeon_object.c | 13 +- + drivers/gpu/drm/radeon/radeon_prime.c | 16 +- + drivers/gpu/drm/radeon/radeon_sync.c | 2 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 12 +- + drivers/gpu/drm/scheduler/sched_main.c | 3 +- + drivers/gpu/drm/solomon/Kconfig | 9 +- + drivers/gpu/drm/solomon/ssd130x-i2c.c | 11 + + drivers/gpu/drm/solomon/ssd130x.c | 73 ++- + drivers/gpu/drm/solomon/ssd130x.h | 2 + + drivers/gpu/drm/sti/sti_gdp.c | 2 +- + drivers/gpu/drm/sti/sti_hdmi.c | 22 +- + drivers/gpu/drm/stm/ltdc.c | 16 +- + drivers/gpu/drm/ttm/ttm_bo.c | 37 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 27 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 34 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 8 +- + drivers/gpu/drm/v3d/v3d_gem.c | 4 +- + drivers/gpu/drm/vc4/vc4_gem.c | 6 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 26 +- + drivers/gpu/drm/vc4/vc4_kms.c | 39 +- + drivers/gpu/drm/vc4/vc4_txp.c | 8 +- + drivers/gpu/drm/vgem/vgem_fence.c | 13 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 7 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 5 - + drivers/infiniband/core/umem_dmabuf.c | 3 +- + drivers/video/fbdev/core/fbcon.c | 708 ++++++++++----------- + drivers/video/fbdev/core/fbcon.h | 8 +- + drivers/video/fbdev/core/fbmem.c | 27 +- + drivers/video/fbdev/core/fbsysfs.c | 2 + + include/drm/dp/drm_dp_helper.h | 1 + + include/drm/ttm/ttm_bo_api.h | 2 - + include/drm/ttm/ttm_bo_driver.h | 11 +- + include/drm/ttm/ttm_resource.h | 3 +- + include/linux/dma-buf.h | 24 +- + include/linux/dma-resv.h | 180 ++++-- + include/linux/fb.h | 1 - + include/linux/seqlock.h | 8 +- + kernel/futex/futex.h | 1 + + 121 files changed, 2076 insertions(+), 1557 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h + create mode 100644 drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c +Merging amdgpu/drm-next (d68cf992ded5 drm/amd/amdgpu: Remove static from variable in RLCG Reg RW) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +Auto-merging include/drm/dp/drm_dp_helper.h +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 968b929673c1] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 13 - + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 23 - + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 1132 ++------------------ + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 49 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 979 +++++++++++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v1_0.h | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_0.h | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_1.h | 2 +- + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 21 - + drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 2 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 14 + + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 74 ++ + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h | 7 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 2 +- + drivers/gpu/drm/amd/amdgpu/smuio_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/smuio_v11_0_6.c | 2 +- + drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/smuio_v9_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 2 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 106 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 71 ++ + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.h | 6 + + drivers/gpu/drm/amd/amdgpu/vi.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 19 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 152 +-- + drivers/gpu/drm/amd/amdkfd/kfd_events.h | 3 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 49 +- + drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 11 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 13 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 37 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 83 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 37 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 9 +- + .../drm/amd/display/dc/bios/bios_parser_common.c | 3 + + .../gpu/drm/amd/display/dc/bios/command_table.c | 3 +- + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 3 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 17 +- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 3 + + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 3 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 26 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 13 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 198 ++-- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 26 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 91 +- + drivers/gpu/drm/amd/display/dc/dc.h | 4 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 14 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 12 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 4 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 25 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 1 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 56 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 16 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 6 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 6 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 26 - + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 5 - + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 24 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h | 2 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 363 +------ + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.h | 4 +- + drivers/gpu/drm/amd/display/dc/dcn315/Makefile | 26 - + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 235 +--- + .../drm/amd/display/dc/dcn315/dcn315_resource.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn316/Makefile | 26 - + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 234 +--- + .../drm/amd/display/dc/dcn316/dcn316_resource.h | 3 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 + + .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 19 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 2 - + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 863 +++++++++++++++ + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 44 + + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 2 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 9 +- + .../gpu/drm/amd/display/dc/link/link_dp_trace.c | 20 + + .../gpu/drm/amd/display/dc/link/link_dp_trace.h | 5 + + .../gpu/drm/amd/display/dc/link/link_hwss_dio.c | 52 + + .../gpu/drm/amd/display/dc/link/link_hwss_dio.h | 1 + + .../gpu/drm/amd/display/dc/link/link_hwss_dpia.c | 28 + + .../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c | 27 + + .../drm/amd/display/dc/link/link_hwss_hpo_frl.c | 19 + + .../drm/amd/display/dc/virtual/virtual_link_hwss.c | 5 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 48 +- + .../gpu/drm/amd/display/include/grph_object_id.h | 1 + + .../drm/amd/display/modules/freesync/freesync.c | 76 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 38 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 8 + + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 6 +- + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 12 + + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 2 +- + .../drm/amd/display/modules/power/power_helpers.c | 38 + + .../drm/amd/display/modules/power/power_helpers.h | 1 + + drivers/gpu/drm/amd/include/amd_shared.h | 66 +- + .../drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h | 13 + + .../drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h | 24 + + drivers/gpu/drm/amd/include/discovery.h | 2 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 87 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h | 2 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 17 + + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 147 +++ + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 2 + + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 2 + + .../inc/pmfw_if/smu11_driver_if_sienna_cichlid.h | 7 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 31 + + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 16 +- + drivers/gpu/drm/radeon/Makefile | 6 +- + drivers/gpu/drm/radeon/cayman_blit_shaders.c | 320 ------ + drivers/gpu/drm/radeon/cayman_blit_shaders.h | 294 ++++- + drivers/gpu/drm/radeon/r600_blit_shaders.c | 719 ------------- + drivers/gpu/drm/radeon/r600_blit_shaders.h | 38 - + drivers/gpu/drm/radeon/radeon_pm.c | 2 +- + drivers/gpu/drm/radeon/si_blit_shaders.c | 253 ----- + drivers/gpu/drm/radeon/si_blit_shaders.h | 223 +++- + include/drm/dp/drm_dp_helper.h | 2 + + 180 files changed, 4327 insertions(+), 4051 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h + delete mode 100644 drivers/gpu/drm/radeon/cayman_blit_shaders.c + delete mode 100644 drivers/gpu/drm/radeon/r600_blit_shaders.c + delete mode 100644 drivers/gpu/drm/radeon/r600_blit_shaders.h + delete mode 100644 drivers/gpu/drm/radeon/si_blit_shaders.c +$ git am -3 ../patches/0001-fix-up-for-drm-ttm-rework-bulk-move-handling-v5.patch +Applying: fix up for "drm/ttm: rework bulk move handling v5" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c +$ git add -A . +$ git commit -v -a --amend +[master 63050a5949c5] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux + Date: Tue Apr 19 10:04:56 2022 +1000 +Merging drm-intel/for-linux-next (b39d2c620242 drm/i915/fbc: Call intel_fbc_activate() directly from frontbuffer flush) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Already up to date. +Merging drm-tegra/drm/tegra/for-next (b53c24f69199 drm/tegra: Support YVYU, VYUY and YU24 formats) +$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next +Merge made by the 'ort' strategy. +Merging drm-msm/msm-next (390d645877ff drm/msm/gpu: Avoid -Wunused-function with !CONFIG_PM_SLEEP) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Merge made by the 'ort' strategy. + drivers/gpu/drm/imx/imx-tve.c | 4 +--- + drivers/gpu/drm/imx/ipuv3-plane.c | 8 +------- + drivers/gpu/ipu-v3/ipu-dc.c | 5 +++-- + drivers/gpu/ipu-v3/ipu-image-convert.c | 9 +++------ + 4 files changed, 8 insertions(+), 18 deletions(-) +Merging etnaviv/etnaviv/next (2829a9fcb738 drm/etnaviv: reap idle softpin mappings when necessary) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 11 ++----- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 54 +++++++++++++++++++++++++++++++++-- + 2 files changed, 55 insertions(+), 10 deletions(-) +Merging fbdev/for-next (610323d8f6f8 video: fbdev: mmp: replace usage of found with dedicated list iterator variable) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'ort' strategy. + drivers/video/fbdev/arkfb.c | 3 +++ + drivers/video/fbdev/aty/aty128fb.c | 1 - + drivers/video/fbdev/aty/atyfb_base.c | 1 - + drivers/video/fbdev/aty/radeon_pm.c | 1 - + drivers/video/fbdev/aty/radeonfb.h | 2 +- + drivers/video/fbdev/controlfb.c | 3 --- + drivers/video/fbdev/i740fb.c | 5 ++++- + drivers/video/fbdev/imxfb.c | 2 ++ + drivers/video/fbdev/kyro/fbdev.c | 2 ++ + drivers/video/fbdev/matrox/matroxfb_base.h | 1 - + drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 2 ++ + drivers/video/fbdev/mmp/core.c | 11 +++++------ + drivers/video/fbdev/neofb.c | 2 +- + drivers/video/fbdev/omap/hwa742.c | 6 +++--- + drivers/video/fbdev/omap/lcdc.c | 6 +++--- + drivers/video/fbdev/omap/sossi.c | 5 +++-- + drivers/video/fbdev/platinumfb.c | 2 +- + drivers/video/fbdev/pm2fb.c | 8 ++------ + drivers/video/fbdev/pxafb.c | 4 ++-- + drivers/video/fbdev/s3fb.c | 3 +++ + drivers/video/fbdev/sh_mobile_lcdcfb.c | 3 --- + drivers/video/fbdev/sis/sis_main.c | 2 +- + drivers/video/fbdev/tridentfb.c | 3 +++ + drivers/video/fbdev/udlfb.c | 14 ++++++++++++-- + drivers/video/fbdev/valkyriefb.c | 3 +-- + drivers/video/fbdev/vt8623fb.c | 3 +++ + drivers/video/of_display_timing.c | 2 +- + include/uapi/linux/fb.h | 2 +- + 28 files changed, 59 insertions(+), 43 deletions(-) +Merging regmap/for-next (bd941dfaae35 regmap: Constify static regmap_bus structs) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/regmap-i3c.c | 2 +- + drivers/base/regmap/regmap-sccb.c | 2 +- + drivers/base/regmap/regmap-sdw-mbq.c | 2 +- + drivers/base/regmap/regmap-sdw.c | 2 +- + drivers/base/regmap/regmap-slimbus.c | 2 +- + drivers/base/regmap/regmap-w1.c | 6 +++--- + 6 files changed, 8 insertions(+), 8 deletions(-) +Merging sound/for-next (faf5933c7954 Merge branch 'for-linus' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging sound/soc/codecs/cs35l41-lib.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/cirrus,cs35l41.yaml | 44 ++- + drivers/firewire/core-card.c | 39 +++ + drivers/firewire/core-cdev.c | 6 +- + drivers/firewire/core-transaction.c | 18 ++ + include/linux/firewire.h | 3 + + include/sound/cs35l41.h | 59 ++++- + include/sound/hda_codec.h | 3 + + include/sound/jack.h | 1 + + sound/core/jack.c | 34 ++- + sound/pci/echoaudio/midi.c | 1 - + sound/pci/emu10k1/emu10k1_main.c | 5 +- + sound/pci/hda/cs35l41_hda.c | 295 +++++++-------------- + sound/pci/hda/cs35l41_hda.h | 27 +- + sound/pci/hda/hda_codec.c | 11 +- + sound/pci/hda/hda_tegra.c | 2 + + sound/soc/codecs/cs35l41-i2c.c | 4 +- + sound/soc/codecs/cs35l41-lib.c | 190 ++++++++++++- + sound/soc/codecs/cs35l41-spi.c | 4 +- + sound/soc/codecs/cs35l41.c | 166 ++++++------ + sound/soc/codecs/cs35l41.h | 5 +- + 20 files changed, 551 insertions(+), 366 deletions(-) +Merging sound-asoc/for-next (5d763a740e5b Merge remote-tracking branch 'asoc/for-5.19' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging MAINTAINERS +Auto-merging include/sound/cs35l41.h +Auto-merging sound/soc/codecs/cs35l41-i2c.c +Auto-merging sound/soc/codecs/cs35l41-lib.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/cirrus,cs35l45.yaml | 75 ++ + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 32 + + .../sound/mt8195-mt6359-rt1011-rt5682.yaml | 51 - + ...t6359-rt1019-rt5682.yaml => mt8195-mt6359.yaml} | 9 +- + .../bindings/sound/nvidia,tegra186-asrc.yaml | 81 ++ + .../bindings/sound/nvidia,tegra210-ahub.yaml | 4 + + .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 17 +- + .../bindings/sound/qcom,lpass-rx-macro.yaml | 17 +- + .../bindings/sound/qcom,lpass-tx-macro.yaml | 17 +- + .../bindings/sound/qcom,lpass-va-macro.yaml | 11 +- + .../devicetree/bindings/sound/qcom,wcd938x.yaml | 3 + + .../bindings/sound/{tas2764.yaml => tas27xx.yaml} | 17 +- + .../devicetree/bindings/sound/wlf,wm8731.yaml | 97 ++ + Documentation/devicetree/bindings/sound/wm8731.txt | 27 - + MAINTAINERS | 2 + + arch/arm/configs/multi_v5_defconfig | 3 +- + drivers/staging/greybus/audio_codec.c | 12 +- + include/dt-bindings/sound/cs35l45.h | 20 + + include/sound/cs35l41.h | 1 - + include/sound/soc-card.h | 7 +- + include/sound/soc.h | 8 + + sound/soc/Kconfig | 9 +- + sound/soc/Makefile | 5 + + sound/soc/amd/acp-da7219-max98357a.c | 4 +- + sound/soc/amd/acp-rt5645.c | 2 +- + sound/soc/amd/acp/acp-mach-common.c | 4 +- + sound/soc/amd/acp3x-rt5682-max9836.c | 2 +- + sound/soc/amd/vangogh/acp5x-mach.c | 8 +- + sound/soc/amd/yc/acp6x-mach.c | 42 +- + sound/soc/amd/yc/pci-acp6x.c | 9 +- + sound/soc/atmel/Kconfig | 4 +- + sound/soc/atmel/sam9g20_wm8731.c | 13 +- + sound/soc/au1x/Kconfig | 2 +- + sound/soc/codecs/Kconfig | 53 +- + sound/soc/codecs/Makefile | 14 + + sound/soc/codecs/ad193x-i2c.c | 6 +- + sound/soc/codecs/adau1372-i2c.c | 4 +- + sound/soc/codecs/adau1373.c | 5 +- + sound/soc/codecs/adau1701.c | 5 +- + sound/soc/codecs/adau1761-i2c.c | 8 +- + sound/soc/codecs/adau1781-i2c.c | 8 +- + sound/soc/codecs/adau1977-i2c.c | 8 +- + sound/soc/codecs/adau7118-i2c.c | 5 +- + sound/soc/codecs/adav803.c | 5 +- + sound/soc/codecs/ak4118.c | 5 +- + sound/soc/codecs/ak4535.c | 5 +- + sound/soc/codecs/ak4613.c | 367 ++++-- + sound/soc/codecs/ak4641.c | 5 +- + sound/soc/codecs/ak4671.c | 5 +- + sound/soc/codecs/cs35l32.c | 5 +- + sound/soc/codecs/cs35l33.c | 5 +- + sound/soc/codecs/cs35l34.c | 5 +- + sound/soc/codecs/cs35l35.c | 5 +- + sound/soc/codecs/cs35l36.c | 5 +- + sound/soc/codecs/cs35l41-i2c.c | 5 +- + sound/soc/codecs/cs35l41-lib.c | 16 +- + sound/soc/codecs/cs35l45-i2c.c | 74 ++ + sound/soc/codecs/cs35l45-spi.c | 74 ++ + sound/soc/codecs/cs35l45-tables.c | 202 ++++ + sound/soc/codecs/cs35l45.c | 694 ++++++++++++ + sound/soc/codecs/cs35l45.h | 217 ++++ + sound/soc/codecs/cs4234.c | 4 +- + sound/soc/codecs/cs4265.c | 5 +- + sound/soc/codecs/cs4270.c | 5 +- + sound/soc/codecs/cs4271-i2c.c | 5 +- + sound/soc/codecs/cs42l42.c | 5 +- + sound/soc/codecs/cs42l51-i2c.c | 5 +- + sound/soc/codecs/cs42l52.c | 5 +- + sound/soc/codecs/cs42l56.c | 5 +- + sound/soc/codecs/cs42l73.c | 5 +- + sound/soc/codecs/cs42xx8-i2c.c | 5 +- + sound/soc/codecs/cs43130.c | 7 +- + sound/soc/codecs/cs4341.c | 5 +- + sound/soc/codecs/cs4349.c | 5 +- + sound/soc/codecs/cs53l30.c | 5 +- + sound/soc/codecs/cx2072x.c | 5 +- + sound/soc/codecs/da7210.c | 5 +- + sound/soc/codecs/da7213.c | 5 +- + sound/soc/codecs/da7218.c | 19 +- + sound/soc/codecs/da7219.c | 5 +- + sound/soc/codecs/da732x.c | 5 +- + sound/soc/codecs/da9055.c | 5 +- + sound/soc/codecs/es8316.c | 5 +- + sound/soc/codecs/es8328-i2c.c | 5 +- + sound/soc/codecs/isabelle.c | 5 +- + sound/soc/codecs/lm4857.c | 5 +- + sound/soc/codecs/lm49453.c | 5 +- + sound/soc/codecs/lpass-macro-common.c | 35 +- + sound/soc/codecs/max9768.c | 5 +- + sound/soc/codecs/max98371.c | 5 +- + sound/soc/codecs/max98373-i2c.c | 5 +- + sound/soc/codecs/max98390.c | 5 +- + sound/soc/codecs/max9850.c | 5 +- + sound/soc/codecs/max98504.c | 5 +- + sound/soc/codecs/max98520.c | 4 +- + sound/soc/codecs/max9867.c | 5 +- + sound/soc/codecs/max9877.c | 5 +- + sound/soc/codecs/max98925.c | 5 +- + sound/soc/codecs/max98926.c | 5 +- + sound/soc/codecs/max98927.c | 5 +- + sound/soc/codecs/ml26124.c | 5 +- + sound/soc/codecs/mt6660.c | 5 +- + sound/soc/codecs/nau8540.c | 5 +- + sound/soc/codecs/nau8810.c | 5 +- + sound/soc/codecs/nau8821.c | 5 +- + sound/soc/codecs/nau8822.c | 5 +- + sound/soc/codecs/nau8824.c | 5 +- + sound/soc/codecs/nau8825.c | 5 +- + sound/soc/codecs/pcm1681.c | 5 +- + sound/soc/codecs/pcm1789-i2c.c | 5 +- + sound/soc/codecs/pcm179x-i2c.c | 5 +- + sound/soc/codecs/pcm3060-i2c.c | 5 +- + sound/soc/codecs/pcm3168a-i2c.c | 5 +- + sound/soc/codecs/pcm512x-i2c.c | 5 +- + sound/soc/codecs/rt1011.c | 5 +- + sound/soc/codecs/rt1015.c | 5 +- + sound/soc/codecs/rt1016.c | 5 +- + sound/soc/codecs/rt1019.c | 5 +- + sound/soc/codecs/rt1305.c | 5 +- + sound/soc/codecs/rt1308.c | 5 +- + sound/soc/codecs/rt274.c | 5 +- + sound/soc/codecs/rt286.c | 5 +- + sound/soc/codecs/rt298.c | 5 +- + sound/soc/codecs/rt5514.c | 5 +- + sound/soc/codecs/rt5616.c | 5 +- + sound/soc/codecs/rt5631.c | 5 +- + sound/soc/codecs/rt5640.c | 5 +- + sound/soc/codecs/rt5645.c | 5 +- + sound/soc/codecs/rt5651.c | 5 +- + sound/soc/codecs/rt5659.c | 5 +- + sound/soc/codecs/rt5660.c | 5 +- + sound/soc/codecs/rt5663.c | 5 +- + sound/soc/codecs/rt5665.c | 5 +- + sound/soc/codecs/rt5668.c | 5 +- + sound/soc/codecs/rt5670.c | 5 +- + sound/soc/codecs/rt5682-i2c.c | 5 +- + sound/soc/codecs/rt5682s.c | 32 +- + sound/soc/codecs/rt5682s.h | 6 +- + sound/soc/codecs/sgtl5000.c | 5 +- + sound/soc/codecs/ssm2518.c | 5 +- + sound/soc/codecs/ssm2602-i2c.c | 8 +- + sound/soc/codecs/ssm4567.c | 5 +- + sound/soc/codecs/sta32x.c | 5 +- + sound/soc/codecs/sta350.c | 5 +- + sound/soc/codecs/sta529.c | 5 +- + sound/soc/codecs/tas2552.c | 5 +- + sound/soc/codecs/tas2764.c | 5 +- + sound/soc/codecs/tas2770.c | 5 +- + sound/soc/codecs/tas5086.c | 5 +- + sound/soc/codecs/tas6424.c | 5 +- + sound/soc/codecs/tda7419.c | 5 +- + sound/soc/codecs/tlv320adcx140.c | 5 +- + sound/soc/codecs/tlv320aic23-i2c.c | 5 +- + sound/soc/codecs/tlv320dac33.c | 5 +- + sound/soc/codecs/ts3a227e.c | 5 +- + sound/soc/codecs/tscs42xx.c | 5 +- + sound/soc/codecs/tscs454.c | 5 +- + sound/soc/codecs/uda1380.c | 5 +- + sound/soc/codecs/wm1250-ev1.c | 5 +- + sound/soc/codecs/wm2000.c | 5 +- + sound/soc/codecs/wm2200.c | 5 +- + sound/soc/codecs/wm5100.c | 5 +- + sound/soc/codecs/wm8510.c | 5 +- + sound/soc/codecs/wm8523.c | 5 +- + sound/soc/codecs/wm8580.c | 5 +- + sound/soc/codecs/wm8711.c | 5 +- + sound/soc/codecs/wm8728.c | 5 +- + sound/soc/codecs/wm8731-i2c.c | 68 ++ + sound/soc/codecs/wm8731-spi.c | 59 + + sound/soc/codecs/wm8731.c | 267 +---- + sound/soc/codecs/wm8731.h | 27 + + sound/soc/codecs/wm8737.c | 5 +- + sound/soc/codecs/wm8741.c | 5 +- + sound/soc/codecs/wm8750.c | 5 +- + sound/soc/codecs/wm8753.c | 5 +- + sound/soc/codecs/wm8776.c | 5 +- + sound/soc/codecs/wm8804-i2c.c | 5 +- + sound/soc/codecs/wm8900.c | 5 +- + sound/soc/codecs/wm8903.c | 5 +- + sound/soc/codecs/wm8904.c | 9 +- + sound/soc/codecs/wm8940.c | 5 +- + sound/soc/codecs/wm8955.c | 5 +- + sound/soc/codecs/wm8960.c | 5 +- + sound/soc/codecs/wm8961.c | 5 +- + sound/soc/codecs/wm8962.c | 5 +- + sound/soc/codecs/wm8971.c | 5 +- + sound/soc/codecs/wm8974.c | 5 +- + sound/soc/codecs/wm8978.c | 5 +- + sound/soc/codecs/wm8983.c | 5 +- + sound/soc/codecs/wm8985.c | 8 +- + sound/soc/codecs/wm8988.c | 5 +- + sound/soc/codecs/wm8990.c | 5 +- + sound/soc/codecs/wm8991.c | 5 +- + sound/soc/codecs/wm8993.c | 5 +- + sound/soc/codecs/wm8995.c | 5 +- + sound/soc/codecs/wm8996.c | 5 +- + sound/soc/codecs/wm9081.c | 5 +- + sound/soc/codecs/wm9090.c | 5 +- + sound/soc/fsl/fsl_esai.c | 6 +- + sound/soc/fsl/imx-es8328.c | 2 +- + sound/soc/fsl/imx-hdmi.c | 5 +- + sound/soc/generic/simple-card-utils.c | 5 +- + sound/soc/intel/atom/sst/sst.c | 1 - + sound/soc/intel/boards/bdw-rt5650.c | 6 +- + sound/soc/intel/boards/bdw-rt5677.c | 4 +- + sound/soc/intel/boards/broadwell.c | 2 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 5 +- + sound/soc/intel/boards/bxt_rt298.c | 5 +- + sound/soc/intel/boards/bytcht_cx2072x.c | 10 +- + sound/soc/intel/boards/bytcht_es8316.c | 8 +- + sound/soc/intel/boards/bytcr_rt5640.c | 24 +- + sound/soc/intel/boards/bytcr_rt5651.c | 7 +- + sound/soc/intel/boards/bytcr_wm5102.c | 6 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 28 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 4 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 6 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 12 +- + sound/soc/intel/boards/cml_rt1011_rt5682.c | 5 +- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 5 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 5 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 5 +- + sound/soc/intel/boards/kbl_rt5660.c | 15 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 7 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 7 +- + sound/soc/intel/boards/skl_hda_dsp_common.c | 8 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 6 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 6 +- + sound/soc/intel/boards/skl_rt286.c | 5 +- + sound/soc/intel/boards/sof_cs42l42.c | 5 +- + sound/soc/intel/boards/sof_da7219_max98373.c | 2 +- + sound/soc/intel/boards/sof_es8336.c | 8 +- + sound/soc/intel/boards/sof_nau8825.c | 2 +- + sound/soc/intel/boards/sof_rt5682.c | 5 +- + sound/soc/intel/boards/sof_sdw_rt5682.c | 14 +- + sound/soc/intel/boards/sof_sdw_rt700.c | 14 +- + sound/soc/intel/boards/sof_sdw_rt711.c | 14 +- + sound/soc/intel/boards/sof_sdw_rt711_sdca.c | 14 +- + sound/soc/intel/boards/sof_ssp_amp.c | 3 +- + sound/soc/intel/catpt/messages.h | 4 +- + sound/soc/mediatek/Kconfig | 27 +- + sound/soc/mediatek/mt2701/mt2701-wm8960.c | 9 +- + sound/soc/mediatek/mt8173/mt8173-max98090.c | 13 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 4 +- + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 5 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 5 +- + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 203 ++-- + sound/soc/mediatek/mt8195/Makefile | 3 +- + .../mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c | 1198 -------------------- + ...8195-mt6359-rt1019-rt5682.c => mt8195-mt6359.c} | 867 +++++++++----- + sound/soc/pxa/Kconfig | 4 +- + sound/soc/pxa/hx4700.c | 6 +- + sound/soc/pxa/palm27x.c | 7 +- + sound/soc/pxa/ttc-dkb.c | 14 +- + sound/soc/pxa/z2.c | 7 +- + sound/soc/qcom/Kconfig | 2 + + sound/soc/qcom/apq8016_sbc.c | 2 +- + sound/soc/qcom/sc7180.c | 4 +- + sound/soc/qcom/sc7280.c | 111 +- + sound/soc/qcom/sdm845.c | 2 +- + sound/soc/qcom/sm8250.c | 2 +- + sound/soc/rockchip/rk3288_hdmi_analog.c | 8 +- + sound/soc/rockchip/rk3399_gru_sound.c | 16 +- + sound/soc/rockchip/rockchip_max98090.c | 16 +- + sound/soc/rockchip/rockchip_rt5645.c | 2 +- + sound/soc/samsung/aries_wm8994.c | 4 +- + sound/soc/samsung/bells.c | 4 +- + sound/soc/samsung/h1940_uda1380.c | 3 +- + sound/soc/samsung/littlemill.c | 6 +- + sound/soc/samsung/lowland.c | 13 +- + sound/soc/samsung/midas_wm1811.c | 2 +- + sound/soc/samsung/rx1950_uda1380.c | 3 +- + sound/soc/samsung/smartq_wm8987.c | 8 +- + sound/soc/samsung/speyside.c | 14 +- + sound/soc/samsung/tobermory.c | 12 +- + sound/soc/sh/rcar/core.c | 2 +- + sound/soc/soc-card.c | 56 +- + sound/soc/soc-core.c | 80 ++ + sound/soc/soc-jack.c | 2 +- + sound/soc/soc-topology.c | 455 ++++---- + sound/soc/soc-utils-test.c | 186 +++ + sound/soc/soc-utils.c | 45 + + sound/soc/sof/compress.c | 8 +- + sound/soc/sof/control.c | 33 - + sound/soc/sof/debug.c | 2 +- + sound/soc/sof/intel/hda-dsp.c | 8 +- + sound/soc/sof/intel/hda-loader.c | 12 +- + sound/soc/sof/intel/pci-tng.c | 6 +- + sound/soc/sof/intel/tgl.c | 6 +- + sound/soc/sof/ipc.c | 894 +-------------- + sound/soc/sof/ipc3-control.c | 131 ++- + sound/soc/sof/ipc3-pcm.c | 8 +- + sound/soc/sof/ipc3-topology.c | 26 +- + sound/soc/sof/ipc3.c | 682 ++++++++++- + sound/soc/sof/mediatek/mt8195/mt8195.c | 7 + + sound/soc/sof/pcm.c | 5 +- + sound/soc/sof/pm.c | 20 +- + sound/soc/sof/sof-audio.c | 57 +- + sound/soc/sof/sof-audio.h | 8 +- + sound/soc/sof/sof-client.c | 2 +- + sound/soc/sof/sof-of-dev.c | 6 + + sound/soc/sof/sof-of-dev.h | 1 + + sound/soc/sof/sof-priv.h | 55 +- + sound/soc/sof/topology.c | 24 +- + sound/soc/sof/trace.c | 61 +- + sound/soc/tegra/Kconfig | 12 + + sound/soc/tegra/Makefile | 2 + + sound/soc/tegra/tegra186_asrc.c | 1046 +++++++++++++++++ + sound/soc/tegra/tegra186_asrc.h | 112 ++ + sound/soc/tegra/tegra210_ahub.c | 82 +- + sound/soc/tegra/tegra_asoc_machine.c | 30 +- + sound/soc/tegra/tegra_wm8903.c | 10 +- + sound/soc/ti/ams-delta.c | 4 +- + sound/soc/ti/omap-abe-twl6040.c | 8 +- + sound/soc/ti/omap-twl4030.c | 8 +- + sound/soc/ti/osk5912.c | 4 +- + sound/soc/ti/rx51.c | 2 +- + 318 files changed, 6605 insertions(+), 4116 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs35l45.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml + rename Documentation/devicetree/bindings/sound/{mt8195-mt6359-rt1019-rt5682.yaml => mt8195-mt6359.yaml} (84%) + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra186-asrc.yaml + rename Documentation/devicetree/bindings/sound/{tas2764.yaml => tas27xx.yaml} (73%) + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8731.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt + create mode 100644 include/dt-bindings/sound/cs35l45.h + create mode 100644 sound/soc/codecs/cs35l45-i2c.c + create mode 100644 sound/soc/codecs/cs35l45-spi.c + create mode 100644 sound/soc/codecs/cs35l45-tables.c + create mode 100644 sound/soc/codecs/cs35l45.c + create mode 100644 sound/soc/codecs/cs35l45.h + create mode 100644 sound/soc/codecs/wm8731-i2c.c + create mode 100644 sound/soc/codecs/wm8731-spi.c + delete mode 100644 sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c + rename sound/soc/mediatek/mt8195/{mt8195-mt6359-rt1019-rt5682.c => mt8195-mt6359.c} (78%) + create mode 100644 sound/soc/soc-utils-test.c + create mode 100644 sound/soc/tegra/tegra186_asrc.c + create mode 100644 sound/soc/tegra/tegra186_asrc.h +Merging modules/modules-next (eeaec7801c42 powerpc: Select ARCH_WANTS_MODULES_DATA_IN_VMALLOC on book3s/32 and 8xx) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Auto-merging MAINTAINERS +Auto-merging kernel/Makefile +Merge made by the 'ort' strategy. + MAINTAINERS | 4 +- + arch/Kconfig | 6 + + arch/powerpc/Kconfig | 1 + + include/linux/kdb.h | 1 + + include/linux/module.h | 29 +- + kernel/Makefile | 5 +- + kernel/debug/kdb/kdb_io.c | 1 - + kernel/debug/kdb/kdb_keyboard.c | 1 - + kernel/debug/kdb/kdb_main.c | 49 - + kernel/debug/kdb/kdb_private.h | 4 - + kernel/debug/kdb/kdb_support.c | 1 - + kernel/module-internal.h | 50 - + kernel/module/Makefile | 20 + + kernel/module/debug_kmemleak.c | 30 + + .../{module_decompress.c => module/decompress.c} | 5 +- + kernel/module/internal.h | 268 +++ + kernel/module/kallsyms.c | 512 +++++ + kernel/module/kdb.c | 62 + + kernel/module/livepatch.c | 74 + + kernel/{module.c => module/main.c} | 2007 ++------------------ + kernel/module/procfs.c | 146 ++ + kernel/module/signing.c | 122 ++ + kernel/module/strict_rwx.c | 143 ++ + kernel/module/sysfs.c | 436 +++++ + kernel/module/tree_lookup.c | 117 ++ + kernel/module/version.c | 109 ++ + kernel/module_signing.c | 45 - + 27 files changed, 2243 insertions(+), 2005 deletions(-) + delete mode 100644 kernel/module-internal.h + create mode 100644 kernel/module/Makefile + create mode 100644 kernel/module/debug_kmemleak.c + rename kernel/{module_decompress.c => module/decompress.c} (99%) + create mode 100644 kernel/module/internal.h + create mode 100644 kernel/module/kallsyms.c + create mode 100644 kernel/module/kdb.c + create mode 100644 kernel/module/livepatch.c + rename kernel/{module.c => module/main.c} (62%) + create mode 100644 kernel/module/procfs.c + create mode 100644 kernel/module/signing.c + create mode 100644 kernel/module/strict_rwx.c + create mode 100644 kernel/module/sysfs.c + create mode 100644 kernel/module/tree_lookup.c + create mode 100644 kernel/module/version.c + delete mode 100644 kernel/module_signing.c +Merging input/next (66ab05c75642 Input: iqs7222 - avoid dereferencing a NULL pointer) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/azoteq,iqs7222.yaml | 960 ++++++++ + drivers/input/keyboard/mt6779-keypad.c | 10 +- + drivers/input/misc/Kconfig | 10 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/iqs7222.c | 2446 ++++++++++++++++++++ + 5 files changed, 3422 insertions(+), 5 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml + create mode 100644 drivers/input/misc/iqs7222.c +Merging block/for-next (7c8ea0124c1b Merge branch 'for-5.19/io_uring' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging block/bdev.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/volumes.h +Auto-merging fs/btrfs/zoned.c +Auto-merging fs/exfat/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/segment.c +Auto-merging fs/internal.h +Auto-merging fs/ntfs3/file.c +Auto-merging include/linux/blkdev.h +Merge made by the 'ort' strategy. + arch/um/drivers/ubd_kern.c | 2 - + block/bdev.c | 16 +- + block/bfq-cgroup.c | 111 ++- + block/bfq-iosched.c | 56 +- + block/bfq-iosched.h | 6 +- + block/bio.c | 135 ++- + block/blk-core.c | 56 +- + block/blk-crypto-fallback.c | 14 +- + block/blk-lib.c | 124 +-- + block/blk-map.c | 42 +- + block/blk-mq-debugfs.c | 2 - + block/blk-settings.c | 74 +- + block/blk.h | 21 - + block/fops.c | 13 +- + block/genhd.c | 4 +- + block/ioctl.c | 48 +- + block/partitions/core.c | 14 +- + drivers/block/drbd/drbd_bitmap.c | 2 +- + drivers/block/drbd/drbd_main.c | 62 +- + drivers/block/drbd/drbd_nl.c | 127 ++- + drivers/block/drbd/drbd_receiver.c | 28 +- + drivers/block/drbd/drbd_req.c | 2 +- + drivers/block/drbd/drbd_state.c | 3 +- + drivers/block/drbd/drbd_worker.c | 2 +- + drivers/block/loop.c | 272 +++--- + drivers/block/loop.h | 1 - + drivers/block/nbd.c | 21 +- + drivers/block/null_blk/main.c | 1 - + drivers/block/pktcdvd.c | 34 +- + drivers/block/rbd.c | 1 - + drivers/block/rnbd/rnbd-clt.c | 20 +- + drivers/block/rnbd/rnbd-srv-dev.h | 8 +- + drivers/block/rnbd/rnbd-srv.c | 5 +- + drivers/block/virtio_blk.c | 2 - + drivers/block/xen-blkback/blkback.c | 15 +- + drivers/block/xen-blkback/xenbus.c | 9 +- + drivers/block/xen-blkfront.c | 8 +- + drivers/block/zram/zram_drv.c | 35 +- + drivers/md/bcache/alloc.c | 2 +- + drivers/md/bcache/debug.c | 10 +- + drivers/md/bcache/request.c | 4 +- + drivers/md/bcache/super.c | 3 +- + drivers/md/bcache/sysfs.c | 2 +- + drivers/md/dm-bufio.c | 9 +- + drivers/md/dm-cache-target.c | 9 +- + drivers/md/dm-clone-target.c | 9 +- + drivers/md/dm-io.c | 2 +- + drivers/md/dm-log-writes.c | 3 +- + drivers/md/dm-raid.c | 9 +- + drivers/md/dm-table.c | 25 +- + drivers/md/dm-thin.c | 15 +- + drivers/md/dm.c | 3 +- + drivers/md/md-linear.c | 11 +- + drivers/md/md.c | 5 +- + drivers/md/raid0.c | 7 - + drivers/md/raid1.c | 30 +- + drivers/md/raid10.c | 41 +- + drivers/md/raid5-cache.c | 8 +- + drivers/md/raid5.c | 14 +- + drivers/mmc/core/queue.c | 3 +- + drivers/mtd/mtd_blkdevs.c | 1 - + drivers/nvme/host/core.c | 4 +- + drivers/nvme/target/io-cmd-bdev.c | 2 +- + drivers/nvme/target/zns.c | 3 +- + drivers/s390/block/dasd_fba.c | 1 - + drivers/scsi/sd.c | 2 - + drivers/target/target_core_device.c | 20 +- + drivers/target/target_core_file.c | 10 +- + drivers/target/target_core_iblock.c | 17 +- + drivers/target/target_core_pscsi.c | 36 +- + fs/btrfs/disk-io.c | 11 +- + fs/btrfs/extent-tree.c | 8 +- + fs/btrfs/ioctl.c | 12 +- + fs/btrfs/volumes.c | 15 +- + fs/btrfs/volumes.h | 4 +- + fs/btrfs/zoned.c | 3 +- + fs/direct-io.c | 32 +- + fs/exfat/file.c | 5 +- + fs/exfat/super.c | 10 +- + fs/ext4/ioctl.c | 10 +- + fs/ext4/mballoc.c | 10 +- + fs/ext4/super.c | 10 +- + fs/f2fs/f2fs.h | 3 +- + fs/f2fs/file.c | 19 +- + fs/f2fs/segment.c | 8 +- + fs/fat/file.c | 5 +- + fs/fat/inode.c | 10 +- + fs/gfs2/rgrp.c | 7 +- + fs/internal.h | 29 + + fs/io_uring.c | 1565 +++++++++++++++++++++------------- + fs/iomap/direct-io.c | 3 +- + fs/jbd2/journal.c | 9 +- + fs/jfs/ioctl.c | 5 +- + fs/jfs/super.c | 8 +- + fs/nilfs2/ioctl.c | 6 +- + fs/nilfs2/sufile.c | 4 +- + fs/nilfs2/the_nilfs.c | 4 +- + fs/ntfs3/file.c | 6 +- + fs/ntfs3/super.c | 10 +- + fs/ocfs2/ioctl.c | 5 +- + fs/squashfs/block.c | 20 +- + fs/super.c | 2 +- + fs/xattr.c | 141 ++- + fs/xfs/xfs_discard.c | 8 +- + fs/xfs/xfs_log_cil.c | 2 +- + fs/xfs/xfs_super.c | 12 +- + fs/zonefs/super.c | 3 +- + include/linux/bio.h | 10 +- + include/linux/blk_types.h | 5 +- + include/linux/blkdev.h | 134 ++- + include/linux/socket.h | 1 + + include/target/target_core_backend.h | 4 +- + include/trace/events/io_uring.h | 9 +- + include/uapi/linux/io_uring.h | 9 +- + mm/swapfile.c | 31 +- + net/socket.c | 52 +- + 116 files changed, 2143 insertions(+), 1852 deletions(-) +Merging device-mapper/for-next (7d8342b5551a dm: improve abnormal bio processing) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Merge made by the 'ort' strategy. + drivers/md/dm-core.h | 38 ++-- + drivers/md/dm-delay.c | 3 +- + drivers/md/dm-flakey.c | 4 +- + drivers/md/dm-linear.c | 11 +- + drivers/md/dm-stats.c | 3 + + drivers/md/dm-table.c | 16 +- + drivers/md/dm-zone.c | 10 - + drivers/md/dm.c | 515 ++++++++++++++++++++++++++++--------------------- + drivers/md/dm.h | 4 +- + 9 files changed, 340 insertions(+), 264 deletions(-) +Merging libata/for-next (8feecea4de7e dt-bindings: ata: renesas,rcar-sata: Add r8a774e1 support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/ata/renesas,rcar-sata.yaml | 1 + + Documentation/driver-api/libata.rst | 11 ----- + drivers/ata/libata-core.c | 50 +--------------------- + drivers/ata/libata-sata.c | 25 ----------- + drivers/ata/libata-scsi.c | 46 +++++++++++++++----- + drivers/ata/libata.h | 13 ------ + drivers/ata/pata_mpc52xx.c | 3 +- + drivers/ata/pata_sil680.c | 30 ++++++------- + drivers/ata/pata_via.c | 6 +-- + include/linux/libata.h | 3 +- + 10 files changed, 57 insertions(+), 131 deletions(-) +Merging pcmcia/pcmcia-next (3928cf08334e pcmcia: db1xxx_ss: restrict to MIPS_DB1XXX boards) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Auto-merging drivers/pcmcia/Kconfig +Merge made by the 'ort' strategy. + drivers/pcmcia/Kconfig | 2 +- + drivers/pcmcia/rsrc_nonstatic.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging mmc/next (0dcf1c1a6ec2 dt-bindings: mmc: imx-esdhc: Update compatible fallbacks) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 30 ++- + .../bindings/mmc/marvell,xenon-sdhci.txt | 173 ------------- + .../bindings/mmc/marvell,xenon-sdhci.yaml | 275 +++++++++++++++++++++ + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 15 +- + MAINTAINERS | 3 +- + drivers/mmc/core/block.c | 16 +- + drivers/mmc/core/core.c | 10 +- + drivers/mmc/core/mmc.c | 25 +- + drivers/mmc/host/bcm2835.c | 2 +- + drivers/mmc/host/dw_mmc.c | 2 +- + drivers/mmc/host/meson-mx-sdhc-mmc.c | 2 +- + drivers/mmc/host/mmci_stm32_sdmmc.c | 88 +++++-- + drivers/mmc/host/mtk-sd.c | 2 +- + drivers/mmc/host/of_mmc_spi.c | 4 + + drivers/mmc/host/omap.c | 23 +- + drivers/mmc/host/renesas_sdhi.h | 2 + + drivers/mmc/host/renesas_sdhi_core.c | 2 - + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 76 +++--- + drivers/mmc/host/sdhci.c | 2 +- + drivers/mmc/host/sunxi-mmc.c | 2 +- + drivers/mmc/host/uniphier-sd.c | 2 +- + include/linux/mmc/core.h | 2 +- + include/linux/mmc/host.h | 2 +- + 23 files changed, 488 insertions(+), 272 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt + create mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml +Merging mfd/for-mfd-next (d99460ed5cdc dt-bindings: mfd: syscon: Add microchip,lan966x-cpu-syscon compatible) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (023a8830a628 backlight: backlight: Slighly simplify devm_of_find_backlight()) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Already up to date. +Merging regulator/for-next (b113137a1793 Merge remote-tracking branch 'regulator/for-5.19' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + .../bindings/regulator/mt6358-regulator.txt | 22 +- + .../bindings/regulator/qcom,rpmh-regulator.yaml | 2 +- + .../regulator/richtek,rt4801-regulator.yaml | 7 +- + .../regulator/richtek,rt5759-regulator.yaml | 90 +++++ + .../regulator/socionext,uniphier-regulator.yaml | 57 +++- + drivers/regulator/Kconfig | 10 + + drivers/regulator/Makefile | 1 + + drivers/regulator/core.c | 18 + + drivers/regulator/fixed.c | 5 +- + drivers/regulator/mt6358-regulator.c | 213 +++++++++++- + drivers/regulator/rpi-panel-attiny-regulator.c | 1 - + drivers/regulator/rt5759-regulator.c | 369 +++++++++++++++++++++ + include/linux/regulator/mt6358-regulator.h | 45 +++ + 13 files changed, 801 insertions(+), 39 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rt5759-regulator.yaml + create mode 100644 drivers/regulator/rt5759-regulator.c +Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) +$ git merge -m Merge branch 'next-testing' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git security/next-testing +Auto-merging security/commoncap.c +Merge made by the 'ort' strategy. +Merging apparmor/apparmor-next (c2489617b3b9 apparmor: Fix undefined reference to `zlib_deflate_workspacesize') +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging MAINTAINERS +Auto-merging security/apparmor/lsm.c +Merge made by the 'ort' strategy. + MAINTAINERS | 7 ++- + security/apparmor/Kconfig | 86 ++++++++++++++++++++--------- + security/apparmor/apparmorfs.c | 99 +++++++++++++++++++--------------- + security/apparmor/audit.c | 2 +- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/apparmorfs.h | 14 +++++ + security/apparmor/include/lib.h | 5 ++ + security/apparmor/label.c | 17 +++--- + security/apparmor/lib.c | 2 +- + security/apparmor/lsm.c | 23 ++++---- + security/apparmor/mount.c | 11 ++-- + security/apparmor/policy.c | 35 ++++++------ + security/apparmor/policy_unpack.c | 37 ++++++++----- + security/apparmor/policy_unpack_test.c | 34 ++++++------ + security/apparmor/procattr.c | 2 +- + 15 files changed, 234 insertions(+), 141 deletions(-) +Merging integrity/next-integrity (29d1c2b47ef3 ima: remove redundant initialization of pointer 'file'.) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Merge made by the 'ort' strategy. + security/integrity/ima/ima_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (6a9e261cbbee selinux: don't sleep when CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE is true) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Merge made by the 'ort' strategy. + security/selinux/avc.c | 4 ++-- + security/selinux/hooks.c | 5 +++-- + security/selinux/include/security.h | 4 ++++ + security/selinux/selinuxfs.c | 8 ++++++-- + security/selinux/ss/services.c | 1 - + 5 files changed, 15 insertions(+), 7 deletions(-) +Merging smack/next (ba6b652bd863 smack: Remove redundant assignments) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smackfs.c +Merge made by the 'ort' strategy. + security/smack/smackfs.c | 1 - + 1 file changed, 1 deletion(-) +Merging tomoyo/master (ae5d03879e63 workqueue: Warn flushing of kernel-global workqueues) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Merge made by the 'ort' strategy. + include/linux/workqueue.h | 15 +++------------ + kernel/workqueue.c | 36 +++++++++++++++++++++++++++++------- + 2 files changed, 32 insertions(+), 19 deletions(-) +Merging tpmdd/next (8467b0ed6ce3 Merge tag 'for-5.18/drivers-2022-04-01' of git://git.kernel.dk/linux-block) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (b2d229d4ddb1 Linux 5.18-rc3) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Already up to date. +Merging iommu/next (71ff461c3f41 iommu/omap: Fix regression in probe for NULL pointer dereference) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Already up to date. +Merging audit/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (548f8b21ae60 dt-bindings: soc: qcom,smp2p: convert to dtschema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Documentation/devicetree/bindings/clock/samsung,exynos4412-isp-clock.yaml +Auto-merging Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml +Auto-merging Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml +Auto-merging Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../clock/samsung,exynos4412-isp-clock.yaml | 1 - + .../devicetree/bindings/clock/st,stm32mp1-rcc.yaml | 8 ++ + .../bindings/crypto/allwinner,sun8i-ce.yaml | 1 - + .../bindings/display/amlogic,meson-dw-hdmi.yaml | 1 - + .../display/bridge/google,cros-ec-anx7688.yaml | 1 - + .../devicetree/bindings/display/bridge/ps8640.yaml | 1 - + .../bindings/display/imx/nxp,imx8mq-dcss.yaml | 1 - + .../bindings/display/mediatek/mediatek,merge.yaml | 1 - + .../bindings/display/panel/ilitek,ili9341.yaml | 1 - + .../bindings/display/panel/orisetech,otm8009a.yaml | 1 - + .../display/sprd/sprd,display-subsystem.yaml | 1 - + .../devicetree/bindings/display/st,stm32-ltdc.yaml | 1 - + .../devicetree/bindings/dma/st,stm32-dmamux.yaml | 1 - + .../devicetree/bindings/dma/st,stm32-mdma.yaml | 1 - + .../devicetree/bindings/example-schema.yaml | 14 +- + .../devicetree/bindings/gpu/samsung-rotator.yaml | 1 - + .../devicetree/bindings/hwmon/adt7475.yaml | 1 - + .../devicetree/bindings/i2c/i2c-gate.yaml | 1 - + .../devicetree/bindings/i2c/i2c-mt65xx.txt | 53 -------- + .../devicetree/bindings/i2c/i2c-mt65xx.yaml | 118 +++++++++++++++++ + .../devicetree/bindings/i2c/i2c-mux-gpmux.yaml | 1 - + .../devicetree/bindings/iio/adc/adi,ad7291.yaml | 1 - + .../devicetree/bindings/iio/dac/lltc,ltc1660.yaml | 2 +- + .../bindings/interrupt-controller/qcom,pdc.txt | 5 +- + .../devicetree/bindings/iommu/samsung,sysmmu.yaml | 1 - + .../bindings/leds/backlight/qcom-wled.yaml | 2 +- + .../bindings/mailbox/amlogic,meson-gxbb-mhu.yaml | 1 - + .../devicetree/bindings/media/microchip,xisc.yaml | 1 - + .../bindings/mtd/hisilicon,fmc-spi-nor.txt | 2 +- + .../devicetree/bindings/net/qcom,ipa.yaml | 7 + + .../devicetree/bindings/net/smsc,lan91c111.yaml | 61 +++++++++ + .../devicetree/bindings/net/smsc-lan91c111.txt | 17 --- + .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 1 - + .../bindings/net/wireless/qcom,ath11k.yaml | 2 +- + .../devicetree/bindings/nvmem/snvs-lpgpr.yaml | 4 + + .../bindings/pci/socionext,uniphier-pcie.yaml | 96 ++++++++++++++ + .../devicetree/bindings/pci/uniphier-pcie.txt | 82 ------------ + .../bindings/power/amlogic,meson-sec-pwrc.yaml | 1 - + .../bindings/power/renesas,rcar-sysc.yaml | 15 +-- + .../bindings/power/supply/cw2015_battery.yaml | 1 - + .../bindings/power/supply/power-supply.yaml | 1 - + .../bindings/power/supply/ti,lp8727.yaml | 1 - + .../bindings/power/supply/tps65217-charger.yaml | 2 +- + .../regulator/socionext,uniphier-regulator.yaml | 1 - + .../bindings/regulator/st,stm32-vrefbuf.yaml | 1 - + .../bindings/reserved-memory/ramoops.yaml | 1 - + .../bindings/reset/hisilicon,hi6220-reset.txt | 37 ------ + .../devicetree/bindings/reset/microchip,rst.yaml | 1 - + .../devicetree/bindings/rng/intel,ixp46x-rng.yaml | 1 - + .../devicetree/bindings/serial/qcom,msm-uartdm.txt | 81 ------------ + .../bindings/serial/qcom,msm-uartdm.yaml | 112 ++++++++++++++++ + .../devicetree/bindings/serial/sprd-uart.yaml | 2 +- + .../bindings/soc/amlogic/amlogic,canvas.yaml | 1 - + .../devicetree/bindings/soc/qcom/qcom,geni-se.yaml | 3 +- + .../devicetree/bindings/soc/qcom/qcom,smp2p.txt | 110 ---------------- + .../devicetree/bindings/soc/qcom/qcom,smp2p.yaml | 145 +++++++++++++++++++++ + .../devicetree/bindings/soc/ti/wkup-m3-ipc.yaml | 94 +++++++++++++ + .../devicetree/bindings/soc/ti/wkup_m3_ipc.txt | 57 -------- + .../devicetree/bindings/sound/adi,adau1372.yaml | 1 - + .../bindings/sound/amlogic,gx-sound-card.yaml | 1 - + .../devicetree/bindings/sound/maxim,max98520.yaml | 1 - + .../devicetree/bindings/sound/mchp,spdifrx.yaml | 2 +- + .../devicetree/bindings/sound/mchp,spdiftx.yaml | 2 +- + .../bindings/sound/nvidia,tegra-audio-rt5640.yaml | 1 - + .../bindings/sound/samsung,aries-wm8994.yaml | 1 - + .../devicetree/bindings/sound/samsung,odroid.yaml | 1 - + .../devicetree/bindings/sound/tas2562.yaml | 1 - + .../devicetree/bindings/sound/tas2770.yaml | 1 - + .../bindings/spi/amlogic,meson-gx-spicc.yaml | 1 - + .../bindings/spi/amlogic,meson6-spifc.yaml | 1 - + .../bindings/spi/qcom,spi-qcom-qspi.yaml | 3 +- + .../devicetree/bindings/spi/qcom,spi-qup.txt | 103 --------------- + .../devicetree/bindings/spi/qcom,spi-qup.yaml | 81 ++++++++++++ + .../devicetree/bindings/spi/renesas,hspi.yaml | 1 - + .../devicetree/bindings/spi/spi-davinci.txt | 2 +- + .../devicetree/bindings/spi/spi-pl022.yaml | 2 +- + .../devicetree/bindings/thermal/qcom-tsens.yaml | 1 + + .../devicetree/bindings/trivial-devices.yaml | 4 + + Documentation/devicetree/bindings/usb/dwc2.yaml | 4 +- + .../devicetree/bindings/usb/smsc,usb3503.yaml | 2 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + .../devicetree/bindings/writing-bindings.rst | 25 ++++ + .../devicetree/bindings/writing-schema.rst | 6 + + MAINTAINERS | 4 +- + drivers/of/irq.c | 13 +- + drivers/of/platform.c | 14 +- + 86 files changed, 810 insertions(+), 634 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml + create mode 100644 Documentation/devicetree/bindings/net/smsc,lan91c111.yaml + delete mode 100644 Documentation/devicetree/bindings/net/smsc-lan91c111.txt + create mode 100644 Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/uniphier-pcie.txt + delete mode 100644 Documentation/devicetree/bindings/reset/hisilicon,hi6220-reset.txt + delete mode 100644 Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt + create mode 100644 Documentation/devicetree/bindings/serial/qcom,msm-uartdm.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smp2p.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smp2p.yaml + create mode 100644 Documentation/devicetree/bindings/soc/ti/wkup-m3-ipc.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/ti/wkup_m3_ipc.txt + delete mode 100644 Documentation/devicetree/bindings/spi/qcom,spi-qup.txt + create mode 100644 Documentation/devicetree/bindings/spi/qcom,spi-qup.yaml +Merging mailbox/mailbox-for-next (1b0d0f7c12d5 dt-bindings: mailbox: add definition for mt8186) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (73f93db5c49b spi: core: Initialize returned status in spi_setup) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging Documentation/devicetree/bindings/spi/qcom,spi-qcom-qspi.yaml +Auto-merging drivers/spi/spi.c +Merge made by the 'ort' strategy. + .../bindings/spi/mediatek,spi-mt65xx.yaml | 4 + + .../bindings/spi/qcom,spi-qcom-qspi.yaml | 1 + + drivers/spi/atmel-quadspi.c | 6 - + drivers/spi/spi-cadence.c | 8 +- + drivers/spi/spi-mpc52xx-psc.c | 1 + + drivers/spi/spi-mpc52xx.c | 3 + + drivers/spi/spi-mt65xx.c | 386 ++++++++++++++++++++- + drivers/spi/spi-rspi.c | 15 +- + drivers/spi/spi-stm32-qspi.c | 30 +- + drivers/spi/spi-ti-qspi.c | 5 +- + drivers/spi/spi.c | 19 +- + drivers/spi/spidev.c | 101 +++--- + 12 files changed, 459 insertions(+), 120 deletions(-) +Merging tip/master (6a0111882747 Merge branch into tip/master: 'x86/platform') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging Documentation/admin-guide/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/include/asm/io.h +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/x86/kernel/acpi/boot.c +Auto-merging arch/x86/mm/mem_encrypt_amd.c +Auto-merging include/linux/efi.h +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +Auto-merging scripts/Makefile.build +Recorded preimage for 'Documentation/admin-guide/kernel-parameters.txt' +Resolved 'kernel/sysctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'Documentation/admin-guide/kernel-parameters.txt'. +[master a155648c1af4] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 26 +- + Documentation/process/maintainer-tip.rst | 14 + + Documentation/virt/coco/sevguest.rst | 155 +++++ + Documentation/virt/index.rst | 1 + + Documentation/x86/cpuinfo.rst | 5 +- + Documentation/x86/index.rst | 1 + + Documentation/x86/tdx.rst | 218 +++++++ + Documentation/x86/x86_64/boot-options.rst | 23 +- + Documentation/x86/zero-page.rst | 2 + + MAINTAINERS | 1 - + arch/arm64/kernel/entry-common.c | 8 +- + arch/x86/Kconfig | 33 +- + arch/x86/Makefile | 1 + + arch/x86/boot/boot.h | 37 +- + arch/x86/boot/compressed/Makefile | 2 + + arch/x86/boot/compressed/acpi.c | 173 +---- + arch/x86/boot/compressed/efi.c | 236 +++++++ + arch/x86/boot/compressed/head_64.S | 64 +- + arch/x86/boot/compressed/ident_map_64.c | 39 +- + arch/x86/boot/compressed/idt_64.c | 18 +- + arch/x86/boot/compressed/mem_encrypt.S | 36 -- + arch/x86/boot/compressed/misc.c | 12 + + arch/x86/boot/compressed/misc.h | 60 +- + arch/x86/boot/compressed/pgtable.h | 2 +- + arch/x86/boot/compressed/sev.c | 263 +++++++- + arch/x86/boot/compressed/tdcall.S | 3 + + arch/x86/boot/compressed/tdx.c | 77 +++ + arch/x86/boot/compressed/tdx.h | 13 + + arch/x86/boot/cpucheck.c | 30 +- + arch/x86/boot/cpuflags.c | 3 +- + arch/x86/boot/cpuflags.h | 1 + + arch/x86/boot/io.h | 41 ++ + arch/x86/boot/main.c | 4 + + arch/x86/boot/msr.h | 26 + + arch/x86/coco/Makefile | 2 + + arch/x86/coco/core.c | 25 +- + arch/x86/coco/tdx/Makefile | 3 + + arch/x86/coco/tdx/tdcall.S | 204 ++++++ + arch/x86/coco/tdx/tdx.c | 692 ++++++++++++++++++++ + arch/x86/events/Kconfig | 8 + + arch/x86/events/amd/Makefile | 1 + + arch/x86/events/amd/brs.c | 364 +++++++++++ + arch/x86/events/amd/core.c | 252 +++++++- + arch/x86/events/core.c | 19 +- + arch/x86/events/intel/lbr.c | 36 +- + arch/x86/events/perf_event.h | 143 ++++- + arch/x86/ia32/Makefile | 2 - + arch/x86/ia32/ia32_aout.c | 325 ---------- + arch/x86/include/asm/acenv.h | 14 +- + arch/x86/include/asm/amd_nb.h | 1 - + arch/x86/include/asm/apic.h | 7 + + arch/x86/include/asm/apicdef.h | 6 - + arch/x86/include/asm/bootparam_utils.h | 1 + + arch/x86/include/asm/cpu_entry_area.h | 2 +- + arch/x86/include/asm/cpufeature.h | 7 +- + arch/x86/include/asm/cpufeatures.h | 2 + + arch/x86/include/asm/cpuid.h | 34 + + arch/x86/include/asm/disabled-features.h | 16 +- + arch/x86/include/asm/idtentry.h | 4 + + arch/x86/include/asm/io.h | 42 +- + arch/x86/include/asm/kvm_para.h | 22 + + arch/x86/include/asm/mem_encrypt.h | 6 +- + arch/x86/include/asm/msr-index.h | 6 + + arch/x86/include/asm/msr.h | 11 +- + arch/x86/include/asm/page_64.h | 2 +- + arch/x86/include/asm/pci_x86.h | 9 + + arch/x86/include/asm/perf_event.h | 23 + + arch/x86/include/asm/pkeys.h | 8 - + arch/x86/include/asm/proto.h | 1 - + arch/x86/include/asm/realmode.h | 1 + + arch/x86/include/asm/setup.h | 1 - + arch/x86/include/asm/sev-common.h | 82 +++ + arch/x86/include/asm/sev.h | 102 ++- + arch/x86/include/asm/shared/io.h | 34 + + arch/x86/include/asm/shared/msr.h | 15 + + arch/x86/include/asm/shared/tdx.h | 40 ++ + arch/x86/include/asm/smap.h | 24 - + arch/x86/include/asm/svm.h | 179 +++++- + arch/x86/include/asm/tdx.h | 91 +++ + arch/x86/include/uapi/asm/bootparam.h | 4 +- + arch/x86/include/uapi/asm/svm.h | 13 + + arch/x86/kernel/Makefile | 2 - + arch/x86/kernel/acpi/boot.c | 93 ++- + arch/x86/kernel/amd_nb.c | 7 +- + arch/x86/kernel/apic/apic.c | 21 +- + arch/x86/kernel/apic/io_apic.c | 18 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 16 +- + arch/x86/kernel/asm-offsets.c | 17 + + arch/x86/kernel/cpu/bugs.c | 7 + + arch/x86/kernel/cpu/common.c | 105 +-- + arch/x86/kernel/cpu/mce/amd.c | 32 +- + arch/x86/kernel/cpu/mce/core.c | 4 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 14 +- + arch/x86/kernel/crash.c | 2 +- + arch/x86/kernel/head64.c | 36 +- + arch/x86/kernel/head_64.S | 65 +- + arch/x86/kernel/idt.c | 3 + + arch/x86/kernel/probe_roms.c | 13 +- + arch/x86/kernel/process.c | 4 + + arch/x86/kernel/setup.c | 28 +- + arch/x86/kernel/sev-shared.c | 529 ++++++++++++++- + arch/x86/kernel/sev.c | 820 +++++++++++++++++++++++- + arch/x86/kernel/smpboot.c | 15 +- + arch/x86/kernel/traps.c | 143 ++++- + arch/x86/kvm/cpuid.c | 19 +- + arch/x86/kvm/svm/sev.c | 22 +- + arch/x86/kvm/svm/svm.c | 8 +- + arch/x86/kvm/svm/svm.h | 4 +- + arch/x86/lib/delay.c | 4 +- + arch/x86/lib/kaslr.c | 2 +- + arch/x86/mm/Makefile | 3 +- + arch/x86/mm/amdtopology.c | 2 +- + arch/x86/mm/fault.c | 2 +- + arch/x86/mm/init_64.c | 1 - + arch/x86/mm/ioremap.c | 5 + + arch/x86/mm/mem_encrypt.c | 13 +- + arch/x86/mm/mem_encrypt_amd.c | 71 +- + arch/x86/mm/mem_encrypt_identity.c | 8 + + arch/x86/mm/mmio-mod.c | 2 +- + arch/x86/mm/numa_emulation.c | 4 +- + arch/x86/mm/setup_nx.c | 62 -- + arch/x86/pci/irq.c | 377 +++++++++-- + arch/x86/platform/uv/uv_nmi.c | 23 +- + arch/x86/realmode/rm/header.S | 1 + + arch/x86/realmode/rm/trampoline_64.S | 57 +- + arch/x86/realmode/rm/trampoline_common.S | 12 +- + arch/x86/realmode/rm/wakemain.c | 4 + + arch/x86/virt/vmx/tdx/tdxcall.S | 96 +++ + arch/x86/xen/smp_pv.c | 5 +- + drivers/acpi/acpi_pad.c | 7 + + drivers/acpi/processor_idle.c | 5 + + drivers/char/agp/amd64-agp.c | 2 +- + drivers/edac/amd64_edac.c | 2 +- + drivers/irqchip/irq-bcm6345-l1.c | 2 +- + drivers/irqchip/irq-gic-v3-its.c | 2 +- + drivers/virt/Kconfig | 3 + + drivers/virt/Makefile | 1 + + drivers/virt/coco/sevguest/Kconfig | 14 + + drivers/virt/coco/sevguest/Makefile | 2 + + drivers/virt/coco/sevguest/sevguest.c | 740 +++++++++++++++++++++ + drivers/virt/coco/sevguest/sevguest.h | 98 +++ + include/linux/cc_platform.h | 18 + + include/linux/efi.h | 1 + + include/linux/irqflags.h | 4 +- + include/linux/kvm_host.h | 2 +- + include/linux/perf_event.h | 22 + + include/linux/sched.h | 41 ++ + include/linux/sched/task_stack.h | 2 +- + include/linux/timer.h | 8 - + include/trace/events/lock.h | 63 +- + include/uapi/linux/sev-guest.h | 80 +++ + kernel/configs/x86_debug.config | 18 + + kernel/cpu.c | 29 +- + kernel/entry/common.c | 6 +- + kernel/irq/affinity.c | 2 +- + kernel/irq/manage.c | 25 +- + kernel/irq/msi.c | 15 + + kernel/kcsan/kcsan_test.c | 5 +- + kernel/locking/lockdep.c | 23 +- + kernel/locking/mutex.c | 18 +- + kernel/locking/percpu-rwsem.c | 5 + + kernel/locking/qrwlock.c | 9 + + kernel/locking/qspinlock.c | 5 + + kernel/locking/rtmutex.c | 11 + + kernel/locking/rwbase_rt.c | 7 + + kernel/locking/rwsem.c | 130 ++-- + kernel/locking/semaphore.c | 15 +- + kernel/sched/core.c | 12 + + kernel/sched/idle.c | 2 +- + kernel/smpboot.c | 7 + + kernel/sysctl.c | 11 - + kernel/time/clockevents.c | 9 +- + kernel/time/clocksource.c | 2 +- + kernel/time/timer.c | 56 +- + kernel/trace/trace.c | 14 +- + kernel/trace/trace_preemptirq.c | 4 +- + lib/irq_poll.c | 8 +- + scripts/Makefile.build | 2 +- + scripts/link-vmlinux.sh | 6 +- + tools/arch/x86/include/asm/disabled-features.h | 8 +- + 180 files changed, 7531 insertions(+), 1367 deletions(-) + create mode 100644 Documentation/virt/coco/sevguest.rst + create mode 100644 Documentation/x86/tdx.rst + create mode 100644 arch/x86/boot/compressed/efi.c + create mode 100644 arch/x86/boot/compressed/tdcall.S + create mode 100644 arch/x86/boot/compressed/tdx.c + create mode 100644 arch/x86/boot/compressed/tdx.h + create mode 100644 arch/x86/boot/io.h + create mode 100644 arch/x86/boot/msr.h + create mode 100644 arch/x86/coco/tdx/Makefile + create mode 100644 arch/x86/coco/tdx/tdcall.S + create mode 100644 arch/x86/coco/tdx/tdx.c + create mode 100644 arch/x86/events/amd/brs.c + delete mode 100644 arch/x86/ia32/ia32_aout.c + create mode 100644 arch/x86/include/asm/cpuid.h + create mode 100644 arch/x86/include/asm/shared/io.h + create mode 100644 arch/x86/include/asm/shared/msr.h + create mode 100644 arch/x86/include/asm/shared/tdx.h + create mode 100644 arch/x86/include/asm/tdx.h + delete mode 100644 arch/x86/mm/setup_nx.c + create mode 100644 arch/x86/virt/vmx/tdx/tdxcall.S + create mode 100644 drivers/virt/coco/sevguest/Kconfig + create mode 100644 drivers/virt/coco/sevguest/Makefile + create mode 100644 drivers/virt/coco/sevguest/sevguest.c + create mode 100644 drivers/virt/coco/sevguest/sevguest.h + create mode 100644 include/uapi/linux/sev-guest.h + create mode 100644 kernel/configs/x86_debug.config +Merging clockevents/timers/drivers/next (49c14f94ccfe clocksource/drivers/timer-of: check return value of of_iomap in timer_of_base_init()) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Merge made by the 'ort' strategy. +Merging edac/edac-for-next (96b79f201386 Merge branch 'edac-urgent' into edac-for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. + .../bindings/memory-controllers/fsl/fsl,ddr.yaml | 6 - + .../devicetree/bindings/powerpc/fsl/l2cache.txt | 6 - + drivers/edac/Kconfig | 1 + + drivers/edac/edac_device.c | 135 ++++++-------- + drivers/edac/edac_device.h | 14 ++ + drivers/edac/edac_device_sysfs.c | 5 +- + drivers/edac/edac_mc.c | 96 ++-------- + drivers/edac/edac_module.h | 2 - + drivers/edac/edac_pci.c | 25 ++- + drivers/edac/ghes_edac.c | 200 ++++----------------- + drivers/edac/mpc85xx_edac.c | 14 -- + drivers/edac/synopsys_edac.c | 16 +- + drivers/firmware/efi/cper.c | 64 +++++-- + include/linux/cper.h | 3 + + 14 files changed, 193 insertions(+), 394 deletions(-) +Merging irqchip/irq/irqchip-next (de26a7424331 Merge branch irq/qcom-mpm into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (c87857e21486 Merge branch 'trace/for-next-rtla' into trace/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next +Auto-merging include/linux/trace_events.h +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/trace.h +Auto-merging kernel/trace/trace_events_hist.c +Merge made by the 'ort' strategy. +Merging rcu/rcu/next (d6932dca19b1 rcu/nocb: Add an option to offload all CPUs on boot) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/Kconfig +Auto-merging kernel/smp.c +Merge made by the 'ort' strategy. + .../RCU/Design/Data-Structures/Data-Structures.rst | 2 +- + .../Expedited-Grace-Periods.rst | 2 +- + .../RCU/Design/Requirements/Requirements.rst | 36 +- + Documentation/RCU/arrayRCU.rst | 4 +- + Documentation/RCU/checklist.rst | 9 +- + Documentation/RCU/rcu.rst | 13 +- + Documentation/RCU/rculist_nulls.rst | 2 +- + Documentation/RCU/stallwarn.rst | 18 + + Documentation/RCU/whatisRCU.rst | 18 +- + Documentation/admin-guide/kernel-parameters.txt | 87 +- + .../litmus-tests/locking/DCL-broken.litmus | 55 + + .../litmus-tests/locking/DCL-fixed.litmus | 56 + + .../litmus-tests/locking/RM-broken.litmus | 42 + + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 + + arch/Kconfig | 1 + + include/linux/rcupdate.h | 2 + + include/linux/rcutiny.h | 10 + + include/linux/rcutree.h | 2 + + include/linux/srcutree.h | 32 +- + include/linux/torture.h | 2 +- + kernel/bpf/Kconfig | 1 + + kernel/rcu/Kconfig | 86 +- + kernel/rcu/Kconfig.debug | 22 +- + kernel/rcu/rcu.h | 28 +- + kernel/rcu/rcu_segcblist.c | 8 +- + kernel/rcu/rcuscale.c | 22 +- + kernel/rcu/rcutorture.c | 288 ++- + kernel/rcu/refscale.c | 22 +- + kernel/rcu/srcutree.c | 639 +++-- + kernel/rcu/sync.c | 2 +- + kernel/rcu/tasks.h | 94 +- + kernel/rcu/tiny.c | 11 +- + kernel/rcu/tree.c | 262 +- + kernel/rcu/tree.h | 19 +- + kernel/rcu/tree_exp.h | 252 +- + kernel/rcu/tree_nocb.h | 54 +- + kernel/rcu/tree_plugin.h | 34 +- + kernel/rcu/tree_stall.h | 34 +- + kernel/rcu/update.c | 15 + + kernel/scftorture.c | 5 +- + kernel/smp.c | 7 +- + kernel/trace/Kconfig | 1 + + tools/Makefile | 4 + + tools/include/nolibc/Makefile | 42 + + tools/include/nolibc/arch-aarch64.h | 199 ++ + tools/include/nolibc/arch-arm.h | 204 ++ + tools/include/nolibc/arch-i386.h | 219 ++ + tools/include/nolibc/arch-mips.h | 215 ++ + tools/include/nolibc/arch-riscv.h | 204 ++ + tools/include/nolibc/arch-x86_64.h | 215 ++ + tools/include/nolibc/arch.h | 32 + + tools/include/nolibc/ctype.h | 99 + + tools/include/nolibc/errno.h | 27 + + tools/include/nolibc/nolibc.h | 2540 +------------------- + tools/include/nolibc/signal.h | 22 + + tools/include/nolibc/std.h | 49 + + tools/include/nolibc/stdio.h | 306 +++ + tools/include/nolibc/stdlib.h | 423 ++++ + tools/include/nolibc/string.h | 285 +++ + tools/include/nolibc/sys.h | 1247 ++++++++++ + tools/include/nolibc/time.h | 28 + + tools/include/nolibc/types.h | 205 ++ + tools/include/nolibc/unistd.h | 54 + + tools/memory-model/Documentation/locking.txt | 320 +++ + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 + + tools/memory-model/scripts/cmplitmushist.sh | 49 +- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 + + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 + + .../testing/selftests/rcutorture/bin/functions.sh | 2 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 7 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 15 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 10 +- + tools/testing/selftests/rcutorture/bin/torture.sh | 29 +- + .../selftests/rcutorture/configs/rcu/RUDE01 | 2 + + .../selftests/rcutorture/configs/rcu/SRCU-N | 2 + + .../selftests/rcutorture/configs/rcu/TASKS01 | 1 + + .../selftests/rcutorture/configs/rcu/TASKS02 | 4 + + .../selftests/rcutorture/configs/rcu/TASKS02.boot | 1 + + .../selftests/rcutorture/configs/rcu/TASKS03 | 2 + + .../selftests/rcutorture/configs/rcu/TRACE01 | 3 + + .../selftests/rcutorture/configs/rcu/TRACE02 | 2 + + .../selftests/rcutorture/configs/rcu/TREE04 | 5 +- + .../selftests/rcutorture/configs/rcu/TREE07 | 1 + + .../selftests/rcutorture/configs/rcu/TREE09 | 2 + + .../selftests/rcutorture/configs/rcu/TREE10 | 1 + + .../rcutorture/configs/rcu/ver_functions.sh | 16 +- + .../selftests/rcutorture/configs/rcuscale/CFcommon | 7 +- + .../selftests/rcutorture/configs/rcuscale/TREE | 2 + + .../selftests/rcutorture/configs/refscale/CFcommon | 4 + + .../rcutorture/configs/refscale/NOPREEMPT | 2 + + .../selftests/rcutorture/configs/scf/NOPREEMPT | 2 + + .../selftests/rcutorture/configs/scf/PREEMPT | 1 + + .../rcutorture/configs/scf/ver_functions.sh | 3 +- + 106 files changed, 6794 insertions(+), 3102 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + create mode 100644 tools/include/nolibc/Makefile + create mode 100644 tools/include/nolibc/arch-aarch64.h + create mode 100644 tools/include/nolibc/arch-arm.h + create mode 100644 tools/include/nolibc/arch-i386.h + create mode 100644 tools/include/nolibc/arch-mips.h + create mode 100644 tools/include/nolibc/arch-riscv.h + create mode 100644 tools/include/nolibc/arch-x86_64.h + create mode 100644 tools/include/nolibc/arch.h + create mode 100644 tools/include/nolibc/ctype.h + create mode 100644 tools/include/nolibc/errno.h + create mode 100644 tools/include/nolibc/signal.h + create mode 100644 tools/include/nolibc/std.h + create mode 100644 tools/include/nolibc/stdio.h + create mode 100644 tools/include/nolibc/stdlib.h + create mode 100644 tools/include/nolibc/string.h + create mode 100644 tools/include/nolibc/sys.h + create mode 100644 tools/include/nolibc/time.h + create mode 100644 tools/include/nolibc/types.h + create mode 100644 tools/include/nolibc/unistd.h + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh +$ git reset --hard HEAD^ +HEAD is now at 067779c1db4a Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git +Merging next-20220414 version of rcu +$ git merge -m next-20220414/rcu e912cedc79ae9278ebbc660b07969f953431748d +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/Kconfig +Auto-merging kernel/smp.c +Merge made by the 'ort' strategy. + .../RCU/Design/Data-Structures/Data-Structures.rst | 2 +- + .../Expedited-Grace-Periods.rst | 2 +- + .../RCU/Design/Requirements/Requirements.rst | 36 +- + Documentation/RCU/arrayRCU.rst | 4 +- + Documentation/RCU/checklist.rst | 9 +- + Documentation/RCU/rcu.rst | 13 +- + Documentation/RCU/rculist_nulls.rst | 2 +- + Documentation/RCU/stallwarn.rst | 18 + + Documentation/RCU/whatisRCU.rst | 18 +- + Documentation/admin-guide/kernel-parameters.txt | 81 +- + .../litmus-tests/locking/DCL-broken.litmus | 55 + + .../litmus-tests/locking/DCL-fixed.litmus | 56 + + .../litmus-tests/locking/RM-broken.litmus | 42 + + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 + + arch/Kconfig | 1 + + include/linux/rcupdate.h | 1 + + include/linux/rcutiny.h | 20 + + include/linux/rcutree.h | 4 + + include/linux/srcutree.h | 32 +- + include/linux/torture.h | 2 +- + include/trace/events/rcu.h | 1 + + kernel/bpf/Kconfig | 1 + + kernel/rcu/Kconfig | 59 +- + kernel/rcu/Kconfig.debug | 22 +- + kernel/rcu/rcu.h | 35 +- + kernel/rcu/rcu_segcblist.c | 8 +- + kernel/rcu/rcuscale.c | 22 +- + kernel/rcu/rcutorture.c | 216 +- + kernel/rcu/refscale.c | 22 +- + kernel/rcu/srcutree.c | 641 +++-- + kernel/rcu/sync.c | 2 +- + kernel/rcu/tasks.h | 94 +- + kernel/rcu/tree.c | 145 +- + kernel/rcu/tree.h | 11 +- + kernel/rcu/tree_exp.h | 210 +- + kernel/rcu/tree_nocb.h | 39 +- + kernel/rcu/tree_plugin.h | 28 +- + kernel/rcu/tree_stall.h | 34 +- + kernel/rcu/update.c | 2 + + kernel/scftorture.c | 5 +- + kernel/smp.c | 7 +- + kernel/trace/Kconfig | 1 + + tools/Makefile | 4 + + tools/include/nolibc/Makefile | 42 + + tools/include/nolibc/arch-aarch64.h | 199 ++ + tools/include/nolibc/arch-arm.h | 204 ++ + tools/include/nolibc/arch-i386.h | 219 ++ + tools/include/nolibc/arch-mips.h | 215 ++ + tools/include/nolibc/arch-riscv.h | 204 ++ + tools/include/nolibc/arch-x86_64.h | 215 ++ + tools/include/nolibc/arch.h | 32 + + tools/include/nolibc/ctype.h | 99 + + tools/include/nolibc/errno.h | 27 + + tools/include/nolibc/nolibc.h | 2540 +------------------- + tools/include/nolibc/signal.h | 22 + + tools/include/nolibc/std.h | 49 + + tools/include/nolibc/stdio.h | 306 +++ + tools/include/nolibc/stdlib.h | 423 ++++ + tools/include/nolibc/string.h | 285 +++ + tools/include/nolibc/sys.h | 1247 ++++++++++ + tools/include/nolibc/time.h | 28 + + tools/include/nolibc/types.h | 205 ++ + tools/include/nolibc/unistd.h | 54 + + tools/memory-model/Documentation/locking.txt | 320 +++ + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 + + tools/memory-model/scripts/cmplitmushist.sh | 49 +- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 + + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 + + .../testing/selftests/rcutorture/bin/functions.sh | 2 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 7 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 14 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 10 +- + tools/testing/selftests/rcutorture/bin/torture.sh | 29 +- + .../selftests/rcutorture/configs/rcu/RUDE01 | 2 + + .../selftests/rcutorture/configs/rcu/SRCU-N | 2 + + .../selftests/rcutorture/configs/rcu/TASKS01 | 1 + + .../selftests/rcutorture/configs/rcu/TASKS02 | 4 + + .../selftests/rcutorture/configs/rcu/TASKS02.boot | 1 + + .../selftests/rcutorture/configs/rcu/TASKS03 | 2 + + .../selftests/rcutorture/configs/rcu/TRACE01 | 3 + + .../selftests/rcutorture/configs/rcu/TRACE02 | 2 + + .../selftests/rcutorture/configs/rcu/TREE04 | 5 +- + .../selftests/rcutorture/configs/rcu/TREE07 | 1 + + .../selftests/rcutorture/configs/rcu/TREE09 | 2 + + .../selftests/rcutorture/configs/rcu/TREE10 | 1 + + .../rcutorture/configs/rcu/ver_functions.sh | 16 +- + .../selftests/rcutorture/configs/rcuscale/CFcommon | 7 +- + .../selftests/rcutorture/configs/rcuscale/TREE | 2 + + .../selftests/rcutorture/configs/refscale/CFcommon | 4 + + .../rcutorture/configs/refscale/NOPREEMPT | 2 + + .../selftests/rcutorture/configs/scf/NOPREEMPT | 2 + + .../selftests/rcutorture/configs/scf/PREEMPT | 1 + + .../rcutorture/configs/scf/ver_functions.sh | 3 +- + 106 files changed, 6559 insertions(+), 3040 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + create mode 100644 tools/include/nolibc/Makefile + create mode 100644 tools/include/nolibc/arch-aarch64.h + create mode 100644 tools/include/nolibc/arch-arm.h + create mode 100644 tools/include/nolibc/arch-i386.h + create mode 100644 tools/include/nolibc/arch-mips.h + create mode 100644 tools/include/nolibc/arch-riscv.h + create mode 100644 tools/include/nolibc/arch-x86_64.h + create mode 100644 tools/include/nolibc/arch.h + create mode 100644 tools/include/nolibc/ctype.h + create mode 100644 tools/include/nolibc/errno.h + create mode 100644 tools/include/nolibc/signal.h + create mode 100644 tools/include/nolibc/std.h + create mode 100644 tools/include/nolibc/stdio.h + create mode 100644 tools/include/nolibc/stdlib.h + create mode 100644 tools/include/nolibc/string.h + create mode 100644 tools/include/nolibc/sys.h + create mode 100644 tools/include/nolibc/time.h + create mode 100644 tools/include/nolibc/types.h + create mode 100644 tools/include/nolibc/unistd.h + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh +Merging kvm/next (5d6c7de6446e KVM: x86: Bail to userspace if emulation of atomic user access faults) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging arch/x86/kvm/svm/sev.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/svm/svm.h +Auto-merging include/linux/kvm_host.h +Auto-merging init/Kconfig +Merge made by the 'ort' strategy. + Documentation/virt/kvm/api.rst | 161 ++- + arch/x86/include/asm/kvm-x86-ops.h | 1 + + arch/x86/include/asm/kvm-x86-pmu-ops.h | 31 + + arch/x86/include/asm/kvm_host.h | 68 +- + arch/x86/include/asm/uaccess.h | 142 +++ + arch/x86/include/asm/vmx.h | 10 +- + arch/x86/include/uapi/asm/kvm.h | 11 +- + arch/x86/kernel/asm-offsets_64.c | 4 +- + arch/x86/kernel/kvm.c | 77 +- + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kvm/i8259.c | 1 - + arch/x86/kvm/irq.c | 10 +- + arch/x86/kvm/irq_comm.c | 2 +- + arch/x86/kvm/mmu/mmu.c | 18 +- + arch/x86/kvm/mmu/paging_tmpl.h | 49 +- + arch/x86/kvm/pmu.c | 66 +- + arch/x86/kvm/pmu.h | 7 +- + arch/x86/kvm/svm/avic.c | 10 +- + arch/x86/kvm/svm/nested.c | 300 +++-- + arch/x86/kvm/svm/pmu.c | 2 +- + arch/x86/kvm/svm/sev.c | 9 +- + arch/x86/kvm/svm/svm.c | 209 +++- + arch/x86/kvm/svm/svm.h | 53 +- + arch/x86/kvm/vmx/nested.c | 48 +- + arch/x86/kvm/vmx/pmu_intel.c | 2 +- + arch/x86/kvm/vmx/vmcs.h | 5 + + arch/x86/kvm/vmx/vmx.c | 10 +- + arch/x86/kvm/x86.c | 267 +++-- + arch/x86/kvm/xen.c | 1245 ++++++++++++++++---- + arch/x86/kvm/xen.h | 62 +- + include/linux/kvm_host.h | 3 +- + include/uapi/linux/kvm.h | 53 +- + init/Kconfig | 5 + + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 2 + + .../selftests/kvm/x86_64/fix_hypercall_test.c | 170 +++ + .../selftests/kvm/x86_64/tsc_scaling_sync.c | 119 ++ + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 366 +++++- + 38 files changed, 2895 insertions(+), 706 deletions(-) + create mode 100644 arch/x86/include/asm/kvm-x86-pmu-ops.h + create mode 100644 tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c +Merging kvm-arm/next (21ea45784275 KVM: arm64: fix typos in comments) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (4aa5ac75bf79 KVM: s390: Fix lockdep issue in vm memop) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Auto-merging arch/s390/kvm/kvm-s390.c +Merge made by the 'ort' strategy. + arch/s390/kvm/kvm-s390.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) +Merging xen-tip/linux-next (262fc47ac174 xen/balloon: don't use PV mode extra memory for zone device allocations) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (4e1f82dce05b Merge branch 'for-5.16-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. +Merging workqueues/for-next (bc35f7ef9628 workqueue: Convert the type of pool->nr_running to int) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (b0c07116c894 platform/x86: amd-pmc: Avoid reading SMU version at probe time) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Merge made by the 'ort' strategy. + drivers/platform/x86/Kconfig | 8 ++ + drivers/platform/x86/Makefile | 3 + + drivers/platform/x86/amd-pmc.c | 78 ++++++++----- + drivers/platform/x86/hp-wmi.c | 8 ++ + drivers/platform/x86/winmate-fm07-keys.c | 189 +++++++++++++++++++++++++++++++ + drivers/platform/x86/wmi.c | 13 +-- + 6 files changed, 261 insertions(+), 38 deletions(-) + create mode 100644 drivers/platform/x86/winmate-fm07-keys.c +Merging chrome-platform/for-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Already up to date. +Merging hsi/for-next (43c14f8d18a7 HSI: omap_ssi: Fix refcount leak in ssi_probe) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Merge made by the 'ort' strategy. + drivers/hsi/clients/ssi_protocol.c | 1 - + drivers/hsi/controllers/omap_ssi_core.c | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) +Merging leds/for-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Already up to date. +Merging ipmi/for-next (af82f0f55788 ipmi: Make two logs unique) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + drivers/char/ipmi/ipmb_dev_int.c | 5 +- + drivers/char/ipmi/ipmi_ipmb.c | 5 +- + drivers/char/ipmi/ipmi_msghandler.c | 105 +++++++++++++++++++++++++++++++++--- + drivers/char/ipmi/ipmi_poweroff.c | 8 +-- + drivers/char/ipmi/ipmi_si_intf.c | 17 +++--- + drivers/char/ipmi/ipmi_ssif.c | 27 +++++++++- + drivers/char/ipmi/ipmi_watchdog.c | 28 ++++------ + include/linux/ipmi.h | 5 ++ + include/linux/ipmi_smi.h | 6 +++ + 9 files changed, 158 insertions(+), 48 deletions(-) +Merging driver-core/driver-core-next (ce522ba9ef7e Linux 5.18-rc2) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging thunderbolt/next (03941ed91c72 thunderbolt: Replace usage of found with dedicated list iterator variable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Merge made by the 'ort' strategy. + drivers/thunderbolt/ctl.c | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) +Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (f398e0aa325c tty: serial: fsl_lpuart: fix potential bug when using both of_alias_get_id and ida_simple_get) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging drivers/tty/goldfish.c +Auto-merging drivers/tty/serial/8250/8250_port.c +Auto-merging drivers/tty/serial/amba-pl011.c +Auto-merging drivers/tty/serial/imx.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/serial/fsl-lpuart.yaml | 4 +- + .../bindings/serial/qcom,serial-geni-qcom.yaml | 86 +++++++++++ + .../bindings/serial/renesas,em-uart.yaml | 9 +- + .../bindings/serial/socionext,uniphier-uart.yaml | 5 +- + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/serial/driver.rst | 2 +- + Documentation/driver-api/serial/index.rst | 2 - + Documentation/driver-api/serial/n_gsm.rst | 159 --------------------- + Documentation/{ => driver-api}/tty/index.rst | 22 ++- + .../driver-api/{serial => tty}/moxa-smartio.rst | 0 + Documentation/driver-api/tty/n_gsm.rst | 153 ++++++++++++++++++++ + Documentation/{ => driver-api}/tty/n_tty.rst | 0 + Documentation/{ => driver-api}/tty/tty_buffer.rst | 0 + Documentation/{ => driver-api}/tty/tty_driver.rst | 0 + .../{ => driver-api}/tty/tty_internals.rst | 0 + Documentation/{ => driver-api}/tty/tty_ldisc.rst | 0 + Documentation/{ => driver-api}/tty/tty_port.rst | 0 + Documentation/{ => driver-api}/tty/tty_struct.rst | 0 + Documentation/index.rst | 1 - + drivers/tty/goldfish.c | 2 + + drivers/tty/hvc/hvc_opal.c | 2 +- + drivers/tty/hvc/hvc_vio.c | 2 +- + drivers/tty/hvc/hvsi.c | 2 +- + drivers/tty/n_tty.c | 38 ++++- + drivers/tty/serial/8250/8250.h | 1 + + drivers/tty/serial/8250/8250_aspeed_vuart.c | 2 + + drivers/tty/serial/8250/8250_of.c | 2 + + drivers/tty/serial/8250/8250_pci.c | 67 +++++---- + drivers/tty/serial/8250/8250_port.c | 78 +++++++++- + drivers/tty/serial/8250/Kconfig | 2 +- + drivers/tty/serial/altera_jtaguart.c | 6 +- + drivers/tty/serial/amba-pl011.c | 16 +-- + drivers/tty/serial/atmel_serial.c | 4 +- + drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c | 1 - + drivers/tty/serial/fsl_lpuart.c | 56 +------- + drivers/tty/serial/icom.c | 2 +- + drivers/tty/serial/imx.c | 2 - + drivers/tty/serial/max310x.c | 1 - + drivers/tty/serial/meson_uart.c | 4 +- + drivers/tty/serial/mpc52xx_uart.c | 5 +- + drivers/tty/serial/omap-serial.c | 13 +- + drivers/tty/serial/owl-uart.c | 7 +- + drivers/tty/serial/pmac_zilog.c | 1 - + drivers/tty/serial/samsung_tty.c | 12 ++ + drivers/tty/serial/sc16is7xx.c | 10 -- + drivers/tty/serial/serial_core.c | 38 +++++ + drivers/tty/serial/stm32-usart.c | 9 +- + drivers/tty/synclink_gt.c | 2 + + include/linux/serial_8250.h | 2 + + 49 files changed, 511 insertions(+), 322 deletions(-) + create mode 100644 Documentation/devicetree/bindings/serial/qcom,serial-geni-qcom.yaml + delete mode 100644 Documentation/driver-api/serial/n_gsm.rst + rename Documentation/{ => driver-api}/tty/index.rst (81%) + rename Documentation/driver-api/{serial => tty}/moxa-smartio.rst (100%) + create mode 100644 Documentation/driver-api/tty/n_gsm.rst + rename Documentation/{ => driver-api}/tty/n_tty.rst (100%) + rename Documentation/{ => driver-api}/tty/tty_buffer.rst (100%) + rename Documentation/{ => driver-api}/tty/tty_driver.rst (100%) + rename Documentation/{ => driver-api}/tty/tty_internals.rst (100%) + rename Documentation/{ => driver-api}/tty/tty_ldisc.rst (100%) + rename Documentation/{ => driver-api}/tty/tty_port.rst (100%) + rename Documentation/{ => driver-api}/tty/tty_struct.rst (100%) +Merging char-misc/char-misc-next (ce522ba9ef7e Linux 5.18-rc2) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging coresight/next (c86dd9869128 coresight: etm4x: Cleanup TRCRSCTLRn register accesses) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Merge made by the 'ort' strategy. + drivers/hwtracing/coresight/coresight-etm3x-core.c | 2 +- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 2 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 136 +++++----------- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 180 +++++++++++---------- + drivers/hwtracing/coresight/coresight-etm4x.h | 120 +++++++++++--- + 5 files changed, 242 insertions(+), 198 deletions(-) +Merging fpga/for-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (2fb251c26560 interconnect: qcom: sdx55: Drop IP0 interconnects) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Merge made by the 'ort' strategy. + drivers/interconnect/qcom/sc7180.c | 21 --------------------- + drivers/interconnect/qcom/sdx55.c | 21 --------------------- + 2 files changed, 42 deletions(-) +Merging iio/togreg (b28bc9ebbe23 iio: adc: ti-ads1015: Switch to read_avail) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging MAINTAINERS +Auto-merging drivers/iio/dac/ltc2688.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/iio/adc/ti,ads1015.yaml | 7 +- + .../bindings/iio/imu/invensense,mpu6050.yaml | 34 +- + .../devicetree/bindings/iio/st,st-sensors.yaml | 1 + + MAINTAINERS | 4 +- + drivers/iio/accel/dmard09.c | 2 +- + drivers/iio/accel/kxsd9-spi.c | 4 +- + drivers/iio/accel/st_accel.h | 28 +- + drivers/iio/accel/st_accel_core.c | 1 + + drivers/iio/accel/st_accel_i2c.c | 5 + + drivers/iio/accel/st_accel_spi.c | 5 + + drivers/iio/adc/ad7124.c | 86 ++++- + drivers/iio/adc/ad7192.c | 64 +++- + drivers/iio/adc/ad_sigma_delta.c | 143 +++++++- + drivers/iio/adc/palmas_gpadc.c | 3 +- + drivers/iio/adc/ti-ads1015.c | 398 ++++++++++++--------- + drivers/iio/common/ssp_sensors/ssp_spi.c | 13 +- + drivers/iio/dac/ltc2688.c | 19 +- + drivers/iio/dummy/iio_simple_dummy.c | 20 +- + drivers/iio/imu/inv_mpu6050/Kconfig | 4 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 9 + + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 6 + + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 2 + + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 5 + + drivers/iio/industrialio-buffer.c | 24 +- + drivers/iio/industrialio-core.c | 3 +- + drivers/iio/multiplexer/Kconfig | 1 - + drivers/iio/multiplexer/iio-mux.c | 49 ++- + drivers/iio/temperature/ltc2983.c | 236 ++++++------ + drivers/iio/trigger/iio-trig-sysfs.c | 11 +- + include/linux/iio/adc/ad_sigma_delta.h | 38 ++ + 30 files changed, 812 insertions(+), 413 deletions(-) +Merging phy-next/next (e72659b69f06 phy: cadence: Sierra: Add TI J721E specific PCIe multilink lane configuration) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 4 + + .../bindings/phy/socionext,uniphier-ahci-phy.yaml | 91 +++++++--- + .../bindings/phy/socionext,uniphier-pcie-phy.yaml | 47 +++-- + .../bindings/phy/socionext,uniphier-usb2-phy.yaml | 3 + + .../phy/socionext,uniphier-usb3hs-phy.yaml | 89 ++++++++-- + .../phy/socionext,uniphier-usb3ss-phy.yaml | 98 ++++++++--- + drivers/phy/Kconfig | 1 + + drivers/phy/cadence/phy-cadence-sierra.c | 193 ++++++++++++++++++++- + drivers/phy/mediatek/phy-mtk-hdmi.c | 50 ++---- + drivers/phy/mediatek/phy-mtk-mipi-dsi.c | 29 ++-- + drivers/phy/phy-can-transceiver.c | 24 ++- + drivers/phy/qualcomm/phy-qcom-qmp.c | 79 +++++++++ + drivers/phy/rockchip/phy-rockchip-dphy-rx0.c | 7 +- + drivers/phy/rockchip/phy-rockchip-typec.c | 6 +- + 14 files changed, 586 insertions(+), 135 deletions(-) +Merging soundwire/next (60657fb9b19d dt-bindings: soundwire: qcom: Add bindings for audio clock reset control property) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/soundwire/qcom,sdw.txt | 14 ++++++++++++++ + drivers/soundwire/qcom.c | 3 ++- + drivers/soundwire/stream.c | 1 + + 3 files changed, 17 insertions(+), 1 deletion(-) +Merging extcon/extcon-next (4a17c3246de7 extcon: sm5502: Add support for SM5703) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'ort' strategy. + .../bindings/extcon/siliconmitus,sm5502-muic.yaml | 5 +- + drivers/extcon/Kconfig | 2 +- + drivers/extcon/extcon-axp288.c | 4 +- + drivers/extcon/extcon-intel-int3496.c | 54 ++++++++++++++++++---- + drivers/extcon/extcon-sm5502.c | 2 + + drivers/extcon/extcon-usb-gpio.c | 15 ------ + drivers/extcon/extcon-usbc-cros-ec.c | 2 +- + drivers/extcon/extcon.c | 8 +++- + drivers/power/supply/axp288_charger.c | 17 ++++--- + drivers/power/supply/charger-manager.c | 7 +-- + drivers/power/supply/max8997_charger.c | 8 ++-- + drivers/usb/dwc3/drd.c | 9 +--- + drivers/usb/phy/phy-omap-otg.c | 4 +- + drivers/usb/typec/tcpm/fusb302.c | 4 +- + include/linux/extcon.h | 2 +- + 15 files changed, 85 insertions(+), 58 deletions(-) +Merging gnss/gnss-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (f621eb13facb vfio-pci: Provide reviewers and acceptance criteria for variant drivers) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging staging/staging-next (bed6d200f8ca staging: rtl8192u: make read-only array EWC11NHTCap static const) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging MAINTAINERS +Auto-merging drivers/net/wireless/silabs/wfx/sta.c +Auto-merging drivers/staging/greybus/audio_codec.c +Merge made by the 'ort' strategy. + drivers/net/wireless/silabs/wfx/hif_tx.c | 10 +- + drivers/net/wireless/silabs/wfx/main.c | 2 +- + drivers/net/wireless/silabs/wfx/sta.c | 20 +- + drivers/staging/greybus/arche-apb-ctrl.c | 2 +- + drivers/staging/greybus/audio_codec.c | 32 +- + drivers/staging/greybus/pwm.c | 1 - + drivers/staging/ks7010/ks_hostif.c | 21 +- + drivers/staging/ks7010/ks_wlan.h | 2 +- + drivers/staging/most/dim2/dim2.c | 29 +- + drivers/staging/r8188eu/core/rtw_ap.c | 3 - + drivers/staging/r8188eu/core/rtw_br_ext.c | 73 +++-- + drivers/staging/r8188eu/core/rtw_cmd.c | 200 ++++++------ + drivers/staging/r8188eu/core/rtw_fw.c | 79 ++--- + drivers/staging/r8188eu/core/rtw_ieee80211.c | 41 +-- + drivers/staging/r8188eu/core/rtw_led.c | 10 +- + drivers/staging/r8188eu/core/rtw_mlme.c | 105 +++--- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 250 +++++++++------ + drivers/staging/r8188eu/core/rtw_p2p.c | 12 +- + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 101 +++--- + drivers/staging/r8188eu/core/rtw_recv.c | 312 ++++++++---------- + drivers/staging/r8188eu/core/rtw_security.c | 6 +- + drivers/staging/r8188eu/core/rtw_sta_mgt.c | 4 +- + drivers/staging/r8188eu/core/rtw_wlan_util.c | 103 ++++-- + drivers/staging/r8188eu/core/rtw_xmit.c | 13 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 6 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c | 2 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c | 2 +- + drivers/staging/r8188eu/hal/hal_com.c | 4 +- + drivers/staging/r8188eu/hal/odm_HWConfig.c | 8 +- + drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 7 +- + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 15 +- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 8 +- + drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 3 +- + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 8 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 351 +-------------------- + drivers/staging/r8188eu/hal/usb_ops_linux.c | 10 +- + drivers/staging/r8188eu/include/HalVerDef.h | 5 +- + drivers/staging/r8188eu/include/basic_types.h | 73 +---- + drivers/staging/r8188eu/include/drv_types.h | 6 +- + drivers/staging/r8188eu/include/hal_intf.h | 33 +- + drivers/staging/r8188eu/include/ieee80211.h | 18 -- + drivers/staging/r8188eu/include/odm.h | 29 -- + drivers/staging/r8188eu/include/osdep_service.h | 47 --- + drivers/staging/r8188eu/include/rtl8188e_hal.h | 3 - + drivers/staging/r8188eu/include/rtl8188e_spec.h | 10 +- + drivers/staging/r8188eu/include/rtw_eeprom.h | 3 - + drivers/staging/r8188eu/include/rtw_fw.h | 5 + + drivers/staging/r8188eu/include/rtw_ioctl.h | 79 ----- + drivers/staging/r8188eu/include/rtw_mlme.h | 5 +- + drivers/staging/r8188eu/include/rtw_mlme_ext.h | 38 +-- + drivers/staging/r8188eu/include/rtw_pwrctrl.h | 23 +- + drivers/staging/r8188eu/include/rtw_recv.h | 2 - + drivers/staging/r8188eu/include/usb_ops.h | 22 +- + drivers/staging/r8188eu/include/usb_osintf.h | 4 - + drivers/staging/r8188eu/include/usb_vendor_req.h | 35 -- + drivers/staging/r8188eu/include/wifi.h | 60 +--- + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 66 ++-- + drivers/staging/r8188eu/os_dep/os_intfs.c | 45 ++- + drivers/staging/r8188eu/os_dep/osdep_service.c | 27 +- + drivers/staging/r8188eu/os_dep/usb_intf.c | 1 - + drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 3 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 3 - + drivers/staging/rtl8192e/rtllib.h | 2 +- + drivers/staging/rtl8192e/rtllib_rx.c | 2 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 12 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 2 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 15 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 4 +- + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 15 +- + drivers/staging/rtl8712/drv_types.h | 3 +- + drivers/staging/rtl8712/ieee80211.c | 4 +- + drivers/staging/rtl8712/os_intfs.c | 1 - + drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | 1 - + drivers/staging/rtl8712/rtl8712_efuse.h | 4 +- + .../staging/rtl8712/rtl8712_macsetting_bitdef.h | 3 - + .../staging/rtl8712/rtl8712_macsetting_regdef.h | 2 - + drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h | 1 - + drivers/staging/rtl8712/rtl8712_recv.c | 16 +- + drivers/staging/rtl8712/rtl8712_security_bitdef.h | 1 - + drivers/staging/rtl8712/rtl8712_spec.h | 3 - + drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h | 4 - + drivers/staging/rtl8712/rtl8712_syscfg_regdef.h | 2 - + drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h | 1 - + drivers/staging/rtl8712/rtl8712_wmac_bitdef.h | 1 - + drivers/staging/rtl8712/rtl871x_cmd.c | 4 +- + drivers/staging/rtl8712/rtl871x_cmd.h | 3 - + drivers/staging/rtl8712/rtl871x_ioctl.h | 1 - + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 20 +- + drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 1 - + drivers/staging/rtl8712/rtl871x_ioctl_set.c | 3 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 102 ++---- + drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 1 - + drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h | 3 - + drivers/staging/rtl8712/rtl871x_recv.c | 1 - + drivers/staging/rtl8712/rtl871x_security.c | 1 - + drivers/staging/rtl8712/sta_info.h | 1 - + drivers/staging/rtl8712/usb_intf.c | 8 +- + drivers/staging/rtl8712/wifi.h | 1 - + drivers/staging/rtl8712/xmit_linux.c | 8 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 12 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 54 ++-- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 44 +-- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 66 ++-- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 194 +++++------- + drivers/staging/rtl8723bs/core/rtw_rf.c | 56 ++-- + drivers/staging/rtl8723bs/hal/sdio_ops.c | 15 +- + drivers/staging/rtl8723bs/include/drv_types.h | 1 - + drivers/staging/rtl8723bs/include/rtw_ioctl.h | 72 ----- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- + drivers/staging/rts5208/rtsx_transport.c | 12 +- + drivers/staging/sm750fb/sm750_hw.c | 1 + + drivers/staging/unisys/visornic/visornic_main.c | 17 - + .../vc04_services/bcm2835-audio/bcm2835-ctl.c | 86 +---- + .../staging/vc04_services/bcm2835-audio/bcm2835.c | 33 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 26 +- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 13 +- + drivers/staging/vme/devices/vme_user.c | 2 +- + drivers/staging/vt6655/mac.h | 169 ++-------- + drivers/staging/vt6655/srom.c | 2 +- + drivers/staging/vt6655/upc.h | 13 - + drivers/staging/vt6656/channel.c | 1 - + drivers/staging/vt6656/rf.c | 1 - + drivers/staging/wlan-ng/cfg80211.c | 10 +- + drivers/staging/wlan-ng/hfa384x.h | 4 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 34 +- + drivers/staging/wlan-ng/prism2usb.c | 8 +- + 126 files changed, 1228 insertions(+), 2477 deletions(-) + delete mode 100644 drivers/staging/r8188eu/include/usb_vendor_req.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_ioctl.h +Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (d0a3ef604801 dmaengine: qcom: gpi: Add SM8350 support) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging MAINTAINERS +Auto-merging drivers/dma/idxd/device.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/altr,msgdma.yaml | 2 +- + .../bindings/dma/nvidia,tegra186-gpc-dma.yaml | 110 ++ + .../devicetree/bindings/dma/qcom,gpi.yaml | 2 + + .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +- + Documentation/driver-api/dmaengine/provider.rst | 2 +- + MAINTAINERS | 2 +- + drivers/dma/Kconfig | 11 + + drivers/dma/Makefile | 1 + + drivers/dma/bestcomm/bestcomm.c | 2 + + drivers/dma/dmaengine.c | 7 - + drivers/dma/ep93xx_dma.c | 2 +- + drivers/dma/idxd/device.c | 66 +- + drivers/dma/idxd/registers.h | 1 + + drivers/dma/idxd/sysfs.c | 10 +- + drivers/dma/mediatek/mtk-cqdma.c | 12 +- + drivers/dma/mediatek/mtk-hsdma.c | 11 +- + drivers/dma/nbpfaxi.c | 14 +- + drivers/dma/qcom/gpi.c | 20 +- + drivers/dma/sf-pdma/sf-pdma.c | 24 +- + drivers/dma/sf-pdma/sf-pdma.h | 8 +- + drivers/dma/sh/Kconfig | 2 +- + drivers/dma/stm32-mdma.c | 21 +- + drivers/dma/tegra186-gpc-dma.c | 1507 ++++++++++++++++++++ + include/linux/dmaengine.h | 1 - + include/uapi/linux/idxd.h | 31 +- + 25 files changed, 1811 insertions(+), 77 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/nvidia,tegra186-gpc-dma.yaml + create mode 100644 drivers/dma/tegra186-gpc-dma.c +Merging cgroup/for-next (1be9b7206b7d Merge branch 'for-5.18' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/cgroup/cpuset.c +Merge made by the 'ort' strategy. +Merging scsi/for-next (70c954151828 Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Merge made by the 'ort' strategy. + drivers/scsi/ufs/ufshcd-pltfrm.c | 10 ++++---- + drivers/scsi/vmw_pvscsi.c | 1 - + drivers/target/target_core_configfs.c | 47 +++++++++++++++++++++-------------- + 3 files changed, 33 insertions(+), 25 deletions(-) +Merging scsi-mkp/for-next (3a6a7187f09a scsi: megaraid_sas: Remove unnecessary memset) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Merge made by the 'ort' strategy. + drivers/scsi/megaraid/megaraid_sas_base.c | 2 -- + 1 file changed, 2 deletions(-) +Merging vhost/linux-next (1c80cf031e02 vdpa: mlx5: synchronize driver status with CVQ) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Already up to date. +Merging rpmsg/for-next (58b7c856519f remoteproc: imx_rproc: Ignore create mem entry for resource table) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + drivers/remoteproc/imx_dsp_rproc.c | 105 +++-------------------------- + drivers/remoteproc/imx_rproc.c | 3 + + drivers/remoteproc/mtk_common.h | 2 + + drivers/remoteproc/mtk_scp.c | 70 ++++++++++++++----- + drivers/remoteproc/remoteproc_cdev.c | 11 --- + drivers/remoteproc/remoteproc_core.c | 15 +++-- + drivers/remoteproc/remoteproc_debugfs.c | 17 +---- + drivers/remoteproc/remoteproc_elf_loader.c | 2 +- + drivers/remoteproc/remoteproc_sysfs.c | 11 --- + 9 files changed, 81 insertions(+), 155 deletions(-) +Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (4f3e79b36d7f gpio: ixp4xx: Detect special machines by compatible) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging drivers/gpio/gpiolib.c +Merge made by the 'ort' strategy. + .../bindings/gpio/realtek,otto-gpio.yaml | 34 ++++- + .../bindings/gpio/renesas,rcar-gpio.yaml | 5 + + .../bindings/gpio/socionext,uniphier-gpio.yaml | 17 +++ + drivers/gpio/Kconfig | 1 - + drivers/gpio/gpio-ixp4xx.c | 5 +- + drivers/gpio/gpio-rcar.c | 7 +- + drivers/gpio/gpio-realtek-otto.c | 137 ++++++++++++++++++++- + drivers/gpio/gpiolib-cdev.c | 66 +++++----- + drivers/gpio/gpiolib-of.c | 3 +- + drivers/gpio/gpiolib-sysfs.c | 3 +- + drivers/gpio/gpiolib.c | 75 +++++------ + drivers/gpio/gpiolib.h | 11 +- + 12 files changed, 271 insertions(+), 93 deletions(-) +Merging gpio-intel/for-next (edc5601db664 pinctrl: meson: Replace custom code by gpiochip_node_count() call) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Auto-merging include/linux/gpio/driver.h +Merge made by the 'ort' strategy. + drivers/pinctrl/meson/Kconfig | 2 +- + drivers/pinctrl/meson/pinctrl-meson.c | 52 +++++----- + drivers/pinctrl/meson/pinctrl-meson.h | 28 +++--- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 34 ++----- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 142 ++++++++++++---------------- + drivers/pinctrl/renesas/pinctrl-rza1.c | 47 +++------ + drivers/pinctrl/samsung/pinctrl-exynos.c | 8 +- + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 2 +- + drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 4 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 30 +++--- + drivers/pinctrl/samsung/pinctrl-samsung.h | 2 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 80 +++++++--------- + include/linux/gpio/driver.h | 28 +++++- + 13 files changed, 210 insertions(+), 249 deletions(-) +Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-sim/gpio/gpio-sim +Already up to date. +Merging pinctrl/for-next (4a6d01495a16 pinctrl: mediatek: common-v1: fix semicolon.cocci warnings) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (0be0b70df661 pinctrl: alderlake: Fix register offsets for ADL-N variant) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (d508ba2d0e57 pinctrl: renesas: Remove unneeded #include <linux/init.h>) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Merge made by the 'ort' strategy. + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 5 +- + drivers/pinctrl/renesas/Kconfig | 7 +- + drivers/pinctrl/renesas/gpio.c | 1 - + drivers/pinctrl/renesas/pfc-emev2.c | 1 - + drivers/pinctrl/renesas/pfc-r8a77990.c | 120 ++++++++++--- + drivers/pinctrl/renesas/pfc-r8a77995.c | 98 ++++++++++ + drivers/pinctrl/renesas/pfc-sh7722.c | 1 - + drivers/pinctrl/renesas/pfc-sh7723.c | 1 - + drivers/pinctrl/renesas/pfc-sh7724.c | 1 - + drivers/pinctrl/renesas/pfc-sh7734.c | 1 - + drivers/pinctrl/renesas/pfc-sh7757.c | 1 - + drivers/pinctrl/renesas/pfc-sh7785.c | 1 - + drivers/pinctrl/renesas/pfc-sh7786.c | 1 - + drivers/pinctrl/renesas/pfc-shx3.c | 1 - + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 200 +++++++++++++-------- + drivers/pinctrl/renesas/pinctrl.c | 1 - + drivers/pinctrl/renesas/sh_pfc.h | 7 +- + 17 files changed, 326 insertions(+), 122 deletions(-) +Merging pinctrl-samsung/for-next (abb860ac7e3f pinctrl: samsung: staticize fsd_pin_ctrl) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (ed14d36498c8 pwm: rcar: Simplify multiplication/shift logic) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Already up to date. +Merging userns/for-next (9def41809e95 Merge of prlimit-tasklist_lock-for-v5.18, per-namespace-ipc-sysctls-for-v5.18, and ptrace-for-v5.18 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging MAINTAINERS +Auto-merging arch/x86/kernel/ptrace.c +Auto-merging fs/io_uring.c +Auto-merging include/linux/posix-timers.h +Auto-merging ipc/mqueue.c +Auto-merging kernel/seccomp.c +Auto-merging kernel/signal.c +Auto-merging kernel/time/posix-cpu-timers.c +Auto-merging mm/memcontrol.c +Merge made by the 'ort' strategy. + include/linux/ipc_namespace.h | 37 ++++++++- + ipc/ipc_sysctl.c | 189 +++++++++++++++++++++++++++--------------- + ipc/mq_sysctl.c | 121 +++++++++++++++------------ + ipc/mqueue.c | 10 +-- + ipc/namespace.c | 10 +++ + 5 files changed, 235 insertions(+), 132 deletions(-) +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging livepatching/for-next (0e1b951d6de0 Merge branch 'for-5.18/selftests-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. +Merging rtc/rtc-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (ada8d8d337ee nvdimm/blk: Fix title level) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (10003e852471 ntb_perf: extend with burst/poll/doorbell latency measurement) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'ort' strategy. + drivers/ntb/hw/idt/Makefile | 1 + + drivers/ntb/test/ntb_perf.c | 820 +++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 805 insertions(+), 16 deletions(-) +Merging seccomp/for-next/seccomp (8a3d3ea66f0d selftests/seccomp: Add SKIP for failed unshare()) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Auto-merging tools/testing/selftests/kselftest_harness.h +Auto-merging tools/testing/selftests/seccomp/Makefile +Merge made by the 'ort' strategy. + tools/testing/selftests/seccomp/Makefile | 1 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 78 ++++++++++++++++++++++++--- + 2 files changed, 73 insertions(+), 6 deletions(-) +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next +Already up to date. +Merging fsi/next (f2af60bb7ce2 fsi: Add trace events in initialization path) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Already up to date. +Merging slimbus/for-next (54bf672111ee slimbus: qcom: Fix IRQ check in qcom_slim_probe) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Merge made by the 'ort' strategy. + drivers/slimbus/qcom-ctrl.c | 4 ++-- + drivers/slimbus/qcom-ngd-ctrl.c | 10 ++++------ + 2 files changed, 6 insertions(+), 8 deletions(-) +Merging nvmem/for-next (2e26a810b679 nvmem: sunplus-ocotp: staticize sp_otp_v0) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/nvmem/apple,efuses.yaml | 50 ++++++++++++++ + MAINTAINERS | 2 + + drivers/nvmem/Kconfig | 12 ++++ + drivers/nvmem/Makefile | 2 + + drivers/nvmem/apple-efuses.c | 80 ++++++++++++++++++++++ + drivers/nvmem/bcm-ocotp.c | 2 +- + drivers/nvmem/brcm_nvram.c | 2 + + drivers/nvmem/core.c | 1 + + drivers/nvmem/sunplus-ocotp.c | 4 +- + include/linux/nvmem-consumer.h | 1 + + 10 files changed, 152 insertions(+), 4 deletions(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/apple,efuses.yaml + create mode 100644 drivers/nvmem/apple-efuses.c +Merging xarray/main (3ed4bb77156d XArray: Update the LRU list in xas_split()) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Already up to date. +Merging hyperv/hyperv-next (eeda29db98f4 x86/hyperv: Output host build info as normal Windows version number) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (13de23494f38 auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging kunit/test (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging cfi/cfi/next (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (59729170afcd kunit: Make kunit_remove_resource() idempotent) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Auto-merging net/mctp/test/route-test.c +CONFLICT (content): Merge conflict in net/mctp/test/route-test.c +Auto-merging security/apparmor/policy_unpack_test.c +CONFLICT (content): Merge conflict in security/apparmor/policy_unpack_test.c +Resolved 'net/mctp/test/route-test.c' using previous resolution. +Resolved 'security/apparmor/policy_unpack_test.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b4eac9ce9538] Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git +$ git diff -M --stat --summary HEAD^.. + Documentation/dev-tools/kunit/api/index.rst | 5 + + Documentation/dev-tools/kunit/api/resource.rst | 13 + + Documentation/dev-tools/kunit/running_tips.rst | 3 +- + drivers/thunderbolt/test.c | 134 ++++----- + include/kunit/resource.h | 318 ++++++++++++++++++++ + include/kunit/test.h | 387 ++++++------------------ + lib/kunit/Makefile | 1 + + lib/kunit/kunit-example-test.c | 2 + + lib/kunit/kunit-test.c | 37 ++- + lib/kunit/resource.c | 129 ++++++++ + lib/kunit/test.c | 116 +------- + lib/list-test.c | 397 ++++++++++++++++++++++++- + lib/test_kasan.c | 2 +- + net/mctp/test/route-test.c | 4 +- + security/apparmor/policy_unpack_test.c | 6 +- + tools/testing/kunit/kunit.py | 54 ++-- + tools/testing/kunit/kunit_config.py | 9 +- + tools/testing/kunit/kunit_json.py | 63 ++-- + tools/testing/kunit/kunit_kernel.py | 53 ++-- + tools/testing/kunit/kunit_parser.py | 7 + + tools/testing/kunit/kunit_tool_test.py | 15 +- + tools/testing/kunit/qemu_config.py | 17 +- + 22 files changed, 1177 insertions(+), 595 deletions(-) + create mode 100644 Documentation/dev-tools/kunit/api/resource.rst + create mode 100644 include/kunit/resource.h + create mode 100644 lib/kunit/resource.c +Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (2ab40dd15f1c bus: mhi: host: Use cached values for calculating the shared write pointer) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/bus/mhi/Kconfig | 1 + + drivers/bus/mhi/Makefile | 3 + + drivers/bus/mhi/common.h | 22 + + drivers/bus/mhi/ep/Kconfig | 10 + + drivers/bus/mhi/ep/Makefile | 2 + + drivers/bus/mhi/ep/internal.h | 218 +++++ + drivers/bus/mhi/ep/main.c | 1591 ++++++++++++++++++++++++++++++++++++ + drivers/bus/mhi/ep/mmio.c | 273 +++++++ + drivers/bus/mhi/ep/ring.c | 207 +++++ + drivers/bus/mhi/ep/sm.c | 148 ++++ + drivers/bus/mhi/host/main.c | 9 +- + drivers/bus/mhi/host/pci_generic.c | 2 + + include/linux/mhi_ep.h | 277 +++++++ + include/linux/mod_devicetable.h | 2 + + scripts/mod/file2alias.c | 10 + + 16 files changed, 2769 insertions(+), 8 deletions(-) + create mode 100644 drivers/bus/mhi/ep/Kconfig + create mode 100644 drivers/bus/mhi/ep/Makefile + create mode 100644 drivers/bus/mhi/ep/internal.h + create mode 100644 drivers/bus/mhi/ep/main.c + create mode 100644 drivers/bus/mhi/ep/mmio.c + create mode 100644 drivers/bus/mhi/ep/ring.c + create mode 100644 drivers/bus/mhi/ep/sm.c + create mode 100644 include/linux/mhi_ep.h +Merging memblock/for-next (58ffc34896db memblock tests: Add TODO and README files) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters +Already up to date. +Merging cxl/next (05e815539f3f cxl/core/port: Fix NULL but dereferenced coccicheck error) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller) +$ git merge -m Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git folio-iomap/folio-iomap +Already up to date. +Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (21b68da7bf4a efi: x86: Set the NX-compatibility flag in the PE header) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging drivers/virt/Kconfig +CONFLICT (content): Merge conflict in drivers/virt/Kconfig +Auto-merging drivers/virt/Makefile +CONFLICT (content): Merge conflict in drivers/virt/Makefile +Auto-merging include/linux/efi.h +Resolved 'drivers/virt/Kconfig' using previous resolution. +Resolved 'drivers/virt/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 03bdab592798] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/securityfs-secrets-coco | 51 ++++ + Documentation/security/index.rst | 1 + + Documentation/security/secrets/coco.rst | 103 +++++++ + Documentation/security/secrets/index.rst | 9 + + arch/x86/boot/header.S | 4 + + arch/x86/include/asm/efi.h | 5 + + arch/x86/platform/efi/efi.c | 3 + + drivers/firmware/efi/Kconfig | 43 +++ + drivers/firmware/efi/efi.c | 13 +- + drivers/firmware/efi/libstub/efistub.h | 74 +++++ + drivers/firmware/efi/libstub/x86-stub.c | 120 +++++++- + drivers/virt/Kconfig | 2 + + drivers/virt/Makefile | 1 + + drivers/virt/coco/efi_secret/Kconfig | 16 + + drivers/virt/coco/efi_secret/Makefile | 2 + + drivers/virt/coco/efi_secret/efi_secret.c | 349 ++++++++++++++++++++++ + include/linux/efi.h | 14 + + 17 files changed, 804 insertions(+), 6 deletions(-) + create mode 100644 Documentation/ABI/testing/securityfs-secrets-coco + create mode 100644 Documentation/security/secrets/coco.rst + create mode 100644 Documentation/security/secrets/index.rst + create mode 100644 drivers/virt/coco/efi_secret/Kconfig + create mode 100644 drivers/virt/coco/efi_secret/Makefile + create mode 100644 drivers/virt/coco/efi_secret/efi_secret.c +Merging unicode/for-next (5298d4bfe80f unicode: clean up the Kconfig symbol confusion) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Already up to date. +Merging slab/for-next (b2a53d4ef861 Merge branches 'slab/for-5.19/stackdepot' and 'slab/for-5.19/refactor' into slab/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Auto-merging init/Kconfig +Auto-merging mm/slab.c +Auto-merging mm/slab.h +Auto-merging mm/slab_common.c +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. + Documentation/vm/slub.rst | 64 ++++++++++++++++++ + include/linux/slab.h | 7 ++ + include/linux/stackdepot.h | 26 ++++++-- + init/Kconfig | 1 + + lib/Kconfig.debug | 1 + + lib/slub_kunit.c | 10 +-- + lib/stackdepot.c | 67 ++++++++++++------- + mm/page_owner.c | 9 ++- + mm/slab.c | 29 +++----- + mm/slab.h | 5 +- + mm/slab_common.c | 23 +++---- + mm/slub.c | 160 +++++++++++++++++++++++++++++---------------- + 12 files changed, 273 insertions(+), 129 deletions(-) +Merging random/master (0c6fa560a2f5 random: insist on random_get_entropy() existing in order to simplify) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Merge made by the 'ort' strategy. + arch/arm/include/asm/timex.h | 1 + + arch/m68k/include/asm/timex.h | 2 +- + arch/mips/include/asm/timex.h | 16 +++---- + arch/nios2/include/asm/timex.h | 2 + + arch/riscv/include/asm/timex.h | 2 +- + arch/sparc/include/asm/timex_32.h | 4 +- + arch/um/include/asm/timex.h | 9 +--- + arch/x86/include/asm/timex.h | 10 ++++ + arch/xtensa/include/asm/timex.h | 6 +-- + drivers/char/random.c | 98 +++++++++++++++------------------------ + include/linux/timex.h | 8 ++++ + kernel/time/timekeeping.c | 10 ++++ + 12 files changed, 82 insertions(+), 86 deletions(-) +Merging landlock/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +Merging rust/rust-next (011150424cd9 rust: avoid all GCC plugins, not just the randstruct one) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging .gitignore +Auto-merging Documentation/doc-guide/kernel-doc.rst +Auto-merging Documentation/index.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging arch/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging init/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging scripts/Makefile +Auto-merging scripts/Makefile.build +Auto-merging scripts/Makefile.lib +Resolved 'Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c892736df301] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 5 + + .rustfmt.toml | 12 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 17 + + Documentation/kbuild/makefiles.rst | 50 +- + Documentation/process/changes.rst | 41 + + Documentation/rust/arch-support.rst | 34 + + Documentation/rust/coding-guidelines.rst | 214 ++ + Documentation/rust/general-information.rst | 77 + + Documentation/rust/index.rst | 20 + + Documentation/rust/logo.svg | 357 +++ + Documentation/rust/quick-start.rst | 230 ++ + MAINTAINERS | 15 + + Makefile | 175 +- + arch/Kconfig | 6 + + arch/arm/Kconfig | 1 + + arch/arm64/Kconfig | 1 + + arch/powerpc/Kconfig | 1 + + arch/riscv/Kconfig | 1 + + arch/riscv/Makefile | 5 + + arch/x86/Kconfig | 1 + + arch/x86/Makefile | 14 + + drivers/android/Kconfig | 6 + + drivers/android/Makefile | 2 + + drivers/android/allocation.rs | 266 ++ + drivers/android/context.rs | 80 + + drivers/android/defs.rs | 99 + + drivers/android/node.rs | 476 ++++ + drivers/android/process.rs | 960 ++++++++ + drivers/android/range_alloc.rs | 189 ++ + drivers/android/rust_binder.rs | 111 + + drivers/android/thread.rs | 870 +++++++ + drivers/android/transaction.rs | 326 +++ + drivers/gpio/Kconfig | 8 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio_pl061_rust.rs | 370 +++ + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 17 +- + include/uapi/linux/android/binder.h | 28 +- + init/Kconfig | 50 +- + kernel/kallsyms.c | 26 +- + kernel/livepatch/core.c | 4 +- + lib/Kconfig.debug | 143 ++ + lib/vsprintf.c | 13 + + rust/.gitignore | 8 + + rust/Makefile | 376 +++ + rust/alloc/README.md | 32 + + rust/alloc/alloc.rs | 440 ++++ + rust/alloc/borrow.rs | 498 ++++ + rust/alloc/boxed.rs | 2008 +++++++++++++++ + rust/alloc/collections/mod.rs | 156 ++ + rust/alloc/fmt.rs | 601 +++++ + rust/alloc/lib.rs | 231 ++ + rust/alloc/macros.rs | 126 + + rust/alloc/raw_vec.rs | 561 +++++ + rust/alloc/slice.rs | 1279 ++++++++++ + rust/alloc/str.rs | 632 +++++ + rust/alloc/string.rs | 2862 ++++++++++++++++++++++ + rust/alloc/vec/drain.rs | 186 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 356 +++ + rust/alloc/vec/is_zero.rs | 106 + + rust/alloc/vec/mod.rs | 3353 ++++++++++++++++++++++++++ + rust/alloc/vec/partial_eq.rs | 49 + + rust/alloc/vec/set_len_on_drop.rs | 30 + + rust/alloc/vec/spec_extend.rs | 174 ++ + rust/bindgen_parameters | 13 + + rust/build_error.rs | 29 + + rust/compiler_builtins.rs | 57 + + rust/exports.c | 20 + + rust/helpers.c | 531 ++++ + rust/kernel/allocator.rs | 65 + + rust/kernel/amba.rs | 259 ++ + rust/kernel/bindings.rs | 47 + + rust/kernel/bindings_helper.h | 37 + + rust/kernel/build_assert.rs | 80 + + rust/kernel/c_types.rs | 119 + + rust/kernel/chrdev.rs | 207 ++ + rust/kernel/clk.rs | 75 + + rust/kernel/cred.rs | 73 + + rust/kernel/device.rs | 554 +++++ + rust/kernel/driver.rs | 440 ++++ + rust/kernel/error.rs | 560 +++++ + rust/kernel/file.rs | 873 +++++++ + rust/kernel/gpio.rs | 478 ++++ + rust/kernel/hwrng.rs | 242 ++ + rust/kernel/io_buffer.rs | 153 ++ + rust/kernel/io_mem.rs | 237 ++ + rust/kernel/iov_iter.rs | 81 + + rust/kernel/irq.rs | 409 ++++ + rust/kernel/lib.rs | 260 ++ + rust/kernel/linked_list.rs | 247 ++ + rust/kernel/miscdev.rs | 291 +++ + rust/kernel/mm.rs | 149 ++ + rust/kernel/module_param.rs | 498 ++++ + rust/kernel/of.rs | 63 + + rust/kernel/pages.rs | 144 ++ + rust/kernel/platform.rs | 224 ++ + rust/kernel/power.rs | 118 + + rust/kernel/prelude.rs | 36 + + rust/kernel/print.rs | 414 ++++ + rust/kernel/random.rs | 42 + + rust/kernel/raw_list.rs | 361 +++ + rust/kernel/rbtree.rs | 562 +++++ + rust/kernel/revocable.rs | 163 ++ + rust/kernel/security.rs | 36 + + rust/kernel/static_assert.rs | 39 + + rust/kernel/std_vendor.rs | 150 ++ + rust/kernel/str.rs | 592 +++++ + rust/kernel/sync/arc.rs | 500 ++++ + rust/kernel/sync/condvar.rs | 138 ++ + rust/kernel/sync/guard.rs | 166 ++ + rust/kernel/sync/locked_by.rs | 112 + + rust/kernel/sync/mod.rs | 157 ++ + rust/kernel/sync/mutex.rs | 114 + + rust/kernel/sync/revocable_mutex.rs | 184 ++ + rust/kernel/sync/rwsem.rs | 149 ++ + rust/kernel/sync/seqlock.rs | 202 ++ + rust/kernel/sync/spinlock.rs | 192 ++ + rust/kernel/sysctl.rs | 199 ++ + rust/kernel/task.rs | 182 ++ + rust/kernel/types.rs | 569 +++++ + rust/kernel/user_ptr.rs | 175 ++ + rust/macros/helpers.rs | 79 + + rust/macros/lib.rs | 94 + + rust/macros/module.rs | 631 +++++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 130 + + samples/rust/Makefile | 15 + + samples/rust/hostprogs/.gitignore | 3 + + samples/rust/hostprogs/Makefile | 5 + + samples/rust/hostprogs/a.rs | 7 + + samples/rust/hostprogs/b.rs | 5 + + samples/rust/hostprogs/single.rs | 12 + + samples/rust/rust_chrdev.rs | 50 + + samples/rust/rust_minimal.rs | 35 + + samples/rust/rust_miscdev.rs | 143 ++ + samples/rust/rust_module_parameters.rs | 69 + + samples/rust/rust_platform.rs | 22 + + samples/rust/rust_print.rs | 54 + + samples/rust/rust_random.rs | 60 + + samples/rust/rust_semaphore.rs | 171 ++ + samples/rust/rust_semaphore_c.c | 212 ++ + samples/rust/rust_stack_probing.rs | 36 + + samples/rust/rust_sync.rs | 93 + + scripts/.gitignore | 1 + + scripts/Kconfig.include | 6 +- + scripts/Makefile | 3 + + scripts/Makefile.build | 60 + + scripts/Makefile.debug | 10 + + scripts/Makefile.host | 34 +- + scripts/Makefile.lib | 12 + + scripts/Makefile.modfinal | 8 +- + scripts/cc-version.sh | 12 +- + scripts/decode_stacktrace.sh | 14 + + scripts/generate_rust_analyzer.py | 133 + + scripts/generate_rust_target.rs | 227 ++ + scripts/is_rust_module.sh | 13 + + scripts/kallsyms.c | 40 +- + scripts/kconfig/confdata.c | 75 + + scripts/min-tool-version.sh | 6 + + scripts/rust-is-available-bindgen-libclang.h | 2 + + scripts/rust-is-available.sh | 158 ++ + tools/include/linux/kallsyms.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 168 files changed, 35289 insertions(+), 64 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/coding-guidelines.rst + create mode 100644 Documentation/rust/general-information.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/logo.svg + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 drivers/android/allocation.rs + create mode 100644 drivers/android/context.rs + create mode 100644 drivers/android/defs.rs + create mode 100644 drivers/android/node.rs + create mode 100644 drivers/android/process.rs + create mode 100644 drivers/android/range_alloc.rs + create mode 100644 drivers/android/rust_binder.rs + create mode 100644 drivers/android/thread.rs + create mode 100644 drivers/android/transaction.rs + create mode 100644 drivers/gpio/gpio_pl061_rust.rs + create mode 100644 rust/.gitignore + create mode 100644 rust/Makefile + create mode 100644 rust/alloc/README.md + create mode 100644 rust/alloc/alloc.rs + create mode 100644 rust/alloc/borrow.rs + create mode 100644 rust/alloc/boxed.rs + create mode 100644 rust/alloc/collections/mod.rs + create mode 100644 rust/alloc/fmt.rs + create mode 100644 rust/alloc/lib.rs + create mode 100644 rust/alloc/macros.rs + create mode 100644 rust/alloc/raw_vec.rs + create mode 100644 rust/alloc/slice.rs + create mode 100644 rust/alloc/str.rs + create mode 100644 rust/alloc/string.rs + create mode 100644 rust/alloc/vec/drain.rs + create mode 100644 rust/alloc/vec/drain_filter.rs + create mode 100644 rust/alloc/vec/into_iter.rs + create mode 100644 rust/alloc/vec/is_zero.rs + create mode 100644 rust/alloc/vec/mod.rs + create mode 100644 rust/alloc/vec/partial_eq.rs + create mode 100644 rust/alloc/vec/set_len_on_drop.rs + create mode 100644 rust/alloc/vec/spec_extend.rs + create mode 100644 rust/bindgen_parameters + create mode 100644 rust/build_error.rs + create mode 100644 rust/compiler_builtins.rs + create mode 100644 rust/exports.c + create mode 100644 rust/helpers.c + create mode 100644 rust/kernel/allocator.rs + create mode 100644 rust/kernel/amba.rs + create mode 100644 rust/kernel/bindings.rs + create mode 100644 rust/kernel/bindings_helper.h + create mode 100644 rust/kernel/build_assert.rs + create mode 100644 rust/kernel/c_types.rs + create mode 100644 rust/kernel/chrdev.rs + create mode 100644 rust/kernel/clk.rs + create mode 100644 rust/kernel/cred.rs + create mode 100644 rust/kernel/device.rs + create mode 100644 rust/kernel/driver.rs + create mode 100644 rust/kernel/error.rs + create mode 100644 rust/kernel/file.rs + create mode 100644 rust/kernel/gpio.rs + create mode 100644 rust/kernel/hwrng.rs + create mode 100644 rust/kernel/io_buffer.rs + create mode 100644 rust/kernel/io_mem.rs + create mode 100644 rust/kernel/iov_iter.rs + create mode 100644 rust/kernel/irq.rs + create mode 100644 rust/kernel/lib.rs + create mode 100644 rust/kernel/linked_list.rs + create mode 100644 rust/kernel/miscdev.rs + create mode 100644 rust/kernel/mm.rs + create mode 100644 rust/kernel/module_param.rs + create mode 100644 rust/kernel/of.rs + create mode 100644 rust/kernel/pages.rs + create mode 100644 rust/kernel/platform.rs + create mode 100644 rust/kernel/power.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/print.rs + create mode 100644 rust/kernel/random.rs + create mode 100644 rust/kernel/raw_list.rs + create mode 100644 rust/kernel/rbtree.rs + create mode 100644 rust/kernel/revocable.rs + create mode 100644 rust/kernel/security.rs + create mode 100644 rust/kernel/static_assert.rs + create mode 100644 rust/kernel/std_vendor.rs + create mode 100644 rust/kernel/str.rs + create mode 100644 rust/kernel/sync/arc.rs + create mode 100644 rust/kernel/sync/condvar.rs + create mode 100644 rust/kernel/sync/guard.rs + create mode 100644 rust/kernel/sync/locked_by.rs + create mode 100644 rust/kernel/sync/mod.rs + create mode 100644 rust/kernel/sync/mutex.rs + create mode 100644 rust/kernel/sync/revocable_mutex.rs + create mode 100644 rust/kernel/sync/rwsem.rs + create mode 100644 rust/kernel/sync/seqlock.rs + create mode 100644 rust/kernel/sync/spinlock.rs + create mode 100644 rust/kernel/sysctl.rs + create mode 100644 rust/kernel/task.rs + create mode 100644 rust/kernel/types.rs + create mode 100644 rust/kernel/user_ptr.rs + create mode 100644 rust/macros/helpers.rs + create mode 100644 rust/macros/lib.rs + create mode 100644 rust/macros/module.rs + create mode 100644 samples/rust/Kconfig + create mode 100644 samples/rust/Makefile + create mode 100644 samples/rust/hostprogs/.gitignore + create mode 100644 samples/rust/hostprogs/Makefile + create mode 100644 samples/rust/hostprogs/a.rs + create mode 100644 samples/rust/hostprogs/b.rs + create mode 100644 samples/rust/hostprogs/single.rs + create mode 100644 samples/rust/rust_chrdev.rs + create mode 100644 samples/rust/rust_minimal.rs + create mode 100644 samples/rust/rust_miscdev.rs + create mode 100644 samples/rust/rust_module_parameters.rs + create mode 100644 samples/rust/rust_platform.rs + create mode 100644 samples/rust/rust_print.rs + create mode 100644 samples/rust/rust_random.rs + create mode 100644 samples/rust/rust_semaphore.rs + create mode 100644 samples/rust/rust_semaphore_c.c + create mode 100644 samples/rust/rust_stack_probing.rs + create mode 100644 samples/rust/rust_sync.rs + create mode 100755 scripts/generate_rust_analyzer.py + create mode 100644 scripts/generate_rust_target.rs + create mode 100755 scripts/is_rust_module.sh + create mode 100644 scripts/rust-is-available-bindgen-libclang.h + create mode 100755 scripts/rust-is-available.sh +Merging sysctl/sysctl-next (383189718496 Merge remote-tracking branch 'bpf-next/pr/bpf-sysctl' into sysctl-next) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/rcu/rcu.h +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sysctl.c +Merge made by the 'ort' strategy. + include/linux/acct.h | 1 - + include/linux/delayacct.h | 3 - + include/linux/ftrace.h | 3 - + include/linux/initrd.h | 2 - + include/linux/lockdep.h | 4 - + include/linux/oom.h | 4 - + include/linux/panic.h | 6 - + include/linux/reboot.h | 4 - + include/linux/sched/sysctl.h | 41 ------- + include/linux/writeback.h | 15 --- + init/do_mounts_initrd.c | 22 +++- + kernel/acct.c | 22 +++- + kernel/delayacct.c | 22 +++- + kernel/locking/lockdep.c | 35 +++++- + kernel/panic.c | 26 +++- + kernel/rcu/rcu.h | 2 + + kernel/reboot.c | 34 +++++- + kernel/sched/core.c | 69 ++++++++--- + kernel/sched/deadline.c | 42 +++++-- + kernel/sched/fair.c | 32 ++++- + kernel/sched/rt.c | 63 +++++++++- + kernel/sched/sched.h | 7 ++ + kernel/sched/topology.c | 25 +++- + kernel/sysctl.c | 277 ------------------------------------------- + kernel/trace/ftrace.c | 22 +++- + mm/oom_kill.c | 38 +++++- + mm/page-writeback.c | 103 ++++++++++++++-- + 27 files changed, 510 insertions(+), 414 deletions(-) +Merging folio/for-next (98ea02597b99 mm/rmap: Fix handling of hugetlbfs pages in page_vma_mapped_walk) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Already up to date. +Merging execve/for-next/execve (6045ab5fea4c binfmt_flat: do not stop relocating GOT entries prematurely on riscv) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Merge made by the 'ort' strategy. + fs/binfmt_flat.c | 27 ++++++++++++++++++++++++++- + 1 file changed, 26 insertions(+), 1 deletion(-) +Merging bitmap/bitmap-for-next (f0b93f69ffda include/linux/find: Fix documentation) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging MAINTAINERS +Auto-merging arch/x86/kernel/cpu/resctrl/rdtgroup.c +Auto-merging arch/x86/kvm/hyperv.c +Auto-merging arch/x86/platform/uv/uv_nmi.c +Auto-merging drivers/gpu/drm/i915/i915_pmu.c +Auto-merging kernel/irq/affinity.c +Auto-merging mm/page_alloc.c +Merge made by the 'ort' strategy. + MAINTAINERS | 4 ++ + arch/alpha/kernel/process.c | 2 +- + arch/ia64/kernel/setup.c | 2 +- + arch/ia64/mm/tlb.c | 2 +- + arch/mips/cavium-octeon/octeon-irq.c | 4 +- + arch/mips/kernel/crash.c | 2 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/kernel/watchdog.c | 2 +- + arch/powerpc/xmon/xmon.c | 4 +- + arch/s390/kernel/perf_cpum_cf.c | 2 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 2 +- + arch/x86/kvm/hyperv.c | 8 +-- + drivers/acpi/numa/srat.c | 2 +- + drivers/firmware/psci/psci_checker.c | 2 +- + drivers/gpu/drm/i915/i915_pmu.c | 2 +- + drivers/iio/dummy/iio_simple_dummy_buffer.c | 48 ++++++------- + drivers/iio/industrialio-trigger.c | 2 +- + drivers/infiniband/hw/hfi1/affinity.c | 9 ++- + drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- + drivers/memstick/core/ms_block.c | 4 +- + drivers/net/dsa/b53/b53_common.c | 6 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 6 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 2 +- + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 8 +-- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 33 +++------ + drivers/net/ethernet/mellanox/mlx4/eq.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 45 ++++--------- + drivers/net/ethernet/qlogic/qed/qed_roce.c | 2 +- + drivers/perf/thunderx2_pmu.c | 4 +- + drivers/scsi/lpfc/lpfc_init.c | 2 +- + drivers/soc/fsl/qbman/qman_test_stash.c | 2 +- + drivers/staging/media/tegra-video/vi.c | 2 +- + include/linux/bitmap.h | 78 ++++++++++++++++++++++ + include/linux/cpumask.h | 50 ++++++++++++++ + include/linux/find.h | 6 +- + include/linux/nodemask.h | 40 +++++++++++ + lib/bitmap.c | 54 +++++++++++---- + mm/mempolicy.c | 2 +- + mm/page_alloc.c | 2 +- + mm/vmstat.c | 4 +- + tools/include/linux/bitmap.h | 44 ++++++++++++ + tools/lib/bitmap.c | 20 ++++++ + tools/perf/util/pmu.c | 2 +- + 48 files changed, 375 insertions(+), 162 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at dccdd90ffe52 Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git +Merging kspp/for-next/kspp (e6f3b3c9c109 cfi: Use __builtin_function_start) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging arch/Kconfig +Merge made by the 'ort' strategy. + arch/Kconfig | 5 +- + arch/arm64/include/asm/compiler.h | 16 ----- + arch/x86/include/asm/highmem.h | 1 + + include/linux/compiler-clang.h | 10 +++ + include/linux/highmem-internal.h | 10 +++ + mm/usercopy.c | 97 ++++++++------------------- + scripts/gcc-plugins/randomize_layout_plugin.c | 2 - + security/Kconfig | 13 +--- + security/security.c | 9 ++- + 9 files changed, 54 insertions(+), 109 deletions(-) +Merging kspp-gustavo/for-next/kspp (452d059ea2b6 drm/amd/display: Fix Wstringop-overflow warnings in dc_link_dp.c) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h +Auto-merging drivers/virt/acrn/mm.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 ++-- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 4 ++-- + drivers/scsi/fcoe/fcoe_ctlr.c | 2 +- + drivers/virt/acrn/acrn_drv.h | 10 ++++++---- + drivers/virt/acrn/mm.c | 9 ++++----- + fs/afs/security.c | 3 +-- + include/scsi/libfcoe.h | 3 ++- + include/uapi/linux/wireless.h | 2 +- + 8 files changed, 19 insertions(+), 18 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-KVM-SEV-Add-KVM_EXIT_SHUTDOWN-metadata-fo.patch +Applying: fix up for "KVM, SEV: Add KVM_EXIT_SHUTDOWN metadata for SEV-ES" +Merging akpm-current/current (184c9e1ca40f ipc/mqueue: use get_tree_nodev() in mqueue_get_tree()) +$ git merge --no-ff akpm-current/current +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/ia64/mm/init.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/mm/Makefile +CONFLICT (content): Merge conflict in arch/x86/mm/Makefile +Auto-merging arch/x86/mm/init_64.c +Auto-merging drivers/block/loop.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging fs/fat/inode.c +Auto-merging fs/namei.c +Auto-merging include/linux/delayacct.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/writeback.h +Auto-merging init/Kconfig +Auto-merging ipc/mqueue.c +Auto-merging kernel/delayacct.c +Auto-merging kernel/sched/core.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/swapfile.c +Auto-merging scripts/decode_stacktrace.sh +Resolved 'arch/x86/mm/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 123343967c02] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/accounting/delay-accounting.rst | 5 +- + Documentation/admin-guide/blockdev/zram.rst | 5 + + Documentation/admin-guide/kernel-parameters.txt | 4 +- + Documentation/admin-guide/mm/hugetlbpage.rst | 2 +- + Documentation/admin-guide/mm/index.rst | 1 + + Documentation/admin-guide/mm/ksm.rst | 18 + + Documentation/admin-guide/mm/multigen_lru.rst | 152 ++ + Documentation/admin-guide/sysctl/vm.rst | 9 + + Documentation/filesystems/locking.rst | 18 +- + Documentation/filesystems/vfs.rst | 17 +- + Documentation/vm/balance.rst | 2 +- + Documentation/vm/index.rst | 1 + + Documentation/vm/multigen_lru.rst | 160 ++ + Documentation/vm/page_owner.rst | 45 +- + MAINTAINERS | 1 - + arch/Kconfig | 8 + + arch/arm64/Kconfig | 2 + + arch/arm64/include/asm/mman.h | 24 - + arch/arm64/include/asm/pgtable-prot.h | 1 + + arch/arm64/include/asm/pgtable.h | 37 +- + arch/arm64/mm/flush.c | 13 + + arch/arm64/mm/mmap.c | 33 + + arch/ia64/kernel/kprobes.c | 64 +- + arch/ia64/kernel/palinfo.c | 2 +- + arch/ia64/kernel/ptrace.c | 2 +- + arch/ia64/kernel/traps.c | 2 +- + arch/ia64/mm/init.c | 2 +- + arch/ia64/mm/tlb.c | 4 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/book3s/64/pgtable.h | 31 +- + arch/powerpc/include/asm/mman.h | 12 - + arch/powerpc/mm/mmap.c | 26 + + arch/s390/include/asm/hugetlb.h | 20 + + arch/s390/include/asm/pgtable.h | 36 +- + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/mman.h | 6 - + arch/sparc/mm/init_64.c | 13 + + arch/x86/Kconfig | 4 +- + arch/x86/include/asm/pgtable.h | 35 +- + arch/x86/include/asm/pgtable_64.h | 4 +- + arch/x86/include/asm/pgtable_types.h | 7 + + arch/x86/include/asm/tlbflush.h | 97 + + arch/x86/include/uapi/asm/mman.h | 14 - + arch/x86/mm/Makefile | 2 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/mm/pgprot.c | 35 + + arch/x86/mm/pgtable.c | 15 +- + drivers/base/node.c | 1 + + drivers/block/loop.c | 4 +- + drivers/block/zram/zram_drv.c | 10 +- + drivers/iommu/tegra-smmu.c | 4 +- + drivers/rapidio/devices/rio_mport_cdev.c | 4 +- + fs/Kconfig | 22 +- + fs/buffer.c | 56 +- + fs/cifs/file.c | 7 +- + fs/dax.c | 98 +- + fs/exec.c | 8 +- + fs/fat/fat.h | 9 +- + fs/fat/fatent.c | 7 +- + fs/fat/inode.c | 6 +- + fs/fat/misc.c | 14 +- + fs/fcntl.c | 9 +- + fs/fuse/dev.c | 3 +- + fs/hugetlbfs/inode.c | 15 +- + fs/namei.c | 8 +- + fs/nfs/file.c | 21 +- + fs/ocfs2/dlm/dlmdebug.c | 12 +- + fs/ocfs2/dlm/dlmunlock.c | 21 +- + fs/ocfs2/namei.c | 49 +- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/quota_local.c | 10 +- + fs/ocfs2/refcounttree.c | 15 +- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/open.c | 9 +- + fs/overlayfs/file.c | 13 +- + fs/pipe.c | 2 +- + fs/proc/base.c | 22 + + fs/proc/fd.c | 23 +- + fs/proc/generic.c | 3 + + fs/proc/kcore.c | 14 +- + fs/proc/page.c | 40 +- + fs/proc/proc_net.c | 3 + + fs/proc/task_mmu.c | 7 + + fs/sysv/super.c | 4 +- + fs/userfaultfd.c | 31 +- + include/asm-generic/hugetlb.h | 24 + + include/asm-generic/tlb.h | 14 + + include/linux/cgroup.h | 15 +- + include/linux/delayacct.h | 28 + + include/linux/fs.h | 4 + + include/linux/gfp.h | 12 +- + include/linux/huge_mm.h | 19 +- + include/linux/hugetlb.h | 37 +- + include/linux/kasan.h | 8 +- + include/linux/khugepaged.h | 59 +- + include/linux/list.h | 6 +- + include/linux/memcontrol.h | 41 + + include/linux/memory_hotplug.h | 2 +- + include/linux/memremap.h | 6 + + include/linux/migrate.h | 34 +- + include/linux/mm.h | 82 +- + include/linux/mm_inline.h | 260 +- + include/linux/mm_types.h | 101 +- + include/linux/mman.h | 4 - + include/linux/mmzone.h | 211 ++ + include/linux/nodemask.h | 1 + + include/linux/page-flags-layout.h | 11 +- + include/linux/page-flags.h | 61 +- + include/linux/pgtable.h | 66 +- + include/linux/pipe_fs_i.h | 2 +- + include/linux/ptrace.h | 2 +- + include/linux/rmap.h | 121 +- + include/linux/sched.h | 12 + + include/linux/sched/coredump.h | 3 +- + include/linux/shmem_fs.h | 6 +- + include/linux/swap.h | 162 +- + include/linux/swapops.h | 106 + + include/linux/userfaultfd_k.h | 84 + + include/linux/vm_event_item.h | 3 + + include/linux/writeback.h | 7 + + include/ras/ras_event.h | 1 - + include/trace/events/mmflags.h | 1 - + include/uapi/linux/acct.h | 3 +- + include/uapi/linux/taskstats.h | 28 +- + include/uapi/linux/userfaultfd.h | 10 +- + init/Kconfig | 4 +- + init/main.c | 25 +- + ipc/mqueue.c | 14 + + ipc/sem.c | 2 - + kernel/bounds.c | 7 + + kernel/cgroup/cgroup-internal.h | 1 - + kernel/delayacct.c | 16 + + kernel/events/uprobes.c | 2 +- + kernel/exit.c | 1 + + kernel/fork.c | 13 +- + kernel/hung_task.c | 46 +- + kernel/kexec_core.c | 2 - + kernel/pid_namespace.c | 2 +- + kernel/ptrace.c | 6 - + kernel/sched/core.c | 1 + + kernel/taskstats.c | 24 + + kernel/tsacct.c | 10 +- + kernel/watchdog.c | 4 +- + lib/Kconfig.debug | 27 +- + lib/glob.c | 2 +- + lib/string.c | 25 +- + lib/test_meminit.c | 12 +- + lib/test_printf.c | 8 +- + lib/test_string.c | 33 + + mm/Kconfig | 45 +- + mm/Makefile | 2 +- + mm/compaction.c | 2 +- + mm/damon/vaddr-test.h | 8 +- + mm/debug_vm_pgtable.c | 46 +- + mm/filemap.c | 5 + + mm/gup.c | 106 +- + mm/hmm.c | 2 +- + mm/huge_memory.c | 165 +- + mm/hugetlb.c | 377 ++- + mm/hugetlb_vmemmap.c | 56 +- + mm/hugetlb_vmemmap.h | 24 +- + mm/internal.h | 146 +- + mm/kasan/quarantine.c | 40 +- + mm/khugepaged.c | 100 +- + mm/ksm.c | 23 +- + mm/madvise.c | 9 +- + mm/memcontrol.c | 83 +- + mm/memory-failure.c | 170 +- + mm/memory.c | 618 +++-- + mm/memory_hotplug.c | 95 +- + mm/mempolicy.c | 9 +- + mm/memremap.c | 29 + + mm/migrate.c | 125 +- + mm/migrate_device.c | 23 +- + mm/mincore.c | 4 +- + mm/mm_init.c | 6 +- + mm/mmap.c | 82 +- + mm/mmu_gather.c | 16 +- + mm/mmzone.c | 2 + + mm/mprotect.c | 176 +- + mm/mremap.c | 14 +- + mm/page_alloc.c | 199 +- + mm/page_io.c | 248 +- + mm/page_isolation.c | 9 +- + mm/page_vma_mapped.c | 17 +- + mm/pgtable-generic.c | 8 + + mm/rmap.c | 182 +- + mm/shmem.c | 26 +- + mm/sparse-vmemmap.c | 4 +- + mm/swap.c | 59 +- + mm/swap.h | 157 ++ + mm/swap_state.c | 23 +- + mm/swapfile.c | 33 +- + mm/userfaultfd.c | 71 +- + mm/util.c | 1 + + mm/vmalloc.c | 2 +- + mm/vmscan.c | 3141 +++++++++++++++++++++-- + mm/vmstat.c | 5 +- + mm/workingset.c | 121 +- + mm/z3fold.c | 64 +- + mm/zswap.c | 2 + + scripts/decode_stacktrace.sh | 27 +- + scripts/get_maintainer.pl | 1 + + tools/accounting/.gitignore | 1 + + tools/accounting/Makefile | 2 +- + tools/accounting/getdelays.c | 8 +- + tools/accounting/procacct.c | 417 +++ + tools/include/linux/gfp.h | 3 +- + tools/perf/builtin-kmem.c | 1 - + tools/testing/selftests/vm/Makefile | 3 + + tools/testing/selftests/vm/gup_test.c | 22 +- + tools/testing/selftests/vm/migration.c | 193 ++ + tools/testing/selftests/vm/run_vmtests.sh | 33 +- + tools/testing/selftests/vm/userfaultfd.c | 13 +- + tools/vm/page-types.c | 8 +- + tools/vm/page_owner_sort.c | 388 ++- + 217 files changed, 9408 insertions(+), 2230 deletions(-) + create mode 100644 Documentation/admin-guide/mm/multigen_lru.rst + create mode 100644 Documentation/vm/multigen_lru.rst + create mode 100644 arch/x86/mm/pgprot.c + create mode 100644 mm/swap.h + create mode 100644 tools/accounting/procacct.c + create mode 100644 tools/testing/selftests/vm/migration.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 8b9e865ce07a...c9b2894523e4 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (c9b2894523e4 kselftest/vm: override TARGETS from arguments) +$ git merge --no-ff akpm/master +Merge made by the 'ort' strategy. + mm/oom_kill.c | 58 ++++---- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 3 +- + tools/testing/selftests/vm/config | 2 + + tools/testing/selftests/vm/soft-dirty.c | 238 ++++++++++++++++++++++++++++++++ + 5 files changed, 272 insertions(+), 30 deletions(-) + create mode 100644 tools/testing/selftests/vm/soft-dirty.c diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..f7de527dec34 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20220419 |