diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-04-06 15:27:26 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-04-06 15:27:26 +1000 |
| commit | 109f6d10ec17302c4666f7df3dfa0e31d8589d41 (patch) | |
| tree | 48a5d58f97cd836f1aa8e4f05f3782bfc3d7ff77 | |
| parent | 84de49f35ed0ca6ca122823c0e34bd3deeffb17f (diff) | |
| download | linux-109f6d10ec17302c4666f7df3dfa0e31d8589d41.tar.gz linux-109f6d10ec17302c4666f7df3dfa0e31d8589d41.tar.xz | |
Add linux-next specific files for 20220406next-20220406
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 346 | ||||
| -rw-r--r-- | Next/Trees | 348 | ||||
| -rw-r--r-- | Next/merge.log | 4126 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 4821 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..78366df731f8 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,346 @@ +Name SHA1 +---- ---- +origin 3e732ebf7316ac83e8562db7e64cc68aec390a18 +fixes d06c942efea40e1701ade200477a7449008d9f24 +kbuild-current 3123109284176b1532874591f7c81f3837bbdc17 +arc-current e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +arm-current 9be4c88bb7924f68f88cfd47d925c2d046f51a73 +arm64-fixes 1d8e926a04b948f03b3c98aabf7e0033ac12ffbc +arm-soc-fixes 83a1cde5c74bfb44b49cb2a940d044bb2380f4ea +drivers-memory-fixes 4f9f45d0eb0e7d449bc9294459df79b9c66edfac +tee-fixes 98268f2a2a9f1dddf20984f79fdc7b655d0e35fe +m68k-current 0d52a01a266ba21840c7cb02e1de39c503759dda +powerpc-fixes 7f921a2d6c93051b6002dbb7c1781f1fa5b88cce +s390-fixes f443e374ae131c168a065ea1748feac6b2e76613 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net 03eb7daec59f9b273d87141a5e8c4bea24fb3358 +bpf 0a210af6d0a0595fef566e7eeb072f10f37774be +ipsec 748b82c23e25310fec54e1eff2cb63936f391b24 +netfilter dea2d93a8ba437460c5f21bdfa4ada57fa1d2179 +ipvs 277f2bb14361790a70e4b3c649e794b75a91a597 +wireless 10cb21f4ff3f9cb36d1e1c39bf80426f02f4986a +rdma-fixes 4d809f69695d4e7d1378b3a072fa9aef23123018 +sound-current 1ef8715975de8bd481abbd0839ed4f49d9e5b0ff +sound-asoc-fixes 8ab89e4e6b5d2cb4516b09f7bc31feb375c89637 +regmap-fixes 3123109284176b1532874591f7c81f3837bbdc17 +regulator-fixes 2316f0fc0ad2aa87a568ceaf3d76be983ee555c3 +spi-fixes 35d516bdcd92fde46202d06b68df1166760208fd +pci-current 3123109284176b1532874591f7c81f3837bbdc17 +driver-core.current cdb4f26a63c391317e335e6e683a614358e70aeb +tty.current dbf3f09322141b6f04a33949453b7626f62d9e0b +usb.current 3123109284176b1532874591f7c81f3837bbdc17 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes 7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3 +usb-chipidea-fixes f130d08a8d79fd419c339d95eb28ddff72a73f52 +phy 3123109284176b1532874591f7c81f3837bbdc17 +staging.current 20314bacd2f9b1b8fc10895417e6db0dc85f8248 +iio-fixes 108e4d4de2b58011eafd14581b6ea7469f1fc467 +counter-fixes 4a14311a3b935b62b33e665a97ecaaf2f078228a +char-misc.current 94865e2dcb46c1c852c881cfa769cec4947d8f28 +soundwire-fixes 3123109284176b1532874591f7c81f3837bbdc17 +thunderbolt-fixes 3123109284176b1532874591f7c81f3837bbdc17 +input-current 8b188fba75195745026e11d408e4a7e94e01d701 +crypto-current aa8e73eed7d3084c18dd16d195748661c7e881b5 +vfio-fixes 8704e89349080bd640d1755c46d8cdc359a89748 +kselftest-fixes 79ee8aa31d518c1fd5f3b1b1ac39dd1fb4dc7039 +modules-fixes dc0ce6cc4b133f5f2beb8b47dacae13a7d283c2c +dmaengine-fixes 3123109284176b1532874591f7c81f3837bbdc17 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 9fe4e0d3cbfe90152137963cc024ecb63db6e8e6 +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 397c08e6613015138c79c551faffbf649d883e44 +reset-fixes 03cb66463b5547b289099a95ac4ea591cca88ca9 +mips-fixes 3123109284176b1532874591f7c81f3837bbdc17 +at91-fixes 26077968f8389a68fdb38af3f2c2289ddc95e8ca +omap-fixes 8840f5460a23759403f1f2860429dcbcc2f04a65 +kvm-fixes 34af78c4e616c359ed428d79fe4758a35d2c5473 +kvms390-fixes 0e9ff65f455dfd0a8aea5e7843678ab6fe097e21 +hwmon-fixes 4fd45cc8568e6086272d3036f2c29d61e9b776a1 +nvdimm-fixes 3dd60fb9d95db9c78fec86ba4df20852a7b974ba +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes 873863d594c4b12aba19872c78fcaa65147fe9ae +vfs-fixes 9d2231c5d74e13b2a0546fee6737ee4446017903 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes f632b296b007144b6901995a01fbea9225e920f1 +samsung-krzk-fixes 1a9f338f9cf96f8338d5592dee5fce222929e4f7 +pinctrl-samsung-fixes abb860ac7e3f022a233f34b12d035d49abfc114d +devicetree-fixes c3b0068194269193286209d7a70ad1e93a13247f +scsi-fixes 733ab7e1b5d1041204c4ca7373f6e6f9d08e3283 +drm-fixes 3123109284176b1532874591f7c81f3837bbdc17 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 3123109284176b1532874591f7c81f3837bbdc17 +mmc-fixes 46d4820f949a3030b19ee482c68a50b06dd27590 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +hyperv-fixes b6cae15b5710c8097aad26a2e5e752c323ee5348 +soc-fsl-fixes a222fd8541394b36b13c89d1698d9530afd59a9c +risc-v-fixes 3123109284176b1532874591f7c81f3837bbdc17 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +spdx 3123109284176b1532874591f7c81f3837bbdc17 +gpio-brgl-fixes 5467801f1fcbdc46bc7298a84dbf3ca1ff2a7320 +gpio-intel-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +pinctrl-intel-fixes 6f66db29e2415cbe8759c48584f9cae19b3c2651 +erofs-fixes 24331050a3e6afcd4451409831dd9ae8085a42f6 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 02c7efa43627163e489a8db87882445a0ff381f7 +ubifs-fixes c3c07fc25f37c157fde041b3a0c3dfcb1590cbce +memblock-fixes c94afc46cae7ad41b2ad6a99368147879f4b0e56 +cel-fixes 999397926ab3f78c7d1235cc4ca6e3c89d2769bf +irqchip-fixes 544808f7e21cb9ccdb8f3aa7de594c05b1419061 +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +perf-current be2d3ecedd9911fbfd7e55cc9ceac5f8b79ae4cf +efi-fixes 9feaf8b387ee0ece9c1d7add308776b502a35d0c +zstd-fixes 88a309465b3f05a100c3b81966982c0f9f5d23a6 +drm-misc-fixes 13043d1a12c54d8b6605bbead5e177e9fb98a287 +kbuild d5ea4fece4508bf8e72b659cd22fa4840d8d61e5 +perf be2d3ecedd9911fbfd7e55cc9ceac5f8b79ae4cf +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping 4fe87e818ea492ade079cc01a31d088e445f8539 +asm-generic fba2689ee77e63b05e203b3f26079ef915e55660 +arc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm 012d2fb6c8c90adac502c0bb9abd3e815f6047ca +arm64 641d804157294d9b19bdfe6a2cdbd5d25939a048 +arm-perf 602c873eb52e5717057eb0971258c8eb7440c4a5 +arm-soc 6a2f0b2d3b74e3e4002dc4143887637cd216e531 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 25d96e6996281868b85c91ed4fb12eb98f4e2d70 +aspeed d9540eeaa3d15d8295895fc39e7fb90937623923 +at91 a845fa592554e6c92d2f81de6e7074f0a50d7828 +drivers-memory c5057050a59fa25ef5d241b47d7b350e11ea4801 +imx-mxs 45550ada88f0253bef38041f2c1d80f6e69bb0ed +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek 6ceb6a96db4e1309ff072cc5dea95e49ec9fe691 +mvebu 8885ae5142a487ef283aff2ec46e55c0528c75f8 +omap f9ecc209330a4837393f7b87f6f95970542b90c6 +qcom b8277c8275a11b19ab7bff1eb95f6b1ed7495eae +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas eee41de7440d0f559567f48dd5920f8155247174 +reset 2c0e0fd1b6949afd0ebe8f4755f07f0b79a5dcde +rockchip f62180385a210a120e2bd4c5f6f95bdc9534cb12 +samsung-krzk f6354da7894985809c4b7645b650455c99825725 +scmi 6fb69590182d6808abd0e44fbb2a778a35c64459 +stm32 74fa56279651956f7ce6a75a85156585f91e7e5e +sunxi f25c47c6762920840785b5038611bca7c023a745 +tee 17522923771d5c5c0544a648339b80ec56d56212 +tegra 6d746e1eb2f6f7e872c78604c899039f1a41dacd +ti 183a6f5c6e1ea03c5a0bf0d9d304e6a73b806e04 +xilinx 3a14f0e614082821ef65de7e1fb39e74c2ee4ee3 +clk 859c2c7b1d0623a6f523f970043db85ce0e5aa60 +clk-imx b09c68dc57c9d44071d83bb935b733f53ea2b2b4 +clk-renesas 3733db1f77130588c9a2c1596937294998bd7d27 +clk-samsung 45bd8166a1d821eb8fada3092514a7c8543f537c +csky 3123109284176b1532874591f7c81f3837bbdc17 +m68k 0d52a01a266ba21840c7cb02e1de39c503759dda +m68knommu 3123109284176b1532874591f7c81f3837bbdc17 +microblaze fcc619621df50f63b641b18536f908b05d6782a4 +mips 3123109284176b1532874591f7c81f3837bbdc17 +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 862cf8d5fd98ed8ea8989726ed5da53761a9ed76 +parisc-hd e34799ccc1269c2789e8ffd50d6d2260d3d31f78 +powerpc af41d2866f7d75bbb38d487f6ec7770425d70e45 +soc-fsl 1ce93cb102e7fcf5d1849044d23ce92b5a71040a +risc-v 3123109284176b1532874591f7c81f3837bbdc17 +s390 faf79934e65aff90284725518a5ec3c2241c65ae +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 82017457957a550d7d00dde419435dd74a890887 +xtensa 1c4664faa38923330d478f046dc743a00c1e2dec +pidfd 6009ff9e80205e358f7e8261c4806f3533be476b +fscrypt cdaa1b1941f667814300799ddb74f3079517cd5a +fscache 3123109284176b1532874591f7c81f3837bbdc17 +afs 26291c54e111ff6ba87a164d85d4a4e134b7315c +btrfs 9b58921a376a289572a2f161934b49778ec47c58 +ceph f639d9867eea647005dc824e0e24f39ffc50d4e4 +cifs 7cd1cc415dd8d0dca7244c9eafb9a0adc8036805 +configfs 84ec758fb2daa236026506868c8796b0500c047d +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs a1108dcd9373a98f7018aa4310076260b8ecfc0b +exfat 0c404308d41fedbbec036fbec44d51f557a59436 +ext3 f06e95c3a4ca43f9acccca33dc2117e8b924eda0 +ext4 c7cded845fc192cc35a1ca37c0cd957ee35abdf8 +f2fs 5191290407668028179f2544a11ae9b57f0bcf07 +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 0c4bcfdecb1ac0967619ee7ff44871d93c08c909 +gfs2 ead638654d750f37e7cb09872e7baa8cac867882 +jfs a53046291020ec41e09181396c1e829287b48d47 +ksmbd edf5f0548fbb77e20b898460dc25281b0f4d974d +nfs 585ddde606b36874bce9864e7a3b7a26c121b720 +nfs-anna d19e0183a88306acda07f4a01fedeeffe2a2a06b +nfsd c1dbd5583235f82d4a85e57362f9ada3ce9bd87d +ntfs3 52e00ea6b26e45fb8159e3b57cdde8d3f9bdd8e9 +orangefs 40a74870b2d1d3d44e13b3b73c6571dd34f5614d +overlayfs 94fd19752b28aa66c98e7991734af91dfc529f8f +ubifs 705757274599e2e064dd3054aabc74e8af31a095 +v9fs 22e424feb6658c5d6789e45121830357809c59cb +xfs 919edbadebe17a67193533f531c2920c03e40fa4 +zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705 +iomap ebb7fb1557b1d03b906b668aa2164b51e6b7d19a +djw-vfs 49df34221804cfd6384135b28b03c9461a31d024 +file-locks 80d8e4d3f3133d2ce8ac83db6806b7bf62e3a1e1 +vfs fd78f28f9f506cf389614d8c4296837274cb61d2 +printk c5f75d490fc2dd706898c005a05a933b39e880d3 +pci 5e8cf6bbbf3d3618358633c60b6ead30918b4541 +pstore 8126b1c73108bc691f5643df19071a59a69d0bc6 +hid ceaaa0282c0693775ce02e6638df7dd6a4c2d14d +i2c 5db36559df9b9c4f8a5dd86eeaa733ff973e3a33 +i3c 6cbf8b38dfe3aabe330f2c356949bc4d6a1f034f +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging a5af7ccaf51299819dd0e5b1347d6f4d00752701 +jc_docs 4407cca0109c47da912d1035b5ed344ac85eed32 +v4l-dvb 3123109284176b1532874591f7c81f3837bbdc17 +v4l-dvb-next 535f49a9e1f99d0bacb5d492a9dd193c3affbfc0 +pm d8a5a5e3123a30efb235ef9d7a26140c51688050 +cpufreq-arm f84ccad5f5660f86a642a3d7e2bfdc4e7a8a2d49 +cpupower 3123109284176b1532874591f7c81f3837bbdc17 +devfreq 93515220624f43e93f06698786141938581d5e43 +opp 3123109284176b1532874591f7c81f3837bbdc17 +thermal 1379d28e840ff2f7f8a4095ec6cb3e7034e966bc +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm feae43f8aa88309224b27bbe3a59fcb9aefab6f5 +rdma 22cbc6c2681a0a4fe76150270426e763d52353a4 +net-next 0b5c21bbc01e92745ca1ca4f6fd87d878fa3ea5e +bpf-next 042152c27c3bc3e20882f75c289ced32331f4010 +ipsec-next b58b1f563ab78955d37e9e43e02790a85c66ac05 +mlx5-next 3123109284176b1532874591f7c81f3837bbdc17 +netfilter-next c84d86a0295c24487db5b7db1a61d9c0eddfbb66 +ipvs-next c828414ac935bd3df96a8f7028d9d06a3db441e8 +bluetooth 38a1944deda4d96ca04b9aaa51ee5ae879b61aa0 +wireless-next e89600ebeeb14d18c0b062837a84196f72542830 +mtd 4c38eded807043f40f4dc49da6df097f9dcac393 +nand f7c48bccf1a0262a763f7e39f28c5c6798f2d6c3 +spi-nor 151c6b49d679872d6fc0b50e0ad96303091694a2 +crypto 0e03b8fd29363f2df44e2a7a176d486de550757a +drm 3123109284176b1532874591f7c81f3837bbdc17 +drm-misc 21d139a95682c6ade89a2151e44012c9797c0309 +amdgpu 78174f477081b61b21c6f8b616234b00ce556840 +drm-intel 92bc908af5cd6633a167638c4ff432d9fe107fa7 +drm-tegra b53c24f69199b88671293de503f1f999a762f4f9 +drm-msm 05241de1f69eb7f56b0a5e0bec96a7752fad1b2f +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv cdd156955f946beaa5f3a00d8ccf90e5a197becc +fbdev 7e4920bf59cb085e148796e937a8e8212fd2bae0 +regmap bd941dfaae3503c6b707d8544696205f759e57a3 +sound b2405aa948b95afc5246fa56fc05c3512cd6185c +sound-asoc b66751b6e3591eafe5c9cbabd68a45731b0083e3 +modules eeaec7801c421e17edda6e45a32d4a5596b633da +input a949087c2285c8de4f0f204cab2d4eece9d929a2 +block ff0f3f83175274daf2eb4fd4db6430ab71c66e80 +device-mapper 7f790f4da003bb68b987e4916c25b6f0497d92da +libata eaeb9fb2739bbb869ed91640130566b3fea70ca4 +pcmcia 3928cf08334ed895a31458cbebd8d4ec6d84c080 +mmc f95f8307f5513ea31e369d6a577948032cd3a277 +mfd d99460ed5cdcc28feba6b992630b04650e410902 +backlight 023a8830a62846e1cecc8da07e00c801dd0d7598 +battery c22fca40522e2be8af168f3087d87d85e404ea72 +regulator 0250961480860e5327c08cbb61f07ce1ab7c5b7d +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor c2489617b3b9a546789ca00940b205d61c518c81 +integrity 29d1c2b47ef3b39a5bc58e060a4ee23ccf3d052e +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux 81200b0265b15609dcecf192e3f7fb238ec0d3da +smack ba6b652bd8633bc90390e1a02ae0c743ea00c429 +tomoyo 99499a2b0ff01d8a5c0a06132ab33aaed4433b89 +tpmdd 8467b0ed6ce37f7e3f87aa3826627dc9cc55ecb2 +watchdog 826270373f17fd8ebd10753ca0a5fd2ceb1dc38e +iommu e17c6debd4b2d2d474074f83946f8c6522587566 +audit 3123109284176b1532874591f7c81f3837bbdc17 +devicetree a1a2b7125e1079cfcc13a116aa3af3df2f9e002b +mailbox 1b0d0f7c12d57763fe27200d0569c863f11d2b8a +spi d6401954317a549bf6cab20db53259692fc620ef +tip 176002d0f443c9bcb8ee9d67d447b7a3ca9d1e48 +clockevents 49c14f94ccfed1acf55a7dd592c00c58d38e5812 +edac b2fa90ef62558ed65f09201b4c8b79ece4468275 +irqchip de26a7424331493311c08625a700cf45d1eaf151 +ftrace c87857e214862a125208a4b1a510839d0c5a1bd4 +rcu b77b2981bb22c4449a0a6e86eeb9fbab36a2beae +kvm 945024d764a18b1484428f0055439072ea58e349 +kvm-arm 21ea457842759a236eefed2cfaa8cc7e5dc967a0 +kvms390 4aa5ac75bf79cbbc46369163eb2e3addbff0d434 +xen-tip de2ae403b4c0e79a3410e63bc448542fbb9f9bfc +percpu 4e1f82dce05b644d6886d5b3656446d8ec50db20 +workqueues bc35f7ef96284b8c963991357a9278a6beafca54 +drivers-x86 b49f72e7f96d4ed147447428f2ae5b4cea598ca7 +chrome-platform 3123109284176b1532874591f7c81f3837bbdc17 +hsi e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +leds 3123109284176b1532874591f7c81f3837bbdc17 +ipmi ae085d7f9365de7da27ab5c0d16b12d51ea7fca9 +driver-core 3123109284176b1532874591f7c81f3837bbdc17 +usb 3123109284176b1532874591f7c81f3837bbdc17 +thunderbolt 03941ed91c7231e4973fb50de6c349974405df4e +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 4ac56b1f1ef8139dbfc5dab918aa235e8344ec4e +usb-chipidea-next 78665f57c3faa09f123c4818101526e43ae9b6a4 +tty 3123109284176b1532874591f7c81f3837bbdc17 +char-misc 3123109284176b1532874591f7c81f3837bbdc17 +coresight 286f950545e0d9c8aa802cbfc9676860bbc49179 +fpga 21f0a239ecab4b6765269af78904512358beb802 +icc 52c85167e41341c2cbc2570f4bb6bc6cd8f8bc6e +iio b28bc9ebbe2320f919e4f4cf70fafbc8a0ac328d +phy-next 3123109284176b1532874591f7c81f3837bbdc17 +soundwire 60657fb9b19d4ff310bdebfd1fd5a075678c29fb +extcon 4e63832f5daf6d76e8c6fe5c84b493572717535c +gnss 26291c54e111ff6ba87a164d85d4a4e134b7315c +vfio f621eb13facb7681a79f4fec8ec6553ae160da76 +staging e54e00a28837656d0564e572f33de3f405e01710 +mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +dmaengine 3123109284176b1532874591f7c81f3837bbdc17 +cgroup 1be9b7206b7dbff54b223eee7ef3bc91b80433aa +scsi ee03d7a9c533a237e19a5a22d53505eec69f4bcb +scsi-mkp a6b758b0420bda28995ea6939ca0808fcec68be4 +vhost 1c80cf031e0204fde471558ee40183695773ce13 +rpmsg 9ea79a3861c93b19ef78db70044d23bf36b8271e +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl 43ebbb92e43fc9d85f6ff8b2a01c20ab5cf08678 +gpio-intel a1ce76e89907a69713f729ff21db1efa00f3bb47 +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl 4a6d01495a167762de1691eb51e0413954db20eb +pinctrl-intel d25478e1d8f9bf9344cf61a9c02fae88d9930f55 +pinctrl-renesas 715c9faa2d2d3058ad34060e895d1d3ac3435caf +pinctrl-samsung abb860ac7e3f022a233f34b12d035d49abfc114d +pwm ed14d36498c8d15be098df4af9ca324f96e9de74 +userns 9def41809e95d345875f37d2245b4b17c62fedf1 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest 3123109284176b1532874591f7c81f3837bbdc17 +livepatching 0e1b951d6de0528a81d119634ad23f8f9fb6d423 +rtc 915593a7a663b2ad08b895a5f3ba8b19d89d4ebf +nvdimm ada8d8d337ee970860c9844126e634df8076aa11 +at24 3123109284176b1532874591f7c81f3837bbdc17 +ntb 5cf4bc46c2f20651f2d44fe395fc93409b7b0ff4 +seccomp 8a3d3ea66f0d06eff26cd64e3712410daec1f4ae +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi f2af60bb7ce2fa5397f401cbf65725d9c87329a4 +slimbus 0eb1fb16396ce3b0d8d493a4416a5c5f06091c84 +nvmem bdf79b27260ba474ce076e451911b0f552285a7b +xarray 3ed4bb77156da0bc732847c8c9df92454c1fbeea +hyperv eeda29db98f429a3b6473117e6ce1c213ab614f2 +auxdisplay 13de23494f387315c6cfab6fe78fbed7d1b25586 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm 3123109284176b1532874591f7c81f3837bbdc17 +kunit 3123109284176b1532874591f7c81f3837bbdc17 +cfi e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +kunit-next 59729170afcd4900e08997a482467ffda8d88c7f +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi 5d4be19cbe6aadfad0a5f40df91bd478cedd8344 +memblock 58ffc34896db2e5e49e6ae6bf8042f85504d84e8 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +cxl 05e815539f3f161585c13a9ab023341bade2c52f +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +zstd 88a309465b3f05a100c3b81966982c0f9f5d23a6 +efi e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +unicode 5298d4bfe80f6ae6ae2777bcd1357b0022d98573 +slab 38e4e58eb858c5a90223a9e09ee844356c026c6b +random cd9bb50979957b24e81d363432f253bfefb6aea9 +landlock 7325fd5614aa686c496e4f98633be9808aee44f4 +rust 011150424cd9db6089d9a3732a03a6d39ce6f1c9 +sysctl 7cde53da38a3ea00d75ef6a6ab06fa85b80bcf87 +folio ae86f150c9079b42d262135ba11e874b5815b20b +execve dd664099002db909912a23215f8775c97f7f4f10 +kspp f4fe9fc39c7131fe482bc44d68cb0eff96105935 +kspp-gustavo 452d059ea2b6252f6743de3e9e81950d05ed8b18 +akpm-current fd61e89eda93354a503f5741fbee84c15b3eb499 +akpm 24d2a2cd9d638c8c3d23e799c427e8f2eba999a7 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..fcfad15a6450 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,348 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless git git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#main +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +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 +counter-fixes git https://gitlab.com/vilhelmgray/counter.git#fixes-togreg +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/fixes +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/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 +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#main +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +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 +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +gpio-sim git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/gpio-sim +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +folio-iomap git git://git.infradead.org/users/willy/linux.git#folio-iomap +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..885ce755daf5 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4126 @@ +$ date -R +Wed, 06 Apr 2022 08:54:17 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 312310928417 Linux 5.18-rc1 +Merging origin/master (3e732ebf7316 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 312310928417..3e732ebf7316 +Fast-forward (no commit created; -m option ignored) + arch/x86/power/cpu.c | 21 +++++++++++-- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 62 ++++++++++++++++++++++++------------- + drivers/virtio/virtio.c | 5 ++- + fs/btrfs/extent_io.h | 2 +- + fs/btrfs/file.c | 13 ++++++-- + fs/btrfs/inode.c | 23 +++++++++++++- + fs/btrfs/ioctl.c | 20 ++++++++---- + fs/btrfs/volumes.c | 65 +++++++++++++++++---------------------- + fs/btrfs/zoned.c | 13 +++----- + include/linux/virtio_config.h | 6 ---- + 10 files changed, 143 insertions(+), 87 deletions(-) +Merging fixes/fixes (d06c942efea4 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging kbuild-current/fixes (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (9be4c88bb792 ARM: 9191/1: arm/stacktrace, kasan: Silence KASAN warnings in unwind_frame()) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (1d8e926a04b9 perf: MARVELL_CN10K_DDR_PMU should depend on ARCH_THUNDER) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Merge made by the 'ort' strategy. + arch/arm64/include/asm/el2_setup.h | 2 +- + arch/arm64/kernel/elfcore.c | 47 +++++++++++++++++++++----------------- + arch/arm64/kernel/hw_breakpoint.c | 2 +- + arch/arm64/kernel/module-plts.c | 2 +- + arch/arm64/kernel/smp.c | 2 +- + arch/arm64/kernel/suspend.c | 2 +- + arch/arm64/mm/init.c | 4 ++-- + drivers/perf/Kconfig | 2 +- + drivers/perf/qcom_l2_pmu.c | 6 ++--- + 9 files changed, 37 insertions(+), 32 deletions(-) +Merging arm-soc-fixes/arm/fixes (83a1cde5c74b ARM: davinci: da850-evm: Avoid NULL pointer dereference) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Merge made by the 'ort' strategy. + arch/arm/mach-davinci/board-da850-evm.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging drivers-memory-fixes/fixes (4f9f45d0eb0e dt-bindings: memory: snps,ddrc-3.80a compatible also need interrupts) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Merge made by the 'ort' strategy. + .../memory-controllers/synopsys,ddrc-ecc.yaml | 6 ++++-- + drivers/memory/atmel-ebi.c | 23 ++++++++++++++++------ + drivers/memory/renesas-rpc-if.c | 10 +++++++++- + 3 files changed, 30 insertions(+), 9 deletions(-) +Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Merge made by the 'ort' strategy. + drivers/tee/optee/ffa_abi.c | 1 + + 1 file changed, 1 insertion(+) +Merging m68k-current/for-linus (0d52a01a266b m68k: defconfig: Disable fbdev on Sun3/3x) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (7f921a2d6c93 KVM: PPC: Move kvmhv_on_pseries() into kvm_ppc.h) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Merge made by the 'ort' strategy. + arch/powerpc/include/asm/kvm_book3s_64.h | 12 ---------- + arch/powerpc/include/asm/kvm_ppc.h | 12 ++++++++++ + arch/powerpc/include/asm/setup.h | 2 ++ + arch/powerpc/kernel/exceptions-64s.S | 4 ++++ + arch/powerpc/kernel/setup_64.c | 28 ++++++++++++++++++++++ + arch/powerpc/kvm/Kconfig | 9 +++++++ + arch/powerpc/kvm/book3s_64_entry.S | 10 ++++++-- + arch/powerpc/kvm/book3s_hv.c | 41 +++++++++++++++++++++++++------- + arch/powerpc/kvm/book3s_pr.c | 26 +++++++++++++------- + arch/powerpc/kvm/book3s_pr_papr.c | 20 ++++++++++++++++ + arch/powerpc/kvm/powerpc.c | 17 +++++++++++++ + arch/powerpc/mm/numa.c | 2 +- + arch/powerpc/platforms/pseries/setup.c | 13 +++++++++- + 13 files changed, 163 insertions(+), 33 deletions(-) +Merging s390-fixes/fixes (f443e374ae13 Linux 5.17) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Already up to date. +Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Already up to date. +Merging net/master (03eb7daec59f Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/net/micrel.txt | 17 --- + Documentation/networking/dsa/dsa.rst | 64 ++++----- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 7 + + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 5 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 14 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h | 2 + + drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 4 +- + drivers/net/ethernet/fungible/funcore/fun_dev.c | 4 +- + drivers/net/ethernet/intel/ice/ice.h | 1 - + drivers/net/ethernet/intel/ice/ice_fltr.c | 44 ++++++- + drivers/net/ethernet/intel/ice/ice_lib.c | 3 + + drivers/net/ethernet/intel/ice/ice_main.c | 121 ++++++++++++----- + drivers/net/ethernet/intel/ice/ice_virtchnl.c | 4 +- + drivers/net/ethernet/micrel/Kconfig | 1 + + drivers/net/ethernet/qlogic/qed/qed_debug.c | 2 +- + drivers/net/ethernet/sfc/efx_channels.c | 146 ++++++++++++--------- + drivers/net/ethernet/sfc/rx_common.c | 3 + + .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 2 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 +- + drivers/net/mctp/mctp-i2c.c | 2 +- + drivers/net/phy/micrel.c | 106 +-------------- + drivers/net/vrf.c | 15 ++- + include/net/mctp.h | 2 - + net/core/skbuff.c | 15 ++- + net/dsa/master.c | 25 +++- + net/ipv4/fib_semantics.c | 7 +- + net/ipv6/route.c | 2 +- + net/mctp/af_mctp.c | 46 +++++-- + net/mctp/route.c | 16 ++- + net/netfilter/nf_tables_api.c | 2 +- + net/netfilter/nft_bitwise.c | 4 +- + net/netfilter/nft_connlimit.c | 2 +- + net/netfilter/nft_counter.c | 2 +- + net/netfilter/nft_last.c | 2 +- + net/netfilter/nft_limit.c | 2 +- + net/netfilter/nft_quota.c | 2 +- + net/sctp/outqueue.c | 6 +- + net/tls/tls_sw.c | 2 +- + tools/testing/selftests/net/fib_nexthops.sh | 14 ++ + 39 files changed, 410 insertions(+), 311 deletions(-) +Merging bpf/master (0a210af6d0a0 bpf: selftests: Test fentry tracing a struct_ops program) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'ort' strategy. + include/linux/bpf_verifier.h | 4 +++- + kernel/trace/bpf_trace.c | 4 ++-- + kernel/trace/rethook.c | 2 +- + tools/bpf/bpftool/gen.c | 22 ++++++++++++++------- + .../selftests/bpf/prog_tests/dummy_st_ops.c | 23 ++++++++++++++++++++++ + tools/testing/selftests/bpf/progs/map_ptr_kern.c | 4 ++-- + .../selftests/bpf/progs/trace_dummy_st_ops.c | 21 ++++++++++++++++++++ + 7 files changed, 67 insertions(+), 13 deletions(-) + create mode 100644 tools/testing/selftests/bpf/progs/trace_dummy_st_ops.c +Merging ipsec/master (748b82c23e25 xfrm: Pass flowi_oif or l3mdev as oif to xfrm_dst_lookup) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + net/xfrm/xfrm_policy.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging netfilter/master (dea2d93a8ba4 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/master (277f2bb14361 ibmvnic: schedule failover only if vioctl fails) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Already up to date. +Merging wireless/main (10cb21f4ff3f Revert "ath11k: mesh: add support for 256 bitmap in blockack frames in 11ax") +$ git merge -m Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/main +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 7 +++---- + drivers/net/wireless/ath/ath11k/mac.c | 22 ++++++++++++++-------- + drivers/net/wireless/ath/ath9k/xmit.c | 5 ++--- + 3 files changed, 19 insertions(+), 15 deletions(-) +Merging rdma-fixes/for-rc (4d809f69695d IB/rdmavt: add lock to call to rvt_error_qp to prevent a race condition) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 5 +---- + drivers/infiniband/core/cm.c | 3 +-- + drivers/infiniband/hw/mlx5/mr.c | 5 ++++- + drivers/infiniband/sw/rdmavt/qp.c | 6 +++++- + 4 files changed, 11 insertions(+), 8 deletions(-) +Merging sound-current/for-linus (1ef8715975de ALSA: usb-audio: Fix undefined behavior due to shift overflowing the constant) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/hda/hdac_i915.c | 29 +++++++++++++++++++---------- + sound/usb/usbaudio.h | 2 +- + 2 files changed, 20 insertions(+), 11 deletions(-) +Merging sound-asoc-fixes/for-linus (8ab89e4e6b5d Merge remote-tracking branch 'asoc/for-5.17' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + sound/soc/atmel/sam9g20_wm8731.c | 61 ---------------------------------------- + sound/soc/codecs/cs35l41-lib.c | 10 ++++--- + sound/soc/codecs/rt5682.c | 11 +++----- + sound/soc/codecs/rt5682s.c | 11 +++----- + sound/soc/codecs/wm_adsp.c | 10 +++---- + sound/soc/soc-dapm.c | 6 ++-- + sound/soc/soc-pcm.c | 2 +- + sound/soc/soc-topology.c | 4 +-- + sound/soc/sof/topology.c | 3 ++ + 9 files changed, 27 insertions(+), 91 deletions(-) +Merging regmap-fixes/for-linus (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (2316f0fc0ad2 regulator: atc260x: Fix missing active_discharge_on setting) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/regulator/atc260x-regulator.c | 1 + + drivers/regulator/rtq2134-regulator.c | 1 + + drivers/regulator/wm8994-regulator.c | 42 ++++++++++++++++++++++++++++++++--- + 3 files changed, 41 insertions(+), 3 deletions(-) +Merging spi-fixes/for-linus (35d516bdcd92 spi: mxic: Fix an error handling path in mxic_spi_probe()) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/spi/spi-mxic.c | 1 + + drivers/spi/spi-rpc-if.c | 8 ++++++-- + 2 files changed, 7 insertions(+), 2 deletions(-) +Merging pci-current/for-linus (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (cdb4f26a63c3 kobject: kobj_type: remove default_attrs) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Merge made by the 'ort' strategy. + arch/powerpc/platforms/pseries/vas-sysfs.c | 6 ++++-- + fs/sysfs/file.c | 13 ------------ + include/linux/kobject.h | 1 - + lib/kobject.c | 32 ------------------------------ + 4 files changed, 4 insertions(+), 48 deletions(-) +Merging tty.current/tty-linus (dbf3f0932214 tty: serial: mpc52xx_uart: make rx/tx hooks return unsigned, part II.) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Merge made by the 'ort' strategy. + drivers/tty/serial/mpc52xx_uart.c | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) +Merging usb.current/usb-linus (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (7e57714cd0ad Linux 5.17-rc6) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/for-usb-fixes (f130d08a8d79 usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle) +$ git merge -m Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-fixes/for-usb-fixes +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +CONFLICT (content): Merge conflict in drivers/usb/chipidea/ci_hdrc_imx.c +Resolved 'drivers/usb/chipidea/ci_hdrc_imx.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0ef4ac126799] Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git +$ git diff -M --stat --summary HEAD^.. +Merging phy/fixes (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (20314bacd2f9 staging: r8188eu: Fix PPPoE tag insertion on little endian systems) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Merge made by the 'ort' strategy. + drivers/staging/r8188eu/core/rtw_br_ext.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging iio-fixes/fixes-togreg (108e4d4de2b5 iio:proximity:sx9324: Fix hardware gain read/write) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/adc/ad7280a.c | 12 ++++++------ + drivers/iio/chemical/scd4x.c | 5 ++++- + drivers/iio/dac/ad3552r.c | 2 +- + drivers/iio/dac/ad5592r-base.c | 2 +- + drivers/iio/dac/ti-dac5571.c | 28 ++++++++++++++++++---------- + drivers/iio/filter/Kconfig | 1 + + drivers/iio/imu/bmi160/bmi160_core.c | 20 ++++++++++++++------ + drivers/iio/proximity/sx9324.c | 26 +++++++++++++++++++++----- + drivers/iio/proximity/sx_common.c | 1 + + 9 files changed, 67 insertions(+), 30 deletions(-) +Merging counter-fixes/fixes-togreg (4a14311a3b93 counter: Stop using dev_get_drvdata() to get the counter device) +$ git merge -m Merge branch 'fixes-togreg' of https://gitlab.com/vilhelmgray/counter.git counter-fixes/fixes-togreg +Merge made by the 'ort' strategy. +Merging char-misc.current/char-misc-linus (94865e2dcb46 habanalabs: Fix test build failures) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Merge made by the 'ort' strategy. + drivers/misc/habanalabs/common/memory.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) +Merging soundwire-fixes/fixes (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (8b188fba7519 Revert "Input: clear BTN_RIGHT/MIDDLE on buttonpads") +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (aa8e73eed7d3 crypto: x86/sm3 - Fixup SLS) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (8704e8934908 vfio/pci: Fix OpRegion read) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (79ee8aa31d51 selftests/harness: Pass variant to teardown) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Merge made by the 'ort' strategy. + tools/testing/selftests/kselftest_harness.h | 59 +++++++++++++++------- + tools/testing/selftests/pid_namespace/Makefile | 6 +-- + tools/testing/selftests/pidfd/pidfd_wait.c | 1 - + tools/testing/selftests/proc/proc-pid-vm.c | 6 ++- + .../testing/selftests/vDSO/vdso_test_correctness.c | 9 ++-- + tools/testing/selftests/x86/Makefile | 4 ++ + 6 files changed, 54 insertions(+), 31 deletions(-) +Merging modules-fixes/modules-linus (dc0ce6cc4b13 lib/test: use after free in register_test_dev_kmod()) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (9fe4e0d3cbfe mtd: rawnand: fix ecc parameters for mt7622) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'ort' strategy. + drivers/mtd/nand/raw/mtk_ecc.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (397c08e66130 media: platform: imx-mipi-csis: Add dependency on VIDEO_DEV) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Merge made by the 'ort' strategy. + drivers/media/platform/nxp/Kconfig | 1 + + drivers/media/platform/rockchip/rga/rga.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging reset-fixes/reset/fixes (03cb66463b55 dt-bindings: reset: Add parent "resets" property as optional) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Merge made by the 'ort' strategy. + .../devicetree/bindings/reset/hisilicon,hi3660-reset.yaml | 5 +++++ + .../devicetree/bindings/reset/socionext,uniphier-reset.yaml | 3 +++ + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 4 +++- + drivers/reset/tegra/reset-bpmp.c | 9 ++++++++- + 4 files changed, 19 insertions(+), 2 deletions(-) +Merging mips-fixes/mips-fixes (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (26077968f838 dt-bindings: ARM: at91: update maintainers entry) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (8840f5460a23 ARM: dts: Use 32KiHz oscillator on devkit8000) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (34af78c4e616 Merge tag 'iommu-updates-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (0e9ff65f455d KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (4fd45cc8568e hwmon: (asus_wmi_sensors) Fix CROSSHAIR VI HERO name) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + drivers/hwmon/asus_wmi_sensors.c | 2 +- + drivers/hwmon/pmbus/xdpe12284.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (3dd60fb9d95d nvdimm/pmem: stop using q_usage_count as external pgmap refcount) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (873863d594c4 Merge branch 'misc-5.18' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/inode.c +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (9d2231c5d74e lib/iov_iter: initialize "flags" in new pipe_buffer) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (f632b296b007 tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-class-firmware-attributes | 48 ++++++++++++---------- + Documentation/ABI/testing/sysfs-driver-intel_sdsi | 18 ++++---- + drivers/platform/x86/acerhdf.c | 21 ++-------- + drivers/platform/x86/amd-pmc.c | 14 ++++++- + drivers/platform/x86/barco-p50-gpio.c | 1 - + drivers/platform/x86/samsung-laptop.c | 2 - + drivers/platform/x86/think-lmi.c | 44 +++++++------------- + drivers/platform/x86/think-lmi.h | 1 - + tools/power/x86/intel-speed-select/Makefile | 2 +- + 9 files changed, 68 insertions(+), 83 deletions(-) +Merging samsung-krzk-fixes/fixes (1a9f338f9cf9 MAINTAINERS: update Krzysztof Kozlowski's email to Linaro) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Auto-merging Documentation/devicetree/bindings/memory-controllers/synopsys,ddrc-ecc.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/clock/samsung,exynos-audss-clock.yaml | 2 +- + .../bindings/clock/samsung,exynos-clock.yaml | 2 +- + .../bindings/clock/samsung,exynos-ext-clock.yaml | 2 +- + .../clock/samsung,exynos4412-isp-clock.yaml | 2 +- + .../bindings/clock/samsung,exynos5260-clock.yaml | 2 +- + .../bindings/clock/samsung,exynos5410-clock.yaml | 2 +- + .../bindings/clock/samsung,exynos5433-clock.yaml | 2 +- + .../bindings/clock/samsung,exynos7-clock.yaml | 2 +- + .../bindings/clock/samsung,exynos7885-clock.yaml | 2 +- + .../bindings/clock/samsung,exynos850-clock.yaml | 2 +- + .../devicetree/bindings/clock/samsung,s2mps11.yaml | 2 +- + .../clock/samsung,s5pv210-audss-clock.yaml | 2 +- + .../bindings/clock/samsung,s5pv210-clock.yaml | 2 +- + .../devfreq/event/samsung,exynos-nocp.yaml | 2 +- + .../devfreq/event/samsung,exynos-ppmu.yaml | 2 +- + .../display/samsung/samsung,exynos-hdmi-ddc.yaml | 2 +- + .../display/samsung/samsung,exynos-hdmi.yaml | 2 +- + .../display/samsung/samsung,exynos-mixer.yaml | 2 +- + .../display/samsung/samsung,exynos5433-decon.yaml | 2 +- + .../display/samsung/samsung,exynos5433-mic.yaml | 2 +- + .../display/samsung/samsung,exynos7-decon.yaml | 2 +- + .../bindings/display/samsung/samsung,fimd.yaml | 2 +- + .../devicetree/bindings/extcon/maxim,max77843.yaml | 2 +- + .../devicetree/bindings/hwmon/lltc,ltc4151.yaml | 2 +- + .../bindings/hwmon/microchip,mcp3021.yaml | 2 +- + .../devicetree/bindings/hwmon/sensirion,sht15.yaml | 2 +- + .../devicetree/bindings/hwmon/ti,tmp102.yaml | 2 +- + .../devicetree/bindings/hwmon/ti,tmp108.yaml | 2 +- + .../devicetree/bindings/i2c/i2c-exynos5.yaml | 2 +- + .../bindings/i2c/samsung,s3c2410-i2c.yaml | 2 +- + .../samsung,exynos4210-combiner.yaml | 2 +- + .../devicetree/bindings/leds/maxim,max77693.yaml | 2 +- + .../bindings/memory-controllers/brcm,dpfe-cpu.yaml | 2 +- + .../ddr/jedec,lpddr2-timings.yaml | 2 +- + .../memory-controllers/ddr/jedec,lpddr2.yaml | 2 +- + .../ddr/jedec,lpddr3-timings.yaml | 2 +- + .../memory-controllers/ddr/jedec,lpddr3.yaml | 2 +- + .../marvell,mvebu-sdram-controller.yaml | 2 +- + .../qca,ath79-ddr-controller.yaml | 2 +- + .../memory-controllers/renesas,h8300-bsc.yaml | 2 +- + .../memory-controllers/samsung,exynos5422-dmc.yaml | 2 +- + .../memory-controllers/synopsys,ddrc-ecc.yaml | 2 +- + .../memory-controllers/ti,da8xx-ddrctl.yaml | 2 +- + .../devicetree/bindings/mfd/maxim,max14577.yaml | 2 +- + .../devicetree/bindings/mfd/maxim,max77686.yaml | 2 +- + .../devicetree/bindings/mfd/maxim,max77693.yaml | 2 +- + .../devicetree/bindings/mfd/maxim,max77802.yaml | 2 +- + .../devicetree/bindings/mfd/maxim,max77843.yaml | 2 +- + .../bindings/mfd/samsung,exynos5433-lpass.yaml | 2 +- + .../devicetree/bindings/mfd/samsung,s2mpa01.yaml | 2 +- + .../devicetree/bindings/mfd/samsung,s2mps11.yaml | 2 +- + .../devicetree/bindings/mfd/samsung,s5m8767.yaml | 2 +- + .../devicetree/bindings/net/nfc/marvell,nci.yaml | 2 +- + .../devicetree/bindings/net/nfc/nxp,nci.yaml | 2 +- + .../devicetree/bindings/net/nfc/nxp,pn532.yaml | 2 +- + .../devicetree/bindings/net/nfc/nxp,pn544.yaml | 2 +- + .../devicetree/bindings/net/nfc/st,st-nci.yaml | 2 +- + .../devicetree/bindings/net/nfc/st,st21nfca.yaml | 2 +- + .../devicetree/bindings/net/nfc/st,st95hf.yaml | 2 +- + .../devicetree/bindings/net/nfc/ti,trf7970a.yaml | 2 +- + .../bindings/phy/samsung,dp-video-phy.yaml | 2 +- + .../bindings/phy/samsung,exynos-hdmi-phy.yaml | 2 +- + .../bindings/phy/samsung,exynos5250-sata-phy.yaml | 2 +- + .../bindings/phy/samsung,mipi-video-phy.yaml | 2 +- + .../devicetree/bindings/phy/samsung,usb2-phy.yaml | 2 +- + .../bindings/phy/samsung,usb3-drd-phy.yaml | 2 +- + .../pinctrl/samsung,pinctrl-gpio-bank.yaml | 2 +- + .../bindings/pinctrl/samsung,pinctrl-pins-cfg.yaml | 2 +- + .../pinctrl/samsung,pinctrl-wakeup-interrupt.yaml | 2 +- + .../bindings/pinctrl/samsung,pinctrl.yaml | 2 +- + .../bindings/power/supply/maxim,max14577.yaml | 2 +- + .../bindings/power/supply/maxim,max77693.yaml | 2 +- + .../bindings/regulator/maxim,max14577.yaml | 2 +- + .../bindings/regulator/maxim,max77686.yaml | 2 +- + .../bindings/regulator/maxim,max77693.yaml | 2 +- + .../bindings/regulator/maxim,max77802.yaml | 2 +- + .../bindings/regulator/maxim,max77843.yaml | 2 +- + .../bindings/regulator/maxim,max8952.yaml | 2 +- + .../bindings/regulator/maxim,max8973.yaml | 2 +- + .../bindings/regulator/maxim,max8997.yaml | 2 +- + .../bindings/regulator/samsung,s2mpa01.yaml | 2 +- + .../bindings/regulator/samsung,s2mps11.yaml | 2 +- + .../bindings/regulator/samsung,s2mps13.yaml | 2 +- + .../bindings/regulator/samsung,s2mps14.yaml | 2 +- + .../bindings/regulator/samsung,s2mps15.yaml | 2 +- + .../bindings/regulator/samsung,s2mpu02.yaml | 2 +- + .../bindings/regulator/samsung,s5m8767.yaml | 2 +- + .../bindings/rng/samsung,exynos5250-trng.yaml | 2 +- + .../devicetree/bindings/rng/timeriomem_rng.yaml | 2 +- + .../bindings/soc/samsung/exynos-usi.yaml | 2 +- + .../devicetree/bindings/sound/samsung,arndale.yaml | 2 +- + .../bindings/sound/samsung,smdk5250.yaml | 2 +- + .../devicetree/bindings/sound/samsung,snow.yaml | 2 +- + .../devicetree/bindings/sound/samsung,tm2.yaml | 2 +- + .../bindings/spi/samsung,spi-peripheral-props.yaml | 2 +- + .../devicetree/bindings/spi/samsung,spi.yaml | 2 +- + .../bindings/thermal/samsung,exynos-thermal.yaml | 2 +- + .../bindings/usb/samsung,exynos-dwc3.yaml | 2 +- + .../bindings/usb/samsung,exynos-usb2.yaml | 2 +- + MAINTAINERS | 36 +++++++++++----------- + 100 files changed, 117 insertions(+), 117 deletions(-) +Merging pinctrl-samsung-fixes/fixes (abb860ac7e3f pinctrl: samsung: staticize fsd_pin_ctrl) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Merge made by the 'ort' strategy. + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devicetree-fixes/dt/linus (c3b006819426 dt-bindings: Fix 'enum' lists with duplicate entries) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Auto-merging Documentation/devicetree/bindings/extcon/maxim,max77843.yaml +Merge made by the 'ort' strategy. + .../bindings/arm/tegra/nvidia,tegra20-pmc.yaml | 1 - + Documentation/devicetree/bindings/bus/ti-sysc.yaml | 1 - + .../devicetree/bindings/extcon/maxim,max77843.yaml | 2 +- + .../devicetree/bindings/iio/adc/adi,ad7476.yaml | 1 + + .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 8 +-- + .../devicetree/bindings/iio/dac/adi,ad5360.yaml | 6 +- + .../devicetree/bindings/interconnect/qcom,rpm.yaml | 84 +++++++++++----------- + .../bindings/interrupt-controller/mrvl,intc.yaml | 6 +- + .../bindings/media/mediatek,vcodec-encoder.yaml | 1 - + .../bindings/mmc/nvidia,tegra20-sdhci.yaml | 2 + + .../devicetree/bindings/net/ti,davinci-mdio.yaml | 1 + + .../bindings/phy/nvidia,tegra20-usb-phy.yaml | 20 +++--- + .../devicetree/bindings/phy/qcom,usb-hs-phy.yaml | 32 +++++---- + .../devicetree/bindings/pinctrl/cirrus,madera.yaml | 11 ++- + .../devicetree/bindings/power/renesas,apmu.yaml | 3 +- + .../devicetree/bindings/power/supply/bq2415x.yaml | 1 - + .../bindings/regulator/fixed-regulator.yaml | 34 ++++----- + .../devicetree/bindings/sound/st,stm32-sai.yaml | 6 +- + Documentation/devicetree/bindings/sram/sram.yaml | 16 ++--- + 19 files changed, 117 insertions(+), 119 deletions(-) +Merging scsi-fixes/fixes (733ab7e1b5d1 scsi: fnic: Finish scsi_cmnd before dropping the spinlock) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (46d4820f949a mmc: renesas_sdhi: special 4tap settings only apply to HS400) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/core/block.c | 46 ++++++++++++++++++++++++++++++++---- + drivers/mmc/host/mmci_stm32_sdmmc.c | 6 ++--- + drivers/mmc/host/renesas_sdhi_core.c | 4 ++-- + drivers/mmc/host/sdhci-xenon.c | 10 -------- + 4 files changed, 47 insertions(+), 19 deletions(-) +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the 'ort' strategy. +Merging gnss-fixes/gnss-linus (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (b6cae15b5710 Drivers: hv: vmbus: Prevent load re-ordering when reading ring buffer) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Auto-merging drivers/hv/hv_common.c +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/pci/controller/pci-hyperv.c +Merge made by the 'ort' strategy. + drivers/hv/hv_common.c | 11 +++++++ + drivers/hv/ring_buffer.c | 11 ++++++- + drivers/hv/vmbus_drv.c | 65 ++++++++++++++++++++++++++++++------- + drivers/pci/controller/pci-hyperv.c | 9 +++++ + include/asm-generic/mshyperv.h | 1 + + 5 files changed, 85 insertions(+), 12 deletions(-) +Merging soc-fsl-fixes/fix (a222fd854139 soc: fsl: qe: Check of ioremap return value) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (8bb7eca972ad Linux 5.15) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (5467801f1fcb gpio: Restrict usage of GPIO chip irq members before initialization) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Merge made by the 'ort' strategy. + drivers/gpio/gpiolib.c | 19 +++++++++++++++++++ + include/linux/gpio/driver.h | 9 +++++++++ + 2 files changed, 28 insertions(+) +Merging gpio-intel-fixes/fixes (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (6f66db29e241 pinctrl: tigerlake: Revert "Add Alder Lake-M ACPI ID") +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (24331050a3e6 erofs: fix small compressed files inlining) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (02c7efa43627 Documentation: kunit: fix path to .kunitconfig in start.rst) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Merge made by the 'ort' strategy. + Documentation/dev-tools/kunit/start.rst | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) +Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (999397926ab3 nfsd: Clean up nfsd_file_put()) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc +Auto-merging fs/nfsd/filecache.c +Merge made by the 'ort' strategy. + fs/nfsd/filecache.c | 25 +++++++++++++++---------- + fs/nfsd/nfs2acl.c | 24 ++++++++++++------------ + 2 files changed, 27 insertions(+), 22 deletions(-) +Merging irqchip-fixes/irq/irqchip-fixes (544808f7e21c irqchip/gic, gic-v3: Prevent GSI to SGI translations) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Merge made by the 'ort' strategy. + drivers/irqchip/Kconfig | 1 + + drivers/irqchip/irq-gic-v3-its.c | 28 +++++++++++++++++++--------- + drivers/irqchip/irq-gic-v3.c | 14 ++++++++++---- + drivers/irqchip/irq-gic.c | 6 ++++++ + drivers/irqchip/irq-qcom-mpm.c | 2 +- + 5 files changed, 37 insertions(+), 14 deletions(-) +Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (be2d3ecedd99 Merge tag 'perf-tools-for-v5.18-2022-04-02' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Already up to date. +Merging efi-fixes/urgent (9feaf8b387ee efi: fix return value of __setup handlers) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Merge made by the 'ort' strategy. + include/linux/zstd_lib.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (13043d1a12c5 Merge drm-misc/drm-misc-next-fixes into drm-misc-fixes) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + .../bindings/display/bridge/chipone,icn6211.yaml | 1 - + .../bindings/display/bridge/toshiba,tc358762.yaml | 1 - + Documentation/driver-api/dma-buf.rst | 6 + + drivers/dma-buf/Makefile | 1 + + drivers/dma-buf/dma-fence-array.c | 32 +++ + drivers/dma-buf/selftests.h | 1 + + drivers/dma-buf/st-dma-fence-unwrap.c | 261 +++++++++++++++++++++ + drivers/dma-buf/sync_file.c | 141 +++++------ + drivers/gpu/drm/drm_of.c | 99 ++++---- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h | 1 + + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 4 +- + include/linux/dma-fence-array.h | 19 ++ + include/linux/dma-fence-chain.h | 2 + + include/linux/dma-fence-unwrap.h | 95 ++++++++ + 17 files changed, 547 insertions(+), 121 deletions(-) + create mode 100644 drivers/dma-buf/st-dma-fence-unwrap.c + create mode 100644 include/linux/dma-fence-unwrap.h +Merging kbuild/for-next (d5ea4fece450 kbuild: Allow kernel installation packaging to override pkg-config) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Merge made by the 'ort' strategy. + Makefile | 3 ++- + certs/Makefile | 4 ++-- + scripts/Makefile | 4 ++-- + scripts/kconfig/gconf-cfg.sh | 12 ++++++------ + scripts/kconfig/mconf-cfg.sh | 16 ++++++++-------- + scripts/kconfig/nconf-cfg.sh | 16 ++++++++-------- + scripts/kconfig/qconf-cfg.sh | 14 +++++++------- + tools/objtool/Makefile | 4 ++-- + usr/include/Makefile | 2 +- + 9 files changed, 38 insertions(+), 37 deletions(-) +Merging perf/perf/core (be2d3ecedd99 Merge tag 'perf-tools-for-v5.18-2022-04-02' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Already up to date. +Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (4fe87e818ea4 dma-mapping: move pgprot_decrypted out of dma_pgprot) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Already up to date. +Merging asm-generic/master (fba2689ee77e Merge branch 'remove-h8300' of git://git.infradead.org/users/hch/misc into asm-generic) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +CONFLICT (modify/delete): Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml deleted in asm-generic/master and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml left in tree. +Auto-merging MAINTAINERS +Auto-merging drivers/irqchip/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml +rm 'Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml' +$ git commit --no-edit -v -a +[master c53f29081408] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/clock/renesas,h8300-div-clock.txt | 24 -- + Documentation/devicetree/bindings/h8300/cpu.txt | 13 - + .../interrupt-controller/renesas,h8300h-intc.txt | 22 -- + .../interrupt-controller/renesas,h8s-intc.txt | 22 -- + .../memory-controllers/renesas,h8300-bsc.yaml | 35 -- + .../features/core/cBPF-JIT/arch-support.txt | 1 - + .../features/core/eBPF-JIT/arch-support.txt | 1 - + .../core/generic-idle-thread/arch-support.txt | 1 - + .../features/core/jump-labels/arch-support.txt | 1 - + .../core/thread-info-in-task/arch-support.txt | 1 - + .../features/core/tracehook/arch-support.txt | 1 - + .../features/debug/KASAN/arch-support.txt | 1 - + .../debug/debug-vm-pgtable/arch-support.txt | 1 - + .../debug/gcov-profile-all/arch-support.txt | 1 - + Documentation/features/debug/kcov/arch-support.txt | 1 - + Documentation/features/debug/kgdb/arch-support.txt | 1 - + .../features/debug/kmemleak/arch-support.txt | 1 - + .../debug/kprobes-on-ftrace/arch-support.txt | 1 - + .../features/debug/kprobes/arch-support.txt | 1 - + .../features/debug/kretprobes/arch-support.txt | 1 - + .../features/debug/optprobes/arch-support.txt | 1 - + .../features/debug/stackprotector/arch-support.txt | 1 - + .../features/debug/uprobes/arch-support.txt | 1 - + .../debug/user-ret-profiler/arch-support.txt | 1 - + .../features/io/dma-contiguous/arch-support.txt | 1 - + .../locking/cmpxchg-local/arch-support.txt | 1 - + .../features/locking/lockdep/arch-support.txt | 1 - + .../locking/queued-rwlocks/arch-support.txt | 1 - + .../locking/queued-spinlocks/arch-support.txt | 1 - + .../features/perf/kprobes-event/arch-support.txt | 1 - + .../features/perf/perf-regs/arch-support.txt | 1 - + .../features/perf/perf-stackdump/arch-support.txt | 1 - + .../sched/membarrier-sync-core/arch-support.txt | 1 - + .../features/sched/numa-balancing/arch-support.txt | 1 - + .../seccomp/seccomp-filter/arch-support.txt | 1 - + .../time/arch-tick-broadcast/arch-support.txt | 1 - + .../features/time/clockevents/arch-support.txt | 1 - + .../time/context-tracking/arch-support.txt | 1 - + .../features/time/irq-time-acct/arch-support.txt | 1 - + .../features/time/virt-cpuacct/arch-support.txt | 1 - + .../features/vm/ELF-ASLR/arch-support.txt | 1 - + .../features/vm/PG_uncached/arch-support.txt | 1 - + Documentation/features/vm/THP/arch-support.txt | 1 - + Documentation/features/vm/TLB/arch-support.txt | 1 - + .../features/vm/huge-vmap/arch-support.txt | 1 - + .../features/vm/ioremap_prot/arch-support.txt | 1 - + .../features/vm/pte_special/arch-support.txt | 1 - + MAINTAINERS | 11 - + arch/h8300/Kbuild | 5 - + arch/h8300/Kconfig | 49 --- + arch/h8300/Kconfig.cpu | 99 ----- + arch/h8300/Kconfig.debug | 2 - + arch/h8300/Makefile | 44 --- + arch/h8300/boot/Makefile | 27 -- + arch/h8300/boot/compressed/Makefile | 45 --- + arch/h8300/boot/compressed/head.S | 49 --- + arch/h8300/boot/compressed/misc.c | 76 ---- + arch/h8300/boot/compressed/vmlinux.lds | 35 -- + arch/h8300/boot/compressed/vmlinux.scr | 9 - + arch/h8300/boot/dts/Makefile | 6 - + arch/h8300/boot/dts/edosk2674.dts | 108 ----- + arch/h8300/boot/dts/h8300h_sim.dts | 97 ----- + arch/h8300/boot/dts/h8s_sim.dts | 100 ----- + arch/h8300/configs/edosk2674_defconfig | 48 --- + arch/h8300/configs/h8300h-sim_defconfig | 48 --- + arch/h8300/configs/h8s-sim_defconfig | 48 --- + arch/h8300/include/asm/Kbuild | 8 - + arch/h8300/include/asm/bitops.h | 179 --------- + arch/h8300/include/asm/bug.h | 13 - + arch/h8300/include/asm/byteorder.h | 7 - + arch/h8300/include/asm/cache.h | 12 - + arch/h8300/include/asm/elf.h | 102 ----- + arch/h8300/include/asm/flat.h | 36 -- + arch/h8300/include/asm/hash.h | 54 --- + arch/h8300/include/asm/io.h | 67 ---- + arch/h8300/include/asm/irq.h | 25 -- + arch/h8300/include/asm/irqflags.h | 97 ----- + arch/h8300/include/asm/kgdb.h | 45 --- + arch/h8300/include/asm/mmu_context.h | 6 - + arch/h8300/include/asm/page.h | 17 - + arch/h8300/include/asm/page_offset.h | 2 - + arch/h8300/include/asm/pgtable.h | 43 -- + arch/h8300/include/asm/processor.h | 126 ------ + arch/h8300/include/asm/ptrace.h | 39 -- + arch/h8300/include/asm/signal.h | 23 -- + arch/h8300/include/asm/smp.h | 1 - + arch/h8300/include/asm/string.h | 18 - + arch/h8300/include/asm/switch_to.h | 52 --- + arch/h8300/include/asm/syscall.h | 43 -- + arch/h8300/include/asm/thread_info.h | 102 ----- + arch/h8300/include/asm/tlb.h | 7 - + arch/h8300/include/asm/traps.h | 41 -- + arch/h8300/include/asm/user.h | 71 ---- + arch/h8300/include/asm/vmalloc.h | 4 - + arch/h8300/include/uapi/asm/Kbuild | 2 - + arch/h8300/include/uapi/asm/byteorder.h | 7 - + arch/h8300/include/uapi/asm/posix_types.h | 13 - + arch/h8300/include/uapi/asm/ptrace.h | 43 -- + arch/h8300/include/uapi/asm/sigcontext.h | 19 - + arch/h8300/include/uapi/asm/signal.h | 92 ----- + arch/h8300/include/uapi/asm/unistd.h | 8 - + arch/h8300/kernel/.gitignore | 2 - + arch/h8300/kernel/Makefile | 22 -- + arch/h8300/kernel/asm-offsets.c | 70 ---- + arch/h8300/kernel/entry.S | 433 --------------------- + arch/h8300/kernel/h8300_ksyms.c | 35 -- + arch/h8300/kernel/head_ram.S | 60 --- + arch/h8300/kernel/head_rom.S | 111 ------ + arch/h8300/kernel/irq.c | 99 ----- + arch/h8300/kernel/kgdb.c | 135 ------- + arch/h8300/kernel/module.c | 71 ---- + arch/h8300/kernel/process.c | 173 -------- + arch/h8300/kernel/ptrace.c | 199 ---------- + arch/h8300/kernel/ptrace_h.c | 256 ------------ + arch/h8300/kernel/ptrace_s.c | 44 --- + arch/h8300/kernel/setup.c | 213 ---------- + arch/h8300/kernel/signal.c | 287 -------------- + arch/h8300/kernel/sim-console.c | 31 -- + arch/h8300/kernel/syscalls.c | 15 - + arch/h8300/kernel/traps.c | 156 -------- + arch/h8300/kernel/vmlinux.lds.S | 69 ---- + arch/h8300/lib/Makefile | 9 - + arch/h8300/lib/abs.S | 21 - + arch/h8300/lib/ashldi3.c | 25 -- + arch/h8300/lib/ashrdi3.c | 25 -- + arch/h8300/lib/delay.c | 41 -- + arch/h8300/lib/libgcc.h | 78 ---- + arch/h8300/lib/lshrdi3.c | 24 -- + arch/h8300/lib/memcpy.S | 86 ---- + arch/h8300/lib/memset.S | 70 ---- + arch/h8300/lib/moddivsi3.S | 73 ---- + arch/h8300/lib/modsi3.S | 73 ---- + arch/h8300/lib/muldi3.c | 45 --- + arch/h8300/lib/mulsi3.S | 39 -- + arch/h8300/lib/ucmpdi2.c | 18 - + arch/h8300/lib/udivsi3.S | 77 ---- + arch/h8300/mm/Makefile | 6 - + arch/h8300/mm/fault.c | 57 --- + arch/h8300/mm/init.c | 95 ----- + arch/h8300/mm/memory.c | 52 --- + drivers/clk/Makefile | 1 - + drivers/clk/h8300/Makefile | 3 - + drivers/clk/h8300/clk-div.c | 57 --- + drivers/clk/h8300/clk-h8s2678.c | 145 ------- + drivers/clocksource/Kconfig | 20 - + drivers/clocksource/Makefile | 3 - + drivers/clocksource/h8300_timer16.c | 192 --------- + drivers/clocksource/h8300_timer8.c | 211 ---------- + drivers/clocksource/h8300_tpu.c | 158 -------- + drivers/irqchip/Kconfig | 11 - + drivers/irqchip/Makefile | 2 - + drivers/irqchip/irq-renesas-h8300h.c | 94 ----- + drivers/irqchip/irq-renesas-h8s.c | 102 ----- + drivers/net/ethernet/smsc/Kconfig | 4 +- + drivers/net/ethernet/smsc/smc91x.h | 11 - + drivers/tty/serial/Kconfig | 5 +- + init/Kconfig | 3 +- + tools/arch/h8300/include/asm/bitsperlong.h | 15 - + tools/arch/h8300/include/uapi/asm/mman.h | 7 - + 159 files changed, 5 insertions(+), 6922 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/renesas,h8300-div-clock.txt + delete mode 100644 Documentation/devicetree/bindings/h8300/cpu.txt + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,h8300h-intc.txt + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,h8s-intc.txt + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml + delete mode 100644 arch/h8300/Kbuild + delete mode 100644 arch/h8300/Kconfig + delete mode 100644 arch/h8300/Kconfig.cpu + delete mode 100644 arch/h8300/Kconfig.debug + delete mode 100644 arch/h8300/Makefile + delete mode 100644 arch/h8300/boot/Makefile + delete mode 100644 arch/h8300/boot/compressed/Makefile + delete mode 100644 arch/h8300/boot/compressed/head.S + delete mode 100644 arch/h8300/boot/compressed/misc.c + delete mode 100644 arch/h8300/boot/compressed/vmlinux.lds + delete mode 100644 arch/h8300/boot/compressed/vmlinux.scr + delete mode 100644 arch/h8300/boot/dts/Makefile + delete mode 100644 arch/h8300/boot/dts/edosk2674.dts + delete mode 100644 arch/h8300/boot/dts/h8300h_sim.dts + delete mode 100644 arch/h8300/boot/dts/h8s_sim.dts + delete mode 100644 arch/h8300/configs/edosk2674_defconfig + delete mode 100644 arch/h8300/configs/h8300h-sim_defconfig + delete mode 100644 arch/h8300/configs/h8s-sim_defconfig + delete mode 100644 arch/h8300/include/asm/Kbuild + delete mode 100644 arch/h8300/include/asm/bitops.h + delete mode 100644 arch/h8300/include/asm/bug.h + delete mode 100644 arch/h8300/include/asm/byteorder.h + delete mode 100644 arch/h8300/include/asm/cache.h + delete mode 100644 arch/h8300/include/asm/elf.h + delete mode 100644 arch/h8300/include/asm/flat.h + delete mode 100644 arch/h8300/include/asm/hash.h + delete mode 100644 arch/h8300/include/asm/io.h + delete mode 100644 arch/h8300/include/asm/irq.h + delete mode 100644 arch/h8300/include/asm/irqflags.h + delete mode 100644 arch/h8300/include/asm/kgdb.h + delete mode 100644 arch/h8300/include/asm/mmu_context.h + delete mode 100644 arch/h8300/include/asm/page.h + delete mode 100644 arch/h8300/include/asm/page_offset.h + delete mode 100644 arch/h8300/include/asm/pgtable.h + delete mode 100644 arch/h8300/include/asm/processor.h + delete mode 100644 arch/h8300/include/asm/ptrace.h + delete mode 100644 arch/h8300/include/asm/signal.h + delete mode 100644 arch/h8300/include/asm/smp.h + delete mode 100644 arch/h8300/include/asm/string.h + delete mode 100644 arch/h8300/include/asm/switch_to.h + delete mode 100644 arch/h8300/include/asm/syscall.h + delete mode 100644 arch/h8300/include/asm/thread_info.h + delete mode 100644 arch/h8300/include/asm/tlb.h + delete mode 100644 arch/h8300/include/asm/traps.h + delete mode 100644 arch/h8300/include/asm/user.h + delete mode 100644 arch/h8300/include/asm/vmalloc.h + delete mode 100644 arch/h8300/include/uapi/asm/Kbuild + delete mode 100644 arch/h8300/include/uapi/asm/byteorder.h + delete mode 100644 arch/h8300/include/uapi/asm/posix_types.h + delete mode 100644 arch/h8300/include/uapi/asm/ptrace.h + delete mode 100644 arch/h8300/include/uapi/asm/sigcontext.h + delete mode 100644 arch/h8300/include/uapi/asm/signal.h + delete mode 100644 arch/h8300/include/uapi/asm/unistd.h + delete mode 100644 arch/h8300/kernel/.gitignore + delete mode 100644 arch/h8300/kernel/Makefile + delete mode 100644 arch/h8300/kernel/asm-offsets.c + delete mode 100644 arch/h8300/kernel/entry.S + delete mode 100644 arch/h8300/kernel/h8300_ksyms.c + delete mode 100644 arch/h8300/kernel/head_ram.S + delete mode 100644 arch/h8300/kernel/head_rom.S + delete mode 100644 arch/h8300/kernel/irq.c + delete mode 100644 arch/h8300/kernel/kgdb.c + delete mode 100644 arch/h8300/kernel/module.c + delete mode 100644 arch/h8300/kernel/process.c + delete mode 100644 arch/h8300/kernel/ptrace.c + delete mode 100644 arch/h8300/kernel/ptrace_h.c + delete mode 100644 arch/h8300/kernel/ptrace_s.c + delete mode 100644 arch/h8300/kernel/setup.c + delete mode 100644 arch/h8300/kernel/signal.c + delete mode 100644 arch/h8300/kernel/sim-console.c + delete mode 100644 arch/h8300/kernel/syscalls.c + delete mode 100644 arch/h8300/kernel/traps.c + delete mode 100644 arch/h8300/kernel/vmlinux.lds.S + delete mode 100644 arch/h8300/lib/Makefile + delete mode 100644 arch/h8300/lib/abs.S + delete mode 100644 arch/h8300/lib/ashldi3.c + delete mode 100644 arch/h8300/lib/ashrdi3.c + delete mode 100644 arch/h8300/lib/delay.c + delete mode 100644 arch/h8300/lib/libgcc.h + delete mode 100644 arch/h8300/lib/lshrdi3.c + delete mode 100644 arch/h8300/lib/memcpy.S + delete mode 100644 arch/h8300/lib/memset.S + delete mode 100644 arch/h8300/lib/moddivsi3.S + delete mode 100644 arch/h8300/lib/modsi3.S + delete mode 100644 arch/h8300/lib/muldi3.c + delete mode 100644 arch/h8300/lib/mulsi3.S + delete mode 100644 arch/h8300/lib/ucmpdi2.c + delete mode 100644 arch/h8300/lib/udivsi3.S + delete mode 100644 arch/h8300/mm/Makefile + delete mode 100644 arch/h8300/mm/fault.c + delete mode 100644 arch/h8300/mm/init.c + delete mode 100644 arch/h8300/mm/memory.c + delete mode 100644 drivers/clk/h8300/Makefile + delete mode 100644 drivers/clk/h8300/clk-div.c + delete mode 100644 drivers/clk/h8300/clk-h8s2678.c + delete mode 100644 drivers/clocksource/h8300_timer16.c + delete mode 100644 drivers/clocksource/h8300_timer8.c + delete mode 100644 drivers/clocksource/h8300_tpu.c + delete mode 100644 drivers/irqchip/irq-renesas-h8300h.c + delete mode 100644 drivers/irqchip/irq-renesas-h8s.c + delete mode 100644 tools/arch/h8300/include/asm/bitsperlong.h + delete mode 100644 tools/arch/h8300/include/uapi/asm/mman.h +Merging arc/for-next (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (012d2fb6c8c9 Merge branch 'devel-stable' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/Kconfig.debug +CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug +Auto-merging arch/arm/boot/compressed/Makefile +CONFLICT (content): Merge conflict in arch/arm/boot/compressed/Makefile +Auto-merging arch/arm/include/asm/assembler.h +Auto-merging arch/arm/include/asm/cacheflush.h +Auto-merging arch/arm/include/asm/switch_to.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/switch_to.h +Auto-merging arch/arm/kernel/entry-armv.S +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/kernel/smp.c +Auto-merging arch/arm/kernel/stacktrace.c +Auto-merging arch/arm/kernel/traps.c +CONFLICT (content): Merge conflict in arch/arm/kernel/traps.c +Auto-merging arch/arm/kernel/traps.c +Auto-merging arch/arm/mach-s3c/mach-jive.c +Auto-merging arch/arm/mm/ioremap.c +Auto-merging drivers/irqchip/irq-nvic.c +Auto-merging lib/Kconfig +Resolved 'arch/arm/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3da67e9100a3] Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging arm64/for-next/core (641d80415729 Merge branch 'for-next/spectre-bhb' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (602c873eb52e perf: Replace acpi_bus_get_device()) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (6a2f0b2d3b74 dt: amd-seattle: add a description of the CPUs and caches) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Already up to date. +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next +Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts +Merge made by the 'ort' strategy. +Merging amlogic/for-next (25d96e699628 Merge branch 'v5.19/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. + .../boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts | 16 ++++++++++++---- + .../dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 6 ++++++ + 2 files changed, 18 insertions(+), 4 deletions(-) +Merging aspeed/for-next (d9540eeaa3d1 Merge branches 'nuvoton-dt-for-v5.18' and 'dt-for-v5.18' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Auto-merging arch/arm/boot/dts/aspeed-g4.dtsi +Auto-merging arch/arm/boot/dts/aspeed-g5.dtsi +Auto-merging arch/arm/boot/dts/aspeed-g6.dtsi +Merge made by the 'ort' strategy. + arch/arm/boot/dts/aspeed-ast2600-evb.dts | 18 ++++++++++++++++++ + arch/arm/boot/dts/aspeed-g4.dtsi | 6 ++++++ + arch/arm/boot/dts/aspeed-g5.dtsi | 7 +++++++ + arch/arm/boot/dts/aspeed-g6.dtsi | 19 +++++++++++++++++++ + 4 files changed, 50 insertions(+) +Merging at91/at91-next (a845fa592554 Merge branch 'clk-at91' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Auto-merging drivers/soc/microchip/mpfs-sys-controller.c +Auto-merging include/dt-bindings/clock/at91.h +Merge made by the 'ort' strategy. +Merging drivers-memory/for-next (c5057050a59f Merge branch 'mem-ctrl-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. + drivers/memory/samsung/exynos5422-dmc.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging imx-mxs/for-next (45550ada88f0 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. +Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (6ceb6a96db4e Merge branch 'v5.17-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. +Merging mvebu/for-next (8885ae5142a4 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Auto-merging arch/arm64/boot/dts/marvell/armada-37xx.dtsi +Merge made by the 'ort' strategy. +Merging omap/for-next (f9ecc209330a Merge branch 'omap-for-v5.18/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. +Merging qcom/for-next (b8277c8275a1 Merge branches 'arm64-defconfig-for-5.18', 'arm64-for-5.18', 'clk-for-5.18', 'defconfig-for-5.18', 'drivers-for-5.18', 'dts-for-5.18', 'arm64-fixes-for-5.17' and 'dts-fixes-for-5.17' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging arch/arm/configs/multi_v7_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +Auto-merging arch/arm64/boot/dts/qcom/sm8350.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sm8450.dtsi +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Resolved 'arch/arm64/configs/defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9ae968c68a89] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/arm64/configs/defconfig | 10 ++++++++++ + 1 file changed, 10 insertions(+) +Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/bcm2711-rpi-400.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging renesas/next (eee41de7440d Merge branches 'renesas-arm-defconfig-for-v5.19', 'renesas-arm-dt-for-v5.19', 'renesas-drivers-for-v5.19' and 'renesas-dt-bindings-for-v5.19' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../bindings/power/renesas,rzg2l-sysc.yaml | 5 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 25 + + .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 12 +- + arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 24 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 56 ++ + arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts | 70 --- + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 584 ++++++++++++++++++++- + arch/arm64/boot/dts/renesas/r9a07g054l2-smarc.dts | 8 - + arch/arm64/boot/dts/renesas/rz-smarc-common.dtsi | 15 - + arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 15 + + .../boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi | 57 +- + arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi | 61 +++ + arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 15 + + arch/arm64/configs/defconfig | 1 + + drivers/soc/renesas/Kconfig | 6 + + drivers/soc/renesas/renesas-soc.c | 13 + + 16 files changed, 833 insertions(+), 134 deletions(-) +Merging reset/reset/next (2c0e0fd1b694 reset: ACPI reset support) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Merge made by the 'ort' strategy. + .../bindings/reset/amlogic,meson-reset.yaml | 1 + + drivers/reset/core.c | 15 ++- + drivers/reset/reset-meson.c | 6 + + drivers/reset/reset-simple.c | 1 + + drivers/reset/reset-uniphier-glue.c | 75 ++++++------- + include/dt-bindings/reset/amlogic,meson-s4-reset.h | 125 +++++++++++++++++++++ + 6 files changed, 181 insertions(+), 42 deletions(-) + create mode 100644 include/dt-bindings/reset/amlogic,meson-s4-reset.h +Merging rockchip/for-next (f62180385a21 Merge branch 'v5.19-armsoc/soc32' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 5 + + .../devicetree/bindings/soc/rockchip/grf.yaml | 2 + + arch/arm/boot/dts/rk3036.dtsi | 2 +- + arch/arm/boot/dts/rk3188-bqedison2qc.dts | 3 +- + arch/arm/boot/dts/rk322x.dtsi | 2 +- + arch/arm/mach-rockchip/platsmp.c | 2 +- + arch/arm64/boot/dts/rockchip/Makefile | 3 +- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 3 +- + arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 3 +- + .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 3 +- + arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 3 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 3 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 3 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 40 +- + arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 502 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 14 + + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 28 ++ + drivers/soc/rockchip/pm_domains.c | 6 +- + 22 files changed, 612 insertions(+), 23 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +Merging samsung-krzk/for-next (f6354da78949 Merge branch 'next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/exynos3250.dtsi | 3 ++- + arch/arm/boot/dts/exynos4.dtsi | 4 ++-- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 4 ++-- + arch/arm/boot/dts/exynos4412-odroidx.dts | 8 ++++---- + arch/arm/boot/dts/exynos5250.dtsi | 8 ++++---- + arch/arm/boot/dts/exynos5260.dtsi | 3 ++- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 4 ++-- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 7 ++----- + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 6 +++--- + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 6 +++--- + arch/arm/boot/dts/exynos54xx.dtsi | 3 ++- + arch/arm/boot/dts/s5pv210.dtsi | 22 ++++++---------------- + arch/arm/configs/mini2440_defconfig | 3 ++- + arch/arm/configs/s3c2410_defconfig | 2 ++ + arch/arm/mach-s3c/Kconfig | 8 -------- + arch/arm/mach-s3c/Kconfig.s3c24xx | 2 -- + arch/arm/mach-s3c/iotiming-s3c2410.c | 2 +- + arch/arm/mach-s3c/pm-s3c64xx.c | 2 +- + arch/arm/mach-s3c/s3c24xx.c | 2 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 3 ++- + arch/arm64/boot/dts/exynos/exynos850-e850-96.dts | 5 +++++ + arch/arm64/boot/dts/exynos/exynos850.dtsi | 19 ++----------------- + arch/arm64/boot/dts/tesla/fsd.dtsi | 2 +- + 23 files changed, 51 insertions(+), 77 deletions(-) +Merging scmi/for-linux-next (6fb69590182d Merge remote-tracking branch 'korg_sudeep/fixes/vexpress' into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + arch/arm/mach-vexpress/spc.c | 28 ++++++++++++++-------------- + drivers/firmware/arm_scmi/clock.c | 5 +++-- + drivers/firmware/arm_scmi/driver.c | 3 ++- + drivers/firmware/arm_scmi/optee.c | 8 ++++---- + 4 files changed, 23 insertions(+), 21 deletions(-) +Merging stm32/stm32-next (74fa56279651 ARM: dts: stm32: Switch DWMAC RMII clock to MCO2 on DHCOM) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 49 ++++++++++++++++++++++++++++ + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 22 ++++++++++--- + 2 files changed, 67 insertions(+), 4 deletions(-) +Merging sunxi/sunxi/for-next (f25c47c67629 Merge branch 'sunxi/dt-for-5.18' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. +Merging tee/next (17522923771d Merge branch 'fixes' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Merge made by the 'ort' strategy. + drivers/tee/Kconfig | 5 +---- + drivers/tee/optee/call.c | 2 +- + drivers/tee/tee_shm.c | 35 +++++++++++++++++++++++++---------- + 3 files changed, 27 insertions(+), 15 deletions(-) +Merging tegra/for-next (6d746e1eb2f6 Merge branch for-5.18/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. + drivers/memory/tegra/Makefile | 2 + + drivers/memory/tegra/mc.c | 3 ++ + drivers/memory/tegra/mc.h | 7 ++- + drivers/memory/tegra/tegra186-emc.c | 3 ++ + drivers/memory/tegra/tegra234.c | 101 ++++++++++++++++++++++++++++++++++++ + 5 files changed, 115 insertions(+), 1 deletion(-) + create mode 100644 drivers/memory/tegra/tegra234.c +Merging ti/ti-next (183a6f5c6e1e Merge branches 'ti-k3-dts-next' and 'ti-drivers-soc-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. +Merging xilinx/for-next (3a14f0e61408 arm64: zynqmp: Rename dma to dma-controller) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Already up to date. +Merging clk/clk-next (859c2c7b1d06 Revert "clk: Drop the rate range on clk_put()") +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (b09c68dc57c9 clk: imx: pll14xx: Support dynamic rates) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (3733db1f7713 dt-bindings: clock: renesas: Document RZ/G2UL SoC) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/clock/renesas,rzg2l-cpg.yaml | 7 ++++--- + drivers/clk/renesas/rzg2l-cpg.c | 2 -- + 2 files changed, 4 insertions(+), 5 deletions(-) +Merging clk-samsung/for-next (45bd8166a1d8 clk: samsung: Add initial Exynos7885 clock driver) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Already up to date. +Merging csky/linux-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging m68k/for-next (0d52a01a266b m68k: defconfig: Disable fbdev on Sun3/3x) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (fcc619621df5 microblaze/PCI: Remove pci_phys_mem_access_prot() dead code) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git nios2/for-next +Already up to date. +Merging openrisc/for-next (862cf8d5fd98 openrisc/boot: Remove unnecessary initialisation in memcpy().) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (e34799ccc126 parisc: Change MAX_ADDRESS to become unsigned long long) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/Kconfig | 1 + + arch/parisc/configs/generic-32bit_defconfig | 4 +++- + arch/parisc/configs/generic-64bit_defconfig | 3 ++- + arch/parisc/include/asm/cache.h | 1 + + arch/parisc/include/asm/cacheflush.h | 5 +++-- + arch/parisc/include/asm/pgtable.h | 2 +- + arch/parisc/kernel/cache.c | 17 ++++++++++++++++- + arch/parisc/kernel/pacache.S | 3 --- + arch/parisc/kernel/processor.c | 11 +++++++++-- + drivers/video/console/sticore.c | 21 +++++++++++++++++++++ + 10 files changed, 57 insertions(+), 11 deletions(-) +Merging powerpc/next (af41d2866f7d powerpc/64: Fix build failure with allyesconfig in book3s_64_entry.S) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging soc-fsl/next (1ce93cb102e7 soc: fsl: qe: Check of ioremap return value) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging risc-v/for-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging s390/for-next (faf79934e65a s390/alternatives: avoid using jgnop mnemonic) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Already up to date. +Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master +Already up to date. +Merging uml/linux-next (82017457957a um: run_helper: Write error message to kernel log on exec failure on host) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (1c4664faa389 xtensa: define update_mmu_tlb function) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging pidfd/for-next (6009ff9e8020 Merge branch 'fs.mount_setattr.fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging fscrypt/master (cdaa1b1941f6 fscrypt: update documentation for direct I/O support) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master +Already up to date. +Merging fscache/fscache-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Already up to date. +Merging afs/afs-next (26291c54e111 Linux 5.17-rc2) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (9b58921a376a Merge branch 'for-next-next-v5.18-20220404' into for-next-20220404) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/inode.c +Merge made by the 'ort' strategy. + fs/btrfs/acl.c | 39 +- + fs/btrfs/block-group.c | 107 +-- + fs/btrfs/block-group.h | 4 + + fs/btrfs/check-integrity.c | 10 +- + fs/btrfs/compression.c | 44 +- + fs/btrfs/ctree.c | 100 ++- + fs/btrfs/ctree.h | 113 +++- + fs/btrfs/delalloc-space.c | 9 +- + fs/btrfs/dev-replace.c | 52 +- + fs/btrfs/dir-item.c | 31 +- + fs/btrfs/disk-io.c | 62 +- + fs/btrfs/disk-io.h | 4 +- + fs/btrfs/extent-tree.c | 11 +- + fs/btrfs/extent_io.c | 172 +++-- + fs/btrfs/extent_io.h | 2 + + fs/btrfs/file.c | 280 +++----- + fs/btrfs/free-space-cache.c | 7 +- + fs/btrfs/inode.c | 1550 ++++++++++++++++++++++--------------------- + fs/btrfs/ioctl.c | 241 ++++--- + fs/btrfs/props.c | 40 +- + fs/btrfs/props.h | 4 - + fs/btrfs/qgroup.c | 7 +- + fs/btrfs/qgroup.h | 12 +- + fs/btrfs/raid56.c | 29 +- + fs/btrfs/reflink.c | 23 +- + fs/btrfs/relocation.c | 16 +- + fs/btrfs/root-tree.c | 3 +- + fs/btrfs/scrub.c | 708 ++++++++++---------- + fs/btrfs/send.c | 227 ++----- + fs/btrfs/space-info.c | 11 +- + fs/btrfs/space-info.h | 6 + + fs/btrfs/subpage.c | 55 +- + fs/btrfs/subpage.h | 2 + + fs/btrfs/super.c | 6 +- + fs/btrfs/sysfs.c | 43 +- + fs/btrfs/tree-checker.c | 55 ++ + fs/btrfs/tree-checker.h | 1 + + fs/btrfs/tree-log.c | 8 +- + fs/btrfs/volumes.c | 56 +- + fs/btrfs/xattr.c | 40 +- + fs/btrfs/zoned.c | 27 + + fs/btrfs/zoned.h | 12 +- + include/linux/fs.h | 5 + + 43 files changed, 2169 insertions(+), 2065 deletions(-) +Merging ceph/master (f639d9867eea ceph: fix memory leak in ceph_readdir when note_last_dentry returns error) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (7cd1cc415dd8 cifs: update internal module number) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/cifs/cifsfs.h | 2 +- + fs/cifs/connect.c | 15 +++++++++------ + fs/cifs/netmisc.c | 2 +- + fs/cifs/smb2misc.c | 10 ++++++---- + 4 files changed, 17 insertions(+), 12 deletions(-) +Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Already up to date. +Merging erofs/dev (a1108dcd9373 erofs: rename ctime to mtime) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (0c404308d41f exfat: fix referencing wrong parent directory information after renaming) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/namei.c | 27 +-------------------------- + 1 file changed, 1 insertion(+), 26 deletions(-) +Merging ext3/for_next (f06e95c3a4ca Merge fsnotify cleanup from Bang Li.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. +Merging ext4/dev (c7cded845fc1 ext4: truncate during setxattr leads to kernel panic) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/super.c +Merge made by the 'ort' strategy. + fs/ext4/ext4.h | 2 +- + fs/ext4/extents.c | 32 +++++++++++++++++++++++++------- + fs/ext4/inode.c | 7 ++++++- + fs/ext4/super.c | 1 + + fs/ext4/xattr.c | 34 ++++++++++++++++++++++++++++++++-- + 5 files changed, 65 insertions(+), 11 deletions(-) +Merging f2fs/dev (519129040766 Merge tag 'for-5.18-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Already up to date. +Merging fuse/for-next (0c4bcfdecb1a fuse: fix pipe buffer lifetime for direct_io) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Already up to date. +Merging gfs2/for-next (ead638654d75 gfs2: Replace list_prepare_entry() with list_entry()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + fs/gfs2/lops.c | 5 +++-- + fs/gfs2/quota.c | 13 +++++-------- + fs/gfs2/recovery.c | 22 ++++++++++------------ + 3 files changed, 18 insertions(+), 22 deletions(-) +Merging jfs/jfs-next (a53046291020 jfs: prevent NULL deref in diFree) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (edf5f0548fbb ksmbd: replace usage of found with dedicated list iterator variable) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +Merging nfs/linux-next (585ddde606b3 SUNRPC: Ensure we flush any closed sockets before xs_xprt_free()) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Auto-merging fs/nfs/inode.c +Auto-merging include/linux/sunrpc/xprt.h +Auto-merging include/trace/events/sunrpc.h +Auto-merging net/sunrpc/rpc_pipe.c +Auto-merging net/sunrpc/xprt.c +Merge made by the 'ort' strategy. + fs/file_table.c | 1 + + fs/nfs/Kconfig | 4 ---- + fs/nfs/dir.c | 19 +++---------------- + fs/nfs/inode.c | 1 - + fs/nfs/internal.h | 10 ++++++++++ + fs/nfs/nfs4file.c | 6 ++++-- + include/linux/sunrpc/xprt.h | 5 ++--- + include/trace/events/sunrpc.h | 1 - + net/sunrpc/clnt.c | 6 +++--- + net/sunrpc/rpc_pipe.c | 1 - + net/sunrpc/xprt.c | 30 ++++++++++++++++-------------- + net/sunrpc/xprtsock.c | 23 ++++++++++++++++++----- + 12 files changed, 57 insertions(+), 50 deletions(-) +Merging nfs-anna/linux-next (d19e0183a883 NFS: Do not report writeback errors in nfs_getattr()) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/for-next (c1dbd5583235 fs/lock: add helper locks_owner_has_blockers to check for blockers) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Auto-merging Documentation/filesystems/locking.rst +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + Documentation/filesystems/locking.rst | 2 ++ + fs/locks.c | 48 ++++++++++++++++++++++++++++++----- + include/linux/fs.h | 8 ++++++ + 3 files changed, 51 insertions(+), 7 deletions(-) +Merging ntfs3/master (52e00ea6b26e fs/ntfs3: Update valid size if -EIOCBQUEUED) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/inode.c +Merge made by the 'ort' strategy. + fs/ntfs3/file.c | 12 +++-- + fs/ntfs3/frecord.c | 10 ++-- + fs/ntfs3/fslog.c | 6 ++- + fs/ntfs3/inode.c | 8 +++- + fs/ntfs3/xattr.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++------- + 5 files changed, 145 insertions(+), 27 deletions(-) +Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (94fd19752b28 ovl: don't fail copy up if no fileattr support on upper) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (705757274599 ubifs: rename_whiteout: correct old_dir size computing) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (22e424feb665 Revert "fs/9p: search open fids first") +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging xfs/for-next (919edbadebe1 xfs: drop async cache flushes from CIL commits.) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Already up to date. +Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Auto-merging fs/zonefs/super.c +CONFLICT (content): Merge conflict in fs/zonefs/super.c +Resolved 'fs/zonefs/super.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4b0c56698d92] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git +$ git diff -M --stat --summary HEAD^.. +Merging iomap/iomap-for-next (ebb7fb1557b1 xfs, iomap: limit individual ioend chain lengths in writeback) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (80d8e4d3f313 fs/locks: fix fcntl_getlk64/fcntl_setlk64 stub prototypes) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. +Merging vfs/for-next (fd78f28f9f50 Merge branch 'work.namei' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging fs/internal.h +Auto-merging fs/namespace.c +Auto-merging fs/namespace.c +Auto-merging fs/nfs/nfs4file.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + arch/alpha/kernel/osf_sys.c | 1 + + fs/fsopen.c | 4 ++-- + fs/internal.h | 1 + + fs/namei.c | 11 ++--------- + fs/namespace.c | 13 ++++--------- + fs/nfs/nfs4file.c | 4 ++-- + include/linux/fs.h | 11 ----------- + include/linux/mount.h | 29 +++++++++++++++++------------ + kernel/usermode_driver.c | 4 ++-- + security/smack/smackfs.c | 1 + + 10 files changed, 32 insertions(+), 47 deletions(-) +Merging printk/for-next (c5f75d490fc2 Merge branch 'for-5.18' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Auto-merging kernel/printk/printk.c +Auto-merging lib/vsprintf.c +Merge made by the 'ort' strategy. +Merging pci/next (5e8cf6bbbf3d Merge branch 'pci/resource') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Merge made by the 'ort' strategy. + arch/x86/include/asm/e820/api.h | 5 +++++ + arch/x86/kernel/resource.c | 25 +++++++++++++++++-------- + arch/x86/pci/acpi.c | 5 +++++ + drivers/pci/pci-acpi.c | 41 ++++++++++++++++++++++++++++++----------- + 4 files changed, 57 insertions(+), 19 deletions(-) +Merging pstore/for-next/pstore (8126b1c73108 pstore: Don't use semaphores in always-atomic-context code) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (ceaaa0282c06 Merge branch 'for-5.18/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'ort' strategy. + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-multitouch.c | 6 ++++++ + drivers/hid/intel-ish-hid/ipc/hw-ish.h | 2 ++ + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 2 ++ + 4 files changed, 11 insertions(+) +Merging i2c/i2c/for-next (5db36559df9b Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging i3c/i3c/next (6cbf8b38dfe3 i3c: fix uninitialized variable use in i2c setup) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (a5af7ccaf512 hwmon: (aquacomputer_d5next) Add support for Aquacomputer Octo) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Merge made by the 'ort' strategy. + Documentation/hwmon/aquacomputer_d5next.rst | 4 + + drivers/hwmon/Kconfig | 7 +- + drivers/hwmon/aquacomputer_d5next.c | 433 ++++++++++++++++++++++++---- + drivers/hwmon/asus-ec-sensors.c | 3 +- + drivers/hwmon/jc42.c | 2 + + drivers/hwmon/peci/dimmtemp.c | 13 +- + 6 files changed, 399 insertions(+), 63 deletions(-) +Merging jc_docs/docs-next (4407cca0109c docs/zh_CN: Add schedutil Chinese translation) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Merge made by the 'ort' strategy. + Documentation/dev-tools/testing-overview.rst | 63 +++++ + Documentation/doc-guide/kernel-doc.rst | 2 + + Documentation/doc-guide/sphinx.rst | 5 +- + Documentation/driver-api/thermal/intel_dptf.rst | 2 +- + Documentation/kernel-hacking/hacking.rst | 36 +-- + Documentation/kernel-hacking/locking.rst | 5 +- + .../process/embargoed-hardware-issues.rst | 2 +- + Documentation/process/submitting-patches.rst | 5 +- + .../zh_CN/admin-guide/mm/damon/reclaim.rst | 4 +- + .../zh_CN/admin-guide/mm/damon/usage.rst | 291 ++++++++++++++++++++- + .../translations/zh_CN/scheduler/index.rst | 2 + + .../translations/zh_CN/scheduler/sched-debug.rst | 51 ++++ + .../translations/zh_CN/scheduler/schedutil.rst | 165 ++++++++++++ + .../translations/zh_CN/vm/damon/design.rst | 7 +- + Documentation/translations/zh_CN/vm/frontswap.rst | 196 ++++++++++++++ + Documentation/translations/zh_CN/vm/hwpoison.rst | 166 ++++++++++++ + Documentation/translations/zh_CN/vm/index.rst | 24 +- + .../translations/zh_CN/vm/memory-model.rst | 135 ++++++++++ + .../translations/zh_CN/vm/mmu_notifier.rst | 97 +++++++ + .../zh_CN/vm/overcommit-accounting.rst | 86 ++++++ + Documentation/translations/zh_CN/vm/page_frags.rst | 38 +++ + Documentation/translations/zh_CN/vm/page_owner.rst | 116 ++++++++ + .../translations/zh_CN/vm/page_table_check.rst | 56 ++++ + .../translations/zh_CN/vm/remap_file_pages.rst | 32 +++ + .../zh_CN/vm/split_page_table_lock.rst | 96 +++++++ + Documentation/translations/zh_CN/vm/z3fold.rst | 31 +++ + Documentation/translations/zh_CN/vm/zsmalloc.rst | 78 ++++++ + Documentation/w1/slaves/w1_therm.rst | 9 +- + Documentation/x86/exception-tables.rst | 23 +- + 29 files changed, 1757 insertions(+), 66 deletions(-) + create mode 100644 Documentation/translations/zh_CN/scheduler/sched-debug.rst + create mode 100644 Documentation/translations/zh_CN/scheduler/schedutil.rst + create mode 100644 Documentation/translations/zh_CN/vm/frontswap.rst + create mode 100644 Documentation/translations/zh_CN/vm/hwpoison.rst + create mode 100644 Documentation/translations/zh_CN/vm/memory-model.rst + create mode 100644 Documentation/translations/zh_CN/vm/mmu_notifier.rst + create mode 100644 Documentation/translations/zh_CN/vm/overcommit-accounting.rst + create mode 100644 Documentation/translations/zh_CN/vm/page_frags.rst + create mode 100644 Documentation/translations/zh_CN/vm/page_owner.rst + create mode 100644 Documentation/translations/zh_CN/vm/page_table_check.rst + create mode 100644 Documentation/translations/zh_CN/vm/remap_file_pages.rst + create mode 100644 Documentation/translations/zh_CN/vm/split_page_table_lock.rst + create mode 100644 Documentation/translations/zh_CN/vm/z3fold.rst + create mode 100644 Documentation/translations/zh_CN/vm/zsmalloc.rst +Merging v4l-dvb/master (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (535f49a9e1f9 media: platform: imx-mipi-csis: Add dependency on VIDEO_DEV) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Merge made by the 'ort' strategy. + drivers/media/usb/dvb-usb/a800.c | 18 +- + drivers/media/usb/dvb-usb/af9005.c | 19 +- + drivers/media/usb/dvb-usb/az6027.c | 45 +- + drivers/media/usb/dvb-usb/cinergyT2-core.c | 10 +- + drivers/media/usb/dvb-usb/cxusb.c | 88 +--- + drivers/media/usb/dvb-usb/dib0700_devices.c | 428 +++++++++++-------- + drivers/media/usb/dvb-usb/dibusb-mb.c | 165 ++++---- + drivers/media/usb/dvb-usb/dibusb-mc.c | 88 ++-- + drivers/media/usb/dvb-usb/digitv.c | 13 +- + drivers/media/usb/dvb-usb/dtt200u.c | 56 ++- + drivers/media/usb/dvb-usb/dtv5100.c | 11 +- + drivers/media/usb/dvb-usb/dw2102.c | 84 ++-- + drivers/media/usb/dvb-usb/gp8psk.c | 36 +- + drivers/media/usb/dvb-usb/m920x.c | 51 ++- + drivers/media/usb/dvb-usb/nova-t-usb2.c | 18 +- + drivers/media/usb/dvb-usb/opera1.c | 15 +- + drivers/media/usb/dvb-usb/pctv452e.c | 22 +- + drivers/media/usb/dvb-usb/technisat-usb2.c | 11 +- + drivers/media/usb/dvb-usb/ttusb2.c | 36 +- + drivers/media/usb/dvb-usb/umt-010.c | 18 +- + drivers/media/usb/dvb-usb/vp702x.c | 23 +- + drivers/media/usb/dvb-usb/vp7045.c | 28 +- + include/media/dvb-usb-ids.h | 632 +++++++++++++++------------- + 23 files changed, 1071 insertions(+), 844 deletions(-) +Merging pm/linux-next (d8a5a5e3123a Merge branch 'acpi-processor' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. + drivers/acpi/processor_idle.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (f84ccad5f566 cpufreq: qcom-cpufreq-hw: Fix throttle frequency value on EPSS platforms) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'ort' strategy. + drivers/cpufreq/qcom-cpufreq-hw.c | 62 +++++++++++++++++++++++++++++++-------- + 1 file changed, 49 insertions(+), 13 deletions(-) +Merging cpupower/cpupower (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (93515220624f PM / devfreq: rk3399_dmc: Avoid static (reused) profile) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/devfreq/rk3399_dmc.txt | 212 ------------ + .../memory-controllers/rockchip,rk3399-dmc.yaml | 384 +++++++++++++++++++++ + drivers/devfreq/rk3399_dmc.c | 299 +++++++--------- + 3 files changed, 518 insertions(+), 377 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/devfreq/rk3399_dmc.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/rockchip,rk3399-dmc.yaml +Merging opp/opp/linux-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (1379d28e840f thermal: rcar_thermal: Use platform_get_irq_optional() to get the interrupt) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/thermal/rzg2l-thermal.yaml | 1 + + drivers/thermal/rcar_thermal.c | 17 ++++++++++++----- + 2 files changed, 13 insertions(+), 5 deletions(-) +Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging dlm/next (feae43f8aa88 fs: dlm: print cluster addr if non-cluster node connects) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging rdma/for-next (22cbc6c2681a IB/rdmavt: add missing locks in rvt_ruc_loopback) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging drivers/infiniband/sw/rdmavt/qp.c +Merge made by the 'ort' strategy. + drivers/infiniband/core/uverbs_cmd.c | 6 +- + drivers/infiniband/hw/irdma/puda.c | 7 +- + drivers/infiniband/sw/rdmavt/qp.c | 6 +- + include/rdma/ib_verbs.h | 122 ++++++++++++++++++++++------------- + include/uapi/rdma/ib_user_verbs.h | 38 +++++++++++ + 5 files changed, 126 insertions(+), 53 deletions(-) +Merging net-next/master (0b5c21bbc01e net: ensure net_todo_list is processed quickly) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Merge made by the 'ort' strategy. + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 20 ++++++------- + include/linux/netdevice.h | 3 +- + net/core/dev.c | 2 +- + net/core/rtnetlink.c | 33 ++++++++++++++++++++++ + 4 files changed, 44 insertions(+), 14 deletions(-) +Merging bpf-next/for-next (042152c27c3b bpf, arm64: Sign return address for JITed code) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging kernel/trace/bpf_trace.c +Auto-merging tools/lib/bpf/Makefile +Merge made by the 'ort' strategy. + arch/arm64/include/asm/insn.h | 9 + + arch/arm64/lib/insn.c | 67 +- + arch/arm64/net/bpf_jit.h | 17 + + arch/arm64/net/bpf_jit_comp.c | 255 +++- + include/uapi/linux/btf.h | 4 +- + kernel/bpf/bpf_iter.c | 30 +- + kernel/bpf/stackmap.c | 1 - + kernel/trace/bpf_trace.c | 6 +- + lib/test_bpf.c | 315 ++++- + samples/bpf/Makefile | 10 +- + samples/bpf/syscall_tp_user.c | 3 + + samples/bpf/xdp_router_ipv4.bpf.c | 180 +++ + samples/bpf/xdp_router_ipv4_kern.c | 186 --- + samples/bpf/xdp_router_ipv4_user.c | 465 +++---- + tools/bpf/bpftool/feature.c | 2 +- + tools/bpf/bpftool/link.c | 3 + + tools/bpf/bpftool/prog.c | 1 + + tools/include/uapi/linux/btf.h | 4 +- + tools/lib/bpf/Build | 3 +- + tools/lib/bpf/Makefile | 2 +- + tools/lib/bpf/btf.c | 6 +- + tools/lib/bpf/libbpf.c | 481 +++++++- + tools/lib/bpf/libbpf.h | 41 +- + tools/lib/bpf/libbpf.map | 1 + + tools/lib/bpf/libbpf_internal.h | 19 + + tools/lib/bpf/usdt.bpf.h | 256 ++++ + tools/lib/bpf/usdt.c | 1280 ++++++++++++++++++++ + tools/testing/selftests/bpf/Makefile | 25 +- + .../selftests/bpf/prog_tests/attach_probe.c | 85 +- + .../selftests/bpf/prog_tests/uprobe_autoattach.c | 38 + + tools/testing/selftests/bpf/prog_tests/usdt.c | 421 +++++++ + tools/testing/selftests/bpf/progs/profiler.inc.h | 5 +- + .../selftests/bpf/progs/test_attach_probe.c | 41 +- + .../testing/selftests/bpf/progs/test_bpf_cookie.c | 4 +- + .../selftests/bpf/progs/test_l4lb_noinline.c | 2 +- + tools/testing/selftests/bpf/progs/test_sk_assign.c | 4 +- + .../selftests/bpf/progs/test_task_pt_regs.c | 2 +- + .../selftests/bpf/progs/test_uprobe_autoattach.c | 52 + + .../selftests/bpf/progs/test_urandom_usdt.c | 70 ++ + tools/testing/selftests/bpf/progs/test_usdt.c | 96 ++ + .../selftests/bpf/progs/test_usdt_multispec.c | 32 + + .../selftests/bpf/progs/test_xdp_noinline.c | 12 +- + tools/testing/selftests/bpf/progs/trigger_bench.c | 2 +- + tools/testing/selftests/bpf/sdt-config.h | 6 + + tools/testing/selftests/bpf/sdt.h | 513 ++++++++ + .../selftests/bpf/test_bpftool_synctypes.py | 2 +- + tools/testing/selftests/bpf/test_offload.py | 2 +- + tools/testing/selftests/bpf/test_progs.c | 6 +- + tools/testing/selftests/bpf/test_progs.h | 2 + + tools/testing/selftests/bpf/urandom_read.c | 63 +- + tools/testing/selftests/bpf/urandom_read_aux.c | 9 + + tools/testing/selftests/bpf/urandom_read_lib1.c | 13 + + tools/testing/selftests/bpf/urandom_read_lib2.c | 8 + + 53 files changed, 4572 insertions(+), 590 deletions(-) + create mode 100644 samples/bpf/xdp_router_ipv4.bpf.c + delete mode 100644 samples/bpf/xdp_router_ipv4_kern.c + create mode 100644 tools/lib/bpf/usdt.bpf.h + create mode 100644 tools/lib/bpf/usdt.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/uprobe_autoattach.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/usdt.c + create mode 100644 tools/testing/selftests/bpf/progs/test_uprobe_autoattach.c + create mode 100644 tools/testing/selftests/bpf/progs/test_urandom_usdt.c + create mode 100644 tools/testing/selftests/bpf/progs/test_usdt.c + create mode 100644 tools/testing/selftests/bpf/progs/test_usdt_multispec.c + create mode 100644 tools/testing/selftests/bpf/sdt-config.h + create mode 100644 tools/testing/selftests/bpf/sdt.h + create mode 100644 tools/testing/selftests/bpf/urandom_read_aux.c + create mode 100644 tools/testing/selftests/bpf/urandom_read_lib1.c + create mode 100644 tools/testing/selftests/bpf/urandom_read_lib2.c +Merging ipsec-next/master (b58b1f563ab7 xfrm: rework default policy structure) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (c84d86a0295c Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Already up to date. +Merging ipvs-next/master (c828414ac935 netfilter: nft_compat: suppress comment match) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master +Already up to date. +Merging bluetooth/master (38a1944deda4 Bluetooth: btusb: Set HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN for QCA) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btbcm.c | 52 +++++++++++++++++++++++++++++++++++++++- + drivers/bluetooth/btintel.c | 2 +- + drivers/bluetooth/btmtksdio.c | 2 +- + drivers/bluetooth/btusb.c | 5 ++++ + drivers/bluetooth/hci_qca.c | 4 ++-- + include/net/bluetooth/hci.h | 9 +++++++ + include/net/bluetooth/hci_core.h | 8 +++++-- + net/bluetooth/hci_conn.c | 2 +- + net/bluetooth/hci_sync.c | 31 ++++++++++++++++++++++++ + net/bluetooth/mgmt_util.c | 2 +- + net/bluetooth/sco.c | 23 +++++++++++------- + 11 files changed, 122 insertions(+), 18 deletions(-) +Merging wireless-next/main (e89600ebeeb1 af_vsock: SOCK_SEQPACKET broken buffer test) +$ git merge -m Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/main +Already up to date. +Merging mtd/mtd/next (4c38eded8070 mtd: parsers: bcm47xxpart: print correct offset on read error) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'ort' strategy. + drivers/mtd/parsers/bcm47xxpart.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nand/nand/next (f7c48bccf1a0 mtd: rawnand: print offset instead of page number for bad blocks) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Merge made by the 'ort' strategy. + drivers/mtd/nand/raw/davinci_nand.c | 2 +- + drivers/mtd/nand/raw/nand_base.c | 9 +- + drivers/mtd/nand/spi/gigadevice.c | 158 +++++++++++++++++++++++++++++++++++- + 3 files changed, 163 insertions(+), 6 deletions(-) +Merging spi-nor/spi-nor/next (151c6b49d679 mtd: spi-nor: Skip erase logic when SPI_NOR_NO_ERASE is set) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (0e03b8fd2936 crypto: xilinx - Turn SHA into a tristate and allow COMPILE_TEST) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging drm/drm-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Already up to date. +Merging drm-misc/for-linux-next (21d139a95682 drm: bridge: icn6211: Fix DSI-to-DPI PLL configuration) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/display/bridge/ite,it66121.yaml | 3 + + .../bindings/display/bridge/toshiba,tc358767.yaml | 22 +- + .../display/panel/leadtek,ltk035c5444t.yaml | 59 ++ + .../bindings/display/sitronix,st7735r.yaml | 6 +- + Documentation/gpu/drm-mm.rst | 9 + + Documentation/gpu/drm-uapi.rst | 4 +- + MAINTAINERS | 11 + + arch/x86/Kconfig | 6 + + arch/x86/boot/video-vesa.c | 4 +- + drivers/dma-buf/dma-buf.c | 2 +- + drivers/dma-buf/dma-resv.c | 132 ++++- + drivers/firmware/Kconfig | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 49 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 49 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 74 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 - + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 13 +- + drivers/gpu/drm/bridge/Kconfig | 2 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 1 + + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 20 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 36 +- + drivers/gpu/drm/bridge/chipone-icn6211.c | 498 ++++++++++++++-- + drivers/gpu/drm/bridge/ite-it66121.c | 629 ++++++++++++++++++++- + drivers/gpu/drm/bridge/lontium-lt9611.c | 49 +- + drivers/gpu/drm/bridge/nwl-dsi.c | 30 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 7 +- + drivers/gpu/drm/bridge/panel.c | 3 + + drivers/gpu/drm/bridge/parade-ps8622.c | 7 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 9 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 51 +- + drivers/gpu/drm/bridge/tc358762.c | 9 +- + drivers/gpu/drm/bridge/tc358764.c | 104 +--- + drivers/gpu/drm/bridge/tc358767.c | 585 ++++++++++++++++--- + drivers/gpu/drm/bridge/tc358775.c | 11 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 17 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 8 +- + drivers/gpu/drm/drm_atomic.c | 20 + + drivers/gpu/drm/drm_atomic_uapi.c | 4 - + drivers/gpu/drm/drm_blend.c | 2 +- + drivers/gpu/drm/drm_bridge_connector.c | 4 +- + drivers/gpu/drm/drm_edid.c | 620 +++++++++++--------- + drivers/gpu/drm/drm_format_helper.c | 76 +-- + drivers/gpu/drm/drm_gem.c | 80 --- + drivers/gpu/drm/drm_gem_atomic_helper.c | 18 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 2 +- + drivers/gpu/drm/drm_modes.c | 17 + + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 5 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 59 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 63 +-- + drivers/gpu/drm/etnaviv/etnaviv_sched.h | 3 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 241 ++------ + drivers/gpu/drm/exynos/exynos_drm_mic.c | 22 + + drivers/gpu/drm/gma500/cdv_device.c | 11 +- + drivers/gpu/drm/gma500/cdv_intel_crt.c | 6 +- + drivers/gpu/drm/gma500/cdv_intel_display.c | 9 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 6 +- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 5 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 5 +- + drivers/gpu/drm/gma500/framebuffer.c | 10 +- + drivers/gpu/drm/gma500/gem.c | 161 +++++- + drivers/gpu/drm/gma500/gem.h | 13 +- + drivers/gpu/drm/gma500/gma_display.c | 53 +- + drivers/gpu/drm/gma500/gma_display.h | 10 +- + drivers/gpu/drm/gma500/gtt.c | 295 +++++----- + drivers/gpu/drm/gma500/gtt.h | 8 +- + drivers/gpu/drm/gma500/oaktrail_crtc.c | 25 +- + drivers/gpu/drm/gma500/oaktrail_device.c | 1 - + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 1 - + drivers/gpu/drm/gma500/oaktrail_lvds.c | 16 +- + drivers/gpu/drm/gma500/opregion.c | 5 +- + drivers/gpu/drm/gma500/power.c | 15 +- + drivers/gpu/drm/gma500/psb_device.c | 29 +- + drivers/gpu/drm/gma500/psb_drv.c | 29 +- + drivers/gpu/drm/gma500/psb_drv.h | 90 +-- + drivers/gpu/drm/gma500/psb_intel_display.c | 37 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 5 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 6 +- + drivers/gpu/drm/gma500/psb_irq.c | 94 ++- + drivers/gpu/drm/gma500/psb_irq.h | 19 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 4 +- + drivers/gpu/drm/imx/imx-ldb.c | 3 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 34 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 43 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 12 + + drivers/gpu/drm/meson/meson_drv.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/atom.h | 6 +- + drivers/gpu/drm/nouveau/dispnv50/crc.c | 27 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 14 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 2 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 198 ++++--- + drivers/gpu/drm/omapdrm/omap_gem.h | 3 +- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 5 +- + drivers/gpu/drm/omapdrm/omap_overlay.c | 2 +- + drivers/gpu/drm/panel/Kconfig | 9 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 30 +- + drivers/gpu/drm/panel/panel-edp.c | 2 + + drivers/gpu/drm/panel/panel-innolux-ej030na.c | 31 +- + drivers/gpu/drm/panel/panel-newvision-nv3052c.c | 484 ++++++++++++++++ + drivers/gpu/drm/panel/panel-truly-nt35597.c | 3 +- + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 4 +- + drivers/gpu/drm/qxl/qxl_kms.c | 4 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 6 +- + drivers/gpu/drm/radeon/radeon_display.c | 7 +- + drivers/gpu/drm/scheduler/sched_main.c | 2 + + drivers/gpu/drm/selftests/test-drm_buddy.c | 10 +- + drivers/gpu/drm/solomon/Kconfig | 2 +- + drivers/gpu/drm/solomon/ssd130x.c | 42 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 8 +- + drivers/gpu/drm/tiny/repaper.c | 2 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 217 +++---- + drivers/gpu/drm/ttm/ttm_bo_util.c | 1 - + drivers/gpu/drm/ttm/ttm_device.c | 82 ++- + drivers/gpu/drm/ttm/ttm_resource.c | 197 ++++++- + drivers/gpu/drm/ttm/ttm_tt.c | 12 +- + drivers/gpu/drm/vc4/vc4_gem.c | 7 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 429 ++++++++++++-- + drivers/gpu/drm/vc4/vc4_hdmi.h | 23 +- + drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 2 +- + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 6 + + drivers/gpu/drm/vc4/vc4_irq.c | 5 + + drivers/gpu/drm/vc4/vc4_kms.c | 24 +- + drivers/gpu/drm/vc4/vc4_regs.h | 16 + + drivers/gpu/drm/vc4/vc4_trace.h | 95 ++++ + drivers/gpu/drm/virtio/virtgpu_display.c | 2 + + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 13 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 20 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 23 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 28 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 27 +- + drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 81 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 445 ++++++++++++--- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 29 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 36 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 19 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 27 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 +- + drivers/infiniband/core/umem_dmabuf.c | 8 +- + drivers/video/fbdev/Kconfig | 14 +- + drivers/video/fbdev/core/fb_defio.c | 9 +- + include/drm/drm_atomic.h | 27 +- + include/drm/drm_edid.h | 12 +- + include/drm/drm_file.h | 2 +- + include/drm/drm_format_helper.h | 5 +- + include/drm/drm_gem.h | 5 - + include/drm/drm_mipi_dsi.h | 2 + + include/drm/drm_modes.h | 2 + + include/drm/gpu_scheduler.h | 1 + + include/drm/ttm/ttm_bo_api.h | 62 +- + include/drm/ttm/ttm_bo_driver.h | 29 +- + include/drm/ttm/ttm_device.h | 11 - + include/drm/ttm/ttm_resource.h | 74 +++ + include/drm/ttm/ttm_tt.h | 4 +- + include/linux/dma-buf.h | 4 +- + include/linux/dma-resv.h | 69 +-- + include/linux/efi.h | 4 - + include/uapi/drm/vmwgfx_drm.h | 9 +- + 169 files changed, 5466 insertions(+), 2569 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/leadtek,ltk035c5444t.yaml + create mode 100644 drivers/gpu/drm/panel/panel-newvision-nv3052c.c +$ git am -3 ../patches/0001-fixup-for-spi-make-remove-callback-a-void-function.patch +Applying: fixup for "spi: make remove callback a void function" +Merging amdgpu/drm-next (78174f477081 drm/amd/display: [FW Promotion] Release 0.0.111.0) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f895f622aeb7] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/ObjectID.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 7 - + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 13 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 23 - + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 16 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 1120 ++------------------ + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 979 +++++++++++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 14 + + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 74 ++ + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h | 7 + + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 71 ++ + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 71 ++ + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.h | 6 + + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 19 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 49 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 13 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 24 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 24 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 6 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- + .../drm/amd/display/dc/bios/bios_parser_common.c | 3 + + .../gpu/drm/amd/display/dc/bios/command_table.c | 3 +- + .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c | 19 +- + .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.h | 4 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 19 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 93 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 91 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 13 +- + drivers/gpu/drm/amd/display/dc/dc.h | 25 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 14 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 12 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 2 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 25 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 1 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 36 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 16 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 12 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 5 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 6 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 26 - + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c | 8 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 25 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 8 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 364 +------ + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.h | 4 +- + drivers/gpu/drm/amd/display/dc/dcn315/Makefile | 26 - + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 235 +--- + .../drm/amd/display/dc/dcn315/dcn315_resource.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn316/Makefile | 26 - + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 234 +--- + .../drm/amd/display/dc/dcn316/dcn316_resource.h | 3 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 + + .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 19 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 20 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 863 +++++++++++++++ + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 44 + + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 13 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 2 + + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 4 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 1 + + .../gpu/drm/amd/display/dc/link/link_dp_trace.c | 20 + + .../gpu/drm/amd/display/dc/link/link_dp_trace.h | 5 + + .../gpu/drm/amd/display/dc/link/link_hwss_dio.c | 41 + + .../gpu/drm/amd/display/dc/link/link_hwss_dio.h | 1 + + .../gpu/drm/amd/display/dc/link/link_hwss_dpia.c | 1 + + .../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c | 17 + + .../drm/amd/display/dc/link/link_hwss_hpo_frl.c | 19 + + .../drm/amd/display/dc/virtual/virtual_link_hwss.c | 5 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 48 +- + .../gpu/drm/amd/display/include/grph_object_id.h | 1 + + .../drm/amd/display/modules/freesync/freesync.c | 74 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 38 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 8 + + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 12 + + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 2 +- + .../amd/display/modules/info_packet/info_packet.c | 5 +- + .../drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h | 13 + + .../drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h | 24 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 17 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 81 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 17 + + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 147 +++ + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 2 + + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 2 + + .../inc/pmfw_if/smu11_driver_if_sienna_cichlid.h | 7 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 31 + + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 16 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 2 +- + 128 files changed, 3462 insertions(+), 2389 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h +$ git am -3 ../patches/0001-fix-up-for-drm-ttm-rework-bulk-move-handling-v5.patch +Applying: fix up for "drm/ttm: rework bulk move handling v5" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c +$ git add -A . +$ git commit -v -a --amend +[master 6d8222108eb7] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux + Date: Wed Apr 6 10:58:33 2022 +1000 +Merging drm-intel/for-linux-next (92bc908af5cd drm/i915/dsb: modified to drm_info in dsb_prepare()) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/dp/drm_dp.c +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging drivers/gpu/drm/i915/display/intel_atomic_plane.c +Auto-merging drivers/gpu/drm/i915/display/intel_bw.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_bw.c +Auto-merging drivers/gpu/drm/i915/display/intel_crtc.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/display/intel_psr.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_region.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shmem.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_stolen.c +Auto-merging drivers/gpu/drm/i915/gem/selftests/huge_pages.c +Auto-merging drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/gt/intel_execlists_submission.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gtt.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gtt.h +Auto-merging drivers/gpu/drm/i915/gt/intel_rps.c +Auto-merging drivers/gpu/drm/i915/gt/intel_sseu.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c +Auto-merging drivers/gpu/drm/i915/i915_driver.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_params.c +Auto-merging drivers/gpu/drm/i915/i915_pci.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/intel_device_info.c +Auto-merging drivers/gpu/drm/i915/intel_device_info.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_device_info.h +Auto-merging drivers/gpu/drm/i915/intel_memory_region.c +Auto-merging drivers/gpu/drm/i915/intel_memory_region.h +Auto-merging drivers/gpu/drm/i915/intel_pch.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_step.c +Auto-merging drivers/iommu/intel/iommu.c +Auto-merging include/drm/dp/drm_dp_helper.h +Resolved 'drivers/gpu/drm/i915/display/intel_bw.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/intel_display.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_pci.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_device_info.h' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_pm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1c7d8d3c3467] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/i915.rst | 14 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/gpu/drm/dp/drm_dp.c | 58 +- + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/display/g4x_dp.c | 73 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 36 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 24 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 16 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 140 ++-- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 3 +- + drivers/gpu/drm/i915/display/intel_audio.c | 45 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 3 +- + drivers/gpu/drm/i915/display/intel_bios.c | 41 +- + drivers/gpu/drm/i915/display/intel_bw.c | 312 +++++---- + drivers/gpu/drm/i915/display/intel_bw.h | 12 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 96 +-- + drivers/gpu/drm/i915/display/intel_cdclk.h | 2 + + drivers/gpu/drm/i915/display/intel_color.c | 95 ++- + drivers/gpu/drm/i915/display/intel_color.h | 3 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 35 +- + drivers/gpu/drm/i915/display/intel_connector.c | 4 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 2 + + drivers/gpu/drm/i915/display/intel_cursor.c | 27 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 33 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 40 +- + drivers/gpu/drm/i915/display/intel_display.c | 776 ++++++++++----------- + drivers/gpu/drm/i915/display/intel_display.h | 3 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 302 +++----- + drivers/gpu/drm/i915/display/intel_display_power.c | 541 +++----------- + drivers/gpu/drm/i915/display/intel_display_power.h | 37 +- + .../drm/i915/display/intel_display_power_well.c | 113 +++ + .../drm/i915/display/intel_display_power_well.h | 153 ++++ + drivers/gpu/drm/i915/display/intel_display_trace.h | 9 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 42 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 131 +++- + drivers/gpu/drm/i915/display/intel_dmc.h | 10 +- + drivers/gpu/drm/i915/display/intel_dmc_regs.h | 30 + + drivers/gpu/drm/i915/display/intel_dp.c | 564 +++++++++------ + .../gpu/drm/i915/display/intel_dp_link_training.c | 31 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 8 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 44 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 144 ++-- + drivers/gpu/drm/i915/display/intel_dpt.c | 2 +- + drivers/gpu/drm/i915/display/intel_drrs.c | 406 ++++------- + drivers/gpu/drm/i915/display/intel_drrs.h | 20 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 7 +- + drivers/gpu/drm/i915/display/intel_dsi.c | 24 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 7 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 49 +- + drivers/gpu/drm/i915/display/intel_fb.c | 15 +- + drivers/gpu/drm/i915/display/intel_fb.h | 1 + + drivers/gpu/drm/i915/display/intel_fbc.c | 8 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 8 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 142 ++-- + drivers/gpu/drm/i915/display/intel_hdcp.c | 1 + + drivers/gpu/drm/i915/display/intel_hdmi.c | 3 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 57 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 22 +- + drivers/gpu/drm/i915/display/intel_panel.c | 359 ++++++---- + drivers/gpu/drm/i915/display/intel_panel.h | 33 +- + drivers/gpu/drm/i915/display/intel_pch_display.c | 99 ++- + drivers/gpu/drm/i915/display/intel_pch_display.h | 10 + + drivers/gpu/drm/i915/display/intel_plane_initial.c | 1 + + drivers/gpu/drm/i915/display/intel_psr.c | 4 + + drivers/gpu/drm/i915/display/intel_sdvo.c | 88 +-- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 8 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 51 +- + drivers/gpu/drm/i915/display/intel_tv.c | 12 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 16 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 24 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 4 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 22 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 223 ++++-- + drivers/gpu/drm/i915/display/vlv_dsi.c | 15 +- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 2 + + drivers/gpu/drm/i915/gem/i915_gem_object.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_region.c | 2 + + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 8 + + drivers/gpu/drm/i915/gem/i915_gem_tiling.h | 2 + + drivers/gpu/drm/i915/gem/i915_gemfs.c | 3 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 10 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 7 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 1 + + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 3 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 11 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 7 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 5 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 + + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 52 +- + drivers/gpu/drm/i915/gt/intel_gtt.c | 12 + + drivers/gpu/drm/i915/gt/intel_gtt.h | 2 + + drivers/gpu/drm/i915/gt/intel_rc6.c | 5 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 3 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 13 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 9 +- + drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c | 10 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 3 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 5 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 5 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c | 6 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 3 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 14 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c | 20 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 + + drivers/gpu/drm/i915/gvt/handlers.c | 20 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 2 + + drivers/gpu/drm/i915/i915_debugfs.c | 18 +- + drivers/gpu/drm/i915/i915_driver.c | 5 +- + drivers/gpu/drm/i915/i915_driver.h | 4 + + drivers/gpu/drm/i915/i915_drv.h | 121 +--- + drivers/gpu/drm/i915/i915_gpu_error.c | 21 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 6 + + drivers/gpu/drm/i915/i915_params.c | 7 +- + drivers/gpu/drm/i915/i915_pci.c | 39 +- + drivers/gpu/drm/i915/i915_reg.h | 132 ++-- + drivers/gpu/drm/i915/i915_utils.c | 11 + + drivers/gpu/drm/i915/i915_utils.h | 29 +- + drivers/gpu/drm/i915/intel_device_info.c | 11 +- + drivers/gpu/drm/i915/intel_device_info.h | 1 + + drivers/gpu/drm/i915/intel_dram.c | 10 +- + drivers/gpu/drm/i915/intel_memory_region.c | 2 + + drivers/gpu/drm/i915/intel_memory_region.h | 2 +- + drivers/gpu/drm/i915/intel_pch.c | 3 +- + drivers/gpu/drm/i915/intel_pm.c | 523 +++++++------- + drivers/gpu/drm/i915/intel_pm.h | 1 + + drivers/gpu/drm/i915/intel_step.c | 7 + + drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c | 4 +- + drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 2 - + drivers/gpu/drm/i915/selftests/i915_active.c | 3 +- + drivers/gpu/drm/i915/vlv_suspend.c | 3 +- + drivers/iommu/intel/iommu.c | 2 +- + include/drm/dp/drm_dp_helper.h | 2 + + include/drm/i915_drm.h | 3 +- + include/drm/i915_pciids.h | 4 +- + include/uapi/drm/drm_fourcc.h | 11 + + 142 files changed, 3634 insertions(+), 3419 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_well.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_well.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dmc_regs.h +Merging drm-tegra/drm/tegra/for-next (b53c24f69199 drm/tegra: Support YVYU, VYUY and YU24 formats) +$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next +Merge made by the 'ort' strategy. +Merging drm-msm/msm-next (05241de1f69e dt-bindings: display/msm: another fix for the dpu-qcm2290 example) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Merge made by the 'ort' strategy. + .../bindings/display/msm/dpu-qcm2290.yaml | 4 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 79 ++++++++++++++++++---- + drivers/gpu/drm/msm/msm_gem.c | 1 + + 3 files changed, 68 insertions(+), 16 deletions(-) +Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Merge made by the 'ort' strategy. + drivers/gpu/drm/imx/imx-tve.c | 4 +--- + drivers/gpu/drm/imx/ipuv3-plane.c | 8 +------- + drivers/gpu/ipu-v3/ipu-dc.c | 5 +++-- + drivers/gpu/ipu-v3/ipu-image-convert.c | 9 +++------ + 4 files changed, 8 insertions(+), 18 deletions(-) +Merging etnaviv/etnaviv/next (cdd156955f94 drm/etnaviv: consider completed fence seqno in hang check) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging fbdev/for-next (7e4920bf59cb video: fbdev: omap: Make it CCF clk API compatible) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'ort' strategy. + drivers/video/fbdev/aty/aty128fb.c | 1 - + drivers/video/fbdev/aty/atyfb_base.c | 1 - + drivers/video/fbdev/aty/radeon_pm.c | 1 - + drivers/video/fbdev/aty/radeonfb.h | 2 +- + drivers/video/fbdev/controlfb.c | 3 --- + drivers/video/fbdev/matrox/matroxfb_base.h | 1 - + drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 2 ++ + drivers/video/fbdev/omap/hwa742.c | 6 +++--- + drivers/video/fbdev/omap/lcdc.c | 6 +++--- + drivers/video/fbdev/omap/sossi.c | 5 +++-- + drivers/video/fbdev/platinumfb.c | 2 +- + drivers/video/fbdev/pm2fb.c | 8 ++------ + drivers/video/fbdev/pxafb.c | 4 ++-- + drivers/video/fbdev/sis/sis_main.c | 2 +- + drivers/video/fbdev/udlfb.c | 14 ++++++++++++-- + drivers/video/fbdev/valkyriefb.c | 3 +-- + drivers/video/of_display_timing.c | 2 +- + include/uapi/linux/fb.h | 2 +- + 18 files changed, 33 insertions(+), 32 deletions(-) +Merging regmap/for-next (bd941dfaae35 regmap: Constify static regmap_bus structs) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/regmap-i3c.c | 2 +- + drivers/base/regmap/regmap-sccb.c | 2 +- + drivers/base/regmap/regmap-sdw-mbq.c | 2 +- + drivers/base/regmap/regmap-sdw.c | 2 +- + drivers/base/regmap/regmap-slimbus.c | 2 +- + drivers/base/regmap/regmap-w1.c | 6 +++--- + 6 files changed, 8 insertions(+), 8 deletions(-) +Merging sound/for-next (b2405aa948b9 firewire: add kernel API to access packet structure in request structure for AR context) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Merge made by the 'ort' strategy. + drivers/firewire/core-card.c | 39 +++++++++++++++++++++++++++++++++++++ + drivers/firewire/core-cdev.c | 6 ++++-- + drivers/firewire/core-transaction.c | 18 +++++++++++++++++ + include/linux/firewire.h | 3 +++ + sound/pci/echoaudio/midi.c | 1 - + sound/pci/emu10k1/emu10k1_main.c | 5 +---- + 6 files changed, 65 insertions(+), 7 deletions(-) +Merging sound-asoc/for-next (b66751b6e359 Merge remote-tracking branch 'asoc/for-5.19' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Merge made by the 'ort' strategy. + .../sound/mt8195-mt6359-rt1011-rt5682.yaml | 51 - + ...t6359-rt1019-rt5682.yaml => mt8195-mt6359.yaml} | 9 +- + .../bindings/sound/nvidia,tegra186-asrc.yaml | 81 ++ + .../bindings/sound/nvidia,tegra210-ahub.yaml | 4 + + .../devicetree/bindings/sound/wlf,wm8731.yaml | 97 ++ + Documentation/devicetree/bindings/sound/wm8731.txt | 27 - + arch/arm/configs/multi_v5_defconfig | 3 +- + include/sound/cs35l41.h | 1 - + include/sound/soc.h | 4 + + sound/soc/atmel/Kconfig | 4 +- + sound/soc/atmel/sam9g20_wm8731.c | 13 +- + sound/soc/au1x/Kconfig | 2 +- + sound/soc/codecs/Kconfig | 18 +- + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/ad193x-i2c.c | 6 +- + sound/soc/codecs/adau1372-i2c.c | 4 +- + sound/soc/codecs/adau1373.c | 5 +- + sound/soc/codecs/adau1701.c | 5 +- + sound/soc/codecs/adau1761-i2c.c | 8 +- + sound/soc/codecs/adau1781-i2c.c | 8 +- + sound/soc/codecs/adau1977-i2c.c | 8 +- + sound/soc/codecs/adau7118-i2c.c | 5 +- + sound/soc/codecs/adav803.c | 5 +- + sound/soc/codecs/cs35l32.c | 5 +- + sound/soc/codecs/cs35l33.c | 5 +- + sound/soc/codecs/cs35l34.c | 5 +- + sound/soc/codecs/cs35l35.c | 5 +- + sound/soc/codecs/cs35l36.c | 5 +- + sound/soc/codecs/cs35l41-i2c.c | 5 +- + sound/soc/codecs/cs35l41-lib.c | 16 +- + sound/soc/codecs/cs4234.c | 4 +- + sound/soc/codecs/cs4265.c | 5 +- + sound/soc/codecs/cs4270.c | 5 +- + sound/soc/codecs/cs4271-i2c.c | 5 +- + sound/soc/codecs/cs42l42.c | 5 +- + sound/soc/codecs/cs42l51-i2c.c | 5 +- + sound/soc/codecs/cs42l52.c | 5 +- + sound/soc/codecs/cs42l56.c | 5 +- + sound/soc/codecs/cs42l73.c | 5 +- + sound/soc/codecs/cs42xx8-i2c.c | 5 +- + sound/soc/codecs/cs43130.c | 5 +- + sound/soc/codecs/cs4341.c | 5 +- + sound/soc/codecs/cs4349.c | 5 +- + sound/soc/codecs/cs53l30.c | 5 +- + sound/soc/codecs/da7210.c | 5 +- + sound/soc/codecs/da7213.c | 5 +- + sound/soc/codecs/da7218.c | 19 +- + sound/soc/codecs/da7219.c | 5 +- + sound/soc/codecs/da732x.c | 5 +- + sound/soc/codecs/da9055.c | 5 +- + sound/soc/codecs/lpass-macro-common.c | 35 +- + sound/soc/codecs/rt5682s.c | 27 +- + sound/soc/codecs/rt5682s.h | 6 +- + sound/soc/codecs/ssm2518.c | 5 +- + sound/soc/codecs/ssm2602-i2c.c | 8 +- + sound/soc/codecs/ssm4567.c | 5 +- + sound/soc/codecs/wm8731-i2c.c | 69 ++ + sound/soc/codecs/wm8731-spi.c | 59 + + sound/soc/codecs/wm8731.c | 266 +---- + sound/soc/codecs/wm8731.h | 27 + + sound/soc/codecs/wm8904.c | 9 +- + sound/soc/codecs/wm8985.c | 8 +- + sound/soc/intel/atom/sst/sst.c | 1 - + sound/soc/intel/catpt/messages.h | 4 +- + sound/soc/mediatek/Kconfig | 26 +- + sound/soc/mediatek/mt8195/Makefile | 3 +- + .../mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c | 1198 -------------------- + ...8195-mt6359-rt1019-rt5682.c => mt8195-mt6359.c} | 862 +++++++++----- + sound/soc/pxa/Kconfig | 4 +- + sound/soc/qcom/Kconfig | 2 + + sound/soc/qcom/sc7280.c | 107 ++ + sound/soc/samsung/bells.c | 4 +- + sound/soc/samsung/littlemill.c | 4 +- + sound/soc/samsung/lowland.c | 4 +- + sound/soc/samsung/speyside.c | 4 +- + sound/soc/samsung/tobermory.c | 4 +- + sound/soc/soc-core.c | 80 ++ + sound/soc/soc-topology.c | 455 ++++---- + sound/soc/sof/compress.c | 8 +- + sound/soc/sof/control.c | 33 - + sound/soc/sof/debug.c | 2 +- + sound/soc/sof/intel/hda-dsp.c | 8 +- + sound/soc/sof/intel/hda-loader.c | 12 +- + sound/soc/sof/intel/tgl.c | 6 +- + sound/soc/sof/ipc.c | 76 +- + sound/soc/sof/ipc3-pcm.c | 8 +- + sound/soc/sof/ipc3-topology.c | 26 +- + sound/soc/sof/ipc3.c | 4 +- + sound/soc/sof/pcm.c | 5 +- + sound/soc/sof/pm.c | 20 +- + sound/soc/sof/sof-audio.c | 3 - + sound/soc/sof/sof-audio.h | 1 - + sound/soc/sof/sof-client.c | 2 +- + sound/soc/sof/sof-priv.h | 27 +- + sound/soc/sof/topology.c | 16 + + sound/soc/sof/trace.c | 61 +- + sound/soc/tegra/Kconfig | 12 + + sound/soc/tegra/Makefile | 2 + + sound/soc/tegra/tegra186_asrc.c | 1046 +++++++++++++++++ + sound/soc/tegra/tegra186_asrc.h | 112 ++ + sound/soc/tegra/tegra210_ahub.c | 82 +- + 101 files changed, 2963 insertions(+), 2426 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml + rename Documentation/devicetree/bindings/sound/{mt8195-mt6359-rt1019-rt5682.yaml => mt8195-mt6359.yaml} (84%) + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra186-asrc.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8731.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt + create mode 100644 sound/soc/codecs/wm8731-i2c.c + create mode 100644 sound/soc/codecs/wm8731-spi.c + delete mode 100644 sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c + rename sound/soc/mediatek/mt8195/{mt8195-mt6359-rt1019-rt5682.c => mt8195-mt6359.c} (78%) + create mode 100644 sound/soc/tegra/tegra186_asrc.c + create mode 100644 sound/soc/tegra/tegra186_asrc.h +Merging modules/modules-next (eeaec7801c42 powerpc: Select ARCH_WANTS_MODULES_DATA_IN_VMALLOC on book3s/32 and 8xx) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 4 +- + arch/Kconfig | 6 + + arch/powerpc/Kconfig | 1 + + include/linux/kdb.h | 1 + + include/linux/module.h | 29 +- + kernel/Makefile | 5 +- + kernel/debug/kdb/kdb_io.c | 1 - + kernel/debug/kdb/kdb_keyboard.c | 1 - + kernel/debug/kdb/kdb_main.c | 49 - + kernel/debug/kdb/kdb_private.h | 4 - + kernel/debug/kdb/kdb_support.c | 1 - + kernel/module-internal.h | 50 - + kernel/module/Makefile | 20 + + kernel/module/debug_kmemleak.c | 30 + + .../{module_decompress.c => module/decompress.c} | 5 +- + kernel/module/internal.h | 268 +++ + kernel/module/kallsyms.c | 512 +++++ + kernel/module/kdb.c | 62 + + kernel/module/livepatch.c | 74 + + kernel/{module.c => module/main.c} | 2007 ++------------------ + kernel/module/procfs.c | 146 ++ + kernel/module/signing.c | 122 ++ + kernel/module/strict_rwx.c | 143 ++ + kernel/module/sysfs.c | 436 +++++ + kernel/module/tree_lookup.c | 117 ++ + kernel/module/version.c | 109 ++ + kernel/module_signing.c | 45 - + 27 files changed, 2243 insertions(+), 2005 deletions(-) + delete mode 100644 kernel/module-internal.h + create mode 100644 kernel/module/Makefile + create mode 100644 kernel/module/debug_kmemleak.c + rename kernel/{module_decompress.c => module/decompress.c} (99%) + create mode 100644 kernel/module/internal.h + create mode 100644 kernel/module/kallsyms.c + create mode 100644 kernel/module/kdb.c + create mode 100644 kernel/module/livepatch.c + rename kernel/{module.c => module/main.c} (62%) + create mode 100644 kernel/module/procfs.c + create mode 100644 kernel/module/signing.c + create mode 100644 kernel/module/strict_rwx.c + create mode 100644 kernel/module/sysfs.c + create mode 100644 kernel/module/tree_lookup.c + create mode 100644 kernel/module/version.c + delete mode 100644 kernel/module_signing.c +Merging input/next (a949087c2285 Input: adi - remove redundant variable z) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Already up to date. +Merging block/for-next (ff0f3f831752 Merge branch 'for-5.19/io_uring-xattr' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging fs/internal.h +Merge made by the 'ort' strategy. + fs/internal.h | 29 ++ + fs/io-wq.h | 1 + + fs/io_uring.c | 904 ++++++++++++++++++++++++++++-------------- + fs/xattr.c | 141 ++++--- + include/uapi/linux/io_uring.h | 8 +- + 5 files changed, 743 insertions(+), 340 deletions(-) +Merging device-mapper/for-next (7f790f4da003 dm: remove bio polling debug checks) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Merge made by the 'ort' strategy. + block/bio.c | 88 +++++---- + block/blk.h | 7 - + block/fops.c | 11 +- + drivers/md/dm-core.h | 38 ++-- + drivers/md/dm-delay.c | 3 +- + drivers/md/dm-flakey.c | 4 +- + drivers/md/dm-linear.c | 11 +- + drivers/md/dm-stats.c | 3 + + drivers/md/dm-table.c | 16 +- + drivers/md/dm.c | 447 +++++++++++++++++++++++++++------------------- + drivers/md/dm.h | 4 +- + include/linux/bio.h | 8 +- + include/linux/blk_types.h | 3 +- + 13 files changed, 373 insertions(+), 270 deletions(-) +Merging libata/for-next (eaeb9fb2739b ata: pata_mpc52xx: Prepare cleanup of powerpc's asm/prom.h) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Merge made by the 'ort' strategy. + drivers/ata/pata_mpc52xx.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging pcmcia/pcmcia-next (3928cf08334e pcmcia: db1xxx_ss: restrict to MIPS_DB1XXX boards) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Auto-merging drivers/pcmcia/Kconfig +Merge made by the 'ort' strategy. + drivers/pcmcia/Kconfig | 2 +- + drivers/pcmcia/rsrc_nonstatic.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging mmc/next (f95f8307f551 mmc: renesas_sdhi: R-Car V3M also has no HS400) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Merge made by the 'ort' strategy. + drivers/mmc/host/mmci_stm32_sdmmc.c | 88 +++++++++++++++++++++------ + drivers/mmc/host/renesas_sdhi.h | 2 + + drivers/mmc/host/renesas_sdhi_core.c | 2 - + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 75 +++++++++++------------ + 4 files changed, 108 insertions(+), 59 deletions(-) +Merging mfd/for-mfd-next (d99460ed5cdc dt-bindings: mfd: syscon: Add microchip,lan966x-cpu-syscon compatible) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (023a8830a628 backlight: backlight: Slighly simplify devm_of_find_backlight()) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (c22fca40522e power: ab8500_chargalg: Use CLOCK_MONOTONIC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Already up to date. +Merging regulator/for-next (025096148086 Merge remote-tracking branch 'regulator/for-5.19' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + .../bindings/regulator/mt6358-regulator.txt | 22 ++- + .../regulator/richtek,rt4801-regulator.yaml | 7 +- + drivers/regulator/core.c | 18 ++ + drivers/regulator/fixed.c | 5 +- + drivers/regulator/mt6358-regulator.c | 213 ++++++++++++++++++++- + include/linux/regulator/mt6358-regulator.h | 45 +++++ + 6 files changed, 291 insertions(+), 19 deletions(-) +Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) +$ git merge -m Merge branch 'next-testing' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git security/next-testing +Auto-merging security/commoncap.c +Merge made by the 'ort' strategy. +Merging apparmor/apparmor-next (c2489617b3b9 apparmor: Fix undefined reference to `zlib_deflate_workspacesize') +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging MAINTAINERS +Auto-merging security/apparmor/lsm.c +Merge made by the 'ort' strategy. + MAINTAINERS | 7 ++- + security/apparmor/Kconfig | 86 ++++++++++++++++++++--------- + security/apparmor/apparmorfs.c | 99 +++++++++++++++++++--------------- + security/apparmor/audit.c | 2 +- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/apparmorfs.h | 14 +++++ + security/apparmor/include/lib.h | 5 ++ + security/apparmor/label.c | 17 +++--- + security/apparmor/lib.c | 2 +- + security/apparmor/lsm.c | 23 ++++---- + security/apparmor/mount.c | 11 ++-- + security/apparmor/policy.c | 35 ++++++------ + security/apparmor/policy_unpack.c | 37 ++++++++----- + security/apparmor/policy_unpack_test.c | 34 ++++++------ + security/apparmor/procattr.c | 2 +- + 15 files changed, 234 insertions(+), 141 deletions(-) +Merging integrity/next-integrity (29d1c2b47ef3 ima: remove redundant initialization of pointer 'file'.) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Merge made by the 'ort' strategy. + security/integrity/ima/ima_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (81200b0265b1 selinux: checkreqprot is deprecated, add some ssleep() discomfort) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Merge made by the 'ort' strategy. + security/selinux/avc.c | 4 ++-- + security/selinux/hooks.c | 5 +++-- + security/selinux/include/security.h | 6 ++++++ + security/selinux/selinuxfs.c | 6 ++++-- + security/selinux/ss/services.c | 1 - + 5 files changed, 15 insertions(+), 7 deletions(-) +Merging smack/next (ba6b652bd863 smack: Remove redundant assignments) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smackfs.c +Merge made by the 'ort' strategy. + security/smack/smackfs.c | 1 - + 1 file changed, 1 deletion(-) +Merging tomoyo/master (99499a2b0ff0 loop: yet another approach to fix the loop lock order inversions) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Auto-merging include/linux/blk_types.h +Merge made by the 'ort' strategy. + block/bdev.c | 16 +-- + block/partitions/core.c | 2 +- + drivers/block/loop.c | 257 ++++++++++++++++++------------------------ + drivers/block/loop.h | 1 - + drivers/block/nbd.c | 16 +-- + drivers/block/zram/zram_drv.c | 29 +++-- + include/linux/blk_types.h | 2 +- + include/linux/blkdev.h | 15 +++ + include/linux/workqueue.h | 15 +-- + kernel/workqueue.c | 36 ++++-- + 10 files changed, 190 insertions(+), 199 deletions(-) +Merging tpmdd/next (8467b0ed6ce3 Merge tag 'for-5.18/drivers-2022-04-01' of git://git.kernel.dk/linux-block) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (826270373f17 Watchdog: sp5100_tco: Enable Family 17h+ CPUs) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Already up to date. +Merging iommu/next (e17c6debd4b2 Merge branches 'arm/mediatek', 'arm/msm', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'x86/vt-d' and 'x86/amd' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Already up to date. +Merging audit/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (a1a2b7125e10 of/platform: Drop static setup of IRQ resource from DT core) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Documentation/devicetree/bindings/clock/samsung,exynos4412-isp-clock.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../clock/samsung,exynos4412-isp-clock.yaml | 1 - + .../bindings/crypto/allwinner,sun8i-ce.yaml | 1 - + .../bindings/display/amlogic,meson-dw-hdmi.yaml | 1 - + .../display/bridge/google,cros-ec-anx7688.yaml | 1 - + .../devicetree/bindings/display/bridge/ps8640.yaml | 1 - + .../bindings/display/imx/nxp,imx8mq-dcss.yaml | 1 - + .../bindings/display/mediatek/mediatek,merge.yaml | 1 - + .../bindings/display/panel/ilitek,ili9341.yaml | 1 - + .../bindings/display/panel/orisetech,otm8009a.yaml | 1 - + .../display/sprd/sprd,display-subsystem.yaml | 1 - + .../devicetree/bindings/display/st,stm32-ltdc.yaml | 1 - + .../devicetree/bindings/dma/st,stm32-dmamux.yaml | 1 - + .../devicetree/bindings/dma/st,stm32-mdma.yaml | 1 - + .../devicetree/bindings/example-schema.yaml | 14 ++-- + .../devicetree/bindings/gpu/samsung-rotator.yaml | 1 - + .../devicetree/bindings/hwmon/adt7475.yaml | 1 - + .../devicetree/bindings/i2c/i2c-gate.yaml | 1 - + .../devicetree/bindings/i2c/i2c-mux-gpmux.yaml | 1 - + .../devicetree/bindings/iio/adc/adi,ad7291.yaml | 1 - + .../devicetree/bindings/iio/dac/lltc,ltc1660.yaml | 2 +- + .../devicetree/bindings/iommu/samsung,sysmmu.yaml | 1 - + .../bindings/leds/backlight/qcom-wled.yaml | 2 +- + .../bindings/mailbox/amlogic,meson-gxbb-mhu.yaml | 1 - + .../devicetree/bindings/media/microchip,xisc.yaml | 1 - + .../devicetree/bindings/net/qcom,ipa.yaml | 7 ++ + .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 1 - + .../bindings/net/wireless/qcom,ath11k.yaml | 2 +- + .../bindings/pci/socionext,uniphier-pcie.yaml | 96 ++++++++++++++++++++++ + .../devicetree/bindings/pci/uniphier-pcie.txt | 82 ------------------ + .../bindings/power/amlogic,meson-sec-pwrc.yaml | 1 - + .../bindings/power/supply/cw2015_battery.yaml | 1 - + .../bindings/power/supply/power-supply.yaml | 1 - + .../bindings/power/supply/ti,lp8727.yaml | 1 - + .../bindings/power/supply/tps65217-charger.yaml | 2 +- + .../regulator/socionext,uniphier-regulator.yaml | 1 - + .../bindings/regulator/st,stm32-vrefbuf.yaml | 1 - + .../bindings/reserved-memory/ramoops.yaml | 1 - + .../devicetree/bindings/reset/microchip,rst.yaml | 1 - + .../devicetree/bindings/rng/intel,ixp46x-rng.yaml | 1 - + .../devicetree/bindings/serial/sprd-uart.yaml | 2 +- + .../bindings/soc/amlogic/amlogic,canvas.yaml | 1 - + .../devicetree/bindings/sound/adi,adau1372.yaml | 1 - + .../bindings/sound/amlogic,gx-sound-card.yaml | 1 - + .../devicetree/bindings/sound/maxim,max98520.yaml | 1 - + .../devicetree/bindings/sound/mchp,spdifrx.yaml | 2 +- + .../devicetree/bindings/sound/mchp,spdiftx.yaml | 2 +- + .../bindings/sound/nvidia,tegra-audio-rt5640.yaml | 1 - + .../bindings/sound/samsung,aries-wm8994.yaml | 1 - + .../devicetree/bindings/sound/samsung,odroid.yaml | 1 - + .../devicetree/bindings/sound/tas2562.yaml | 1 - + .../devicetree/bindings/sound/tas2770.yaml | 1 - + .../bindings/spi/amlogic,meson-gx-spicc.yaml | 1 - + .../bindings/spi/amlogic,meson6-spifc.yaml | 1 - + .../devicetree/bindings/spi/renesas,hspi.yaml | 1 - + Documentation/devicetree/bindings/usb/dwc2.yaml | 4 +- + .../devicetree/bindings/usb/smsc,usb3503.yaml | 2 +- + .../devicetree/bindings/writing-bindings.rst | 25 ++++++ + .../devicetree/bindings/writing-schema.rst | 6 ++ + MAINTAINERS | 2 +- + drivers/of/platform.c | 14 ++-- + 60 files changed, 157 insertions(+), 152 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/uniphier-pcie.txt +Merging mailbox/mailbox-for-next (1b0d0f7c12d5 dt-bindings: mailbox: add definition for mt8186) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (d6401954317a Merge remote-tracking branch 'spi/for-5.19' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Merge made by the 'ort' strategy. + .../bindings/spi/mediatek,spi-mt65xx.yaml | 4 + + .../bindings/spi/qcom,spi-qcom-qspi.yaml | 1 + + drivers/spi/spi-mpc52xx-psc.c | 1 + + drivers/spi/spi-mpc52xx.c | 3 + + drivers/spi/spi-mt65xx.c | 386 ++++++++++++++++++++- + drivers/spi/spidev.c | 101 +++--- + 6 files changed, 424 insertions(+), 72 deletions(-) +Merging tip/master (176002d0f443 Merge sched/core into tip/master) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging arch/x86/Kconfig +Auto-merging drivers/acpi/processor_idle.c +Auto-merging kernel/Makefile +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 24 +- + Documentation/x86/cpuinfo.rst | 5 +- + Documentation/x86/x86_64/boot-options.rst | 9 - + arch/arm64/kernel/entry-common.c | 8 +- + arch/powerpc/include/asm/static_call.h | 1 + + arch/x86/Kconfig | 11 - + arch/x86/events/Kconfig | 8 + + arch/x86/events/amd/Makefile | 1 + + arch/x86/events/amd/brs.c | 364 ++++++++++++++++ + arch/x86/events/amd/core.c | 252 ++++++++++- + arch/x86/events/core.c | 19 +- + arch/x86/events/intel/core.c | 9 +- + arch/x86/events/intel/cstate.c | 22 +- + arch/x86/events/intel/lbr.c | 36 +- + arch/x86/events/intel/uncore.c | 1 + + arch/x86/events/intel/uncore_snb.c | 20 + + arch/x86/events/msr.c | 1 + + arch/x86/events/perf_event.h | 143 ++++++- + arch/x86/include/asm/bug.h | 4 +- + arch/x86/include/asm/cpu_entry_area.h | 2 +- + arch/x86/include/asm/cpufeature.h | 7 +- + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/disabled-features.h | 8 +- + arch/x86/include/asm/msr-index.h | 4 + + arch/x86/include/asm/page_64.h | 2 +- + arch/x86/include/asm/percpu.h | 6 +- + arch/x86/include/asm/perf_event.h | 28 ++ + arch/x86/include/asm/pkeys.h | 8 - + arch/x86/include/asm/proto.h | 1 - + arch/x86/include/asm/smap.h | 24 -- + arch/x86/include/asm/static_call.h | 2 + + arch/x86/include/asm/svm.h | 8 +- + arch/x86/kernel/cpu/common.c | 101 ++--- + arch/x86/kernel/setup.c | 28 +- + arch/x86/kernel/static_call.c | 5 +- + arch/x86/mm/Makefile | 3 +- + arch/x86/mm/fault.c | 2 +- + arch/x86/mm/init_64.c | 1 - + arch/x86/mm/setup_nx.c | 62 --- + arch/x86/mm/tlb.c | 37 +- + drivers/acpi/acpi_pad.c | 7 + + drivers/acpi/processor_idle.c | 5 + + include/linux/irqflags.h | 4 +- + include/linux/kvm_host.h | 2 +- + include/linux/local_lock_internal.h | 6 +- + include/linux/perf_event.h | 22 + + include/linux/sched.h | 41 ++ + include/linux/sched/task_stack.h | 2 +- + include/linux/static_call.h | 48 ++- + include/trace/events/lock.h | 63 ++- + kernel/Makefile | 3 +- + kernel/entry/common.c | 8 +- + kernel/events/core.c | 212 +++------ + kernel/kcsan/kcsan_test.c | 5 +- + kernel/locking/lockdep.c | 23 +- + kernel/locking/mutex.c | 18 +- + kernel/locking/percpu-rwsem.c | 5 + + kernel/locking/qrwlock.c | 9 + + kernel/locking/qspinlock.c | 5 + + kernel/locking/rtmutex.c | 11 + + kernel/locking/rwbase_rt.c | 7 + + kernel/locking/rwsem.c | 130 +++--- + kernel/locking/semaphore.c | 15 +- + kernel/sched/core.c | 28 +- + kernel/sched/idle.c | 3 +- + kernel/sched/sched.h | 6 - + kernel/static_call.c | 541 ----------------------- + kernel/static_call_inline.c | 543 ++++++++++++++++++++++++ + kernel/trace/trace.c | 14 +- + kernel/trace/trace_preemptirq.c | 4 +- + mm/page_alloc.c | 2 +- + scripts/Makefile.build | 2 +- + scripts/link-vmlinux.sh | 6 +- + tools/arch/x86/include/asm/disabled-features.h | 8 +- + tools/objtool/check.c | 30 +- + 75 files changed, 1971 insertions(+), 1145 deletions(-) + create mode 100644 arch/x86/events/amd/brs.c + delete mode 100644 arch/x86/mm/setup_nx.c + create mode 100644 kernel/static_call_inline.c +Merging clockevents/timers/drivers/next (49c14f94ccfe clocksource/drivers/timer-of: check return value of of_iomap in timer_of_base_init()) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Merge made by the 'ort' strategy. +Merging edac/edac-for-next (b2fa90ef6255 powerpc/85xx: Remove fsl,85... bindings) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. + .../bindings/memory-controllers/fsl/fsl,ddr.yaml | 6 ------ + Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt | 6 ------ + drivers/edac/mpc85xx_edac.c | 14 -------------- + 3 files changed, 26 deletions(-) +Merging irqchip/irq/irqchip-next (de26a7424331 Merge branch irq/qcom-mpm into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (c87857e21486 Merge branch 'trace/for-next-rtla' into trace/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next +Auto-merging include/linux/trace_events.h +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/trace.h +Auto-merging kernel/trace/trace_events_hist.c +Merge made by the 'ort' strategy. +Merging rcu/rcu/next (b77b2981bb22 rcu-tasks: Handle sparse cpu_possible_mask) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/Kconfig +Auto-merging include/linux/sched.h +CONFLICT (content): Merge conflict in include/linux/sched.h +Auto-merging kernel/sched/core.c +CONFLICT (content): Merge conflict in kernel/sched/core.c +Auto-merging kernel/trace/Kconfig +Recorded preimage for 'include/linux/sched.h' +Recorded preimage for 'kernel/sched/core.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git reset --hard +HEAD is now at 2e6a8bfe7185 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git +$ git commit --no-edit -v -a +On branch master +nothing to commit, working tree clean +$ git diff -M --stat --summary HEAD^.. +Merging kvm/next (945024d764a1 KVM: x86: optimize PKU branching in kvm_load_{guest|host}_xsave_state) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kernel/kvm.c +CONFLICT (content): Merge conflict in arch/x86/kernel/kvm.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging include/linux/kvm_host.h +Auto-merging tools/testing/selftests/kvm/.gitignore +Auto-merging tools/testing/selftests/kvm/Makefile +Resolved 'arch/x86/kernel/kvm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c769d7746d9d] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 149 ++- + arch/x86/include/asm/kvm-x86-ops.h | 1 + + arch/x86/include/asm/kvm_host.h | 34 +- + arch/x86/include/uapi/asm/kvm.h | 11 +- + arch/x86/kernel/asm-offsets_64.c | 4 +- + arch/x86/kernel/kvm.c | 77 +- + arch/x86/kvm/i8259.c | 1 - + arch/x86/kvm/irq.c | 10 +- + arch/x86/kvm/irq_comm.c | 2 +- + arch/x86/kvm/svm/avic.c | 10 +- + arch/x86/kvm/svm/nested.c | 297 +++-- + arch/x86/kvm/svm/svm.c | 207 +++- + arch/x86/kvm/svm/svm.h | 53 +- + arch/x86/kvm/vmx/vmx.c | 2 +- + arch/x86/kvm/x86.c | 211 ++-- + arch/x86/kvm/xen.c | 1246 ++++++++++++++++---- + arch/x86/kvm/xen.h | 62 +- + include/linux/kvm_host.h | 3 +- + include/uapi/linux/kvm.h | 48 +- + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 2 + + .../selftests/kvm/x86_64/fix_hypercall_test.c | 170 +++ + .../selftests/kvm/x86_64/tsc_scaling_sync.c | 119 ++ + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 366 +++++- + 24 files changed, 2534 insertions(+), 552 deletions(-) + create mode 100644 tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c +Merging kvm-arm/next (21ea45784275 KVM: arm64: fix typos in comments) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (4aa5ac75bf79 KVM: s390: Fix lockdep issue in vm memop) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Auto-merging arch/s390/kvm/kvm-s390.c +Merge made by the 'ort' strategy. + arch/s390/kvm/kvm-s390.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) +Merging xen-tip/linux-next (de2ae403b4c0 xen: fix is_xen_pmu()) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (4e1f82dce05b Merge branch 'for-5.16-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. +Merging workqueues/for-next (bc35f7ef9628 workqueue: Convert the type of pool->nr_running to int) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (b49f72e7f96d platform/x86: think-lmi: Certificate authentication support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Already up to date. +Merging hsi/for-next (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds/for-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Already up to date. +Merging ipmi/for-next (ae085d7f9365 mm: kfence: fix missing objcg housekeeping for SLAB) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging thunderbolt/next (03941ed91c72 thunderbolt: Replace usage of found with dedicated list iterator variable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Merge made by the 'ort' strategy. + drivers/thunderbolt/ctl.c | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) +Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (4ac56b1f1ef8 USB: serial: usb_wwan: remove redundant assignment to variable i) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed) +$ git merge -m Merge branch 'for-usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-next/for-usb-next +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'ort' strategy. +Merging tty/tty-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging coresight/next (286f950545e0 coresight: Drop unused 'none' enum value for each component) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fpga/for-next (21f0a239ecab fpga: dfl: pci: Remove usage of the deprecated "pci-dma-compat.h" API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (52c85167e413 Merge branch 'icc-msm8939' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (b28bc9ebbe23 iio: adc: ti-ads1015: Switch to read_avail) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/iio/adc/ti,ads1015.yaml | 7 +- + .../bindings/iio/imu/invensense,mpu6050.yaml | 34 +- + .../devicetree/bindings/iio/st,st-sensors.yaml | 1 + + MAINTAINERS | 4 +- + drivers/iio/accel/dmard09.c | 2 +- + drivers/iio/accel/kxsd9-spi.c | 4 +- + drivers/iio/accel/st_accel.h | 28 +- + drivers/iio/accel/st_accel_core.c | 1 + + drivers/iio/accel/st_accel_i2c.c | 5 + + drivers/iio/accel/st_accel_spi.c | 5 + + drivers/iio/adc/ad7124.c | 86 ++++- + drivers/iio/adc/ad7192.c | 64 +++- + drivers/iio/adc/ad_sigma_delta.c | 143 +++++++- + drivers/iio/adc/palmas_gpadc.c | 3 +- + drivers/iio/adc/ti-ads1015.c | 398 ++++++++++++--------- + drivers/iio/common/ssp_sensors/ssp_spi.c | 13 +- + drivers/iio/dac/ltc2688.c | 19 +- + drivers/iio/dummy/iio_simple_dummy.c | 20 +- + drivers/iio/imu/inv_mpu6050/Kconfig | 4 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 9 + + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 6 + + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 2 + + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 5 + + drivers/iio/industrialio-buffer.c | 24 +- + drivers/iio/industrialio-core.c | 3 +- + drivers/iio/multiplexer/Kconfig | 1 - + drivers/iio/multiplexer/iio-mux.c | 49 ++- + drivers/iio/temperature/ltc2983.c | 236 ++++++------ + drivers/iio/trigger/iio-trig-sysfs.c | 11 +- + include/linux/iio/adc/ad_sigma_delta.h | 38 ++ + 30 files changed, 812 insertions(+), 413 deletions(-) +Merging phy-next/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (60657fb9b19d dt-bindings: soundwire: qcom: Add bindings for audio clock reset control property) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/soundwire/qcom,sdw.txt | 14 ++++++++++++++ + drivers/soundwire/qcom.c | 3 ++- + drivers/soundwire/stream.c | 1 + + 3 files changed, 17 insertions(+), 1 deletion(-) +Merging extcon/extcon-next (4e63832f5daf extcon: sm5502: Add support for SM5703) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Auto-merging drivers/extcon/Kconfig +Auto-merging drivers/power/supply/axp288_charger.c +Auto-merging drivers/power/supply/max8997_charger.c +CONFLICT (content): Merge conflict in drivers/power/supply/max8997_charger.c +Auto-merging drivers/usb/dwc3/drd.c +Resolved 'drivers/power/supply/max8997_charger.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 93390eb600fd] Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/extcon/siliconmitus,sm5502-muic.yaml | 5 +- + drivers/extcon/Kconfig | 2 +- + drivers/extcon/extcon-axp288.c | 4 +- + drivers/extcon/extcon-intel-int3496.c | 54 ++++++++++++++++++---- + drivers/extcon/extcon-sm5502.c | 2 + + drivers/extcon/extcon-usb-gpio.c | 15 ------ + drivers/extcon/extcon-usbc-cros-ec.c | 2 +- + drivers/extcon/extcon.c | 8 +++- + drivers/power/supply/axp288_charger.c | 17 ++++--- + drivers/power/supply/charger-manager.c | 7 +-- + drivers/power/supply/max8997_charger.c | 10 ++-- + drivers/usb/dwc3/drd.c | 9 +--- + drivers/usb/phy/phy-omap-otg.c | 4 +- + drivers/usb/typec/tcpm/fusb302.c | 4 +- + include/linux/extcon.h | 2 +- + 15 files changed, 86 insertions(+), 59 deletions(-) +Merging gnss/gnss-next (26291c54e111 Linux 5.17-rc2) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (f621eb13facb vfio-pci: Provide reviewers and acceptance criteria for variant drivers) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging staging/staging-next (e54e00a28837 staging: r8188eu: ps_flag is never set) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging drivers/staging/r8188eu/core/rtw_br_ext.c +Merge made by the 'ort' strategy. + drivers/staging/greybus/audio_codec.c | 24 +- + drivers/staging/r8188eu/core/rtw_br_ext.c | 10 +- + drivers/staging/r8188eu/core/rtw_cmd.c | 114 ++++---- + drivers/staging/r8188eu/core/rtw_led.c | 6 +- + drivers/staging/r8188eu/core/rtw_mlme.c | 51 ++-- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 113 +++++--- + drivers/staging/r8188eu/core/rtw_p2p.c | 6 +- + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 37 ++- + drivers/staging/r8188eu/core/rtw_recv.c | 309 +++++++++------------ + drivers/staging/r8188eu/core/rtw_wlan_util.c | 101 +++++-- + drivers/staging/r8188eu/core/rtw_xmit.c | 6 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 6 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c | 2 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c | 2 +- + drivers/staging/r8188eu/hal/odm_HWConfig.c | 4 +- + drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 7 +- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 8 +- + drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 3 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 222 +-------------- + drivers/staging/r8188eu/hal/usb_ops_linux.c | 8 +- + drivers/staging/r8188eu/include/hal_intf.h | 20 +- + drivers/staging/r8188eu/include/rtl8188e_hal.h | 3 - + drivers/staging/r8188eu/include/rtl8188e_spec.h | 10 +- + drivers/staging/r8188eu/include/rtw_mlme.h | 3 +- + drivers/staging/r8188eu/include/rtw_mlme_ext.h | 38 +-- + drivers/staging/r8188eu/include/rtw_pwrctrl.h | 19 +- + drivers/staging/r8188eu/include/rtw_recv.h | 1 - + drivers/staging/r8188eu/include/usb_ops.h | 22 +- + drivers/staging/r8188eu/include/wifi.h | 53 +--- + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 17 +- + drivers/staging/r8188eu/os_dep/os_intfs.c | 16 +- + drivers/staging/r8188eu/os_dep/osdep_service.c | 9 - + drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 3 +- + drivers/staging/rtl8712/drv_types.h | 3 +- + drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | 1 - + .../staging/rtl8712/rtl8712_macsetting_bitdef.h | 3 - + .../staging/rtl8712/rtl8712_macsetting_regdef.h | 2 - + drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h | 1 - + drivers/staging/rtl8712/rtl8712_security_bitdef.h | 1 - + drivers/staging/rtl8712/rtl8712_spec.h | 3 - + drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h | 4 - + drivers/staging/rtl8712/rtl8712_syscfg_regdef.h | 2 - + drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h | 1 - + drivers/staging/rtl8712/rtl8712_wmac_bitdef.h | 1 - + drivers/staging/rtl8712/rtl871x_cmd.c | 2 +- + drivers/staging/rtl8712/rtl871x_cmd.h | 2 - + drivers/staging/rtl8712/rtl871x_ioctl.h | 1 - + drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 1 - + drivers/staging/rtl8712/rtl871x_ioctl_set.c | 1 - + drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 1 - + drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h | 3 - + drivers/staging/rtl8712/rtl871x_recv.c | 1 - + drivers/staging/rtl8712/rtl871x_security.c | 1 - + drivers/staging/rtl8712/sta_info.h | 1 - + drivers/staging/rtl8712/usb_intf.c | 2 +- + drivers/staging/rtl8712/wifi.h | 1 - + drivers/staging/rtl8712/xmit_linux.c | 8 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 54 ++-- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 44 ++- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 38 +-- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 32 +-- + drivers/staging/rtl8723bs/core/rtw_rf.c | 56 ++-- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- + drivers/staging/rts5208/rtsx_transport.c | 12 +- + drivers/staging/sm750fb/sm750_hw.c | 1 + + drivers/staging/unisys/visornic/visornic_main.c | 17 -- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 26 +- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 13 +- + drivers/staging/vme/devices/vme_user.c | 2 +- + drivers/staging/vt6656/channel.c | 1 - + drivers/staging/vt6656/rf.c | 1 - + drivers/staging/wfx/hif_tx.c | 10 +- + drivers/staging/wfx/main.c | 2 +- + drivers/staging/wfx/sta.c | 20 +- + drivers/staging/wlan-ng/cfg80211.c | 10 +- + 76 files changed, 609 insertions(+), 1034 deletions(-) +Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Already up to date. +Merging cgroup/for-next (1be9b7206b7d Merge branch 'for-5.18' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/cgroup/cpuset.c +Merge made by the 'ort' strategy. +Merging scsi/for-next (ee03d7a9c533 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/fnic/fnic_scsi.c +Auto-merging drivers/scsi/lpfc/lpfc.h +Auto-merging drivers/scsi/lpfc/lpfc_attr.c +Auto-merging drivers/scsi/lpfc/lpfc_els.c +Auto-merging drivers/scsi/lpfc/lpfc_nportdisc.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c +Auto-merging drivers/scsi/qedi/qedi_fw.c +Auto-merging drivers/scsi/ufs/ufshcd.c +Merge made by the 'ort' strategy. +Merging scsi-mkp/for-next (a6b758b0420b scsi: bnx2i: Fix spelling mistake "mis-match" -> "mismatch") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/lpfc/lpfc.h +Auto-merging drivers/scsi/sr.c +Merge made by the 'ort' strategy. + drivers/scsi/aha152x.c | 235 +++++++-------- + drivers/scsi/aic7xxx/aic79xx_osm.h | 2 - + drivers/scsi/aic7xxx/aic79xx_pci.c | 6 +- + drivers/scsi/aic7xxx/aic7xxx_osm.h | 2 - + drivers/scsi/aic7xxx/aic7xxx_pci.c | 4 +- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 6 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 4 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 1 - + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 2 +- + drivers/scsi/isci/host.c | 6 +- + drivers/scsi/libiscsi.c | 1 - + drivers/scsi/lpfc/lpfc.h | 7 +- + drivers/scsi/lpfc/lpfc_crtn.h | 3 + + drivers/scsi/lpfc/lpfc_hbadisc.c | 120 ++++++-- + drivers/scsi/lpfc/lpfc_init.c | 88 ++++-- + drivers/scsi/lpfc/lpfc_nvme.c | 27 +- + drivers/scsi/lpfc/lpfc_scsi.c | 12 +- + drivers/scsi/lpfc/lpfc_sli.c | 75 +++-- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 5 +- + drivers/scsi/pmcraid.c | 491 ------------------------------- + drivers/scsi/pmcraid.h | 33 --- + drivers/scsi/scsi_logging.c | 2 +- + drivers/scsi/scsi_scan.c | 5 + + drivers/scsi/scsi_sysfs.c | 4 - + drivers/scsi/sr.c | 2 +- + drivers/scsi/ufs/ufs-qcom.c | 15 - + drivers/scsi/ufs/ufshcd.h | 2 - + drivers/scsi/virtio_scsi.c | 8 +- + drivers/scsi/zorro7xx.c | 2 + + drivers/target/target_core_user.c | 3 +- + 31 files changed, 393 insertions(+), 782 deletions(-) +Merging vhost/linux-next (1c80cf031e02 vdpa: mlx5: synchronize driver status with CVQ) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Already up to date. +Merging rpmsg/for-next (9ea79a3861c9 Merge branches 'rpmsg-next', 'rproc-next' and 'hwspinlock-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. +Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (43ebbb92e43f gpio: rcar: Add R-Car Gen4 support) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging drivers/gpio/gpiolib.c +Merge made by the 'ort' strategy. + .../bindings/gpio/renesas,rcar-gpio.yaml | 5 ++ + .../bindings/gpio/socionext,uniphier-gpio.yaml | 17 ++++++ + drivers/gpio/gpio-rcar.c | 7 ++- + drivers/gpio/gpiolib-cdev.c | 66 ++++++++++++---------- + drivers/gpio/gpiolib.c | 12 ++-- + 5 files changed, 67 insertions(+), 40 deletions(-) +Merging gpio-intel/for-next (a1ce76e89907 gpio: tps68470: Allow building as module) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-sim/gpio/gpio-sim +Already up to date. +Merging pinctrl/for-next (4a6d01495a16 pinctrl: mediatek: common-v1: fix semicolon.cocci warnings) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (d25478e1d8f9 pinctrl: icelake: Add Ice Lake-N PCH pin controller support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (715c9faa2d2d pinctrl: renesas: r8a77990: Add drive-strength) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Merge made by the 'ort' strategy. + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 5 +-- + drivers/pinctrl/renesas/pfc-r8a77990.c | 39 ++++++++++++++++++++-- + drivers/pinctrl/renesas/sh_pfc.h | 2 +- + 3 files changed, 41 insertions(+), 5 deletions(-) +Merging pinctrl-samsung/for-next (abb860ac7e3f pinctrl: samsung: staticize fsd_pin_ctrl) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (ed14d36498c8 pwm: rcar: Simplify multiplication/shift logic) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Already up to date. +Merging userns/for-next (9def41809e95 Merge of prlimit-tasklist_lock-for-v5.18, per-namespace-ipc-sysctls-for-v5.18, and ptrace-for-v5.18 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging MAINTAINERS +Auto-merging arch/x86/kernel/ptrace.c +Auto-merging fs/io_uring.c +Auto-merging include/linux/posix-timers.h +Auto-merging ipc/mqueue.c +Auto-merging kernel/seccomp.c +Auto-merging kernel/signal.c +Auto-merging kernel/time/posix-cpu-timers.c +Auto-merging mm/memcontrol.c +Merge made by the 'ort' strategy. + include/linux/ipc_namespace.h | 37 ++++++++- + ipc/ipc_sysctl.c | 189 +++++++++++++++++++++++++++--------------- + ipc/mq_sysctl.c | 121 +++++++++++++++------------ + ipc/mqueue.c | 10 +-- + ipc/namespace.c | 10 +++ + 5 files changed, 235 insertions(+), 132 deletions(-) +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging livepatching/for-next (0e1b951d6de0 Merge branch 'for-5.18/selftests-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. +Merging rtc/rtc-next (915593a7a663 rtc: check if __rtc_read_time was successful) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (ada8d8d337ee nvdimm/blk: Fix title level) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (5cf4bc46c2f2 IDT: Fix Build warnings on some 32bit architectures.) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'ort' strategy. + drivers/ntb/hw/idt/Makefile | 1 + + 1 file changed, 1 insertion(+) +Merging seccomp/for-next/seccomp (8a3d3ea66f0d selftests/seccomp: Add SKIP for failed unshare()) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Auto-merging tools/testing/selftests/kselftest_harness.h +Auto-merging tools/testing/selftests/seccomp/Makefile +Merge made by the 'ort' strategy. + tools/testing/selftests/seccomp/Makefile | 1 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 78 ++++++++++++++++++++++++--- + 2 files changed, 73 insertions(+), 6 deletions(-) +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next +Already up to date. +Merging fsi/next (f2af60bb7ce2 fsi: Add trace events in initialization path) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Already up to date. +Merging slimbus/for-next (0eb1fb16396c slimbus: qcom-ngd-ctrl: Use platform_get_irq() to get the interrupt) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Merge made by the 'ort' strategy. + drivers/slimbus/qcom-ngd-ctrl.c | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) +Merging nvmem/for-next (bdf79b27260b dt-bindings: nvmem: brcm,nvram: add basic NVMEM cells) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/mtd/mtdcore.c +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 03bd31a85a71] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging xarray/main (3ed4bb77156d XArray: Update the LRU list in xas_split()) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Already up to date. +Merging hyperv/hyperv-next (eeda29db98f4 x86/hyperv: Output host build info as normal Windows version number) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (13de23494f38 auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging kunit/test (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging cfi/cfi/next (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (59729170afcd kunit: Make kunit_remove_resource() idempotent) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Auto-merging security/apparmor/policy_unpack_test.c +CONFLICT (content): Merge conflict in security/apparmor/policy_unpack_test.c +Resolved 'security/apparmor/policy_unpack_test.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 887510eb8237] Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git +$ git diff -M --stat --summary HEAD^.. + Documentation/dev-tools/kunit/api/index.rst | 5 + + Documentation/dev-tools/kunit/api/resource.rst | 13 + + Documentation/dev-tools/kunit/running_tips.rst | 3 +- + drivers/thunderbolt/test.c | 134 ++++----- + include/kunit/resource.h | 318 ++++++++++++++++++++ + include/kunit/test.h | 387 ++++++------------------ + lib/kunit/Makefile | 1 + + lib/kunit/kunit-example-test.c | 2 + + lib/kunit/kunit-test.c | 37 ++- + lib/kunit/resource.c | 129 ++++++++ + lib/kunit/test.c | 116 +------- + lib/list-test.c | 397 ++++++++++++++++++++++++- + lib/test_kasan.c | 2 +- + net/mctp/test/route-test.c | 4 +- + security/apparmor/policy_unpack_test.c | 6 +- + tools/testing/kunit/kunit.py | 54 ++-- + tools/testing/kunit/kunit_config.py | 9 +- + tools/testing/kunit/kunit_json.py | 63 ++-- + tools/testing/kunit/kunit_kernel.py | 53 ++-- + tools/testing/kunit/kunit_parser.py | 7 + + tools/testing/kunit/kunit_tool_test.py | 15 +- + tools/testing/kunit/qemu_config.py | 17 +- + 22 files changed, 1177 insertions(+), 595 deletions(-) + create mode 100644 Documentation/dev-tools/kunit/api/resource.rst + create mode 100644 include/kunit/resource.h + create mode 100644 lib/kunit/resource.c +Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (5d4be19cbe6a bus: mhi: ep: Add uevent support for module autoloading) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Merge made by the 'ort' strategy. + drivers/bus/mhi/Kconfig | 1 + + drivers/bus/mhi/Makefile | 3 + + drivers/bus/mhi/common.h | 22 + + drivers/bus/mhi/ep/Kconfig | 10 + + drivers/bus/mhi/ep/Makefile | 2 + + drivers/bus/mhi/ep/internal.h | 218 ++++++ + drivers/bus/mhi/ep/main.c | 1591 +++++++++++++++++++++++++++++++++++++++ + drivers/bus/mhi/ep/mmio.c | 273 +++++++ + drivers/bus/mhi/ep/ring.c | 207 +++++ + drivers/bus/mhi/ep/sm.c | 148 ++++ + include/linux/mhi_ep.h | 277 +++++++ + include/linux/mod_devicetable.h | 2 + + scripts/mod/file2alias.c | 10 + + 13 files changed, 2764 insertions(+) + create mode 100644 drivers/bus/mhi/ep/Kconfig + create mode 100644 drivers/bus/mhi/ep/Makefile + create mode 100644 drivers/bus/mhi/ep/internal.h + create mode 100644 drivers/bus/mhi/ep/main.c + create mode 100644 drivers/bus/mhi/ep/mmio.c + create mode 100644 drivers/bus/mhi/ep/ring.c + create mode 100644 drivers/bus/mhi/ep/sm.c + create mode 100644 include/linux/mhi_ep.h +Merging memblock/for-next (58ffc34896db memblock tests: Add TODO and README files) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters +Already up to date. +Merging cxl/next (05e815539f3f cxl/core/port: Fix NULL but dereferenced coccicheck error) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller) +$ git merge -m Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git folio-iomap/folio-iomap +Already up to date. +Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (5298d4bfe80f unicode: clean up the Kconfig symbol confusion) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Already up to date. +Merging slab/for-next (38e4e58eb858 Merge branch 'slab/for-5.19/stackdepot' into slab/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Auto-merging init/Kconfig +Merge made by the 'ort' strategy. + Documentation/vm/slub.rst | 64 +++++++++++++++++++++ + include/linux/stackdepot.h | 26 +++++++-- + init/Kconfig | 1 + + lib/Kconfig.debug | 1 + + lib/stackdepot.c | 66 ++++++++++++++-------- + mm/page_owner.c | 9 ++- + mm/slab.c | 17 +----- + mm/slab_common.c | 5 ++ + mm/slub.c | 135 ++++++++++++++++++++++++++++++--------------- + 9 files changed, 236 insertions(+), 88 deletions(-) +Merging random/master (cd9bb5097995 random: check for signals every PAGE_SIZE chunk of /dev/[u]random) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Merge made by the 'ort' strategy. + drivers/char/random.c | 62 +++++++++++++++++++++++---------------------------- + 1 file changed, 28 insertions(+), 34 deletions(-) +Merging landlock/next (7325fd5614aa Merge Landlock fixes into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging fs/open.c +Auto-merging include/linux/syscalls.h +Auto-merging kernel/sysctl.c +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/fs.rst | 50 +++ + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/open.c | 133 ++++++++ + fs/proc/proc_sysctl.c | 2 +- + include/linux/syscalls.h | 1 + + include/linux/sysctl.h | 3 + + include/uapi/asm-generic/unistd.h | 5 +- + include/uapi/linux/trusted-for.h | 18 + + kernel/printk/sysctl.c | 9 - + kernel/sysctl.c | 9 + + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/interpreter/.gitignore | 2 + + tools/testing/selftests/interpreter/Makefile | 21 ++ + tools/testing/selftests/interpreter/config | 1 + + .../selftests/interpreter/trust_policy_test.c | 362 +++++++++++++++++++++ + 32 files changed, 625 insertions(+), 12 deletions(-) + create mode 100644 include/uapi/linux/trusted-for.h + create mode 100644 tools/testing/selftests/interpreter/.gitignore + create mode 100644 tools/testing/selftests/interpreter/Makefile + create mode 100644 tools/testing/selftests/interpreter/config + create mode 100644 tools/testing/selftests/interpreter/trust_policy_test.c +Merging rust/rust-next (011150424cd9 rust: avoid all GCC plugins, not just the randstruct one) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging Documentation/doc-guide/kernel-doc.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging arch/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging init/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging scripts/Makefile +Auto-merging scripts/Makefile.build +Resolved 'Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 098158558f5e] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 5 + + .rustfmt.toml | 12 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 17 + + Documentation/kbuild/makefiles.rst | 50 +- + Documentation/process/changes.rst | 41 + + Documentation/rust/arch-support.rst | 34 + + Documentation/rust/coding-guidelines.rst | 214 ++ + Documentation/rust/general-information.rst | 77 + + Documentation/rust/index.rst | 20 + + Documentation/rust/logo.svg | 357 +++ + Documentation/rust/quick-start.rst | 230 ++ + MAINTAINERS | 15 + + Makefile | 175 +- + arch/Kconfig | 6 + + arch/arm/Kconfig | 1 + + arch/arm64/Kconfig | 1 + + arch/powerpc/Kconfig | 1 + + arch/riscv/Kconfig | 1 + + arch/riscv/Makefile | 5 + + arch/x86/Kconfig | 1 + + arch/x86/Makefile | 14 + + drivers/android/Kconfig | 6 + + drivers/android/Makefile | 2 + + drivers/android/allocation.rs | 266 ++ + drivers/android/context.rs | 80 + + drivers/android/defs.rs | 99 + + drivers/android/node.rs | 476 ++++ + drivers/android/process.rs | 960 ++++++++ + drivers/android/range_alloc.rs | 189 ++ + drivers/android/rust_binder.rs | 111 + + drivers/android/thread.rs | 870 +++++++ + drivers/android/transaction.rs | 326 +++ + drivers/gpio/Kconfig | 8 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio_pl061_rust.rs | 370 +++ + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 17 +- + include/uapi/linux/android/binder.h | 28 +- + init/Kconfig | 50 +- + kernel/kallsyms.c | 26 +- + kernel/livepatch/core.c | 4 +- + lib/Kconfig.debug | 143 ++ + lib/vsprintf.c | 13 + + rust/.gitignore | 8 + + rust/Makefile | 376 +++ + rust/alloc/README.md | 32 + + rust/alloc/alloc.rs | 440 ++++ + rust/alloc/borrow.rs | 498 ++++ + rust/alloc/boxed.rs | 2008 +++++++++++++++ + rust/alloc/collections/mod.rs | 156 ++ + rust/alloc/fmt.rs | 601 +++++ + rust/alloc/lib.rs | 231 ++ + rust/alloc/macros.rs | 126 + + rust/alloc/raw_vec.rs | 561 +++++ + rust/alloc/slice.rs | 1279 ++++++++++ + rust/alloc/str.rs | 632 +++++ + rust/alloc/string.rs | 2862 ++++++++++++++++++++++ + rust/alloc/vec/drain.rs | 186 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 356 +++ + rust/alloc/vec/is_zero.rs | 106 + + rust/alloc/vec/mod.rs | 3353 ++++++++++++++++++++++++++ + rust/alloc/vec/partial_eq.rs | 49 + + rust/alloc/vec/set_len_on_drop.rs | 30 + + rust/alloc/vec/spec_extend.rs | 174 ++ + rust/bindgen_parameters | 13 + + rust/build_error.rs | 29 + + rust/compiler_builtins.rs | 57 + + rust/exports.c | 20 + + rust/helpers.c | 531 ++++ + rust/kernel/allocator.rs | 65 + + rust/kernel/amba.rs | 259 ++ + rust/kernel/bindings.rs | 47 + + rust/kernel/bindings_helper.h | 37 + + rust/kernel/build_assert.rs | 80 + + rust/kernel/c_types.rs | 119 + + rust/kernel/chrdev.rs | 207 ++ + rust/kernel/clk.rs | 75 + + rust/kernel/cred.rs | 73 + + rust/kernel/device.rs | 554 +++++ + rust/kernel/driver.rs | 440 ++++ + rust/kernel/error.rs | 560 +++++ + rust/kernel/file.rs | 873 +++++++ + rust/kernel/gpio.rs | 478 ++++ + rust/kernel/hwrng.rs | 242 ++ + rust/kernel/io_buffer.rs | 153 ++ + rust/kernel/io_mem.rs | 237 ++ + rust/kernel/iov_iter.rs | 81 + + rust/kernel/irq.rs | 409 ++++ + rust/kernel/lib.rs | 260 ++ + rust/kernel/linked_list.rs | 247 ++ + rust/kernel/miscdev.rs | 291 +++ + rust/kernel/mm.rs | 149 ++ + rust/kernel/module_param.rs | 498 ++++ + rust/kernel/of.rs | 63 + + rust/kernel/pages.rs | 144 ++ + rust/kernel/platform.rs | 224 ++ + rust/kernel/power.rs | 118 + + rust/kernel/prelude.rs | 36 + + rust/kernel/print.rs | 414 ++++ + rust/kernel/random.rs | 42 + + rust/kernel/raw_list.rs | 361 +++ + rust/kernel/rbtree.rs | 562 +++++ + rust/kernel/revocable.rs | 163 ++ + rust/kernel/security.rs | 36 + + rust/kernel/static_assert.rs | 39 + + rust/kernel/std_vendor.rs | 150 ++ + rust/kernel/str.rs | 592 +++++ + rust/kernel/sync/arc.rs | 500 ++++ + rust/kernel/sync/condvar.rs | 138 ++ + rust/kernel/sync/guard.rs | 166 ++ + rust/kernel/sync/locked_by.rs | 112 + + rust/kernel/sync/mod.rs | 157 ++ + rust/kernel/sync/mutex.rs | 114 + + rust/kernel/sync/revocable_mutex.rs | 184 ++ + rust/kernel/sync/rwsem.rs | 149 ++ + rust/kernel/sync/seqlock.rs | 202 ++ + rust/kernel/sync/spinlock.rs | 192 ++ + rust/kernel/sysctl.rs | 199 ++ + rust/kernel/task.rs | 182 ++ + rust/kernel/types.rs | 569 +++++ + rust/kernel/user_ptr.rs | 175 ++ + rust/macros/helpers.rs | 79 + + rust/macros/lib.rs | 94 + + rust/macros/module.rs | 631 +++++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 130 + + samples/rust/Makefile | 15 + + samples/rust/hostprogs/.gitignore | 3 + + samples/rust/hostprogs/Makefile | 5 + + samples/rust/hostprogs/a.rs | 7 + + samples/rust/hostprogs/b.rs | 5 + + samples/rust/hostprogs/single.rs | 12 + + samples/rust/rust_chrdev.rs | 50 + + samples/rust/rust_minimal.rs | 35 + + samples/rust/rust_miscdev.rs | 143 ++ + samples/rust/rust_module_parameters.rs | 69 + + samples/rust/rust_platform.rs | 22 + + samples/rust/rust_print.rs | 54 + + samples/rust/rust_random.rs | 60 + + samples/rust/rust_semaphore.rs | 171 ++ + samples/rust/rust_semaphore_c.c | 212 ++ + samples/rust/rust_stack_probing.rs | 36 + + samples/rust/rust_sync.rs | 93 + + scripts/.gitignore | 1 + + scripts/Kconfig.include | 6 +- + scripts/Makefile | 3 + + scripts/Makefile.build | 60 + + scripts/Makefile.debug | 10 + + scripts/Makefile.host | 34 +- + scripts/Makefile.lib | 12 + + scripts/Makefile.modfinal | 8 +- + scripts/cc-version.sh | 12 +- + scripts/decode_stacktrace.sh | 14 + + scripts/generate_rust_analyzer.py | 133 + + scripts/generate_rust_target.rs | 227 ++ + scripts/is_rust_module.sh | 13 + + scripts/kallsyms.c | 40 +- + scripts/kconfig/confdata.c | 75 + + scripts/min-tool-version.sh | 6 + + scripts/rust-is-available-bindgen-libclang.h | 2 + + scripts/rust-is-available.sh | 158 ++ + tools/include/linux/kallsyms.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 168 files changed, 35289 insertions(+), 64 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/coding-guidelines.rst + create mode 100644 Documentation/rust/general-information.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/logo.svg + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 drivers/android/allocation.rs + create mode 100644 drivers/android/context.rs + create mode 100644 drivers/android/defs.rs + create mode 100644 drivers/android/node.rs + create mode 100644 drivers/android/process.rs + create mode 100644 drivers/android/range_alloc.rs + create mode 100644 drivers/android/rust_binder.rs + create mode 100644 drivers/android/thread.rs + create mode 100644 drivers/android/transaction.rs + create mode 100644 drivers/gpio/gpio_pl061_rust.rs + create mode 100644 rust/.gitignore + create mode 100644 rust/Makefile + create mode 100644 rust/alloc/README.md + create mode 100644 rust/alloc/alloc.rs + create mode 100644 rust/alloc/borrow.rs + create mode 100644 rust/alloc/boxed.rs + create mode 100644 rust/alloc/collections/mod.rs + create mode 100644 rust/alloc/fmt.rs + create mode 100644 rust/alloc/lib.rs + create mode 100644 rust/alloc/macros.rs + create mode 100644 rust/alloc/raw_vec.rs + create mode 100644 rust/alloc/slice.rs + create mode 100644 rust/alloc/str.rs + create mode 100644 rust/alloc/string.rs + create mode 100644 rust/alloc/vec/drain.rs + create mode 100644 rust/alloc/vec/drain_filter.rs + create mode 100644 rust/alloc/vec/into_iter.rs + create mode 100644 rust/alloc/vec/is_zero.rs + create mode 100644 rust/alloc/vec/mod.rs + create mode 100644 rust/alloc/vec/partial_eq.rs + create mode 100644 rust/alloc/vec/set_len_on_drop.rs + create mode 100644 rust/alloc/vec/spec_extend.rs + create mode 100644 rust/bindgen_parameters + create mode 100644 rust/build_error.rs + create mode 100644 rust/compiler_builtins.rs + create mode 100644 rust/exports.c + create mode 100644 rust/helpers.c + create mode 100644 rust/kernel/allocator.rs + create mode 100644 rust/kernel/amba.rs + create mode 100644 rust/kernel/bindings.rs + create mode 100644 rust/kernel/bindings_helper.h + create mode 100644 rust/kernel/build_assert.rs + create mode 100644 rust/kernel/c_types.rs + create mode 100644 rust/kernel/chrdev.rs + create mode 100644 rust/kernel/clk.rs + create mode 100644 rust/kernel/cred.rs + create mode 100644 rust/kernel/device.rs + create mode 100644 rust/kernel/driver.rs + create mode 100644 rust/kernel/error.rs + create mode 100644 rust/kernel/file.rs + create mode 100644 rust/kernel/gpio.rs + create mode 100644 rust/kernel/hwrng.rs + create mode 100644 rust/kernel/io_buffer.rs + create mode 100644 rust/kernel/io_mem.rs + create mode 100644 rust/kernel/iov_iter.rs + create mode 100644 rust/kernel/irq.rs + create mode 100644 rust/kernel/lib.rs + create mode 100644 rust/kernel/linked_list.rs + create mode 100644 rust/kernel/miscdev.rs + create mode 100644 rust/kernel/mm.rs + create mode 100644 rust/kernel/module_param.rs + create mode 100644 rust/kernel/of.rs + create mode 100644 rust/kernel/pages.rs + create mode 100644 rust/kernel/platform.rs + create mode 100644 rust/kernel/power.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/print.rs + create mode 100644 rust/kernel/random.rs + create mode 100644 rust/kernel/raw_list.rs + create mode 100644 rust/kernel/rbtree.rs + create mode 100644 rust/kernel/revocable.rs + create mode 100644 rust/kernel/security.rs + create mode 100644 rust/kernel/static_assert.rs + create mode 100644 rust/kernel/std_vendor.rs + create mode 100644 rust/kernel/str.rs + create mode 100644 rust/kernel/sync/arc.rs + create mode 100644 rust/kernel/sync/condvar.rs + create mode 100644 rust/kernel/sync/guard.rs + create mode 100644 rust/kernel/sync/locked_by.rs + create mode 100644 rust/kernel/sync/mod.rs + create mode 100644 rust/kernel/sync/mutex.rs + create mode 100644 rust/kernel/sync/revocable_mutex.rs + create mode 100644 rust/kernel/sync/rwsem.rs + create mode 100644 rust/kernel/sync/seqlock.rs + create mode 100644 rust/kernel/sync/spinlock.rs + create mode 100644 rust/kernel/sysctl.rs + create mode 100644 rust/kernel/task.rs + create mode 100644 rust/kernel/types.rs + create mode 100644 rust/kernel/user_ptr.rs + create mode 100644 rust/macros/helpers.rs + create mode 100644 rust/macros/lib.rs + create mode 100644 rust/macros/module.rs + create mode 100644 samples/rust/Kconfig + create mode 100644 samples/rust/Makefile + create mode 100644 samples/rust/hostprogs/.gitignore + create mode 100644 samples/rust/hostprogs/Makefile + create mode 100644 samples/rust/hostprogs/a.rs + create mode 100644 samples/rust/hostprogs/b.rs + create mode 100644 samples/rust/hostprogs/single.rs + create mode 100644 samples/rust/rust_chrdev.rs + create mode 100644 samples/rust/rust_minimal.rs + create mode 100644 samples/rust/rust_miscdev.rs + create mode 100644 samples/rust/rust_module_parameters.rs + create mode 100644 samples/rust/rust_platform.rs + create mode 100644 samples/rust/rust_print.rs + create mode 100644 samples/rust/rust_random.rs + create mode 100644 samples/rust/rust_semaphore.rs + create mode 100644 samples/rust/rust_semaphore_c.c + create mode 100644 samples/rust/rust_stack_probing.rs + create mode 100644 samples/rust/rust_sync.rs + create mode 100755 scripts/generate_rust_analyzer.py + create mode 100644 scripts/generate_rust_target.rs + create mode 100755 scripts/is_rust_module.sh + create mode 100644 scripts/rust-is-available-bindgen-libclang.h + create mode 100755 scripts/rust-is-available.sh +Merging sysctl/sysctl-next (7cde53da38a3 ftrace: move sysctl_ftrace_enabled to ftrace.c) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Auto-merging include/linux/ftrace.h +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sysctl.c +Merge made by the 'ort' strategy. + include/linux/acct.h | 1 - + include/linux/delayacct.h | 3 - + include/linux/ftrace.h | 3 - + include/linux/initrd.h | 2 - + include/linux/lockdep.h | 4 - + include/linux/oom.h | 4 - + include/linux/panic.h | 6 - + include/linux/reboot.h | 4 - + include/linux/sched/sysctl.h | 41 ------- + include/linux/writeback.h | 15 --- + init/do_mounts_initrd.c | 22 +++- + kernel/acct.c | 22 +++- + kernel/delayacct.c | 22 +++- + kernel/locking/lockdep.c | 35 +++++- + kernel/panic.c | 26 +++- + kernel/rcu/rcu.h | 2 + + kernel/reboot.c | 34 +++++- + kernel/sched/core.c | 69 ++++++++--- + kernel/sched/deadline.c | 42 +++++-- + kernel/sched/fair.c | 32 ++++- + kernel/sched/rt.c | 63 +++++++++- + kernel/sched/sched.h | 7 ++ + kernel/sched/topology.c | 25 +++- + kernel/sysctl.c | 277 ------------------------------------------- + kernel/trace/ftrace.c | 22 +++- + mm/oom_kill.c | 38 +++++- + mm/page-writeback.c | 103 ++++++++++++++-- + 27 files changed, 510 insertions(+), 414 deletions(-) +Merging folio/for-next (ae86f150c907 btrfs: Remove a use of PAGE_SIZE in btrfs_invalidate_folio()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Auto-merging Documentation/filesystems/locking.rst +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/reflink.c +Auto-merging fs/cifs/cifssmb.c +Auto-merging fs/ext4/inode.c +Auto-merging include/linux/fs.h +Auto-merging mm/readahead.c +CONFLICT (content): Merge conflict in mm/readahead.c +Resolved 'mm/readahead.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 63738a6e47c8] Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git +$ git diff -M --stat --summary HEAD^.. +Merging execve/for-next/execve (dd664099002d binfmt_elf: Don't write past end of notes for regset gap) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging kspp/for-next/kspp (f4fe9fc39c71 Merge branch 'for-next/hardening' into for-next/kspp) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Merge made by the 'ort' strategy. + arch/x86/include/asm/highmem.h | 1 + + include/linux/highmem-internal.h | 10 +++++ + include/uapi/linux/stddef.h | 4 ++ + mm/usercopy.c | 97 +++++++++++----------------------------- + security/Kconfig | 13 +----- + 5 files changed, 43 insertions(+), 82 deletions(-) +Merging kspp-gustavo/for-next/kspp (452d059ea2b6 drm/amd/display: Fix Wstringop-overflow warnings in dc_link_dp.c) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h +Auto-merging drivers/virt/acrn/mm.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 ++-- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 4 ++-- + drivers/scsi/fcoe/fcoe_ctlr.c | 2 +- + drivers/virt/acrn/acrn_drv.h | 10 ++++++---- + drivers/virt/acrn/mm.c | 9 ++++----- + fs/afs/security.c | 3 +-- + include/scsi/libfcoe.h | 3 ++- + include/uapi/linux/wireless.h | 2 +- + 8 files changed, 19 insertions(+), 18 deletions(-) +Merging akpm-current/current (fd61e89eda93 ipc/mqueue: use get_tree_nodev() in mqueue_get_tree()) +$ git merge --no-ff akpm-current/current +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/filesystems/locking.rst +Auto-merging arch/arm64/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/mm/init_64.c +Auto-merging drivers/block/loop.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging fs/namei.c +Auto-merging fs/open.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/writeback.h +Auto-merging ipc/mqueue.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/page_alloc.c +Merge made by the 'ort' strategy. + .mailmap | 4 + + Documentation/admin-guide/blockdev/zram.rst | 5 + + Documentation/admin-guide/kernel-parameters.txt | 4 +- + Documentation/admin-guide/mm/hugetlbpage.rst | 2 +- + Documentation/admin-guide/mm/ksm.rst | 18 + + Documentation/admin-guide/sysctl/vm.rst | 9 + + Documentation/filesystems/locking.rst | 18 +- + Documentation/filesystems/vfs.rst | 17 +- + Documentation/vm/balance.rst | 2 +- + Documentation/vm/page_owner.rst | 44 ++- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/pgtable-prot.h | 1 + + arch/arm64/include/asm/pgtable.h | 23 +- + arch/arm64/mm/flush.c | 13 + + arch/ia64/kernel/kprobes.c | 64 ++-- + arch/ia64/kernel/palinfo.c | 2 +- + arch/ia64/kernel/ptrace.c | 2 +- + arch/ia64/kernel/traps.c | 2 +- + arch/ia64/mm/init.c | 2 +- + arch/ia64/mm/tlb.c | 4 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 31 +- + arch/s390/include/asm/pgtable.h | 36 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/io.h | 2 +- + arch/x86/include/asm/pgtable.h | 21 ++ + arch/x86/include/asm/pgtable_64.h | 4 +- + arch/x86/include/asm/pgtable_types.h | 7 + + arch/x86/include/asm/tlbflush.h | 97 ++++++ + arch/x86/kernel/crash_dump_64.c | 2 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/mm/pgtable.c | 10 + + drivers/base/node.c | 1 + + drivers/block/loop.c | 4 +- + drivers/block/zram/zram_drv.c | 10 +- + drivers/iommu/tegra-smmu.c | 4 +- + drivers/rapidio/devices/rio_mport_cdev.c | 4 +- + fs/Kconfig | 22 +- + fs/buffer.c | 56 +++- + fs/cifs/file.c | 7 +- + fs/dax.c | 98 +----- + fs/exec.c | 6 +- + fs/fat/fat.h | 9 +- + fs/fat/fatent.c | 7 +- + fs/fat/inode.c | 6 +- + fs/fat/misc.c | 14 +- + fs/fcntl.c | 9 +- + fs/namei.c | 8 +- + fs/nfs/file.c | 21 +- + fs/ocfs2/dlm/dlmdebug.c | 12 +- + fs/ocfs2/dlm/dlmunlock.c | 21 +- + fs/ocfs2/namei.c | 49 +-- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/quota_local.c | 10 +- + fs/ocfs2/refcounttree.c | 15 +- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/open.c | 9 +- + fs/overlayfs/file.c | 13 +- + fs/pipe.c | 2 +- + fs/proc/base.c | 22 ++ + fs/proc/fd.c | 23 +- + fs/proc/generic.c | 3 + + fs/proc/kcore.c | 14 +- + fs/proc/page.c | 40 +-- + fs/proc/proc_net.c | 3 + + fs/sysv/super.c | 4 +- + include/asm-generic/tlb.h | 14 + + include/linux/fs.h | 4 + + include/linux/gfp.h | 12 +- + include/linux/huge_mm.h | 19 +- + include/linux/hugetlb.h | 10 +- + include/linux/khugepaged.h | 59 +--- + include/linux/list.h | 6 +- + include/linux/memcontrol.h | 5 + + include/linux/memory_hotplug.h | 2 +- + include/linux/memremap.h | 6 + + include/linux/migrate.h | 34 +- + include/linux/mm.h | 64 +++- + include/linux/mm_types.h | 24 +- + include/linux/mmzone.h | 11 +- + include/linux/page-flags.h | 57 +++- + include/linux/pgtable.h | 49 +++ + include/linux/pipe_fs_i.h | 2 +- + include/linux/rmap.h | 121 ++++++- + include/linux/sched.h | 8 + + include/linux/sched/coredump.h | 3 +- + include/linux/shmem_fs.h | 2 +- + include/linux/swap.h | 143 +------- + include/linux/swapops.h | 27 ++ + include/linux/vm_event_item.h | 3 + + include/linux/writeback.h | 7 + + include/trace/events/mmflags.h | 1 - + include/uapi/linux/acct.h | 3 +- + include/uapi/linux/taskstats.h | 24 +- + init/main.c | 25 +- + ipc/mqueue.c | 14 + + kernel/events/uprobes.c | 2 +- + kernel/fork.c | 4 +- + kernel/hung_task.c | 46 ++- + kernel/irq_work.c | 2 +- + kernel/kexec_core.c | 2 - + kernel/pid_namespace.c | 2 +- + kernel/taskstats.c | 23 ++ + kernel/tsacct.c | 10 +- + kernel/watchdog.c | 4 +- + lib/Kconfig.debug | 27 +- + lib/glob.c | 2 +- + lib/lz4/lz4_decompress.c | 8 +- + lib/string.c | 25 +- + lib/test_meminit.c | 12 +- + lib/test_printf.c | 8 +- + lib/test_string.c | 33 ++ + mm/Makefile | 2 +- + mm/compaction.c | 12 +- + mm/damon/vaddr-test.h | 8 +- + mm/debug_vm_pgtable.c | 46 ++- + mm/gup.c | 106 +++++- + mm/highmem.c | 4 +- + mm/huge_memory.c | 162 ++++++--- + mm/hugetlb.c | 205 ++++++++---- + mm/hugetlb_vmemmap.c | 56 ++-- + mm/hugetlb_vmemmap.h | 24 +- + mm/internal.h | 145 +++++--- + mm/khugepaged.c | 86 +++-- + mm/ksm.c | 23 +- + mm/list_lru.c | 6 - + mm/madvise.c | 9 +- + mm/memcontrol.c | 48 +-- + mm/memory-failure.c | 158 ++++++--- + mm/memory.c | 375 ++++++++++++--------- + mm/memory_hotplug.c | 95 +++--- + mm/mempolicy.c | 12 +- + mm/memremap.c | 29 ++ + mm/migrate.c | 131 ++++---- + mm/migrate_device.c | 23 +- + mm/mincore.c | 1 + + mm/mmap.c | 67 ++-- + mm/mmu_gather.c | 16 +- + mm/mprotect.c | 101 +++--- + mm/mremap.c | 17 +- + mm/page_alloc.c | 187 ++++------- + mm/page_io.c | 302 ++++++++++------- + mm/page_isolation.c | 9 +- + mm/page_vma_mapped.c | 17 +- + mm/pgtable-generic.c | 8 + + mm/rmap.c | 168 +++++++--- + mm/secretmem.c | 17 + + mm/shmem.c | 22 +- + mm/sparse-vmemmap.c | 4 +- + mm/swap.c | 4 +- + mm/swap.h | 157 +++++++++ + mm/swap_state.c | 23 +- + mm/swapfile.c | 33 +- + mm/userfaultfd.c | 23 +- + mm/util.c | 1 + + mm/vmalloc.c | 23 +- + mm/vmscan.c | 47 ++- + mm/vmstat.c | 5 +- + mm/workingset.c | 2 +- + mm/z3fold.c | 64 +--- + mm/zswap.c | 2 + + scripts/get_maintainer.pl | 1 + + tools/accounting/.gitignore | 1 + + tools/accounting/Makefile | 2 +- + tools/accounting/procacct.c | 417 ++++++++++++++++++++++++ + tools/include/linux/gfp.h | 3 +- + tools/perf/builtin-kmem.c | 1 - + tools/testing/selftests/vm/Makefile | 3 + + tools/testing/selftests/vm/migration.c | 193 +++++++++++ + tools/vm/page-types.c | 8 +- + tools/vm/page_owner_sort.c | 266 ++++++++++++--- + 171 files changed, 4152 insertions(+), 1788 deletions(-) + create mode 100644 mm/swap.h + create mode 100644 tools/accounting/procacct.c + create mode 100644 tools/testing/selftests/vm/migration.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 9c8823197b8c...24d2a2cd9d63 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (24d2a2cd9d63 kselftest/vm: override TARGETS from arguments) +$ git merge --no-ff akpm/master +Merge made by the 'ort' strategy. + mm/oom_kill.c | 58 ++++---- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 3 +- + tools/testing/selftests/vm/config | 2 + + tools/testing/selftests/vm/soft-dirty.c | 238 ++++++++++++++++++++++++++++++++ + 5 files changed, 272 insertions(+), 30 deletions(-) + create mode 100644 tools/testing/selftests/vm/soft-dirty.c diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..9f3b94276531 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20220406 |