diff options
| author | Mark Brown <broonie@kernel.org> | 2021-07-30 17:11:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-07-30 17:11:34 +0100 |
| commit | 8d4b477da1a807199ca60e0829357ce7aa6758d5 (patch) | |
| tree | 16291c19c9a75592517bfd4456f914d6f8be7990 | |
| parent | a368a0f3584e0f35b93b98df9bcb8f85baf3d16a (diff) | |
Add linux-next specific files for 20210730next-20210730
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | Next/SHA1s | 334 | ||||
| -rw-r--r-- | Next/Trees | 336 | ||||
| -rw-r--r-- | Next/merge.log | 7153 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 7824 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..5ea5ab0bc4e1 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,334 @@ +Name SHA1 +---- ---- +origin 7e96bf476270aecea66740a083e51b38c1371cd2 +fixes 614124bea77e452aa6df7a8714e8bc820b489922 +kbuild-current 5e60f363b38fd40e4d8838b5d6f4d4ecee92c777 +arc-current 3eada7b4bd85d0f73b34108db74d212fc8ad1e8c +arm-current dad7b9896a5dbac5da8275d5a6147c65c81fb5f2 +arm64-fixes d8a719059b9dc963aa190598778ac804ff3e6a87 +arm-soc-fixes 82a1c67554dff610d6be4e1982c425717b3c6a23 +drivers-memory-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +m68k-current 21ed49265986931b8921a2404394426870245bd2 +powerpc-fixes a88603f4b92ecef9e2359e40bcb99ad399d85dd7 +s390-fixes ff1176468d368232b684f75e82563369208bc371 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current d19d8d345eecd9247cbe6cbf27aef271bd88aba7 +net fc16a5322ee6c30ea848818722eee5d352f8d127 +bpf b4f0c24a5eaf0d2f654e253e37d89c30b49bc030 +ipsec 480e93e12aa04d857f7cc2e6fcec181c0d690404 +netfilter 832df96d5f957d42fd9eb9660519a0c51fe8538e +ipvs 832df96d5f957d42fd9eb9660519a0c51fe8538e +wireless-drivers 891332f697e14bfb2002f56e21d9bbd4800a7098 +mac80211 f9a5c358c8d26fed0cc45f2afc64633d4ba21dff +rdma-fixes dc6afef7e14252c5ca5b8a8444946cb4b75b0aa0 +sound-current 4b0556b96e1fe7723629bd40e3813a30cd632faf +sound-asoc-fixes 1cb606882c3968dd59e1f5570f72d341d2f8d567 +regmap-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +regulator-fixes 3687139ee5fb8318725929e2749209a529d6c0ba +spi-fixes ffaff51043fe074380f4ff6af101dd05f0c1087e +pci-current d5450c42cbc30a51a7ad8c4c1bedc765b552c427 +driver-core.current 75d95e2e39b27f733f21e6668af1c9893a97de5e +tty.current 06e91df16f3e1ca1a1886968fb22d4258f3b6b6f +usb.current a154c43b95e860a305d8c943fb3a16ece9a69715 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes 3c18e9baee0ef97510dcda78c82285f52626764b +usb-chipidea-fixes 5df09c15bab98463203c83ecab88b9321466e626 +phy e73f0f0ee7541171d89f2e2491130c7771ba58d3 +staging.current c7b65650c7f41d3946c4e2f0bb56dfdb92cfe127 +iio-fixes 84edec86f449adea9ee0b4912a79ab8d9d65abb7 +char-misc.current 4c4c1257b844ffe5d0933684e612f92c4b78e120 +soundwire-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +thunderbolt-fixes ff1176468d368232b684f75e82563369208bc371 +input-current 818b26588994d9d95743fca0a427f08ec6c1c41d +crypto-current 66192b2e3fd8ab97ed518d6c0240e26655a20b4b +vfio-fixes dc51ff91cf2d1e9a2d941da483602f71d4a51472 +kselftest-fixes 2734d6c1b1a089fb593ef6a23d4b70903526fe0c +modules-fixes 055f23b74b20f2824ce33047b4cf2e2aa856bf3b +dmaengine-fixes eda97cb095f2958bbad55684a6ca3e7d7af0176a +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes ba356289261975ff061580ff30d1026448b9ffd2 +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 61c6f04a988e420a1fc5e8e81cf9aebf142a7bd6 +reset-fixes 1435f82689e1d195e56ce8b19c81aa7b1a3bd0b0 +mips-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +at91-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5 +omap-fixes 353b7a55dcaf5fb8758e09ebe2ddf5f3adbac7c5 +kvm-fixes 8750f9bbda115f3f79bfe43be85551ee5e12b6ff +kvms390-fixes cd4220d23bf3f43cf720e82bdee681f383433ae2 +hwmon-fixes 03726fd90f4bc4ea309f9bf6faf24960d6d2e986 +nvdimm-fixes b05d4c576b697b9f462b9c532c997171d5c3b067 +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes ff4502c88fea119bca6db7e4a76a8528c4893c9b +vfs-fixes 173e84953eaaf17864a707efa2b8cd4c233b3129 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 153cca9caa81ca8912a70528daca4b9a523c6898 +samsung-krzk-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +pinctrl-samsung-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +devicetree-fixes 50d8d7e19c4398da74d028f367754e73547b078b +scsi-fixes f0f82e2476f6adb9c7a0135cfab8091456990c99 +drm-fixes d28e2568ac26fff351c846bf74ba6ca5dded733e +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes b4bde5554f70fb04ff07989fdc1356ab84d6f482 +mmc-fixes 10252bae863d09b9648bed2e035572d207200ca1 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +hyperv-fixes f5a11c69b69923a4367d24365ad4dff6d4f3fc42 +soc-fsl-fixes 2663b3388551230cbc4606a40fabf3331ceb59e4 +risc-v-fixes ea196c548c0ac407afd31d142712b6da8bd00244 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes ec6446d5304b3c3dd692a1e244df7e40bbb5af36 +spdx de5540965853e514a85d3b775e9049deb85a2ff3 +gpio-brgl-fixes ec7099fdea8025988710ee6fecfd4e4210c29ab5 +gpio-intel-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +pinctrl-intel-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +erofs-fixes 0852b6ca941ef3ff75076e85738877bd3271e1cd +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 2734d6c1b1a089fb593ef6a23d4b70903526fe0c +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes 024591f9a6e0164ec23301784d1e6d8f6cacbe59 +cel-fixes 9f4ad9e425a1d3b6a34617b8ea226d56a119a717 +irqchip-fixes 1fee9db9b42d821e8007289d4eea74bdf85b1543 +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +drm-misc-fixes eb92830cdbc232a0e8166c48061ca276132646a7 +kspp-gustavo cb163627e6d32dbaca4d89b2292788cee895b06d +kbuild 27932b6a2088eac7a5afa5471963b926cfbb4de7 +compiler-attributes 7ed012969bbcdbd7aef5778a061681e6cbc4b402 +dma-mapping 40ac971eab89330d6153e7721e88acd2d98833f9 +asm-generic 14462376858e35b83932f94616effc2f49fd8494 +arc def9d2780727cec3313ed3522d0123158d87224d +arm 3bd1461d1691d5405c59c4415c54fcf674eaa5ac +arm64 d914b80a8f567d052d621197974ae08f729c963d +arm-perf d96b1b8c9f79b6bb234a31c80972a6f422079376 +arm-soc 82a1c67554dff610d6be4e1982c425717b3c6a23 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 45889c71755f3d3dddac2b59f6030818e5cc42f1 +aspeed db2d7420f8d381c31fc411c818e4d3ff52e538ed +at91 276fbcb8b79a57476519cdc3de8ade6de0c6e5db +drivers-memory c28b584deb1bc81f8a2454b43c82cdda17ed29f6 +imx-mxs bfec305eccea440b4531ed26f8cb61c6ac494a1d +keystone 9d2e21ed98a24584daa3c90698ce81f5cc307a27 +mediatek a1c8c49de3d7859db3f5dea72a049b92d7ad2e20 +mvebu 69a91ff5e46ccdf9af0ee44cabae000aa06cd5ee +omap f4cfed3482d837202fae6f7484943cc1e071b5c0 +qcom 3f8b3dfa5522b8aa4c12c717a590bb52207cefe0 +raspberrypi b1f2fcb28228593be5bed5bc5ae6c3e68d760ab0 +renesas b1f6bead1fb4976611429f459a1865daadedbb48 +reset bee08559701fb98b43d7061717e7c3131230aa69 +rockchip 7c5b22cf2d8e3d9d03d725e83242733b379829bd +samsung-krzk bb2c20c976aa1018851f1c619a9049dff9331d64 +scmi 7929b794edc738b37d5c3fcfffdf43fd11d48371 +stm32 1f0172c02a3d707026822977fb7c470325f2e7b6 +sunxi 3f1c53207cf051d9aec85e9139bd35ada6184143 +tegra 51b89b49954fae783a7d9216899e7b9b901ee99b +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new e73f0f0ee7541171d89f2e2491130c7771ba58d3 +xilinx d98fb9ab6255136813af65d17524cb224ddd9829 +clk ea271aa63551b4b2c938dc822db2d125167052e3 +clk-imx fb3f4bca19b362c57e1d17b0c1aedd7450f0588e +clk-renesas d28b1e03dc8d1070538ca3ea3f4e6732109ddf42 +clk-samsung a38fd8748464831584a19438cbb3082b5a2dab15 +csky 90dc8c0e664efcb14e2f133309d84bfdcb0b3d24 +h8300 6e5e55227c959716103945e7140614c4c2faf439 +m68k a0b22464ce9352c4a3e100f10f976c85b0ae6690 +m68knommu 60fc0a58c91d56e5b4822b94fb5325d93ebddfb5 +microblaze 14a832498c23cf480243222189066a8006182b9d +mips a86aadeff2fe9203d9575f1c157d09b3c557d1ce +nds32 40e0dd851e7b7afe219820fb270b09016e41d4fc +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc ad4e600cbf897f47525b342cd4b02e88ed300a83 +parisc-hd ca2b19a4bdb6200dc1d64619ea4b8de2a84a0439 +powerpc e1ab9a730b426fadc018f91b7c98412473e542fb +soc-fsl 242b0b398ccd34f73772120bd27a87a1bf00e30b +risc-v 67979e927dd053bde3b71128495f651256b3161c +s390 3da77cf33cf8caf60d5cf29987885abb997a38fa +sh 2882b7626f4903a8e9250b328cdf7396a6deecac +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 1aee020155f364ef538370d3392969f1077b9bae +xtensa ac637a0ada717bdf798f9903d94e3ac65c357423 +pidfd 8374f43123a5957326095d108a12c49ae509624f +fscrypt ba47b515f59406038a6ad763d4aff1ab50be2038 +fscache 5193f26aef591d289b74fcf2055fef002bd25432 +afs 7af08140979a6e7e12b78c93b8625c8d25b084e2 +btrfs 878d950ee03851cc284a325602ee39e5c772e364 +ceph 0077a50082729c3f9ea2836f59e35d9b7dacfb12 +cifs b946dbcfa4df80ec81b442964e07ad37000cc059 +cifsd a8ab5293dd230b7301b489578e1d08cef95ab2b1 +configfs 420405ecde061fde76d67bd3a67577a563ea758e +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs 8215d5b7f15f8643bf12fe005b2bc0cc322aff62 +exfat 50be9417e23af5a8ac860d998e1e3f06b8fd79d7 +ext3 9048da101932cf97aa6240ca46d7699d767e8a69 +ext4 0705e8d1e2207ceeb83dc6e1751b6b82718b353a +f2fs 972afa376543f882b0ed9532aa3ceb2882565f71 +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse ef5680b5f7d1f41f60c60e81c65fd6f738e27a8b +gfs2 a6579cbfd7216b071008db13360c322a6b21400b +jfs 5d299f44d7658f4423e33a0b9915bc8d81687511 +nfs 2734d6c1b1a089fb593ef6a23d4b70903526fe0c +nfs-anna 4f8be1f53bf615102d103c0509ffa9596f65b718 +nfsd ab1016d39cc052064e32f25ad18ef8767a0ee3b8 +cel 268b654a6bd8a0ea8131a11ca2cd1acd99cd5436 +orangefs 0fdec1b3c9fbb5e856a40db5993c9eaf91c74a83 +overlayfs cdaddca6cf0dbb9dbb973f90bf450de842f99c2c +ubifs a801fcfeef96702fa3f9b22ad56c5eb1989d9221 +v9fs 732b33d0dbf17e9483f0b50385bf606f724f50a2 +xfs 81a448d7b0668ae39c08e6f34a54cc7eafb844f1 +zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705 +iomap 229adf3c64dbeae4e2f45fb561907ada9fcc0d0c +djw-vfs 9b8523423b23ee3dfd88e32f5b7207be56a4e782 +file-locks e1cc6e8c1969a598119b7a5578a08f6d9d0d14c4 +vfs 303392fd5c160822bf778270b28ec5ea50cab2b4 +printk 94cbc604683f64c2d66f53a6bf88e082891593d9 +pci 08463f5ad501ba0573ecf4b0be3dc25690e04868 +pstore c5d4fb2539cad2e62c5a3f0d8237613c394f297e +hid e2e4893180f321a23795827af3305ccfc68c1556 +i2c 4a8ac5e45cdaa88884b4ce05303e304cbabeb367 +i3c 3e5feb11a82945c88a1518fd2682ca8de66c37d3 +dmi 3cb4d29a2633170208c96240c7e85148679ceee3 +hwmon-staging c35d96845882fa7d1e134049fcda52b294c79c85 +jc_docs 4a52225d61017c0cb9133b624d5790bf86abf608 +v4l-dvb c27479d762de4eda72ba9e0aa150d439970f2077 +v4l-dvb-next c3cdc019a6bf03c4bf06fe8252db96eb6e4a3b5f +pm 604483c9d25283debe498a972c2b4565581e3aaa +cpufreq-arm d66cd5dea551e974580a64bf80b337b9a09ce63e +cpupower 5499f2b80b562c07b5aee157dee51d083083ab97 +devfreq e73f0f0ee7541171d89f2e2491130c7771ba58d3 +opp 941b2be46901c7178a35a2cdcf90aa5b6fd72fc6 +thermal fe6a6de6692e7f7159c1ff42b07ecd737df712b4 +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm 62699b3f0a62435fceb8debf295e90a5ea259e04 +swiotlb 93ebb6828723b8aef114415c4dc3518342f7dcad +rdma 07d0f314ba75cba17c3fad0a3d4e640e757897d7 +net-next 3e12361b6d23f793580a50a6008633501c56ea1d +bpf-next f309b4ba989d96c192edd0d730d85bc1dd92a64a +ipsec-next 2d151d39073aff498358543801fca0f670fea981 +mlx5-next 616d5769345528b989294a242a5906b157a92837 +netfilter-next facfbf4f0b5afbf2d9a4147ca57c84dce2c7b8e2 +ipvs-next facfbf4f0b5afbf2d9a4147ca57c84dce2c7b8e2 +wireless-drivers-next b4f8e2d9b5f8ccc4c46bcab203e6d4fa0f6a7251 +bluetooth f4292e2faf522f899b642d2040a2edbcbd455b9f +mac80211-next 0d6835ffe50c9c1f098b5704394331710b67af48 +mtd ff44b90b325dcd585cdba6ded6c9c52ea8ddead0 +nand c5b9ee9c361f52cd319135b9ec7fe684d5e2e026 +spi-nor 2734d6c1b1a089fb593ef6a23d4b70903526fe0c +crypto 821720b9f34ec54106ebf012a712ba73bbcf47c2 +drm 988dbd25b8ae14de70d2be384f5872d6e22e3434 +drm-misc 87360168759879d68550b0c052bbcc2a0339ff74 +amdgpu 99facff49d5e0c66ca4b048990db66e03cda6d7e +drm-intel 155b8645de9e0f07b654025fe91725ca2f67d12a +drm-tegra 8874e3a7baec1ee0dc5c20b8e0bf1cade3512b24 +drm-msm 4541e4f2225c30b0e9442be9eb2fb8b7086cdd1f +imx-drm 59e4e762a17daf34307d5cf90fdad2725bfccb54 +etnaviv 81fd23e2b3ccf71c807e671444e8accaba98ca53 +regmap d63aa09f7c53bdeb83edb4d84c07d759a92223bb +sound c5aa8277a1d388ba634f756473ee63017708f9c6 +sound-asoc 3b1cc6388558b47cff8abd3ad77ec8d2e5c25b6c +modules 4c5afb74d9450edc2e2e37243b469cc278b120d4 +input 76ba1900cb67390d963e07457ebf679c56c59094 +block 89f11f3cf09ea07b27cc71c6e3afef88754cbdea +device-mapper 3eadac651d1dc11355812566fbadc8223ef13283 +pcmcia e39cdacf2f664b09029e7c1eb354c91a20c367af +mmc 49fc2be70e7f5c6b8fe542271277c794f080b1e1 +mfd 495fb48dbd9bcbe15859e086edd24519a6bd2961 +backlight 1181f2164135d770bdad297290b73d274787389b +battery 56d629af09b9d4db9792257165844287ecce0a98 +regulator c570c2337460cbbee4b96501b8edc1dbfda2cebf +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor d108370c644b153382632b3e5511ade575c91c86 +integrity 907a399de7b0566236c480d0c01ff52220532fb1 +keys e377c31f788fc98815e1ab90b5a35704ce35843a +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux 893c47d1964f5c9b00c5468f2cd1a1e9351fbb6a +smack bfc3cac0c76126995737f1b858d2cdb476be5b1d +tomoyo ff1176468d368232b684f75e82563369208bc371 +tpmdd 0178f9d0f60ba07e09bab57381a3ef18e2c1fd7f +watchdog cf813c67d9619fd474c785698cbed543b94209dd +iommu 9be9f5580ab65e04a9092b55e3895f4a878da6c7 +audit d97e99386ad0dcae08cb0f0c70efa806a2d4811c +devicetree f72999f51da1ae39e59e08ed8658e7a470d6fee5 +mailbox 4f197188da668180d5ea7d808ae6221ce66cfe33 +spi 4296a65e1d9d9bc42a6d40539d4cffb16628ef64 +tip 1606b3aadfab884614467fd201288ddcdcd1ee7d +clockevents 6f64c8159af9a4c46aea60344d5ab66a9bb24bc0 +edac e1ca90b7cc5cb5d3a38321cbb65ad36a59fcb574 +irqchip 00a2b7c758958e13b12c56179e85df6bc2acc0c7 +ftrace 352384d5c84ebe40fa77098cc234fe173247d8ef +rcu 56dbe080de28142d2116bd39e2897bebe6f2ebb6 +kvm 8750f9bbda115f3f79bfe43be85551ee5e12b6ff +kvm-arm 188982cda00ebfe28b50c2905d9bbaa2e9a001b9 +kvm-ppc 72476aaa469179222b92c380de60c76b4cb9a318 +kvms390 1f703d2cf20464338c3d5279dddfb65ac79b8782 +xen-tip 83f877a09516bcb82e34df621cc3a794509a11a3 +percpu a81a52b325ec886eb004ca28b943480dae0353c7 +workqueues f728c4a9e8405caae69d4bc1232c54ff57b5d20f +drivers-x86 153cca9caa81ca8912a70528daca4b9a523c6898 +chrome-platform e73f0f0ee7541171d89f2e2491130c7771ba58d3 +hsi e73f0f0ee7541171d89f2e2491130c7771ba58d3 +leds e642197562cd9781453f835e1406cfe0feeb917e +ipmi f9714eb04364420f2a988c29382f35edb881a5e1 +driver-core b2c943e52705b211d1aa0633c9196150cf30be47 +usb 64cd4271ea8e6247f7ed14c443e41d0f5866aac0 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial ff1176468d368232b684f75e82563369208bc371 +usb-chipidea-next 956df1bb0ab8bb823541e66d186ed65559541b69 +tty 6c44eb5905f6cc731b36c4170f703f81e477f039 +char-misc 9bb3a9dddbf1ca6e062464f790a6a18052d63a4a +extcon 07de34f5ce1e76811d8567b41ccfff244d78874c +phy-next c1302e8ce517ed9c417aa4eb19776df4efbbebf4 +soundwire caa15c8dcb00f9dfe9f304e6e0955c5b29cf2499 +thunderbolt ff1176468d368232b684f75e82563369208bc371 +vfio 6a45ece4c9af473555f01f0f8b97eba56e3c7d0d +staging 7aaabc37943f383ec8d8e51b7fc43ae60fac4206 +iio 9491b9177fd0015f4dd118e94328a3a768f4bea3 +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc 2092cdb412f0586b90591c55121f77050ba702f8 +dmaengine b60bb6e2bfc192091b8f792781b83b5e0f9324f6 +cgroup c3df5fb57fe8756d67fd56ed29da65cdfde839f9 +scsi 549cd449ebb2d2aa4606c4361f230ee892ab626e +scsi-mkp 08dc2f9b53afbbc897bc895aa41906194f5af1cf +vhost db7b337709a15d33cc5e901d2ee35d3bb3e42b2f +rpmsg 7486f29e5e6003c0672020be02011b0eab87a56d +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl e5de9d283a36a2923f7f309050b8c51b14753c3a +gpio-intel e73f0f0ee7541171d89f2e2491130c7771ba58d3 +pinctrl 4990672e9b2ad2cda9bbc547126d2f149a992c94 +pinctrl-intel e73f0f0ee7541171d89f2e2491130c7771ba58d3 +pinctrl-renesas 91d1be9fb7d667ae136f05cc645276eb2c9fa40e +pinctrl-samsung e73f0f0ee7541171d89f2e2491130c7771ba58d3 +pwm f4a8e31ed84ec646c158824f423cb22d1f362bbf +userns 0421c2df6954db3557a412f5ecd59f6b13e13372 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest 2734d6c1b1a089fb593ef6a23d4b70903526fe0c +livepatching c150bbbb1731c5b6c0b232320c450dcd3b5c9fde +coresight 1efbcec2ef8c037f1e801c76e4b9434ee2400be7 +rtc 4aa90c036df670b8757140e0dae2a94e7b0d42b4 +nvdimm 30c10d32152dd09c2158e9cab8a6c7adaa09278e +at24 6efb943b8616ec53a5e444193dccf1af9ad627b5 +ntb 28293b6c68cd93178f021f51b1b504f3ec33f463 +seccomp 19d67694745c5c9ed085d0d8332fa02d835a07d0 +kspp b88972649fa071caa5633a12c64f9b03504d6503 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss 0f79ce970e79ffb771733f9634d5918d0eb3e30a +fsi 9ab1428dfe2c66b51e0b41337cd0164da0ab6080 +slimbus e5c578adcdd974f73380f0e5a5595354fcab0d60 +nvmem e73f0f0ee7541171d89f2e2491130c7771ba58d3 +xarray 2c7e57a02708a69d0194f9ef2a7b7e54f5a0484a +hyperv 63fb60c2fcc94d595a184fa187bdfb25e5ecd4a2 +auxdisplay 24ebc044c72ee6e88dc902a0041bac672f012537 +kgdb e868f0a3c4b9c1d7721f08b703142a876814a3f8 +hmm fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +fpga 4f45f3404960109843eaa92c8a4a850d6bdd9981 +kunit e73f0f0ee7541171d89f2e2491130c7771ba58d3 +cfi ff1176468d368232b684f75e82563369208bc371 +kunit-next 2734d6c1b1a089fb593ef6a23d4b70903526fe0c +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +mhi b8c95616d154830be38482557d8eef6100f3c3dd +memblock a4d5613c4dc6d413e0733e37db9d116a2a36b9f3 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +rust 5d3986cf8ed63ff8d86270e578649e71143112d6 +cxl 4ad6181e4b216ed0cb52f45d3c6d2c70c8ae9243 +folio 42c774e24ae0604a1fca84373e86556aa6e6e5ef +akpm-current 9a931efa742f54d370c2db41daa2b31e2b334328 +akpm 70a94fad3e4e1df2ccfdf0f4e4451b91479438bc diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..113246f897e8 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,336 @@ +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 +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-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +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 +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-fixes +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 +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/jeyu/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/mdf/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 +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +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 +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti-k3 git git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux.git#ti-k3-next +ti-k3-new git git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git#ti-k3-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 +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-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 +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#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 +cifsd git https://github.com/smfrench/smb3-kernel.git#cifsd-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 +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.linux-nfs.org/~bfields/linux.git#nfsd-next +cel git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next +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 +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-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 +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +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 +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/jeyu/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 +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#auto-latest +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 +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-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 +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 +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-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 +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +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 +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#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 +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-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/andersson/remoteproc.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 +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 +coresight git git://git.linaro.org/kernel/coresight.git#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 +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-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 +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +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 +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +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..ea76e5551790 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7153 @@ +$ date -R +Fri, 30 Jul 2021 03:49:35 +0100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 4010a528219e Merge tag 'fixes_for_v5.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs +Merging origin/master (7e96bf476270 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ git merge origin/master +Updating 4010a528219e..7e96bf476270 +Fast-forward + Documentation/virt/kvm/api.rst | 30 +- + arch/arm64/kvm/mmu.c | 2 +- + arch/m68k/coldfire/m525x.c | 2 +- + arch/s390/include/asm/kvm_host.h | 18 +- + arch/s390/kvm/diag.c | 18 +- + arch/s390/kvm/kvm-s390.c | 18 +- + arch/x86/kvm/ioapic.c | 2 +- + arch/x86/kvm/ioapic.h | 4 +- + arch/x86/kvm/svm/avic.c | 2 +- + arch/x86/kvm/svm/nested.c | 10 +- + arch/x86/kvm/svm/svm.c | 26 +- + arch/x86/kvm/svm/svm.h | 6 +- + arch/x86/kvm/svm/svm_onhyperv.h | 2 +- + arch/x86/kvm/x86.c | 4 +- + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 1 + + tools/testing/selftests/kvm/aarch64/get-reg-list.c | 3 +- + .../selftests/kvm/access_tracking_perf_test.c | 429 +++++++++++++++++++++ + tools/testing/selftests/kvm/dirty_log_perf_test.c | 1 + + tools/testing/selftests/kvm/steal_time.c | 2 +- + virt/kvm/kvm_main.c | 29 ++ + 21 files changed, 538 insertions(+), 72 deletions(-) + create mode 100644 tools/testing/selftests/kvm/access_tracking_perf_test.c +Merging fixes/fixes (614124bea77e Linux 5.13-rc5) +$ git merge fixes/fixes +Already up to date. +Merging kbuild-current/fixes (5e60f363b38f Documentation: Fix intiramfs script name) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (3eada7b4bd85 ARC: fp: set FPU_STATUS.FWE to enable FPU_STATUS update on context switch) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 2 +- + arch/arc/include/asm/checksum.h | 2 +- + arch/arc/include/asm/perf_event.h | 2 +- + arch/arc/kernel/fpu.c | 9 ++++++--- + arch/arc/kernel/unwind.c | 10 +++++----- + arch/arc/kernel/vmlinux.lds.S | 2 ++ + 6 files changed, 16 insertions(+), 11 deletions(-) +Merging arm-current/fixes (dad7b9896a5d ARM: 9081/1: fix gcc-10 thumb2-kernel regression) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (d8a719059b9d Revert "mm/pgtable: add stubs for {pmd/pub}_{set/clear}_huge") +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (82a1c67554df ARM: dts: versatile: Fix up interrupt controller node names) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging drivers-memory-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) +$ git merge drivers-memory-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (21ed49265986 m68k: MAC should select HAVE_PATA_PLATFORM) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (a88603f4b92e powerpc/vdso: Don't use r30 to avoid breaking Go lang) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/vdso64/Makefile | 7 +++++++ + arch/powerpc/platforms/pseries/setup.c | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) +Merging s390-fixes/fixes (ff1176468d36 Linux 5.14-rc3) +$ git merge 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 sparc/master +Already up to date. +Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (fc16a5322ee6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) +$ git merge net/master +Merge made by the 'recursive' strategy. + arch/arm/net/bpf_jit_32.c | 3 + + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 4 +- + arch/arm64/net/bpf_jit_comp.c | 13 ++ + arch/mips/net/ebpf_jit.c | 3 + + arch/powerpc/net/bpf_jit_comp32.c | 6 + + arch/powerpc/net/bpf_jit_comp64.c | 6 + + arch/riscv/net/bpf_jit_comp32.c | 4 + + arch/riscv/net/bpf_jit_comp64.c | 4 + + arch/s390/net/bpf_jit_comp.c | 5 + + arch/sparc/net/bpf_jit_comp_64.c | 3 + + arch/x86/net/bpf_jit_comp.c | 7 + + arch/x86/net/bpf_jit_comp32.c | 6 + + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 1 + + drivers/net/can/usb/peak_usb/pcan_usb.c | 10 +- + drivers/net/dsa/mv88e6xxx/chip.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 7 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 4 + + drivers/net/ethernet/dec/tulip/winbond-840.c | 7 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 36 +++- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h | 10 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 6 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 61 +++--- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 50 +++++ + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 + + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 2 +- + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 3 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 6 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 17 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 11 +- + .../net/ethernet/marvell/octeontx2/af/rvu_switch.c | 11 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 14 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 7 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 5 + + drivers/net/ethernet/mellanox/mlx4/main.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 5 +- + .../net/ethernet/mellanox/mlx5/core/en/params.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/en/trap.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 38 ++-- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 33 ++- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 2 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 12 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 197 +++++++++--------- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 11 +- + drivers/net/ethernet/pensando/ionic/ionic_phc.c | 10 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 41 ++-- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 4 +- + drivers/net/ethernet/qlogic/qla3xxx.c | 6 +- + drivers/net/ethernet/sis/sis900.c | 7 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 + + drivers/net/ethernet/sun/niu.c | 3 +- + drivers/net/phy/broadcom.c | 2 +- + drivers/net/wireless/virt_wifi.c | 52 +++-- + drivers/net/wwan/wwan_core.c | 2 + + drivers/nfc/nfcsim.c | 3 +- + drivers/nfc/s3fwrn5/firmware.c | 2 +- + include/linux/bpf_types.h | 1 + + include/linux/bpf_verifier.h | 3 +- + include/linux/filter.h | 15 ++ + include/linux/skmsg.h | 54 +++-- + include/net/llc_pdu.h | 31 ++- + include/net/sctp/structs.h | 5 +- + kernel/bpf/core.c | 19 +- + kernel/bpf/disasm.c | 16 +- + kernel/bpf/verifier.c | 148 +++++-------- + net/can/j1939/transport.c | 11 +- + net/can/raw.c | 20 +- + net/core/devlink.c | 10 +- + net/core/flow_dissector.c | 18 +- + net/core/skmsg.c | 39 +++- + net/ipv4/ip_tunnel.c | 2 +- + net/ipv6/ip6_output.c | 5 +- + net/llc/af_llc.c | 10 +- + net/llc/llc_s_ac.c | 2 +- + net/mac80211/cfg.c | 19 ++ + net/mac80211/ieee80211_i.h | 2 + + net/mac80211/mlme.c | 4 +- + net/mac80211/rx.c | 3 +- + net/mac80211/tx.c | 57 ++--- + net/netfilter/nf_conntrack_core.c | 7 +- + net/netfilter/nf_flow_table_core.c | 6 +- + net/netfilter/nf_tables_api.c | 12 ++ + net/netfilter/nfnetlink_hook.c | 2 + + net/netfilter/nft_last.c | 20 +- + net/netfilter/nft_nat.c | 4 +- + net/qrtr/qrtr.c | 6 +- + net/sctp/input.c | 2 +- + net/sctp/ipv6.c | 5 +- + net/sctp/sm_statefuns.c | 15 +- + net/sctp/transport.c | 45 ++-- + net/tipc/crypto.c | 14 +- + net/tipc/socket.c | 30 +-- + net/wireless/nl80211.c | 5 +- + net/wireless/scan.c | 6 +- + .../selftests/bpf/verifier/value_ptr_arith.c | 229 +++++++++++++++++++++ + 98 files changed, 1177 insertions(+), 539 deletions(-) +Merging bpf/master (b4f0c24a5eaf bpf: Do not close un-owned FD 0 on errors) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + net/bpf/test_run.c | 3 +++ + tools/lib/bpf/btf.c | 3 +-- + tools/lib/bpf/libbpf_probes.c | 4 +++- + 3 files changed, 7 insertions(+), 3 deletions(-) +Merging ipsec/master (480e93e12aa0 net: xfrm: Fix end of loop tests for list_for_each_entry) +$ git merge ipsec/master +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging include/net/netns/xfrm.h +Merge made by the 'recursive' strategy. + include/net/netns/xfrm.h | 1 + + net/xfrm/xfrm_compat.c | 49 +++++++++-- + net/xfrm/xfrm_ipcomp.c | 2 +- + net/xfrm/xfrm_policy.c | 32 +++---- + net/xfrm/xfrm_user.c | 10 +++ + tools/testing/selftests/net/ipsec.c | 165 +++++++++++++++++++++++++++++++++++- + 6 files changed, 231 insertions(+), 28 deletions(-) +Merging netfilter/master (832df96d5f95 Merge branch 'sctp-pmtu-probe') +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (832df96d5f95 Merge branch 'sctp-pmtu-probe') +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (891332f697e1 iwlwifi: add new so-jf devices) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 25 ++++++---- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 70 ++++++++++++++++++++++++++- + 2 files changed, 85 insertions(+), 10 deletions(-) +Merging mac80211/master (f9a5c358c8d2 cfg80211: Fix possible memory leak in function cfg80211_bss_update) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (dc6afef7e142 RDMA/irdma: Change returned type of irdma_setup_virt_qp to void) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (4b0556b96e1f ALSA: usb-audio: Add registration quirk for JBL Quantum 600) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_realtek.c | 1 + + sound/usb/card.c | 2 +- + sound/usb/clock.c | 6 ++++++ + sound/usb/mixer_scarlett_gen2.c | 34 ++++++++++++++++++++++++---------- + sound/usb/quirks.c | 1 + + 5 files changed, 33 insertions(+), 11 deletions(-) +Merging sound-asoc-fixes/for-linus (1cb606882c39 Merge remote-tracking branch 'asoc/for-5.14' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +- + sound/soc/Kconfig | 1 + + sound/soc/amd/acp-da7219-max98357a.c | 5 +++ + sound/soc/amd/renoir/rn-pci-acp3x.c | 2 + + sound/soc/codecs/Kconfig | 1 + + sound/soc/codecs/Makefile | 5 ++- + sound/soc/codecs/cs42l42.c | 10 +++-- + sound/soc/codecs/rt5682.c | 1 + + sound/soc/codecs/tlv320aic31xx.c | 10 +++++ + sound/soc/codecs/tlv320aic32x4.c | 33 +++++++++++---- + sound/soc/codecs/wm_adsp.c | 1 - + sound/soc/intel/boards/sof_da7219_max98373.c | 2 +- + sound/soc/soc-component.c | 63 ++++++++++++---------------- + sound/soc/sof/intel/hda.c | 12 ++++++ + 14 files changed, 98 insertions(+), 51 deletions(-) +Merging regmap-fixes/for-linus (e73f0f0ee754 Linux 5.14-rc1) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (3687139ee5fb Merge remote-tracking branch 'regulator/for-5.14' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/hi6421v600-regulator.c | 36 ++++++++++++++++---------------- + 1 file changed, 18 insertions(+), 18 deletions(-) +Merging spi-fixes/for-linus (ffaff51043fe Merge remote-tracking branch 'spi/for-5.14' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-imx.c | 18 ++++++++++++++++-- + drivers/spi/spi-meson-spicc.c | 2 ++ + drivers/spi/spi-mux.c | 8 ++++++++ + drivers/spi/spi.c | 4 ++++ + 4 files changed, 30 insertions(+), 2 deletions(-) +Merging pci-current/for-linus (d5450c42cbc3 PCI: Increase D3 delay for AMD Renoir/Cezanne XHCI) +$ git merge pci-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 +++++++ + drivers/pci/quirks.c | 1 + + 2 files changed, 8 insertions(+) +Merging driver-core.current/driver-core-linus (75d95e2e39b2 firmware_loader: fix use-after-free in firmware_fallback_sysfs) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + drivers/base/dd.c | 4 ++-- + drivers/base/firmware_loader/fallback.c | 14 ++++++++------ + drivers/base/firmware_loader/firmware.h | 10 +++++++++- + drivers/base/firmware_loader/main.c | 2 ++ + 4 files changed, 21 insertions(+), 9 deletions(-) +Merging tty.current/tty-linus (06e91df16f3e tty: serial: fsl_lpuart: fix the wrong return value in lpuart32_get_mctrl) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + arch/mips/mti-malta/malta-platform.c | 3 ++- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 5 +++-- + drivers/tty/serial/8250/8250_fsl.c | 5 +++-- + drivers/tty/serial/8250/8250_pci.c | 6 ++++++ + drivers/tty/serial/8250/8250_port.c | 17 ++++++++++++----- + drivers/tty/serial/fsl_lpuart.c | 2 +- + drivers/tty/serial/max310x.c | 3 ++- + drivers/tty/serial/serial-tegra.c | 6 ++++-- + include/linux/serial_core.h | 24 ++++++++++++++++++++++++ + 9 files changed, 57 insertions(+), 14 deletions(-) +Merging usb.current/usb-linus (a154c43b95e8 Merge tag 'usb-v5.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-linus) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/thunderbolt/switch.c | 15 +----------- + drivers/usb/cdns3/cdns3-ep0.c | 1 + + drivers/usb/cdns3/cdnsp-gadget.c | 2 +- + drivers/usb/cdns3/cdnsp-gadget.h | 4 ++-- + drivers/usb/cdns3/cdnsp-ring.c | 18 +++++++-------- + drivers/usb/class/usbtmc.c | 9 +------- + drivers/usb/common/usb-otg-fsm.c | 6 ++++- + drivers/usb/gadget/function/f_hid.c | 44 +++++++++++++++++++++++++++++++----- + drivers/usb/gadget/udc/max3420_udc.c | 14 ++++++++---- + drivers/usb/host/ohci-at91.c | 9 ++++---- + drivers/usb/musb/omap2430.c | 43 +++++++++++++++++++++++++++++++---- + include/linux/usb/otg-fsm.h | 1 + + 12 files changed, 111 insertions(+), 55 deletions(-) +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (3c18e9baee0e USB: serial: ch341: fix character loss at high transfer rates) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/ch341.c | 1 + + 1 file changed, 1 insertion(+) +Merging usb-chipidea-fixes/for-usb-fixes (5df09c15bab9 usb: cdnsp: Fix the IMAN_IE_SET and IMAN_IE_CLEAR macro) +$ git merge usb-chipidea-fixes/for-usb-fixes +Already up to date. +Merging phy/fixes (e73f0f0ee754 Linux 5.14-rc1) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (c7b65650c7f4 staging: mt7621-pci: avoid to re-disable clock for those pcies not in use) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/mt7621-pci/pci-mt7621.c | 1 - + drivers/staging/rtl8712/hal_init.c | 30 ++++++++++++------ + drivers/staging/rtl8712/rtl8712_led.c | 8 +++++ + drivers/staging/rtl8712/rtl871x_led.h | 1 + + drivers/staging/rtl8712/rtl871x_pwrctrl.c | 8 +++++ + drivers/staging/rtl8712/rtl871x_pwrctrl.h | 1 + + drivers/staging/rtl8712/usb_intf.c | 51 ++++++++++++++----------------- + drivers/staging/rtl8723bs/Kconfig | 1 + + drivers/staging/rtl8723bs/hal/sdio_ops.c | 2 ++ + 9 files changed, 64 insertions(+), 39 deletions(-) +Merging iio-fixes/fixes-togreg (84edec86f449 iio: humidity: hdc100x: Add margin to the conversion time) +$ git merge iio-fixes/fixes-togreg +Merge made by the 'recursive' strategy. + .../devicetree/bindings/iio/st,st-sensors.yaml | 41 ---------------------- + drivers/iio/accel/Kconfig | 2 ++ + drivers/iio/accel/fxls8962af-core.c | 2 +- + drivers/iio/adc/ti-ads7950.c | 1 - + drivers/iio/humidity/hdc100x.c | 6 ++-- + drivers/iio/imu/adis.c | 3 +- + 6 files changed, 8 insertions(+), 47 deletions(-) +Merging char-misc.current/char-misc-linus (4c4c1257b844 virt: acrn: Do hcall_destroy_vm() before resource release) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/virt/acrn/vm.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) +Merging soundwire-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (ff1176468d36 Linux 5.14-rc3) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (818b26588994 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (66192b2e3fd8 crypto: hisilicon/sec - fix the process of disabling sva prefetching) +$ git merge crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (dc51ff91cf2d vfio/platform: fix module_put call in error flow) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (2734d6c1b1a0 Linux 5.14-rc2) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (055f23b74b20 module: check for exit sections in layout_sections() instead of module_init_section()) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (eda97cb095f2 dmaengine: of-dma: router_xlate to return -EPROBE_DEFER if controller is not yet available) +$ git merge dmaengine-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/dma/idxd/idxd.h | 14 +++++++ + drivers/dma/idxd/init.c | 30 +++++++++----- + drivers/dma/idxd/irq.c | 27 ++++++++---- + drivers/dma/idxd/submit.c | 92 +++++++++++++++++++++++++++++++---------- + drivers/dma/idxd/sysfs.c | 2 - + drivers/dma/of-dma.c | 9 +++- + drivers/dma/sh/usb-dmac.c | 2 +- + drivers/dma/stm32-dma.c | 4 +- + drivers/dma/stm32-dmamux.c | 6 +-- + drivers/dma/uniphier-xdmac.c | 4 +- + drivers/dma/xilinx/xilinx_dma.c | 12 ++++++ + 11 files changed, 149 insertions(+), 53 deletions(-) +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (ba3562892619 mtd: devices: mchp48l640: Fix memory leak on cmd) +$ git merge mtd-fixes/mtd/fixes +Merge made by the 'recursive' strategy. + drivers/mtd/chips/cfi_cmdset_0002.c | 2 +- + drivers/mtd/devices/mchp48l640.c | 5 +++-- + drivers/mtd/mtd_blkdevs.c | 9 +++------ + drivers/mtd/mtdcore.c | 4 +++- + drivers/mtd/nand/raw/nand_base.c | 4 ++-- + 5 files changed, 12 insertions(+), 12 deletions(-) +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (61c6f04a988e media: s5p-mfc: Fix display delay control creation) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (1435f82689e1 reset: RESET_MCHP_SPARX5 should depend on ARCH_SPARX5) +$ git merge reset-fixes/reset/fixes +Merge made by the 'recursive' strategy. + drivers/reset/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging mips-fixes/mips-fixes (e73f0f0ee754 Linux 5.14-rc1) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (6efb943b8616 Linux 5.13-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (353b7a55dcaf Merge branch 'fixes-v5.14' into fixes) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am437x-l4.dtsi | 2 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- + arch/arm/boot/dts/omap5-board-common.dtsi | 9 +-------- + arch/arm/mach-omap2/omap_hwmod.c | 10 +++++++++- + drivers/bus/ti-sysc.c | 22 +++++++++++++++------- + 5 files changed, 27 insertions(+), 18 deletions(-) +Merging kvm-fixes/master (8750f9bbda11 KVM: add missing compat KVM_CLEAR_DIRTY_LOG) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (cd4220d23bf3 KVM: selftests: do not require 64GB in set_memory_region_test) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (03726fd90f4b hwmon: sht4x: update Documentation for Malformed table) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + Documentation/hwmon/sht4x.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nvdimm-fixes/libnvdimm-fixes (b05d4c576b69 dax: Ensure errno is returned from dax_direct_access) +$ git merge nvdimm-fixes/libnvdimm-fixes +Auto-merging fs/fuse/dax.c +Auto-merging fs/dax.c +Merge made by the 'recursive' strategy. + drivers/dax/super.c | 2 +- + fs/dax.c | 2 +- + fs/fuse/dax.c | 6 ++---- + 3 files changed, 4 insertions(+), 6 deletions(-) +Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) +$ git merge cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (ff4502c88fea Merge branch 'misc-5.14' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/compression.c | 2 +- + fs/btrfs/disk-io.c | 2 +- + fs/btrfs/tree-log.c | 4 ++-- + fs/btrfs/volumes.c | 1 + + 4 files changed, 5 insertions(+), 4 deletions(-) +Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra file attributes for statx()) +$ git merge vfs-fixes/fixes +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2181 and retry the command. +Merge made by the 'recursive' strategy. +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 dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (153cca9caa81 platform/x86: Add and use a dual_accel_detect() helper) +$ git merge drivers-x86-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/platform/x86/Kconfig | 3 ++ + drivers/platform/x86/dual_accel_detect.h | 75 ++++++++++++++++++++++++++++++++ + drivers/platform/x86/intel-hid.c | 21 +++------ + drivers/platform/x86/intel-vbtn.c | 18 ++++++-- + drivers/platform/x86/thinkpad_acpi.c | 3 +- + 5 files changed, 101 insertions(+), 19 deletions(-) + create mode 100644 drivers/platform/x86/dual_accel_detect.h +Merging samsung-krzk-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) +$ git merge pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (50d8d7e19c43 dt-bindings: display: renesas,du: Make resets optional on R-Car H1) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (f0f82e2476f6 scsi: core: Fix capacity set to zero after offlinining device) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/scsi/device_handler/scsi_dh_rdac.c | 4 ++-- + drivers/scsi/ibmvscsi/ibmvfc.c | 19 ++++++++++++++++-- + drivers/scsi/ibmvscsi/ibmvfc.h | 1 + + drivers/scsi/megaraid/megaraid_mm.c | 21 ++++++++++++++------ + drivers/scsi/pm8001/pm8001_sas.c | 32 ++++++++++++++---------------- + drivers/scsi/scsi_scan.c | 3 ++- + drivers/scsi/scsi_sysfs.c | 9 ++++++--- + drivers/scsi/sr.c | 2 +- + 8 files changed, 59 insertions(+), 32 deletions(-) +Merging drm-fixes/drm-fixes (d28e2568ac26 Merge tag 'amd-drm-fixes-5.14-2021-07-28' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes) +$ git merge drm-fixes/drm-fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 3 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 ++------ + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 7 +++---- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- + .../gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 1 + + .../drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c | 3 +++ + drivers/gpu/drm/i915/display/intel_bios.c | 3 ++- + drivers/gpu/drm/i915/display/intel_display.c | 8 +++++++- + drivers/gpu/drm/i915/intel_device_info.c | 9 +++++---- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 2 +- + drivers/gpu/drm/msm/dp/dp_catalog.c | 1 + + drivers/gpu/drm/msm/dp/dp_ctrl.c | 2 +- + drivers/gpu/drm/msm/dp/dp_display.c | 5 +++++ + drivers/gpu/drm/msm/msm_iommu.c | 11 ++++++++++- + drivers/gpu/drm/panel/panel-simple.c | 2 +- + drivers/gpu/drm/ttm/ttm_device.c | 12 ++++++++++++ + drivers/gpu/drm/ttm/ttm_module.c | 16 ---------------- + 19 files changed, 61 insertions(+), 40 deletions(-) +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (b4bde5554f70 drm/i915/display: split DISPLAY_VER 9 and 10 in intel_setup_outputs()) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (10252bae863d mmc: core: Don't allocate IDA for OF aliases) +$ git merge 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 rtc-fixes/rtc-fixes +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2182 and retry the command. +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-cmos.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging gnss-fixes/gnss-linus (e73f0f0ee754 Linux 5.14-rc1) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (f5a11c69b699 Revert "x86/hyperv: fix logical processor creation") +$ git merge hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu)) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (ea196c548c0a riscv: __asm_copy_to-from_user: Fix: Typos in comments) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) +$ git merge pidfd-fixes/fixes +Auto-merging fs/file.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2160 and retry the command. +Merge made by the 'recursive' strategy. + fs/file.c | 64 +++++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 40 insertions(+), 24 deletions(-) +Merging fpga-fixes/fixes (ec6446d5304b fpga: dfl: fme: Fix cpu hotplug issue in performance reporting) +$ git merge fpga-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/fpga/dfl-fme-perf.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging spdx/spdx-linus (de5540965853 Merge tag 'rtc-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (ec7099fdea80 Revert "gpio: mpc8xxx: change the gpio interrupt flags.") +$ git merge gpio-brgl-fixes/gpio/for-current +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-mpc8xxx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging gpio-intel-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (0852b6ca941e erofs: fix 1 lcluster-sized pcluster for big pcluster) +$ git merge erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (2734d6c1b1a0 Linux 5.14-rc2) +$ git merge kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) +$ git merge ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (024591f9a6e0 arm: ioremap: don't abuse pfn_valid() to check if pfn is in RAM) +$ git merge memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (9f4ad9e425a1 Linux 5.12) +$ git merge cel-fixes/for-rc +Already up to date. +Merging irqchip-fixes/irq/irqchip-fixes (1fee9db9b42d irqchip/mips: Fix RCU violation when using irqdomain lookup on interrupt entry) +$ git merge irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) +$ git merge renesas-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (eb92830cdbc2 drm/kmb: Define driver date and major/minor version) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/kmb/kmb_drv.c | 22 ++++++++++++++++++---- + drivers/gpu/drm/kmb/kmb_drv.h | 5 +++++ + drivers/gpu/drm/kmb/kmb_plane.c | 15 +++++++++++++-- + 3 files changed, 36 insertions(+), 6 deletions(-) +Merging kspp-gustavo/for-next/kspp (cb163627e6d3 scsi: fas216: Fix fall-through warning for Clang) +$ git merge kspp-gustavo/for-next/kspp +Merge made by the 'recursive' strategy. + arch/arm/mach-rpc/riscpc.c | 1 + + drivers/scsi/arm/acornscsi.c | 1 + + drivers/scsi/arm/fas216.c | 1 + + 3 files changed, 3 insertions(+) +Merging kbuild/for-next (27932b6a2088 scripts: add generic syscallnr.sh) +$ git merge kbuild/for-next +Already up to date. +Merging compiler-attributes/compiler-attributes (7ed012969bbc Compiler Attributes: fix __has_attribute(__no_sanitize_coverage__) for GCC 4) +$ git merge compiler-attributes/compiler-attributes +Auto-merging include/linux/compiler_attributes.h +CONFLICT (content): Merge conflict in include/linux/compiler_attributes.h +Resolved 'include/linux/compiler_attributes.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master be9329b84319] Merge remote-tracking branch 'compiler-attributes/compiler-attributes' +$ git diff -M --stat --summary HEAD^.. + include/linux/compiler_attributes.h | 1 + + 1 file changed, 1 insertion(+) +Merging dma-mapping/for-next (40ac971eab89 dma-mapping: handle vmalloc addresses in dma_common_{mmap,get_sgtable}) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (14462376858e Merge branch 'asm-generic-unaligned' into asm-generic) +$ git merge asm-generic/master +Auto-merging arch/riscv/include/asm/io.h +Merge made by the 'recursive' strategy. + arch/riscv/include/asm/io.h | 5 ++-- + arch/sparc/include/asm/io.h | 8 ++++++ + include/asm-generic/io.h | 68 ++++++++++++++++++++++++++++++++++++++++++--- + 3 files changed, 75 insertions(+), 6 deletions(-) +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (3bd1461d1691 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (d914b80a8f56 arm64: avoid double ISB on kernel entry) +$ git merge arm64/for-next/core +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-system-cpu | 17 +++ + Documentation/arm64/memory-tagging-extension.rst | 48 +++++-- + arch/arm64/include/asm/pointer_auth.h | 12 +- + arch/arm64/include/asm/processor.h | 10 +- + arch/arm64/kernel/asm-offsets.c | 2 +- + arch/arm64/kernel/entry.S | 57 ++++++--- + arch/arm64/kernel/mte.c | 139 ++++++++++++++------- + arch/arm64/kernel/pointer_auth.c | 10 +- + arch/arm64/kernel/process.c | 21 ++-- + include/uapi/linux/prctl.h | 11 +- + 10 files changed, 223 insertions(+), 104 deletions(-) +Merging arm-perf/for-next/perf (d96b1b8c9f79 drivers/perf: fix the missed ida_simple_remove() in ddr_perf_probe()) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (82a1c67554df ARM: dts: versatile: Fix up interrupt controller node names) +$ git merge arm-soc/for-next +Already up to date. +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge actions/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2182 and retry the command. +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (45889c71755f Merge branches 'v5.15/configs', 'v5.15/dt' and 'v5.15/dt64' into for-next) +$ git merge amlogic/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/meson.dtsi | 12 ++++ + arch/arm/boot/dts/meson8.dtsi | 68 ++++++++++++++++++++++ + arch/arm/boot/dts/meson8b-ec100.dts | 48 ++++++++++++++- + arch/arm/boot/dts/meson8b-mxq.dts | 4 +- + arch/arm/boot/dts/meson8b-odroidc1.dts | 4 +- + arch/arm/boot/dts/meson8b.dtsi | 63 ++++++++++++++++++++ + arch/arm/configs/multi_v7_defconfig | 1 + + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 13 ++++- + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 2 + + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 3 +- + 10 files changed, 211 insertions(+), 7 deletions(-) +Merging aspeed/for-next (db2d7420f8d3 ARM: dts: aspeed: ast2500evb: Enable built in RTC) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/aspeed-ast2500-evb.dts | 4 + + .../arm/boot/dts/aspeed-bmc-facebook-galaxy100.dts | 4 - + arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts | 5 + + arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts | 4 - + arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 4 +- + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-inspur-nf5280m6.dts | 691 +++++++++++++++++++++ + arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 2 +- + arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 4 +- + .../boot/dts/ast2400-facebook-netbmc-common.dtsi | 4 + + 11 files changed, 711 insertions(+), 14 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed-bmc-inspur-nf5280m6.dts +Merging at91/at91-next (276fbcb8b79a Merge branch 'at91-dt' into at91-next) +$ git merge at91/at91-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/atmel-at91.yaml | 5 + + .../devicetree/bindings/arm/atmel-sysregs.txt | 14 +- + arch/arm/Kconfig.debug | 10 + + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/at91-sam9x60ek.dts | 16 +- + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 4 +- + arch/arm/boot/dts/at91-sama5d2_icp.dts | 6 + + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 31 +- + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 32 +- + arch/arm/boot/dts/at91-sama7g5ek.dts | 656 +++++++++++++++ + arch/arm/boot/dts/sama7g5-pinfunc.h | 923 +++++++++++++++++++++ + arch/arm/boot/dts/sama7g5.dtsi | 528 ++++++++++++ + arch/arm/configs/multi_v7_defconfig | 2 + + arch/arm/configs/sama7_defconfig | 209 +++++ + arch/arm/mach-at91/Kconfig | 18 + + arch/arm/mach-at91/Makefile | 1 + + arch/arm/mach-at91/generic.h | 2 + + arch/arm/mach-at91/pm.c | 343 ++++++-- + arch/arm/mach-at91/pm.h | 3 + + arch/arm/mach-at91/pm_data-offsets.c | 2 + + arch/arm/mach-at91/pm_suspend.S | 827 +++++++++++++----- + arch/arm/mach-at91/sama7.c | 33 + + include/linux/clk/at91_pmc.h | 26 + + include/soc/at91/sama7-ddr.h | 80 ++ + include/soc/at91/sama7-sfrbu.h | 34 + + 25 files changed, 3503 insertions(+), 304 deletions(-) + create mode 100644 arch/arm/boot/dts/at91-sama7g5ek.dts + create mode 100644 arch/arm/boot/dts/sama7g5-pinfunc.h + create mode 100644 arch/arm/boot/dts/sama7g5.dtsi + create mode 100644 arch/arm/configs/sama7_defconfig + create mode 100644 arch/arm/mach-at91/sama7.c + create mode 100644 include/soc/at91/sama7-ddr.h + create mode 100644 include/soc/at91/sama7-sfrbu.h +Merging drivers-memory/for-next (c28b584deb1b Merge branch 'for-v5.15/omap-gpmc' into for-next) +$ git merge drivers-memory/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + arch/arm/mach-omap2/pm34xx.c | 5 -- + drivers/memory/omap-gpmc.c | 191 +++++++++++++++++++++++++--------------- + drivers/memory/tegra/tegra186.c | 2 + + include/linux/omap-gpmc.h | 3 - + 5 files changed, 121 insertions(+), 82 deletions(-) +Merging imx-mxs/for-next (bfec305eccea Merge branch 'imx/dt64' into for-next) +$ git merge imx-mxs/for-next +Auto-merging drivers/spi/spi-imx.c +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 16 ++ + .../devicetree/bindings/dma/fsl-imx-sdma.txt | 1 + + .../devicetree/bindings/media/nxp,imx8-jpeg.yaml | 19 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/imx53-m53menlo.dts | 4 +- + arch/arm/boot/dts/imx6dl-solidsense.dts | 54 ++++ + arch/arm/boot/dts/imx6q-dhcom-pdk2.dts | 103 +++++++- + arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 142 ++++++++++- + arch/arm/boot/dts/imx6q-solidsense.dts | 54 ++++ + arch/arm/boot/dts/imx6q.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-solidsense.dtsi | 160 ++++++++++++ + arch/arm/boot/dts/imx6qdl-sr-som.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl.dtsi | 8 +- + arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 1 + + arch/arm/boot/dts/imx7d-remarkable2.dts | 91 +++++++ + arch/arm/mach-imx/common.h | 2 +- + arch/arm/mach-imx/mmdc.c | 17 +- + arch/arm64/boot/dts/freescale/Makefile | 1 + + .../freescale/fsl-ls1028a-kontron-sl28-var2.dts | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 9 + + arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 12 +- + arch/arm64/boot/dts/freescale/imx8-ss-img.dtsi | 80 ++++++ + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 2 - + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 6 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 3 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 14 +- + .../boot/dts/freescale/imx8mq-mnt-reform2.dts | 164 ++++++++++++ + .../boot/dts/freescale/imx8mq-nitrogen-som.dtsi | 275 +++++++++++++++++++++ + arch/arm64/boot/dts/freescale/imx8qm-ss-img.dtsi | 12 + + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 2 + + arch/arm64/boot/dts/freescale/imx8qxp-ai_ml.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8qxp-ss-img.dtsi | 13 + + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 2 + + drivers/dma/imx-sdma.c | 93 +++++-- + drivers/soc/imx/soc-imx8m.c | 84 +------ + drivers/spi/spi-imx.c | 41 ++- + 45 files changed, 1372 insertions(+), 150 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6dl-solidsense.dts + create mode 100644 arch/arm/boot/dts/imx6q-solidsense.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-solidsense.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-img.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-nitrogen-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-ss-img.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-ss-img.dtsi +Merging keystone/next (9d2e21ed98a2 Merge branch 'for_5.12/drivers-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (a1c8c49de3d7 Merge branch 'v5.13-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (69a91ff5e46c Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/marvell/Makefile | 5 + + .../boot/dts/marvell/armada-3720-turris-mox.dts | 3 + + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 2 +- + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 4 +- + arch/arm64/boot/dts/marvell/cn9130-crb-A.dts | 38 ++ + arch/arm64/boot/dts/marvell/cn9130-crb-B.dts | 46 +++ + arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 222 +++++++++++ + arch/arm64/boot/dts/marvell/cn9130-db-B.dts | 22 ++ + arch/arm64/boot/dts/marvell/cn9130-db.dts | 403 +------------------- + arch/arm64/boot/dts/marvell/cn9130-db.dtsi | 410 +++++++++++++++++++++ + arch/arm64/boot/dts/marvell/cn9131-db-B.dts | 22 ++ + arch/arm64/boot/dts/marvell/cn9131-db.dts | 197 +--------- + arch/arm64/boot/dts/marvell/cn9131-db.dtsi | 206 +++++++++++ + arch/arm64/boot/dts/marvell/cn9132-db-B.dts | 22 ++ + arch/arm64/boot/dts/marvell/cn9132-db.dts | 218 +---------- + arch/arm64/boot/dts/marvell/cn9132-db.dtsi | 227 ++++++++++++ + 16 files changed, 1244 insertions(+), 803 deletions(-) + create mode 100644 arch/arm64/boot/dts/marvell/cn9130-crb-A.dts + create mode 100644 arch/arm64/boot/dts/marvell/cn9130-crb-B.dts + create mode 100644 arch/arm64/boot/dts/marvell/cn9130-crb.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/cn9130-db-B.dts + create mode 100644 arch/arm64/boot/dts/marvell/cn9130-db.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/cn9131-db-B.dts + create mode 100644 arch/arm64/boot/dts/marvell/cn9131-db.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/cn9132-db-B.dts + create mode 100644 arch/arm64/boot/dts/marvell/cn9132-db.dtsi +Merging omap/for-next (f4cfed3482d8 Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/am335x-boneblack-common.dtsi | 135 -------------------- + arch/arm/boot/dts/am335x-boneblack-hdmi.dtsi | 141 +++++++++++++++++++++ + arch/arm/boot/dts/am335x-boneblack-wireless.dts | 1 + + arch/arm/boot/dts/am335x-boneblack.dts | 1 + + arch/arm/boot/dts/am335x-boneblue.dts | 143 +++++++++++++++++++++- + arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi | 96 +++++++++++++++ + arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts | 50 ++++++++ + arch/arm/boot/dts/am335x-sancloud-bbe.dts | 92 +------------- + arch/arm/boot/dts/am5748.dtsi | 6 +- + arch/arm/boot/dts/am574x-idk.dts | 4 - + arch/arm/boot/dts/dra74x-p.dtsi | 27 ++++ + arch/arm/boot/dts/dra76x.dtsi | 12 -- + arch/arm/boot/dts/omap4-l4-abe.dtsi | 38 +++--- + arch/arm/mach-omap2/Kconfig | 5 - + drivers/bus/ti-sysc.c | 11 +- + 17 files changed, 493 insertions(+), 276 deletions(-) + create mode 100644 arch/arm/boot/dts/am335x-boneblack-hdmi.dtsi + create mode 100644 arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi + create mode 100644 arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts + create mode 100644 arch/arm/boot/dts/dra74x-p.dtsi +Merging qcom/for-next (3f8b3dfa5522 Merge remote-tracking branch 'refs/remotes/origin/for-next' into for-next) +$ git merge qcom/for-next +Auto-merging arch/arm64/boot/dts/qcom/sm8150.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sc7180.dtsi +Auto-merging arch/arm64/boot/dts/qcom/ipq8074.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Removing Documentation/devicetree/bindings/soc/qcom/qcom,aoss-qmp.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/qcom.yaml | 6 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + + .../devicetree/bindings/soc/qcom/qcom,aoss-qmp.txt | 87 ----- + .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 114 +++++++ + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/qcom-apq8064.dtsi | 6 +- + arch/arm/boot/dts/qcom-msm8226-samsung-s3ve3g.dts | 25 ++ + arch/arm/boot/dts/qcom-msm8226.dtsi | 147 +++++++++ + arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts | 11 + + arch/arm64/boot/dts/qcom/Makefile | 1 + + arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts | 8 + + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 50 ++- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 6 + + .../boot/dts/qcom/msm8916-wingtech-wt88047.dts | 313 ++++++++++++++++++ + .../boot/dts/qcom/msm8992-bullhead-rev-101.dts | 12 + + arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 60 +++- + .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 15 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 76 +++++ + arch/arm64/boot/dts/qcom/sc7280-idp.dts | 110 +++++++ + arch/arm64/boot/dts/qcom/sc7280.dtsi | 352 +++++++++++++++++++- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 4 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 358 +++++++++++++++++++-- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 6 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 4 +- + drivers/firmware/Kconfig | 2 +- + drivers/firmware/Makefile | 3 +- + drivers/firmware/qcom_scm.c | 8 +- + drivers/iommu/Kconfig | 2 + + drivers/net/wireless/ath/ath10k/Kconfig | 1 + + drivers/soc/qcom/qcom_aoss.c | 9 +- + drivers/soc/qcom/rpmhpd.c | 5 +- + drivers/soc/qcom/rpmpd.c | 28 ++ + drivers/soc/qcom/socinfo.c | 4 +- + include/dt-bindings/power/qcom-rpmpd.h | 10 + + 37 files changed, 1707 insertions(+), 143 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,aoss-qmp.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,aoss-qmp.yaml + create mode 100644 arch/arm/boot/dts/qcom-msm8226-samsung-s3ve3g.dts + create mode 100644 arch/arm/boot/dts/qcom-msm8226.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts +Merging raspberrypi/for-next (b1f2fcb28228 ARM: dts: bcm283x: Fix VEC address for BCM2711) +$ git merge raspberrypi/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm2711.dtsi | 8 ++++++++ + arch/arm/boot/dts/bcm2835-common.dtsi | 8 ++++++++ + arch/arm/boot/dts/bcm283x.dtsi | 8 -------- + 3 files changed, 16 insertions(+), 8 deletions(-) +Merging renesas/next (b1f6bead1fb4 Merge branches 'renesas-arm-dt-for-v5.15', 'renesas-drivers-for-v5.15' and 'renesas-dt-bindings-for-v5.15' into renesas-next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/renesas.yaml | 50 ++++-- + arch/arm/boot/dts/r8a73a4.dtsi | 44 ------ + arch/arm/boot/dts/r8a7742.dtsi | 4 +- + arch/arm/boot/dts/r8a7743.dtsi | 4 +- + arch/arm/boot/dts/r8a7744.dtsi | 4 +- + arch/arm64/boot/dts/renesas/Makefile | 8 + + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 8 + + arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 8 +- + .../arm64/boot/dts/renesas/r8a77950-salvator-x.dts | 73 --------- + arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77950-ulcb.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77950.dtsi | 2 + + .../arm64/boot/dts/renesas/r8a77951-salvator-x.dts | 73 --------- + .../boot/dts/renesas/r8a77951-salvator-xs.dts | 122 --------------- + arch/arm64/boot/dts/renesas/r8a77951-ulcb-kf.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77951-ulcb.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 5 + + arch/arm64/boot/dts/renesas/r8a77960-ulcb-kf.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77961-ulcb-kf.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts | 3 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 29 ++++ + .../boot/dts/renesas/r8a77965-salvator-xs.dts | 14 -- + arch/arm64/boot/dts/renesas/r8a77965-ulcb-kf.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77965-ulcb.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 50 +++++- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 6 +- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 169 ++++++++++++++++++++- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 158 +++++++++++++++++++ + arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 26 ++-- + .../boot/dts/renesas/r8a779m1-salvator-xs.dts | 53 +++++++ + arch/arm64/boot/dts/renesas/r8a779m1-ulcb-kf.dts | 19 +++ + arch/arm64/boot/dts/renesas/r8a779m1-ulcb.dts | 54 +++++++ + arch/arm64/boot/dts/renesas/r8a779m1.dtsi | 12 ++ + .../boot/dts/renesas/r8a779m3-salvator-xs.dts | 46 ++++++ + arch/arm64/boot/dts/renesas/r8a779m3-ulcb-kf.dts | 18 +++ + arch/arm64/boot/dts/renesas/r8a779m3-ulcb.dts | 45 ++++++ + arch/arm64/boot/dts/renesas/r8a779m3.dtsi | 12 ++ + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 80 ++++++++++ + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 76 ++++++++- + arch/arm64/boot/dts/renesas/salvator-xs.dtsi | 56 +++++++ + arch/arm64/configs/defconfig | 1 + + drivers/soc/renesas/Kconfig | 2 + + drivers/soc/renesas/renesas-soc.c | 4 + + 51 files changed, 989 insertions(+), 382 deletions(-) + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m1-salvator-xs.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m1-ulcb-kf.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m1-ulcb.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m1.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m3-salvator-xs.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m3-ulcb-kf.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m3-ulcb.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m3.dtsi +Merging reset/reset/next (bee08559701f reset: renesas: Add RZ/G2L usbphy control driver) +$ git merge reset/reset/next +Auto-merging drivers/reset/Kconfig +Removing Documentation/devicetree/bindings/reset/uniphier-reset.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/reset/qcom,aoss-reset.yaml | 5 + + .../devicetree/bindings/reset/qcom,pdc-global.yaml | 4 + + .../bindings/reset/renesas,rzg2l-usbphy-ctrl.yaml | 65 ++++++++ + .../reset/socionext,uniphier-glue-reset.yaml | 88 +++++++++++ + .../devicetree/bindings/reset/uniphier-reset.txt | 61 ------- + drivers/reset/Kconfig | 7 + + drivers/reset/Makefile | 1 + + drivers/reset/reset-qcom-pdc.c | 62 ++++++-- + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 175 +++++++++++++++++++++ + include/dt-bindings/reset/qcom,sdm845-pdc.h | 2 + + 10 files changed, 398 insertions(+), 72 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reset/renesas,rzg2l-usbphy-ctrl.yaml + create mode 100644 Documentation/devicetree/bindings/reset/socionext,uniphier-glue-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/uniphier-reset.txt + create mode 100644 drivers/reset/reset-rzg2l-usbphy-ctrl.c +Merging rockchip/for-next (7c5b22cf2d8e Merge branch 'v5.15-clk/next' into for-next) +$ git merge rockchip/for-next +Removing Documentation/devicetree/bindings/power/rockchip-io-domain.txt +Removing Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 20 +- + .../devicetree/bindings/arm/rockchip/pmu.yaml | 2 + + .../bindings/clock/rockchip,rk3399-cru.txt | 68 -- + .../bindings/clock/rockchip,rk3399-cru.yaml | 92 +++ + .../bindings/power/rockchip-io-domain.txt | 135 ---- + .../bindings/power/rockchip-io-domain.yaml | 330 ++++++++ + .../devicetree/bindings/soc/rockchip/grf.yaml | 18 +- + arch/arm/boot/dts/rk3066a.dtsi | 10 +- + arch/arm/boot/dts/rk3188.dtsi | 13 +- + arch/arm/boot/dts/rk3288.dtsi | 6 - + arch/arm/boot/dts/rv1108.dtsi | 12 +- + arch/arm64/boot/dts/rockchip/Makefile | 5 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 35 + + arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts | 3 - + arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts | 110 +++ + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 5 - + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 5 - + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 2 +- + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 36 + + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 4 - + .../arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts | 218 ++++++ + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 54 ++ + .../boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts | 14 + + .../boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts | 47 ++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 47 +- + arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 464 +++++++++++ + arch/arm64/boot/dts/rockchip/rk3566.dtsi | 20 + + arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 57 ++ + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 644 ++-------------- + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 855 +++++++++++++++++++++ + drivers/clk/rockchip/clk-pll.c | 2 +- + drivers/clk/rockchip/clk-rk3036.c | 5 +- + drivers/clk/rockchip/clk-rk3308.c | 1 + + drivers/soc/rockchip/Kconfig | 4 +- + include/dt-bindings/clock/rk3036-cru.h | 1 + + 36 files changed, 2518 insertions(+), 828 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.txt + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.yaml + delete mode 100644 Documentation/devicetree/bindings/power/rockchip-io-domain.txt + create mode 100644 Documentation/devicetree/bindings/power/rockchip-io-domain.yaml + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk356x.dtsi +Merging samsung-krzk/for-next (bb2c20c976aa Merge branch 'next/soc' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/mach-s3c/mach-gta02.c | 3 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 70 ++++++++++++++++++++++++++++++ + arch/arm64/boot/dts/exynos/exynos7.dtsi | 35 +++++++++++++++ + 3 files changed, 106 insertions(+), 2 deletions(-) +Merging scmi/for-linux-next (7929b794edc7 Merge branch 'for-next/juno' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/arm/fvp-base-revc.dts | 12 ------------ + 1 file changed, 12 deletions(-) +Merging stm32/stm32-next (1f0172c02a3d ARM: dts: stm32: Disable LAN8710 EDPD on DHCOM) +$ git merge stm32/stm32-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/stm32mp157c-ed1.dts | 4 ++-- + arch/arm/boot/dts/stm32mp15xx-dhcom-drc02.dtsi | 4 ++++ + arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 25 ++++++++++++++++++---- + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 5 ++++- + arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 6 ++---- + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 12 +++++------ + 6 files changed, 39 insertions(+), 17 deletions(-) +Merging sunxi/sunxi/for-next (3f1c53207cf0 Merge branches 'sunxi/dt-for-5.14' and 'sunxi/fixes-for-5.13' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (51b89b49954f Merge branch for-5.14/arm64/dt into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 60 ++++++++++++++++++++++++++++---- + 1 file changed, 54 insertions(+), 6 deletions(-) +Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) +$ git merge ti-k3/ti-k3-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ti-k3-new/ti-k3-next (e73f0f0ee754 Linux 5.14-rc1) +$ git merge ti-k3-new/ti-k3-next +Already up to date. +Merging xilinx/for-next (d98fb9ab6255 Merge branch 'zynq/dt' into for-next) +$ git merge xilinx/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/zynq-7000.dtsi | 21 +++++++++++++++++++++ + arch/arm/boot/dts/zynq-ebaz4205.dts | 12 ++++++++++++ + arch/arm/configs/multi_v7_defconfig | 1 + + 3 files changed, 34 insertions(+) +Merging clk/clk-next (ea271aa63551 Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../bindings/arm/mediatek/mediatek,audsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,mmsys.txt | 1 + + .../arm/mediatek/mediatek,mt8192-clock.yaml | 199 +++ + .../arm/mediatek/mediatek,mt8192-sys-clock.yaml | 65 + + .../devicetree/bindings/clock/qcom,gpucc.yaml | 6 +- + .../devicetree/bindings/clock/qcom,rpmcc.txt | 2 + + .../bindings/clock/qcom,sc7280-dispcc.yaml | 94 ++ + .../devicetree/bindings/clock/qcom,videocc.yaml | 6 +- + drivers/acpi/acpi_lpss.c | 6 +- + drivers/clk/clk-lmk04832.c | 18 - + drivers/clk/clk-stm32f4.c | 10 +- + drivers/clk/hisilicon/Kconfig | 1 + + drivers/clk/mediatek/Kconfig | 105 +- + drivers/clk/mediatek/Makefile | 13 + + drivers/clk/mediatek/clk-cpumux.c | 2 +- + drivers/clk/mediatek/clk-mt8192-aud.c | 118 ++ + drivers/clk/mediatek/clk-mt8192-cam.c | 107 ++ + drivers/clk/mediatek/clk-mt8192-img.c | 70 ++ + drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c | 119 ++ + drivers/clk/mediatek/clk-mt8192-ipe.c | 57 + + drivers/clk/mediatek/clk-mt8192-mdp.c | 82 ++ + drivers/clk/mediatek/clk-mt8192-mfg.c | 50 + + drivers/clk/mediatek/clk-mt8192-mm.c | 108 ++ + drivers/clk/mediatek/clk-mt8192-msdc.c | 85 ++ + drivers/clk/mediatek/clk-mt8192-scp_adsp.c | 50 + + drivers/clk/mediatek/clk-mt8192-vdec.c | 94 ++ + drivers/clk/mediatek/clk-mt8192-venc.c | 53 + + drivers/clk/mediatek/clk-mt8192.c | 1326 ++++++++++++++++++++ + drivers/clk/mediatek/clk-mtk.c | 25 +- + drivers/clk/mediatek/clk-mtk.h | 28 +- + drivers/clk/mediatek/clk-mux.c | 11 +- + drivers/clk/mediatek/clk-mux.h | 18 +- + drivers/clk/mediatek/clk-pll.c | 31 +- + drivers/clk/mediatek/reset.c | 2 +- + drivers/clk/qcom/Kconfig | 25 + + drivers/clk/qcom/Makefile | 3 + + drivers/clk/qcom/clk-smd-rpm.c | 2 +- + drivers/clk/qcom/dispcc-sc7280.c | 908 ++++++++++++++ + drivers/clk/qcom/dispcc-sm8250.c | 22 +- + drivers/clk/qcom/gpucc-sc7280.c | 491 ++++++++ + drivers/clk/qcom/videocc-sc7280.c | 325 +++++ + drivers/clk/socfpga/clk-agilex.c | 19 +- + drivers/clk/tegra/clk-sdmmc-mux.c | 10 + + drivers/clk/x86/Makefile | 2 +- + drivers/clk/x86/{clk-lpt.c => clk-lpss-atom.c} | 12 +- + include/dt-bindings/clock/mt8192-clk.h | 585 +++++++++ + include/dt-bindings/clock/qcom,dispcc-sc7280.h | 55 + + include/dt-bindings/clock/qcom,gcc-sc7280.h | 2 +- + include/dt-bindings/clock/qcom,gpucc-sc7280.h | 35 + + include/dt-bindings/clock/qcom,rpmcc.h | 10 + + include/dt-bindings/clock/qcom,videocc-sc7280.h | 27 + + include/linux/platform_data/x86/clk-lpss.h | 2 +- + 52 files changed, 5405 insertions(+), 93 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-clock.yaml + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7280-dispcc.yaml + create mode 100644 drivers/clk/mediatek/clk-mt8192-aud.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-cam.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-img.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-ipe.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-mdp.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-mfg.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-mm.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-msdc.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-scp_adsp.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-vdec.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-venc.c + create mode 100644 drivers/clk/mediatek/clk-mt8192.c + create mode 100644 drivers/clk/qcom/dispcc-sc7280.c + create mode 100644 drivers/clk/qcom/gpucc-sc7280.c + create mode 100644 drivers/clk/qcom/videocc-sc7280.c + rename drivers/clk/x86/{clk-lpt.c => clk-lpss-atom.c} (76%) + create mode 100644 include/dt-bindings/clock/mt8192-clk.h + create mode 100644 include/dt-bindings/clock/qcom,dispcc-sc7280.h + create mode 100644 include/dt-bindings/clock/qcom,gpucc-sc7280.h + create mode 100644 include/dt-bindings/clock/qcom,videocc-sc7280.h +Merging clk-imx/for-next (fb3f4bca19b3 clk: imx: clk-divider-gate: Switch to clk_divider.determine_rate) +$ git merge clk-imx/for-next +Merge made by the 'recursive' strategy. + drivers/clk/imx/clk-divider-gate.c | 10 +++++----- + drivers/clk/imx/clk-imx8mm.c | 4 ++-- + drivers/clk/imx/clk-imx8mn.c | 4 ++-- + 3 files changed, 9 insertions(+), 9 deletions(-) +Merging clk-renesas/renesas-clk (d28b1e03dc8d clk: renesas: r9a07g044: Add entry for fixed clock P0_DIV2) +$ git merge clk-renesas/renesas-clk +Merge made by the 'recursive' strategy. + drivers/clk/renesas/Makefile | 2 +- + drivers/clk/renesas/r8a774a1-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a774b1-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a774c0-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a774e1-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 5 +- + drivers/clk/renesas/r9a07g044-cpg.c | 72 +++++++++++++++++++++- + .../renesas/{renesas-rzg2l-cpg.c => rzg2l-cpg.c} | 22 +++---- + .../renesas/{renesas-rzg2l-cpg.h => rzg2l-cpg.h} | 0 + include/dt-bindings/clock/r9a07g044-cpg.h | 1 + + 10 files changed, 87 insertions(+), 23 deletions(-) + rename drivers/clk/renesas/{renesas-rzg2l-cpg.c => rzg2l-cpg.c} (98%) + rename drivers/clk/renesas/{renesas-rzg2l-cpg.h => rzg2l-cpg.h} (100%) +Merging clk-samsung/for-next (a38fd8748464 Linux 5.12-rc2) +$ git merge clk-samsung/for-next +Already up to date. +Merging csky/linux-next (90dc8c0e664e csky: Kconfig: Remove unused selects) +$ git merge csky/linux-next +Already up to date. +Merging h8300/h8300-next (6e5e55227c95 Merge tag 'v5.11' into h8300-next) +$ git merge h8300/h8300-next +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging arch/h8300/kernel/setup.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 3178 and retry the command. +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/boot/dts/h8300h_sim.dts | 2 +- + arch/h8300/boot/dts/h8s_sim.dts | 2 +- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/kernel/setup.c | 2 +- + arch/h8300/lib/memset.S | 17 +++++---- + drivers/clocksource/h8300_timer8.c | 20 +++++----- + drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++- + drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++-------- + drivers/net/ethernet/smsc/Kconfig | 1 - + drivers/net/ethernet/smsc/smc91x.c | 10 +++++ + drivers/tty/serial/sh-sci.c | 5 +-- + 15 files changed, 123 insertions(+), 62 deletions(-) +Merging m68k/for-next (a0b22464ce93 m68k: defconfig: Update defconfigs for v5.14-rc1:) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/configs/amiga_defconfig | 6 ++++-- + arch/m68k/configs/apollo_defconfig | 4 +++- + arch/m68k/configs/atari_defconfig | 6 ++++-- + arch/m68k/configs/bvme6000_defconfig | 4 +++- + arch/m68k/configs/hp300_defconfig | 4 +++- + arch/m68k/configs/mac_defconfig | 6 ++++-- + arch/m68k/configs/multi_defconfig | 6 ++++-- + arch/m68k/configs/mvme147_defconfig | 4 +++- + arch/m68k/configs/mvme16x_defconfig | 4 +++- + arch/m68k/configs/q40_defconfig | 6 ++++-- + arch/m68k/configs/sun3_defconfig | 4 +++- + arch/m68k/configs/sun3x_defconfig | 4 +++- + arch/m68k/emu/nfeth.c | 4 ++-- + 13 files changed, 43 insertions(+), 19 deletions(-) +Merging m68knommu/for-next (60fc0a58c91d m68k: m5441x: add flexcan support) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig.machine | 1 + + arch/m68k/coldfire/device.c | 44 +++++++++++++++++++++++++++++++++++++++ + arch/m68k/coldfire/m5441x.c | 8 +++---- + arch/m68k/coldfire/stmark2.c | 6 ++++-- + arch/m68k/include/asm/m5441xsim.h | 19 +++++++++++++++++ + 5 files changed, 72 insertions(+), 6 deletions(-) +Merging microblaze/next (14a832498c23 arch: microblaze: Fix spelling mistake "vesion" -> "version") +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (a86aadeff2fe MIPS: Alchemy: Fix spelling contraction "cant" -> "can't") +$ git merge mips/mips-next +Merge made by the 'recursive' strategy. + arch/mips/alchemy/devboards/db1200.c | 2 +- + arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 10 +-- + arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c | 33 +++------ + .../cavium-octeon/executive/cvmx-helper-board.c | 8 +-- + .../cavium-octeon/executive/cvmx-helper-rgmii.c | 12 ++-- + .../cavium-octeon/executive/cvmx-helper-xaui.c | 8 +-- + .../executive/cvmx-interrupt-decodes.c | 17 +++-- + arch/mips/cavium-octeon/executive/cvmx-l2c.c | 9 ++- + arch/mips/cavium-octeon/executive/cvmx-pko.c | 22 +++--- + arch/mips/cavium-octeon/executive/cvmx-spi.c | 20 +++--- + arch/mips/cavium-octeon/flash_setup.c | 2 +- + arch/mips/cavium-octeon/setup.c | 81 ++++++---------------- + arch/mips/cavium-octeon/smp.c | 14 ++-- + arch/mips/generic/board-ingenic.c | 21 ++++++ + arch/mips/include/asm/bootinfo.h | 3 + + arch/mips/include/asm/cpu.h | 4 +- + arch/mips/kvm/Makefile | 19 +++-- + arch/mips/mm/c-octeon.c | 29 ++++---- + arch/mips/netlogic/xlr/fmn-config.c | 15 ++-- + 19 files changed, 154 insertions(+), 175 deletions(-) +Merging nds32/next (40e0dd851e7b nds32: Fix bogus reference to <asm/procinfo.h>) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (ad4e600cbf89 drivers/soc/litex: remove 8-bit subregister option) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (ca2b19a4bdb6 parisc: Increase gcc stack frame check to 2048 for 32- and 64-bit) +$ git merge parisc-hd/for-next +Auto-merging lib/Kconfig.debug +Merge made by the 'recursive' strategy. + drivers/parisc/led.c | 4 ++-- + lib/Kconfig.debug | 5 ++--- + 2 files changed, 4 insertions(+), 5 deletions(-) +Merging powerpc/next (e1ab9a730b42 Merge branch 'fixes' into next) +$ git merge powerpc/next +Already up to date. +Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM driver) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (67979e927dd0 riscv: kprobes: implement the branch instructions) +$ git merge risc-v/for-next +Merge made by the 'recursive' strategy. + arch/riscv/kernel/probes/decode-insn.c | 5 +- + arch/riscv/kernel/probes/simulate-insn.c | 112 +++++++++++++++++++++++++++++++ + 2 files changed, 114 insertions(+), 3 deletions(-) +Merging s390/for-next (3da77cf33cf8 s390/delay: get rid of not needed header includes) +$ git merge s390/for-next +Merge made by the 'recursive' strategy. + arch/s390/boot/Makefile | 2 +- + arch/s390/boot/boot.h | 14 +- + arch/s390/boot/compressed/decompressor.c | 5 - + arch/s390/boot/compressed/decompressor.h | 5 + + arch/s390/boot/compressed/vmlinux.lds.S | 35 ++-- + arch/s390/boot/head.S | 56 ++---- + arch/s390/boot/ipl_report.c | 6 +- + arch/s390/boot/kaslr.c | 6 +- + arch/s390/boot/mem_detect.c | 8 +- + arch/s390/boot/pgm_check_info.c | 5 +- + arch/s390/boot/sclp_early_core.c | 9 + + arch/s390/boot/startup.c | 60 ++----- + arch/s390/boot/uv.c | 40 +++-- + arch/s390/boot/uv.h | 19 ++ + arch/s390/include/asm/cio.h | 1 - + arch/s390/include/asm/cpacf.h | 208 ++++++++++++---------- + arch/s390/include/asm/cpufeature.h | 2 +- + arch/s390/include/asm/ctl_reg.h | 17 ++ + arch/s390/include/asm/debug.h | 34 ---- + arch/s390/include/asm/diag.h | 8 + + arch/s390/include/asm/elf.h | 76 +++++--- + arch/s390/include/asm/ipl.h | 1 + + arch/s390/include/asm/module.h | 6 +- + arch/s390/include/asm/pgtable.h | 10 +- + arch/s390/include/asm/qdio.h | 15 +- + arch/s390/include/asm/sclp.h | 8 +- + arch/s390/include/asm/setup.h | 46 ++--- + arch/s390/include/asm/syscall.h | 59 ++++++ + arch/s390/include/asm/uv.h | 8 - + arch/s390/include/asm/vdso/gettimeofday.h | 22 +-- + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/asm-offsets.c | 7 + + arch/s390/kernel/crash_dump.c | 46 ++--- + arch/s390/kernel/diag.c | 13 +- + arch/s390/kernel/dis.c | 2 + + arch/s390/kernel/early.c | 4 + + arch/s390/kernel/entry.h | 9 + + arch/s390/kernel/head64.S | 17 ++ + arch/s390/kernel/ipl_vmparm.c | 2 + + arch/s390/kernel/jump_label.c | 2 +- + arch/s390/kernel/os_info.c | 2 +- + arch/s390/kernel/processor.c | 173 +++++++++++++++++- + arch/s390/kernel/setup.c | 276 ++++++++++++---------------- + arch/s390/kernel/smp.c | 4 +- + arch/s390/{boot => kernel}/text_dma.S | 4 +- + arch/s390/kernel/uv.c | 15 -- + arch/s390/kernel/vmlinux.lds.S | 33 ++++ + arch/s390/lib/delay.c | 11 +- + arch/s390/mm/kasan_init.c | 2 +- + arch/s390/pci/pci.c | 5 +- + arch/s390/tools/opcodes.txt | 18 ++ + drivers/s390/block/dasd_ioctl.c | 4 +- + drivers/s390/char/sclp_cmd.c | 2 +- + drivers/s390/char/sclp_early_core.c | 19 +- + drivers/s390/char/zcore.c | 2 +- + drivers/s390/cio/qdio.h | 18 -- + drivers/s390/cio/qdio_debug.c | 3 - + drivers/s390/cio/qdio_main.c | 286 ++++++------------------------ + drivers/s390/cio/qdio_setup.c | 4 - + drivers/s390/net/qeth_core_main.c | 10 +- + drivers/s390/scsi/zfcp_qdio.c | 5 +- + 61 files changed, 896 insertions(+), 895 deletions(-) + create mode 100644 arch/s390/boot/uv.h + rename arch/s390/{boot => kernel}/text_dma.S (98%) +Merging sh/for-next (2882b7626f49 sh: kernel: traps: remove unused variable) +$ git merge sh/for-next +Auto-merging drivers/sh/maple/maple.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 3180 and retry the command. +Merge made by the 'recursive' strategy. + arch/sh/boards/mach-landisk/irq.c | 4 ++-- + arch/sh/boot/Makefile | 4 ++-- + arch/sh/boot/compressed/.gitignore | 5 ----- + arch/sh/boot/compressed/Makefile | 32 +++++++++++++------------------- + arch/sh/boot/compressed/ashiftrt.S | 2 ++ + arch/sh/boot/compressed/ashldi3.c | 2 ++ + arch/sh/boot/compressed/ashlsi3.S | 2 ++ + arch/sh/boot/compressed/ashrsi3.S | 2 ++ + arch/sh/boot/compressed/lshrsi3.S | 2 ++ + arch/sh/include/asm/checksum_32.h | 5 +++-- + arch/sh/include/asm/uaccess.h | 4 ++-- + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 +++-- + arch/sh/kernel/crash_dump.c | 4 ++-- + arch/sh/kernel/traps_32.c | 8 ++++---- + arch/sh/math-emu/math.c | 4 ++-- + arch/sh/mm/nommu.c | 4 ++-- + drivers/sh/maple/maple.c | 5 ++++- + 17 files changed, 49 insertions(+), 45 deletions(-) + create mode 100644 arch/sh/boot/compressed/ashiftrt.S + create mode 100644 arch/sh/boot/compressed/ashldi3.c + create mode 100644 arch/sh/boot/compressed/ashlsi3.S + create mode 100644 arch/sh/boot/compressed/ashrsi3.S + create mode 100644 arch/sh/boot/compressed/lshrsi3.S +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 sparc-next/master +Already up to date. +Merging uml/linux-next (1aee020155f3 um: remove unneeded semicolon in um_arch.c) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (ac637a0ada71 xtensa: add fairness to IRQ handling) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/Kconfig | 2 +- + arch/xtensa/kernel/traps.c | 7 +++++++ + 2 files changed, 8 insertions(+), 1 deletion(-) +Merging pidfd/for-next (8374f43123a5 tests: add move_mount(MOVE_MOUNT_SET_GROUP) selftest) +$ git merge pidfd/for-next +Merge made by the 'recursive' strategy. + fs/namespace.c | 77 ++++- + include/uapi/linux/mount.h | 3 +- + tools/testing/selftests/Makefile | 1 + + .../selftests/move_mount_set_group/.gitignore | 1 + + .../selftests/move_mount_set_group/Makefile | 7 + + .../testing/selftests/move_mount_set_group/config | 1 + + .../move_mount_set_group_test.c | 375 +++++++++++++++++++++ + 7 files changed, 463 insertions(+), 2 deletions(-) + create mode 100644 tools/testing/selftests/move_mount_set_group/.gitignore + create mode 100644 tools/testing/selftests/move_mount_set_group/Makefile + create mode 100644 tools/testing/selftests/move_mount_set_group/config + create mode 100644 tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c +Merging fscrypt/master (ba47b515f594 fscrypt: align Base64 encoding with RFC 4648 base64url) +$ git merge fscrypt/master +Merge made by the 'recursive' strategy. + Documentation/filesystems/fscrypt.rst | 15 ++--- + fs/crypto/fname.c | 106 +++++++++++++++++++++------------- + fs/crypto/hooks.c | 44 ++++++++++++++ + fs/ext4/symlink.c | 12 +++- + fs/f2fs/namei.c | 12 +++- + fs/ubifs/file.c | 13 ++++- + include/linux/fscrypt.h | 7 +++ + 7 files changed, 155 insertions(+), 54 deletions(-) +Merging fscache/fscache-next (5193f26aef59 fscache: Use refcount_t for the cookie refcount instead of atomic_t) +$ git merge fscache/fscache-next +Removing fs/fscache/object-list.c +Removing fs/fscache/histogram.c +Removing fs/cachefiles/proc.c +Merge made by the 'recursive' strategy. + fs/cachefiles/Kconfig | 19 -- + fs/cachefiles/Makefile | 2 - + fs/cachefiles/bind.c | 2 - + fs/cachefiles/interface.c | 6 +- + fs/cachefiles/internal.h | 25 --- + fs/cachefiles/io.c | 6 +- + fs/cachefiles/key.c | 2 +- + fs/cachefiles/main.c | 7 - + fs/cachefiles/namei.c | 61 ++---- + fs/cachefiles/proc.c | 114 ----------- + fs/cachefiles/xattr.c | 4 +- + fs/fscache/Kconfig | 25 +-- + fs/fscache/Makefile | 2 - + fs/fscache/cache.c | 11 +- + fs/fscache/cookie.c | 201 +++++++++++++----- + fs/fscache/fsdef.c | 3 +- + fs/fscache/histogram.c | 87 -------- + fs/fscache/internal.h | 57 ++---- + fs/fscache/main.c | 39 ++++ + fs/fscache/netfs.c | 2 +- + fs/fscache/object-list.c | 414 -------------------------------------- + fs/fscache/object.c | 8 - + fs/fscache/operation.c | 3 - + fs/fscache/page.c | 6 - + fs/fscache/proc.c | 20 +- + include/linux/fscache-cache.h | 4 - + include/linux/fscache.h | 4 +- + include/linux/netfs.h | 2 +- + include/trace/events/cachefiles.h | 68 +++---- + include/trace/events/fscache.h | 160 +++++++-------- + include/trace/events/netfs.h | 2 +- + 31 files changed, 368 insertions(+), 998 deletions(-) + delete mode 100644 fs/cachefiles/proc.c + delete mode 100644 fs/fscache/histogram.c + delete mode 100644 fs/fscache/object-list.c +Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build") +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (878d950ee038 Merge branch 'for-next-next-v5.14-20210729' into for-next-20210729) +$ git merge btrfs/for-next +Auto-merging fs/btrfs/disk-io.c +Merge made by the 'recursive' strategy. + block/bio.c | 12 +- + fs/9p/vfs_file.c | 7 +- + fs/btrfs/Makefile | 1 + + fs/btrfs/backref.c | 6 +- + fs/btrfs/backref.h | 2 +- + fs/btrfs/block-group.c | 112 +++++- + fs/btrfs/btrfs_inode.h | 27 +- + fs/btrfs/check-integrity.c | 60 +-- + fs/btrfs/compression.c | 169 ++++----- + fs/btrfs/compression.h | 5 +- + fs/btrfs/ctree.c | 62 +-- + fs/btrfs/ctree.h | 96 +++-- + fs/btrfs/delayed-inode.c | 227 ++++------- + fs/btrfs/dir-item.c | 76 ++-- + fs/btrfs/disk-io.c | 45 ++- + fs/btrfs/extent-tree.c | 12 +- + fs/btrfs/extent_io.c | 364 +++++++++++------- + fs/btrfs/extent_io.h | 2 +- + fs/btrfs/file-item.c | 5 +- + fs/btrfs/file.c | 25 +- + fs/btrfs/inode.c | 227 ++++++++--- + fs/btrfs/ioctl.c | 149 ++++---- + fs/btrfs/lzo.c | 236 +++++------- + fs/btrfs/misc.h | 10 + + fs/btrfs/ordered-data.c | 5 +- + fs/btrfs/ordered-data.h | 2 +- + fs/btrfs/qgroup.c | 8 +- + fs/btrfs/raid56.c | 18 +- + fs/btrfs/ref-verify.c | 10 +- + fs/btrfs/relocation.c | 306 +++++++++------ + fs/btrfs/scrub.c | 2 +- + fs/btrfs/send.c | 6 +- + fs/btrfs/space-info.c | 107 +++++- + fs/btrfs/struct-funcs.c | 8 +- + fs/btrfs/subpage.c | 24 +- + fs/btrfs/subpage.h | 3 + + fs/btrfs/super.c | 56 ++- + fs/btrfs/sysfs.c | 10 + + fs/btrfs/tests/qgroup-tests.c | 30 +- + fs/btrfs/transaction.c | 11 +- + fs/btrfs/tree-checker.c | 38 +- + fs/btrfs/tree-log.c | 105 ++++-- + fs/btrfs/verity.c | 811 ++++++++++++++++++++++++++++++++++++++++ + fs/btrfs/volumes.c | 347 +++++++---------- + fs/btrfs/volumes.h | 32 +- + fs/btrfs/zlib.c | 54 +-- + fs/btrfs/zoned.c | 22 +- + fs/btrfs/zoned.h | 1 - + fs/btrfs/zstd.c | 39 +- + fs/fs-writeback.c | 19 +- + include/linux/bio.h | 2 +- + include/linux/blk_types.h | 1 + + include/linux/fs.h | 3 +- + include/trace/events/btrfs.h | 21 +- + include/uapi/linux/btrfs.h | 1 + + include/uapi/linux/btrfs_tree.h | 35 ++ + mm/filemap.c | 36 +- + 57 files changed, 2671 insertions(+), 1439 deletions(-) + create mode 100644 fs/btrfs/verity.c +Merging ceph/master (0077a5008272 rbd: resurrect setting of disk->private_data in rbd_init_disk()) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (b946dbcfa4df cifs: add missing parsing of backupuid) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/file.c | 2 +- + fs/cifs/fs_context.c | 7 +++++++ + fs/cifs/smb2ops.c | 3 ++- + 3 files changed, 10 insertions(+), 2 deletions(-) +Merging cifsd/cifsd-for-next (a8ab5293dd23 Merge pull request #63 from namjaejeon/cifsd-for-next) +$ git merge cifsd/cifsd-for-next +Auto-merging fs/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/filesystems/index.rst +Merge made by the 'recursive' strategy. + Documentation/filesystems/cifs/index.rst | 10 + + Documentation/filesystems/cifs/ksmbd.rst | 164 + + Documentation/filesystems/index.rst | 2 +- + MAINTAINERS | 11 +- + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/ksmbd/Kconfig | 69 + + fs/ksmbd/Makefile | 20 + + fs/ksmbd/asn1.c | 343 ++ + fs/ksmbd/asn1.h | 21 + + fs/ksmbd/auth.c | 1364 +++++ + fs/ksmbd/auth.h | 67 + + fs/ksmbd/connection.c | 413 ++ + fs/ksmbd/connection.h | 213 + + fs/ksmbd/crypto_ctx.c | 282 + + fs/ksmbd/crypto_ctx.h | 74 + + fs/ksmbd/glob.h | 49 + + fs/ksmbd/ksmbd_netlink.h | 395 ++ + fs/ksmbd/ksmbd_spnego_negtokeninit.asn1 | 31 + + fs/ksmbd/ksmbd_spnego_negtokentarg.asn1 | 19 + + fs/ksmbd/ksmbd_work.c | 80 + + fs/ksmbd/ksmbd_work.h | 117 + + fs/ksmbd/mgmt/ksmbd_ida.c | 46 + + fs/ksmbd/mgmt/ksmbd_ida.h | 34 + + fs/ksmbd/mgmt/share_config.c | 238 + + fs/ksmbd/mgmt/share_config.h | 81 + + fs/ksmbd/mgmt/tree_connect.c | 121 + + fs/ksmbd/mgmt/tree_connect.h | 56 + + fs/ksmbd/mgmt/user_config.c | 69 + + fs/ksmbd/mgmt/user_config.h | 66 + + fs/ksmbd/mgmt/user_session.c | 369 ++ + fs/ksmbd/mgmt/user_session.h | 106 + + fs/ksmbd/misc.c | 338 ++ + fs/ksmbd/misc.h | 35 + + fs/ksmbd/ndr.c | 340 ++ + fs/ksmbd/ndr.h | 22 + + fs/ksmbd/nterr.h | 543 ++ + fs/ksmbd/ntlmssp.h | 169 + + fs/ksmbd/oplock.c | 1709 ++++++ + fs/ksmbd/oplock.h | 131 + + fs/ksmbd/server.c | 633 +++ + fs/ksmbd/server.h | 70 + + fs/ksmbd/smb2misc.c | 438 ++ + fs/ksmbd/smb2ops.c | 312 ++ + fs/ksmbd/smb2pdu.c | 8363 ++++++++++++++++++++++++++++++ + fs/ksmbd/smb2pdu.h | 1698 ++++++ + fs/ksmbd/smb_common.c | 655 +++ + fs/ksmbd/smb_common.h | 543 ++ + fs/ksmbd/smbacl.c | 1344 +++++ + fs/ksmbd/smbacl.h | 212 + + fs/ksmbd/smbfsctl.h | 91 + + fs/ksmbd/smbstatus.h | 1822 +++++++ + fs/ksmbd/transport_ipc.c | 874 ++++ + fs/ksmbd/transport_ipc.h | 47 + + fs/ksmbd/transport_rdma.c | 2057 ++++++++ + fs/ksmbd/transport_rdma.h | 63 + + fs/ksmbd/transport_tcp.c | 618 +++ + fs/ksmbd/transport_tcp.h | 13 + + fs/ksmbd/unicode.c | 384 ++ + fs/ksmbd/unicode.h | 357 ++ + fs/ksmbd/uniupr.h | 268 + + fs/ksmbd/vfs.c | 1886 +++++++ + fs/ksmbd/vfs.h | 197 + + fs/ksmbd/vfs_cache.c | 725 +++ + fs/ksmbd/vfs_cache.h | 178 + + fs/ksmbd/xattr.h | 122 + + 66 files changed, 32187 insertions(+), 2 deletions(-) + create mode 100644 Documentation/filesystems/cifs/index.rst + create mode 100644 Documentation/filesystems/cifs/ksmbd.rst + create mode 100644 fs/ksmbd/Kconfig + create mode 100644 fs/ksmbd/Makefile + create mode 100644 fs/ksmbd/asn1.c + create mode 100644 fs/ksmbd/asn1.h + create mode 100644 fs/ksmbd/auth.c + create mode 100644 fs/ksmbd/auth.h + create mode 100644 fs/ksmbd/connection.c + create mode 100644 fs/ksmbd/connection.h + create mode 100644 fs/ksmbd/crypto_ctx.c + create mode 100644 fs/ksmbd/crypto_ctx.h + create mode 100644 fs/ksmbd/glob.h + create mode 100644 fs/ksmbd/ksmbd_netlink.h + create mode 100644 fs/ksmbd/ksmbd_spnego_negtokeninit.asn1 + create mode 100644 fs/ksmbd/ksmbd_spnego_negtokentarg.asn1 + create mode 100644 fs/ksmbd/ksmbd_work.c + create mode 100644 fs/ksmbd/ksmbd_work.h + create mode 100644 fs/ksmbd/mgmt/ksmbd_ida.c + create mode 100644 fs/ksmbd/mgmt/ksmbd_ida.h + create mode 100644 fs/ksmbd/mgmt/share_config.c + create mode 100644 fs/ksmbd/mgmt/share_config.h + create mode 100644 fs/ksmbd/mgmt/tree_connect.c + create mode 100644 fs/ksmbd/mgmt/tree_connect.h + create mode 100644 fs/ksmbd/mgmt/user_config.c + create mode 100644 fs/ksmbd/mgmt/user_config.h + create mode 100644 fs/ksmbd/mgmt/user_session.c + create mode 100644 fs/ksmbd/mgmt/user_session.h + create mode 100644 fs/ksmbd/misc.c + create mode 100644 fs/ksmbd/misc.h + create mode 100644 fs/ksmbd/ndr.c + create mode 100644 fs/ksmbd/ndr.h + create mode 100644 fs/ksmbd/nterr.h + create mode 100644 fs/ksmbd/ntlmssp.h + create mode 100644 fs/ksmbd/oplock.c + create mode 100644 fs/ksmbd/oplock.h + create mode 100644 fs/ksmbd/server.c + create mode 100644 fs/ksmbd/server.h + create mode 100644 fs/ksmbd/smb2misc.c + create mode 100644 fs/ksmbd/smb2ops.c + create mode 100644 fs/ksmbd/smb2pdu.c + create mode 100644 fs/ksmbd/smb2pdu.h + create mode 100644 fs/ksmbd/smb_common.c + create mode 100644 fs/ksmbd/smb_common.h + create mode 100644 fs/ksmbd/smbacl.c + create mode 100644 fs/ksmbd/smbacl.h + create mode 100644 fs/ksmbd/smbfsctl.h + create mode 100644 fs/ksmbd/smbstatus.h + create mode 100644 fs/ksmbd/transport_ipc.c + create mode 100644 fs/ksmbd/transport_ipc.h + create mode 100644 fs/ksmbd/transport_rdma.c + create mode 100644 fs/ksmbd/transport_rdma.h + create mode 100644 fs/ksmbd/transport_tcp.c + create mode 100644 fs/ksmbd/transport_tcp.h + create mode 100644 fs/ksmbd/unicode.c + create mode 100644 fs/ksmbd/unicode.h + create mode 100644 fs/ksmbd/uniupr.h + create mode 100644 fs/ksmbd/vfs.c + create mode 100644 fs/ksmbd/vfs.h + create mode 100644 fs/ksmbd/vfs_cache.c + create mode 100644 fs/ksmbd/vfs_cache.h + create mode 100644 fs/ksmbd/xattr.h +Merging configfs/for-next (420405ecde06 configfs: fix the read and write iterators) +$ git merge 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 ecryptfs/next +Already up to date. +Merging erofs/dev (8215d5b7f15f MAINTAINERS: erofs: update my email address) +$ git merge erofs/dev +Already up to date. +Merging exfat/dev (50be9417e23a Merge tag 'io_uring-5.14-2021-07-09' of git://git.kernel.dk/linux-block) +$ git merge exfat/dev +Already up to date. +Merging ext3/for_next (9048da101932 Merge doc fixup from Randy for the hole punch series.) +$ git merge ext3/for_next +Auto-merging mm/filemap.c +Auto-merging include/linux/fs.h +Auto-merging fs/fuse/dax.c +Auto-merging fs/cifs/smb2ops.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/locking.rst | 79 ++++++++----- + fs/ceph/addr.c | 9 +- + fs/ceph/file.c | 2 + + fs/cifs/smb2ops.c | 2 + + fs/ext2/Kconfig | 1 + + fs/ext2/ext2.h | 11 -- + fs/ext2/file.c | 7 +- + fs/ext2/inode.c | 27 ++--- + fs/ext2/super.c | 3 - + fs/ext4/ext4.h | 10 -- + fs/ext4/extents.c | 25 +++-- + fs/ext4/file.c | 13 ++- + fs/ext4/inode.c | 47 +++----- + fs/ext4/ioctl.c | 4 +- + fs/ext4/super.c | 13 +-- + fs/ext4/truncate.h | 8 +- + fs/f2fs/data.c | 8 +- + fs/f2fs/f2fs.h | 1 - + fs/f2fs/file.c | 62 +++++------ + fs/f2fs/super.c | 1 - + fs/fuse/dax.c | 50 ++++----- + fs/fuse/dir.c | 11 +- + fs/fuse/file.c | 10 +- + fs/fuse/fuse_i.h | 7 -- + fs/fuse/inode.c | 1 - + fs/hpfs/Kconfig | 1 + + fs/hpfs/file.c | 51 ++++++++- + fs/inode.c | 2 + + fs/ioctl.c | 203 ---------------------------------- + fs/xfs/xfs_bmap_util.c | 15 +-- + fs/xfs/xfs_file.c | 13 ++- + fs/xfs/xfs_inode.c | 121 ++++++++++---------- + fs/xfs/xfs_inode.h | 3 +- + fs/xfs/xfs_super.c | 2 - + fs/zonefs/super.c | 23 +--- + fs/zonefs/zonefs.h | 7 +- + include/linux/fiemap.h | 4 - + include/linux/fs.h | 39 +++++++ + mm/filemap.c | 145 ++++++++++++++++++++---- + mm/madvise.c | 2 +- + mm/memory-failure.c | 2 +- + mm/readahead.c | 2 + + mm/rmap.c | 41 +++---- + mm/shmem.c | 20 ++-- + mm/truncate.c | 9 +- + 45 files changed, 542 insertions(+), 575 deletions(-) +Merging ext4/dev (0705e8d1e220 ext4: inline jbd2_journal_[un]register_shrinker()) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (972afa376543 f2fs: turn back remapped address in compressed page endio) +$ git merge f2fs/dev +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/data.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 20 +++++++ + fs/f2fs/data.c | 93 +++++++++++++++++++-------------- + fs/f2fs/debug.c | 9 ++++ + fs/f2fs/f2fs.h | 20 ++++--- + fs/f2fs/file.c | 34 +++++++++++- + fs/f2fs/gc.c | 3 +- + fs/f2fs/node.c | 20 +++++-- + fs/f2fs/segment.c | 2 +- + fs/f2fs/super.c | 85 +++++++++++++++++------------- + fs/f2fs/sysfs.c | 40 +++++++++++++- + 10 files changed, 231 insertions(+), 95 deletions(-) +$ git am -3 ../patches/0001-fxup-for-f2fs-Convert-to-using-invalidate_lock.patch +Applying: fxup for "f2fs: Convert to using invalidate_lock" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/f2fs/data.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master adb7b771fd39] Merge remote-tracking branch 'f2fs/dev' + Date: Fri Jul 30 04:46:45 2021 +0100 +Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (ef5680b5f7d1 fuse: allow sharing existing sb) +$ git merge fuse/for-next +Auto-merging fs/fuse/inode.c +Auto-merging fs/fuse/fuse_i.h +Merge made by the 'recursive' strategy. + fs/fuse/control.c | 10 ++--- + fs/fuse/fuse_i.h | 1 + + fs/fuse/inode.c | 121 ++++++++++++++++++++++++++++++---------------------- + fs/fuse/virtio_fs.c | 12 +++--- + 4 files changed, 83 insertions(+), 61 deletions(-) +Merging gfs2/for-next (a6579cbfd721 gfs2: Fix memory leak of object lsi on error return path) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/ops_fstype.c | 1 + + 1 file changed, 1 insertion(+) +Merging jfs/jfs-next (5d299f44d765 jfs: Avoid field-overflowing memcpy()) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (2734d6c1b1a0 Linux 5.14-rc2) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (4f8be1f53bf6 nfs: we don't support removing system.nfs4_acl) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (ab1016d39cc0 nfsd: fix NULL dereference in nfs3svc_encode_getaclres) +$ git merge nfsd/nfsd-next +Already up to date. +Merging cel/for-next (268b654a6bd8 NFSD: remove vanity comments) +$ git merge cel/for-next +Merge made by the 'recursive' strategy. + fs/lockd/svclock.c | 2 +- + fs/nfsd/trace.h | 17 ++++----- + fs/nfsd/vfs.c | 21 +++-------- + include/linux/sunrpc/svc.h | 4 +++ + include/linux/sunrpc/svc_rdma.h | 7 ++-- + include/trace/trace_events.h | 22 ++++++++++++ + include/uapi/linux/nfsd/nfsfh.h | 1 - + net/sunrpc/svc.c | 21 +++++++++++ + net/sunrpc/svc_xprt.c | 3 ++ + net/sunrpc/xprtrdma/svc_rdma_rw.c | 56 ++++++++++++++++++++---------- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 41 ++++++++++++---------- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 +-- + samples/trace_events/trace-events-sample.h | 27 ++++++++++++++ + 13 files changed, 156 insertions(+), 70 deletions(-) +Merging orangefs/for-next (0fdec1b3c9fb orangefs: fix orangefs df output.) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (cdaddca6cf0d ovl: fix deadlock in splice write) +$ git merge overlayfs/overlayfs-next +Auto-merging mm/util.c +Auto-merging include/linux/mm.h +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.rst | 3 + + fs/orangefs/inode.c | 7 +-- + fs/overlayfs/copy_up.c | 83 +++++++++++++++++++++------ + fs/overlayfs/dir.c | 10 +++- + fs/overlayfs/file.c | 51 ++++++++++++++++- + fs/overlayfs/inode.c | 99 ++++++++++++++++++++++++++------- + fs/overlayfs/namei.c | 4 +- + fs/overlayfs/overlayfs.h | 42 ++++++++++++-- + fs/overlayfs/readdir.c | 5 ++ + fs/overlayfs/super.c | 4 +- + fs/overlayfs/util.c | 92 ++++++++++++++++++++++++++++-- + fs/stat.c | 18 ++++++ + include/linux/fs.h | 1 + + include/linux/mm.h | 2 +- + include/linux/stat.h | 4 ++ + mm/mmap.c | 2 +- + mm/util.c | 27 ++++++++- + 17 files changed, 391 insertions(+), 63 deletions(-) +Merging ubifs/next (a801fcfeef96 ubifs: Set/Clear I_LINKABLE under i_lock for whiteout inode) +$ git merge ubifs/next +Already up to date. +Merging v9fs/9p-next (732b33d0dbf1 9p/xen: Fix end of loop tests for list_for_each_entry) +$ git merge v9fs/9p-next +Merge made by the 'recursive' strategy. + net/9p/trans_virtio.c | 4 +++- + net/9p/trans_xen.c | 4 ++-- + 2 files changed, 5 insertions(+), 3 deletions(-) +Merging xfs/for-next (81a448d7b066 xfs: prevent spoofing of rtbitmap blocks when recovering buffers) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_log_format.h | 11 +- + fs/xfs/xfs_buf_item_recover.c | 15 ++- + fs/xfs/xfs_inode_item_recover.c | 39 +++++-- + fs/xfs/xfs_log.c | 251 ++++++++++++++++++++++++++-------------- + fs/xfs/xfs_log_cil.c | 13 ++- + fs/xfs/xfs_log_priv.h | 16 ++- + fs/xfs/xfs_trace.h | 5 +- + 7 files changed, 244 insertions(+), 106 deletions(-) +Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check) +$ git merge zonefs/for-next +Auto-merging fs/zonefs/super.c +Merge made by the 'recursive' strategy. +Merging iomap/iomap-for-next (229adf3c64db iomap: Don't create iomap_page objects in iomap_page_mkwrite_actor) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (e1cc6e8c1969 fcntl: fix potential deadlock for &fasync_struct.fa_lock) +$ git merge file-locks/locks-next +Auto-merging fs/fcntl.c +Merge made by the 'recursive' strategy. + fs/fcntl.c | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) +Merging vfs/for-next (303392fd5c16 Merge tag 'leds-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds) +$ git merge vfs/for-next +Already up to date. +Merging printk/for-next (94cbc604683f Merge branch 'for-5.15-verbose-console' into for-next) +$ git merge printk/for-next +Auto-merging kernel/trace/trace.c +Auto-merging init/Kconfig +Auto-merging drivers/base/core.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 9 + + Documentation/core-api/printk-basics.rst | 5 +- + MAINTAINERS | 5 + + arch/arm/kernel/entry-v7m.S | 2 +- + arch/arm/kernel/smp.c | 4 +- + arch/arm/lib/backtrace-clang.S | 2 +- + arch/arm/lib/backtrace.S | 2 +- + arch/arm/mach-rpc/io-acorn.S | 2 +- + arch/arm/vfp/vfphw.S | 6 +- + arch/ia64/include/uapi/asm/cmpxchg.h | 4 +- + arch/mips/include/asm/asm.h | 2 +- + arch/openrisc/kernel/entry.S | 6 +- + arch/powerpc/kernel/head_fsl_booke.S | 2 +- + arch/powerpc/kernel/traps.c | 1 - + arch/powerpc/kernel/watchdog.c | 5 - + arch/powerpc/kexec/crash.c | 2 +- + arch/um/include/shared/user.h | 3 +- + arch/x86/kernel/head_32.S | 2 +- + drivers/base/core.c | 6 +- + include/asm-generic/vmlinux.lds.h | 13 + + include/linux/dev_printk.h | 66 +++-- + include/linux/hardirq.h | 2 - + include/linux/module.h | 5 + + include/linux/printk.h | 171 ++++++++--- + init/Kconfig | 19 +- + kernel/kexec_core.c | 1 - + kernel/module.c | 5 + + kernel/panic.c | 3 - + kernel/printk/Makefile | 1 + + kernel/printk/index.c | 195 +++++++++++++ + kernel/printk/internal.h | 31 +- + kernel/printk/printk.c | 361 +++++++++++++---------- + kernel/printk/printk_safe.c | 364 +----------------------- + kernel/trace/trace.c | 2 - + lib/nmi_backtrace.c | 13 +- + lib/string_helpers.c | 4 + + lib/test-string_helpers.c | 14 +- + lib/test_scanf.c | 4 +- + 38 files changed, 687 insertions(+), 657 deletions(-) + create mode 100644 kernel/printk/index.c +Merging pci/next (08463f5ad501 Merge branch 'remotes/lorenzo/pci/tegra') +$ git merge pci/next +Merge made by the 'recursive' strategy. + drivers/pci/controller/Kconfig | 1 + + drivers/pci/controller/dwc/pcie-artpec6.c | 7 ++---- + drivers/pci/controller/dwc/pcie-designware-plat.c | 1 - + drivers/pci/controller/pci-tegra.c | 5 ---- + drivers/pci/pci.c | 28 +++++++++++++---------- + 5 files changed, 19 insertions(+), 23 deletions(-) +Merging pstore/for-next/pstore (c5d4fb2539ca pstore/blk: Use "%lu" to format unsigned long) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + fs/pstore/blk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hid/for-next (e2e4893180f3 Merge branch 'for-5.14/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 7 ++- + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 2 +- + drivers/hid/hid-apple.c | 34 +++++++--- + drivers/hid/hid-asus.c | 3 - + drivers/hid/hid-cmedia.c | 90 ++++++++++++++++++++++++++- + drivers/hid/hid-ft260.c | 27 +++----- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-input.c | 2 - + drivers/hid/hid-magicmouse.c | 52 ++++++++++++++++ + drivers/hid/i2c-hid/i2c-hid-of-goodix.c | 92 ++++++++++++++++++++++++---- + drivers/hid/intel-ish-hid/ishtp-hid-client.c | 15 ++++- + drivers/hid/intel-ish-hid/ishtp-hid.h | 1 + + drivers/hid/intel-ish-hid/ishtp/bus.c | 29 ++++++--- + drivers/hid/usbhid/Kconfig | 2 +- + drivers/hid/usbhid/hid-core.c | 13 +++- + drivers/hid/wacom_sys.c | 9 ++- + drivers/hid/wacom_wac.c | 53 ++++++++++++---- + drivers/hid/wacom_wac.h | 2 + + include/linux/intel-ish-client-if.h | 2 + + 19 files changed, 362 insertions(+), 74 deletions(-) +Merging i2c/i2c/for-next (4a8ac5e45cda i2c: mpc: Poll for MCF) +$ git merge i2c/i2c/for-next +Already up to date. +Merging i3c/i3c/next (3e5feb11a829 i3c: master: svc: fix doc warning in svc-i3c-master.c) +$ git merge i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved) +$ git merge dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (c35d96845882 hwmon: (dell-smm-hwmon) Fix fan mutliplier detection for 3rd fan) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/amd,sbrmi.yaml | 53 ++ + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/sbrmi.rst | 79 ++ + Documentation/hwmon/scpi-hwmon.rst | 2 +- + drivers/hwmon/Kconfig | 10 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/dell-smm-hwmon.c | 853 ++++++++++----------- + drivers/hwmon/intel-m10-bmc-hwmon.c | 116 +++ + drivers/hwmon/k10temp.c | 2 + + drivers/hwmon/ntc_thermistor.c | 20 +- + drivers/hwmon/pmbus/bpa-rs600.c | 22 +- + drivers/hwmon/sbrmi.c | 358 +++++++++ + drivers/hwmon/w83627ehf.c | 122 +-- + 13 files changed, 1094 insertions(+), 545 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/amd,sbrmi.yaml + create mode 100644 Documentation/hwmon/sbrmi.rst + create mode 100644 drivers/hwmon/sbrmi.c +Merging jc_docs/docs-next (4a52225d6101 docs/zh_CN: add a translation for index) +$ git merge jc_docs/docs-next +Auto-merging Documentation/virt/kvm/api.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cputopology.rst | 10 +- + .../admin-guide/hw-vuln/core-scheduling.rst | 10 +- + Documentation/admin-guide/sysrq.rst | 12 +- + Documentation/arm/marvell.rst | 18 + + Documentation/core-api/cpu_hotplug.rst | 38 +- + Documentation/core-api/printk-formats.rst | 1 + + Documentation/firmware-guide/acpi/dsd/graph.rst | 2 +- + .../ethernet/freescale/dpaa2/dpio-driver.rst | 1 + + Documentation/process/deprecated.rst | 4 +- + Documentation/process/submitting-patches.rst | 10 +- + .../sound/kernel-api/writing-an-alsa-driver.rst | 2 +- + .../translations/zh_CN/core-api/cpu_hotplug.rst | 348 ++++++++++++++++++ + .../translations/zh_CN/core-api/genericirq.rst | 409 +++++++++++++++++++++ + .../translations/zh_CN/core-api/index.rst | 7 +- + .../translations/zh_CN/core-api/memory-hotplug.rst | 126 +++++++ + .../zh_CN/core-api/protection-keys.rst | 99 +++++ + .../translations/zh_CN/dev-tools/index.rst | 5 + + .../zh_CN/dev-tools/testing-overview.rst | 109 ++++++ + Documentation/translations/zh_CN/index.rst | 5 + + .../translations/zh_CN/process/coding-style.rst | 3 +- + Documentation/virt/kvm/api.rst | 32 +- + 21 files changed, 1197 insertions(+), 54 deletions(-) + create mode 100644 Documentation/translations/zh_CN/core-api/cpu_hotplug.rst + create mode 100644 Documentation/translations/zh_CN/core-api/genericirq.rst + create mode 100644 Documentation/translations/zh_CN/core-api/memory-hotplug.rst + create mode 100644 Documentation/translations/zh_CN/core-api/protection-keys.rst + create mode 100644 Documentation/translations/zh_CN/dev-tools/testing-overview.rst +Merging v4l-dvb/master (c27479d762de media: atomisp: pci: reposition braces as per coding style) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/i2c/adv7180.yaml | 8 + + .../devicetree/bindings/media/rockchip-vpu.yaml | 1 + + Documentation/driver-api/media/cec-core.rst | 9 +- + .../userspace-api/media/cec.h.rst.exceptions | 2 +- + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 3 + + drivers/media/cec/platform/stm32/stm32-cec.c | 26 +- + drivers/media/dvb-frontends/cx24117.c | 1 - + drivers/media/dvb-frontends/dib8000.c | 58 ++- + drivers/media/i2c/adv7180.c | 66 ++- + drivers/media/i2c/tda1997x.c | 1 + + drivers/media/i2c/tvp5150.c | 2 +- + drivers/media/pci/ivtv/ivtv-cards.h | 68 ++- + drivers/media/pci/ivtv/ivtv-i2c.c | 16 +- + drivers/media/pci/saa7134/saa7134-alsa.c | 4 +- + drivers/media/pci/saa7134/saa7134-core.c | 7 +- + drivers/media/pci/saa7164/saa7164-cmd.c | 3 - + drivers/media/pci/tw5864/tw5864-reg.h | 2 +- + drivers/media/platform/atmel/atmel-sama5d2-isc.c | 17 + + drivers/media/platform/coda/coda-bit.c | 18 +- + drivers/media/platform/davinci/vpfe_capture.c | 2 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 2 +- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 4 +- + drivers/media/platform/rockchip/rga/rga.c | 27 +- + .../platform/rockchip/rkisp1/rkisp1-capture.c | 12 +- + .../media/platform/rockchip/rkisp1/rkisp1-common.h | 6 +- + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 3 +- + .../media/platform/rockchip/rkisp1/rkisp1-stats.c | 6 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 2 +- + drivers/media/platform/sti/delta/delta-ipc.c | 3 +- + drivers/media/platform/ti-vpe/cal-camerarx.c | 247 ++++++----- + drivers/media/platform/ti-vpe/cal-video.c | 176 ++++++-- + drivers/media/platform/ti-vpe/cal.c | 278 ++++++++---- + drivers/media/platform/ti-vpe/cal.h | 66 ++- + drivers/media/platform/ti-vpe/cal_regs.h | 53 +-- + drivers/media/platform/vsp1/vsp1_entity.c | 4 +- + drivers/media/rc/ene_ir.c | 2 +- + drivers/media/rc/lirc_dev.c | 6 +- + drivers/media/rc/mceusb.c | 2 +- + drivers/media/rc/rc-loopback.c | 82 ++-- + drivers/media/rc/rc-main.c | 2 +- + drivers/media/rc/redrat3.c | 2 +- + drivers/media/rc/streamzap.c | 2 - + drivers/media/spi/cxd2880-spi.c | 7 +- + drivers/media/test-drivers/vivid/vivid-cec.c | 2 +- + drivers/media/usb/dvb-usb-v2/Kconfig | 2 + + drivers/media/usb/dvb-usb-v2/af9035.c | 1 + + drivers/media/usb/dvb-usb-v2/dvbsky.c | 37 +- + drivers/media/usb/dvb-usb/dvb-usb-i2c.c | 9 +- + drivers/media/usb/dvb-usb/dvb-usb-init.c | 2 +- + drivers/media/usb/dvb-usb/nova-t-usb2.c | 6 +- + drivers/media/usb/dvb-usb/vp702x.c | 12 +- + drivers/media/usb/go7007/go7007-driver.c | 26 -- + drivers/media/usb/go7007/go7007-usb.c | 2 +- + drivers/media/usb/gspca/Kconfig | 1 - + drivers/media/usb/gspca/vc032x.c | 6 +- + drivers/media/usb/gspca/zc3xx.c | 134 +++--- + drivers/media/usb/stkwebcam/stk-webcam.c | 6 +- + drivers/media/usb/uvc/uvc_v4l2.c | 34 +- + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 13 +- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 22 +- + drivers/staging/media/atomisp/i2c/ov2680.h | 2 +- + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 2 +- + drivers/staging/media/atomisp/pci/atomisp_compat.h | 2 - + .../media/atomisp/pci/atomisp_compat_css20.c | 38 +- + drivers/staging/media/atomisp/pci/atomisp_csi2.c | 3 +- + drivers/staging/media/atomisp/pci/atomisp_drvfs.c | 6 +- + .../media/atomisp/pci/atomisp_gmin_platform.c | 8 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 4 +- + .../pci/hive_isp_css_common/host/input_system.c | 62 --- + .../media/atomisp/pci/input_system_ctrl_defs.h | 2 +- + .../pci/isp/kernels/anr/anr_1.0/ia_css_anr_types.h | 4 +- + .../media/atomisp/pci/isp2400_input_system_local.h | 32 +- + .../media/atomisp/pci/isp_acquisition_defs.h | 2 +- + .../staging/media/atomisp/pci/isp_capture_defs.h | 2 +- + .../media/atomisp/pci/runtime/isys/src/rx.c | 14 +- + drivers/staging/media/atomisp/pci/sh_css.c | 47 +- + .../staging/media/atomisp/pci/sh_css_firmware.c | 6 +- + drivers/staging/media/atomisp/pci/sh_css_mipi.c | 69 ++- + drivers/staging/media/atomisp/pci/sh_css_params.c | 171 ++++--- + drivers/staging/media/atomisp/pci/sh_css_sp.c | 108 ++--- + drivers/staging/media/atomisp/pci/sh_css_version.c | 3 +- + drivers/staging/media/hantro/Makefile | 1 + + drivers/staging/media/hantro/hantro.h | 4 +- + drivers/staging/media/hantro/hantro_drv.c | 11 +- + drivers/staging/media/hantro/hantro_g1_h264_dec.c | 48 +- + drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 31 +- + drivers/staging/media/hantro/hantro_h264.c | 24 + + drivers/staging/media/hantro/hantro_hw.h | 8 + + .../media/hantro/rockchip_vpu2_hw_h264_dec.c | 491 +++++++++++++++++++++ + .../media/hantro/rockchip_vpu2_hw_vp8_dec.c | 32 +- + drivers/staging/media/hantro/rockchip_vpu_hw.c | 43 +- + drivers/staging/media/hantro/sama5d4_vdec_hw.c | 6 - + drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 26 +- + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 1 + + drivers/staging/media/tegra-video/vi.c | 4 +- + include/media/dvb-usb-ids.h | 2 + + include/media/hevc-ctrls.h | 3 +- + include/media/rc-core.h | 5 +- + include/uapi/linux/cec.h | 2 +- + 99 files changed, 1889 insertions(+), 1063 deletions(-) + create mode 100644 drivers/staging/media/hantro/rockchip_vpu2_hw_h264_dec.c +Merging v4l-dvb-next/master (c3cdc019a6bf media: atomisp: pci: reposition braces as per coding style) +$ git merge v4l-dvb-next/master +Merge made by the 'recursive' strategy. +Merging pm/linux-next (604483c9d252 Merge branch 'acpi-dptf' into linux-next) +$ git merge pm/linux-next +Auto-merging drivers/pci/pci.c +Auto-merging drivers/base/core.c +Merge made by the 'recursive' strategy. + drivers/acpi/Kconfig | 4 +-- + drivers/acpi/acpi_configfs.c | 54 +++++++++++++++---------------- + drivers/acpi/bus.c | 12 +++---- + drivers/acpi/dptf/dptf_pch_fivr.c | 51 ++++++++++++++++++++++++----- + drivers/acpi/glue.c | 51 ++++++++--------------------- + drivers/acpi/numa/Kconfig | 2 +- + drivers/acpi/numa/srat.c | 2 +- + drivers/acpi/pmic/intel_pmic_xpower.c | 47 ++++++++++++++++++++++++--- + drivers/acpi/resource.c | 9 +----- + drivers/acpi/x86/s2idle.c | 10 ++++-- + drivers/base/base.h | 3 ++ + drivers/base/core.c | 35 +++++++++----------- + drivers/base/swnode.c | 61 ++++++++++++++++++----------------- + drivers/pci/pci.c | 6 +--- + include/linux/acpi.h | 12 +++---- + include/linux/property.h | 2 -- + 16 files changed, 202 insertions(+), 159 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (d66cd5dea551 cpufreq: blacklist Qualcomm sc8180x in cpufreq-dt-platdev) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'recursive' strategy. + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + + 1 file changed, 1 insertion(+) +Merging cpupower/cpupower (5499f2b80b56 tools: cpupower: fix typo in cpupower-idle-set(1) manpage) +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/man/cpupower-idle-set.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devfreq/devfreq-next (e73f0f0ee754 Linux 5.14-rc1) +$ git merge devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (941b2be46901 dt-bindings: opp: Convert to DT schema) +$ git merge opp/opp/linux-next +Removing Documentation/devicetree/bindings/opp/opp.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/cpufreq/cpufreq-dt.txt | 2 +- + .../bindings/cpufreq/cpufreq-mediatek.txt | 2 +- + .../devicetree/bindings/cpufreq/cpufreq-st.txt | 6 +- + .../bindings/cpufreq/nvidia,tegra20-cpufreq.txt | 2 +- + .../devicetree/bindings/devfreq/rk3399_dmc.txt | 2 +- + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 2 +- + .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 2 +- + .../bindings/interconnect/fsl,imx8m-noc.yaml | 4 +- + .../opp/allwinner,sun50i-h6-operating-points.yaml | 4 + + Documentation/devicetree/bindings/opp/opp-v1.yaml | 51 ++ + .../devicetree/bindings/opp/opp-v2-base.yaml | 214 +++++++ + Documentation/devicetree/bindings/opp/opp-v2.yaml | 475 ++++++++++++++++ + Documentation/devicetree/bindings/opp/opp.txt | 622 --------------------- + Documentation/devicetree/bindings/opp/qcom-opp.txt | 2 +- + .../bindings/opp/ti-omap5-opp-supply.txt | 2 +- + .../devicetree/bindings/power/power-domain.yaml | 2 +- + arch/arm/boot/dts/omap34xx.dtsi | 1 - + arch/arm/boot/dts/omap36xx.dtsi | 1 - + drivers/opp/of.c | 5 +- + 19 files changed, 760 insertions(+), 641 deletions(-) + create mode 100644 Documentation/devicetree/bindings/opp/opp-v1.yaml + create mode 100644 Documentation/devicetree/bindings/opp/opp-v2-base.yaml + create mode 100644 Documentation/devicetree/bindings/opp/opp-v2.yaml + delete mode 100644 Documentation/devicetree/bindings/opp/opp.txt +Merging thermal/thermal/linux-next (fe6a6de6692e thermal/drivers/int340x/processor_thermal: Fix tcc setting) +$ git merge thermal/thermal/linux-next +Already up to date. +Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) +$ git merge ieee1394/for-next +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 4 ---- + 1 file changed, 4 deletions(-) +Merging dlm/next (62699b3f0a62 fs: dlm: move receive loop into receive handler) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/dlm_internal.h | 2 +- + fs/dlm/lockspace.c | 2 +- + fs/dlm/lowcomms.c | 769 +++++++++++++++++++++++++------------------------- + fs/dlm/rcom.c | 29 +- + 4 files changed, 398 insertions(+), 404 deletions(-) +Merging swiotlb/linux-next (93ebb6828723 s390/pv: fix the forcing of the swiotlb) +$ git merge swiotlb/linux-next +Auto-merging drivers/base/core.c +Merge made by the 'recursive' strategy. + .../bindings/reserved-memory/reserved-memory.txt | 36 ++- + arch/s390/mm/init.c | 2 +- + drivers/base/core.c | 4 + + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +- + drivers/iommu/dma-iommu.c | 12 +- + drivers/of/address.c | 33 ++ + drivers/of/device.c | 3 + + drivers/of/of_private.h | 7 + + drivers/pci/xen-pcifront.c | 2 +- + drivers/xen/swiotlb-xen.c | 8 +- + include/linux/device.h | 4 + + include/linux/swiotlb.h | 57 +++- + kernel/dma/Kconfig | 14 + + kernel/dma/direct.c | 59 +++- + kernel/dma/direct.h | 8 +- + kernel/dma/swiotlb.c | 352 +++++++++++++++------ + 17 files changed, 467 insertions(+), 138 deletions(-) +Merging rdma/for-next (07d0f314ba75 Merge branch 'mlx5_dcs' into rdma.git for-next) +$ git merge rdma/for-next +Auto-merging drivers/infiniband/sw/rxe/rxe_mr.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/infiniband/core/cache.c | 10 +- + drivers/infiniband/core/device.c | 10 +- + drivers/infiniband/hw/efa/efa_verbs.c | 118 +++++++++++++---------- + drivers/infiniband/hw/mlx5/main.c | 10 ++ + drivers/infiniband/hw/mlx5/qp.c | 168 +++++++++++++++++++++++++++++++++ + drivers/infiniband/sw/rxe/rxe.h | 22 ----- + drivers/infiniband/sw/rxe/rxe_comp.c | 4 +- + drivers/infiniband/sw/rxe/rxe_icrc.c | 124 +++++++++++++++++++++++- + drivers/infiniband/sw/rxe/rxe_loc.h | 61 ++---------- + drivers/infiniband/sw/rxe/rxe_mr.c | 23 +---- + drivers/infiniband/sw/rxe/rxe_net.c | 59 ++++++++++-- + drivers/infiniband/sw/rxe/rxe_recv.c | 23 +---- + drivers/infiniband/sw/rxe/rxe_req.c | 13 +-- + drivers/infiniband/sw/rxe/rxe_resp.c | 33 ++----- + drivers/infiniband/sw/rxe/rxe_verbs.c | 11 +-- + drivers/infiniband/sw/siw/siw_qp_tx.c | 44 +++++---- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 11 ++- + drivers/infiniband/ulp/rtrs/rtrs-clt.h | 1 - + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 6 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 19 ++-- + drivers/infiniband/ulp/rtrs/rtrs-srv.h | 2 - + drivers/infiniband/ulp/rtrs/rtrs.c | 23 +++-- + include/linux/mlx5/mlx5_ifc.h | 14 ++- + include/uapi/rdma/mlx5-abi.h | 17 +++- + 25 files changed, 550 insertions(+), 278 deletions(-) +Merging net-next/master (3e12361b6d23 bcm63xx_enet: delete a redundant assignment) +$ git merge net-next/master +Auto-merging net/unix/af_unix.c +Auto-merging net/tipc/socket.c +Auto-merging net/qrtr/qrtr.c +Auto-merging net/netfilter/nf_flow_table_core.c +Auto-merging net/ipv6/ip6_output.c +Auto-merging net/ipv4/ip_tunnel.c +Auto-merging net/core/flow_dissector.c +Auto-merging net/core/devlink.c +Auto-merging net/can/j1939/transport.c +Auto-merging net/bpf/test_run.c +Auto-merging kernel/bpf/verifier.c +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/filter.h +Auto-merging include/linux/bpf_verifier.h +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging drivers/nfc/s3fwrn5/firmware.c +CONFLICT (content): Merge conflict in drivers/nfc/s3fwrn5/firmware.c +Auto-merging drivers/nfc/nfcsim.c +Auto-merging drivers/net/ethernet/sun/niu.c +Auto-merging drivers/net/ethernet/sis/sis900.c +Auto-merging drivers/net/ethernet/pensando/ionic/ionic_txrx.c +Auto-merging drivers/net/ethernet/pensando/ionic/ionic_phc.c +Auto-merging drivers/net/ethernet/pensando/ionic/ionic_lif.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/trap.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/params.c +Auto-merging drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c +Auto-merging drivers/net/ethernet/dec/tulip/winbond-840.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging drivers/net/dsa/mv88e6xxx/chip.c +Auto-merging drivers/net/can/usb/peak_usb/pcan_usb.c +Auto-merging drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c +Auto-merging drivers/bus/mhi/pci_generic.c +CONFLICT (content): Merge conflict in drivers/bus/mhi/pci_generic.c +Auto-merging arch/x86/net/bpf_jit_comp.c +Auto-merging arch/arm64/boot/dts/qcom/sc7280.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sc7180.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mn.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mm.dtsi +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/net/fsl-fec.txt +Resolved 'drivers/bus/mhi/pci_generic.c' using previous resolution. +Resolved 'drivers/nfc/s3fwrn5/firmware.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cbf27d6d3e40] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/net/can/bosch,m_can.yaml | 3 + + Documentation/devicetree/bindings/net/fsl,fec.yaml | 244 +++ + Documentation/devicetree/bindings/net/fsl-fec.txt | 95 -- + .../devicetree/bindings/net/qcom,ipa.yaml | 18 +- + Documentation/driver-api/nfc/nfc-hci.rst | 2 +- + .../ethernet/freescale/dpaa2/index.rst | 1 + + .../ethernet/freescale/dpaa2/switch-driver.rst | 217 +++ + Documentation/networking/devlink/hns3.rst | 25 + + Documentation/networking/devlink/index.rst | 1 + + Documentation/networking/index.rst | 2 + + Documentation/networking/ioam6-sysctl.rst | 26 + + Documentation/networking/ip-sysctl.rst | 17 + + Documentation/networking/mctp.rst | 213 +++ + Documentation/networking/netdevices.rst | 29 + + Documentation/networking/timestamping.rst | 6 +- + MAINTAINERS | 20 + + arch/arm/boot/dts/imx35.dtsi | 2 +- + arch/arm/boot/dts/imx6q-novena.dts | 34 +- + arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 18 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 34 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 34 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 34 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 34 +- + arch/arm/boot/dts/imx7-mba7.dtsi | 1 - + arch/arm/boot/dts/imx7d-mba7.dts | 1 - + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8qxp-ss-conn.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 5 + + arch/arm64/boot/dts/qcom/sc7280.dtsi | 42 + + arch/arm64/include/asm/compat.h | 14 +- + arch/mips/include/asm/compat.h | 24 +- + arch/parisc/include/asm/compat.h | 14 +- + arch/powerpc/include/asm/compat.h | 11 - + arch/s390/include/asm/ccwgroup.h | 2 - + arch/s390/include/asm/compat.h | 14 +- + arch/sparc/include/asm/compat.h | 14 +- + arch/x86/include/asm/compat.h | 14 +- + arch/x86/include/asm/signal.h | 1 + + arch/x86/net/bpf_jit_comp.c | 19 + + drivers/atm/idt77252.c | 2 +- + drivers/bus/mhi/pci_generic.c | 4 + + drivers/char/pcmcia/synclink_cs.c | 23 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 8 +- + drivers/net/Kconfig | 2 + + drivers/net/Makefile | 1 + + drivers/net/appletalk/ipddp.c | 16 +- + drivers/net/bonding/bond_main.c | 74 +- + drivers/net/can/Kconfig | 3 +- + drivers/net/can/at91_can.c | 137 +- + drivers/net/can/dev/netlink.c | 9 +- + drivers/net/can/dev/rx-offload.c | 90 +- + drivers/net/can/flexcan.c | 127 +- + drivers/net/can/janz-ican3.c | 23 +- + drivers/net/can/m_can/m_can.c | 38 +- + drivers/net/can/m_can/m_can.h | 5 +- + drivers/net/can/m_can/m_can_platform.c | 16 +- + drivers/net/can/sja1000/peak_pci.c | 119 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 28 +- + drivers/net/can/ti_hecc.c | 2 + + drivers/net/can/usb/esd_usb2.c | 12 +- + drivers/net/can/usb/etas_es58x/es581_4.c | 5 +- + drivers/net/can/usb/etas_es58x/es58x_core.c | 82 +- + drivers/net/can/usb/etas_es58x/es58x_core.h | 2 +- + drivers/net/can/usb/etas_es58x/es58x_fd.c | 19 +- + drivers/net/can/usb/peak_usb/pcan_usb.c | 228 ++- + drivers/net/dsa/mv88e6xxx/chip.c | 78 +- + drivers/net/dsa/ocelot/felix.c | 34 +- + drivers/net/dsa/ocelot/felix.h | 1 - + drivers/net/dsa/sja1105/sja1105.h | 26 +- + drivers/net/dsa/sja1105/sja1105_devlink.c | 114 +- + drivers/net/dsa/sja1105/sja1105_dynamic_config.c | 6 +- + drivers/net/dsa/sja1105/sja1105_main.c | 1189 +++----------- + drivers/net/dsa/sja1105/sja1105_vl.c | 14 +- + drivers/net/eql.c | 24 +- + drivers/net/ethernet/3com/3c574_cs.c | 2 +- + drivers/net/ethernet/3com/3c59x.c | 4 +- + drivers/net/ethernet/8390/ax88796.c | 2 +- + drivers/net/ethernet/8390/axnet_cs.c | 2 +- + drivers/net/ethernet/8390/pcnet_cs.c | 2 +- + drivers/net/ethernet/actions/owl-emac.c | 6 +- + drivers/net/ethernet/adaptec/starfire.c | 2 +- + drivers/net/ethernet/agere/et131x.c | 2 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +- + drivers/net/ethernet/amd/amd8111e.c | 2 +- + drivers/net/ethernet/amd/au1000_eth.c | 2 +- + drivers/net/ethernet/amd/pcnet32.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_main.c | 2 +- + drivers/net/ethernet/arc/emac_main.c | 2 +- + drivers/net/ethernet/atheros/ag71xx.c | 2 +- + drivers/net/ethernet/atheros/alx/main.c | 2 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 2 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 2 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 2 +- + drivers/net/ethernet/broadcom/b44.c | 2 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 5 +- + drivers/net/ethernet/broadcom/bgmac.c | 2 +- + drivers/net/ethernet/broadcom/bnx2.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 6 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 64 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 11 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 319 +++- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 53 + + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 2 +- + drivers/net/ethernet/broadcom/tg3.c | 2 +- + drivers/net/ethernet/cadence/macb_main.c | 4 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 2 +- + drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 14 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +- + drivers/net/ethernet/cirrus/ep93xx_eth.c | 2 +- + drivers/net/ethernet/davicom/dm9000.c | 2 +- + drivers/net/ethernet/dec/tulip/de4x5.c | 11 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 2 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 2 +- + drivers/net/ethernet/dlink/dl2k.c | 2 +- + drivers/net/ethernet/dlink/sundance.c | 2 +- + drivers/net/ethernet/dnet.c | 2 +- + drivers/net/ethernet/ethoc.c | 2 +- + drivers/net/ethernet/faraday/ftgmac100.c | 2 +- + drivers/net/ethernet/faraday/ftmac100.c | 2 +- + drivers/net/ethernet/fealnx.c | 2 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 2 +- + .../ethernet/freescale/dpaa2/dpaa2-switch-flower.c | 530 ++++++- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 216 ++- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.h | 44 +- + drivers/net/ethernet/freescale/dpaa2/dpsw-cmd.h | 19 + + drivers/net/ethernet/freescale/dpaa2/dpsw.c | 80 + + drivers/net/ethernet/freescale/dpaa2/dpsw.h | 31 + + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 2 +- + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 2 +- + drivers/net/ethernet/freescale/fec.h | 25 + + drivers/net/ethernet/freescale/fec_main.c | 148 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- + drivers/net/ethernet/freescale/gianfar.c | 2 +- + drivers/net/ethernet/freescale/ucc_geth.c | 2 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 6 +- + drivers/net/ethernet/hisilicon/Kconfig | 1 + + drivers/net/ethernet/hisilicon/hisi_femac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- + .../net/ethernet/hisilicon/hns3/hns3pf/Makefile | 2 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c | 154 ++ + .../ethernet/hisilicon/hns3/hns3pf/hclge_devlink.h | 15 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 10 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 2 + + .../net/ethernet/hisilicon/hns3/hns3vf/Makefile | 2 +- + .../hisilicon/hns3/hns3vf/hclgevf_devlink.c | 155 ++ + .../hisilicon/hns3/hns3vf/hclgevf_devlink.h | 15 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 8 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 3 + + drivers/net/ethernet/ibm/emac/core.c | 4 +- + drivers/net/ethernet/ibm/ibmveth.c | 2 +- + drivers/net/ethernet/intel/e100.c | 6 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 2 + + drivers/net/ethernet/intel/e1000e/hw.h | 9 + + drivers/net/ethernet/intel/e1000e/ich8lan.c | 13 +- + drivers/net/ethernet/intel/e1000e/ich8lan.h | 3 + + drivers/net/ethernet/intel/e1000e/netdev.c | 372 +++-- + drivers/net/ethernet/intel/e1000e/ptp.c | 1 + + drivers/net/ethernet/intel/e1000e/regs.h | 1 + + drivers/net/ethernet/intel/i40e/i40e.h | 78 + + drivers/net/ethernet/intel/i40e/i40e_main.c | 30 +- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 756 ++++++++- + drivers/net/ethernet/intel/i40e/i40e_register.h | 29 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 23 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 58 +- + drivers/net/ethernet/intel/ice/ice_main.c | 6 +- + drivers/net/ethernet/intel/igb/e1000_mac.c | 6 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 3 +- + drivers/net/ethernet/intel/igb/igb_main.c | 2 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 2 +- + drivers/net/ethernet/intel/igc/igc.h | 38 +- + drivers/net/ethernet/intel/igc/igc_base.c | 10 +- + drivers/net/ethernet/intel/igc/igc_defines.h | 52 +- + drivers/net/ethernet/intel/igc/igc_ethtool.c | 41 +- + drivers/net/ethernet/intel/igc/igc_main.c | 349 +++- + drivers/net/ethernet/intel/igc/igc_phy.c | 6 +- + drivers/net/ethernet/intel/igc/igc_regs.h | 17 + + drivers/net/ethernet/intel/igc/igc_tsn.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- + drivers/net/ethernet/jme.c | 2 +- + drivers/net/ethernet/korina.c | 2 +- + drivers/net/ethernet/lantiq_etop.c | 2 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- + drivers/net/ethernet/marvell/mvneta.c | 24 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 11 +- + .../net/ethernet/marvell/octeontx2/af/rvu_trace.h | 10 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 2 +- + .../net/ethernet/marvell/prestera/prestera_main.c | 3 +- + .../ethernet/marvell/prestera/prestera_switchdev.c | 12 +- + .../ethernet/marvell/prestera/prestera_switchdev.h | 3 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- + drivers/net/ethernet/marvell/skge.c | 2 +- + drivers/net/ethernet/marvell/sky2.c | 4 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- + drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 64 +- + .../net/ethernet/mellanox/mlx5/core/en/devlink.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 14 +- + .../net/ethernet/mellanox/mlx5/core/en/params.c | 12 + + .../net/ethernet/mellanox/mlx5/core/en/params.h | 6 + + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en/rqt.c | 161 ++ + drivers/net/ethernet/mellanox/mlx5/core/en/rqt.h | 39 + + .../net/ethernet/mellanox/mlx5/core/en/rx_res.c | 73 + + .../net/ethernet/mellanox/mlx5/core/en/rx_res.h | 47 + + drivers/net/ethernet/mellanox/mlx5/core/en/tir.c | 200 +++ + drivers/net/ethernet/mellanox/mlx5/core/en/tir.h | 58 + + drivers/net/ethernet/mellanox/mlx5/core/en/trap.c | 27 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 18 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 53 +- + drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 7 +- + .../net/ethernet/mellanox/mlx5/core/en_common.c | 27 - + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 66 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 45 +- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 753 ++++----- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 37 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 144 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 51 +- + .../ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c | 2 +- + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 2 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 32 +- + drivers/net/ethernet/micrel/ks8851_common.c | 2 +- + drivers/net/ethernet/micrel/ksz884x.c | 2 +- + drivers/net/ethernet/microchip/lan743x_main.c | 2 +- + drivers/net/ethernet/microchip/sparx5/Kconfig | 1 + + .../ethernet/microchip/sparx5/sparx5_switchdev.c | 24 +- + drivers/net/ethernet/mscc/ocelot_net.c | 106 +- + drivers/net/ethernet/natsemi/natsemi.c | 2 +- + drivers/net/ethernet/neterion/s2io.c | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +- + drivers/net/ethernet/netronome/Kconfig | 1 + + drivers/net/ethernet/netronome/nfp/flower/action.c | 35 +- + .../net/ethernet/netronome/nfp/flower/conntrack.c | 620 +++++++- + .../net/ethernet/netronome/nfp/flower/conntrack.h | 26 + + drivers/net/ethernet/netronome/nfp/flower/main.h | 79 +- + drivers/net/ethernet/netronome/nfp/flower/match.c | 333 ++-- + .../net/ethernet/netronome/nfp/flower/metadata.c | 7 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 51 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 20 + + .../net/ethernet/netronome/nfp/nfp_net_common.c | 133 +- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 21 +- + drivers/net/ethernet/nxp/lpc_eth.c | 2 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 +- + drivers/net/ethernet/packetengines/hamachi.c | 63 +- + drivers/net/ethernet/packetengines/yellowfin.c | 2 +- + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 5 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 28 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 3 +- + .../net/ethernet/pensando/ionic/ionic_devlink.c | 14 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 21 + + drivers/net/ethernet/pensando/ionic/ionic_if.h | 5 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 42 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 2 + + drivers/net/ethernet/pensando/ionic/ionic_phc.c | 4 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 27 +- + drivers/net/ethernet/qlogic/qed/qed.h | 15 - + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 6 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 3 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 1 - + drivers/net/ethernet/qlogic/qede/qede.h | 9 - + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 6 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 12 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 2 +- + drivers/net/ethernet/rdc/r6040.c | 2 +- + drivers/net/ethernet/realtek/8139cp.c | 2 +- + drivers/net/ethernet/realtek/8139too.c | 2 +- + drivers/net/ethernet/realtek/r8169_main.c | 2 +- + drivers/net/ethernet/renesas/ravb_main.c | 2 +- + drivers/net/ethernet/renesas/sh_eth.c | 4 +- + drivers/net/ethernet/rocker/rocker.h | 3 +- + drivers/net/ethernet/rocker/rocker_main.c | 9 +- + drivers/net/ethernet/rocker/rocker_ofdpa.c | 19 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 2 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sfc/falcon/efx.c | 2 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 2 +- + drivers/net/ethernet/sgi/meth.c | 2 +- + drivers/net/ethernet/sis/sis190.c | 2 +- + drivers/net/ethernet/sis/sis900.c | 2 +- + drivers/net/ethernet/smsc/epic100.c | 2 +- + drivers/net/ethernet/smsc/smc91c92_cs.c | 2 +- + drivers/net/ethernet/smsc/smsc911x.c | 2 +- + drivers/net/ethernet/smsc/smsc9420.c | 2 +- + drivers/net/ethernet/socionext/netsec.c | 2 +- + drivers/net/ethernet/socionext/sni_ave.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- + drivers/net/ethernet/sun/cassini.c | 2 +- + drivers/net/ethernet/sun/niu.c | 2 +- + drivers/net/ethernet/sun/sungem.c | 2 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 2 +- + drivers/net/ethernet/tehuti/tehuti.c | 18 +- + drivers/net/ethernet/ti/Kconfig | 2 + + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 54 +- + drivers/net/ethernet/ti/cpmac.c | 2 +- + drivers/net/ethernet/ti/cpsw.c | 2 +- + drivers/net/ethernet/ti/cpsw_new.c | 18 +- + drivers/net/ethernet/ti/davinci_emac.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/ethernet/ti/tlan.c | 2 +- + drivers/net/ethernet/toshiba/spider_net.c | 2 +- + drivers/net/ethernet/toshiba/tc35815.c | 2 +- + drivers/net/ethernet/tundra/tsi108_eth.c | 2 +- + drivers/net/ethernet/via/via-rhine.c | 2 +- + drivers/net/ethernet/via/via-velocity.c | 2 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +- + drivers/net/fddi/skfp/skfddi.c | 19 +- + drivers/net/hamradio/baycom_epp.c | 9 +- + drivers/net/hamradio/baycom_par.c | 12 +- + drivers/net/hamradio/baycom_ser_fdx.c | 12 +- + drivers/net/hamradio/baycom_ser_hdx.c | 12 +- + drivers/net/hamradio/bpqether.c | 9 +- + drivers/net/hamradio/dmascc.c | 18 +- + drivers/net/hamradio/hdlcdrv.c | 20 +- + drivers/net/hamradio/scc.c | 13 +- + drivers/net/hamradio/yam.c | 19 +- + drivers/net/hippi/rrunner.c | 11 +- + drivers/net/hippi/rrunner.h | 3 +- + drivers/net/ipa/Makefile | 3 - + drivers/net/ipa/gsi.c | 2 - + drivers/net/ipa/gsi_trans.c | 34 +- + drivers/net/ipa/ipa.h | 2 + + drivers/net/ipa/ipa_cmd.c | 51 +- + drivers/net/ipa/ipa_cmd.h | 22 +- + drivers/net/ipa/ipa_data-v4.11.c | 15 +- + drivers/net/ipa/ipa_data-v4.5.c | 2 + + drivers/net/ipa/ipa_data-v4.9.c | 2 + + drivers/net/ipa/ipa_endpoint.c | 26 +- + drivers/net/ipa/ipa_interrupt.c | 73 +- + drivers/net/ipa/ipa_interrupt.h | 8 +- + drivers/net/ipa/ipa_main.c | 96 +- + drivers/net/ipa/ipa_modem.c | 26 +- + drivers/net/ipa/ipa_modem.h | 4 - + drivers/net/ipa/ipa_qmi.c | 6 +- + drivers/net/ipa/ipa_qmi.h | 19 + + drivers/net/ipa/ipa_reg.h | 12 +- + drivers/net/ipa/ipa_resource.c | 3 +- + drivers/net/ipa/ipa_smp2p.c | 5 + + drivers/net/ipa/ipa_table.c | 40 +- + drivers/net/ipa/ipa_table.h | 16 - + drivers/net/ipa/ipa_uc.c | 52 +- + drivers/net/ipa/ipa_uc.h | 22 +- + drivers/net/ipvlan/ipvlan_main.c | 1 + + drivers/net/macvlan.c | 8 +- + drivers/net/mctp/Kconfig | 8 + + drivers/net/mctp/Makefile | 0 + drivers/net/mhi/net.c | 15 +- + drivers/net/mhi/proto_mbim.c | 8 +- + drivers/net/netdevsim/bus.c | 17 +- + drivers/net/netdevsim/netdev.c | 6 +- + drivers/net/netdevsim/netdevsim.h | 1 + + drivers/net/phy/Kconfig | 6 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/at803x.c | 18 +- + drivers/net/phy/dp83822.c | 8 +- + drivers/net/phy/intel-xway.c | 76 + + drivers/net/phy/marvell10g.c | 89 ++ + drivers/net/phy/mxl-gpy.c | 727 +++++++++ + drivers/net/phy/phy.c | 4 +- + drivers/net/phy/phy_device.c | 14 + + drivers/net/phy/phylink.c | 21 +- + drivers/net/plip/plip.c | 12 +- + drivers/net/ppp/ppp_generic.c | 6 +- + drivers/net/sb1000.c | 20 +- + drivers/net/slip/slip.c | 13 +- + drivers/net/usb/asix_devices.c | 12 +- + drivers/net/usb/ax88172a.c | 2 +- + drivers/net/usb/ax88179_178a.c | 2 +- + drivers/net/usb/cdc-phonet.c | 5 +- + drivers/net/usb/dm9601.c | 2 +- + drivers/net/usb/hso.c | 6 +- + drivers/net/usb/lan78xx.c | 2 +- + drivers/net/usb/mcs7830.c | 2 +- + drivers/net/usb/pegasus.c | 5 +- + drivers/net/usb/r8152.c | 2 +- + drivers/net/usb/rtl8150.c | 5 +- + drivers/net/usb/smsc75xx.c | 2 +- + drivers/net/usb/smsc95xx.c | 2 +- + drivers/net/usb/sr9700.c | 2 +- + drivers/net/usb/sr9800.c | 2 +- + drivers/net/veth.c | 307 +++- + drivers/net/vmxnet3/Makefile | 2 +- + drivers/net/vmxnet3/upt1_defs.h | 2 +- + drivers/net/vmxnet3/vmxnet3_defs.h | 50 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 221 ++- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 20 + + drivers/net/vmxnet3/vmxnet3_int.h | 22 +- + drivers/net/wan/c101.c | 33 +- + drivers/net/wan/cosa.c | 15 +- + drivers/net/wan/farsync.c | 123 +- + drivers/net/wan/fsl_ucc_hdlc.c | 19 +- + drivers/net/wan/hdlc.c | 9 +- + drivers/net/wan/hdlc_cisco.c | 14 +- + drivers/net/wan/hdlc_fr.c | 40 +- + drivers/net/wan/hdlc_ppp.c | 8 +- + drivers/net/wan/hdlc_raw.c | 14 +- + drivers/net/wan/hdlc_raw_eth.c | 14 +- + drivers/net/wan/hdlc_x25.c | 16 +- + drivers/net/wan/hostess_sv11.c | 7 +- + drivers/net/wan/ixp4xx_hss.c | 22 +- + drivers/net/wan/lmc/lmc.h | 2 +- + drivers/net/wan/lmc/lmc_main.c | 33 +- + drivers/net/wan/lmc/lmc_proto.c | 7 - + drivers/net/wan/lmc/lmc_proto.h | 1 - + drivers/net/wan/n2.c | 32 +- + drivers/net/wan/pc300too.c | 44 +- + drivers/net/wan/pci200syn.c | 32 +- + drivers/net/wan/sbni.c | 15 +- + drivers/net/wan/sealevel.c | 10 +- + drivers/net/wan/wanxl.c | 21 +- + drivers/net/wireless/cisco/airo.c | 15 +- + drivers/net/wireless/intersil/hostap/hostap.h | 3 +- + .../net/wireless/intersil/hostap/hostap_ioctl.c | 30 +- + drivers/net/wireless/intersil/hostap/hostap_main.c | 3 + + drivers/net/wwan/iosm/iosm_ipc_pcie.c | 19 +- + drivers/nfc/fdp/fdp.c | 38 +- + drivers/nfc/fdp/fdp.h | 4 +- + drivers/nfc/fdp/i2c.c | 8 +- + drivers/nfc/mei_phy.c | 4 +- + drivers/nfc/mei_phy.h | 2 +- + drivers/nfc/microread/i2c.c | 4 +- + drivers/nfc/microread/microread.c | 14 +- + drivers/nfc/microread/microread.h | 6 +- + drivers/nfc/nfcmrvl/fw_dnld.c | 16 +- + drivers/nfc/nfcmrvl/i2c.c | 4 +- + drivers/nfc/nfcmrvl/main.c | 6 +- + drivers/nfc/nfcmrvl/nfcmrvl.h | 6 +- + drivers/nfc/nfcmrvl/spi.c | 6 +- + drivers/nfc/nfcmrvl/uart.c | 4 +- + drivers/nfc/nfcmrvl/usb.c | 2 +- + drivers/nfc/nfcsim.c | 4 +- + drivers/nfc/nxp-nci/core.c | 2 +- + drivers/nfc/pn533/pn533.c | 2 +- + drivers/nfc/pn544/i2c.c | 2 +- + drivers/nfc/pn544/pn544.c | 13 +- + drivers/nfc/pn544/pn544.h | 7 +- + drivers/nfc/port100.c | 47 +- + drivers/nfc/s3fwrn5/core.c | 7 +- + drivers/nfc/s3fwrn5/firmware.c | 12 +- + drivers/nfc/s3fwrn5/nci.c | 8 +- + drivers/nfc/s3fwrn5/nci.h | 2 +- + drivers/nfc/st-nci/core.c | 5 +- + drivers/nfc/st-nci/i2c.c | 2 +- + drivers/nfc/st-nci/ndlc.c | 6 +- + drivers/nfc/st-nci/ndlc.h | 8 +- + drivers/nfc/st-nci/spi.c | 2 +- + drivers/nfc/st-nci/vendor_cmds.c | 2 +- + drivers/nfc/st21nfca/core.c | 6 +- + drivers/nfc/st21nfca/i2c.c | 6 +- + drivers/nfc/st21nfca/st21nfca.h | 4 +- + drivers/nfc/st21nfca/vendor_cmds.c | 2 +- + drivers/nfc/st95hf/core.c | 2 +- + drivers/nfc/trf7970a.c | 19 +- + drivers/nfc/virtual_ncidev.c | 4 +- + drivers/s390/cio/ccwgroup.c | 22 - + drivers/s390/net/Kconfig | 9 - + drivers/s390/net/qeth_core.h | 51 +- + drivers/s390/net/qeth_core_main.c | 189 +-- + drivers/s390/net/qeth_core_mpc.c | 3 - + drivers/s390/net/qeth_core_mpc.h | 23 +- + drivers/s390/net/qeth_core_sys.c | 5 - + drivers/s390/net/qeth_ethtool.c | 7 - + drivers/s390/net/qeth_l2_main.c | 175 +- + drivers/s390/net/qeth_l3_main.c | 19 +- + drivers/staging/octeon/ethernet.c | 12 +- + drivers/staging/rtl8188eu/include/osdep_intf.h | 2 + + drivers/staging/rtl8188eu/include/rtw_android.h | 3 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 3 - + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 1 + + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 14 +- + drivers/staging/rtl8723bs/include/osdep_intf.h | 2 + + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 18 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 1 + + drivers/staging/wlan-ng/p80211netdev.c | 76 +- + drivers/tty/synclink_gt.c | 19 +- + include/asm-generic/compat.h | 17 + + include/linux/bitops.h | 50 + + include/linux/bpf.h | 100 +- + include/linux/bpf_verifier.h | 19 +- + include/linux/btf.h | 1 + + include/linux/can/bittiming.h | 4 +- + include/linux/can/platform/flexcan.h | 23 + + include/linux/can/rx-offload.h | 8 +- + include/linux/compat.h | 32 +- + include/linux/dsa/8021q.h | 44 +- + include/linux/dsa/sja1105.h | 1 - + include/linux/ethtool.h | 4 - + include/linux/filter.h | 3 +- + include/linux/hdlc.h | 4 +- + include/linux/hdlcdrv.h | 2 +- + include/linux/if_bridge.h | 69 +- + include/linux/inetdevice.h | 9 + + include/linux/ioam6.h | 13 + + include/linux/ioam6_genl.h | 13 + + include/linux/ioam6_iptunnel.h | 13 + + include/linux/ipv6.h | 3 + + include/linux/mhi.h | 2 + + include/linux/mlx5/mlx5_ifc.h | 3 +- + include/linux/netdevice.h | 46 +- + include/linux/phy.h | 1 + + include/linux/skbuff.h | 16 +- + include/linux/socket.h | 6 +- + include/linux/typecheck.h | 9 + + include/net/af_unix.h | 12 + + include/net/devlink.h | 4 +- + include/net/dsa.h | 60 +- + include/net/dst.h | 2 + + include/net/ioam6.h | 67 + + include/net/ip.h | 22 +- + include/net/ip6_route.h | 5 +- + include/net/ip_tunnels.h | 3 +- + include/net/mctp.h | 231 +++ + include/net/mctpdevice.h | 36 + + include/net/net_namespace.h | 4 + + include/net/netlink.h | 2 +- + include/net/netns/ipv4.h | 1 - + include/net/netns/ipv6.h | 3 + + include/net/netns/mctp.h | 36 + + include/net/nfc/digital.h | 4 +- + include/net/nfc/hci.h | 6 +- + include/net/nfc/nci_core.h | 12 +- + include/net/nfc/nfc.h | 12 +- + include/net/pkt_cls.h | 22 +- + include/net/sock.h | 9 + + include/net/switchdev.h | 62 + + include/net/xdp.h | 5 + + include/trace/events/qdisc.h | 2 + + include/uapi/linux/bpf.h | 85 +- + include/uapi/linux/if_arp.h | 1 + + include/uapi/linux/if_bridge.h | 18 + + include/uapi/linux/if_ether.h | 3 + + include/uapi/linux/if_link.h | 10 + + include/uapi/linux/in6.h | 1 + + include/uapi/linux/ioam6.h | 133 ++ + include/uapi/linux/ioam6_genl.h | 52 + + include/uapi/linux/ioam6_iptunnel.h | 20 + + include/uapi/linux/ipv6.h | 3 + + include/uapi/linux/lwtunnel.h | 1 + + include/uapi/linux/mctp.h | 36 + + include/uapi/linux/openvswitch.h | 8 + + include/uapi/linux/tc_act/tc_skbmod.h | 1 + + kernel/bpf/Kconfig | 2 +- + kernel/bpf/arraymap.c | 21 + + kernel/bpf/btf.c | 77 +- + kernel/bpf/cpumap.c | 116 +- + kernel/bpf/devmap.c | 49 +- + kernel/bpf/hashtab.c | 105 +- + kernel/bpf/helpers.c | 340 +++- + kernel/bpf/local_storage.c | 4 +- + kernel/bpf/map_in_map.c | 8 + + kernel/bpf/syscall.c | 53 +- + kernel/bpf/trampoline.c | 12 +- + kernel/bpf/verifier.c | 379 ++++- + kernel/trace/bpf_trace.c | 33 +- + mm/memcontrol.c | 2 +- + net/8021q/vlan.c | 2 +- + net/8021q/vlan_dev.c | 6 +- + net/Kconfig | 1 + + net/Makefile | 1 + + net/appletalk/ddp.c | 4 +- + net/bpf/test_run.c | 107 +- + net/bridge/br.c | 11 +- + net/bridge/br_device.c | 16 +- + net/bridge/br_fdb.c | 28 +- + net/bridge/br_forward.c | 16 +- + net/bridge/br_if.c | 11 +- + net/bridge/br_input.c | 17 +- + net/bridge/br_ioctl.c | 52 +- + net/bridge/br_mdb.c | 109 +- + net/bridge/br_multicast.c | 1670 +++++++++++++------- + net/bridge/br_multicast_eht.c | 92 +- + net/bridge/br_netlink.c | 41 +- + net/bridge/br_private.h | 456 ++++-- + net/bridge/br_private_mcast_eht.h | 3 +- + net/bridge/br_switchdev.c | 264 +++- + net/bridge/br_sysfs_br.c | 38 +- + net/bridge/br_sysfs_if.c | 2 +- + net/bridge/br_vlan.c | 133 +- + net/bridge/br_vlan_options.c | 216 +++ + net/can/j1939/socket.c | 2 +- + net/can/j1939/transport.c | 42 +- + net/core/Makefile | 2 - + net/core/dev.c | 146 +- + net/core/dev_ioctl.c | 257 +-- + net/core/devlink.c | 19 +- + net/core/fib_rules.c | 4 +- + net/core/filter.c | 10 +- + net/core/flow_dissector.c | 12 +- + net/core/lwtunnel.c | 2 + + net/core/rtnetlink.c | 15 +- + net/core/scm.c | 4 +- + net/core/selftests.c | 12 + + net/core/skbuff.c | 27 +- + net/core/sock.c | 1 + + net/core/sock_map.c | 22 +- + net/dccp/proto.c | 2 +- + net/dsa/Kconfig | 12 - + net/dsa/Makefile | 3 +- + net/dsa/dsa2.c | 4 + + net/dsa/dsa_priv.h | 106 +- + net/dsa/master.c | 6 +- + net/dsa/port.c | 201 ++- + net/dsa/slave.c | 211 ++- + net/dsa/switch.c | 30 +- + net/dsa/tag_8021q.c | 607 ++++--- + net/dsa/tag_brcm.c | 4 +- + net/dsa/tag_dsa.c | 67 +- + net/dsa/tag_hellcreek.c | 2 +- + net/dsa/tag_ksz.c | 2 +- + net/dsa/tag_lan9303.c | 3 +- + net/dsa/tag_mtk.c | 2 +- + net/dsa/tag_ocelot.c | 2 +- + net/dsa/tag_ocelot_8021q.c | 6 +- + net/dsa/tag_rtl4_a.c | 2 +- + net/dsa/tag_sja1105.c | 149 +- + net/dsa/tag_xrs700x.c | 2 +- + net/ethernet/eth.c | 6 +- + net/ethtool/ioctl.c | 139 +- + net/ieee802154/socket.c | 4 +- + net/ipv4/af_inet.c | 6 +- + net/ipv4/devinet.c | 16 +- + net/ipv4/fib_trie.c | 4 +- + net/ipv4/igmp.c | 2 + + net/ipv4/ip_gre.c | 2 +- + net/ipv4/ip_output.c | 5 +- + net/ipv4/ip_tunnel.c | 9 +- + net/ipv4/ip_vti.c | 2 +- + net/ipv4/ipip.c | 2 +- + net/ipv4/route.c | 21 +- + net/ipv4/tcp.c | 4 +- + net/ipv4/tcp_fastopen.c | 17 +- + net/ipv4/tcp_input.c | 54 +- + net/ipv4/tcp_ipv4.c | 1 - + net/ipv4/tcp_recovery.c | 3 +- + net/ipv4/udp_bpf.c | 1 - + net/ipv6/Kconfig | 11 + + net/ipv6/Makefile | 3 +- + net/ipv6/addrconf.c | 44 +- + net/ipv6/af_inet6.c | 10 + + net/ipv6/exthdrs.c | 61 + + net/ipv6/ioam6.c | 910 +++++++++++ + net/ipv6/ioam6_iptunnel.c | 274 ++++ + net/ipv6/ip6_fib.c | 4 +- + net/ipv6/ip6_gre.c | 17 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/ip6_tunnel.c | 21 +- + net/ipv6/ip6_vti.c | 21 +- + net/ipv6/route.c | 22 +- + net/ipv6/sit.c | 40 +- + net/ipv6/sysctl_net_ipv6.c | 19 + + net/mctp/Kconfig | 13 + + net/mctp/Makefile | 3 + + net/mctp/af_mctp.c | 396 +++++ + net/mctp/device.c | 423 +++++ + net/mctp/neigh.c | 342 ++++ + net/mctp/route.c | 1099 +++++++++++++ + net/mpls/af_mpls.c | 2 +- + net/netfilter/nf_flow_table_core.c | 2 +- + net/netlabel/netlabel_cipso_v4.c | 8 +- + net/netlink/af_netlink.c | 4 +- + net/netlink/genetlink.c | 9 +- + net/nfc/core.c | 2 +- + net/nfc/digital_core.c | 4 +- + net/nfc/hci/core.c | 6 +- + net/nfc/hci/llc.c | 2 +- + net/nfc/hci/llc.h | 6 +- + net/nfc/hci/llc_nop.c | 2 +- + net/nfc/hci/llc_shdlc.c | 2 +- + net/nfc/nci/core.c | 25 +- + net/nfc/netlink.c | 2 +- + net/openvswitch/actions.c | 8 +- + net/openvswitch/datapath.c | 76 +- + net/openvswitch/datapath.h | 20 + + net/phonet/pn_dev.c | 6 +- + net/qrtr/qrtr.c | 4 +- + net/sched/act_api.c | 12 +- + net/sched/act_skbmod.c | 44 +- + net/sched/cls_api.c | 57 +- + net/sched/sch_api.c | 10 +- + net/sched/sch_atm.c | 2 +- + net/sched/sch_cake.c | 2 +- + net/sched/sch_cbq.c | 2 +- + net/sched/sch_drr.c | 2 +- + net/sched/sch_dsmark.c | 2 +- + net/sched/sch_ets.c | 2 +- + net/sched/sch_fq_codel.c | 2 +- + net/sched/sch_fq_pie.c | 2 +- + net/sched/sch_hfsc.c | 2 +- + net/sched/sch_htb.c | 2 +- + net/sched/sch_multiq.c | 2 +- + net/sched/sch_prio.c | 2 +- + net/sched/sch_qfq.c | 2 +- + net/sched/sch_sfb.c | 2 +- + net/sched/sch_sfq.c | 2 +- + net/socket.c | 347 +--- + net/switchdev/switchdev.c | 260 +++ + net/tipc/socket.c | 34 +- + net/unix/Makefile | 1 + + net/unix/af_unix.c | 85 +- + net/unix/unix_bpf.c | 122 ++ + samples/bpf/xdp_redirect_cpu_user.c | 22 +- + scripts/bpf_doc.py | 2 + + security/selinux/hooks.c | 4 +- + security/selinux/include/classmap.h | 4 +- + tools/include/uapi/linux/bpf.h | 85 +- + tools/lib/bpf/libbpf.c | 104 +- + .../selftests/bpf/prog_tests/get_func_ip_test.c | 53 + + .../selftests/bpf/prog_tests/sockmap_listen.c | 406 ++++- + tools/testing/selftests/bpf/prog_tests/timer.c | 55 + + tools/testing/selftests/bpf/prog_tests/timer_mim.c | 69 + + .../bpf/prog_tests/xdp_context_test_run.c | 105 ++ + .../selftests/bpf/prog_tests/xdp_cpumap_attach.c | 43 +- + .../selftests/bpf/prog_tests/xdp_devmap_attach.c | 39 +- + .../testing/selftests/bpf/progs/get_func_ip_test.c | 73 + + tools/testing/selftests/bpf/progs/test_tc_tunnel.c | 1 - + .../bpf/progs/test_xdp_context_test_run.c | 20 + + tools/testing/selftests/bpf/progs/timer.c | 297 ++++ + tools/testing/selftests/bpf/progs/timer_mim.c | 88 ++ + .../testing/selftests/bpf/progs/timer_mim_reject.c | 74 + + tools/testing/selftests/net/Makefile | 2 + + tools/testing/selftests/net/config | 1 + + tools/testing/selftests/net/ioam6.sh | 297 ++++ + tools/testing/selftests/net/ioam6_parser.c | 402 +++++ + tools/testing/selftests/net/veth.sh | 183 ++- + .../tc-testing/tc-tests/actions/skbmod.json | 24 + + 745 files changed, 23562 insertions(+), 7993 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/fsl,fec.yaml + delete mode 100644 Documentation/devicetree/bindings/net/fsl-fec.txt + create mode 100644 Documentation/networking/device_drivers/ethernet/freescale/dpaa2/switch-driver.rst + create mode 100644 Documentation/networking/devlink/hns3.rst + create mode 100644 Documentation/networking/ioam6-sysctl.rst + create mode 100644 Documentation/networking/mctp.rst + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/rqt.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/rqt.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tir.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tir.h + create mode 100644 drivers/net/mctp/Kconfig + create mode 100644 drivers/net/mctp/Makefile + create mode 100644 drivers/net/phy/mxl-gpy.c + create mode 100644 include/linux/can/platform/flexcan.h + create mode 100644 include/linux/ioam6.h + create mode 100644 include/linux/ioam6_genl.h + create mode 100644 include/linux/ioam6_iptunnel.h + create mode 100644 include/net/ioam6.h + create mode 100644 include/net/mctp.h + create mode 100644 include/net/mctpdevice.h + create mode 100644 include/net/netns/mctp.h + create mode 100644 include/uapi/linux/ioam6.h + create mode 100644 include/uapi/linux/ioam6_genl.h + create mode 100644 include/uapi/linux/ioam6_iptunnel.h + create mode 100644 include/uapi/linux/mctp.h + create mode 100644 net/ipv6/ioam6.c + create mode 100644 net/ipv6/ioam6_iptunnel.c + create mode 100644 net/mctp/Kconfig + create mode 100644 net/mctp/Makefile + create mode 100644 net/mctp/af_mctp.c + create mode 100644 net/mctp/device.c + create mode 100644 net/mctp/neigh.c + create mode 100644 net/mctp/route.c + create mode 100644 net/unix/unix_bpf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/timer.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/timer_mim.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c + create mode 100644 tools/testing/selftests/bpf/progs/get_func_ip_test.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c + create mode 100644 tools/testing/selftests/bpf/progs/timer.c + create mode 100644 tools/testing/selftests/bpf/progs/timer_mim.c + create mode 100644 tools/testing/selftests/bpf/progs/timer_mim_reject.c + create mode 100644 tools/testing/selftests/net/ioam6.sh + create mode 100644 tools/testing/selftests/net/ioam6_parser.c +Merging bpf-next/for-next (f309b4ba989d Merge branch 'libbpf: rename btf__get_from_id() and btf__load() APIs, support split BTF') +$ git merge bpf-next/for-next +Auto-merging tools/lib/bpf/btf.c +Auto-merging net/ipv4/tcp_ipv4.c +Auto-merging net/bpf/test_run.c +Auto-merging include/net/tcp.h +Merge made by the 'recursive' strategy. + Documentation/networking/filter.rst | 23 +- + include/linux/bpf-cgroup.h | 54 - + include/linux/bpf.h | 62 +- + include/linux/sched.h | 3 + + include/net/inet_hashtables.h | 6 + + include/net/tcp.h | 1 - + kernel/bpf/bpf_iter.c | 22 + + kernel/bpf/btf.c | 5 + + kernel/bpf/helpers.c | 16 +- + kernel/bpf/local_storage.c | 16 +- + kernel/fork.c | 1 + + kernel/trace/bpf_trace.c | 9 +- + lib/test_bpf.c | 13 +- + net/bpf/test_run.c | 23 +- + net/core/filter.c | 34 + + net/ipv4/tcp_ipv4.c | 410 ++++-- + samples/bpf/.gitignore | 2 + + samples/bpf/test_override_return.sh | 1 + + samples/bpf/tracex7_user.c | 5 + + tools/bpf/bpftool/btf.c | 8 +- + tools/bpf/bpftool/btf_dumper.c | 6 +- + tools/bpf/bpftool/map.c | 14 +- + tools/bpf/bpftool/prog.c | 29 +- + tools/bpf/resolve_btfids/main.c | 13 +- + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/btf.c | 33 +- + tools/lib/bpf/btf.h | 25 +- + tools/lib/bpf/btf_dump.c | 871 +++++++++++- + tools/lib/bpf/libbpf.c | 1459 ++------------------ + tools/lib/bpf/libbpf.h | 25 +- + tools/lib/bpf/libbpf.map | 6 + + tools/lib/bpf/libbpf_internal.h | 81 +- + tools/lib/bpf/relo_core.c | 1295 +++++++++++++++++ + tools/lib/bpf/relo_core.h | 100 ++ + tools/perf/util/bpf-event.c | 11 +- + tools/perf/util/bpf_counter.c | 12 +- + tools/testing/selftests/bpf/README.rst | 7 + + tools/testing/selftests/bpf/netcnt_common.h | 38 +- + tools/testing/selftests/bpf/network_helpers.c | 85 +- + tools/testing/selftests/bpf/network_helpers.h | 4 + + .../selftests/bpf/prog_tests/bpf_iter_setsockopt.c | 226 +++ + tools/testing/selftests/bpf/prog_tests/btf.c | 4 +- + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 615 +++++++++ + .../selftests/bpf/prog_tests/core_autosize.c | 22 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 25 +- + .../selftests/bpf/prog_tests/get_func_ip_test.c | 2 + + tools/testing/selftests/bpf/prog_tests/pinning.c | 9 + + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 23 +- + .../selftests/bpf/progs/bpf_iter_setsockopt.c | 72 + + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 6 + + .../testing/selftests/bpf/progs/get_func_ip_test.c | 11 + + tools/testing/selftests/bpf/progs/netcnt_prog.c | 8 +- + .../selftests/bpf/progs/test_map_in_map_invalid.c | 26 + + tools/testing/selftests/bpf/test_maps.c | 72 +- + tools/testing/selftests/bpf/test_netcnt.c | 4 +- + tools/testing/selftests/bpf/test_progs.h | 12 + + tools/testing/selftests/bpf/test_tc_tunnel.sh | 2 +- + 57 files changed, 4236 insertions(+), 1733 deletions(-) + create mode 100644 tools/lib/bpf/relo_core.c + create mode 100644 tools/lib/bpf/relo_core.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_iter_setsockopt.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_setsockopt.c + create mode 100644 tools/testing/selftests/bpf/progs/test_map_in_map_invalid.c +Merging ipsec-next/master (2d151d39073a xfrm: Add possibility to set the default to block if we have no policy) +$ git merge ipsec-next/master +Auto-merging net/xfrm/xfrm_user.c +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging include/net/netns/xfrm.h +Merge made by the 'recursive' strategy. + include/net/netns/xfrm.h | 7 +++++++ + include/net/xfrm.h | 36 ++++++++++++++++++++++++++------ + include/uapi/linux/xfrm.h | 10 +++++++++ + net/ipv4/esp4.c | 4 +--- + net/xfrm/xfrm_policy.c | 16 +++++++++++++++ + net/xfrm/xfrm_user.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 116 insertions(+), 9 deletions(-) +Merging mlx5-next/mlx5-next (616d57693455 IB/mlx5: Rename is_apu_thread_cq function to is_apu_cq) +$ git merge mlx5-next/mlx5-next +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/mlx5/cq.c | 2 +- + drivers/infiniband/hw/mlx5/devx.c | 7 +++---- + drivers/net/ethernet/mellanox/mlx5/core/cq.c | 3 ++- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c | 2 +- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 +- + include/linux/mlx5/mlx5_ifc.h | 5 ++--- + 8 files changed, 12 insertions(+), 13 deletions(-) +Merging netfilter-next/master (facfbf4f0b5a Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue) +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (facfbf4f0b5a Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (b4f8e2d9b5f8 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/pci.c | 9 +-------- + drivers/net/wireless/ath/ath11k/dp_rx.c | 5 ----- + drivers/net/wireless/ath/ath11k/pci.c | 10 ++-------- + drivers/net/wireless/ath/ath5k/pci.c | 2 +- + drivers/net/wireless/ath/ath9k/pci.c | 8 +------- + 5 files changed, 5 insertions(+), 29 deletions(-) +Merging bluetooth/master (f4292e2faf52 Bluetooth: btusb: Make the CSR clone chip force-suspend workaround more generic) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btmrvl_sdio.c | 29 +++++----- + drivers/bluetooth/btrsi.c | 2 +- + drivers/bluetooth/btrtl.c | 10 +++- + drivers/bluetooth/btusb.c | 105 ++++++++++++++++++++++------------- + drivers/bluetooth/hci_h5.c | 116 +++++++++++++++++++++++++++++++-------- + drivers/bluetooth/hci_serdev.c | 3 + + drivers/bluetooth/hci_uart.h | 7 ++- + include/net/bluetooth/hci_core.h | 1 + + net/6lowpan/debugfs.c | 3 +- + net/bluetooth/hci_core.c | 17 +++--- + net/bluetooth/hci_event.c | 15 +++++ + net/bluetooth/hci_sock.c | 20 ++++--- + net/bluetooth/hci_sysfs.c | 2 +- + net/bluetooth/mgmt.c | 2 +- + net/bluetooth/sco.c | 5 ++ + 15 files changed, 236 insertions(+), 101 deletions(-) +Merging mac80211-next/master (0d6835ffe50c net: phy: Fix data type in DP83822 dp8382x_disable_wol()) +$ git merge mac80211-next/master +Already up to date. +Merging mtd/mtd/next (ff44b90b325d dt_bindings: mtd: partitions: redboot: convert to YAML) +$ git merge mtd/mtd/next +Removing Documentation/devicetree/bindings/mtd/partitions/redboot-fis.txt +Merge made by the 'recursive' strategy. + .../bindings/mtd/partitions/redboot-fis.txt | 27 -------------- + .../bindings/mtd/partitions/redboot-fis.yaml | 42 ++++++++++++++++++++++ + 2 files changed, 42 insertions(+), 27 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mtd/partitions/redboot-fis.txt + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/redboot-fis.yaml +Merging nand/nand/next (c5b9ee9c361f mtd: rawnand: Fix a couple of spelling mistakes in Kconfig) +$ git merge nand/nand/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/gpmc-nand.txt | 2 +- + drivers/mtd/nand/raw/Kconfig | 4 +-- + drivers/mtd/nand/raw/nand_bbt.c | 33 ++++++++++++++++++++++ + drivers/mtd/nand/spi/core.c | 2 +- + 4 files changed, 37 insertions(+), 4 deletions(-) +Merging spi-nor/spi-nor/next (2734d6c1b1a0 Linux 5.14-rc2) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (821720b9f34e crypto: x86/aes-ni - add missing error checks in XTS code) +$ git merge crypto/master +Merge made by the 'recursive' strategy. + arch/arm/crypto/curve25519-glue.c | 8 ++-- + arch/x86/crypto/aesni-intel_glue.c | 5 +++ + crypto/Kconfig | 2 +- + drivers/char/hw_random/amd-rng.c | 8 ++-- + drivers/char/hw_random/geode-rng.c | 8 ++-- + drivers/char/hw_random/intel-rng.c | 8 ++-- + drivers/char/hw_random/via-rng.c | 8 ++-- + drivers/crypto/mxs-dcp.c | 81 +++++++++++++++++++++----------------- + lib/crypto/blake2s.c | 8 ++-- + lib/crypto/chacha20poly1305.c | 8 ++-- + lib/crypto/curve25519.c | 8 ++-- + 11 files changed, 82 insertions(+), 70 deletions(-) +Merging drm/drm-next (988dbd25b8ae Merge tag 'du-next-20210728' of git://linuxtv.org/pinchartl/media into drm-next) +$ git merge drm/drm-next +Removing drivers/gpu/drm/vmwgfx/device_include/vmware_pack_end.h +Removing drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h +Removing drivers/gpu/drm/vmwgfx/device_include/svga_types.h +Removing drivers/gpu/drm/vmwgfx/device_include/svga3d_caps.h +Removing drivers/gpu/drm/vmwgfx/device_include/includeCheck.h +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Removing drivers/gpu/drm/bochs/bochs_mm.c +Removing drivers/gpu/drm/bochs/bochs_kms.c +Removing drivers/gpu/drm/bochs/bochs_hw.c +Removing drivers/gpu/drm/bochs/bochs_drv.c +Removing drivers/gpu/drm/bochs/bochs.h +Removing drivers/gpu/drm/bochs/Makefile +Removing drivers/gpu/drm/bochs/Kconfig +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/firmware/Makefile +CONFLICT (content): Merge conflict in drivers/firmware/Makefile +Auto-merging drivers/firmware/Kconfig +Auto-merging arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +Auto-merging MAINTAINERS +Resolved 'drivers/firmware/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 336ae9753389] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-dmabuf-buffers | 24 + + .../bindings/display/bridge/simple-bridge.yaml | 3 + + .../bindings/display/bridge/ti,sn65dsi86.yaml | 21 +- + .../devicetree/bindings/display/dp-aux-bus.yaml | 37 + + .../bindings/display/panel/innolux,ej030na.yaml | 62 + + .../bindings/display/panel/panel-simple.yaml | 10 + + .../bindings/display/panel/samsung,lms380kf01.yaml | 99 + + .../bindings/display/panel/samsung,lms397kf04.yaml | 18 +- + Documentation/driver-api/dma-buf.rst | 13 + + Documentation/gpu/drm-uapi.rst | 13 + + Documentation/gpu/vkms.rst | 38 +- + MAINTAINERS | 19 +- + arch/arm/include/asm/efi.h | 5 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 30 +- + arch/arm64/include/asm/efi.h | 5 +- + arch/riscv/include/asm/efi.h | 5 +- + arch/x86/Kconfig | 26 - + arch/x86/kernel/Makefile | 3 - + drivers/dma-buf/Kconfig | 11 + + drivers/dma-buf/Makefile | 1 + + drivers/dma-buf/dma-buf-sysfs-stats.c | 205 ++ + drivers/dma-buf/dma-buf-sysfs-stats.h | 35 + + drivers/dma-buf/dma-buf.c | 26 +- + drivers/dma-buf/dma-fence-chain.c | 2 +- + drivers/dma-buf/dma-resv.c | 33 +- + drivers/dma-buf/st-dma-fence-chain.c | 16 +- + drivers/dma-buf/udmabuf.c | 59 +- + drivers/firmware/Kconfig | 32 + + drivers/firmware/Makefile | 2 + + drivers/firmware/efi/Makefile | 2 + + drivers/firmware/efi/efi-init.c | 90 - + .../kernel => drivers/firmware/efi}/sysfb_efi.c | 80 +- + {arch/x86/kernel => drivers/firmware}/sysfb.c | 37 +- + .../kernel => drivers/firmware}/sysfb_simplefb.c | 33 +- + drivers/gpu/drm/Kconfig | 7 +- + drivers/gpu/drm/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 66 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 65 - + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 118 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 5 - + drivers/gpu/drm/arm/malidp_drv.c | 4 - + drivers/gpu/drm/armada/armada_drv.c | 4 +- + drivers/gpu/drm/armada/armada_overlay.c | 2 - + drivers/gpu/drm/armada/armada_plane.c | 29 - + drivers/gpu/drm/armada/armada_plane.h | 2 - + drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 1 - + drivers/gpu/drm/ast/ast_drv.c | 2 +- + drivers/gpu/drm/ast/ast_drv.h | 6 + + drivers/gpu/drm/ast/ast_main.c | 5 + + drivers/gpu/drm/ast/ast_mode.c | 21 +- + drivers/gpu/drm/ast/ast_post.c | 91 +- + drivers/gpu/drm/bochs/Kconfig | 11 - + drivers/gpu/drm/bochs/Makefile | 4 - + drivers/gpu/drm/bochs/bochs.h | 98 - + drivers/gpu/drm/bochs/bochs_drv.c | 205 -- + drivers/gpu/drm/bochs/bochs_hw.c | 323 -- + drivers/gpu/drm/bochs/bochs_kms.c | 178 - + drivers/gpu/drm/bochs/bochs_mm.c | 24 - + drivers/gpu/drm/bridge/Kconfig | 1 + + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 9 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 10 +- + drivers/gpu/drm/bridge/nwl-dsi.c | 6 - + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 55 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 10 +- + drivers/gpu/drm/bridge/tc358768.c | 2 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 200 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 744 ++-- + drivers/gpu/drm/drm_aperture.c | 19 +- + drivers/gpu/drm/drm_atomic_helper.c | 10 + + drivers/gpu/drm/drm_auth.c | 93 +- + drivers/gpu/drm/drm_bridge.c | 10 + + drivers/gpu/drm/drm_connector.c | 5 +- + drivers/gpu/drm/drm_debugfs.c | 3 +- + drivers/gpu/drm/drm_debugfs_crc.c | 8 +- + drivers/gpu/drm/drm_dp_aux_bus.c | 326 ++ + drivers/gpu/drm/drm_dp_helper.c | 462 +++ + drivers/gpu/drm/drm_file.c | 1 + + drivers/gpu/drm/drm_gem.c | 12 +- + drivers/gpu/drm/drm_gem_atomic_helper.c | 58 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 4 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 9 +- + drivers/gpu/drm/drm_irq.c | 17 +- + drivers/gpu/drm/drm_lease.c | 81 +- + drivers/gpu/drm/drm_mipi_dbi.c | 55 +- + drivers/gpu/drm/drm_of.c | 6 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 12 +- + drivers/gpu/drm/drm_syncobj.c | 6 +- + drivers/gpu/drm/drm_vblank.c | 15 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 3 +- + drivers/gpu/drm/exynos/exynos_dp.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 10 - + drivers/gpu/drm/exynos/exynos_hdmi.c | 5 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 6 +- + drivers/gpu/drm/gud/gud_drv.c | 61 +- + drivers/gpu/drm/gud/gud_internal.h | 2 + + drivers/gpu/drm/gud/gud_pipe.c | 62 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 3 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 16 +- + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 9 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 - + drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 4 +- + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/display/icl_dsi.c | 46 +- + drivers/gpu/drm/i915/display/intel_crt.c | 3 + + drivers/gpu/drm/i915/display/intel_crtc.c | 8 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 210 +- + drivers/gpu/drm/i915/display/intel_ddi.h | 4 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 2461 +++++++------ + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h | 68 +- + drivers/gpu/drm/i915/display/intel_display.c | 170 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 35 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 5 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 12 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 165 +- + drivers/gpu/drm/i915/display/intel_dmc.h | 23 +- + drivers/gpu/drm/i915/display/intel_dp.c | 10 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 329 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 15 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 215 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 96 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 25 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 42 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 4 +- + drivers/gpu/drm/i915/display/intel_psr.c | 203 +- + drivers/gpu/drm/i915/display/intel_quirks.c | 34 + + drivers/gpu/drm/i915/display/intel_sdvo.c | 4 +- + drivers/gpu/drm/i915/display/intel_tc.c | 34 +- + drivers/gpu/drm/i915/display/intel_tc.h | 2 + + drivers/gpu/drm/i915/display/intel_tv.c | 13 +- + drivers/gpu/drm/i915/display/intel_vga.c | 12 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 27 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 13 +- + drivers/gpu/drm/i915/gem/i915_gem_create.c | 9 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 126 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 5 - + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 83 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 143 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 19 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 30 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_region.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 647 ++++ + drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 48 + + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 90 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 3 +- + drivers/gpu/drm/i915/i915_debugfs.c | 2 +- + drivers/gpu/drm/i915/i915_drv.c | 2 +- + drivers/gpu/drm/i915/i915_drv.h | 29 +- + drivers/gpu/drm/i915/i915_gem.c | 5 +- + drivers/gpu/drm/i915/i915_irq.c | 30 +- + drivers/gpu/drm/i915/i915_pci.c | 52 +- + drivers/gpu/drm/i915/i915_reg.h | 18 +- + drivers/gpu/drm/i915/intel_dram.c | 3 +- + drivers/gpu/drm/i915/intel_memory_region.c | 1 - + drivers/gpu/drm/i915/intel_memory_region.h | 1 - + drivers/gpu/drm/i915/intel_pm.c | 119 +- + drivers/gpu/drm/i915/intel_region_ttm.c | 8 +- + drivers/gpu/drm/i915/intel_region_ttm.h | 11 +- + drivers/gpu/drm/i915/intel_uncore.c | 2 +- + drivers/gpu/drm/i915/selftests/igt_mmap.c | 25 +- + drivers/gpu/drm/i915/selftests/igt_mmap.h | 12 +- + drivers/gpu/drm/imx/dcss/dcss-kms.c | 8 +- + drivers/gpu/drm/imx/dcss/dcss-plane.c | 1 - + drivers/gpu/drm/imx/imx-drm-core.c | 11 - + drivers/gpu/drm/imx/imx-ldb.c | 4 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 1 - + drivers/gpu/drm/imx/parallel-display.c | 5 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 10 +- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 1 - + drivers/gpu/drm/kmb/kmb_dsi.c | 1 - + drivers/gpu/drm/lima/lima_sched.c | 3 +- + drivers/gpu/drm/mcde/mcde_display.c | 1 - + drivers/gpu/drm/mcde/mcde_dsi.c | 9 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 - + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 1 - + drivers/gpu/drm/mediatek/mtk_hdmi.c | 5 +- + drivers/gpu/drm/meson/meson_drv.c | 12 +- + drivers/gpu/drm/meson/meson_overlay.c | 1 - + drivers/gpu/drm/meson/meson_plane.c | 1 - + drivers/gpu/drm/mgag200/mgag200_drv.c | 64 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 14 - + drivers/gpu/drm/mgag200/mgag200_mode.c | 16 +- + drivers/gpu/drm/msm/msm_fbdev.c | 2 +- + drivers/gpu/drm/msm/msm_gem.c | 16 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 6 +- + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 2 - + drivers/gpu/drm/nouveau/dispnv50/disp.c | 28 + + drivers/gpu/drm/nouveau/nouveau_backlight.c | 166 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 9 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_encoder.h | 1 + + drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_vga.c | 8 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 6 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 2 + + drivers/gpu/drm/omapdrm/omap_irq.c | 13 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 3 + + drivers/gpu/drm/panel/Kconfig | 31 + + drivers/gpu/drm/panel/Makefile | 3 + + drivers/gpu/drm/panel/panel-innolux-ej030na.c | 289 ++ + drivers/gpu/drm/panel/panel-samsung-db7430.c | 347 ++ + drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 10 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c | 83 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 41 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.h | 33 +- + drivers/gpu/drm/panel/panel-simple.c | 208 +- + drivers/gpu/drm/panel/panel-widechips-ws2401.c | 441 +++ + drivers/gpu/drm/panfrost/panfrost_device.c | 142 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 99 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 91 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 20 +- + drivers/gpu/drm/panfrost/panfrost_gpu.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 695 ++-- + drivers/gpu/drm/panfrost/panfrost_job.h | 8 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 203 +- + drivers/gpu/drm/panfrost/panfrost_mmu.h | 5 +- + drivers/gpu/drm/panfrost/panfrost_regs.h | 3 - + drivers/gpu/drm/pl111/pl111_display.c | 1 - + drivers/gpu/drm/qxl/qxl_drv.c | 4 +- + drivers/gpu/drm/qxl/qxl_drv.h | 3 - + drivers/gpu/drm/qxl/qxl_irq.c | 9 +- + drivers/gpu/drm/qxl/qxl_prime.c | 6 - + drivers/gpu/drm/radeon/radeon_device.c | 11 +- + drivers/gpu/drm/radeon/radeon_drv.c | 2 +- + drivers/gpu/drm/radeon/radeon_fence.c | 2 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 16 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 13 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 26 +- + drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 1 + + drivers/gpu/drm/rcar-du/rcar_lvds.c | 126 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 8 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 - + drivers/gpu/drm/rockchip/rockchip_lvds.c | 5 +- + drivers/gpu/drm/rockchip/rockchip_rgb.c | 5 +- + drivers/gpu/drm/scheduler/sched_main.c | 21 +- + drivers/gpu/drm/sti/sti_compositor.c | 2 - + drivers/gpu/drm/sti/sti_dvo.c | 4 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 17 +- + drivers/gpu/drm/stm/ltdc.c | 12 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_layer.c | 1 - + drivers/gpu/drm/sun4i/sun4i_lvds.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 4 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 1 - + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 1 - + drivers/gpu/drm/tegra/drm.c | 9 +- + drivers/gpu/drm/tegra/rgb.c | 5 +- + drivers/gpu/drm/tidss/tidss_irq.c | 3 - + drivers/gpu/drm/tidss/tidss_kms.c | 4 +- + drivers/gpu/drm/tidss/tidss_plane.c | 1 - + drivers/gpu/drm/tilcdc/tilcdc_external.c | 4 +- + drivers/gpu/drm/tiny/Kconfig | 17 +- + drivers/gpu/drm/tiny/Makefile | 1 + + drivers/gpu/drm/tiny/bochs.c | 733 ++++ + drivers/gpu/drm/tiny/cirrus.c | 2 +- + drivers/gpu/drm/tiny/hx8357d.c | 1 - + drivers/gpu/drm/tiny/ili9225.c | 1 - + drivers/gpu/drm/tiny/ili9341.c | 1 - + drivers/gpu/drm/tiny/ili9486.c | 1 - + drivers/gpu/drm/tiny/mi0283qt.c | 1 - + drivers/gpu/drm/tiny/repaper.c | 1 - + drivers/gpu/drm/tiny/st7586.c | 1 - + drivers/gpu/drm/tiny/st7735r.c | 1 - + drivers/gpu/drm/ttm/ttm_bo.c | 66 +- + drivers/gpu/drm/tve200/tve200_display.c | 1 - + drivers/gpu/drm/v3d/Makefile | 1 + + drivers/gpu/drm/v3d/v3d_drv.c | 8 + + drivers/gpu/drm/v3d/v3d_drv.h | 63 + + drivers/gpu/drm/v3d/v3d_gem.c | 31 + + drivers/gpu/drm/v3d/v3d_perfmon.c | 213 ++ + drivers/gpu/drm/v3d/v3d_regs.h | 2 + + drivers/gpu/drm/v3d/v3d_sched.c | 26 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 3 +- + drivers/gpu/drm/vboxvideo/vbox_drv.h | 1 - + drivers/gpu/drm/vboxvideo/vbox_irq.c | 16 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 3 +- + drivers/gpu/drm/vc4/Kconfig | 1 + + drivers/gpu/drm/vc4/vc4_drv.c | 2 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 4 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 424 +-- + drivers/gpu/drm/vc4/vc4_hdmi.h | 3 +- + drivers/gpu/drm/vc4/vc4_kms.c | 1 - + drivers/gpu/drm/vc4/vc4_regs.h | 30 + + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 4 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 64 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 7 +- + drivers/gpu/drm/vkms/vkms_composer.c | 26 +- + drivers/gpu/drm/vkms/vkms_drv.c | 32 +- + drivers/gpu/drm/vkms/vkms_drv.h | 6 +- + drivers/gpu/drm/vkms/vkms_plane.c | 57 +- + drivers/gpu/drm/vmwgfx/Kconfig | 8 + + drivers/gpu/drm/vmwgfx/Makefile | 2 +- + .../gpu/drm/vmwgfx/device_include/includeCheck.h | 3 - + .../gpu/drm/vmwgfx/device_include/svga3d_caps.h | 111 - + drivers/gpu/drm/vmwgfx/device_include/svga3d_cmd.h | 3680 ++++++++------------ + .../gpu/drm/vmwgfx/device_include/svga3d_devcaps.h | 793 ++--- + drivers/gpu/drm/vmwgfx/device_include/svga3d_dx.h | 3503 +++++++++---------- + .../gpu/drm/vmwgfx/device_include/svga3d_limits.h | 101 +- + drivers/gpu/drm/vmwgfx/device_include/svga3d_reg.h | 15 +- + .../drm/vmwgfx/device_include/svga3d_surfacedefs.h | 3132 ++++++++--------- + .../gpu/drm/vmwgfx/device_include/svga3d_types.h | 3020 +++++++--------- + .../gpu/drm/vmwgfx/device_include/svga_escape.h | 68 +- + .../gpu/drm/vmwgfx/device_include/svga_overlay.h | 203 +- + drivers/gpu/drm/vmwgfx/device_include/svga_reg.h | 2847 ++++----------- + drivers/gpu/drm/vmwgfx/device_include/svga_types.h | 51 - + .../gpu/drm/vmwgfx/device_include/vm_basic_types.h | 131 +- + .../drm/vmwgfx/device_include/vmware_pack_begin.h | 2 - + .../drm/vmwgfx/device_include/vmware_pack_end.h | 2 - + drivers/gpu/drm/vmwgfx/ttm_memory.c | 2 + + drivers/gpu/drm/vmwgfx/vmw_surface_cache.h | 539 +++ + drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 24 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_devcaps.c | 142 + + drivers/gpu/drm/vmwgfx/vmwgfx_devcaps.h | 50 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 68 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 42 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 111 +- + drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 24 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mksstat.h | 144 + + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 40 +- + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 579 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 80 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 35 - + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 4 +- + drivers/gpu/drm/xen/xen_drm_front_kms.c | 1 - + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 2 - + drivers/gpu/drm/zte/zx_drm_drv.c | 6 - + drivers/gpu/vga/vgaarb.c | 67 +- + drivers/vfio/pci/vfio_pci.c | 11 +- + drivers/video/fbdev/arcfb.c | 2 +- + drivers/video/fbdev/core/fbmem.c | 6 +- + drivers/video/fbdev/kyro/fbdev.c | 5 + + drivers/video/fbdev/neofb.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/apply.c | 4 +- + include/drm/bridge/dw_hdmi.h | 2 + + include/drm/drm_aperture.h | 14 +- + include/drm/drm_auth.h | 1 + + include/drm/drm_bridge.h | 26 +- + include/drm/drm_connector.h | 5 + + include/drm/drm_dp_aux_bus.h | 57 + + include/drm/drm_dp_helper.h | 175 +- + include/drm/drm_file.h | 18 +- + include/drm/drm_gem_atomic_helper.h | 6 + + include/drm/drm_gem_vram_helper.h | 16 +- + include/drm/drm_mipi_dbi.h | 7 +- + include/drm/drm_mipi_dsi.h | 5 + + include/drm/drm_modeset_helper_vtables.h | 7 +- + include/drm/drm_panel.h | 8 +- + include/drm/drm_print.h | 2 +- + include/drm/drm_simple_kms_helper.h | 7 +- + include/drm/drm_vma_manager.h | 2 +- + include/drm/gpu_scheduler.h | 37 +- + include/drm/ttm/ttm_placement.h | 7 +- + include/linux/dma-buf.h | 160 +- + include/linux/dma-fence-chain.h | 52 +- + include/linux/fb.h | 3 +- + {arch/x86/include/asm => include/linux}/sysfb.h | 32 +- + include/linux/vgaarb.h | 118 +- + include/uapi/drm/drm.h | 4 +- + include/uapi/drm/drm_mode.h | 32 + + include/uapi/drm/v3d_drm.h | 136 + + include/uapi/drm/vmwgfx_drm.h | 41 + + include/uapi/linux/dma-buf.h | 50 +- + 385 files changed, 20210 insertions(+), 16629 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-dmabuf-buffers + create mode 100644 Documentation/devicetree/bindings/display/dp-aux-bus.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,ej030na.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,lms380kf01.yaml + create mode 100644 drivers/dma-buf/dma-buf-sysfs-stats.c + create mode 100644 drivers/dma-buf/dma-buf-sysfs-stats.h + rename {arch/x86/kernel => drivers/firmware/efi}/sysfb_efi.c (83%) + rename {arch/x86/kernel => drivers/firmware}/sysfb.c (75%) + rename {arch/x86/kernel => drivers/firmware}/sysfb_simplefb.c (81%) + delete mode 100644 drivers/gpu/drm/bochs/Kconfig + delete mode 100644 drivers/gpu/drm/bochs/Makefile + delete mode 100644 drivers/gpu/drm/bochs/bochs.h + delete mode 100644 drivers/gpu/drm/bochs/bochs_drv.c + delete mode 100644 drivers/gpu/drm/bochs/bochs_hw.c + delete mode 100644 drivers/gpu/drm/bochs/bochs_kms.c + delete mode 100644 drivers/gpu/drm/bochs/bochs_mm.c + create mode 100644 drivers/gpu/drm/drm_dp_aux_bus.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.h + create mode 100644 drivers/gpu/drm/panel/panel-innolux-ej030na.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-db7430.c + create mode 100644 drivers/gpu/drm/panel/panel-widechips-ws2401.c + create mode 100644 drivers/gpu/drm/tiny/bochs.c + create mode 100644 drivers/gpu/drm/v3d/v3d_perfmon.c + delete mode 100644 drivers/gpu/drm/vmwgfx/device_include/includeCheck.h + delete mode 100644 drivers/gpu/drm/vmwgfx/device_include/svga3d_caps.h + delete mode 100644 drivers/gpu/drm/vmwgfx/device_include/svga_types.h + delete mode 100644 drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h + delete mode 100644 drivers/gpu/drm/vmwgfx/device_include/vmware_pack_end.h + create mode 100644 drivers/gpu/drm/vmwgfx/vmw_surface_cache.h + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_devcaps.c + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_devcaps.h + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_mksstat.h + create mode 100644 include/drm/drm_dp_aux_bus.h + rename {arch/x86/include/asm => include/linux}/sysfb.h (70%) +Merging drm-misc/for-linux-next (873601687598 drm/vmwgfx: Fix a 64bit regression on svga3) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +Resolved 'drivers/gpu/drm/vmwgfx/vmwgfx_drv.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e613befca0f8] Merge remote-tracking branch 'drm-misc/for-linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging amdgpu/drm-next (99facff49d5e drm/amdgpu/smu7: split PM logging start and sampling) +$ git merge amdgpu/drm-next +Auto-merging drivers/usb/host/xhci-pci.c +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +Auto-merging drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +Auto-merging drivers/gpu/drm/amd/pm/inc/smu_types.h +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc.h +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc15.c +Auto-merging drivers/gpu/drm/amd/amdgpu/psp_v12_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/nv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +CONFLICT (rename/delete): drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h deleted in HEAD and renamed to drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.h in amdgpu/drm-next. Version amdgpu/drm-next of drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.h left in tree. +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging MAINTAINERS +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/nv.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_svm.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/inc/smu_v11_0.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 152d13d3c97b] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 83 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 133 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.c | 239 ++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.h | 37 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 369 ++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 116 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 1258 +++++++++++++------- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 90 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 86 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 61 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 147 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 2 + + .../gpu/drm/amd/amdgpu/cyan_skillfish_reg_init.c | 51 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 160 ++- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 13 + + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 21 + + drivers/gpu/drm/amd/amdgpu/nv.c | 27 +- + drivers/gpu/drm/amd/amdgpu/nv.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 49 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0_8.c | 208 ++++ + drivers/gpu/drm/amd/amdgpu/psp_v11_0_8.h | 30 + + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 126 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 50 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 17 - + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 324 ++--- + drivers/gpu/drm/amd/amdgpu/soc15.c | 7 +- + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 8 +- + drivers/gpu/drm/amd/amdgpu/ta_xgmi_if.h | 14 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 15 + + drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 15 + + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 17 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 30 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 39 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 5 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 19 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 3 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 263 ++-- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 4 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 18 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 4 +- + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 12 +- + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 4 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 12 +- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 16 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 25 +- + .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 10 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 2 +- + .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 10 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 118 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 135 ++- + drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c | 25 + + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 24 + + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 3 + + drivers/gpu/drm/amd/display/dc/dc.h | 120 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_stat.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 83 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 8 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 21 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 19 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 29 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 4 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 42 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 6 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 2 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 21 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h | 33 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 17 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 10 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 1 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h | 14 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 2 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 3 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c | 1 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h | 14 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 25 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 8 +- + .../gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.c | 1 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 33 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.h | 15 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 5 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 11 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 18 +- + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 15 +- + .../drm/amd/display/dc/dml/display_mode_enums.h | 4 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 2 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 12 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 4 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 393 +++--- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 1 - + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 11 + + drivers/gpu/drm/amd/display/dc/inc/link_dpcd.h | 25 + + drivers/gpu/drm/amd/display/dc/irq_types.h | 2 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 18 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 47 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 20 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 10 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 17 + + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 70 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 2 - + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 6 - + .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 3 - + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 53 +- + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 12 +- + drivers/gpu/drm/amd/include/amd_shared.h | 1 + + .../amd/include/asic_reg/dcn/dcn_3_1_2_sh_mask.h | 4 + + .../drm/amd/include/asic_reg/mp/mp_11_0_8_offset.h | 352 ++++++ + .../amd/include/asic_reg/umc/umc_8_7_0_sh_mask.h | 179 +-- + .../gpu/drm/amd/include/cyan_skillfish_ip_offset.h | 714 +++++++++++ + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 1 + + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 8 + + .../amd/pm/inc/smu11_driver_if_cyan_skillfish.h | 95 ++ + .../amd/pm/inc/smu11_driver_if_sienna_cichlid.h | 65 +- + drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 5 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_8_pmfw.h | 152 +++ + drivers/gpu/drm/amd/pm/inc/smu_v11_8_ppsmc.h | 70 ++ + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 44 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 13 + + drivers/gpu/drm/amd/pm/swsmu/smu11/Makefile | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 246 ++-- + .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 76 ++ + .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.h | 29 + + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 173 ++- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 494 ++++---- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 28 + + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 243 ++-- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 286 ++++- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 3 +- + drivers/gpu/drm/radeon/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 95 ++ + drivers/usb/host/xhci-pci.c | 3 + + include/drm/amd_asic_type.h | 17 +- + include/uapi/linux/kfd_ioctl.h | 16 +- + 174 files changed, 7026 insertions(+), 2678 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/cyan_skillfish_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v11_0_8.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v11_0_8.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_0_8_offset.h + create mode 100644 drivers/gpu/drm/amd/include/cyan_skillfish_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu11_driver_if_cyan_skillfish.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v11_8_pmfw.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v11_8_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.h +Merging drm-intel/for-linux-next (155b8645de9e drm/i915/dp: DPTX writes Swing/Pre-emphs(DPCD 0x103-0x106) requested during PHY Layer testing) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_device_info.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gt/intel_region_lmem.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/Makefile +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/display/i9xx_plane.c | 2 +- + drivers/gpu/drm/i915/display/intel_acpi.c | 19 + + drivers/gpu/drm/i915/display/intel_acpi.h | 3 + + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 7 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 3 +- + drivers/gpu/drm/i915/display/intel_bw.c | 178 ++++- + drivers/gpu/drm/i915/display/intel_cdclk.c | 35 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 12 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 188 ++++- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 160 +++- + drivers/gpu/drm/i915/display/intel_display.c | 196 ++++- + drivers/gpu/drm/i915/display/intel_display.h | 1 + + .../gpu/drm/i915/display/intel_display_debugfs.c | 83 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 43 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 10 + + drivers/gpu/drm/i915/display/intel_display_types.h | 22 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 58 +- + drivers/gpu/drm/i915/display/intel_dp.c | 20 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 28 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 12 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 7 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 4 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 11 + + drivers/gpu/drm/i915/display/intel_opregion.c | 3 + + drivers/gpu/drm/i915/display/intel_psr.c | 88 ++- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 862 +++++++++++++++++++++ + drivers/gpu/drm/i915/display/intel_snps_phy.h | 35 + + drivers/gpu/drm/i915/display/intel_sprite.c | 2 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 12 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 111 +-- + drivers/gpu/drm/i915/i915_drv.c | 17 +- + drivers/gpu/drm/i915/i915_drv.h | 130 ++-- + drivers/gpu/drm/i915/i915_irq.c | 141 ++-- + drivers/gpu/drm/i915/i915_pci.c | 65 +- + drivers/gpu/drm/i915/i915_reg.h | 141 +++- + drivers/gpu/drm/i915/intel_device_info.c | 20 +- + drivers/gpu/drm/i915/intel_device_info.h | 12 +- + drivers/gpu/drm/i915/intel_dram.c | 7 +- + drivers/gpu/drm/i915/intel_pch.c | 3 + + drivers/gpu/drm/i915/intel_pch.h | 2 + + drivers/gpu/drm/i915/intel_pm.c | 124 ++- + drivers/gpu/drm/i915/intel_sideband.c | 13 +- + drivers/gpu/drm/i915/intel_sideband.h | 2 +- + drivers/gpu/drm/i915/intel_step.c | 148 +++- + drivers/gpu/drm/i915/intel_step.h | 33 +- + 47 files changed, 2574 insertions(+), 502 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_snps_phy.c + create mode 100644 drivers/gpu/drm/i915/display/intel_snps_phy.h +Merging drm-tegra/drm/tegra/for-next (8874e3a7baec drm/tegra: Fix compilation of variadic macro) +$ git merge drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/drm.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/Makefile | 4 + + drivers/gpu/drm/tegra/drm.c | 82 +++-- + drivers/gpu/drm/tegra/drm.h | 12 + + drivers/gpu/drm/tegra/firewall.c | 254 ++++++++++++++ + drivers/gpu/drm/tegra/gather_bo.c | 81 +++++ + drivers/gpu/drm/tegra/gather_bo.h | 22 ++ + drivers/gpu/drm/tegra/gem.c | 13 + + drivers/gpu/drm/tegra/gem.h | 2 + + drivers/gpu/drm/tegra/submit.c | 527 +++++++++++++++++++++++++++++ + drivers/gpu/drm/tegra/submit.h | 21 ++ + drivers/gpu/drm/tegra/uapi.c | 387 +++++++++++++++++++++ + drivers/gpu/drm/tegra/uapi.h | 58 ++++ + drivers/gpu/drm/tegra/vic.c | 112 +++--- + drivers/gpu/host1x/Makefile | 1 + + drivers/gpu/host1x/cdma.c | 58 +++- + drivers/gpu/host1x/fence.c | 209 ++++++++++++ + drivers/gpu/host1x/fence.h | 13 + + drivers/gpu/host1x/hw/channel_hw.c | 87 +++-- + drivers/gpu/host1x/hw/debug_hw.c | 9 +- + drivers/gpu/host1x/hw/hw_host1x02_uclass.h | 12 + + drivers/gpu/host1x/hw/hw_host1x04_uclass.h | 12 + + drivers/gpu/host1x/hw/hw_host1x05_uclass.h | 12 + + drivers/gpu/host1x/hw/hw_host1x06_uclass.h | 12 + + drivers/gpu/host1x/hw/hw_host1x07_uclass.h | 12 + + drivers/gpu/host1x/intr.c | 9 + + drivers/gpu/host1x/intr.h | 2 + + drivers/gpu/host1x/job.c | 77 +++-- + drivers/gpu/host1x/job.h | 16 + + drivers/gpu/host1x/syncpt.c | 2 + + drivers/gpu/host1x/syncpt.h | 12 + + include/linux/host1x.h | 22 +- + include/uapi/drm/tegra_drm.h | 425 +++++++++++++++++++++-- + 32 files changed, 2408 insertions(+), 169 deletions(-) + create mode 100644 drivers/gpu/drm/tegra/firewall.c + create mode 100644 drivers/gpu/drm/tegra/gather_bo.c + create mode 100644 drivers/gpu/drm/tegra/gather_bo.h + create mode 100644 drivers/gpu/drm/tegra/submit.c + create mode 100644 drivers/gpu/drm/tegra/submit.h + create mode 100644 drivers/gpu/drm/tegra/uapi.c + create mode 100644 drivers/gpu/drm/tegra/uapi.h + create mode 100644 drivers/gpu/host1x/fence.c + create mode 100644 drivers/gpu/host1x/fence.h +Merging drm-msm/msm-next (4541e4f2225c drm/msm/gem: Mark active before pinning) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/msm_gem_submit.c +Auto-merging drivers/gpu/drm/msm/msm_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/drm_gem.c +Resolved 'drivers/gpu/drm/msm/msm_gem.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9b29356760c6] Merge remote-tracking branch 'drm-msm/msm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/drm_gem.c | 22 -- + drivers/gpu/drm/msm/Kconfig | 1 + + drivers/gpu/drm/msm/Makefile | 1 + + drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 6 +- + drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +- + drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 7 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 12 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 6 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 4 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 6 +- + drivers/gpu/drm/msm/msm_drv.c | 30 ++- + drivers/gpu/drm/msm/msm_fence.c | 53 +---- + drivers/gpu/drm/msm/msm_fence.h | 44 +++- + drivers/gpu/drm/msm/msm_gem.c | 92 +------- + drivers/gpu/drm/msm/msm_gem.h | 47 ++-- + drivers/gpu/drm/msm/msm_gem_submit.c | 344 +++++++++++++++++----------- + drivers/gpu/drm/msm/msm_gpu.c | 220 ++++-------------- + drivers/gpu/drm/msm/msm_gpu.h | 139 ++++++++++- + drivers/gpu/drm/msm/msm_gpu_devfreq.c | 203 ++++++++++++++++ + drivers/gpu/drm/msm/msm_rd.c | 6 +- + drivers/gpu/drm/msm/msm_ringbuffer.c | 69 +++++- + drivers/gpu/drm/msm/msm_ringbuffer.h | 12 + + drivers/gpu/drm/msm/msm_submitqueue.c | 53 +++-- + include/drm/drm_gem.h | 2 - + include/uapi/drm/msm_drm.h | 14 +- + 26 files changed, 865 insertions(+), 534 deletions(-) + create mode 100644 drivers/gpu/drm/msm/msm_gpu_devfreq.c +Merging imx-drm/imx-drm/next (59e4e762a17d gpu: ipu-v3: Fix i.MX IPU-v3 offset calculations for (semi)planar U/V formats) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/ipu-v3/ipu-cpmem.c | 30 +++++++++++++++--------------- + drivers/gpu/ipu-v3/ipu-image-convert.c | 9 +++------ + 2 files changed, 18 insertions(+), 21 deletions(-) +Merging etnaviv/etnaviv/next (81fd23e2b3cc drm/etnaviv: Implement mmap as GEM object function) +$ git merge etnaviv/etnaviv/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 14 ++----------- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 3 --- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 18 +++++------------ + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 13 ------------ + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 6 ++++++ + drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 31 +++++++++++++++++++++++++++++ + 6 files changed, 44 insertions(+), 41 deletions(-) +Merging regmap/for-next (d63aa09f7c53 regmap: Prefer unsigned int to bare use of unsigned) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-debugfs.c | 2 +- + drivers/base/regmap/regmap-mmio.c | 2 +- + drivers/base/regmap/regmap.c | 10 +++++----- + 3 files changed, 7 insertions(+), 7 deletions(-) +Merging sound/for-next (c5aa8277a1d3 ALSA: seq: Fix comments of wrong client number for MIDI Passthrough) +$ git merge sound/for-next +Auto-merging sound/pci/hda/patch_hdmi.c +Auto-merging Documentation/sound/kernel-api/writing-an-alsa-driver.rst +Merge made by the 'recursive' strategy. + .../sound/kernel-api/writing-an-alsa-driver.rst | 33 ++++ + include/sound/compress_driver.h | 2 - + include/sound/core.h | 6 + + include/sound/emu10k1.h | 6 +- + include/sound/emu8000.h | 3 - + include/sound/es1688.h | 1 - + include/sound/memalloc.h | 4 + + sound/core/compress_offload.c | 69 +------ + sound/core/init.c | 99 +++++++++- + sound/core/isadma.c | 38 ++++ + sound/core/memalloc.c | 46 +++++ + sound/core/seq/seq_dummy.c | 8 +- + sound/drivers/Kconfig | 2 +- + sound/drivers/aloop.c | 26 +-- + sound/drivers/dummy.c | 24 +-- + sound/drivers/mpu401/mpu401.c | 34 +--- + sound/drivers/mtpav.c | 30 +-- + sound/drivers/pcsp/pcsp.c | 49 ++--- + sound/drivers/pcsp/pcsp_input.c | 14 +- + sound/drivers/pcsp/pcsp_input.h | 1 - + sound/drivers/serial-u16550.c | 57 +----- + sound/drivers/virmidi.c | 21 +-- + sound/drivers/vx/vx_core.c | 12 +- + sound/isa/ad1816a/ad1816a.c | 41 +--- + sound/isa/ad1816a/ad1816a_lib.c | 49 +---- + sound/isa/ad1848/ad1848.c | 19 +- + sound/isa/adlib.c | 28 +-- + sound/isa/als100.c | 41 +--- + sound/isa/azt2320.c | 49 ++--- + sound/isa/cmi8328.c | 31 +-- + sound/isa/cmi8330.c | 27 +-- + sound/isa/cs423x/cs4231.c | 21 +-- + sound/isa/cs423x/cs4236.c | 52 +---- + sound/isa/cs423x/cs4236_lib.c | 2 - + sound/isa/es1688/es1688.c | 33 +--- + sound/isa/es1688/es1688_lib.c | 29 +-- + sound/isa/es18xx.c | 112 ++--------- + sound/isa/galaxy/galaxy.c | 82 ++++---- + sound/isa/gus/gus_main.c | 44 ++--- + sound/isa/gus/gusclassic.c | 28 +-- + sound/isa/gus/gusextreme.c | 39 ++-- + sound/isa/gus/gusmax.c | 65 ++----- + sound/isa/gus/interwave.c | 53 ++---- + sound/isa/msnd/msnd_pinnacle.c | 119 +++--------- + sound/isa/opl3sa2.c | 60 ++---- + sound/isa/opti9xx/miro.c | 76 +++----- + sound/isa/opti9xx/opti92x-ad1848.c | 77 +++----- + sound/isa/sb/emu8000.c | 48 +---- + sound/isa/sb/jazz16.c | 39 ++-- + sound/isa/sb/sb16.c | 42 +---- + sound/isa/sb/sb8.c | 48 ++--- + sound/isa/sb/sb_common.c | 64 ++----- + sound/isa/sc6000.c | 84 +++------ + sound/isa/sscape.c | 92 ++------- + sound/isa/wavefront/wavefront.c | 46 +---- + sound/isa/wss/wss_lib.c | 67 ++----- + sound/pci/ad1889.c | 144 +++----------- + sound/pci/ali5451/ali5451.c | 90 +++------ + sound/pci/als300.c | 80 ++------ + sound/pci/als4000.c | 59 ++---- + sound/pci/atiixp.c | 92 ++------- + sound/pci/atiixp_modem.c | 92 ++------- + sound/pci/au88x0/au88x0.c | 134 +++---------- + sound/pci/aw2/aw2-alsa.c | 102 ++-------- + sound/pci/azt3328.c | 124 +++--------- + sound/pci/bt87x.c | 98 +++------- + sound/pci/ca0106/ca0106.h | 3 +- + sound/pci/ca0106/ca0106_main.c | 114 +++-------- + sound/pci/cmipci.c | 104 +++------- + sound/pci/cs4281.c | 114 +++-------- + sound/pci/cs46xx/cs46xx.c | 51 ++--- + sound/pci/cs46xx/cs46xx.h | 4 +- + sound/pci/cs46xx/cs46xx_lib.c | 111 +++-------- + sound/pci/cs5530.c | 86 ++------- + sound/pci/cs5535audio/cs5535audio.c | 94 ++------- + sound/pci/cs5535audio/cs5535audio_olpc.c | 7 +- + sound/pci/echoaudio/echoaudio.c | 168 +++++------------ + sound/pci/echoaudio/echoaudio.h | 2 +- + sound/pci/emu10k1/emu10k1.c | 53 +++--- + sound/pci/emu10k1/emu10k1_main.c | 102 +++------- + sound/pci/emu10k1/emu10k1x.c | 128 +++---------- + sound/pci/emu10k1/p16v.c | 22 +-- + sound/pci/ens1370.c | 115 +++--------- + sound/pci/es1938.c | 97 +++------- + sound/pci/es1968.c | 112 +++-------- + sound/pci/fm801.c | 103 ++-------- + sound/pci/hda/hda_controller.h | 1 - + sound/pci/hda/hda_intel.c | 26 +-- + sound/pci/hda/patch_ca0132.c | 2 +- + sound/pci/hda/patch_hdmi.c | 7 + + sound/pci/ice1712/ice1712.c | 133 +++---------- + sound/pci/ice1712/ice1724.c | 167 ++++------------ + sound/pci/intel8x0.c | 142 +++++--------- + sound/pci/intel8x0m.c | 139 ++++---------- + sound/pci/korg1212/korg1212.c | 209 ++++++--------------- + sound/pci/lola/lola.c | 127 ++++--------- + sound/pci/lola/lola.h | 5 +- + sound/pci/lola/lola_pcm.c | 20 +- + sound/pci/lx6464es/lx6464es.c | 112 +++-------- + sound/pci/maestro3.c | 106 +++-------- + sound/pci/nm256/nm256.c | 131 +++---------- + sound/pci/oxygen/oxygen.c | 1 - + sound/pci/oxygen/oxygen.h | 1 - + sound/pci/oxygen/oxygen_lib.c | 66 +++---- + sound/pci/oxygen/se6x.c | 1 - + sound/pci/oxygen/virtuoso.c | 1 - + sound/pci/riptide/riptide.c | 89 +++------ + sound/pci/rme32.c | 49 ++--- + sound/pci/rme96.c | 57 ++---- + sound/pci/rme9652/hdsp.c | 89 +++------ + sound/pci/rme9652/hdspm.c | 64 ++----- + sound/pci/rme9652/rme9652.c | 85 +++------ + sound/pci/sis7019.c | 87 ++------- + sound/pci/sonicvibes.c | 117 +++--------- + sound/pci/trident/trident.c | 39 +--- + sound/pci/trident/trident.h | 7 +- + sound/pci/trident/trident_main.c | 90 +++------ + sound/pci/trident/trident_memory.c | 8 +- + sound/pci/via82xx.c | 116 +++--------- + sound/pci/via82xx_modem.c | 88 ++------- + sound/pci/vx222/vx222.c | 69 ++----- + sound/pci/ymfpci/ymfpci.c | 66 +++---- + sound/pci/ymfpci/ymfpci.h | 8 +- + sound/pci/ymfpci/ymfpci_main.c | 149 +++++---------- + sound/pcmcia/vx/vxpocket.c | 22 --- + sound/soc/soc-compress.c | 1 - + sound/x86/intel_hdmi_audio.c | 88 +++------ + sound/x86/intel_hdmi_audio.h | 1 - + 128 files changed, 2040 insertions(+), 5643 deletions(-) +Merging sound-asoc/for-next (3b1cc6388558 Merge remote-tracking branch 'asoc/for-5.15' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + .../bindings/sound/davinci-mcasp-audio.txt | 1 + + include/linux/platform_data/davinci_asp.h | 1 + + include/sound/sof.h | 1 + + sound/soc/amd/Kconfig | 9 + + sound/soc/amd/Makefile | 1 + + sound/soc/amd/acp-da7219-max98357a.c | 12 +- + sound/soc/amd/acp-pcm-dma.c | 12 +- + sound/soc/amd/acp3x-rt5682-max9836.c | 14 +- + sound/soc/amd/raven/acp3x-pcm-dma.c | 2 +- + sound/soc/amd/renoir/acp3x-rn.c | 7 +- + sound/soc/amd/vangogh/Makefile | 9 + + sound/soc/amd/vangogh/acp5x-i2s.c | 427 +++++++++++++++++ + sound/soc/amd/vangogh/acp5x-pcm-dma.c | 525 +++++++++++++++++++++ + sound/soc/amd/vangogh/acp5x.h | 193 ++++++++ + sound/soc/amd/vangogh/pci-acp5x.c | 326 +++++++++++++ + sound/soc/amd/vangogh/vg_chip_offset_byte.h | 337 +++++++++++++ + sound/soc/atmel/Kconfig | 1 - + sound/soc/atmel/mchp-spdifrx.c | 6 +- + sound/soc/atmel/mchp-spdiftx.c | 2 +- + sound/soc/atmel/tse850-pcm5142.c | 2 +- + sound/soc/bcm/cygnus-pcm.c | 2 +- + sound/soc/codecs/Kconfig | 18 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/cx20442.c | 8 +- + sound/soc/codecs/lpass-rx-macro.c | 65 +-- + sound/soc/codecs/rt1015.c | 39 +- + sound/soc/codecs/rt1015.h | 2 - + sound/soc/codecs/rt5682.c | 44 ++ + sound/soc/codecs/sdw-mockup.c | 310 ++++++++++++ + sound/soc/codecs/tlv320aic32x4.c | 2 +- + sound/soc/codecs/wcd938x.c | 11 +- + sound/soc/codecs/wcd938x.h | 1 - + sound/soc/codecs/wm_adsp.c | 7 +- + sound/soc/fsl/fsl_xcvr.c | 4 +- + sound/soc/intel/atom/sst/sst_ipc.c | 2 +- + sound/soc/intel/boards/Kconfig | 1 + + sound/soc/intel/boards/sof_cs42l42.c | 361 +++++++++----- + sound/soc/intel/boards/sof_maxim_common.c | 17 +- + sound/soc/intel/boards/sof_maxim_common.h | 4 +- + sound/soc/intel/boards/sof_rt5682.c | 52 +- + sound/soc/intel/boards/sof_sdw.c | 75 ++- + sound/soc/intel/boards/sof_sdw_common.h | 27 +- + sound/soc/intel/common/Makefile | 3 +- + sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 15 + + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 8 + + .../intel/common/soc-acpi-intel-sdw-mockup-match.c | 166 +++++++ + .../intel/common/soc-acpi-intel-sdw-mockup-match.h | 17 + + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 38 ++ + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 43 +- + sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 27 +- + sound/soc/samsung/aries_wm8994.c | 2 +- + sound/soc/samsung/arndale.c | 4 +- + sound/soc/samsung/h1940_uda1380.c | 2 +- + sound/soc/samsung/littlemill.c | 2 +- + sound/soc/samsung/midas_wm1811.c | 2 +- + sound/soc/samsung/neo1973_wm8753.c | 4 +- + sound/soc/samsung/rx1950_uda1380.c | 2 +- + sound/soc/samsung/smartq_wm8987.c | 2 +- + sound/soc/samsung/smdk_wm8580.c | 2 +- + sound/soc/samsung/smdk_wm8994.c | 2 +- + sound/soc/samsung/smdk_wm8994pcm.c | 2 +- + sound/soc/samsung/tm2_wm5110.c | 6 +- + sound/soc/samsung/tobermory.c | 2 +- + sound/soc/sh/rcar/dma.c | 2 +- + sound/soc/soc-core.c | 36 +- + sound/soc/soc-pcm.c | 22 +- + sound/soc/sof/sof-audio.c | 42 +- + sound/soc/ti/Kconfig | 1 + + sound/soc/ti/davinci-mcasp.c | 176 ++++++- + sound/soc/ti/j721e-evm.c | 30 +- + sound/soc/ti/omap-abe-twl6040.c | 5 - + 71 files changed, 3157 insertions(+), 450 deletions(-) + create mode 100644 sound/soc/amd/vangogh/Makefile + create mode 100644 sound/soc/amd/vangogh/acp5x-i2s.c + create mode 100644 sound/soc/amd/vangogh/acp5x-pcm-dma.c + create mode 100644 sound/soc/amd/vangogh/acp5x.h + create mode 100644 sound/soc/amd/vangogh/pci-acp5x.c + create mode 100644 sound/soc/amd/vangogh/vg_chip_offset_byte.h + create mode 100644 sound/soc/codecs/sdw-mockup.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-sdw-mockup-match.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-sdw-mockup-match.h +Merging modules/modules-next (4c5afb74d945 module: combine constructors in module linker script) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + scripts/module.lds.S | 1 + + 1 file changed, 1 insertion(+) +Merging input/next (76ba1900cb67 dt-bindings: power: reset: qcom-pon: Convert qcom PON binding to yaml) +$ git merge input/next +Removing drivers/input/misc/ixp4xx-beeper.c +Removing Documentation/devicetree/bindings/power/reset/qcom,pon.txt +Removing Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.txt +Merge made by the 'recursive' strategy. + .../bindings/input/qcom,pm8941-pwrkey.txt | 55 ------- + .../bindings/input/qcom,pm8941-pwrkey.yaml | 51 ++++++ + .../devicetree/bindings/power/reset/qcom,pon.txt | 49 ------ + .../devicetree/bindings/power/reset/qcom,pon.yaml | 80 +++++++++ + .../bindings/power/reset/reboot-mode.yaml | 2 +- + drivers/input/misc/Kconfig | 12 -- + drivers/input/misc/Makefile | 1 - + drivers/input/misc/ixp4xx-beeper.c | 183 --------------------- + drivers/input/serio/parkbd.c | 14 +- + 9 files changed, 133 insertions(+), 314 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.txt + create mode 100644 Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.yaml + delete mode 100644 Documentation/devicetree/bindings/power/reset/qcom,pon.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/qcom,pon.yaml + delete mode 100644 drivers/input/misc/ixp4xx-beeper.c +Merging block/for-next (89f11f3cf09e Merge branch 'for-5.15/block' into for-next) +$ git merge block/for-next +Removing include/linux/cmdline-parser.h +Auto-merging include/linux/bio.h +Removing block/cmdline-parser.c +Auto-merging block/bio.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-block | 12 ++ + arch/m68k/configs/stmark2_defconfig | 1 - + arch/mips/include/asm/mach-rc32434/rb.h | 2 - + block/Kconfig | 10 -- + block/Makefile | 1 - + block/bio-integrity.c | 14 +- + block/bio.c | 37 ++--- + block/blk-iocost.c | 11 +- + block/blk-map.c | 2 +- + block/blk-mq-sched.c | 17 +- + block/blk-mq-sysfs.c | 55 ------- + block/blk-settings.c | 12 +- + block/blk.h | 1 - + block/bounce.c | 39 ++--- + block/cmdline-parser.c | 255 ------------------------------ + block/disk-events.c | 62 ++++++-- + block/genhd.c | 90 +++++++---- + block/ioctl.c | 2 + + block/partitions/Kconfig | 1 - + block/partitions/cmdline.c | 267 +++++++++++++++++++++++++++++++- + block/partitions/core.c | 36 +++-- + block/t10-pi.c | 16 +- + drivers/ata/sata_dwc_460ex.c | 12 +- + drivers/block/loop.c | 138 ++++++++++++----- + drivers/block/ps3disk.c | 18 +-- + drivers/block/rbd.c | 15 +- + drivers/block/rnbd/rnbd-clt-sysfs.c | 33 ++-- + drivers/block/rnbd/rnbd-clt.c | 2 +- + drivers/block/rnbd/rnbd-srv-sysfs.c | 14 +- + drivers/md/dm-writecache.c | 5 +- + fs/block_dev.c | 83 +++------- + include/linux/bio.h | 42 ----- + include/linux/blkdev.h | 2 - + include/linux/bvec.h | 52 ++++++- + include/linux/cmdline-parser.h | 46 ------ + include/linux/genhd.h | 3 + + include/linux/ioprio.h | 41 +---- + include/uapi/linux/fs.h | 1 + + include/uapi/linux/ioprio.h | 46 ++++++ + 39 files changed, 709 insertions(+), 787 deletions(-) + delete mode 100644 block/cmdline-parser.c + delete mode 100644 include/linux/cmdline-parser.h + create mode 100644 include/uapi/linux/ioprio.h +Merging device-mapper/for-next (3eadac651d1d dm: add documentation for IMA measurement support) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm-writecache.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/device-mapper/dm-ima.rst | 306 +++++++++ + Documentation/admin-guide/device-mapper/index.rst | 1 + + .../admin-guide/device-mapper/writecache.rst | 16 +- + drivers/md/Makefile | 4 + + drivers/md/dm-cache-target.c | 24 + + drivers/md/dm-clone-target.c | 5 + + drivers/md/dm-core.h | 5 + + drivers/md/dm-crypt.c | 27 + + drivers/md/dm-delay.c | 4 + + drivers/md/dm-dust.c | 4 + + drivers/md/dm-ebs-target.c | 3 + + drivers/md/dm-era-target.c | 4 + + drivers/md/dm-flakey.c | 4 + + drivers/md/dm-ima.c | 705 +++++++++++++++++++++ + drivers/md/dm-ima.h | 68 ++ + drivers/md/dm-integrity.c | 25 + + drivers/md/dm-ioctl.c | 24 +- + drivers/md/dm-linear.c | 10 +- + drivers/md/dm-log-userspace-base.c | 3 + + drivers/md/dm-log-writes.c | 4 + + drivers/md/dm-log.c | 10 + + drivers/md/dm-mpath.c | 28 + + drivers/md/dm-ps-historical-service-time.c | 3 + + drivers/md/dm-ps-io-affinity.c | 3 + + drivers/md/dm-ps-queue-length.c | 3 + + drivers/md/dm-ps-round-robin.c | 4 + + drivers/md/dm-ps-service-time.c | 3 + + drivers/md/dm-raid.c | 39 ++ + drivers/md/dm-raid1.c | 17 + + drivers/md/dm-snap-persistent.c | 4 + + drivers/md/dm-snap-transient.c | 4 + + drivers/md/dm-snap.c | 13 + + drivers/md/dm-stripe.c | 15 + + drivers/md/dm-switch.c | 4 + + drivers/md/dm-thin.c | 8 + + drivers/md/dm-unstripe.c | 4 + + drivers/md/dm-verity-target.c | 41 ++ + drivers/md/dm-writecache.c | 467 ++++++++------ + drivers/md/dm-zoned-target.c | 3 + + drivers/md/dm.c | 3 + + include/linux/device-mapper.h | 6 +- + include/uapi/linux/dm-ioctl.h | 6 + + security/integrity/ima/ima_main.c | 1 + + 43 files changed, 1745 insertions(+), 190 deletions(-) + create mode 100644 Documentation/admin-guide/device-mapper/dm-ima.rst + create mode 100644 drivers/md/dm-ima.c + create mode 100644 drivers/md/dm-ima.h +Merging pcmcia/pcmcia-next (e39cdacf2f66 pcmcia: i82092: fix a null pointer dereference bug) +$ git merge pcmcia/pcmcia-next +Merge made by the 'recursive' strategy. + drivers/pcmcia/i82092.c | 1 + + 1 file changed, 1 insertion(+) +Merging mmc/next (49fc2be70e7f Merge branch 'fixes' into next) +$ git merge mmc/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/sdhci-msm.txt | 1 + + drivers/mmc/core/core.c | 3 +- + drivers/mmc/core/host.c | 13 +++++- + drivers/mmc/core/host.h | 6 +++ + drivers/mmc/host/mmc_spi.c | 15 ++----- + drivers/mmc/host/mmci.c | 3 ++ + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 4 +- + drivers/mmc/host/sdhci-of-arasan.c | 51 +++++++++++++++++++--- + drivers/mmc/host/sh_mmcif.c | 4 +- + drivers/mmc/host/usdhi6rol0.c | 4 +- + 10 files changed, 76 insertions(+), 28 deletions(-) +Merging mfd/for-mfd-next (495fb48dbd9b mfd: wm831x: Use DEFINE_RES_IRQ_NAMED() and DEFINE_RES_IRQ() to simplify code) +$ git merge mfd/for-mfd-next +Merge made by the 'recursive' strategy. +Merging backlight/for-backlight-next (1181f2164135 backlight: lm3630a: Convert to atomic PWM API and check for errors) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (56d629af09b9 power: supply: PCHG: Peripheral device charger) +$ git merge battery/for-next +Auto-merging drivers/power/supply/ab8500_fg.c +Auto-merging drivers/power/supply/ab8500_chargalg.c +Merge made by the 'recursive' strategy. + drivers/power/supply/Kconfig | 10 + + drivers/power/supply/Makefile | 3 +- + drivers/power/supply/ab8500-bm.h | 219 ++------ + drivers/power/supply/ab8500_bmdata.c | 34 +- + drivers/power/supply/ab8500_btemp.c | 22 +- + .../{abx500_chargalg.c => ab8500_chargalg.c} | 583 +++++++++++---------- + drivers/power/supply/ab8500_charger.c | 4 +- + drivers/power/supply/ab8500_fg.c | 20 +- + drivers/power/supply/cros_peripheral_charger.c | 386 ++++++++++++++ + include/linux/platform_data/cros_ec_commands.h | 67 +++ + 10 files changed, 830 insertions(+), 518 deletions(-) + rename drivers/power/supply/{abx500_chargalg.c => ab8500_chargalg.c} (75%) + create mode 100644 drivers/power/supply/cros_peripheral_charger.c +Merging regulator/for-next (c570c2337460 Merge remote-tracking branch 'regulator/for-5.15' into regulator-next) +$ git merge regulator/for-next +Removing Documentation/devicetree/bindings/regulator/uniphier-regulator.txt +Merge made by the 'recursive' strategy. + .../regulator/richtek,rtq2134-regulator.yaml | 106 ++++++ + .../regulator/richtek,rtq6752-regulator.yaml | 76 +++++ + .../regulator/socionext,uniphier-regulator.yaml | 85 +++++ + .../bindings/regulator/uniphier-regulator.txt | 58 ---- + drivers/regulator/Kconfig | 24 +- + drivers/regulator/Makefile | 2 + + drivers/regulator/bd718x7-regulator.c | 369 ++++++++++++++------ + drivers/regulator/da9063-regulator.c | 132 +++++++- + drivers/regulator/dbx500-prcmu.c | 4 +- + drivers/regulator/devres.c | 69 +--- + drivers/regulator/fixed.c | 5 +- + drivers/regulator/hi6421v600-regulator.c | 30 +- + drivers/regulator/mt6358-regulator.c | 87 +++-- + drivers/regulator/mt6359-regulator.c | 19 +- + drivers/regulator/mt6397-regulator.c | 15 +- + drivers/regulator/rt5033-regulator.c | 21 +- + drivers/regulator/rt6245-regulator.c | 2 +- + drivers/regulator/rtq2134-regulator.c | 373 +++++++++++++++++++++ + drivers/regulator/rtq6752-regulator.c | 289 ++++++++++++++++ + drivers/regulator/tps65910-regulator.c | 10 +- + include/linux/mfd/rt5033-private.h | 4 +- + include/linux/regulator/consumer.h | 15 - + include/linux/regulator/driver.h | 1 - + include/linux/regulator/machine.h | 2 +- + 24 files changed, 1444 insertions(+), 354 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rtq2134-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rtq6752-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/uniphier-regulator.txt + create mode 100644 drivers/regulator/rtq2134-regulator.c + create mode 100644 drivers/regulator/rtq6752-regulator.c +Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) +$ git merge security/next-testing +Already up to date! +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/policy.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/label.c +Auto-merging security/apparmor/include/label.h +Auto-merging security/apparmor/include/file.h +Auto-merging security/apparmor/apparmorfs.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 11995 and retry the command. +Merge made by the 'recursive' strategy. + security/apparmor/apparmorfs.c | 4 +-- + security/apparmor/include/file.h | 2 +- + security/apparmor/include/label.h | 1 + + security/apparmor/include/policy.h | 6 ++-- + security/apparmor/label.c | 4 +-- + security/apparmor/lsm.c | 22 +++++++------- + security/apparmor/path.c | 2 +- + security/apparmor/policy.c | 59 ++++++++++++++++++++++++++++++++------ + security/apparmor/policy_unpack.c | 2 +- + 9 files changed, 73 insertions(+), 29 deletions(-) +Merging integrity/next-integrity (907a399de7b0 evm: Check xattr size discrepancy between kernel and user) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring) +$ git merge keys/keys-next +Auto-merging scripts/Makefile +Auto-merging include/keys/system_keyring.h +Auto-merging certs/system_keyring.c +CONFLICT (content): Merge conflict in certs/system_keyring.c +Auto-merging certs/Makefile +Auto-merging certs/Kconfig +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 3399 and retry the command. +Resolved 'certs/system_keyring.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 80d8fdd3c7a2] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. +Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata) +$ git merge safesetid/safesetid-next +Already up to date. +Merging selinux/next (893c47d1964f selinux: return early for possible NULL audit buffers) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Merge made by the 'recursive' strategy. + security/selinux/hooks.c | 4 ++++ + security/selinux/ss/services.c | 2 ++ + 2 files changed, 6 insertions(+) +Merging smack/next (bfc3cac0c761 smack: mark 'smack_enabled' global variable as __initdata) +$ git merge smack/next +Merge made by the 'recursive' strategy. + security/smack/smack.h | 2 +- + security/smack/smack_access.c | 17 ++++++++--------- + security/smack/smack_lsm.c | 2 +- + 3 files changed, 10 insertions(+), 11 deletions(-) +Merging tomoyo/master (ff1176468d36 Linux 5.14-rc3) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (0178f9d0f60b tpm: Replace WARN_ONCE() with dev_err_once() in tpm_tis_status()) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (cf813c67d961 watchdog: iTCO_wdt: use dev_err() instead of pr_err()) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (9be9f5580ab6 Merge branches 'iommu/fixes', 'x86/amd' and 'core' into next) +$ git merge iommu/next +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging drivers/iommu/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 12 +- + drivers/iommu/Kconfig | 41 +++++ + drivers/iommu/amd/amd_iommu_types.h | 6 - + drivers/iommu/amd/init.c | 7 +- + drivers/iommu/amd/io_pgtable.c | 3 - + drivers/iommu/amd/iommu.c | 34 ++-- + drivers/iommu/amd/iommu_v2.c | 13 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 3 - + drivers/iommu/arm/arm-smmu/arm-smmu.c | 21 ++- + drivers/iommu/dma-iommu.c | 1 + + drivers/iommu/intel/iommu.c | 139 ++++++++------- + drivers/iommu/io-pgtable-arm-v7s.c | 50 +++++- + drivers/iommu/io-pgtable-arm.c | 223 +++++++++++++++--------- + drivers/iommu/iommu.c | 146 ++++++++++++---- + include/linux/io-pgtable.h | 8 + + include/linux/iommu.h | 11 +- + 16 files changed, 462 insertions(+), 256 deletions(-) +Merging audit/next (d97e99386ad0 audit: add header protection to kernel/audit.h) +$ git merge audit/next +Merge made by the 'recursive' strategy. + kernel/audit.h | 5 +++++ + 1 file changed, 5 insertions(+) +Merging devicetree/for-next (f72999f51da1 dt-bindings: arm: mediatek: mmsys: add MT8365 SoC binding) +$ git merge devicetree/for-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/pci/faraday,ftpci100.txt +Removing Documentation/devicetree/bindings/pci/designware-pcie.txt +Removing Documentation/devicetree/bindings/net/micrel-ks8851.txt +Removing Documentation/devicetree/bindings/i2c/brcm,iproc-i2c.txt +CONFLICT (modify/delete): Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt deleted in devicetree/for-next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b304f353ef4c] Merge remote-tracking branch 'devicetree/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/arm/mediatek/mediatek,mmsys.txt | 32 ---- + .../bindings/arm/mediatek/mediatek,mmsys.yaml | 58 +++++++ + .../display/allwinner,sun8i-a83t-dw-hdmi.yaml | 2 - + .../bindings/display/bridge/ti,sn65dsi83.yaml | 6 +- + .../devicetree/bindings/display/fsl,lcdif.yaml | 1 + + .../bindings/display/msm/dsi-controller-main.yaml | 6 +- + .../bindings/display/panel/boe,tv101wum-nl6.yaml | 1 - + .../devicetree/bindings/i2c/brcm,iproc-i2c.txt | 46 ------ + .../devicetree/bindings/i2c/brcm,iproc-i2c.yaml | 71 +++++++++ + .../interrupt-controller/ti,pruss-intc.yaml | 4 +- + .../devicetree/bindings/media/atmel,isc.yaml | 3 +- + .../devicetree/bindings/media/microchip,xisc.yaml | 2 +- + .../bindings/media/nxp,imx7-mipi-csi2.yaml | 2 - + .../devicetree/bindings/media/renesas,drif.yaml | 3 +- + .../devicetree/bindings/net/intel,dwmac-plat.yaml | 1 - + .../bindings/net/intel,ixp4xx-ethernet.yaml | 2 - + .../devicetree/bindings/net/micrel,ks8851.yaml | 96 +++++++++++ + .../devicetree/bindings/net/micrel-ks8851.txt | 18 --- + .../bindings/net/nfc/samsung,s3fwrn5.yaml | 3 - + .../devicetree/bindings/net/qca,ar71xx.yaml | 25 +-- + .../devicetree/bindings/pci/amlogic,meson-pcie.txt | 4 +- + .../devicetree/bindings/pci/axis,artpec6-pcie.txt | 2 +- + .../devicetree/bindings/pci/designware-pcie.txt | 77 --------- + .../devicetree/bindings/pci/faraday,ftpci100.txt | 135 ---------------- + .../devicetree/bindings/pci/faraday,ftpci100.yaml | 176 +++++++++++++++++++++ + .../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 2 +- + .../bindings/pci/hisilicon-histb-pcie.txt | 2 +- + .../devicetree/bindings/pci/intel-gw-pcie.yaml | 36 +---- + .../devicetree/bindings/pci/kirin-pcie.txt | 2 +- + .../devicetree/bindings/pci/layerscape-pci.txt | 2 +- + .../bindings/pci/nvidia,tegra194-pcie.txt | 5 +- + .../devicetree/bindings/pci/pci-armada8k.txt | 2 +- + Documentation/devicetree/bindings/pci/pcie-al.txt | 2 +- + .../devicetree/bindings/pci/qcom,pcie.txt | 14 +- + .../bindings/pci/samsung,exynos-pcie.yaml | 4 +- + .../devicetree/bindings/pci/sifive,fu740-pcie.yaml | 4 +- + .../devicetree/bindings/pci/snps,dw-pcie-ep.yaml | 90 +++++++++++ + .../devicetree/bindings/pci/snps,dw-pcie.yaml | 102 ++++++++++++ + .../bindings/pci/socionext,uniphier-pcie-ep.yaml | 4 +- + Documentation/devicetree/bindings/pci/ti-pci.txt | 4 +- + .../bindings/pci/toshiba,visconti-pcie.yaml | 110 +++++++++++++ + .../devicetree/bindings/pci/uniphier-pcie.txt | 2 +- + .../regulator/richtek,rt6245-regulator.yaml | 1 - + .../regulator/vqmmc-ipq4019-regulator.yaml | 1 - + .../bindings/reset/hisilicon,hi3660-reset.yaml | 1 - + .../devicetree/bindings/reset/intel,rcu-gw.yaml | 1 - + .../bindings/rtc/microcrystal,rv3032.yaml | 1 - + .../bindings/soc/litex/litex,soc-controller.yaml | 1 - + .../devicetree/bindings/sound/st,stm32-sai.yaml | 2 - + .../bindings/sound/ti,j721e-cpb-audio.yaml | 2 - + .../bindings/sound/ti,j721e-cpb-ivi-audio.yaml | 2 - + MAINTAINERS | 3 +- + drivers/of/base.c | 4 +- + drivers/of/fdt.c | 3 - + drivers/of/kexec.c | 40 ++--- + 55 files changed, 775 insertions(+), 450 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/brcm,iproc-i2c.txt + create mode 100644 Documentation/devicetree/bindings/i2c/brcm,iproc-i2c.yaml + create mode 100644 Documentation/devicetree/bindings/net/micrel,ks8851.yaml + delete mode 100644 Documentation/devicetree/bindings/net/micrel-ks8851.txt + delete mode 100644 Documentation/devicetree/bindings/pci/designware-pcie.txt + delete mode 100644 Documentation/devicetree/bindings/pci/faraday,ftpci100.txt + create mode 100644 Documentation/devicetree/bindings/pci/faraday,ftpci100.yaml + create mode 100644 Documentation/devicetree/bindings/pci/snps,dw-pcie-ep.yaml + create mode 100644 Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml + create mode 100644 Documentation/devicetree/bindings/pci/toshiba,visconti-pcie.yaml +Merging mailbox/mailbox-for-next (4f197188da66 MAINTAINERS: add entry for polarfire soc mailbox) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (4296a65e1d9d Merge remote-tracking branch 'spi/for-5.15' into spi-next) +$ git merge spi/for-next +Auto-merging drivers/spi/spi-imx.c +Removing Documentation/devicetree/bindings/spi/omap-spi.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/fsi/ibm,fsi2spi.yaml | 1 - + Documentation/devicetree/bindings/spi/omap-spi.txt | 48 -------- + .../devicetree/bindings/spi/omap-spi.yaml | 117 +++++++++++++++++++ + .../devicetree/bindings/spi/spi-mt65xx.txt | 1 + + drivers/spi/spi-fsi.c | 125 ++++----------------- + drivers/spi/spi-geni-qcom.c | 6 - + drivers/spi/spi-imx.c | 11 +- + drivers/spi/spi-mt65xx.c | 52 +++++++-- + drivers/spi/spi-pxa2xx.c | 35 +++--- + drivers/spi/spi-stm32.c | 122 ++++++++------------ + include/linux/platform_data/spi-mt65xx.h | 1 + + include/linux/spi/spi.h | 3 +- + 12 files changed, 251 insertions(+), 271 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/spi/omap-spi.txt + create mode 100644 Documentation/devicetree/bindings/spi/omap-spi.yaml +Merging tip/auto-latest (1606b3aadfab Merge branch 'x86/cpu') +$ git merge tip/auto-latest +Auto-merging include/uapi/linux/prctl.h +Auto-merging include/linux/sched.h +Removing include/asm-generic/atomic-long.h +Auto-merging arch/x86/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../testing/sysfs-bus-event_source-devices-uncore | 13 + + Documentation/admin-guide/hw-vuln/index.rst | 1 + + Documentation/admin-guide/hw-vuln/l1d_flush.rst | 69 ++ + Documentation/admin-guide/kernel-parameters.txt | 17 + + Documentation/atomic_t.txt | 41 + + Documentation/userspace-api/spec_ctrl.rst | 8 + + arch/Kconfig | 3 + + arch/x86/Kconfig | 1 + + arch/x86/events/intel/uncore.c | 45 +- + arch/x86/events/intel/uncore.h | 4 + + arch/x86/events/intel/uncore_discovery.c | 42 +- + arch/x86/events/intel/uncore_discovery.h | 21 + + arch/x86/events/intel/uncore_snbep.c | 585 ++++++++++- + arch/x86/include/asm/nospec-branch.h | 2 + + arch/x86/include/asm/processor.h | 2 + + arch/x86/include/asm/thread_info.h | 6 +- + arch/x86/include/asm/tlbflush.h | 2 +- + arch/x86/kernel/cpu/bugs.c | 70 ++ + arch/x86/kernel/smpboot.c | 10 +- + arch/x86/mm/tlb.c | 107 ++- + include/asm-generic/atomic-long.h | 1014 -------------------- + include/asm-generic/bitops/atomic.h | 32 +- + .../asm-generic/bitops/instrumented-non-atomic.h | 21 +- + include/asm-generic/bitops/lock.h | 39 +- + include/asm-generic/bitops/non-atomic.h | 41 +- + include/linux/atomic.h | 7 +- + include/linux/{ => atomic}/atomic-arch-fallback.h | 0 + .../atomic}/atomic-instrumented.h | 586 ++++++++++- + include/linux/atomic/atomic-long.h | 1014 ++++++++++++++++++++ + include/linux/sched.h | 10 + + include/linux/sched/sysctl.h | 18 - + include/linux/wait.h | 2 +- + include/uapi/linux/prctl.h | 1 + + kernel/events/core.c | 35 +- + kernel/locking/mutex.c | 124 +-- + kernel/locking/rwsem.c | 6 +- + kernel/sched/core.c | 6 +- + kernel/sched/debug.c | 7 + + kernel/sched/fair.c | 6 +- + kernel/sched/sched.h | 15 + + kernel/time/timer.c | 6 +- + scripts/atomic/check-atomics.sh | 6 +- + scripts/atomic/fallbacks/acquire | 4 +- + scripts/atomic/fallbacks/add_negative | 6 +- + scripts/atomic/fallbacks/add_unless | 6 +- + scripts/atomic/fallbacks/andnot | 4 +- + scripts/atomic/fallbacks/dec | 4 +- + scripts/atomic/fallbacks/dec_and_test | 6 +- + scripts/atomic/fallbacks/dec_if_positive | 6 +- + scripts/atomic/fallbacks/dec_unless_positive | 6 +- + scripts/atomic/fallbacks/fence | 4 +- + scripts/atomic/fallbacks/fetch_add_unless | 8 +- + scripts/atomic/fallbacks/inc | 4 +- + scripts/atomic/fallbacks/inc_and_test | 6 +- + scripts/atomic/fallbacks/inc_not_zero | 6 +- + scripts/atomic/fallbacks/inc_unless_negative | 6 +- + scripts/atomic/fallbacks/read_acquire | 2 +- + scripts/atomic/fallbacks/release | 4 +- + scripts/atomic/fallbacks/set_release | 2 +- + scripts/atomic/fallbacks/sub_and_test | 6 +- + scripts/atomic/fallbacks/try_cmpxchg | 4 +- + scripts/atomic/gen-atomic-fallback.sh | 68 +- + scripts/atomic/gen-atomic-instrumented.sh | 11 +- + scripts/atomic/gen-atomic-long.sh | 10 +- + scripts/atomic/gen-atomics.sh | 6 +- + 65 files changed, 2872 insertions(+), 1362 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-event_source-devices-uncore + create mode 100644 Documentation/admin-guide/hw-vuln/l1d_flush.rst + delete mode 100644 include/asm-generic/atomic-long.h + rename include/linux/{ => atomic}/atomic-arch-fallback.h (100%) + rename include/{asm-generic => linux/atomic}/atomic-instrumented.h (68%) + create mode 100644 include/linux/atomic/atomic-long.h +Merging clockevents/timers/drivers/next (6f64c8159af9 clocksource/drivers/arm_global_timer: Remove duplicated argument in arm_global_timer) +$ git merge clockevents/timers/drivers/next +Auto-merging drivers/clocksource/Kconfig +Merge made by the 'recursive' strategy. + drivers/clocksource/ingenic-sysost.c | 315 ++++++++++++++++++++++++++--------- + 1 file changed, 236 insertions(+), 79 deletions(-) +Merging edac/edac-for-next (e1ca90b7cc5c EDAC/mc: Add new HBM2 memory type) +$ git merge edac/edac-for-next +Merge made by the 'recursive' strategy. + drivers/edac/amd64_edac.c | 21 ++++++++------------- + drivers/edac/edac_mc.c | 1 + + include/linux/edac.h | 3 +++ + 3 files changed, 12 insertions(+), 13 deletions(-) +Merging irqchip/irq/irqchip-next (00a2b7c75895 Merge branch irq/bitmap_zalloc into irq/irqchip-next) +$ git merge irqchip/irq/irqchip-next +Merge made by the 'recursive' strategy. + drivers/irqchip/irq-alpine-msi.c | 6 ++---- + drivers/irqchip/irq-gic-v2m.c | 5 ++--- + drivers/irqchip/irq-gic-v3-its.c | 6 +++--- + drivers/irqchip/irq-gic-v3-mbi.c | 5 ++--- + drivers/irqchip/irq-ls-scfg-msi.c | 5 +---- + drivers/irqchip/irq-mvebu-gicp.c | 4 +--- + drivers/irqchip/irq-mvebu-odmi.c | 5 ++--- + drivers/irqchip/irq-partition-percpu.c | 3 +-- + 8 files changed, 14 insertions(+), 25 deletions(-) +Merging ftrace/for-next (352384d5c84e tracepoints: Update static_call before tp_funcs when adding a tracepoint) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (56dbe080de28 rcu: Comment rcu_gp_init() code waiting for CPU-hotplug operations) +$ git merge rcu/rcu/next +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/core.c +Removing kernel/kcsan/atomic.h +Merge made by the 'recursive' strategy. + .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 98 +- + .../RCU/Design/Requirements/Requirements.rst | 8 +- + Documentation/RCU/checklist.rst | 24 +- + Documentation/RCU/rcu_dereference.rst | 6 +- + Documentation/RCU/stallwarn.rst | 41 +- + Documentation/dev-tools/kcsan.rst | 12 + + .../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/sh/configs/sdk7786_defconfig | 1 - + arch/xtensa/configs/nommu_kc705_defconfig | 1 - + include/linux/rculist.h | 35 +- + include/linux/rcupdate.h | 4 +- + include/linux/rcutiny.h | 3 - + include/linux/srcutiny.h | 8 +- + kernel/irq/chip.c | 15 +- + kernel/irq/handle.c | 4 +- + kernel/irq/internals.h | 57 + + kernel/kcsan/atomic.h | 23 - + kernel/kcsan/core.c | 77 +- + kernel/kcsan/kcsan_test.c | 32 + + kernel/kcsan/permissive.h | 94 ++ + kernel/locking/locktorture.c | 25 +- + kernel/rcu/rcuscale.c | 4 +- + kernel/rcu/rcutorture.c | 9 +- + kernel/rcu/refscale.c | 36 +- + kernel/rcu/srcutiny.c | 2 +- + kernel/rcu/tasks.h | 36 +- + kernel/rcu/tree.c | 127 +- + kernel/rcu/tree_nocb.h | 1496 +++++++++++++++++++ + kernel/rcu/tree_plugin.h | 1506 +------------------- + kernel/rcu/tree_stall.h | 111 +- + kernel/scftorture.c | 103 +- + kernel/sched/core.c | 11 + + lib/Kconfig.debug | 16 + + lib/Kconfig.kcsan | 42 +- + tools/include/nolibc/nolibc.h | 15 +- + .../memory-model/Documentation/access-marking.txt | 151 +- + 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 + + tools/rcu/extract-stall.sh | 33 + + tools/testing/selftests/rcutorture/bin/jitter.sh | 10 +- + .../selftests/rcutorture/bin/kcsan-collapse.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-again.sh | 4 +- + .../selftests/rcutorture/bin/kvm-assign-cpus.sh | 106 ++ + .../rcutorture/bin/kvm-get-cpus-script.sh | 88 ++ + .../selftests/rcutorture/bin/kvm-recheck-lock.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck-scf.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 5 +- + .../selftests/rcutorture/bin/kvm-remote-noreap.sh | 30 + + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 20 +- + .../rcutorture/bin/kvm-test-1-run-batch.sh | 24 + + .../rcutorture/bin/kvm-test-1-run-qemu.sh | 49 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 2 + + tools/testing/selftests/rcutorture/bin/kvm.sh | 41 +- + tools/testing/selftests/rcutorture/bin/torture.sh | 48 +- + .../selftests/rcutorture/configs/rcu/RUDE01 | 2 +- + .../selftests/rcutorture/configs/rcu/TASKS01 | 2 +- + .../selftests/rcutorture/configs/rcu/TASKS03 | 2 +- + 75 files changed, 3691 insertions(+), 2017 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 + delete mode 100644 kernel/kcsan/atomic.h + create mode 100644 kernel/kcsan/permissive.h + create mode 100644 kernel/rcu/tree_nocb.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 + create mode 100644 tools/rcu/extract-stall.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-assign-cpus.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-get-cpus-script.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-remote-noreap.sh +Merging kvm/next (8750f9bbda11 KVM: add missing compat KVM_CLEAR_DIRTY_LOG) +$ git merge kvm/next +Already up to date. +Merging kvm-arm/next (188982cda00e Merge branch kvm-arm64/mmu/mte into kvmarm-master/next) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (1f703d2cf204 KVM: s390: allow facility 192 (vector-packed-decimal-enhancement facility 2)) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (83f877a09516 xen/events: remove redundant initialization of variable irq) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + drivers/xen/events/events_base.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging percpu/for-next (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next) +$ git merge percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (f728c4a9e840 workqueue: Fix possible memory leaks in wq_numa_init()) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) +Merging drivers-x86/for-next (153cca9caa81 platform/x86: Add and use a dual_accel_detect() helper) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (e73f0f0ee754 Linux 5.14-rc1) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (e73f0f0ee754 Linux 5.14-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (e642197562cd leds: is31fl32xx: Fix missing error code in is31fl32xx_parse_dt()) +$ git merge leds/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/leds/Kconfig | 57 -------------------------------- + drivers/leds/Makefile | 6 ---- + drivers/leds/flash/Kconfig | 53 +++++++++++++++++++++++++++++ + drivers/leds/flash/Makefile | 6 ++++ + drivers/leds/{ => flash}/leds-aat1290.c | 0 + drivers/leds/{ => flash}/leds-as3645a.c | 0 + drivers/leds/{ => flash}/leds-ktd2692.c | 0 + drivers/leds/{ => flash}/leds-lm3601x.c | 0 + drivers/leds/{ => flash}/leds-max77693.c | 0 + drivers/leds/{ => flash}/leds-sgm3140.c | 0 + drivers/leds/leds-is31fl32xx.c | 1 + + 12 files changed, 61 insertions(+), 64 deletions(-) + rename drivers/leds/{ => flash}/leds-aat1290.c (100%) + rename drivers/leds/{ => flash}/leds-as3645a.c (100%) + rename drivers/leds/{ => flash}/leds-ktd2692.c (100%) + rename drivers/leds/{ => flash}/leds-lm3601x.c (100%) + rename drivers/leds/{ => flash}/leds-max77693.c (100%) + rename drivers/leds/{ => flash}/leds-sgm3140.c (100%) +Merging ipmi/for-next (f9714eb04364 ipmi: ssif_bmc: Return -EFAULT if copy_from_user() fails) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ipmi/ssif-bmc.yaml | 38 + + drivers/char/ipmi/Kconfig | 11 + + drivers/char/ipmi/Makefile | 1 + + drivers/char/ipmi/ssif_bmc.c | 780 +++++++++++++++++++++ + drivers/char/ipmi/ssif_bmc.h | 106 +++ + drivers/i2c/busses/i2c-aspeed.c | 20 + + include/linux/i2c.h | 2 + + 7 files changed, 958 insertions(+) + create mode 100644 Documentation/devicetree/bindings/ipmi/ssif-bmc.yaml + create mode 100644 drivers/char/ipmi/ssif_bmc.c + create mode 100644 drivers/char/ipmi/ssif_bmc.h +Merging driver-core/driver-core-next (b2c943e52705 nubus: Make struct nubus_driver::remove return void) +$ git merge driver-core/driver-core-next +Auto-merging drivers/spi/spi.c +Auto-merging drivers/s390/cio/ccwgroup.c +Auto-merging drivers/net/netdevsim/bus.c +Auto-merging drivers/hid/intel-ish-hid/ishtp/bus.c +Auto-merging drivers/dma/idxd/sysfs.c +Auto-merging drivers/base/firmware_loader/main.c +Auto-merging drivers/base/dd.c +Auto-merging drivers/acpi/bus.c +Merge made by the 'recursive' strategy. + arch/arm/common/locomo.c | 3 +- + arch/arm/common/sa1111.c | 4 +- + arch/arm/mach-rpc/ecard.c | 4 +- + arch/mips/sgi-ip22/ip22-gio.c | 3 +- + arch/parisc/kernel/drivers.c | 5 +- + arch/powerpc/platforms/ps3/system-bus.c | 3 +- + arch/powerpc/platforms/pseries/ibmebus.c | 3 +- + arch/powerpc/platforms/pseries/vio.c | 3 +- + arch/s390/include/asm/eadm.h | 2 +- + arch/sparc/kernel/vio.c | 4 +- + drivers/acpi/bus.c | 3 +- + drivers/amba/bus.c | 4 +- + drivers/base/auxiliary.c | 4 +- + drivers/base/bus.c | 6 +- + drivers/base/cacheinfo.c | 1 + + drivers/base/cpu.c | 4 +- + drivers/base/dd.c | 16 ++- + drivers/base/firmware_loader/main.c | 20 ++-- + drivers/base/isa.c | 4 +- + drivers/base/map.c | 12 +- + drivers/base/node.c | 8 +- + drivers/base/platform.c | 4 +- + drivers/base/power/wakeup.c | 2 +- + drivers/bcma/main.c | 6 +- + drivers/bus/sunxi-rsb.c | 4 +- + drivers/cxl/core.c | 3 +- + drivers/dax/bus.c | 4 +- + drivers/dma/idxd/sysfs.c | 4 +- + drivers/firewire/core-device.c | 4 +- + drivers/firmware/arm_scmi/bus.c | 4 +- + drivers/firmware/google/coreboot_table.c | 4 +- + drivers/fpga/dfl.c | 4 +- + drivers/hid/hid-core.c | 4 +- + drivers/hid/intel-ish-hid/ishtp/bus.c | 4 +- + drivers/hv/vmbus_drv.c | 5 +- + drivers/hwtracing/intel_th/core.c | 4 +- + drivers/i2c/i2c-core-base.c | 5 +- + drivers/i3c/master.c | 4 +- + drivers/input/gameport/gameport.c | 3 +- + drivers/input/serio/serio.c | 3 +- + drivers/ipack/ipack.c | 4 +- + drivers/macintosh/macio_asic.c | 4 +- + drivers/mcb/mcb-core.c | 4 +- + drivers/media/pci/bt8xx/bttv-gpio.c | 3 +- + drivers/memstick/core/memstick.c | 3 +- + drivers/mfd/mcp-core.c | 3 +- + drivers/misc/mei/bus.c | 4 +- + drivers/misc/tifm_core.c | 3 +- + drivers/mmc/core/bus.c | 4 +- + drivers/mmc/core/sdio_bus.c | 4 +- + drivers/net/ethernet/8390/mac8390.c | 3 +- + drivers/net/ethernet/natsemi/macsonic.c | 4 +- + drivers/net/netdevsim/bus.c | 3 +- + drivers/ntb/core.c | 4 +- + drivers/ntb/ntb_transport.c | 4 +- + drivers/nubus/bus.c | 6 +- + drivers/nvdimm/bus.c | 3 +- + drivers/pci/endpoint/pci-epf-core.c | 7 +- + drivers/pci/pci-driver.c | 3 +- + drivers/pcmcia/ds.c | 4 +- + drivers/platform/surface/aggregator/bus.c | 4 +- + drivers/platform/x86/wmi.c | 4 +- + drivers/pnp/driver.c | 3 +- + drivers/rapidio/rio-driver.c | 4 +- + drivers/rpmsg/rpmsg_core.c | 7 +- + drivers/s390/block/scm_drv.c | 4 +- + drivers/s390/cio/ccwgroup.c | 6 +- + drivers/s390/cio/chsc_sch.c | 3 +- + drivers/s390/cio/css.c | 7 +- + drivers/s390/cio/css.h | 2 +- + drivers/s390/cio/device.c | 9 +- + drivers/s390/cio/eadm_sch.c | 4 +- + drivers/s390/cio/scm.c | 5 +- + drivers/s390/cio/vfio_ccw_drv.c | 3 +- + drivers/s390/crypto/ap_bus.c | 4 +- + drivers/scsi/scsi_debug.c | 3 +- + drivers/sh/superhyway/superhyway.c | 8 +- + drivers/siox/siox-core.c | 4 +- + drivers/slimbus/core.c | 4 +- + drivers/soc/qcom/apr.c | 4 +- + drivers/spi/spi.c | 4 +- + drivers/spmi/spmi.c | 3 +- + drivers/ssb/main.c | 4 +- + drivers/staging/fieldbus/anybuss/host.c | 4 +- + drivers/staging/greybus/gbphy.c | 4 +- + drivers/target/loopback/tcm_loop.c | 5 +- + drivers/thunderbolt/domain.c | 4 +- + drivers/tty/serdev/core.c | 4 +- + drivers/usb/common/ulpi.c | 4 +- + drivers/usb/serial/bus.c | 4 +- + drivers/usb/typec/bus.c | 4 +- + drivers/vdpa/vdpa.c | 4 +- + drivers/vfio/mdev/mdev_driver.c | 4 +- + drivers/virtio/virtio.c | 3 +- + drivers/vlynq/vlynq.c | 4 +- + drivers/vme/vme.c | 4 +- + drivers/xen/xenbus/xenbus.h | 2 +- + drivers/xen/xenbus/xenbus_probe.c | 4 +- + drivers/zorro/zorro-driver.c | 3 +- + fs/kernfs/dir.c | 153 +++++++++++++----------- + fs/kernfs/file.c | 4 +- + fs/kernfs/inode.c | 26 ++-- + fs/kernfs/kernfs-internal.h | 24 +++- + fs/kernfs/mount.c | 12 +- + fs/kernfs/symlink.c | 4 +- + fs/sysfs/group.c | 2 +- + include/linux/device/bus.h | 2 +- + include/linux/kernfs.h | 7 +- + include/linux/nubus.h | 2 +- + include/linux/pci-epf.h | 2 +- + sound/ac97/bus.c | 6 +- + sound/aoa/soundbus/core.c | 4 +- + tools/testing/selftests/firmware/fw_namespace.c | 3 +- + 113 files changed, 286 insertions(+), 397 deletions(-) +$ git am -3 ../patches/0001-fix-for-drm-Introduce-the-DP-AUX-bus.patch +Applying: fix for "drm: Introduce the DP AUX bus" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/drm_dp_aux_bus.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 3ef42969e6e9] Merge remote-tracking branch 'driver-core/driver-core-next' + Date: Fri Jul 30 13:07:57 2021 +0100 +Merging usb/usb-next (64cd4271ea8e usb: gadget: pxa25x_udc: Constify static struct pxa25x_ep_ops) +$ git merge usb/usb-next +Auto-merging drivers/usb/host/xhci-pci.c +Auto-merging drivers/of/base.c +Auto-merging arch/arm64/boot/dts/qcom/sc7280.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/sc7280.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sc7280-idp.dts +Resolved 'arch/arm64/boot/dts/qcom/sc7280.dtsi' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1dd605282c97] Merge remote-tracking branch 'usb/usb-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/configfs-usb-gadget-uac1 | 10 + + Documentation/ABI/testing/configfs-usb-gadget-uac2 | 10 + + .../bindings/phy/qcom,qmp-usb3-dp-phy.yaml | 1 + + .../devicetree/bindings/usb/generic-ehci.yaml | 6 + + .../devicetree/bindings/usb/generic-ohci.yaml | 6 + + .../devicetree/bindings/usb/mediatek,mtu3.yaml | 47 +- + .../devicetree/bindings/usb/qcom,dwc3.yaml | 1 + + .../devicetree/bindings/usb/snps,dwc3.yaml | 15 +- + Documentation/usb/gadget-testing.rst | 38 +- + drivers/of/base.c | 1 + + drivers/usb/common/common.c | 20 + + drivers/usb/dwc2/core.h | 2 + + drivers/usb/dwc2/gadget.c | 28 +- + drivers/usb/dwc3/core.c | 15 + + drivers/usb/dwc3/core.h | 16 + + drivers/usb/dwc3/drd.c | 8 +- + drivers/usb/dwc3/dwc3-qcom.c | 24 +- + drivers/usb/dwc3/ep0.c | 2 + + drivers/usb/dwc3/gadget.c | 234 ++++++- + drivers/usb/gadget/Kconfig | 1 + + drivers/usb/gadget/composite.c | 8 +- + drivers/usb/gadget/configfs.c | 4 + + drivers/usb/gadget/function/f_ncm.c | 50 +- + drivers/usb/gadget/function/f_uac1.c | 674 ++++++++++++++++++++- + drivers/usb/gadget/function/f_uac2.c | 656 ++++++++++++++++++-- + drivers/usb/gadget/function/f_uvc.c | 1 + + drivers/usb/gadget/function/u_audio.c | 369 ++++++++++- + drivers/usb/gadget/function/u_audio.h | 22 + + drivers/usb/gadget/function/u_ether.c | 5 +- + drivers/usb/gadget/function/u_uac1.h | 20 + + drivers/usb/gadget/function/u_uac2.h | 23 +- + drivers/usb/gadget/function/uvc.h | 15 +- + drivers/usb/gadget/function/uvc_queue.c | 28 +- + drivers/usb/gadget/function/uvc_queue.h | 7 +- + drivers/usb/gadget/function/uvc_video.c | 155 ++++- + drivers/usb/gadget/function/uvc_video.h | 2 + + drivers/usb/gadget/legacy/Kconfig | 1 + + drivers/usb/gadget/udc/core.c | 19 + + drivers/usb/gadget/udc/pxa25x_udc.c | 2 +- + drivers/usb/host/ehci-mv.c | 23 +- + drivers/usb/host/fotg210-hcd.c | 48 +- + drivers/usb/host/fotg210.h | 5 - + drivers/usb/host/ohci-spear.c | 2 +- + drivers/usb/host/xhci-pci-renesas.c | 7 +- + drivers/usb/host/xhci-pci.c | 2 - + drivers/usb/host/xhci-pci.h | 3 - + drivers/usb/isp1760/isp1760-hcd.c | 23 +- + drivers/usb/mtu3/mtu3.h | 8 + + drivers/usb/mtu3/mtu3_core.c | 115 +++- + drivers/usb/mtu3/mtu3_dr.c | 26 +- + drivers/usb/mtu3/mtu3_dr.h | 30 +- + drivers/usb/mtu3/mtu3_gadget.c | 5 + + drivers/usb/mtu3/mtu3_host.c | 106 +++- + drivers/usb/mtu3/mtu3_plat.c | 166 ++++- + drivers/usb/phy/phy-isp1301-omap.c | 2 +- + include/linux/of.h | 5 + + include/linux/usb/audio-v2.h | 14 + + include/linux/usb/gadget.h | 4 + + include/linux/usb/otg.h | 1 + + 59 files changed, 2823 insertions(+), 318 deletions(-) +Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (ff1176468d36 Linux 5.14-rc3) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/for-usb-next (956df1bb0ab8 usb: chipidea: host: fix port index underflow and UBSAN complains) +$ git merge usb-chipidea-next/for-usb-next +Auto-merging drivers/usb/cdns3/cdnsp-gadget.c +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/host.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) +Merging tty/tty-next (6c44eb5905f6 serial: omap: Only allow if 8250_omap is not selected) +$ git merge tty/tty-next +Auto-merging drivers/usb/gadget/function/u_serial.c +Auto-merging drivers/tty/synclink_gt.c +Auto-merging drivers/tty/serial/max310x.c +Auto-merging drivers/tty/serial/8250/8250_port.c +Auto-merging drivers/tty/serial/8250/8250_pci.c +Auto-merging drivers/net/usb/hso.c +Auto-merging drivers/char/pcmcia/synclink_cs.c +Removing Documentation/devicetree/bindings/serial/cdns,uart.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/serial/8250.yaml | 6 + + .../devicetree/bindings/serial/cdns,uart.txt | 27 -- + .../devicetree/bindings/serial/cdns,uart.yaml | 66 +++++ + .../devicetree/bindings/serial/mtk-uart.txt | 1 + + arch/alpha/kernel/srmcons.c | 8 +- + arch/m68k/emu/nfcon.c | 30 +-- + arch/parisc/kernel/pdc_cons.c | 34 +-- + arch/um/drivers/line.c | 13 +- + arch/xtensa/platforms/iss/console.c | 45 ++-- + drivers/char/pcmcia/synclink_cs.c | 4 +- + drivers/char/ttyprintk.c | 4 +- + drivers/ipack/devices/ipoctal.c | 13 +- + drivers/isdn/capi/capi.c | 14 +- + drivers/misc/bcm-vk/bcm_vk_tty.c | 8 +- + drivers/mmc/core/sdio_uart.c | 12 +- + drivers/net/usb/hso.c | 12 +- + drivers/s390/char/con3215.c | 11 +- + drivers/s390/char/sclp_tty.c | 15 +- + drivers/s390/char/sclp_vt220.c | 9 +- + drivers/s390/char/tty3270.c | 4 +- + drivers/staging/fwserial/fwserial.c | 8 +- + drivers/staging/gdm724x/gdm_tty.c | 13 +- + drivers/staging/greybus/uart.c | 4 +- + drivers/tty/amiserial.c | 278 ++++++++------------- + drivers/tty/ehv_bytechan.c | 34 +-- + drivers/tty/goldfish.c | 18 +- + drivers/tty/hvc/hvc_console.c | 10 +- + drivers/tty/hvc/hvc_xen.c | 17 +- + drivers/tty/hvc/hvcs.c | 12 +- + drivers/tty/hvc/hvsi.c | 55 ++-- + drivers/tty/ipwireless/tty.c | 12 +- + drivers/tty/mips_ejtag_fdc.c | 2 +- + drivers/tty/moxa.c | 4 +- + drivers/tty/mxser.c | 12 +- + drivers/tty/n_gsm.c | 13 +- + drivers/tty/nozomi.c | 12 +- + drivers/tty/serial/8250/8250_bcm7271.c | 2 +- + drivers/tty/serial/8250/8250_exar.c | 36 ++- + drivers/tty/serial/8250/8250_lpss.c | 10 + + drivers/tty/serial/8250/8250_omap.c | 2 +- + drivers/tty/serial/8250/8250_pci.c | 2 +- + drivers/tty/serial/8250/8250_pnp.c | 2 + + drivers/tty/serial/8250/8250_port.c | 3 +- + drivers/tty/serial/8250/Kconfig | 10 +- + drivers/tty/serial/Kconfig | 4 +- + drivers/tty/serial/amba-pl011.c | 197 ++++++++++++++- + drivers/tty/serial/jsm/jsm_neo.c | 2 + + drivers/tty/serial/jsm/jsm_tty.c | 3 + + drivers/tty/serial/kgdb_nmi.c | 11 +- + drivers/tty/serial/max310x.c | 15 +- + drivers/tty/serial/omap-serial.c | 75 +----- + drivers/tty/serial/samsung_tty.c | 46 ++-- + drivers/tty/serial/serial_core.c | 20 +- + drivers/tty/serial/uartlite.c | 61 ++++- + drivers/tty/synclink_gt.c | 12 +- + drivers/tty/tty_io.c | 13 - + drivers/tty/ttynull.c | 4 +- + drivers/tty/vcc.c | 4 +- + drivers/tty/vt/keyboard.c | 62 ++--- + drivers/tty/vt/vt.c | 27 +- + drivers/usb/class/cdc-acm.c | 14 +- + drivers/usb/gadget/function/u_serial.c | 36 +-- + drivers/usb/host/xhci-dbgtty.c | 4 +- + drivers/usb/serial/usb-serial.c | 13 +- + include/linux/tty.h | 275 +------------------- + include/linux/tty_buffer.h | 59 +++++ + include/linux/tty_driver.h | 39 +-- + include/linux/tty_flip.h | 8 +- + include/linux/tty_ldisc.h | 17 ++ + include/linux/tty_port.h | 208 +++++++++++++++ + include/linux/vt_kern.h | 30 +-- + include/uapi/linux/serial_reg.h | 1 + + net/bluetooth/rfcomm/tty.c | 12 +- + 73 files changed, 1218 insertions(+), 961 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/serial/cdns,uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/cdns,uart.yaml + create mode 100644 include/linux/tty_buffer.h + create mode 100644 include/linux/tty_port.h +Merging char-misc/char-misc-next (9bb3a9dddbf1 fpga: versal-fpga: Remove empty functions) +$ git merge char-misc/char-misc-next +Removing Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/binderfs.rst | 13 ++ + .../firmware/xilinx/xlnx,zynqmp-firmware.txt | 44 ------- + .../firmware/xilinx/xlnx,zynqmp-firmware.yaml | 89 ++++++++++++++ + .../devicetree/bindings/fpga/xlnx,versal-fpga.yaml | 33 +++++ + Documentation/driver-api/fpga/fpga-bridge.rst | 10 +- + Documentation/driver-api/fpga/fpga-mgr.rst | 12 +- + Documentation/driver-api/fpga/fpga-programming.rst | 8 +- + Documentation/driver-api/fpga/fpga-region.rst | 20 +-- + Documentation/fpga/dfl.rst | 4 +- + drivers/accessibility/speakup/i18n.c | 14 +-- + drivers/accessibility/speakup/speakup_soft.c | 15 ++- + drivers/android/binderfs.c | 39 ++++++ + drivers/bus/fsl-mc/fsl-mc-bus.c | 134 ++++++++++++++++++--- + drivers/dio/dio.c | 2 +- + drivers/firmware/xilinx/zynqmp.c | 17 +++ + drivers/fpga/Kconfig | 9 ++ + drivers/fpga/Makefile | 1 + + drivers/fpga/altera-cvp.c | 2 +- + drivers/fpga/altera-freeze-bridge.c | 2 + + drivers/fpga/dfl-fme-mgr.c | 6 - + drivers/fpga/dfl-fme-pr.c | 2 +- + drivers/fpga/dfl-n3000-nios.c | 2 +- + drivers/fpga/dfl-pci.c | 5 + + drivers/fpga/dfl.h | 2 +- + drivers/fpga/fpga-bridge.c | 8 +- + drivers/fpga/fpga-mgr.c | 111 +++++++++++------ + drivers/fpga/stratix10-soc.c | 6 - + drivers/fpga/ts73xx-fpga.c | 6 - + drivers/fpga/versal-fpga.c | 83 +++++++++++++ + drivers/fpga/xilinx-pr-decoupler.c | 2 + + drivers/fpga/xilinx-spi.c | 2 + + drivers/fpga/zynq-fpga.c | 6 +- + drivers/fpga/zynqmp-fpga.c | 10 +- + drivers/misc/lkdtm/core.c | 1 - + drivers/misc/pci_endpoint_test.c | 1 + + drivers/misc/pvpanic/pvpanic-pci.c | 2 + + drivers/misc/sgi-gru/grumain.c | 6 +- + drivers/misc/sgi-gru/grutables.h | 3 +- + drivers/most/most_cdev.c | 8 +- + include/linux/firmware/xlnx-zynqmp.h | 10 ++ + include/linux/fpga/fpga-mgr.h | 2 +- + scripts/spdxcheck-test.sh | 16 ++- + .../selftests/filesystems/binderfs/binderfs_test.c | 17 +++ + 43 files changed, 593 insertions(+), 192 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.txt + create mode 100644 Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.yaml + create mode 100644 Documentation/devicetree/bindings/fpga/xlnx,versal-fpga.yaml + create mode 100644 drivers/fpga/versal-fpga.c +Merging extcon/extcon-next (07de34f5ce1e extcon: max3355: Drop unused include) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-max3355.c | 1 - + drivers/extcon/extcon-usb-gpio.c | 3 +-- + 2 files changed, 1 insertion(+), 3 deletions(-) +Merging phy-next/next (c1302e8ce517 phy: tegra: xusb: mark PM functions as __maybe_unused) +$ git merge phy-next/next +Merge made by the 'recursive' strategy. + ...keembay-usb.yaml => intel,keembay-phy-usb.yaml} | 2 +- + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 2 + + .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 1 + + drivers/phy/qualcomm/phy-qcom-qmp.c | 140 +++++++++++++++++++++ + drivers/phy/samsung/Makefile | 5 +- + .../{phy-exynos7-ufs.h => phy-exynos7-ufs.c} | 8 +- + drivers/phy/samsung/phy-exynosautov9-ufs.c | 67 ++++++++++ + drivers/phy/samsung/phy-samsung-ufs.c | 3 + + drivers/phy/samsung/phy-samsung-ufs.h | 13 +- + drivers/phy/tegra/xusb.c | 4 +- + 10 files changed, 232 insertions(+), 13 deletions(-) + rename Documentation/devicetree/bindings/phy/{intel,phy-keembay-usb.yaml => intel,keembay-phy-usb.yaml} (93%) + rename drivers/phy/samsung/{phy-exynos7-ufs.h => phy-exynos7-ufs.c} (93%) + create mode 100644 drivers/phy/samsung/phy-exynosautov9-ufs.c +Merging soundwire/next (caa15c8dcb00 soundwire: dmi-quirks: add quirk for Intel 'Bishop County' NUC M15) +$ git merge soundwire/next +Merge made by the 'recursive' strategy. + drivers/soundwire/bus.c | 4 +++- + drivers/soundwire/cadence_master.c | 3 +-- + drivers/soundwire/dmi-quirks.c | 36 ++++++++++++++++++++++-------------- + 3 files changed, 26 insertions(+), 17 deletions(-) +Merging thunderbolt/next (ff1176468d36 Linux 5.14-rc3) +$ git merge thunderbolt/next +Already up to date. +Merging vfio/next (6a45ece4c9af vfio/pci: Handle concurrent vma faults) +$ git merge vfio/next +Already up to date. +Merging staging/staging-next (7aaabc37943f staging/vc04_services: Remove all strcpy() uses in favor of strscpy()) +$ git merge staging/staging-next +Removing drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +Auto-merging drivers/staging/rtl8723bs/os_dep/os_intfs.c +Auto-merging drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +Auto-merging drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +Removing drivers/staging/hikey9xx/hi6421-spmi-pmic.c +Removing drivers/staging/hikey9xx/TODO +Removing drivers/staging/hikey9xx/Makefile +Removing drivers/staging/hikey9xx/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/mfd}/hisilicon,hi6421-spmi-pmic.yaml | 31 +- + MAINTAINERS | 6 +- + drivers/mfd/Kconfig | 16 + + drivers/mfd/Makefile | 1 + + drivers/mfd/hi6421-spmi-pmic.c | 72 + + drivers/misc/Kconfig | 10 + + drivers/misc/Makefile | 1 + + drivers/misc/hi6421v600-irq.c | 307 + + drivers/staging/Kconfig | 4 +- + drivers/staging/Makefile | 4 +- + drivers/staging/board/board.c | 7 +- + drivers/staging/hikey9xx/Kconfig | 19 - + drivers/staging/hikey9xx/Makefile | 3 - + drivers/staging/hikey9xx/TODO | 5 - + drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 311 - + drivers/staging/ks7010/ks7010_sdio.c | 2 +- + drivers/staging/ks7010/ks_wlan_net.c | 10 +- + drivers/staging/most/video/video.c | 4 +- + drivers/staging/qlge/qlge_dbg.c | 4 +- + drivers/staging/r8188eu/Kconfig | 25 + + drivers/staging/r8188eu/Makefile | 129 + + drivers/staging/r8188eu/core/rtw_ap.c | 1976 +++++ + drivers/staging/r8188eu/core/rtw_br_ext.c | 1184 +++ + drivers/staging/r8188eu/core/rtw_cmd.c | 2206 +++++ + drivers/staging/r8188eu/core/rtw_debug.c | 943 +++ + drivers/staging/r8188eu/core/rtw_efuse.c | 872 ++ + drivers/staging/r8188eu/core/rtw_ieee80211.c | 1625 ++++ + drivers/staging/r8188eu/core/rtw_io.c | 323 + + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 1118 +++ + drivers/staging/r8188eu/core/rtw_iol.c | 209 + + drivers/staging/r8188eu/core/rtw_led.c | 1705 ++++ + drivers/staging/r8188eu/core/rtw_mlme.c | 2354 ++++++ + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 8407 ++++++++++++++++++++ + drivers/staging/r8188eu/core/rtw_mp.c | 1000 +++ + drivers/staging/r8188eu/core/rtw_mp_ioctl.c | 1352 ++++ + drivers/staging/r8188eu/core/rtw_p2p.c | 2068 +++++ + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 655 ++ + drivers/staging/r8188eu/core/rtw_recv.c | 2252 ++++++ + drivers/staging/r8188eu/core/rtw_rf.c | 88 + + drivers/staging/r8188eu/core/rtw_security.c | 1757 ++++ + drivers/staging/r8188eu/core/rtw_sreset.c | 79 + + drivers/staging/r8188eu/core/rtw_sta_mgt.c | 609 ++ + drivers/staging/r8188eu/core/rtw_wlan_util.c | 1690 ++++ + drivers/staging/r8188eu/core/rtw_xmit.c | 2370 ++++++ + drivers/staging/r8188eu/hal/Hal8188EPwrSeq.c | 86 + + drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c | 760 ++ + drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 720 ++ + drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c | 230 + + drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c | 268 + + drivers/staging/r8188eu/hal/HalPhyRf.c | 49 + + drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 1505 ++++ + drivers/staging/r8188eu/hal/HalPwrSeqCmd.c | 132 + + drivers/staging/r8188eu/hal/hal_com.c | 381 + + drivers/staging/r8188eu/hal/hal_intf.c | 468 ++ + drivers/staging/r8188eu/hal/odm.c | 2174 +++++ + drivers/staging/r8188eu/hal/odm_HWConfig.c | 601 ++ + drivers/staging/r8188eu/hal/odm_RTL8188E.c | 400 + + drivers/staging/r8188eu/hal/odm_RegConfig8188E.c | 130 + + drivers/staging/r8188eu/hal/odm_debug.c | 32 + + drivers/staging/r8188eu/hal/odm_interface.c | 205 + + drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 762 ++ + drivers/staging/r8188eu/hal/rtl8188e_dm.c | 267 + + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 2390 ++++++ + drivers/staging/r8188eu/hal/rtl8188e_mp.c | 851 ++ + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 1135 +++ + drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 569 ++ + drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 202 + + drivers/staging/r8188eu/hal/rtl8188e_sreset.c | 80 + + drivers/staging/r8188eu/hal/rtl8188e_xmit.c | 91 + + drivers/staging/r8188eu/hal/rtl8188eu_led.c | 111 + + drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 136 + + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 703 ++ + drivers/staging/r8188eu/hal/usb_halinit.c | 2334 ++++++ + drivers/staging/r8188eu/hal/usb_ops_linux.c | 717 ++ + drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 269 + + drivers/staging/r8188eu/include/Hal8188EPhyReg.h | 1088 +++ + drivers/staging/r8188eu/include/Hal8188EPwrSeq.h | 173 + + .../staging/r8188eu/include/Hal8188ERateAdaptive.h | 75 + + drivers/staging/r8188eu/include/Hal8188EReg.h | 44 + + drivers/staging/r8188eu/include/HalHWImg8188E_BB.h | 44 + + drivers/staging/r8188eu/include/HalHWImg8188E_FW.h | 33 + + .../staging/r8188eu/include/HalHWImg8188E_MAC.h | 30 + + drivers/staging/r8188eu/include/HalHWImg8188E_RF.h | 30 + + drivers/staging/r8188eu/include/HalPhyRf.h | 30 + + drivers/staging/r8188eu/include/HalPhyRf_8188e.h | 58 + + drivers/staging/r8188eu/include/HalPwrSeqCmd.h | 126 + + drivers/staging/r8188eu/include/HalVerDef.h | 166 + + drivers/staging/r8188eu/include/autoconf.h | 43 + + drivers/staging/r8188eu/include/basic_types.h | 184 + + drivers/staging/r8188eu/include/cmd_osdep.h | 32 + + drivers/staging/r8188eu/include/drv_types.h | 346 + + drivers/staging/r8188eu/include/drv_types_linux.h | 23 + + drivers/staging/r8188eu/include/ethernet.h | 41 + + drivers/staging/r8188eu/include/h2clbk.h | 32 + + drivers/staging/r8188eu/include/hal_com.h | 172 + + drivers/staging/r8188eu/include/hal_intf.h | 430 + + drivers/staging/r8188eu/include/ieee80211.h | 1261 +++ + drivers/staging/r8188eu/include/ieee80211_ext.h | 287 + + drivers/staging/r8188eu/include/if_ether.h | 111 + + drivers/staging/r8188eu/include/ioctl_cfg80211.h | 107 + + drivers/staging/r8188eu/include/ip.h | 125 + + drivers/staging/r8188eu/include/mlme_osdep.h | 35 + + drivers/staging/r8188eu/include/mp_custom_oid.h | 349 + + drivers/staging/r8188eu/include/nic_spec.h | 41 + + drivers/staging/r8188eu/include/odm.h | 1182 +++ + drivers/staging/r8188eu/include/odm_HWConfig.h | 133 + + drivers/staging/r8188eu/include/odm_RTL8188E.h | 56 + + .../staging/r8188eu/include/odm_RegConfig8188E.h | 43 + + .../staging/r8188eu/include/odm_RegDefine11AC.h | 46 + + drivers/staging/r8188eu/include/odm_RegDefine11N.h | 160 + + drivers/staging/r8188eu/include/odm_debug.h | 143 + + drivers/staging/r8188eu/include/odm_interface.h | 164 + + drivers/staging/r8188eu/include/odm_precomp.h | 103 + + drivers/staging/r8188eu/include/odm_reg.h | 116 + + drivers/staging/r8188eu/include/odm_types.h | 61 + + drivers/staging/r8188eu/include/osdep_intf.h | 83 + + drivers/staging/r8188eu/include/osdep_service.h | 489 ++ + drivers/staging/r8188eu/include/recv_osdep.h | 54 + + drivers/staging/r8188eu/include/rtl8188e_cmd.h | 122 + + drivers/staging/r8188eu/include/rtl8188e_dm.h | 62 + + drivers/staging/r8188eu/include/rtl8188e_hal.h | 471 ++ + drivers/staging/r8188eu/include/rtl8188e_led.h | 34 + + drivers/staging/r8188eu/include/rtl8188e_recv.h | 69 + + drivers/staging/r8188eu/include/rtl8188e_rf.h | 35 + + drivers/staging/r8188eu/include/rtl8188e_spec.h | 1438 ++++ + drivers/staging/r8188eu/include/rtl8188e_sreset.h | 31 + + drivers/staging/r8188eu/include/rtl8188e_xmit.h | 177 + + drivers/staging/r8188eu/include/rtw_android.h | 64 + + drivers/staging/r8188eu/include/rtw_ap.h | 67 + + drivers/staging/r8188eu/include/rtw_br_ext.h | 66 + + drivers/staging/r8188eu/include/rtw_cmd.h | 991 +++ + drivers/staging/r8188eu/include/rtw_debug.h | 274 + + drivers/staging/r8188eu/include/rtw_eeprom.h | 130 + + drivers/staging/r8188eu/include/rtw_efuse.h | 150 + + drivers/staging/r8188eu/include/rtw_event.h | 113 + + drivers/staging/r8188eu/include/rtw_ht.h | 44 + + drivers/staging/r8188eu/include/rtw_io.h | 387 + + drivers/staging/r8188eu/include/rtw_ioctl.h | 120 + + drivers/staging/r8188eu/include/rtw_ioctl_rtl.h | 79 + + drivers/staging/r8188eu/include/rtw_ioctl_set.h | 49 + + drivers/staging/r8188eu/include/rtw_iol.h | 84 + + drivers/staging/r8188eu/include/rtw_led.h | 201 + + drivers/staging/r8188eu/include/rtw_mlme.h | 649 ++ + drivers/staging/r8188eu/include/rtw_mlme_ext.h | 874 ++ + drivers/staging/r8188eu/include/rtw_mp.h | 492 ++ + drivers/staging/r8188eu/include/rtw_mp_ioctl.h | 339 + + .../staging/r8188eu/include/rtw_mp_phy_regdef.h | 1079 +++ + drivers/staging/r8188eu/include/rtw_p2p.h | 135 + + drivers/staging/r8188eu/include/rtw_pwrctrl.h | 282 + + drivers/staging/r8188eu/include/rtw_qos.h | 30 + + drivers/staging/r8188eu/include/rtw_recv.h | 473 ++ + drivers/staging/r8188eu/include/rtw_rf.h | 145 + + drivers/staging/r8188eu/include/rtw_security.h | 382 + + drivers/staging/r8188eu/include/rtw_sreset.h | 50 + + drivers/staging/r8188eu/include/rtw_version.h | 1 + + drivers/staging/r8188eu/include/rtw_xmit.h | 383 + + drivers/staging/r8188eu/include/sta_info.h | 384 + + drivers/staging/r8188eu/include/usb_hal.h | 26 + + drivers/staging/r8188eu/include/usb_ops.h | 115 + + drivers/staging/r8188eu/include/usb_ops_linux.h | 55 + + drivers/staging/r8188eu/include/usb_osintf.h | 45 + + drivers/staging/r8188eu/include/usb_vendor_req.h | 51 + + drivers/staging/r8188eu/include/wifi.h | 1105 +++ + drivers/staging/r8188eu/include/wlan_bssdef.h | 343 + + drivers/staging/r8188eu/include/xmit_osdep.h | 67 + + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 8178 +++++++++++++++++++ + drivers/staging/r8188eu/os_dep/mlme_linux.c | 302 + + drivers/staging/r8188eu/os_dep/os_intfs.c | 1283 +++ + drivers/staging/r8188eu/os_dep/osdep_service.c | 535 ++ + drivers/staging/r8188eu/os_dep/recv_linux.c | 270 + + drivers/staging/r8188eu/os_dep/rtw_android.c | 303 + + drivers/staging/r8188eu/os_dep/usb_intf.c | 863 ++ + drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 283 + + drivers/staging/r8188eu/os_dep/xmit_linux.c | 282 + + drivers/staging/rtl8188eu/Kconfig | 9 +- + drivers/staging/rtl8188eu/Makefile | 6 +- + drivers/staging/rtl8188eu/{hal => core}/mac_cfg.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 3 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 32 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 3 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 1 - + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 3 - + drivers/staging/rtl8188eu/core/rtw_security.c | 81 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 3 +- + drivers/staging/rtl8188eu/hal/hal_intf.c | 1 - + drivers/staging/rtl8188eu/hal/phy.c | 192 +- + drivers/staging/rtl8188eu/hal/pwrseq.c | 52 - + drivers/staging/rtl8188eu/hal/pwrseqcmd.c | 80 +- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 19 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 99 +- + drivers/staging/rtl8188eu/include/hal_intf.h | 42 - + drivers/staging/rtl8188eu/include/odm.h | 7 - + drivers/staging/rtl8188eu/include/phy.h | 2 +- + drivers/staging/rtl8188eu/include/pwrseq.h | 168 +- + drivers/staging/rtl8188eu/include/pwrseqcmd.h | 17 +- + drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 14 - + drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 4 - + drivers/staging/rtl8188eu/include/rtw_pwrctrl.h | 1 - + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 81 - + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 3 +- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 18 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 3 +- + drivers/staging/rtl8712/os_intfs.c | 2 +- + drivers/staging/rtl8712/osdep_service.h | 2 +- + drivers/staging/rtl8712/wifi.h | 48 - + drivers/staging/rtl8723bs/core/rtw_ap.c | 126 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 54 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 80 +- + drivers/staging/rtl8723bs/core/rtw_io.c | 13 +- + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 30 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 214 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 289 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 31 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 106 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 458 -- + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h | 1 - + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 408 - + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h | 1 - + drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 8 - + drivers/staging/rtl8723bs/hal/Mp_Precomp.h | 2 - + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 108 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 6 +- + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 22 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 64 +- + drivers/staging/rtl8723bs/include/drv_types.h | 4 - + drivers/staging/rtl8723bs/include/hal_btcoex.h | 3 - + drivers/staging/rtl8723bs/include/ieee80211.h | 16 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 6 +- + drivers/staging/rtl8723bs/include/wlan_bssdef.h | 90 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 145 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 196 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 14 +- + drivers/staging/sm750fb/sm750.c | 52 +- + drivers/staging/sm750fb/sm750.h | 12 +- + drivers/staging/sm750fb/sm750_cursor.c | 4 +- + drivers/staging/sm750fb/sm750_hw.c | 62 +- + drivers/staging/vc04_services/Kconfig | 10 + + drivers/staging/vc04_services/Makefile | 5 +- + .../staging/vc04_services/bcm2835-audio/bcm2835.h | 2 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 2 +- + .../interface/vchiq_arm/vchiq_2835_arm.c | 564 -- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 2330 ++---- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 82 + + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 1440 ++++ + drivers/staging/vt6655/baseband.c | 2 - + drivers/staging/vt6655/baseband.h | 2 - + drivers/staging/vt6655/card.c | 1 - + drivers/staging/vt6655/card.h | 2 - + drivers/staging/vt6655/channel.c | 2 - + drivers/staging/vt6655/channel.h | 1 - + drivers/staging/vt6655/device_cfg.h | 3 +- + drivers/staging/vt6655/device_main.c | 2 - + drivers/staging/vt6655/dpc.c | 2 - + drivers/staging/vt6655/dpc.h | 2 - + drivers/staging/vt6655/key.c | 2 - + drivers/staging/vt6655/key.h | 2 - + drivers/staging/vt6655/mac.c | 3 - + drivers/staging/vt6655/mac.h | 2 - + drivers/staging/vt6655/upc.h | 2 - + drivers/staging/wlan-ng/prism2fw.c | 8 +- + include/linux/mfd/hi6421-spmi-pmic.h | 5 - + 266 files changed, 92826 insertions(+), 5289 deletions(-) + rename {drivers/staging/hikey9xx => Documentation/devicetree/bindings/mfd}/hisilicon,hi6421-spmi-pmic.yaml (87%) + create mode 100644 drivers/mfd/hi6421-spmi-pmic.c + create mode 100644 drivers/misc/hi6421v600-irq.c + delete mode 100644 drivers/staging/hikey9xx/Kconfig + delete mode 100644 drivers/staging/hikey9xx/Makefile + delete mode 100644 drivers/staging/hikey9xx/TODO + delete mode 100644 drivers/staging/hikey9xx/hi6421-spmi-pmic.c + create mode 100644 drivers/staging/r8188eu/Kconfig + create mode 100644 drivers/staging/r8188eu/Makefile + create mode 100644 drivers/staging/r8188eu/core/rtw_ap.c + create mode 100644 drivers/staging/r8188eu/core/rtw_br_ext.c + create mode 100644 drivers/staging/r8188eu/core/rtw_cmd.c + create mode 100644 drivers/staging/r8188eu/core/rtw_debug.c + create mode 100644 drivers/staging/r8188eu/core/rtw_efuse.c + create mode 100644 drivers/staging/r8188eu/core/rtw_ieee80211.c + create mode 100644 drivers/staging/r8188eu/core/rtw_io.c + create mode 100644 drivers/staging/r8188eu/core/rtw_ioctl_set.c + create mode 100644 drivers/staging/r8188eu/core/rtw_iol.c + create mode 100644 drivers/staging/r8188eu/core/rtw_led.c + create mode 100644 drivers/staging/r8188eu/core/rtw_mlme.c + create mode 100644 drivers/staging/r8188eu/core/rtw_mlme_ext.c + create mode 100644 drivers/staging/r8188eu/core/rtw_mp.c + create mode 100644 drivers/staging/r8188eu/core/rtw_mp_ioctl.c + create mode 100644 drivers/staging/r8188eu/core/rtw_p2p.c + create mode 100644 drivers/staging/r8188eu/core/rtw_pwrctrl.c + create mode 100644 drivers/staging/r8188eu/core/rtw_recv.c + create mode 100644 drivers/staging/r8188eu/core/rtw_rf.c + create mode 100644 drivers/staging/r8188eu/core/rtw_security.c + create mode 100644 drivers/staging/r8188eu/core/rtw_sreset.c + create mode 100644 drivers/staging/r8188eu/core/rtw_sta_mgt.c + create mode 100644 drivers/staging/r8188eu/core/rtw_wlan_util.c + create mode 100644 drivers/staging/r8188eu/core/rtw_xmit.c + create mode 100644 drivers/staging/r8188eu/hal/Hal8188EPwrSeq.c + create mode 100644 drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c + create mode 100644 drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c + create mode 100644 drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c + create mode 100644 drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c + create mode 100644 drivers/staging/r8188eu/hal/HalPhyRf.c + create mode 100644 drivers/staging/r8188eu/hal/HalPhyRf_8188e.c + create mode 100644 drivers/staging/r8188eu/hal/HalPwrSeqCmd.c + create mode 100644 drivers/staging/r8188eu/hal/hal_com.c + create mode 100644 drivers/staging/r8188eu/hal/hal_intf.c + create mode 100644 drivers/staging/r8188eu/hal/odm.c + create mode 100644 drivers/staging/r8188eu/hal/odm_HWConfig.c + create mode 100644 drivers/staging/r8188eu/hal/odm_RTL8188E.c + create mode 100644 drivers/staging/r8188eu/hal/odm_RegConfig8188E.c + create mode 100644 drivers/staging/r8188eu/hal/odm_debug.c + create mode 100644 drivers/staging/r8188eu/hal/odm_interface.c + create mode 100644 drivers/staging/r8188eu/hal/rtl8188e_cmd.c + create mode 100644 drivers/staging/r8188eu/hal/rtl8188e_dm.c + create mode 100644 drivers/staging/r8188eu/hal/rtl8188e_hal_init.c + create mode 100644 drivers/staging/r8188eu/hal/rtl8188e_mp.c + create mode 100644 drivers/staging/r8188eu/hal/rtl8188e_phycfg.c + create mode 100644 drivers/staging/r8188eu/hal/rtl8188e_rf6052.c + create mode 100644 drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c + create mode 100644 drivers/staging/r8188eu/hal/rtl8188e_sreset.c + create mode 100644 drivers/staging/r8188eu/hal/rtl8188e_xmit.c + create mode 100644 drivers/staging/r8188eu/hal/rtl8188eu_led.c + create mode 100644 drivers/staging/r8188eu/hal/rtl8188eu_recv.c + create mode 100644 drivers/staging/r8188eu/hal/rtl8188eu_xmit.c + create mode 100644 drivers/staging/r8188eu/hal/usb_halinit.c + create mode 100644 drivers/staging/r8188eu/hal/usb_ops_linux.c + create mode 100644 drivers/staging/r8188eu/include/Hal8188EPhyCfg.h + create mode 100644 drivers/staging/r8188eu/include/Hal8188EPhyReg.h + create mode 100644 drivers/staging/r8188eu/include/Hal8188EPwrSeq.h + create mode 100644 drivers/staging/r8188eu/include/Hal8188ERateAdaptive.h + create mode 100644 drivers/staging/r8188eu/include/Hal8188EReg.h + create mode 100644 drivers/staging/r8188eu/include/HalHWImg8188E_BB.h + create mode 100644 drivers/staging/r8188eu/include/HalHWImg8188E_FW.h + create mode 100644 drivers/staging/r8188eu/include/HalHWImg8188E_MAC.h + create mode 100644 drivers/staging/r8188eu/include/HalHWImg8188E_RF.h + create mode 100644 drivers/staging/r8188eu/include/HalPhyRf.h + create mode 100644 drivers/staging/r8188eu/include/HalPhyRf_8188e.h + create mode 100644 drivers/staging/r8188eu/include/HalPwrSeqCmd.h + create mode 100644 drivers/staging/r8188eu/include/HalVerDef.h + create mode 100644 drivers/staging/r8188eu/include/autoconf.h + create mode 100644 drivers/staging/r8188eu/include/basic_types.h + create mode 100644 drivers/staging/r8188eu/include/cmd_osdep.h + create mode 100644 drivers/staging/r8188eu/include/drv_types.h + create mode 100644 drivers/staging/r8188eu/include/drv_types_linux.h + create mode 100644 drivers/staging/r8188eu/include/ethernet.h + create mode 100644 drivers/staging/r8188eu/include/h2clbk.h + create mode 100644 drivers/staging/r8188eu/include/hal_com.h + create mode 100644 drivers/staging/r8188eu/include/hal_intf.h + create mode 100644 drivers/staging/r8188eu/include/ieee80211.h + create mode 100644 drivers/staging/r8188eu/include/ieee80211_ext.h + create mode 100644 drivers/staging/r8188eu/include/if_ether.h + create mode 100644 drivers/staging/r8188eu/include/ioctl_cfg80211.h + create mode 100644 drivers/staging/r8188eu/include/ip.h + create mode 100644 drivers/staging/r8188eu/include/mlme_osdep.h + create mode 100644 drivers/staging/r8188eu/include/mp_custom_oid.h + create mode 100644 drivers/staging/r8188eu/include/nic_spec.h + create mode 100644 drivers/staging/r8188eu/include/odm.h + create mode 100644 drivers/staging/r8188eu/include/odm_HWConfig.h + create mode 100644 drivers/staging/r8188eu/include/odm_RTL8188E.h + create mode 100644 drivers/staging/r8188eu/include/odm_RegConfig8188E.h + create mode 100644 drivers/staging/r8188eu/include/odm_RegDefine11AC.h + create mode 100644 drivers/staging/r8188eu/include/odm_RegDefine11N.h + create mode 100644 drivers/staging/r8188eu/include/odm_debug.h + create mode 100644 drivers/staging/r8188eu/include/odm_interface.h + create mode 100644 drivers/staging/r8188eu/include/odm_precomp.h + create mode 100644 drivers/staging/r8188eu/include/odm_reg.h + create mode 100644 drivers/staging/r8188eu/include/odm_types.h + create mode 100644 drivers/staging/r8188eu/include/osdep_intf.h + create mode 100644 drivers/staging/r8188eu/include/osdep_service.h + create mode 100644 drivers/staging/r8188eu/include/recv_osdep.h + create mode 100644 drivers/staging/r8188eu/include/rtl8188e_cmd.h + create mode 100644 drivers/staging/r8188eu/include/rtl8188e_dm.h + create mode 100644 drivers/staging/r8188eu/include/rtl8188e_hal.h + create mode 100644 drivers/staging/r8188eu/include/rtl8188e_led.h + create mode 100644 drivers/staging/r8188eu/include/rtl8188e_recv.h + create mode 100644 drivers/staging/r8188eu/include/rtl8188e_rf.h + create mode 100644 drivers/staging/r8188eu/include/rtl8188e_spec.h + create mode 100644 drivers/staging/r8188eu/include/rtl8188e_sreset.h + create mode 100644 drivers/staging/r8188eu/include/rtl8188e_xmit.h + create mode 100644 drivers/staging/r8188eu/include/rtw_android.h + create mode 100644 drivers/staging/r8188eu/include/rtw_ap.h + create mode 100644 drivers/staging/r8188eu/include/rtw_br_ext.h + create mode 100644 drivers/staging/r8188eu/include/rtw_cmd.h + create mode 100644 drivers/staging/r8188eu/include/rtw_debug.h + create mode 100644 drivers/staging/r8188eu/include/rtw_eeprom.h + create mode 100644 drivers/staging/r8188eu/include/rtw_efuse.h + create mode 100644 drivers/staging/r8188eu/include/rtw_event.h + create mode 100644 drivers/staging/r8188eu/include/rtw_ht.h + create mode 100644 drivers/staging/r8188eu/include/rtw_io.h + create mode 100644 drivers/staging/r8188eu/include/rtw_ioctl.h + create mode 100644 drivers/staging/r8188eu/include/rtw_ioctl_rtl.h + create mode 100644 drivers/staging/r8188eu/include/rtw_ioctl_set.h + create mode 100644 drivers/staging/r8188eu/include/rtw_iol.h + create mode 100644 drivers/staging/r8188eu/include/rtw_led.h + create mode 100644 drivers/staging/r8188eu/include/rtw_mlme.h + create mode 100644 drivers/staging/r8188eu/include/rtw_mlme_ext.h + create mode 100644 drivers/staging/r8188eu/include/rtw_mp.h + create mode 100644 drivers/staging/r8188eu/include/rtw_mp_ioctl.h + create mode 100644 drivers/staging/r8188eu/include/rtw_mp_phy_regdef.h + create mode 100644 drivers/staging/r8188eu/include/rtw_p2p.h + create mode 100644 drivers/staging/r8188eu/include/rtw_pwrctrl.h + create mode 100644 drivers/staging/r8188eu/include/rtw_qos.h + create mode 100644 drivers/staging/r8188eu/include/rtw_recv.h + create mode 100644 drivers/staging/r8188eu/include/rtw_rf.h + create mode 100644 drivers/staging/r8188eu/include/rtw_security.h + create mode 100644 drivers/staging/r8188eu/include/rtw_sreset.h + create mode 100644 drivers/staging/r8188eu/include/rtw_version.h + create mode 100644 drivers/staging/r8188eu/include/rtw_xmit.h + create mode 100644 drivers/staging/r8188eu/include/sta_info.h + create mode 100644 drivers/staging/r8188eu/include/usb_hal.h + create mode 100644 drivers/staging/r8188eu/include/usb_ops.h + create mode 100644 drivers/staging/r8188eu/include/usb_ops_linux.h + create mode 100644 drivers/staging/r8188eu/include/usb_osintf.h + create mode 100644 drivers/staging/r8188eu/include/usb_vendor_req.h + create mode 100644 drivers/staging/r8188eu/include/wifi.h + create mode 100644 drivers/staging/r8188eu/include/wlan_bssdef.h + create mode 100644 drivers/staging/r8188eu/include/xmit_osdep.h + create mode 100644 drivers/staging/r8188eu/os_dep/ioctl_linux.c + create mode 100644 drivers/staging/r8188eu/os_dep/mlme_linux.c + create mode 100644 drivers/staging/r8188eu/os_dep/os_intfs.c + create mode 100644 drivers/staging/r8188eu/os_dep/osdep_service.c + create mode 100644 drivers/staging/r8188eu/os_dep/recv_linux.c + create mode 100644 drivers/staging/r8188eu/os_dep/rtw_android.c + create mode 100644 drivers/staging/r8188eu/os_dep/usb_intf.c + create mode 100644 drivers/staging/r8188eu/os_dep/usb_ops_linux.c + create mode 100644 drivers/staging/r8188eu/os_dep/xmit_linux.c + rename drivers/staging/rtl8188eu/{hal => core}/mac_cfg.c (93%) + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c + create mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c +Merging iio/togreg (9491b9177fd0 iio: adc: meson-saradc: Fix indentation of arguments after a line-break) +$ git merge iio/togreg +Removing Documentation/devicetree/bindings/iio/accel/bosch,bma180.yaml +Merge made by the 'recursive' strategy. + .../bindings/iio/accel/bosch,bma180.yaml | 61 ---- + .../bindings/iio/accel/bosch,bma255.yaml | 23 +- + .../bindings/iio/adc/rockchip-saradc.yaml | 1 + + .../devicetree/bindings/iio/dac/adi,ad5064.yaml | 268 ++++++++++++++++ + .../devicetree/bindings/iio/dac/adi,ad5360.yaml | 79 +++++ + .../devicetree/bindings/iio/dac/adi,ad5380.yaml | 70 ++++ + .../devicetree/bindings/iio/dac/adi,ad5421.yaml | 51 +++ + .../devicetree/bindings/iio/dac/adi,ad5449.yaml | 97 ++++++ + .../devicetree/bindings/iio/dac/adi,ad5504.yaml | 50 +++ + .../devicetree/bindings/iio/dac/adi,ad5624r.yaml | 47 +++ + .../devicetree/bindings/iio/dac/adi,ad5686.yaml | 75 +++++ + .../devicetree/bindings/iio/dac/adi,ad5761.yaml | 60 ++++ + .../devicetree/bindings/iio/dac/adi,ad5764.yaml | 62 ++++ + .../devicetree/bindings/iio/dac/adi,ad5791.yaml | 52 +++ + .../devicetree/bindings/iio/dac/adi,ad8801.yaml | 60 ++++ + .../bindings/iio/dac/microchip,mcp4922.yaml | 46 +++ + drivers/counter/intel-qep.c | 1 - + drivers/iio/accel/adxl345.h | 1 - + drivers/iio/accel/adxl345_core.c | 29 +- + drivers/iio/accel/adxl345_i2c.c | 6 - + drivers/iio/accel/adxl345_spi.c | 6 - + drivers/iio/accel/bma220_spi.c | 79 +++-- + drivers/iio/accel/da280.c | 26 +- + drivers/iio/accel/da311.c | 26 +- + drivers/iio/accel/dmard10.c | 27 +- + drivers/iio/accel/hid-sensor-accel-3d.c | 10 +- + drivers/iio/accel/st_accel.h | 4 - + drivers/iio/accel/st_accel_buffer.c | 16 +- + drivers/iio/accel/st_accel_core.c | 14 +- + drivers/iio/accel/st_accel_i2c.c | 3 +- + drivers/iio/accel/st_accel_spi.c | 2 +- + drivers/iio/adc/fsl-imx25-gcq.c | 8 +- + drivers/iio/adc/meson_saradc.c | 20 +- + drivers/iio/adc/rockchip_saradc.c | 22 +- + drivers/iio/common/st_sensors/st_sensors_buffer.c | 2 - + drivers/iio/common/st_sensors/st_sensors_core.c | 1 + + drivers/iio/common/st_sensors/st_sensors_core.h | 1 + + drivers/iio/common/st_sensors/st_sensors_i2c.c | 3 +- + drivers/iio/common/st_sensors/st_sensors_spi.c | 3 +- + drivers/iio/common/st_sensors/st_sensors_trigger.c | 1 - + drivers/iio/dac/ad5624r_spi.c | 18 +- + drivers/iio/gyro/hid-sensor-gyro-3d.c | 11 +- + drivers/iio/gyro/st_gyro.h | 4 - + drivers/iio/gyro/st_gyro_buffer.c | 16 +- + drivers/iio/gyro/st_gyro_core.c | 15 +- + drivers/iio/gyro/st_gyro_i2c.c | 2 +- + drivers/iio/gyro/st_gyro_spi.c | 2 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 22 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 18 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 15 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 1 + + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 3 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 3 +- + drivers/iio/industrialio-buffer.c | 9 +- + drivers/iio/industrialio-core.c | 33 +- + drivers/iio/light/adjd_s311.c | 53 +--- + drivers/iio/light/hid-sensor-als.c | 11 +- + drivers/iio/light/hid-sensor-prox.c | 11 +- + drivers/iio/light/si1145.c | 1 - + drivers/iio/light/tcs3414.c | 48 ++- + drivers/iio/magnetometer/st_magn.h | 12 - + drivers/iio/magnetometer/st_magn_buffer.c | 16 +- + drivers/iio/magnetometer/st_magn_core.c | 17 +- + drivers/iio/magnetometer/st_magn_i2c.c | 2 +- + drivers/iio/magnetometer/st_magn_spi.c | 2 +- + drivers/iio/orientation/hid-sensor-incl-3d.c | 11 +- + drivers/iio/potentiometer/max5481.c | 22 +- + drivers/iio/pressure/hid-sensor-press.c | 11 +- + drivers/iio/pressure/st_pressure.h | 5 - + drivers/iio/pressure/st_pressure_buffer.c | 16 +- + drivers/iio/pressure/st_pressure_core.c | 16 +- + drivers/iio/pressure/st_pressure_i2c.c | 3 +- + drivers/iio/pressure/st_pressure_spi.c | 2 +- + drivers/iio/proximity/rfd77402.c | 83 ++--- + drivers/iio/proximity/vcnl3020.c | 351 ++++++++++++++++++++- + drivers/iio/temperature/tmp006.c | 53 ++-- + 76 files changed, 1737 insertions(+), 594 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/iio/accel/bosch,bma180.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5064.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5360.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5380.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5421.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5449.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5504.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5624r.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5761.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5764.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5791.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad8801.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/microchip,mcp4922.yaml +Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ git merge mux/for-next +Already up to date. +Merging icc/icc-next (2092cdb412f0 Merge branch 'icc-fixes' into icc-next) +$ git merge icc/icc-next +Merge made by the 'recursive' strategy. + drivers/interconnect/core.c | 10 ++++ + drivers/interconnect/qcom/icc-rpmh.c | 113 +++++++++++++++++++++++++++++++---- + drivers/interconnect/qcom/icc-rpmh.h | 2 + + drivers/interconnect/qcom/sc7180.c | 96 +---------------------------- + drivers/interconnect/qcom/sc7280.c | 96 +---------------------------- + drivers/interconnect/qcom/sdm845.c | 99 +----------------------------- + drivers/interconnect/qcom/sdx55.c | 96 +---------------------------- + drivers/interconnect/qcom/sm8150.c | 96 +---------------------------- + drivers/interconnect/qcom/sm8250.c | 96 +---------------------------- + drivers/interconnect/qcom/sm8350.c | 97 +----------------------------- + 10 files changed, 129 insertions(+), 672 deletions(-) +Merging dmaengine/next (b60bb6e2bfc1 dmaengine: idxd: fix abort status check) +$ git merge dmaengine/next +Auto-merging include/uapi/linux/idxd.h +Auto-merging drivers/dma/stm32-dma.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 9 + + Documentation/admin-guide/kernel-parameters.txt | 5 + + .../devicetree/bindings/dma/altr,msgdma.yaml | 4 +- + .../devicetree/bindings/dma/st,stm32-dma.yaml | 7 + + drivers/dma/Kconfig | 23 +- + drivers/dma/Makefile | 2 +- + drivers/dma/altera-msgdma.c | 37 +- + drivers/dma/at_xdmac.c | 8 +- + drivers/dma/dw/idma32.c | 138 ++++- + drivers/dma/dw/internal.h | 16 + + drivers/dma/dw/pci.c | 6 +- + drivers/dma/dw/platform.c | 6 +- + drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c | 8 +- + drivers/dma/hisi_dma.c | 10 +- + drivers/dma/idxd/Makefile | 8 + + drivers/dma/idxd/bus.c | 91 ++++ + drivers/dma/idxd/cdev.c | 68 ++- + drivers/dma/idxd/compat.c | 114 ++++ + drivers/dma/idxd/device.c | 310 +++++++++-- + drivers/dma/idxd/dma.c | 86 ++- + drivers/dma/idxd/idxd.h | 167 +++++- + drivers/dma/idxd/init.c | 148 +++--- + drivers/dma/idxd/irq.c | 113 +--- + drivers/dma/idxd/registers.h | 6 + + drivers/dma/idxd/submit.c | 27 +- + drivers/dma/idxd/sysfs.c | 588 +++++---------------- + drivers/dma/ppc4xx/adma.c | 12 +- + drivers/dma/sprd-dma.c | 1 + + drivers/dma/stm32-dma.c | 8 +- + drivers/dma/tegra210-adma.c | 7 +- + drivers/dma/xilinx/xilinx_dma.c | 3 +- + drivers/dma/xilinx/zynqmp_dma.c | 3 +- + include/linux/platform_data/dma-dw.h | 3 + + include/uapi/linux/idxd.h | 23 + + 34 files changed, 1328 insertions(+), 737 deletions(-) + create mode 100644 drivers/dma/idxd/bus.c + create mode 100644 drivers/dma/idxd/compat.c +$ git am -3 ../patches/0001-fixup-for-bus-Make-remove-callback-return-void.patch +Applying: fixup for "bus: Make remove callback return void" +Using index info to reconstruct a base tree... +M drivers/dma/idxd/bus.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging cgroup/for-next (c3df5fb57fe8 cgroup: rstat: fix A-A deadlock on 32bit around u64_stats_sync) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + block/blk-cgroup.c | 14 ++++++++------ + kernel/cgroup/rstat.c | 19 +++++++++++-------- + 2 files changed, 19 insertions(+), 14 deletions(-) +Merging scsi/for-next (549cd449ebb2 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging include/linux/blkdev.h +Auto-merging drivers/target/loopback/tcm_loop.c +Auto-merging drivers/scsi/sr.c +Auto-merging drivers/scsi/scsi_sysfs.c +Auto-merging drivers/scsi/scsi_scan.c +Auto-merging drivers/scsi/scsi_debug.c +Removing block/scsi_ioctl.c +Auto-merging block/Makefile +Auto-merging block/Kconfig +Merge made by the 'recursive' strategy. + block/Kconfig | 26 +- + block/Makefile | 3 +- + block/bsg.c | 124 +- + block/scsi_ioctl.c | 890 ------- + drivers/block/Kconfig | 3 +- + drivers/block/paride/Kconfig | 1 - + drivers/cdrom/cdrom.c | 7 - + drivers/infiniband/ulp/iser/iser_verbs.c | 2 +- + drivers/s390/scsi/zfcp_fsf.c | 4 +- + drivers/scsi/Kconfig | 18 +- + drivers/scsi/Makefile | 3 +- + drivers/scsi/aacraid/aachba.c | 1 - + drivers/scsi/be2iscsi/be_mgmt.c | 84 +- + drivers/scsi/ch.c | 73 +- + drivers/scsi/libsas/Kconfig | 1 - + drivers/scsi/libsas/Makefile | 2 +- + drivers/scsi/libsas/sas_ata.c | 4 +- + drivers/scsi/libsas/sas_discover.c | 2 +- + drivers/scsi/libsas/sas_expander.c | 2 +- + drivers/scsi/libsas/sas_host_smp.c | 2 +- + drivers/scsi/libsas/sas_init.c | 2 +- + drivers/scsi/libsas/sas_phy.c | 2 +- + drivers/scsi/libsas/sas_port.c | 2 +- + drivers/scsi/libsas/sas_scsi_host.c | 6 +- + drivers/scsi/lpfc/lpfc.h | 1 - + drivers/scsi/lpfc/lpfc_attr.c | 21 +- + drivers/scsi/lpfc/lpfc_crtn.h | 2 + + drivers/scsi/lpfc/lpfc_ct.c | 10 +- + drivers/scsi/lpfc/lpfc_disc.h | 9 +- + drivers/scsi/lpfc/lpfc_els.c | 128 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 198 +- + drivers/scsi/lpfc/lpfc_hw.h | 3 +- + drivers/scsi/lpfc/lpfc_hw4.h | 26 +- + drivers/scsi/lpfc/lpfc_ids.h | 4 +- + drivers/scsi/lpfc/lpfc_init.c | 93 +- + drivers/scsi/lpfc/lpfc_mbox.c | 5 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 43 +- + drivers/scsi/lpfc/lpfc_nvme.c | 10 +- + drivers/scsi/lpfc/lpfc_nvme.h | 6 +- + drivers/scsi/lpfc/lpfc_scsi.c | 76 +- + drivers/scsi/lpfc/lpfc_scsi.h | 6 +- + drivers/scsi/lpfc/lpfc_sli.c | 194 +- + drivers/scsi/lpfc/lpfc_sli4.h | 4 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/qla2xxx/Makefile | 3 +- + drivers/scsi/qla2xxx/qla_attr.c | 5 + + drivers/scsi/qla2xxx/qla_bsg.c | 90 +- + drivers/scsi/qla2xxx/qla_bsg.h | 3 + + drivers/scsi/qla2xxx/qla_dbg.h | 1 + + drivers/scsi/qla2xxx/qla_def.h | 195 +- + drivers/scsi/qla2xxx/qla_edif.c | 3409 ++++++++++++++++++++++++ + drivers/scsi/qla2xxx/qla_edif.h | 128 + + drivers/scsi/qla2xxx/qla_edif_bsg.h | 220 ++ + drivers/scsi/qla2xxx/qla_fw.h | 12 +- + drivers/scsi/qla2xxx/qla_gbl.h | 50 +- + drivers/scsi/qla2xxx/qla_gs.c | 6 +- + drivers/scsi/qla2xxx/qla_init.c | 168 +- + drivers/scsi/qla2xxx/qla_iocb.c | 146 +- + drivers/scsi/qla2xxx/qla_isr.c | 320 ++- + drivers/scsi/qla2xxx/qla_mbx.c | 33 +- + drivers/scsi/qla2xxx/qla_mid.c | 7 +- + drivers/scsi/qla2xxx/qla_nvme.c | 4 + + drivers/scsi/qla2xxx/qla_nx.c | 2 - + drivers/scsi/qla2xxx/qla_os.c | 101 +- + drivers/scsi/qla2xxx/qla_sup.c | 1 - + drivers/scsi/qla2xxx/qla_target.c | 145 +- + drivers/scsi/qla2xxx/qla_target.h | 19 +- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/scsi_bsg.c | 95 + + drivers/scsi/scsi_common.c | 9 + + drivers/scsi/scsi_debug.c | 112 +- + drivers/scsi/scsi_devinfo.c | 1 + + drivers/scsi/scsi_ioctl.c | 854 +++++- + drivers/scsi/scsi_lib.c | 7 +- + drivers/scsi/scsi_priv.h | 10 + + drivers/scsi/scsi_scan.c | 3 + + drivers/scsi/scsi_sysfs.c | 2 +- + drivers/scsi/sd.c | 88 +- + drivers/scsi/sg.c | 33 +- + drivers/scsi/smartpqi/Kconfig | 8 +- + drivers/scsi/smartpqi/smartpqi.h | 6 +- + drivers/scsi/smartpqi/smartpqi_init.c | 64 +- + drivers/scsi/smartpqi/smartpqi_sas_transport.c | 4 +- + drivers/scsi/smartpqi/smartpqi_sis.c | 4 +- + drivers/scsi/smartpqi/smartpqi_sis.h | 4 +- + drivers/scsi/sr.c | 74 +- + drivers/scsi/st.c | 72 +- + drivers/scsi/ufs/ufshcd.c | 7 +- + drivers/scsi/ufs/ufshcd.h | 12 +- + drivers/target/Kconfig | 2 +- + drivers/target/iscsi/cxgbit/cxgbit_ddp.c | 2 +- + drivers/target/loopback/tcm_loop.c | 4 +- + drivers/target/target_core_iblock.c | 2 +- + fs/nfsd/Kconfig | 2 +- + include/linux/blkdev.h | 21 +- + include/linux/bsg.h | 11 +- + include/scsi/scsi_cmnd.h | 18 +- + include/scsi/scsi_device.h | 1 + + include/scsi/scsi_devinfo.h | 6 +- + include/scsi/scsi_ioctl.h | 9 +- + include/scsi/scsi_request.h | 2 - + 101 files changed, 6695 insertions(+), 2031 deletions(-) + delete mode 100644 block/scsi_ioctl.c + create mode 100644 drivers/scsi/qla2xxx/qla_edif.c + create mode 100644 drivers/scsi/qla2xxx/qla_edif.h + create mode 100644 drivers/scsi/qla2xxx/qla_edif_bsg.h + create mode 100644 drivers/scsi/scsi_bsg.c +Merging scsi-mkp/for-next (08dc2f9b53af scsi: scsi_ioctl: Unexport sg_scsi_ioctl()) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (db7b337709a1 virtio-mem: prioritize unplug from ZONE_MOVABLE in Big Block Mode) +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (7486f29e5e60 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) +$ git merge gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (e5de9d283a36 gpio: brcmstb: remove custom 'brcmstb_gpio_set_names') +$ git merge gpio-brgl/gpio/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-api/gpio/consumer.rst | 10 ++++++- + Documentation/driver-api/gpio/driver.rst | 11 +++----- + drivers/gpio/gpio-brcmstb.c | 45 +----------------------------- + drivers/gpio/gpio-mt7621.c | 1 + + drivers/gpio/gpio-rcar.c | 4 +-- + drivers/gpio/gpiolib.c | 32 +++++++++++++++++---- + include/linux/gpio/driver.h | 4 +++ + 7 files changed, 48 insertions(+), 59 deletions(-) +Merging gpio-intel/for-next (e73f0f0ee754 Linux 5.14-rc1) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (4990672e9b2a Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/fsl,imx8ulp-pinctrl.yaml | 79 ++ + .../pinctrl/marvell,armada-37xx-pinctrl.txt | 8 +- + .../bindings/pinctrl/qcom,mdm9607-pinctrl.yaml | 133 +++ + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 64 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 3 +- + drivers/pinctrl/freescale/Kconfig | 7 + + drivers/pinctrl/freescale/Makefile | 1 + + drivers/pinctrl/freescale/pinctrl-imx8ulp.c | 278 +++++ + drivers/pinctrl/mediatek/pinctrl-mt8365.c | 1 - + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 8 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 16 +- + drivers/pinctrl/qcom/Kconfig | 71 +- + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-mdm9607.c | 1087 ++++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 35 +- + 15 files changed, 1692 insertions(+), 100 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8ulp-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,mdm9607-pinctrl.yaml + create mode 100644 drivers/pinctrl/freescale/pinctrl-imx8ulp.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-mdm9607.c +Merging pinctrl-intel/for-next (e73f0f0ee754 Linux 5.14-rc1) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (91d1be9fb7d6 pinctrl: renesas: Fix pin control matching on R-Car H3e-2G) +$ git merge pinctrl-renesas/renesas-pinctrl +Merge made by the 'recursive' strategy. + drivers/pinctrl/renesas/core.c | 29 ++- + drivers/pinctrl/renesas/pfc-r8a77995.c | 320 ++++++++++++++++++++++++++++++++- + drivers/pinctrl/renesas/pinctrl.c | 16 +- + drivers/pinctrl/renesas/sh_pfc.h | 7 +- + 4 files changed, 337 insertions(+), 35 deletions(-) +Merging pinctrl-samsung/for-next (e73f0f0ee754 Linux 5.14-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (f4a8e31ed84e pwm: ep93xx: Ensure configuring period and duty_cycle isn't wrongly skipped) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (0421c2df6954 Merge of ucount-fixes-for-5.14, and siginfo-si_trapno-for-v5.15 for testing in linux-next) +$ git merge userns/for-next +Merge made by the 'recursive' strategy. + arch/alpha/include/uapi/asm/siginfo.h | 2 -- + arch/alpha/kernel/osf_sys.c | 2 +- + arch/alpha/kernel/signal.c | 4 +-- + arch/alpha/kernel/traps.c | 26 +++++++-------- + arch/alpha/mm/fault.c | 4 +-- + arch/arm/kernel/signal.c | 39 ++++++++++++++++++++++ + arch/arm64/kernel/signal.c | 39 ++++++++++++++++++++++ + arch/arm64/kernel/signal32.c | 39 ++++++++++++++++++++++ + arch/mips/include/uapi/asm/siginfo.h | 2 -- + arch/sparc/include/uapi/asm/siginfo.h | 3 -- + arch/sparc/kernel/process_64.c | 2 +- + arch/sparc/kernel/signal32.c | 37 +++++++++++++++++++++ + arch/sparc/kernel/signal_64.c | 36 ++++++++++++++++++++ + arch/sparc/kernel/sys_sparc_32.c | 2 +- + arch/sparc/kernel/sys_sparc_64.c | 2 +- + arch/sparc/kernel/traps_32.c | 22 ++++++------- + arch/sparc/kernel/traps_64.c | 44 +++++++++++-------------- + arch/sparc/kernel/unaligned_32.c | 2 +- + arch/sparc/mm/fault_32.c | 2 +- + arch/sparc/mm/fault_64.c | 2 +- + arch/x86/kernel/signal_compat.c | 6 ++++ + fs/notify/fanotify/fanotify_user.c | 10 +++--- + fs/signalfd.c | 4 +-- + include/linux/sched/signal.h | 11 ++----- + include/linux/signal.h | 2 +- + include/uapi/asm-generic/siginfo.h | 5 +++ + kernel/signal.c | 62 +++++++++++++++++++++++++---------- + kernel/ucount.c | 26 ++++++++------- + 28 files changed, 326 insertions(+), 111 deletions(-) +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ git merge ktest/for-next +Already up to date. +Merging kselftest/next (2734d6c1b1a0 Linux 5.14-rc2) +$ git merge kselftest/next +Already up to date. +Merging livepatching/for-next (c150bbbb1731 Merge branch 'for-5.13/signal' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection()) +$ git merge coresight/next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 4479 and retry the command. +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (4aa90c036df6 rtc: pcf8523: rename register and bit defines) +$ git merge rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (30c10d32152d Merge branch 'for-5.12/cxl' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at24/at24/for-next (6efb943b8616 Linux 5.13-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (28293b6c68cd ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data) +$ git merge ntb/ntb-next +Merge made by the 'recursive' strategy. + drivers/ntb/test/ntb_msi_test.c | 4 +++- + drivers/ntb/test/ntb_perf.c | 1 + + drivers/ntb/test/ntb_pingpong.c | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) +Merging seccomp/for-next/seccomp (19d67694745c Documentation: seccomp: Fix typo in user notification) +$ git merge seccomp/for-next/seccomp +Merge made by the 'recursive' strategy. + Documentation/userspace-api/seccomp_filter.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging kspp/for-next/kspp (b88972649fa0 lib/test_stackinit: Add assigned initializers) +$ git merge kspp/for-next/kspp +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 5 + + lib/test_stackinit.c | 252 +++++++++++++++++++++++++++++++++------------ + security/Kconfig.hardening | 71 +++++++++---- + 3 files changed, 241 insertions(+), 87 deletions(-) +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (0f79ce970e79 gnss: drop stray semicolons) +$ git merge gnss/gnss-next +Merge made by the 'recursive' strategy. + drivers/gnss/mtk.c | 2 +- + drivers/gnss/serial.c | 2 +- + drivers/gnss/sirf.c | 2 +- + drivers/gnss/ubx.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging fsi/next (9ab1428dfe2c fsi/sbefifo: Fix reset timeout) +$ git merge fsi/next +Already up to date. +Merging slimbus/for-next (e5c578adcdd9 slimbus: ngd: reset dma setup during runtime pm) +$ git merge slimbus/for-next +Merge made by the 'recursive' strategy. + drivers/slimbus/messaging.c | 7 ++++--- + drivers/slimbus/qcom-ngd-ctrl.c | 22 +++++++++++++--------- + 2 files changed, 17 insertions(+), 12 deletions(-) +Merging nvmem/for-next (e73f0f0ee754 Linux 5.14-rc1) +$ git merge nvmem/for-next +Already up to date. +Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1) +$ git merge xarray/main +Already up to date. +Merging hyperv/hyperv-next (63fb60c2fcc9 hv: hyperv.h: Remove unused inline functions) +$ git merge hyperv/hyperv-next +Auto-merging arch/x86/kernel/cpu/mshyperv.c +Merge made by the 'recursive' strategy. + arch/x86/hyperv/hv_init.c | 101 ++--------------- + arch/x86/include/asm/mshyperv.h | 4 - + arch/x86/kernel/cpu/mshyperv.c | 38 +++---- + drivers/clocksource/hyperv_timer.c | 3 - + drivers/hv/hv_common.c | 219 +++++++++++++++++++++++++++++++++++++ + drivers/hv/hv_util.c | 5 - + include/asm-generic/mshyperv.h | 13 +++ + include/clocksource/hyperv_timer.h | 11 +- + include/linux/hyperv.h | 16 --- + 9 files changed, 268 insertions(+), 142 deletions(-) +Merging auxdisplay/auxdisplay (24ebc044c72e auxdisplay: Replace symbolic permissions with octal permissions) +$ git merge auxdisplay/auxdisplay +Merge made by the 'recursive' strategy. + .../bindings/auxdisplay/hit,hd44780.yaml | 31 +++++++++++++++++++++- + drivers/auxdisplay/cfag12864b.c | 2 +- + drivers/auxdisplay/charlcd.c | 4 +-- + drivers/auxdisplay/hd44780.c | 2 +- + drivers/auxdisplay/ks0108.c | 18 +++---------- + 5 files changed, 36 insertions(+), 21 deletions(-) +Merging kgdb/kgdb/for-next (e868f0a3c4b9 kdb: Rename members of struct kdbtab_t) +$ git merge kgdb/kgdb/for-next +Merge made by the 'recursive' strategy. + include/linux/kdb.h | 27 +- + kernel/debug/kdb/kdb_bp.c | 72 ++--- + kernel/debug/kdb/kdb_debugger.c | 1 - + kernel/debug/kdb/kdb_main.c | 626 ++++++++++++++++++---------------------- + kernel/debug/kdb/kdb_private.h | 18 -- + kernel/debug/kdb/kdb_support.c | 329 ++------------------- + kernel/trace/trace_kdb.c | 12 +- + samples/kdb/kdb_hello.c | 20 +- + 8 files changed, 385 insertions(+), 720 deletions(-) +Merging hmm/hmm (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (4f45f3404960 spi: spi-altera-dfl: support n5010 feature revision) +$ git merge fpga/for-next +Auto-merging drivers/fpga/dfl.c +Auto-merging drivers/fpga/Kconfig +Merge made by the 'recursive' strategy. + drivers/fpga/Kconfig | 2 +- + drivers/fpga/dfl.c | 27 +++++++++++++++++---------- + drivers/fpga/dfl.h | 1 + + drivers/spi/spi-altera-dfl.c | 21 ++++++++++++--------- + include/linux/dfl.h | 1 + + 5 files changed, 32 insertions(+), 20 deletions(-) +Merging kunit/test (e73f0f0ee754 Linux 5.14-rc1) +$ git merge kunit/test +Already up to date. +Merging cfi/cfi/next (ff1176468d36 Linux 5.14-rc3) +$ git merge cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (2734d6c1b1a0 Linux 5.14-rc2) +$ git merge kunit-next/kunit +Already up to date. +Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge trivial/for-next +Already up to date. +Merging mhi/mhi-next (b8c95616d154 bus: mhi: core: Improve debug messages for power up) +$ git merge mhi/mhi-next +Auto-merging include/linux/mhi.h +Auto-merging drivers/net/mhi/net.c +Auto-merging drivers/bus/mhi/pci_generic.c +Auto-merging drivers/bus/mhi/core/main.c +Merge made by the 'recursive' strategy. + drivers/bus/mhi/core/boot.c | 17 ++++--- + drivers/bus/mhi/core/init.c | 93 ++++++++++++++++++++++------------- + drivers/bus/mhi/core/internal.h | 22 +-------- + drivers/bus/mhi/core/main.c | 15 +++--- + drivers/bus/mhi/core/pm.c | 34 ++++--------- + drivers/bus/mhi/pci_generic.c | 38 ++++++++++++++ + drivers/net/mhi/net.c | 2 +- + drivers/net/wireless/ath/ath11k/mhi.c | 1 + + drivers/net/wwan/mhi_wwan_ctrl.c | 2 +- + include/linux/mhi.h | 9 +++- + net/qrtr/mhi.c | 2 +- + 11 files changed, 136 insertions(+), 99 deletions(-) +Merging memblock/for-next (a4d5613c4dc6 arm: extend pfn_valid to take into account freed memory map alignment) +$ git merge memblock/for-next +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge counters/counters +Already up to date. +Merging rust/rust-next (5d3986cf8ed6 MAINTAINERS: Rust) +$ git merge rust/rust-next +Auto-merging scripts/Makefile.build +Auto-merging samples/Kconfig +Auto-merging lib/vsprintf.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/printk/printk.c +Auto-merging kernel/kallsyms.c +Auto-merging init/Kconfig +Auto-merging include/linux/kallsyms.h +CONFLICT (content): Merge conflict in include/linux/kallsyms.h +Auto-merging arch/riscv/Makefile +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging MAINTAINERS +Resolved 'Makefile' using previous resolution. +Resolved 'include/linux/kallsyms.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b038834891b3] Merge remote-tracking branch 'rust/rust-next' +$ 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 | 4 + + Documentation/process/changes.rst | 13 + + Documentation/rust/arch-support.rst | 35 + + Documentation/rust/assets/favicon-16x16.png | Bin 0 -> 798 bytes + Documentation/rust/assets/favicon-32x32.png | Bin 0 -> 2076 bytes + Documentation/rust/assets/rust-logo.png | Bin 0 -> 53976 bytes + Documentation/rust/coding.rst | 92 + + Documentation/rust/docs.rst | 110 + + Documentation/rust/index.rst | 20 + + Documentation/rust/quick-start.rst | 222 ++ + MAINTAINERS | 14 + + Makefile | 176 +- + arch/arm/rust/target.json | 28 + + arch/arm64/rust/target.json | 35 + + arch/powerpc/rust/target.json | 30 + + arch/riscv/Makefile | 1 + + arch/riscv/rust/rv32ima.json | 37 + + arch/riscv/rust/rv32imac.json | 37 + + arch/riscv/rust/rv64ima.json | 37 + + arch/riscv/rust/rv64imac.json | 37 + + arch/x86/rust/target.json | 37 + + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 17 +- + init/Kconfig | 28 + + kernel/kallsyms.c | 7 + + kernel/livepatch/core.c | 4 +- + kernel/printk/printk.c | 5 +- + lib/Kconfig.debug | 144 ++ + lib/vsprintf.c | 12 + + rust/.gitignore | 6 + + rust/Makefile | 316 +++ + rust/alloc/README.md | 32 + + rust/alloc/alloc.rs | 425 ++++ + rust/alloc/borrow.rs | 493 ++++ + rust/alloc/boxed.rs | 1728 ++++++++++++++ + rust/alloc/collections/mod.rs | 116 + + rust/alloc/fmt.rs | 587 +++++ + rust/alloc/lib.rs | 197 ++ + rust/alloc/macros.rs | 128 ++ + rust/alloc/prelude/mod.rs | 17 + + rust/alloc/prelude/v1.rs | 16 + + rust/alloc/raw_vec.rs | 612 +++++ + rust/alloc/rc.rs | 2539 +++++++++++++++++++++ + rust/alloc/slice.rs | 1271 +++++++++++ + rust/alloc/str.rs | 614 +++++ + rust/alloc/string.rs | 2847 +++++++++++++++++++++++ + rust/alloc/sync.rs | 2631 ++++++++++++++++++++++ + rust/alloc/vec/drain.rs | 157 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 296 +++ + rust/alloc/vec/is_zero.rs | 106 + + rust/alloc/vec/mod.rs | 3255 +++++++++++++++++++++++++++ + rust/alloc/vec/partial_eq.rs | 49 + + rust/alloc/vec/set_len_on_drop.rs | 30 + + rust/alloc/vec/spec_extend.rs | 170 ++ + rust/bindgen_parameters | 13 + + rust/build_error.rs | 33 + + rust/compiler_builtins.rs | 146 ++ + rust/exports.c | 16 + + rust/helpers.c | 235 ++ + rust/kernel/allocator.rs | 63 + + rust/kernel/bindings.rs | 28 + + rust/kernel/bindings_helper.h | 24 + + rust/kernel/buffer.rs | 39 + + rust/kernel/build_assert.rs | 80 + + rust/kernel/c_types.rs | 119 + + rust/kernel/chrdev.rs | 212 ++ + rust/kernel/error.rs | 272 +++ + rust/kernel/file.rs | 130 ++ + rust/kernel/file_operations.rs | 698 ++++++ + rust/kernel/io_buffer.rs | 153 ++ + rust/kernel/iov_iter.rs | 95 + + rust/kernel/lib.rs | 220 ++ + rust/kernel/linked_list.rs | 245 ++ + rust/kernel/miscdev.rs | 113 + + rust/kernel/module_param.rs | 497 ++++ + rust/kernel/of.rs | 101 + + rust/kernel/pages.rs | 176 ++ + rust/kernel/platdev.rs | 166 ++ + rust/kernel/prelude.rs | 28 + + rust/kernel/print.rs | 412 ++++ + rust/kernel/random.rs | 50 + + rust/kernel/raw_list.rs | 361 +++ + rust/kernel/rbtree.rs | 570 +++++ + rust/kernel/security.rs | 79 + + rust/kernel/static_assert.rs | 39 + + rust/kernel/str.rs | 259 +++ + rust/kernel/sync/arc.rs | 227 ++ + rust/kernel/sync/condvar.rs | 136 ++ + rust/kernel/sync/guard.rs | 82 + + rust/kernel/sync/locked_by.rs | 112 + + rust/kernel/sync/mod.rs | 84 + + rust/kernel/sync/mutex.rs | 101 + + rust/kernel/sync/spinlock.rs | 109 + + rust/kernel/sysctl.rs | 198 ++ + rust/kernel/task.rs | 193 ++ + rust/kernel/traits.rs | 26 + + rust/kernel/types.rs | 249 ++ + rust/kernel/user_ptr.rs | 191 ++ + rust/macros/lib.rs | 127 ++ + rust/macros/module.rs | 754 +++++++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 113 + + samples/rust/Makefile | 12 + + samples/rust/rust_chrdev.rs | 51 + + samples/rust/rust_minimal.rs | 38 + + samples/rust/rust_miscdev.rs | 150 ++ + samples/rust/rust_module_parameters.rs | 72 + + samples/rust/rust_print.rs | 57 + + samples/rust/rust_random.rs | 61 + + samples/rust/rust_semaphore.rs | 177 ++ + samples/rust/rust_semaphore_c.c | 212 ++ + samples/rust/rust_stack_probing.rs | 40 + + samples/rust/rust_sync.rs | 81 + + scripts/Makefile.build | 22 + + scripts/Makefile.lib | 12 + + scripts/generate_rust_analyzer.py | 143 ++ + scripts/kallsyms.c | 33 +- + scripts/kconfig/confdata.c | 67 +- + scripts/rust-version.sh | 31 + + tools/include/linux/kallsyms.h | 2 +- + tools/include/linux/lockdep.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 129 files changed, 29600 insertions(+), 32 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/assets/favicon-16x16.png + create mode 100644 Documentation/rust/assets/favicon-32x32.png + create mode 100644 Documentation/rust/assets/rust-logo.png + create mode 100644 Documentation/rust/coding.rst + create mode 100644 Documentation/rust/docs.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 arch/arm/rust/target.json + create mode 100644 arch/arm64/rust/target.json + create mode 100644 arch/powerpc/rust/target.json + create mode 100644 arch/riscv/rust/rv32ima.json + create mode 100644 arch/riscv/rust/rv32imac.json + create mode 100644 arch/riscv/rust/rv64ima.json + create mode 100644 arch/riscv/rust/rv64imac.json + create mode 100644 arch/x86/rust/target.json + 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/prelude/mod.rs + create mode 100644 rust/alloc/prelude/v1.rs + create mode 100644 rust/alloc/raw_vec.rs + create mode 100644 rust/alloc/rc.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/sync.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/bindings.rs + create mode 100644 rust/kernel/bindings_helper.h + create mode 100644 rust/kernel/buffer.rs + 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/error.rs + create mode 100644 rust/kernel/file.rs + create mode 100644 rust/kernel/file_operations.rs + create mode 100644 rust/kernel/io_buffer.rs + create mode 100644 rust/kernel/iov_iter.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/module_param.rs + create mode 100644 rust/kernel/of.rs + create mode 100644 rust/kernel/pages.rs + create mode 100644 rust/kernel/platdev.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/security.rs + create mode 100644 rust/kernel/static_assert.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/spinlock.rs + create mode 100644 rust/kernel/sysctl.rs + create mode 100644 rust/kernel/task.rs + create mode 100644 rust/kernel/traits.rs + create mode 100644 rust/kernel/types.rs + create mode 100644 rust/kernel/user_ptr.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/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_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 100755 scripts/rust-version.sh +Merging cxl/next (4ad6181e4b21 cxl/pci: Rename CXL REGLOC ID) +$ git merge cxl/next +Already up to date. +Merging folio/for-next (42c774e24ae0 mm/filemap: Add FGP_STABLE) +$ git merge folio/for-next +Auto-merging mm/util.c +Auto-merging mm/shmem.c +Auto-merging mm/rmap.c +CONFLICT (content): Merge conflict in mm/rmap.c +Auto-merging mm/page_alloc.c +Auto-merging mm/memory.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memcontrol.c +Auto-merging mm/filemap.c +CONFLICT (content): Merge conflict in mm/filemap.c +Auto-merging kernel/bpf/verifier.c +Auto-merging include/linux/netfs.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/highmem.h +Auto-merging fs/io_uring.c +Auto-merging fs/afs/write.c +Resolved 'mm/filemap.c' using previous resolution. +Resolved 'mm/rmap.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1426b4ccc9f0] Merge remote-tracking branch 'folio/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/cachetlb.rst | 6 + + Documentation/core-api/mm-api.rst | 5 + + Documentation/filesystems/netfs_library.rst | 2 + + arch/arm/include/asm/cacheflush.h | 1 + + arch/nds32/include/asm/cacheflush.h | 1 + + fs/afs/write.c | 9 +- + fs/cachefiles/rdwr.c | 16 +- + fs/io_uring.c | 2 +- + fs/jfs/jfs_metapage.c | 1 + + include/asm-generic/cacheflush.h | 6 + + include/linux/backing-dev.h | 6 +- + include/linux/flex_proportions.h | 9 +- + include/linux/gfp.h | 22 +- + include/linux/highmem-internal.h | 11 + + include/linux/highmem.h | 37 ++ + include/linux/huge_mm.h | 15 - + include/linux/ksm.h | 4 +- + include/linux/memcontrol.h | 228 ++++++----- + include/linux/migrate.h | 4 + + include/linux/mm.h | 235 ++++++++--- + include/linux/mm_inline.h | 103 +++-- + include/linux/mm_types.h | 77 ++++ + include/linux/mmdebug.h | 20 + + include/linux/netfs.h | 77 ++-- + include/linux/page-flags.h | 267 +++++++++---- + include/linux/page_idle.h | 99 +++-- + include/linux/page_owner.h | 8 +- + include/linux/page_ref.h | 158 +++++++- + include/linux/pagemap.h | 579 +++++++++++++++++----------- + include/linux/rmap.h | 10 +- + include/linux/swap.h | 17 +- + include/linux/vmstat.h | 107 +++++ + include/linux/writeback.h | 9 +- + include/trace/events/pagemap.h | 46 ++- + include/trace/events/writeback.h | 28 +- + kernel/bpf/verifier.c | 2 +- + kernel/events/uprobes.c | 3 +- + lib/flex_proportions.c | 28 +- + mm/Makefile | 2 +- + mm/compaction.c | 4 +- + mm/filemap.c | 565 +++++++++++++-------------- + mm/folio-compat.c | 142 +++++++ + mm/huge_memory.c | 7 +- + mm/hugetlb.c | 2 +- + mm/internal.h | 36 +- + mm/khugepaged.c | 8 +- + mm/ksm.c | 34 +- + mm/memcontrol.c | 329 ++++++++-------- + mm/memory-failure.c | 2 +- + mm/memory.c | 20 +- + mm/mempolicy.c | 10 + + mm/memremap.c | 2 +- + mm/migrate.c | 189 +++++---- + mm/mlock.c | 3 +- + mm/page-writeback.c | 447 +++++++++++---------- + mm/page_alloc.c | 14 +- + mm/page_io.c | 4 +- + mm/page_owner.c | 10 +- + mm/rmap.c | 14 +- + mm/shmem.c | 7 +- + mm/swap.c | 182 ++++----- + mm/swap_state.c | 2 +- + mm/swapfile.c | 8 +- + mm/userfaultfd.c | 2 +- + mm/util.c | 101 ++--- + mm/vmscan.c | 8 +- + mm/workingset.c | 44 +-- + 67 files changed, 2810 insertions(+), 1646 deletions(-) + create mode 100644 mm/folio-compat.c +Merging akpm-current/current (9a931efa742f selftests/memfd: remove unused variable) +$ git merge --no-ff akpm-current/current +Auto-merging mm/workingset.c +Auto-merging mm/vmscan.c +Auto-merging mm/truncate.c +Auto-merging mm/swapfile.c +Auto-merging mm/shmem.c +Auto-merging mm/rmap.c +Auto-merging mm/page_owner.c +Auto-merging mm/page_alloc.c +Auto-merging mm/page-writeback.c +CONFLICT (content): Merge conflict in mm/page-writeback.c +Auto-merging mm/migrate.c +Auto-merging mm/memremap.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memcontrol.c +CONFLICT (content): Merge conflict in mm/memcontrol.c +Auto-merging mm/internal.h +Auto-merging mm/hugetlb.c +Auto-merging mm/huge_memory.c +Auto-merging mm/filemap.c +Auto-merging mm/compaction.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/signal.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/core.c +Auto-merging kernel/fork.c +Auto-merging include/linux/writeback.h +Auto-merging include/linux/swap.h +Auto-merging include/linux/sched.h +CONFLICT (content): Merge conflict in include/linux/sched.h +Auto-merging include/linux/rmap.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/migrate.h +Auto-merging include/linux/memcontrol.h +CONFLICT (content): Merge conflict in include/linux/memcontrol.h +Auto-merging include/linux/highmem.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/backing-dev.h +Auto-merging fs/namespace.c +Auto-merging fs/inode.c +Auto-merging fs/fs-writeback.c +Auto-merging fs/fcntl.c +Auto-merging drivers/of/kexec.c +Auto-merging drivers/mmc/host/mmc_spi.c +Auto-merging drivers/block/ps3disk.c +CONFLICT (content): Merge conflict in drivers/block/ps3disk.c +Auto-merging drivers/base/node.c +Auto-merging block/blk-map.c +Auto-merging arch/s390/mm/init.c +Auto-merging arch/nds32/include/asm/cacheflush.h +Auto-merging arch/arm/mach-rpc/ecard.c +Auto-merging arch/arm/include/asm/cacheflush.h +Auto-merging arch/Kconfig +Auto-merging Documentation/core-api/cachetlb.rst +Resolved 'drivers/block/ps3disk.c' using previous resolution. +Resolved 'include/linux/memcontrol.h' using previous resolution. +Resolved 'include/linux/sched.h' using previous resolution. +Resolved 'mm/memcontrol.c' using previous resolution. +Resolved 'mm/page-writeback.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a0019e182390] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-kernel-mm-numa | 24 + + Documentation/admin-guide/mm/memory-hotplug.rst | 800 ++++++++++-------- + .../admin-guide/mm/numa_memory_policy.rst | 16 +- + Documentation/core-api/cachetlb.rst | 86 +- + Documentation/dev-tools/kasan.rst | 13 +- + Documentation/dev-tools/kfence.rst | 98 ++- + .../translations/zh_CN/core-api/cachetlb.rst | 9 - + arch/Kconfig | 30 +- + arch/arm/configs/dove_defconfig | 1 - + arch/arm/configs/pxa_defconfig | 1 - + arch/arm/include/asm/cacheflush.h | 4 +- + arch/arm/mach-rpc/ecard.c | 2 +- + arch/arm/mm/flush.c | 33 - + arch/arm/mm/nommu.c | 6 - + arch/arm64/mm/mmu.c | 3 +- + arch/csky/abiv1/cacheflush.c | 11 - + arch/csky/abiv1/inc/abi/cacheflush.h | 4 +- + arch/csky/kernel/probes/kprobes.c | 3 +- + arch/ia64/mm/init.c | 3 +- + arch/microblaze/include/asm/pgtable.h | 2 - + arch/microblaze/mm/init.c | 12 - + arch/microblaze/mm/pgtable.c | 17 +- + arch/mips/configs/lemote2f_defconfig | 1 - + arch/mips/configs/pic32mzda_defconfig | 1 - + arch/mips/configs/rt305x_defconfig | 1 - + arch/mips/configs/xway_defconfig | 1 - + arch/mips/include/asm/cacheflush.h | 8 +- + arch/nds32/include/asm/cacheflush.h | 3 +- + arch/nds32/mm/cacheflush.c | 9 - + arch/parisc/configs/generic-32bit_defconfig | 1 - + arch/parisc/include/asm/cacheflush.h | 8 +- + arch/parisc/kernel/cache.c | 3 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 4 +- + arch/powerpc/mm/mem.c | 3 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 13 +- + arch/s390/mm/init.c | 3 +- + arch/sh/include/asm/cacheflush.h | 8 +- + arch/sh/mm/init.c | 3 +- + arch/x86/configs/i386_defconfig | 1 - + arch/x86/configs/x86_64_defconfig | 1 - + arch/x86/kernel/ldt.c | 6 +- + arch/x86/mm/init_32.c | 3 +- + arch/x86/mm/init_64.c | 3 +- + block/blk-map.c | 2 +- + drivers/acpi/acpi_memhotplug.c | 46 +- + drivers/base/memory.c | 167 +++- + drivers/base/node.c | 2 - + drivers/dax/kmem.c | 43 +- + drivers/mmc/host/jz4740_mmc.c | 4 - + drivers/mmc/host/mmc_spi.c | 2 +- + drivers/of/kexec.c | 1 + + drivers/virtio/virtio_mem.c | 26 +- + fs/buffer.c | 56 +- + fs/drop_caches.c | 3 +- + fs/exec.c | 10 +- + fs/fcntl.c | 3 +- + fs/fs-writeback.c | 28 +- + fs/fs_context.c | 4 +- + fs/hfsplus/catalog.c | 16 +- + fs/hfsplus/dir.c | 4 +- + fs/hfsplus/hfsplus_raw.h | 12 +- + fs/hfsplus/xattr.c | 18 +- + fs/inode.c | 48 +- + fs/internal.h | 1 - + fs/locks.c | 6 +- + fs/namei.c | 8 +- + fs/namespace.c | 7 +- + fs/nilfs2/sysfs.c | 26 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/file.c | 103 ++- + fs/ocfs2/namei.c | 17 +- + fs/proc/base.c | 5 +- + fs/proc/fd.c | 23 +- + fs/proc/kcore.c | 73 ++ + fs/proc/page.c | 40 +- + fs/select.c | 4 +- + include/linux/backing-dev-defs.h | 2 + + include/linux/backing-dev.h | 19 + + include/linux/fs.h | 1 + + include/linux/highmem.h | 33 +- + include/linux/memcontrol.h | 91 +- + include/linux/memory.h | 55 +- + include/linux/memory_hotplug.h | 35 +- + include/linux/mempolicy.h | 9 +- + include/linux/memremap.h | 6 + + include/linux/migrate.h | 14 +- + include/linux/mm.h | 32 - + include/linux/mm_types.h | 2 + + include/linux/mm_types_task.h | 5 + + include/linux/mmzone.h | 22 +- + include/linux/once.h | 2 +- + include/linux/pagemap.h | 54 +- + include/linux/preempt.h | 18 +- + include/linux/rmap.h | 8 +- + include/linux/sched.h | 8 + + include/linux/sched/mm.h | 31 +- + include/linux/slab.h | 32 + + include/linux/swap.h | 28 +- + include/linux/threads.h | 2 +- + include/linux/vm_event_item.h | 2 + + include/linux/vmpressure.h | 2 +- + include/linux/writeback.h | 4 +- + include/trace/events/migrate.h | 3 +- + include/uapi/linux/mempolicy.h | 1 + + init/initramfs.c | 2 + + init/main.c | 26 +- + init/noinitramfs.c | 2 + + ipc/msg.c | 2 +- + ipc/namespace.c | 2 +- + ipc/sem.c | 9 +- + ipc/shm.c | 12 +- + ipc/util.c | 6 +- + kernel/acct.c | 2 +- + kernel/cgroup/namespace.c | 2 +- + kernel/cpu.c | 2 +- + kernel/exit.c | 2 +- + kernel/fork.c | 51 ++ + kernel/hung_task.c | 44 + + kernel/kthread.c | 21 +- + kernel/nsproxy.c | 2 +- + kernel/pid_namespace.c | 5 +- + kernel/sched/core.c | 35 +- + kernel/sched/sched.h | 4 +- + kernel/signal.c | 2 +- + kernel/sys.c | 7 - + kernel/sysctl.c | 8 +- + kernel/time/namespace.c | 4 +- + kernel/time/posix-timers.c | 4 +- + kernel/user_namespace.c | 2 +- + lib/Kconfig | 3 - + lib/Kconfig.debug | 17 +- + lib/math/Kconfig | 2 +- + lib/math/rational.c | 3 + + lib/scatterlist.c | 5 +- + lib/string.c | 130 ++- + lib/test_sort.c | 40 +- + lib/test_vmalloc.c | 5 +- + mm/Kconfig | 5 +- + mm/backing-dev.c | 11 + + mm/compaction.c | 51 +- + mm/debug_vm_pgtable.c | 919 +++++++++++++-------- + mm/filemap.c | 23 +- + mm/gup.c | 2 +- + mm/huge_memory.c | 26 - + mm/hugetlb.c | 164 +++- + mm/internal.h | 9 + + mm/kasan/hw_tags.c | 43 - + mm/kasan/kasan.h | 1 - + mm/kasan/report.c | 29 +- + mm/kfence/core.c | 3 + + mm/kfence/kfence.h | 2 + + mm/kfence/report.c | 19 +- + mm/memblock.c | 20 +- + mm/memcontrol.c | 204 ++--- + mm/memory-failure.c | 2 +- + mm/memory.c | 2 +- + mm/memory_hotplug.c | 372 ++++++++- + mm/mempolicy.c | 152 +++- + mm/memremap.c | 25 +- + mm/migrate.c | 317 ++++++- + mm/mremap.c | 52 +- + mm/oom_kill.c | 7 +- + mm/page-writeback.c | 121 ++- + mm/page_alloc.c | 81 +- + mm/page_isolation.c | 7 +- + mm/page_owner.c | 14 +- + mm/percpu.c | 1 - + mm/rmap.c | 14 +- + mm/shmem.c | 2 +- + mm/slab.h | 2 +- + mm/slub.c | 35 +- + mm/sparse.c | 46 +- + mm/swapfile.c | 8 +- + mm/truncate.c | 47 +- + mm/vmalloc.c | 79 +- + mm/vmpressure.c | 10 +- + mm/vmscan.c | 214 ++++- + mm/vmstat.c | 37 +- + mm/workingset.c | 10 + + mm/zsmalloc.c | 10 +- + scripts/check_extable.sh | 2 +- + scripts/checkversion.pl | 18 +- + tools/testing/scatterlist/linux/mm.h | 1 - + tools/testing/selftests/memfd/memfd_test.c | 2 +- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 3 + + tools/testing/selftests/vm/ksm_tests.c | 516 ++++++++++++ + tools/testing/selftests/vm/run_vmtests.sh | 96 +++ + 190 files changed, 4816 insertions(+), 2080 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-numa + create mode 100644 tools/testing/selftests/vm/ksm_tests.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' +Branch 'akpm' set up to track remote branch 'akpm/master' from 'origin'. +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +warning: notes ref refs/notes/commits is invalid +Applying: kexec: move locking into do_kexec_load +Applying: kexec: avoid compat_alloc_user_space +Applying: mm: simplify compat_sys_move_pages +Applying: mm: simplify compat numa syscalls +Applying: compat: remove some compat entry points +Applying: arch: remove compat_alloc_user_space +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + adbe5f2f41f0...70a94fad3e4e akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (70a94fad3e4e arch: remove compat_alloc_user_space) +$ git merge --no-ff akpm/master +Removing arch/arm64/lib/copy_in_user.S +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/compat.h | 5 - + arch/arm64/include/asm/uaccess.h | 11 -- + arch/arm64/include/asm/unistd32.h | 10 +- + arch/arm64/lib/Makefile | 2 +- + arch/arm64/lib/copy_in_user.S | 77 ------------ + arch/mips/cavium-octeon/octeon-memcpy.S | 2 - + arch/mips/include/asm/compat.h | 8 -- + arch/mips/include/asm/uaccess.h | 26 ---- + arch/mips/kernel/syscalls/syscall_n32.tbl | 10 +- + arch/mips/kernel/syscalls/syscall_o32.tbl | 10 +- + arch/mips/lib/memcpy.S | 11 -- + arch/parisc/include/asm/compat.h | 6 - + arch/parisc/include/asm/uaccess.h | 2 - + arch/parisc/kernel/syscalls/syscall.tbl | 8 +- + arch/parisc/lib/memcpy.c | 9 -- + arch/powerpc/include/asm/compat.h | 16 --- + arch/powerpc/kernel/syscalls/syscall.tbl | 10 +- + arch/s390/include/asm/compat.h | 10 -- + arch/s390/include/asm/uaccess.h | 3 - + arch/s390/kernel/syscalls/syscall.tbl | 10 +- + arch/s390/lib/uaccess.c | 63 ---------- + arch/sparc/include/asm/compat.h | 19 --- + arch/sparc/kernel/process_64.c | 2 +- + arch/sparc/kernel/signal32.c | 12 +- + arch/sparc/kernel/signal_64.c | 8 +- + arch/sparc/kernel/syscalls/syscall.tbl | 10 +- + arch/x86/entry/syscalls/syscall_32.tbl | 4 +- + arch/x86/entry/syscalls/syscall_64.tbl | 2 +- + arch/x86/include/asm/compat.h | 13 -- + arch/x86/include/asm/uaccess_64.h | 7 -- + include/linux/compat.h | 39 ++---- + include/linux/uaccess.h | 10 -- + include/uapi/asm-generic/unistd.h | 10 +- + kernel/compat.c | 21 ---- + kernel/kexec.c | 103 ++++++---------- + kernel/sys_ni.c | 5 - + mm/mempolicy.c | 196 +++++++----------------------- + mm/migrate.c | 50 ++++---- + 38 files changed, 175 insertions(+), 645 deletions(-) + delete mode 100644 arch/arm64/lib/copy_in_user.S diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..5b6a036dcc0b --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20210730 |