diff options
| -rw-r--r-- | Next/SHA1s | 330 | ||||
| -rw-r--r-- | Next/Trees | 332 | ||||
| -rw-r--r-- | Next/merge.log | 4274 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 4937 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..97119c3cda2d --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,330 @@ +Name SHA1 +---- ---- +origin e9f1cbc0c4114880090c7a578117d3b9cf184ad4 +fixes 614124bea77e452aa6df7a8714e8bc820b489922 +kbuild-current c4681547bcce777daf576925a966ffa824edd09d +arc-current 13311e74253fe64329390df80bed3f07314ddd61 +arm-current dad7b9896a5dbac5da8275d5a6147c65c81fb5f2 +arm64-fixes e69012400b0cb42b2070748322cb72f9effec00f +arm-soc-fixes 048c958f12a223f154987ade94a702cc25fa0485 +drivers-memory-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5 +m68k-current c1367ee016e3550745315fb9a2dd1e4ce02cdcf6 +powerpc-fixes 1df3af6dc3cfe643f43d46f202bd44861ccbdb99 +s390-fixes 62fb9874f5da54fdb243003b386128037319b219 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current d19d8d345eecd9247cbe6cbf27aef271bd88aba7 +net c6c205ed442e4609a2bb3e369acc5f1007f782a2 +bpf 1d719254c139fb62fb8056fb496b6fd007e71550 +ipsec 2580d3f40022642452dd8422bfb8c22e54cf84bb +netfilter d322957ebfb9c21c2c72b66680f7c3ccd724e081 +ipvs c23a9fd209bc6f8c1fa6ee303fdf037d784a1627 +wireless-drivers 1f9482aa8d412b4ba06ce6ab8e333fb8ca29a06e +mac80211 f4b29d2ee903f15b5e3f9bbb485079b2a7fe6616 +rdma-fixes 13311e74253fe64329390df80bed3f07314ddd61 +sound-current 307cc9baac5c07b23da78d75c3d4755e9cffab26 +sound-asoc-fixes fd96f1a6e5b4b26068902965b928b11310eea19f +regmap-fixes 614124bea77e452aa6df7a8714e8bc820b489922 +regulator-fixes d2755ee2fc31566e82d873e637c96fa2f0f84d59 +spi-fixes d2e3148a703567070a06eea7383bece862daa0ab +pci-current 6efb943b8616ec53a5e444193dccf1af9ad627b5 +driver-core.current 77d34a4683b053108ecd466cc7c4193b45805528 +tty.current 77d34a4683b053108ecd466cc7c4193b45805528 +usb.current 77d34a4683b053108ecd466cc7c4193b45805528 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes 009c9aa5be652675a06d5211e1640e02bbb1c33d +usb-chipidea-fixes 42c4417937beaf68a9ab07e95cf8634c7080174c +phy d1ce245fe409241ed6168c835a5b55ef52bdb6a9 +staging.current 77d34a4683b053108ecd466cc7c4193b45805528 +iio-fixes e9de1ecadeab5fbffd873b9110e969c869554a56 +char-misc.current 77d34a4683b053108ecd466cc7c4193b45805528 +soundwire-fixes da096fbccd52803db3edd9dd0c5ae4079d31c456 +thunderbolt-fixes 13311e74253fe64329390df80bed3f07314ddd61 +input-current 818b26588994d9d95743fca0a427f08ec6c1c41d +crypto-current 66192b2e3fd8ab97ed518d6c0240e26655a20b4b +vfio-fixes dc51ff91cf2d1e9a2d941da483602f71d4a51472 +kselftest-fixes d07f6ca923ea0927a1024dfccafc5b53b61cfecc +modules-fixes 055f23b74b20f2824ce33047b4cf2e2aa856bf3b +dmaengine-fixes 18ef082713ad1104c32cd17a15abdc3f43c9b28a +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 562b4e91d3b221f737f84ff78ee7d348c8a6891f +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 61c6f04a988e420a1fc5e8e81cf9aebf142a7bd6 +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes 78cf0eb926cb1abeff2106bae67752e032fe5f3e +at91-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5 +omap-fixes 3ff340e24c9dd5cff9fc07d67914c5adf67f80d6 +kvm-fixes f8be156be163a052a067306417cd0ff679068c97 +kvms390-fixes cd4220d23bf3f43cf720e82bdee681f383433ae2 +hwmon-fixes 1b1cf8fe99830e8c95f0fe110b02ba51c2bbc4e0 +nvdimm-fixes de80d578113605164c358e4b532db2be5b71b1a7 +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes 2376b98e2a509b904292e0e1fcefd80ef0ff10ad +vfs-fixes 173e84953eaaf17864a707efa2b8cd4c233b3129 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 701b54bcb7d0d72ee3f032afc900608708409be0 +samsung-krzk-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5 +pinctrl-samsung-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5 +devicetree-fixes 8929ef8d4dfd53a05913e22561784ece5f6419c7 +scsi-fixes d1b7f92035c6fb42529ada531e2cbf3534544c82 +drm-fixes 62fb9874f5da54fdb243003b386128037319b219 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 62fb9874f5da54fdb243003b386128037319b219 +mmc-fixes d0244847f9fc5e20df8b7483c8a4717fe0432d38 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +hyperv-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5 +soc-fsl-fixes 2663b3388551230cbc4606a40fabf3331ceb59e4 +risc-v-fixes 7ede12b01b59dc67bef2e2035297dd2da5bfe427 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 2e8496f31d0be8f43849b2980b069f3a9805d047 +spdx 009c9aa5be652675a06d5211e1640e02bbb1c33d +gpio-brgl-fixes c6414e1a2bd26b0071e2b9d6034621f705dfd4c0 +gpio-intel-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5 +pinctrl-intel-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5 +erofs-fixes 0852b6ca941ef3ff75076e85738877bd3271e1cd +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 1d71307a6f94df3750f8f884545a769e227172fe +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes 024591f9a6e0164ec23301784d1e6d8f6cacbe59 +cel-fixes 9f4ad9e425a1d3b6a34617b8ea226d56a119a717 +drm-misc-fixes 1988e0d84161dabd99d1c27033fbd6ee439bf432 +kspp-gustavo f1469e568bf6dcbdff9fd7cd7d2cc9ca9d06efeb +kbuild a0e781a2a35a8dd4e6a38571998d59c6b0e32cd8 +compiler-attributes ca0760e7d79e2bb9c342e6b3f925b1ef01c6303e +dma-mapping 2b4bbc6231d789f58676d2ccc42177df163e1c4a +asm-generic 14462376858e35b83932f94616effc2f49fd8494 +arc def9d2780727cec3313ed3522d0123158d87224d +arm 3bd1461d1691d5405c59c4415c54fcf674eaa5ac +arm64 3d1bf78c7b13a0ad88e77dce94df88400f47e0dd +arm-perf d96b1b8c9f79b6bb234a31c80972a6f422079376 +arm-soc 2ded36511b58ba44a92b2a247b7b18c2c68aa19b +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic b03485fe99f23d95bb43b5b77df7b83121905a06 +aspeed cd946cfe2e7e86de5617a87a96619e7a90a300d4 +at91 80cbaa6d3450ca330a004953cffeffb76d35553d +drivers-memory 316ce128fbbe40c6685d2015456faf14616058ce +imx-mxs 5004b2d188273494aa12eabb45a61d0ccc8ecaf4 +keystone 9d2e21ed98a24584daa3c90698ce81f5cc307a27 +mediatek a1c8c49de3d7859db3f5dea72a049b92d7ad2e20 +mvebu 72a0a49b7c77b77ca7a1d03c38138166136d1a88 +omap 91ee322340fb88eacf437367562a3b9a0428a362 +qcom c275bbc84be9f166fc1dcedf60bb6e6a7fbf540d +raspberrypi 21c6bf8304f0141af6460cfe404dbbdeb96bdd62 +renesas 23df6d1f09712871dfba619729a8a165f147c17e +reset 48a74b1147f7db4623eaed591cc01eb740b871c0 +rockchip 764f25388c384744ac83adae0240ac6a513e2542 +samsung-krzk 5ce16705e00d9c48384201fdd5e9eb6adf59ada5 +scmi 35ba87e913089c42e5b790ecfe33146982dc68bd +stm32 4bf4abe19089245b7b12f35e5cafb5477b3e2c48 +sunxi 3f1c53207cf051d9aec85e9139bd35ada6184143 +tegra eac9ab885bb501d624c78ddbdac153b02d67d154 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new d71abfcc6c050b72ba735b74f3e3848ce07ddd15 +xilinx d98fb9ab6255136813af65d17524cb224ddd9829 +clk 783d08bd02f5d33d6e9e7fea62b727e2b6fe6462 +clk-imx c586f53ae159c6c1390f093a1ec94baef2df9f3a +clk-renesas 2cd1e3883a5739e89bb8bc6050c6f900cf5cc1da +clk-samsung a38fd8748464831584a19438cbb3082b5a2dab15 +csky 90dc8c0e664efcb14e2f133309d84bfdcb0b3d24 +h8300 6e5e55227c959716103945e7140614c4c2faf439 +m68k c1367ee016e3550745315fb9a2dd1e4ce02cdcf6 +m68knommu 3f605ee17f8e785ba6ff69bee8e584e377a3cf28 +microblaze 14a832498c23cf480243222189066a8006182b9d +mips 97e488073cfca0eea84450169ca4cbfcc64e33e3 +nds32 40e0dd851e7b7afe219820fb270b09016e41d4fc +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc ad4e600cbf897f47525b342cd4b02e88ed300a83 +parisc-hd ca2b19a4bdb6200dc1d64619ea4b8de2a84a0439 +powerpc 019b3fd94ba73d3ac615f0537440b81f129821f6 +soc-fsl 242b0b398ccd34f73772120bd27a87a1bf00e30b +risc-v 7761e36bc7222d1221242c5f195ee0fd40caea40 +s390 bd39654a2282c1a51c044575a6bc00d641d5dfd1 +sh 2882b7626f4903a8e9250b328cdf7396a6deecac +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 1aee020155f364ef538370d3392969f1077b9bae +xtensa 21e0c3d5f633efba365d64c58979a9e9e9ebd572 +pidfd 5ddf9602d7112188cb20aa5a33fd8440fb4567bd +fscrypt 2fc2b430f559fdf32d5d1dd5ceaa40e12fb77bdf +fscache 18d5803bc50ec2a38d053ed730f7194fa4f983f2 +afs 7af08140979a6e7e12b78c93b8625c8d25b084e2 +btrfs 808c6838dfeed706bda4757b1a2c2dd2cfc4d986 +ceph 4c18347238ab5a4ee0e71ca765460d84c75a26b5 +cifs d4dc277c480c1faf87d452467d16f513b7ae2fb8 +cifsd db0e04ad42bbbf7a4045d70984cd487e5137307e +configfs c886fa3cf6ffbe13006053ceb27c93d41928de30 +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs 8215d5b7f15f8643bf12fe005b2bc0cc322aff62 +exfat 1e5654de0f51890f88abd409ebf4867782431e81 +ext3 5fd541e3a9337ded34341630352c3a8549ea9ab2 +ext4 1a40ce3dd8532141fc19f3693e405c7a009caf82 +f2fs 28607bf3aa6f9762b32dc7f1ed0488823c0651b8 +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse c4e0cd4e0c16544ff0afecf07a5fe17de6077233 +gfs2 41e5ef8ed733ccfc08c1a7a0a2b6d4f0e8f1d6ae +jfs 5d299f44d7658f4423e33a0b9915bc8d81687511 +nfs 2512f47b8bd84f14fd0af7a8dd313703a4f0b743 +nfs-anna 4f8be1f53bf615102d103c0509ffa9596f65b718 +nfsd ab1016d39cc052064e32f25ad18ef8767a0ee3b8 +cel b9f83ffaa0c096b4c832a43964fe6bff3acffe10 +orangefs 0fdec1b3c9fbb5e856a40db5993c9eaf91c74a83 +overlayfs 5e717c6fa41ff9b9b0c1e5959ccf5d8ef42f804b +ubifs a801fcfeef96702fa3f9b22ad56c5eb1989d9221 +v9fs cba7dcd8878e04647c47c829846bbde91e67ca2f +xfs 1effb72a8179a02c2dd8a268454ccf50bf68aa50 +zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705 +iomap 6e552494fb90acae005d74ce6a2ee102d965184b +djw-vfs 9b8523423b23ee3dfd88e32f5b7207be56a4e782 +file-locks e1cc6e8c1969a598119b7a5578a08f6d9d0d14c4 +vfs 303392fd5c160822bf778270b28ec5ea50cab2b4 +printk 48e72544d6f06daedbf1d9b14610be89dba67526 +pci d58b2061105956f6e69691bf0259b1dd1e9fb601 +pstore c5d4fb2539cad2e62c5a3f0d8237613c394f297e +hid f3fb2deb517f894f710f5355508f7422a2bcdf3f +i2c 5bac2a5bf0c660e891d2f5d104cbafc83f246348 +i3c 3e5feb11a82945c88a1518fd2682ca8de66c37d3 +dmi 3cb4d29a2633170208c96240c7e85148679ceee3 +hwmon-staging 1b1cf8fe99830e8c95f0fe110b02ba51c2bbc4e0 +jc_docs 98cf4951842adbb03079dadedddf30b95e623cb0 +v4l-dvb 50e7a31d30e8221632675abed3be306382324ca2 +v4l-dvb-next 50e7a31d30e8221632675abed3be306382324ca2 +pm 7570e1f151ada42f46d385c0e67940fe1e732804 +cpufreq-arm c503c193db7d7ccc0c58b1ef694eaef331318149 +cpupower d07f6ca923ea0927a1024dfccafc5b53b61cfecc +devfreq 8c37d01e1a86073d15ea7084390fba58d9a1665f +opp 4fa82a87ba55f5eca7d194055572110652daa264 +thermal fe6a6de6692e7f7159c1ff42b07ecd737df712b4 +dlm 957adb68b3f7df8421a05f1647d3027f2acad310 +swiotlb 7d31f1c65cc91dfee777802bcd950e921efc955a +rdma 3d8287544223a3d2f37981c1f9ffd94d0b5e9ffc +net-next 5e437416ff66981d8154687cfdf7de50b1d82bfc +bpf-next 5e437416ff66981d8154687cfdf7de50b1d82bfc +ipsec-next 84fe73996c2e7407006002ef92d7354a56b69fed +mlx5-next 9a1ac95a59d0724ffac2181a98b232c3f94f49f5 +netfilter-next 84fe73996c2e7407006002ef92d7354a56b69fed +ipvs-next 84fe73996c2e7407006002ef92d7354a56b69fed +wireless-drivers-next ff8744b5eb116fdf9b80a6ff774393afac7325bd +bluetooth 3c755b4545aa30e89d53c65a2f7b91ad077e619b +mac80211-next 5e437416ff66981d8154687cfdf7de50b1d82bfc +mtd 0bcc3939c98d83955397eac1584d5f791fdc88d0 +nand c06dd49fd59a0abd6fa3d9fc5f6eb1776af4e5e4 +spi-nor c17e5c85b32f8809135f3211ba2525fb98b5c09f +crypto 66192b2e3fd8ab97ed518d6c0240e26655a20b4b +drm 8a02ea42bc1d4c448caf1bab0e05899dad503f74 +drm-misc f18f58012ee894039cd59ee8c889bf499d7a3943 +amdgpu 6c1c27b5253949f3c2ada9f941e7f1bc71acb86c +drm-intel 3dd6c11b60d2f1e4082221a8831f91093c4494aa +drm-tegra a562c0783b5f36cc5b0c4e52d6125e28ab89e65d +drm-msm e88bbc91849b2bf57683119c339e52916d34433f +imx-drm fc1e985b67f9f318bc5797c9370715f5d020dac3 +etnaviv 81fd23e2b3ccf71c807e671444e8accaba98ca53 +regmap d17032f2befaceef2c8c6b761ae657bc700b0be3 +sound 307cc9baac5c07b23da78d75c3d4755e9cffab26 +sound-asoc fd96f1a6e5b4b26068902965b928b11310eea19f +modules 2c0f0f3639562d6e38ee9705303c6457c4936eac +input f8f84af5da9ee04ef1d271528656dac42a090d00 +block e12ca7286849b309b23b83b0c2506eafa67f31c3 +device-mapper 5c0de3d72f8c05678ed769bea24e98128f7ab570 +pcmcia e9d503fef7da2cc0610ce9cd056d0347ec9cafc4 +mmc d0244847f9fc5e20df8b7483c8a4717fe0432d38 +mfd 495fb48dbd9bcbe15859e086edd24519a6bd2961 +backlight 1181f2164135d770bdad297290b73d274787389b +battery f1c74a6c07e76fcb31a4bcc1f437c4361a2674ce +regulator d2755ee2fc31566e82d873e637c96fa2f0f84d59 +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor d108370c644b153382632b3e5511ade575c91c86 +integrity 907a399de7b0566236c480d0c01ff52220532fb1 +keys e377c31f788fc98815e1ab90b5a35704ce35843a +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux d99cf13f14200cdb5cbb704345774c9c0698612d +smack fe6bde732be8c4711a878b11491d9a2749b03909 +tomoyo 122fa8c588316aacafe7e5a393bb3e875eaf5b25 +tpmdd 0178f9d0f60ba07e09bab57381a3ef18e2c1fd7f +watchdog cf813c67d9619fd474c785698cbed543b94209dd +iommu 2b9d8e3e9a9bb693a8b8bd26ad192db037517759 +audit 0ecc617858fce305bedcf735eb18a46cb7e9921f +devicetree 6a9a930dc4415b2e8c0bf2085b2b0b2b291053d5 +mailbox 4f197188da668180d5ea7d808ae6221ce66cfe33 +spi d2e3148a703567070a06eea7383bece862daa0ab +tip ae3527382df224b8151f6dd4d7409c602ddcd596 +clockevents 6f64c8159af9a4c46aea60344d5ab66a9bb24bc0 +edac 0a9ece9ba154dd6205709108180952c55e630833 +irqchip c51e96dace68a67f1fcfa49d4ad1577875f50bf1 +ftrace 4030a6e6a6a4a42ff8c18414c9e0c93e24cc70b8 +rcu 2a2ed5618a0e8a890d948b88b368c0459f35136c +kvm a01b45e9d34d278129296daf91c4771143fa9dd9 +kvm-arm 188982cda00ebfe28b50c2905d9bbaa2e9a001b9 +kvm-ppc 72476aaa469179222b92c380de60c76b4cb9a318 +kvms390 1f703d2cf20464338c3d5279dddfb65ac79b8782 +xen-tip 629a5d87e26fe96bcaab44cbb81f5866af6f7008 +percpu a81a52b325ec886eb004ca28b943480dae0353c7 +workqueues 89e28ce60cb65971c73359c66d076aa20a395cd5 +drivers-x86 0e695c3f7f66c66e0a1da90cc5378198a656d494 +chrome-platform 6efb943b8616ec53a5e444193dccf1af9ad627b5 +hsi 6efb943b8616ec53a5e444193dccf1af9ad627b5 +leds 7b97174cc93fadb055258f4f8f3b964e9968e59f +ipmi 5b32dd281ee0a269f39ecf6b48f0cd3f37264842 +driver-core 77d34a4683b053108ecd466cc7c4193b45805528 +usb 77d34a4683b053108ecd466cc7c4193b45805528 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 8051334e901f2f7ab9fa30a15b74cdc8e58dfde2 +usb-chipidea-next 956df1bb0ab8bb823541e66d186ed65559541b69 +tty 77d34a4683b053108ecd466cc7c4193b45805528 +char-misc 77d34a4683b053108ecd466cc7c4193b45805528 +extcon d97c0ff5a124f48109c4b32d6471c7bccd497009 +phy-next 15692a80d9491b42f910f61f5ef2171b3c2eb15c +soundwire 3d3e88e336338834086278236d42039f3cde50e1 +thunderbolt b18f901382fdb74a138a0bf30458c54a023a1d86 +vfio 6a45ece4c9af473555f01f0f8b97eba56e3c7d0d +staging 77d34a4683b053108ecd466cc7c4193b45805528 +iio 6cbb3aa0f9d5d23221df787cf36f74d3866fdb78 +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc 46bdcac533cca06c481524343de7d9cc46d67093 +dmaengine 18ef082713ad1104c32cd17a15abdc3f43c9b28a +cgroup cfeaa699186e2d5dfaca67184d734e44c13f51ee +scsi 4e65a83cd0b9b4848c85eb7c206626cef7f63765 +scsi-mkp 5f638e5ac61ef1b9b588efdf688acc0a4cecdca2 +vhost b3634a892df49d8095a4c8dc8528ed67e0a1f1d9 +rpmsg 7486f29e5e6003c0672020be02011b0eab87a56d +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl c34c1228fc1cfe83aed909995f5b82e0ab7cb977 +gpio-intel 043d7f09bf614809c10c4acbf0695ef731958300 +pinctrl bfa50166cd9d5d190b20dc33d1ec7ae19ced7022 +pinctrl-intel 258435a1c8187f559549e515d2f77fa0b57bcd27 +pinctrl-renesas c3975a73ca9410519cf62531f640b68d69b0d798 +pinctrl-samsung 6efb943b8616ec53a5e444193dccf1af9ad627b5 +pwm bebedf2bb4a9e0cb4ffa72cbc960728051b338a4 +userns 5e6b8a50a7cec5686ee2c4bda1d49899c79a7eae +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest 4896df9d53ae5521f3ce83751e828ad70bc65c80 +livepatching c150bbbb1731c5b6c0b232320c450dcd3b5c9fde +coresight 1efbcec2ef8c037f1e801c76e4b9434ee2400be7 +rtc 94af1e732abe6e83fb146fc89d6f520e6a939c6a +nvdimm 30c10d32152dd09c2158e9cab8a6c7adaa09278e +at24 6efb943b8616ec53a5e444193dccf1af9ad627b5 +ntb 28293b6c68cd93178f021f51b1b504f3ec33f463 +seccomp 19d67694745c5c9ed085d0d8332fa02d835a07d0 +kspp 6a0544606ec7f03e4a2534c87ea989de4bac41ae +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss 994adcbd37148acfa593c9ec2880a81ef97c7041 +fsi 9ab1428dfe2c66b51e0b41337cd0164da0ab6080 +slimbus 0320ed0a82364b3b175ab83ad11c7e4d9ad828a9 +nvmem 76a2b9a8ab441e4505cebe658feb0c27ba209d44 +xarray 2c7e57a02708a69d0194f9ef2a7b7e54f5a0484a +hyperv 7d815f4afa87f2032b650ae1bba7534b550a6b8b +auxdisplay c784e46c8445635afd81bd4089fc5e87271a8f3b +kgdb c8daba4640ac9619f9cb34ca7c314ff1eaff5f33 +hmm fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +fpga d97176f6040f8ab11d574ea3437557bc11d1d19a +kunit d07f6ca923ea0927a1024dfccafc5b53b61cfecc +cfi 6efb943b8616ec53a5e444193dccf1af9ad627b5 +kunit-next d07f6ca923ea0927a1024dfccafc5b53b61cfecc +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +mhi 3bd1d916c79b35fe23fec61118b3e0f35af8e026 +memblock a4d5613c4dc6d413e0733e37db9d116a2a36b9f3 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +rust 5d3986cf8ed63ff8d86270e578649e71143112d6 +cxl 4ad6181e4b216ed0cb52f45d3c6d2c70c8ae9243 +akpm-current 4bae9e362a116d9c3efab8e1730ac3e8ac6aff5b +akpm 93df9eb3bf3d4190ff57edf82c90fa18a9253c36 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..87b644234431 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,332 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-fixes +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/fixes +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +renesas git git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti-k3 git git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux.git#ti-k3-next +ti-k3-new git git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git#ti-k3-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +cifsd git https://github.com/smfrench/smb3-kernel.git#cifsd-for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +cel git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +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..065504339f78 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4274 @@ +$ date -R +Thu, 08 Jul 2021 08:25:48 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 77d34a4683b0 Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm +Merging origin/master (e9f1cbc0c411 Merge tag 'acpi-5.14-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge origin/master +Updating 77d34a4683b0..e9f1cbc0c411 +Fast-forward + Documentation/cpu-freq/cpu-drivers.rst | 6 - + Documentation/devicetree/bindings/arm/cpus.yaml | 7 + + .../devicetree/bindings/arm/msm/qcom,saw2.txt | 1 + + .../bindings/cpufreq/cpufreq-mediatek.txt | 8 +- + .../bindings/dvfs/performance-domain.yaml | 74 ++ + .../hwlock/allwinner,sun6i-a31-hwspinlock.yaml | 48 + + .../bindings/power/supply/charger-manager.txt | 91 -- + .../bindings/power/supply/charger-manager.yaml | 215 ++++ + .../bindings/power/supply/maxim,max17040.yaml | 2 +- + .../power/supply/richtek,rt5033-battery.yaml | 54 + + .../bindings/remoteproc/fsl,imx-rproc.yaml | 12 +- + .../devicetree/bindings/remoteproc/qcom,adsp.txt | 228 ---- + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 547 +++++++++ + .../bindings/remoteproc/ti,k3-r5f-rproc.yaml | 31 +- + .../bindings/remoteproc/ti,pru-rproc.yaml | 5 + + .../bindings/watchdog/atmel,sama5d4-wdt.yaml | 74 ++ + .../bindings/watchdog/atmel-sama5d4-wdt.txt | 34 - + .../bindings/watchdog/mstar,msc313e-wdt.yaml | 40 + + .../devicetree/bindings/watchdog/mtk-wdt.txt | 6 + + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 1 + + .../devicetree/bindings/watchdog/snps,dw-wdt.yaml | 1 + + .../translations/zh_CN/cpu-freq/cpu-drivers.rst | 5 - + Documentation/x86/elf_auxvec.rst | 53 + + Documentation/x86/index.rst | 1 + + MAINTAINERS | 10 +- + arch/x86/events/intel/lbr.c | 6 +- + arch/x86/include/asm/elf.h | 4 + + arch/x86/include/asm/fpu/internal.h | 202 ++-- + arch/x86/include/asm/fpu/signal.h | 2 + + arch/x86/include/asm/fpu/xstate.h | 78 +- + arch/x86/include/asm/pgtable.h | 57 +- + arch/x86/include/asm/pkeys.h | 9 +- + arch/x86/include/asm/pkru.h | 62 + + arch/x86/include/asm/processor.h | 9 + + arch/x86/include/asm/sigframe.h | 2 + + arch/x86/include/asm/special_insns.h | 14 +- + arch/x86/include/uapi/asm/auxvec.h | 4 +- + arch/x86/kernel/cpu/common.c | 37 +- + arch/x86/kernel/fpu/core.c | 282 ++--- + arch/x86/kernel/fpu/init.c | 15 +- + arch/x86/kernel/fpu/regset.c | 223 ++-- + arch/x86/kernel/fpu/signal.c | 438 ++++--- + arch/x86/kernel/fpu/xstate.c | 644 ++++------ + arch/x86/kernel/process.c | 22 +- + arch/x86/kernel/process_64.c | 28 +- + arch/x86/kernel/signal.c | 88 +- + arch/x86/kernel/traps.c | 5 +- + arch/x86/kvm/svm/sev.c | 1 + + arch/x86/kvm/x86.c | 56 +- + arch/x86/math-emu/fpu_proto.h | 2 +- + arch/x86/math-emu/load_store.c | 2 +- + arch/x86/math-emu/reg_ld_str.c | 2 +- + arch/x86/mm/extable.c | 2 +- + arch/x86/mm/fault.c | 2 +- + arch/x86/mm/pkeys.c | 22 - + drivers/acpi/Kconfig | 10 + + drivers/acpi/acpi_amba.c | 1 + + drivers/acpi/acpi_video.c | 9 + + drivers/acpi/bus.c | 3 +- + drivers/acpi/x86/s2idle.c | 12 +- + drivers/base/arch_topology.c | 27 +- + drivers/base/power/domain.c | 38 +- + drivers/base/power/main.c | 5 +- + drivers/cpufreq/Kconfig.arm | 10 + + drivers/cpufreq/cppc_cpufreq.c | 324 ++++- + drivers/cpufreq/cpufreq-dt-platdev.c | 10 +- + drivers/cpufreq/cpufreq.c | 44 +- + drivers/cpufreq/intel_pstate.c | 11 +- + drivers/cpufreq/mediatek-cpufreq.c | 1 + + drivers/cpufreq/powernv-cpufreq.c | 23 +- + drivers/cpufreq/scmi-cpufreq.c | 2 +- + drivers/cpuidle/cpuidle-qcom-spm.c | 14 + + drivers/hwspinlock/Kconfig | 9 + + drivers/hwspinlock/Makefile | 1 + + drivers/hwspinlock/sun6i_hwspinlock.c | 210 ++++ + drivers/i3c/master/i3c-master-cdns.c | 2 + + drivers/input/joystick/sidewinder.c | 1 + + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 1 + + drivers/power/reset/at91-sama5d2_shdwc.c | 4 +- + drivers/power/reset/gpio-poweroff.c | 1 + + drivers/power/reset/keystone-reset.c | 1 + + drivers/power/reset/regulator-poweroff.c | 1 + + drivers/power/supply/Kconfig | 12 +- + drivers/power/supply/Makefile | 3 +- + drivers/power/supply/ab8500-bm.h | 7 +- + drivers/power/supply/ab8500-chargalg.h | 2 +- + drivers/power/supply/ab8500_btemp.c | 126 +- + drivers/power/supply/ab8500_charger.c | 381 +++--- + drivers/power/supply/ab8500_fg.c | 145 ++- + drivers/power/supply/abx500_chargalg.c | 117 +- + drivers/power/supply/axp20x_battery.c | 17 +- + drivers/power/supply/axp288_fuel_gauge.c | 26 +- + drivers/power/supply/bd70528-charger.c | 710 ----------- + drivers/power/supply/bq24190_charger.c | 11 +- + drivers/power/supply/charger-manager.c | 1 + + drivers/power/supply/cpcap-battery.c | 19 +- + drivers/power/supply/cpcap-charger.c | 39 +- + drivers/power/supply/max17040_battery.c | 42 +- + drivers/power/supply/max17042_battery.c | 2 +- + drivers/power/supply/pm2301_charger.c | 1249 -------------------- + drivers/power/supply/rn5t618_power.c | 235 ++++ + drivers/power/supply/rt5033_battery.c | 7 + + drivers/power/supply/sbs-battery.c | 153 ++- + drivers/power/supply/sc2731_charger.c | 1 + + drivers/power/supply/sc27xx_fuel_gauge.c | 1 + + drivers/power/supply/smb347-charger.c | 1 - + drivers/power/supply/surface_battery.c | 14 +- + drivers/power/supply/surface_charger.c | 2 +- + drivers/remoteproc/Kconfig | 1 + + drivers/remoteproc/imx_rproc.c | 209 +++- + drivers/remoteproc/pru_rproc.c | 3 + + drivers/remoteproc/qcom_q6v5.c | 2 +- + drivers/remoteproc/qcom_q6v5_pas.c | 22 + + drivers/remoteproc/qcom_wcnss.c | 5 +- + drivers/remoteproc/remoteproc_cdev.c | 2 +- + drivers/remoteproc/remoteproc_core.c | 72 +- + drivers/remoteproc/remoteproc_elf_loader.c | 12 +- + drivers/remoteproc/remoteproc_virtio.c | 6 +- + drivers/remoteproc/stm32_rproc.c | 16 +- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 151 ++- + drivers/scsi/aic94xx/aic94xx_sds.c | 4 +- + drivers/soc/qcom/smem_state.c | 36 + + drivers/watchdog/Kconfig | 77 +- + drivers/watchdog/Makefile | 3 +- + drivers/watchdog/aspeed_wdt.c | 6 +- + drivers/watchdog/bcm7038_wdt.c | 31 +- + drivers/watchdog/booke_wdt.c | 2 +- + drivers/watchdog/diag288_wdt.c | 4 - + drivers/watchdog/dw_wdt.c | 9 +- + drivers/watchdog/eurotechwdt.c | 2 +- + drivers/watchdog/hpwdt.c | 1 + + drivers/watchdog/iTCO_wdt.c | 16 +- + drivers/watchdog/imx2_wdt.c | 10 + + drivers/watchdog/imx_sc_wdt.c | 11 +- + drivers/watchdog/it87_wdt.c | 8 - + drivers/watchdog/jz4740_wdt.c | 4 +- + drivers/watchdog/keembay_wdt.c | 34 +- + drivers/watchdog/lpc18xx_wdt.c | 2 +- + drivers/watchdog/mei_wdt.c | 4 +- + drivers/watchdog/meson_wdt.c | 8 +- + drivers/watchdog/msc313e_wdt.c | 166 +++ + drivers/watchdog/mtk_wdt.c | 77 +- + drivers/watchdog/mtx-1_wdt.c | 2 - + drivers/watchdog/mv64x60_wdt.c | 324 ----- + drivers/watchdog/octeon-wdt-main.c | 12 +- + drivers/watchdog/of_xilinx_wdt.c | 38 +- + drivers/watchdog/orion_wdt.c | 2 +- + drivers/watchdog/pc87413_wdt.c | 2 +- + drivers/watchdog/qcom-wdt.c | 4 +- + drivers/watchdog/sama5d4_wdt.c | 10 +- + drivers/watchdog/sbc60xxwdt.c | 2 +- + drivers/watchdog/sbsa_gwdt.c | 54 +- + drivers/watchdog/sc520_wdt.c | 2 +- + drivers/watchdog/sl28cpld_wdt.c | 2 +- + drivers/watchdog/sp805_wdt.c | 43 +- + drivers/watchdog/w83877f_wdt.c | 2 +- + drivers/watchdog/watchdog_core.h | 48 + + drivers/watchdog/watchdog_dev.c | 86 +- + drivers/watchdog/watchdog_hrtimer_pretimeout.c | 44 + + drivers/watchdog/watchdog_pretimeout.c | 9 +- + drivers/watchdog/wdat_wdt.c | 4 +- + drivers/watchdog/wdt.c | 4 +- + drivers/watchdog/wdt_pci.c | 2 +- + drivers/watchdog/ziirave_wdt.c | 21 +- + drivers/xen/pcpu.c | 6 +- + drivers/xen/xen-balloon.c | 28 +- + drivers/xen/xenbus/xenbus_probe.c | 15 +- + fs/lockd/svc.c | 43 + + fs/lockd/svcxdr.h | 151 +++ + fs/lockd/xdr.c | 402 ++++--- + fs/lockd/xdr4.c | 403 ++++--- + fs/nfs_common/grace.c | 1 + + fs/nfsd/netns.h | 6 + + fs/nfsd/nfs3acl.c | 3 +- + fs/nfsd/nfs4callback.c | 47 +- + fs/nfsd/nfs4proc.c | 154 ++- + fs/nfsd/nfs4state.c | 177 ++- + fs/nfsd/nfsd.h | 4 + + fs/nfsd/nfsfh.h | 7 +- + fs/nfsd/nfssvc.c | 3 + + fs/nfsd/trace.h | 250 +++- + fs/nfsd/vfs.c | 26 +- + fs/nfsd/xdr4.h | 1 + + include/dt-bindings/clock/mt8173-clk.h | 1 - + include/linux/acpi.h | 2 +- + include/linux/arch_topology.h | 1 + + include/linux/cpufreq.h | 10 - + include/linux/lockd/xdr.h | 6 - + include/linux/lockd/xdr4.h | 7 +- + include/linux/max17040_battery.h | 16 - + include/linux/mv643xx.h | 8 - + include/linux/nfs_ssc.h | 14 + + include/linux/pkeys.h | 4 - + include/linux/pm2301_charger.h | 48 - + include/linux/power/ab8500.h | 16 - + include/linux/remoteproc.h | 50 +- + include/linux/sched/signal.h | 19 +- + include/linux/soc/qcom/smem_state.h | 8 + + include/uapi/linux/auxvec.h | 3 + + include/xen/interface/io/ring.h | 278 +++-- + kernel/module.c | 6 +- + kernel/sched/core.c | 1 + + net/sunrpc/auth_gss/svcauth_gss.c | 2 +- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 6 +- + tools/testing/selftests/sigaltstack/sas.c | 20 +- + tools/testing/selftests/x86/Makefile | 5 +- + .../testing/selftests/x86/corrupt_xstate_header.c | 114 ++ + tools/testing/selftests/x86/sigaltstack.c | 128 ++ + 208 files changed, 6560 insertions(+), 5645 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dvfs/performance-domain.yaml + create mode 100644 Documentation/devicetree/bindings/hwlock/allwinner,sun6i-a31-hwspinlock.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/charger-manager.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/charger-manager.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt5033-battery.yaml + delete mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,adsp.txt + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/mstar,msc313e-wdt.yaml + create mode 100644 Documentation/x86/elf_auxvec.rst + create mode 100644 arch/x86/include/asm/pkru.h + create mode 100644 drivers/hwspinlock/sun6i_hwspinlock.c + delete mode 100644 drivers/power/supply/bd70528-charger.c + delete mode 100644 drivers/power/supply/pm2301_charger.c + create mode 100644 drivers/watchdog/msc313e_wdt.c + delete mode 100644 drivers/watchdog/mv64x60_wdt.c + create mode 100644 drivers/watchdog/watchdog_hrtimer_pretimeout.c + create mode 100644 fs/lockd/svcxdr.h + delete mode 100644 include/linux/max17040_battery.h + delete mode 100644 include/linux/pm2301_charger.h + delete mode 100644 include/linux/power/ab8500.h + create mode 100644 tools/testing/selftests/x86/corrupt_xstate_header.c + create mode 100644 tools/testing/selftests/x86/sigaltstack.c +Merging fixes/fixes (614124bea77e Linux 5.13-rc5) +$ git merge fixes/fixes +Already up to date. +Merging kbuild-current/fixes (c4681547bcce Linux 5.13-rc3) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (13311e74253f Linux 5.13-rc7) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (dad7b9896a5d ARM: 9081/1: fix gcc-10 thumb2-kernel regression) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (e69012400b0c arm64: mm: don't use CON and BLK mapping if KFENCE is enabled) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (048c958f12a2 Merge tag 'tee-reviewer-for-v5.13' of git://git.linaro.org:/people/jens.wiklander/linux-tee into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm/boot/dts/am5718.dtsi | 6 +- + arch/arm/boot/dts/dra7-l4.dtsi | 22 ------ + arch/arm/boot/dts/dra71x.dtsi | 4 - + arch/arm/boot/dts/dra72x.dtsi | 4 - + arch/arm/boot/dts/dra74x.dtsi | 92 ++++++++++++---------- + arch/arm/boot/dts/qcom-sdx55-t55.dts | 2 +- + arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts | 4 +- + arch/arm/boot/dts/ste-href.dtsi | 7 ++ + arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 2 +- + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- + 12 files changed, 64 insertions(+), 84 deletions(-) +Merging drivers-memory-fixes/fixes (6efb943b8616 Linux 5.13-rc1) +$ git merge drivers-memory-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (c1367ee016e3 m68k: atari: Fix ATARI_KBD_CORE kconfig unmet dependency warning) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (1df3af6dc3cf powerpc/64e: Fix system call illegal mtmsrd instruction) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/interrupt_64.S | 6 +++++- + arch/powerpc/mm/fault.c | 4 +--- + arch/powerpc/net/bpf_jit_comp32.c | 14 +++++++++++--- + arch/powerpc/net/bpf_jit_comp64.c | 4 ++-- + arch/powerpc/sysdev/xive/common.c | 7 +++---- + 5 files changed, 22 insertions(+), 13 deletions(-) +Merging s390-fixes/fixes (62fb9874f5da Linux 5.13) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (d7fba8ff3e50 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) +$ git merge net/master +Removing include/net/caif/caif_hsi.h +Removing drivers/net/caif/caif_hsi.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/net/smsc911x.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-ptp | 20 + + Documentation/devicetree/bindings/net/gpmc-eth.txt | 2 +- + .../devicetree/bindings/net/smsc,lan9115.yaml | 110 ++ + Documentation/devicetree/bindings/net/smsc911x.txt | 43 - + Documentation/networking/ethtool-netlink.rst | 22 + + Documentation/networking/nf_conntrack-sysctl.rst | 6 + + Documentation/networking/tipc.rst | 121 +- + MAINTAINERS | 7 + + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 4 +- + drivers/net/bonding/bond_main.c | 181 ++- + drivers/net/caif/Kconfig | 9 - + drivers/net/caif/Makefile | 3 - + drivers/net/caif/caif_hsi.c | 1454 -------------------- + drivers/net/dsa/mv88e6xxx/chip.c | 22 +- + drivers/net/dsa/mv88e6xxx/serdes.c | 6 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 17 +- + drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 6 - + drivers/net/ethernet/google/gve/gve_main.c | 19 +- + drivers/net/ethernet/google/gve/gve_rx_dqo.c | 7 - + drivers/net/ethernet/ibm/ibmvnic.c | 22 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 1 + + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 1 + + drivers/net/ethernet/intel/iavf/iavf_main.c | 1 + + drivers/net/ethernet/intel/igb/igb_main.c | 15 +- + drivers/net/ethernet/intel/igc/igc.h | 2 +- + drivers/net/ethernet/intel/igc/igc_main.c | 3 + + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 1 + + drivers/net/ethernet/intel/ixgbevf/ipsec.c | 20 +- + drivers/net/ethernet/marvell/mvneta.c | 20 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 292 +++- + drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 10 + + .../ethernet/marvell/octeontx2/af/lmac_common.h | 12 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 58 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 1 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 7 + + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 111 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 200 +++ + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 88 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 3 + + .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 10 + + .../net/ethernet/marvell/octeontx2/af/rvu_struct.h | 3 +- + .../net/ethernet/marvell/octeontx2/nic/Makefile | 2 +- + drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 87 +- + drivers/net/ethernet/marvell/octeontx2/nic/cn10k.h | 3 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 3 + + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 18 +- + .../ethernet/marvell/octeontx2/nic/otx2_dmac_flt.c | 173 +++ + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 229 ++- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 26 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 1 + + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 12 +- + .../net/ethernet/netronome/nfp/flower/conntrack.c | 13 - + .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 3 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 41 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 56 +- + drivers/net/netdevsim/ipsec.c | 8 +- + drivers/net/usb/asix_devices.c | 1 + + drivers/net/vmxnet3/vmxnet3_ethtool.c | 22 +- + drivers/net/wwan/iosm/iosm_ipc_imem_ops.c | 21 +- + drivers/net/wwan/iosm/iosm_ipc_imem_ops.h | 6 +- + drivers/net/wwan/iosm/iosm_ipc_mux_codec.c | 2 +- + drivers/net/wwan/iosm/iosm_ipc_uevent.c | 2 +- + drivers/net/wwan/iosm/iosm_ipc_wwan.c | 11 +- + drivers/ptp/Makefile | 2 +- + drivers/ptp/ptp_clock.c | 42 +- + drivers/ptp/ptp_private.h | 39 + + drivers/ptp/ptp_sysfs.c | 160 +++ + drivers/ptp/ptp_vclock.c | 219 +++ + include/linux/ethtool.h | 10 + + include/linux/ptp_clock_kernel.h | 31 +- + include/linux/stmmac.h | 2 + + include/net/bonding.h | 9 +- + include/net/busy_poll.h | 2 +- + include/net/caif/caif_hsi.h | 200 --- + include/net/ip6_route.h | 2 +- + include/net/netfilter/nf_conntrack_core.h | 1 - + include/net/netns/conntrack.h | 1 + + include/net/sctp/constants.h | 4 +- + include/net/sock.h | 8 +- + include/net/tcp.h | 4 + + include/uapi/linux/ethtool_netlink.h | 15 + + include/uapi/linux/net_tstamp.h | 17 +- + include/uapi/linux/netfilter/nfnetlink_log.h | 2 +- + include/uapi/linux/netfilter/nfnetlink_queue.h | 4 +- + net/802/garp.c | 14 + + net/802/mrp.c | 14 + + net/bridge/br_if.c | 17 +- + net/core/dev.c | 13 + + net/core/skbuff.c | 1 + + net/core/sock.c | 69 +- + net/dsa/switch.c | 4 +- + net/ethtool/Makefile | 2 +- + net/ethtool/common.c | 14 + + net/ethtool/netlink.c | 10 + + net/ethtool/netlink.h | 2 + + net/ethtool/phc_vclocks.c | 94 ++ + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_ipv4.c | 4 +- + net/ipv4/udp.c | 6 +- + net/ipv4/udp_offload.c | 6 +- + net/ipv6/ip6_output.c | 4 +- + net/ipv6/tcp_ipv6.c | 4 +- + net/ipv6/udp.c | 2 +- + net/ipv6/xfrm6_output.c | 2 +- + net/iucv/iucv.c | 22 +- + net/mptcp/sockopt.c | 68 +- + net/netfilter/nf_conntrack_core.c | 11 +- + net/netfilter/nf_conntrack_netlink.c | 3 + + net/netfilter/nf_conntrack_proto.c | 7 - + net/netfilter/nf_conntrack_proto_gre.c | 13 - + net/netfilter/nf_conntrack_proto_tcp.c | 69 +- + net/netfilter/nf_conntrack_standalone.c | 10 + + net/netfilter/nf_tables_api.c | 3 +- + net/netfilter/nft_last.c | 12 +- + net/openvswitch/flow_table.c | 6 +- + net/sched/act_ct.c | 14 +- + net/sched/sch_taprio.c | 2 +- + net/sctp/protocol.c | 3 +- + net/sctp/sm_make_chunk.c | 2 +- + net/sctp/transport.c | 11 +- + net/socket.c | 19 +- + tools/testing/selftests/net/icmp_redirect.sh | 5 +- + tools/testing/selftests/net/timestamping.c | 55 +- + tools/testing/selftests/netfilter/Makefile | 2 +- + .../selftests/netfilter/conntrack_tcp_unreplied.sh | 167 +++ + 128 files changed, 3119 insertions(+), 2141 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/smsc,lan9115.yaml + delete mode 100644 Documentation/devicetree/bindings/net/smsc911x.txt + delete mode 100644 drivers/net/caif/caif_hsi.c + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_dmac_flt.c + create mode 100644 drivers/ptp/ptp_vclock.c + delete mode 100644 include/net/caif/caif_hsi.h + create mode 100644 net/ethtool/phc_vclocks.c + create mode 100755 tools/testing/selftests/netfilter/conntrack_tcp_unreplied.sh +$ git reset --hard HEAD^ +HEAD is now at 9936f4381e45 Merge remote-tracking branch 'powerpc-fixes/fixes' +Merging next-20210706 version of net +$ git merge -m next-20210706/net c6c205ed442e4609a2bb3e369acc5f1007f782a2 +Removing include/net/caif/caif_hsi.h +Removing drivers/net/caif/caif_hsi.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/net/smsc911x.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-ptp | 20 + + Documentation/devicetree/bindings/net/gpmc-eth.txt | 2 +- + .../devicetree/bindings/net/smsc,lan9115.yaml | 110 ++ + Documentation/devicetree/bindings/net/smsc911x.txt | 43 - + Documentation/networking/ethtool-netlink.rst | 22 + + Documentation/networking/tipc.rst | 121 +- + MAINTAINERS | 7 + + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 4 +- + drivers/net/caif/Kconfig | 9 - + drivers/net/caif/Makefile | 3 - + drivers/net/caif/caif_hsi.c | 1454 -------------------- + drivers/net/dsa/mv88e6xxx/chip.c | 22 +- + drivers/net/dsa/mv88e6xxx/serdes.c | 6 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 17 +- + drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 6 - + drivers/net/ethernet/google/gve/gve_main.c | 19 +- + drivers/net/ethernet/google/gve/gve_rx_dqo.c | 7 - + drivers/net/ethernet/ibm/ibmvnic.c | 22 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 1 + + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 1 + + drivers/net/ethernet/intel/iavf/iavf_main.c | 1 + + drivers/net/ethernet/intel/igb/igb_main.c | 15 +- + drivers/net/ethernet/intel/igc/igc.h | 2 +- + drivers/net/ethernet/intel/igc/igc_main.c | 3 + + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 1 + + drivers/net/ethernet/marvell/mvneta.c | 20 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 292 +++- + drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 10 + + .../ethernet/marvell/octeontx2/af/lmac_common.h | 12 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 58 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 1 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 7 + + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 111 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 200 +++ + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 88 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 3 + + .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 10 + + .../net/ethernet/marvell/octeontx2/af/rvu_struct.h | 3 +- + .../net/ethernet/marvell/octeontx2/nic/Makefile | 2 +- + drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 87 +- + drivers/net/ethernet/marvell/octeontx2/nic/cn10k.h | 3 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 3 + + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 18 +- + .../ethernet/marvell/octeontx2/nic/otx2_dmac_flt.c | 173 +++ + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 229 ++- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 26 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 1 + + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 12 +- + .../net/ethernet/netronome/nfp/flower/conntrack.c | 13 - + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 3 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 41 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 56 +- + drivers/net/usb/asix_devices.c | 1 + + drivers/net/vmxnet3/vmxnet3_ethtool.c | 22 +- + drivers/net/wwan/iosm/iosm_ipc_imem_ops.c | 21 +- + drivers/net/wwan/iosm/iosm_ipc_imem_ops.h | 6 +- + drivers/net/wwan/iosm/iosm_ipc_mux_codec.c | 2 +- + drivers/net/wwan/iosm/iosm_ipc_uevent.c | 2 +- + drivers/net/wwan/iosm/iosm_ipc_wwan.c | 11 +- + drivers/ptp/Makefile | 2 +- + drivers/ptp/ptp_clock.c | 42 +- + drivers/ptp/ptp_private.h | 39 + + drivers/ptp/ptp_sysfs.c | 160 +++ + drivers/ptp/ptp_vclock.c | 219 +++ + include/linux/ethtool.h | 10 + + include/linux/ptp_clock_kernel.h | 31 +- + include/linux/stmmac.h | 2 + + include/net/busy_poll.h | 2 +- + include/net/caif/caif_hsi.h | 200 --- + include/net/ip6_route.h | 2 +- + include/net/sctp/constants.h | 4 +- + include/net/sock.h | 8 +- + include/net/tcp.h | 4 + + include/uapi/linux/ethtool_netlink.h | 15 + + include/uapi/linux/net_tstamp.h | 17 +- + net/802/garp.c | 14 + + net/802/mrp.c | 14 + + net/bridge/br_if.c | 17 +- + net/core/sock.c | 69 +- + net/dsa/switch.c | 4 +- + net/ethtool/Makefile | 2 +- + net/ethtool/common.c | 14 + + net/ethtool/netlink.c | 10 + + net/ethtool/netlink.h | 2 + + net/ethtool/phc_vclocks.c | 94 ++ + net/ipv4/tcp_ipv4.c | 4 +- + net/ipv4/udp.c | 6 +- + net/ipv4/udp_offload.c | 6 +- + net/ipv6/tcp_ipv6.c | 4 +- + net/ipv6/udp.c | 2 +- + net/ipv6/xfrm6_output.c | 2 +- + net/iucv/iucv.c | 22 +- + net/mptcp/sockopt.c | 68 +- + net/openvswitch/flow_table.c | 6 +- + net/sched/act_ct.c | 14 +- + net/sched/sch_taprio.c | 2 +- + net/sctp/protocol.c | 3 +- + net/sctp/sm_make_chunk.c | 2 +- + net/sctp/transport.c | 11 +- + net/socket.c | 19 +- + tools/testing/selftests/net/timestamping.c | 55 +- + 102 files changed, 2648 insertions(+), 2041 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/smsc,lan9115.yaml + delete mode 100644 Documentation/devicetree/bindings/net/smsc911x.txt + delete mode 100644 drivers/net/caif/caif_hsi.c + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_dmac_flt.c + create mode 100644 drivers/ptp/ptp_vclock.c + delete mode 100644 include/net/caif/caif_hsi.h + create mode 100644 net/ethtool/phc_vclocks.c +Merging bpf/master (1d719254c139 tools: bpf: Fix error in 'make -C tools/ bpf_install') +$ git merge bpf/master +Merge made by the 'recursive' strategy. + kernel/bpf/devmap.c | 6 ++++-- + samples/bpf/Makefile | 1 + + samples/bpf/xdpsock_user.c | 28 ++++++++++++++++++++++++++++ + tools/bpf/Makefile | 7 ++----- + tools/bpf/bpftool/jit_disasm.c | 6 ++++-- + tools/bpf/runqslower/runqslower.bpf.c | 2 +- + tools/lib/bpf/libbpf.c | 4 ++-- + 7 files changed, 42 insertions(+), 12 deletions(-) +Merging ipsec/master (2580d3f40022 xfrm: Fix RCU vs hash_resize_mutex lock inversion) +$ git merge ipsec/master +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging include/net/netns/xfrm.h +Merge made by the 'recursive' strategy. + include/net/netns/xfrm.h | 1 + + net/xfrm/xfrm_policy.c | 32 ++++++++++++-------------------- + net/xfrm/xfrm_user.c | 10 ++++++++++ + 3 files changed, 23 insertions(+), 20 deletions(-) +Merging netfilter/master (d322957ebfb9 netfilter: uapi: refer to nfnetlink_conntrack.h, not nf_conntrack_netlink.h) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + Documentation/networking/nf_conntrack-sysctl.rst | 6 + + include/net/netfilter/nf_conntrack_core.h | 1 - + include/net/netns/conntrack.h | 1 + + include/uapi/linux/netfilter/nfnetlink_log.h | 2 +- + include/uapi/linux/netfilter/nfnetlink_queue.h | 4 +- + net/netfilter/nf_conntrack_core.c | 11 +- + net/netfilter/nf_conntrack_netlink.c | 3 + + net/netfilter/nf_conntrack_proto.c | 7 - + net/netfilter/nf_conntrack_proto_gre.c | 13 -- + net/netfilter/nf_conntrack_proto_tcp.c | 69 ++++++--- + net/netfilter/nf_conntrack_standalone.c | 10 ++ + net/netfilter/nf_tables_api.c | 3 +- + net/netfilter/nft_last.c | 12 +- + tools/testing/selftests/netfilter/Makefile | 2 +- + .../selftests/netfilter/conntrack_tcp_unreplied.sh | 167 +++++++++++++++++++++ + 15 files changed, 262 insertions(+), 49 deletions(-) + create mode 100755 tools/testing/selftests/netfilter/conntrack_tcp_unreplied.sh +Merging ipvs/master (c23a9fd209bc netfilter: ctnetlink: suspicious RCU usage in ctnetlink_dump_helpinfo) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (1f9482aa8d41 mwifiex: bring down link before deleting interface) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (f4b29d2ee903 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (13311e74253f Linux 5.13-rc7) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (307cc9baac5c ALSA: usb-audio: Reduce latency at playback start, take#2) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/firewire/bebob/bebob.c | 5 ++--- + sound/isa/cmi8330.c | 2 +- + sound/pci/hda/patch_realtek.c | 1 + + sound/synth/emux/emux_nrpn.c | 2 +- + sound/synth/emux/soundfont.c | 6 +++--- + sound/usb/card.h | 3 ++- + sound/usb/endpoint.c | 4 ++-- + sound/usb/media.c | 2 +- + sound/usb/mixer_s1810c.c | 2 +- + sound/usb/mixer_scarlett.c | 2 +- + sound/usb/pcm.c | 26 +++++++++++++++++++++----- + sound/usb/usx2y/usbusx2yaudio.c | 2 +- + sound/usb/usx2y/usx2yhwdeppcm.c | 2 +- + sound/x86/intel_hdmi_audio.c | 6 +++--- + sound/x86/intel_hdmi_audio.h | 2 +- + 15 files changed, 42 insertions(+), 25 deletions(-) +Merging sound-asoc-fixes/for-linus (fd96f1a6e5b4 Merge remote-tracking branch 'asoc/for-5.14' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Auto-merging sound/soc/codecs/Kconfig +Merge made by the 'recursive' strategy. + sound/soc/codecs/Kconfig | 7 +-- + sound/soc/codecs/tlv320aic31xx.h | 4 +- + sound/soc/codecs/wm_adsp.c | 6 ++- + sound/soc/intel/boards/sof_sdw_max98373.c | 81 ++++++++++++++++++++----------- + 4 files changed, 60 insertions(+), 38 deletions(-) +Merging regmap-fixes/for-linus (614124bea77e Linux 5.13-rc5) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (d2755ee2fc31 Merge remote-tracking branch 'regulator/for-5.14' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/fixed-regulator.yaml | 2 ++ + drivers/regulator/bd9576-regulator.c | 4 ++-- + drivers/regulator/hi6421v600-regulator.c | 16 +++++++++------- + drivers/regulator/mtk-dvfsrc-regulator.c | 3 +-- + drivers/regulator/rtmv20-regulator.c | 2 +- + include/linux/mfd/rt5033-private.h | 4 ++-- + 6 files changed, 17 insertions(+), 14 deletions(-) +Merging spi-fixes/for-linus (d2e3148a7035 Merge remote-tracking branch 'spi/for-5.14' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-imx.c | 38 +++++++++++++++++++------------------- + drivers/spi/spi-stm32.c | 24 +++++++++++++++++------- + 2 files changed, 36 insertions(+), 26 deletions(-) +Merging pci-current/for-linus (6efb943b8616 Linux 5.13-rc1) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (77d34a4683b0 Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (77d34a4683b0 Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (77d34a4683b0 Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (009c9aa5be65 Linux 5.13-rc6) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/for-usb-fixes (42c4417937be usb: cdnsp: Fix the IMAN_IE_SET and IMAN_IE_CLEAR macro.) +$ git merge usb-chipidea-fixes/for-usb-fixes +Auto-merging drivers/usb/cdns3/cdnsp-gadget.c +Auto-merging drivers/usb/cdns3/cdns3-ep0.c +Merge made by the 'recursive' strategy. + drivers/usb/cdns3/cdns3-ep0.c | 1 + + drivers/usb/cdns3/cdnsp-gadget.c | 2 +- + drivers/usb/cdns3/cdnsp-gadget.h | 4 ++-- + drivers/usb/cdns3/cdnsp-ring.c | 18 ++++++++---------- + 4 files changed, 12 insertions(+), 13 deletions(-) +Merging phy/fixes (d1ce245fe409 phy: Sparx5 Eth SerDes: check return value after calling platform_get_resource()) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (77d34a4683b0 Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm) +$ git merge staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (e9de1ecadeab staging: ralink-gdma: Remove incorrect author information) +$ git merge iio-fixes/fixes-togreg +Already up to date. +Merging char-misc.current/char-misc-linus (77d34a4683b0 Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (da096fbccd52 soundwire: qcom: fix handling of qcom,ports-block-pack-mode) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (13311e74253f Linux 5.13-rc7) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (818b26588994 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (66192b2e3fd8 crypto: hisilicon/sec - fix the process of disabling sva prefetching) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + crypto/testmgr.c | 5 ++- + crypto/testmgr.h | 49 +++++++++++++++++++++++++++++ + drivers/crypto/Kconfig | 6 ++-- + drivers/crypto/gemini/sl3516-ce-cipher.c | 2 +- + drivers/crypto/gemini/sl3516-ce-core.c | 2 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 3 ++ + drivers/crypto/omap-crypto.c | 3 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 2 +- + include/crypto/scatterwalk.h | 7 +---- + 9 files changed, 64 insertions(+), 15 deletions(-) +Merging vfio-fixes/for-linus (dc51ff91cf2d vfio/platform: fix module_put call in error flow) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (d07f6ca923ea Linux 5.13-rc2) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (055f23b74b20 module: check for exit sections in layout_sections() instead of module_init_section()) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (18ef082713ad Merge tag 'dmaengine-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine) +$ git merge dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (562b4e91d3b2 mtd: parsers: ofpart: fix parsing subpartitions) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (61c6f04a988e media: s5p-mfc: Fix display delay control creation) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (78cf0eb926cb MIPS: Fix kernel hang under FUNCTION_GRAPH_TRACER and PREEMPT_TRACER) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (6efb943b8616 Linux 5.13-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (3ff340e24c9d bus: ti-sysc: Fix gpt12 system timer issue with reserved status) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/bus/ti-sysc.c | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) +Merging kvm-fixes/master (f8be156be163 KVM: do not allow mapping valid but non-reference-counted pages) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (cd4220d23bf3 KVM: selftests: do not require 64GB in set_memory_region_test) +$ git merge kvms390-fixes/master +Auto-merging tools/testing/selftests/kvm/set_memory_region_test.c +Auto-merging tools/testing/selftests/kvm/lib/kvm_util.c +Auto-merging tools/testing/selftests/kvm/include/kvm_util.h +Merge made by the 'recursive' strategy. + tools/testing/selftests/kvm/include/kvm_util.h | 3 ++- + tools/testing/selftests/kvm/lib/guest_modes.c | 16 ++++++++++++++++ + tools/testing/selftests/kvm/lib/kvm_util.c | 5 +++++ + tools/testing/selftests/kvm/set_memory_region_test.c | 3 ++- + 4 files changed, 25 insertions(+), 2 deletions(-) +Merging hwmon-fixes/hwmon (1b1cf8fe9983 Merge tag 'x86-splitlock-2021-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (de80d5781136 Merge branch 'for-5.13/dax' into libnvdimm-fixes) +$ git merge nvdimm-fixes/libnvdimm-fixes +Auto-merging fs/dax.c +Merge made by the 'recursive' strategy. +Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) +$ git merge cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (2376b98e2a50 Merge branch 'misc-5.14' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Auto-merging fs/btrfs/volumes.c +Merge made by the 'recursive' strategy. + fs/btrfs/block-group.c | 367 ++++++++++++++++++++++++++++++++++++------------- + fs/btrfs/block-group.h | 6 +- + fs/btrfs/ctree.c | 67 ++------- + fs/btrfs/inode.c | 147 ++++++++++++++++---- + fs/btrfs/transaction.c | 15 +- + fs/btrfs/transaction.h | 9 +- + fs/btrfs/tree-log.c | 2 +- + fs/btrfs/volumes.c | 355 +++++++++++++++++++++++++++++++++++------------ + fs/btrfs/volumes.h | 5 +- + 9 files changed, 687 insertions(+), 286 deletions(-) +Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra file attributes for statx()) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. +Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (701b54bcb7d0 platform/mellanox: mlxreg-hotplug: Revert "move to use request_irq by IRQF_NO_AUTOEN flag") +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (6efb943b8616 Linux 5.13-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (6efb943b8616 Linux 5.13-rc1) +$ git merge pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (8929ef8d4dfd media: dt-bindings: media: renesas,drif: Fix fck definition) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (d1b7f92035c6 scsi: sd: Call sd_revalidate_disk() for ioctl(BLKRRPART)) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (62fb9874f5da Linux 5.13) +$ git merge 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 amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (62fb9874f5da Linux 5.13) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (d0244847f9fc mmc: sdhci: Fix warning message when accessing RPMB in HS400 mode) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge rtc-fixes/rtc-fixes +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-cmos.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging gnss-fixes/gnss-linus (a38fd8748464 Linux 5.12-rc2) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (6efb943b8616 Linux 5.13-rc1) +$ git merge hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu)) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (7ede12b01b59 riscv: dts: fu740: fix cache-controller interrupts) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) +$ git merge pidfd-fixes/fixes +Auto-merging fs/file.c +Merge made by the 'recursive' strategy. + fs/file.c | 64 +++++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 40 insertions(+), 24 deletions(-) +Merging fpga-fixes/fixes (2e8496f31d0b firmware: stratix10-svc: reset COMMAND_RECONFIG_FLAG_PARTIAL to 0) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (009c9aa5be65 Linux 5.13-rc6) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (c6414e1a2bd2 gpio: AMD8111 and TQMX86 require HAS_IOPORT_MAP) +$ git merge gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (6efb943b8616 Linux 5.13-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (6efb943b8616 Linux 5.13-rc1) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (0852b6ca941e erofs: fix 1 lcluster-sized pcluster for big pcluster) +$ git merge erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (1d71307a6f94 kunit: add unit test for filtering suites by names) +$ git merge kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) +$ git merge ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (024591f9a6e0 arm: ioremap: don't abuse pfn_valid() to check if pfn is in RAM) +$ git merge memblock-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/mm/ioremap.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging cel-fixes/for-rc (9f4ad9e425a1 Linux 5.12) +$ git merge cel-fixes/for-rc +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (1988e0d84161 drm/panel: nt35510: Do not fail if DSI read fails) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/panel/panel-novatek-nt35510.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +Merging kspp-gustavo/for-next/kspp (f1469e568bf6 Input: Fix fall-through warning for Clang) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (a0e781a2a35a sparc: syscalls: use pattern rules to generate syscall headers) +$ git merge kbuild/for-next +Removing scripts/mkmakefile +Auto-merging scripts/link-vmlinux.sh +Auto-merging scripts/Makefile.modfinal +Auto-merging scripts/Makefile.build +Auto-merging lib/Kconfig.debug +Auto-merging arch/x86/Makefile +Auto-merging arch/s390/Makefile +Auto-merging arch/riscv/Makefile +Auto-merging arch/powerpc/Makefile +Auto-merging arch/m68k/Makefile +Auto-merging arch/arm64/Makefile +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 130 +++++++++++++++-------------------- + arch/alpha/Kbuild | 3 + + arch/alpha/Makefile | 2 - + arch/arc/Makefile | 3 - + arch/arm/Makefile | 1 - + arch/arm64/Makefile | 1 - + arch/csky/Kbuild | 1 + + arch/h8300/Kbuild | 2 + + arch/h8300/Makefile | 3 - + arch/hexagon/Kbuild | 2 + + arch/hexagon/Makefile | 4 -- + arch/ia64/Kbuild | 1 + + arch/m68k/Makefile | 1 - + arch/microblaze/Kbuild | 1 + + arch/mips/Makefile | 3 - + arch/nds32/Kbuild | 1 + + arch/nds32/boot/.gitignore | 2 + + arch/nios2/Kbuild | 1 + + arch/openrisc/Makefile | 1 - + arch/parisc/Kbuild | 1 + + arch/parisc/kernel/syscalls/Makefile | 18 ++--- + arch/powerpc/Makefile | 3 - + arch/riscv/Makefile | 1 - + arch/s390/Makefile | 3 - + arch/sh/Kbuild | 4 ++ + arch/sh/Makefile | 5 -- + arch/sparc/Makefile | 3 - + arch/sparc/kernel/syscalls/Makefile | 18 ++--- + arch/um/Kbuild | 1 + + arch/x86/Makefile | 3 - + arch/xtensa/Kbuild | 1 + + include/linux/kconfig.h | 6 +- + init/Makefile | 12 ++-- + kernel/gen_kheaders.sh | 4 +- + lib/Kconfig.debug | 4 +- + scripts/Kbuild.include | 7 +- + scripts/Makefile.build | 2 - + scripts/Makefile.modfinal | 2 - + scripts/kconfig/conf.c | 2 +- + scripts/link-vmlinux.sh | 4 +- + scripts/mkcompile_h | 18 +++-- + scripts/mkmakefile | 17 ----- + scripts/mod/modpost.c | 7 +- + scripts/setlocalversion | 75 ++++---------------- + 44 files changed, 134 insertions(+), 250 deletions(-) + create mode 100644 arch/alpha/Kbuild + create mode 100644 arch/csky/Kbuild + create mode 100644 arch/h8300/Kbuild + create mode 100644 arch/hexagon/Kbuild + create mode 100644 arch/ia64/Kbuild + create mode 100644 arch/microblaze/Kbuild + create mode 100644 arch/nds32/Kbuild + create mode 100644 arch/nds32/boot/.gitignore + create mode 100644 arch/nios2/Kbuild + create mode 100644 arch/parisc/Kbuild + create mode 100644 arch/sh/Kbuild + create mode 100644 arch/um/Kbuild + create mode 100644 arch/xtensa/Kbuild + delete mode 100755 scripts/mkmakefile +Merging compiler-attributes/compiler-attributes (ca0760e7d79e Compiler Attributes: Add continue in comment) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (2b4bbc6231d7 dma-debug: report -EEXIST errors in add_dma_entry) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (14462376858e Merge branch 'asm-generic-unaligned' into asm-generic) +$ git merge asm-generic/master +Merge made by the 'recursive' strategy. + arch/riscv/include/asm/io.h | 5 ++-- + arch/sparc/include/asm/io.h | 8 ++++++ + include/asm-generic/io.h | 68 ++++++++++++++++++++++++++++++++++++++++++--- + 3 files changed, 75 insertions(+), 6 deletions(-) +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (3bd1461d1691 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (3d1bf78c7b13 Merge branch 'for-next/sve' into for-next/core) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (d96b1b8c9f79 drivers/perf: fix the missed ida_simple_remove() in ddr_perf_probe()) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (2ded36511b58 ARM: Document merges) +$ git merge arm-soc/for-next +Auto-merging drivers/soc/ixp4xx/ixp4xx-npe.c +Auto-merging drivers/reset/Makefile +Auto-merging drivers/reset/Kconfig +Auto-merging drivers/net/wan/ixp4xx_hss.c +Auto-merging drivers/net/ethernet/xscale/ixp4xx_eth.c +Auto-merging drivers/crypto/ixp4xx_crypto.c +Auto-merging drivers/char/hw_random/Kconfig +Auto-merging drivers/ata/Kconfig +Auto-merging arch/arm64/boot/dts/rockchip/rk3308.dtsi +Auto-merging arch/arm64/boot/dts/qcom/msm8996.dtsi +Removing arch/arm64/boot/dts/qcom/msm8996-pins.dtsi +Auto-merging arch/arm64/boot/dts/marvell/armada-37xx.dtsi +Removing arch/arm/mach-ixp4xx/include/mach/cpu.h +Auto-merging arch/arm/mach-ixp4xx/common.c +Auto-merging arch/arm/boot/dts/sama5d4.dtsi +Auto-merging arch/arm/Kconfig.debug +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/soc/rockchip/power_domain.txt +Removing Documentation/devicetree/bindings/soc/rockchip/grf.txt +Auto-merging Documentation/devicetree/bindings/pwm/allwinner,sun4i-a10-pwm.yaml +Auto-merging Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml +Auto-merging Documentation/devicetree/bindings/net/stm32-dwmac.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/net/stm32-dwmac.yaml +Removing Documentation/devicetree/bindings/clock/nvidia,tegra30-car.txt +Removing Documentation/devicetree/bindings/clock/nvidia,tegra210-car.txt +Removing Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt +Removing Documentation/devicetree/bindings/clock/nvidia,tegra124-car.txt +Removing Documentation/devicetree/bindings/clock/nvidia,tegra114-car.txt +Removing Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt +Removing Documentation/devicetree/bindings/arm/rockchip/pmu.txt +Resolved 'Documentation/devicetree/bindings/net/stm32-dwmac.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 749a348d4a2d] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + + .../devicetree/bindings/arm/bcm/bcm2835.yaml | 1 + + Documentation/devicetree/bindings/arm/fsl.yaml | 13 + + .../devicetree/bindings/arm/intel-ixp4xx.yaml | 1 + + .../devicetree/bindings/arm/mediatek.yaml | 29 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 14 + + Documentation/devicetree/bindings/arm/renesas.yaml | 18 + + .../devicetree/bindings/arm/rockchip.yaml | 5 + + .../devicetree/bindings/arm/rockchip/pmu.txt | 16 - + .../devicetree/bindings/arm/rockchip/pmu.yaml | 55 + + Documentation/devicetree/bindings/arm/sunxi.yaml | 11 + + .../bindings/arm/tegra/nvidia,tegra20-pmc.yaml | 35 + + .../bindings/clock/brcm,iproc-clocks.txt | 313 -- + .../bindings/clock/brcm,iproc-clocks.yaml | 395 +++ + .../bindings/clock/nvidia,tegra114-car.txt | 63 - + .../bindings/clock/nvidia,tegra124-car.txt | 107 - + .../bindings/clock/nvidia,tegra124-car.yaml | 115 + + .../bindings/clock/nvidia,tegra20-car.txt | 63 - + .../bindings/clock/nvidia,tegra20-car.yaml | 69 + + .../bindings/clock/nvidia,tegra210-car.txt | 56 - + .../bindings/clock/nvidia,tegra30-car.txt | 63 - + .../devicetree/bindings/firmware/qcom,scm.txt | 1 + + Documentation/devicetree/bindings/i2c/i2c-at91.txt | 2 +- + .../devicetree/bindings/iommu/arm,smmu.yaml | 11 +- + .../devicetree/bindings/net/stm32-dwmac.yaml | 4 +- + .../devicetree/bindings/pci/intel,ixp4xx-pci.yaml | 100 + + .../devicetree/bindings/phy/phy-mvebu-comphy.txt | 12 +- + .../bindings/phy/phy-rockchip-inno-usb2.yaml | 11 +- + .../devicetree/bindings/power/fsl,imx-gpcv2.yaml | 13 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 2 + + .../bindings/power/renesas,rzg2l-sysc.yaml | 63 + + .../bindings/power/rockchip,power-controller.yaml | 248 ++ + .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 3 + + .../devicetree/bindings/reset/microchip,rst.yaml | 58 + + .../devicetree/bindings/rng/intel,ixp46x-rng.yaml | 36 + + .../devicetree/bindings/soc/mediatek/pwrap.txt | 1 + + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 2 + + .../devicetree/bindings/soc/rockchip/grf.txt | 61 - + .../devicetree/bindings/soc/rockchip/grf.yaml | 261 ++ + .../bindings/soc/rockchip/power_domain.txt | 136 - + .../bindings/sound/allwinner,sun4i-a10-i2s.yaml | 3 + + .../sound/allwinner,sun8i-a23-codec-analog.yaml | 9 +- + .../bindings/timer/allwinner,sun4i-a10-timer.yaml | 42 +- + .../devicetree/bindings/vendor-prefixes.yaml | 8 + + MAINTAINERS | 26 +- + arch/arm/Kconfig | 3 +- + arch/arm/Kconfig.debug | 15 +- + arch/arm/arm-soc-for-next-contents.txt | 194 ++ + arch/arm/boot/dts/Makefile | 13 +- + arch/arm/boot/dts/am335x-baltos.dtsi | 4 +- + arch/arm/boot/dts/am335x-boneblack-wireless.dts | 2 +- + arch/arm/boot/dts/am335x-boneblue.dts | 2 +- + arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 4 +- + arch/arm/boot/dts/am335x-cm-t335.dts | 4 +- + arch/arm/boot/dts/am335x-evm.dts | 2 +- + arch/arm/boot/dts/am335x-evmsk.dts | 4 +- + arch/arm/boot/dts/am335x-icev2.dts | 4 +- + arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 2 +- + arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi | 2 +- + arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 132 +- + arch/arm/boot/dts/am335x-shc.dts | 8 +- + arch/arm/boot/dts/am33xx-l4.dtsi | 34 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 9 +- + arch/arm/boot/dts/am437x-l4.dtsi | 49 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 6 +- + arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 13 +- + arch/arm/boot/dts/aspeed-ast2500-evb.dts | 2 +- + arch/arm/boot/dts/aspeed-ast2600-evb-a1.dts | 15 + + arch/arm/boot/dts/aspeed-ast2600-evb.dts | 119 +- + arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 59 +- + .../boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 2 +- + .../dts/aspeed-bmc-arm-stardragon4800-rep2.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 2 +- + .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 2060 ++++++++++++- + arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts | 30 - + arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-opp-mowgli.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-supermicro-x11spi.dts | 2 +- + arch/arm/boot/dts/aspeed-g5.dtsi | 1 + + arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 10 + + arch/arm/boot/dts/bcm-cygnus.dtsi | 2 +- + arch/arm/boot/dts/bcm-hr2.dtsi | 2 +- + arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 85 +- + arch/arm/boot/dts/bcm2711-rpi-400.dts | 45 + + arch/arm/boot/dts/bcm2711-rpi.dtsi | 74 + + arch/arm/boot/dts/bcm2711.dtsi | 3 +- + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 4 +- + arch/arm/boot/dts/bcm2835-rpi-a.dts | 2 +- + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 +- + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 2 +- + arch/arm/boot/dts/bcm2835-rpi-b.dts | 2 +- + arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi | 2 +- + arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 2 +- + arch/arm/boot/dts/bcm2835-rpi-zero.dts | 2 +- + arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 +- + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 4 +- + arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 4 +- + arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 4 +- + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 2 +- + arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 2 +- + arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi | 2 +- + arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi | 2 +- + arch/arm/boot/dts/bcm283x.dtsi | 2 +- + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 4 +- + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 4 +- + arch/arm/boot/dts/bcm47094.dtsi | 2 +- + arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 4 +- + arch/arm/boot/dts/bcm5301x.dtsi | 26 +- + arch/arm/boot/dts/bcm63138.dtsi | 2 +- + arch/arm/boot/dts/bcm7445-bcm97445svmb.dts | 4 +- + arch/arm/boot/dts/bcm7445.dtsi | 2 +- + arch/arm/boot/dts/bcm911360_entphn.dts | 4 +- + arch/arm/boot/dts/bcm953012k.dts | 4 +- + arch/arm/boot/dts/bcm958300k.dts | 4 +- + arch/arm/boot/dts/bcm958305k.dts | 4 +- + arch/arm/boot/dts/bcm958522er.dts | 4 +- + arch/arm/boot/dts/bcm958525er.dts | 4 +- + arch/arm/boot/dts/bcm958525xmc.dts | 4 +- + arch/arm/boot/dts/bcm958622hr.dts | 4 +- + arch/arm/boot/dts/bcm958623hr.dts | 4 +- + arch/arm/boot/dts/bcm958625hr.dts | 4 +- + arch/arm/boot/dts/bcm958625k.dts | 4 +- + arch/arm/boot/dts/bcm963138dvt.dts | 4 +- + arch/arm/boot/dts/bcm988312hr.dts | 4 +- + arch/arm/boot/dts/da850.dtsi | 21 +- + arch/arm/boot/dts/dm816x.dtsi | 6 +- + arch/arm/boot/dts/dra7-evm.dts | 8 +- + arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi | 6 +- + arch/arm/boot/dts/dra7-l4.dtsi | 30 +- + arch/arm/boot/dts/dra71-evm.dts | 2 +- + arch/arm/boot/dts/dra72-evm-common.dtsi | 6 +- + arch/arm/boot/dts/dra72x.dtsi | 6 +- + arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi | 2 +- + arch/arm/boot/dts/dra74x.dtsi | 8 +- + arch/arm/boot/dts/dra76-evm.dts | 43 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 2 +- + arch/arm/boot/dts/exynos4210-i9100.dts | 8 +- + arch/arm/boot/dts/exynos4210-trats.dts | 2 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 2 +- + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 1 + + arch/arm/boot/dts/exynos4412-midas.dtsi | 1 + + arch/arm/boot/dts/exynos4412-n710x.dts | 4 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 1 + + arch/arm/boot/dts/exynos4412-origen.dts | 1 + + arch/arm/boot/dts/exynos4412-p4note.dtsi | 1 + + arch/arm/boot/dts/exynos5250-arndale.dts | 1 + + arch/arm/boot/dts/exynos5410-odroidxu.dts | 1 + + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 1 + + arch/arm/boot/dts/exynos5420-smdk5420.dts | 1 + + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 1 + + arch/arm/boot/dts/exynos5422-odroidhc1.dts | 2 +- + arch/arm/boot/dts/exynos5422-odroidxu4.dts | 2 +- + arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi | 4 +- + arch/arm/boot/dts/gemini-dlink-dir-685.dts | 11 +- + arch/arm/boot/dts/gemini-dlink-dns-313.dts | 4 +- + arch/arm/boot/dts/gemini-nas4220b.dts | 2 +- + arch/arm/boot/dts/gemini-rut1xx.dts | 14 +- + arch/arm/boot/dts/gemini-sl93512r.dts | 6 +- + arch/arm/boot/dts/gemini-sq201.dts | 6 +- + arch/arm/boot/dts/gemini-wbd111.dts | 2 +- + arch/arm/boot/dts/gemini-wbd222.dts | 2 +- + arch/arm/boot/dts/gemini.dtsi | 13 +- + arch/arm/boot/dts/hi3620.dtsi | 4 +- + arch/arm/boot/dts/hip01-ca9x2.dts | 4 +- + arch/arm/boot/dts/hip01.dtsi | 4 +- + arch/arm/boot/dts/hip04.dtsi | 4 +- + arch/arm/boot/dts/hisi-x5hd2-dkb.dts | 2 +- + arch/arm/boot/dts/hisi-x5hd2.dtsi | 2 +- + arch/arm/boot/dts/imx25-pinfunc.h | 12 +- + arch/arm/boot/dts/imx28-lwe.dtsi | 170 ++ + arch/arm/boot/dts/imx28-xea.dts | 99 + + arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 2 +- + arch/arm/boot/dts/imx53-ard.dts | 2 +- + arch/arm/boot/dts/imx6dl-b105pv2.dts | 32 + + arch/arm/boot/dts/imx6dl-b105v2.dts | 32 + + arch/arm/boot/dts/imx6dl-b125pv2.dts | 30 + + arch/arm/boot/dts/imx6dl-b125v2.dts | 30 + + arch/arm/boot/dts/imx6dl-b155v2.dts | 32 + + arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi | 413 +++ + arch/arm/boot/dts/imx6dl-b1x5v2.dtsi | 58 + + arch/arm/boot/dts/imx6dl-plym2m.dts | 6 +- + arch/arm/boot/dts/imx6dl-prtvt7.dts | 36 +- + arch/arm/boot/dts/imx6dl-qmx6.dtsi | 612 ++++ + arch/arm/boot/dts/imx6dl-riotboard.dts | 2 + + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 3 + + arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 71 +- + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +- + arch/arm/boot/dts/imx6q-ds.dts | 17 + + arch/arm/boot/dts/imx6qdl-ds.dtsi | 458 +++ + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 5 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 10 + + arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 41 +- + arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi | 1 - + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 50 +- + arch/arm/boot/dts/imx7d-sdb.dts | 7 + + arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts | 79 +- + .../arm/boot/dts/intel-ixp42x-welltech-epbx100.dts | 76 + + arch/arm/boot/dts/intel-ixp42x.dtsi | 4 + + .../arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts | 104 +- + arch/arm/boot/dts/intel-ixp43x.dtsi | 4 + + arch/arm/boot/dts/intel-ixp45x-ixp46x.dtsi | 33 + + arch/arm/boot/dts/intel-ixp4xx.dtsi | 92 +- + arch/arm/boot/dts/keystone-k2g-evm.dts | 11 +- + arch/arm/boot/dts/keystone-k2g.dtsi | 6 +- + arch/arm/boot/dts/meson.dtsi | 1 + + arch/arm/boot/dts/mstar-v7.dtsi | 14 + + arch/arm/boot/dts/omap2.dtsi | 4 - + arch/arm/boot/dts/omap2420.dtsi | 5 +- + arch/arm/boot/dts/omap2430.dtsi | 2 +- + arch/arm/boot/dts/omap3-evm-processor-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-gta04a5.dts | 2 +- + arch/arm/boot/dts/omap3.dtsi | 8 +- + arch/arm/boot/dts/omap4-l4.dtsi | 4 +- + arch/arm/boot/dts/omap5-board-common.dtsi | 2 +- + arch/arm/boot/dts/omap5-l4.dtsi | 4 +- + arch/arm/boot/dts/openbmc-flash-layout-64.dtsi | 18 +- + arch/arm/boot/dts/qcom-ipq8064-rb3011.dts | 58 + + arch/arm/boot/dts/qcom-ipq8064.dtsi | 425 +++ + arch/arm/boot/dts/r8a7742.dtsi | 6 +- + arch/arm/boot/dts/r8a7743.dtsi | 4 +- + arch/arm/boot/dts/r8a7744.dtsi | 4 +- + arch/arm/boot/dts/r8a7745.dtsi | 4 +- + arch/arm/boot/dts/r8a77470.dtsi | 4 +- + arch/arm/boot/dts/r8a7778.dtsi | 3 + + arch/arm/boot/dts/r8a7779-marzen.dts | 2 +- + arch/arm/boot/dts/r8a7779.dtsi | 4 + + arch/arm/boot/dts/r8a7790-lager.dts | 8 + + arch/arm/boot/dts/r8a7790.dtsi | 10 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 4 +- + arch/arm/boot/dts/r8a7791.dtsi | 4 +- + arch/arm/boot/dts/r8a7792-blanche.dts | 8 + + arch/arm/boot/dts/r8a7792.dtsi | 4 +- + arch/arm/boot/dts/r8a7793-gose.dts | 10 +- + arch/arm/boot/dts/r8a7793.dtsi | 3 +- + arch/arm/boot/dts/r8a7794-alt.dts | 42 + + arch/arm/boot/dts/r8a7794-silk.dts | 10 +- + arch/arm/boot/dts/r8a7794.dtsi | 4 +- + arch/arm/boot/dts/rk3036-kylin.dts | 2 +- + arch/arm/boot/dts/rk3036.dtsi | 72 +- + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 5 + + arch/arm/boot/dts/rk3066a-marsboard.dts | 4 + + arch/arm/boot/dts/rk3066a-mk808.dts | 5 + + arch/arm/boot/dts/rk3066a-rayeager.dts | 8 +- + arch/arm/boot/dts/rk3066a.dtsi | 71 +- + arch/arm/boot/dts/rk3188-bqedison2qc.dts | 6 + + arch/arm/boot/dts/rk3188-px3-evb.dts | 5 + + arch/arm/boot/dts/rk3188-radxarock.dts | 4 + + arch/arm/boot/dts/rk3188.dtsi | 74 +- + arch/arm/boot/dts/rk322x.dtsi | 158 +- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 2 +- + arch/arm/boot/dts/rk3288-vyasa.dts | 4 +- + arch/arm/boot/dts/rk3288.dtsi | 18 +- + arch/arm/boot/dts/rk3xxx.dtsi | 17 +- + arch/arm/boot/dts/rv1108.dtsi | 2 +- + arch/arm/boot/dts/s5pv210-goni.dts | 9 - + arch/arm/boot/dts/sama5d4.dtsi | 2 +- + arch/arm/boot/dts/sd5203.dts | 2 +- + arch/arm/boot/dts/ste-ab8500.dtsi | 28 +- + arch/arm/boot/dts/ste-ab8505.dtsi | 24 +- + arch/arm/boot/dts/ste-href-ab8500.dtsi | 2 +- + arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi | 6 + + arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi | 4 +- + arch/arm/boot/dts/ste-href.dtsi | 2 +- + arch/arm/boot/dts/ste-snowball.dts | 2 +- + arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 3 +- + arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 11 +- + arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 3 +- + arch/arm/boot/dts/stm32429i-eval.dts | 8 +- + arch/arm/boot/dts/stm32746g-eval.dts | 6 +- + arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/stm32f429-disco.dts | 6 +- + arch/arm/boot/dts/stm32f429-pinctrl.dtsi | 72 +- + arch/arm/boot/dts/stm32f429.dtsi | 10 +- + arch/arm/boot/dts/stm32f469-disco.dts | 6 +- + arch/arm/boot/dts/stm32f469-pinctrl.dtsi | 74 +- + arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/stm32f746.dtsi | 12 +- + arch/arm/boot/dts/stm32f769-disco.dts | 6 +- + arch/arm/boot/dts/stm32h743.dtsi | 4 - + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 33 + + arch/arm/boot/dts/stm32mp151.dtsi | 16 +- + ...m32mp157a-microgea-stm32mp1-microdev2.0-of7.dts | 2 +- + arch/arm/boot/dts/stm32mp157a-stinger96.dtsi | 7 +- + arch/arm/boot/dts/stm32mp157c-odyssey-som.dtsi | 7 +- + arch/arm/boot/dts/stm32mp157c-odyssey.dts | 2 +- + arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 7 +- + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 17 +- + arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 2 +- + arch/arm/boot/dts/stm32mp15xx-osd32.dtsi | 7 +- + arch/arm/boot/dts/sun8i-a33.dtsi | 4 +- + arch/arm/boot/dts/sun8i-r40-feta40i.dtsi | 106 + + arch/arm/boot/dts/sun8i-r40-oka40i-c.dts | 203 ++ + arch/arm/boot/dts/sun8i-r40.dtsi | 56 + + arch/arm/boot/dts/sun8i-v3.dtsi | 31 + + arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts | 17 +- + arch/arm/boot/dts/sun8i-v3s.dtsi | 48 + + arch/arm/boot/dts/tegra124.dtsi | 3 +- + arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 21 +- + arch/arm/boot/dts/tegra20-harmony.dts | 2 +- + arch/arm/boot/dts/tegra20-medcom-wide.dts | 2 +- + arch/arm/boot/dts/tegra20-paz00.dts | 43 +- + arch/arm/boot/dts/tegra20-plutux.dts | 2 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 2 +- + arch/arm/boot/dts/tegra20-tec.dts | 2 +- + arch/arm/boot/dts/tegra20-ventana.dts | 2 +- + .../dts/tegra30-asus-nexus7-grouper-common.dtsi | 16 +- + .../tegra30-asus-nexus7-grouper-maxim-pmic.dtsi | 9 + + .../dts/tegra30-asus-nexus7-grouper-ti-pmic.dtsi | 11 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +- + arch/arm/boot/dts/tegra30-ouya.dts | 4 +- + arch/arm/boot/dts/tegra30.dtsi | 3 +- + arch/arm/configs/aspeed_g4_defconfig | 1 + + arch/arm/configs/aspeed_g5_defconfig | 2 + + arch/arm/configs/at91_dt_defconfig | 2 + + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/imx_v6_v7_defconfig | 2 + + arch/arm/configs/ixp4xx_defconfig | 3 + + arch/arm/configs/omap2plus_defconfig | 5 + + arch/arm/configs/shmobile_defconfig | 1 - + arch/arm/configs/tegra_defconfig | 1 + + arch/arm/mach-exynos/exynos.c | 2 + + arch/arm/mach-imx/Makefile | 2 +- + arch/arm/mach-imx/common.h | 3 + + arch/arm/mach-imx/headsmp.S | 9 + + arch/arm/mach-imx/hotplug.c | 3 + + arch/arm/mach-imx/mach-imx50.c | 7 + + arch/arm/mach-imx/mach-imx6q.c | 88 - + arch/arm/mach-imx/mach-imx6sx.c | 26 - + arch/arm/mach-imx/mach-imx7d.c | 25 +- + arch/arm/mach-imx/platsmp.c | 26 + + arch/arm/mach-imx/src.c | 101 +- + arch/arm/mach-imx/suspend-imx53.S | 4 +- + arch/arm/mach-ixp4xx/Kconfig | 35 +- + arch/arm/mach-ixp4xx/avila-setup.c | 1 + + arch/arm/mach-ixp4xx/common.c | 47 +- + arch/arm/mach-ixp4xx/fsg-setup.c | 1 + + arch/arm/mach-ixp4xx/include/mach/cpu.h | 54 - + arch/arm/mach-ixp4xx/include/mach/hardware.h | 2 +- + arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 61 +- + arch/arm/mach-ixp4xx/include/mach/platform.h | 14 - + arch/arm/mach-ixp4xx/ixp4xx-of.c | 8 +- + arch/arm/mach-ixp4xx/nas100d-setup.c | 1 + + arch/arm/mach-ixp4xx/nslu2-setup.c | 1 + + arch/arm/mach-omap1/Kconfig | 12 +- + arch/arm/mach-omap2/cm.h | 1 - + arch/arm/mach-omap2/cm_common.c | 13 - + arch/arm/mach-omap2/common.h | 1 - + arch/arm/mach-omap2/control.c | 5 - + arch/arm/mach-omap2/control.h | 1 - + arch/arm/mach-omap2/pm33xx-core.c | 40 + + arch/arm/mach-s3c/mach-rx1950.c | 1 - + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 25 + + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 62 +- + .../boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts | 195 ++ + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 9 + + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 41 +- + .../boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 646 ++++ + .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 13 + + .../arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts | 17 - + .../boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 48 +- + arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 9 +- + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 10 + + arch/arm64/boot/dts/arm/juno-base.dtsi | 6 +- + arch/arm64/boot/dts/broadcom/Makefile | 3 +- + arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts | 2 + + arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 2 +- + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 8 +- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 1 + + arch/arm64/boot/dts/freescale/Makefile | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 14 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 24 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 12 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 24 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 24 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 16 +- + arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 16 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 1 - + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 24 +- + arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 50 +- + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 1 + + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 1019 +++++++ + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 363 +-- + .../boot/dts/freescale/imx8mn-beacon-som.dtsi | 3 + + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 147 +- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 139 + + .../boot/dts/freescale/imx8mp-phycore-som.dtsi | 25 + + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 18 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 1 + + arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts | 182 ++ + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 16 + + .../arm64/boot/dts/hisilicon/hi3660-coresight.dtsi | 2 +- + arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 2 +- + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 2 +- + arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts | 2 +- + arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 2 +- + .../arm64/boot/dts/hisilicon/hi6220-coresight.dtsi | 2 +- + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 +- + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 2 +- + arch/arm64/boot/dts/hisilicon/hip05-d02.dts | 2 +- + arch/arm64/boot/dts/hisilicon/hip05.dtsi | 2 +- + arch/arm64/boot/dts/hisilicon/hip06-d03.dts | 2 +- + arch/arm64/boot/dts/hisilicon/hip06.dtsi | 2 +- + arch/arm64/boot/dts/hisilicon/hip07-d05.dts | 2 +- + arch/arm64/boot/dts/hisilicon/hip07.dtsi | 2 +- + .../boot/dts/marvell/armada-3720-turris-mox.dts | 6 +- + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 8 + + arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 3 +- + arch/arm64/boot/dts/marvell/cn9130-db.dts | 2 +- + arch/arm64/boot/dts/mediatek/Makefile | 8 + + arch/arm64/boot/dts/mediatek/mt8167.dtsi | 121 + + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 60 +- + arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 5 + + .../dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts | 30 + + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts | 44 + + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts | 32 + + .../dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi | 27 + + .../dts/mediatek/mt8183-kukui-jacuzzi-fennel14.dts | 16 + + .../dts/mediatek/mt8183-kukui-jacuzzi-kappa.dts | 16 + + .../dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts | 12 + + .../mediatek/mt8183-kukui-jacuzzi-willow-sku0.dts | 13 + + .../mediatek/mt8183-kukui-jacuzzi-willow-sku1.dts | 12 + + .../dts/mediatek/mt8183-kukui-jacuzzi-willow.dtsi | 26 + + .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 8 + + .../boot/dts/mediatek/mt8183-kukui-kakadu.dtsi | 4 + + .../boot/dts/mediatek/mt8183-kukui-kodama.dtsi | 4 + + .../boot/dts/mediatek/mt8183-kukui-krane.dtsi | 4 + + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 23 + + arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts | 5 + + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 110 +- + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 4 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 4 +- + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 4 +- + .../arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi | 595 +++- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 100 + + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 4 +- + arch/arm64/boot/dts/qcom/Makefile | 15 +- + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 93 +- + arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 24 +- + arch/arm64/boot/dts/qcom/ipq8074-hk10-c1.dts | 11 + + arch/arm64/boot/dts/qcom/ipq8074-hk10-c2.dts | 10 + + arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi | 76 + + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 20 +- + .../boot/dts/qcom/msm8916-alcatel-idol347.dts | 26 + + arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 454 +++ + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 131 + + .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 47 + + .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 26 + + .../arm64/boot/dts/qcom/msm8994-angler-rev-101.dts | 4 + + arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8996-pins.dtsi | 653 ---- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 999 ++++++- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm6150.dtsi | 24 + + arch/arm64/boot/dts/qcom/pm7325.dtsi | 53 + + arch/arm64/boot/dts/qcom/pm8150.dtsi | 12 +- + arch/arm64/boot/dts/qcom/pm8350c.dtsi | 32 +- + arch/arm64/boot/dts/qcom/pm8994.dtsi | 8 +- + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 13 + + arch/arm64/boot/dts/qcom/pmk8350.dtsi | 51 +- + arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi | 135 + + arch/arm64/boot/dts/qcom/pmm8155au_2.dtsi | 108 + + arch/arm64/boot/dts/qcom/pmr735a.dtsi | 32 +- + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 4 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 98 +- + arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 360 +++ + arch/arm64/boot/dts/qcom/sc7180-idp.dts | 169 +- + .../boot/dts/qcom/sc7180-trogdor-coachz-r1-lte.dts | 4 +- + .../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 22 +- + ...r2-lte.dts => sc7180-trogdor-coachz-r3-lte.dts} | 6 +- + ...-coachz-r2.dts => sc7180-trogdor-coachz-r3.dts} | 4 +- + .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 64 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 9 - + .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 9 - + .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 9 - + arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 9 + + .../boot/dts/qcom/sc7180-trogdor-pompom-r1.dts | 12 + + .../boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts | 4 +- + .../boot/dts/qcom/sc7180-trogdor-pompom-r2.dts | 38 +- + .../boot/dts/qcom/sc7180-trogdor-pompom-r3-lte.dts | 14 + + .../boot/dts/qcom/sc7180-trogdor-pompom-r3.dts | 15 + + .../arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 29 + + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 121 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 142 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dts | 36 +- + arch/arm64/boot/dts/qcom/sc7280.dtsi | 1171 ++++++++ + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 4 - + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 5 + + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 18 + + .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 114 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 2 + + arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 28 +- + .../boot/dts/qcom/sm8150-microsoft-surface-duo.dts | 543 ++++ + arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 28 +- + .../dts/qcom/sm8150-sony-xperia-kumano-bahamut.dts | 19 + + .../dts/qcom/sm8150-sony-xperia-kumano-griffin.dts | 13 + + .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 452 +++ + arch/arm64/boot/dts/qcom/sm8150.dtsi | 78 +- + arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 33 +- + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 10 + + .../dts/qcom/sm8250-sony-xperia-edo-pdx203.dts | 15 + + .../dts/qcom/sm8250-sony-xperia-edo-pdx206.dts | 35 + + .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 636 ++++ + arch/arm64/boot/dts/qcom/sm8250.dtsi | 192 +- + arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 6 + + arch/arm64/boot/dts/qcom/sm8350.dtsi | 64 +- + arch/arm64/boot/dts/renesas/Makefile | 2 + + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 4 +- + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 8 +- + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 8 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 19 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 8 + + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 8 +- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 1 + + .../boot/dts/renesas/r8a779a0-falcon-csi-dsi.dtsi | 21 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 7 +- + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 132 + + arch/arm64/boot/dts/renesas/r9a07g044l1.dtsi | 25 + + arch/arm64/boot/dts/renesas/r9a07g044l2-smarc.dts | 21 + + arch/arm64/boot/dts/renesas/r9a07g044l2.dtsi | 13 + + arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 27 + + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 28 +- + arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 74 +- + arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 37 +- + arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 36 +- + arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 9 +- + arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 7 +- + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 5 + + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 13 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 + + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 162 +- + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 4 +- + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 121 + + arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 1 - + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 16 + + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 1 - + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 66 +- + .../boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 1 - + arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 79 + + arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi | 3111 ++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 593 ++++ + arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi | 344 +++ + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 222 +- + arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi | 6 +- + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 110 +- + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 121 + + arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 63 +- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 37 +- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 2 - + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 2 - + arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts | 5 + + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 49 +- + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 2 +- + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 25 +- + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 6 - + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 62 +- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 126 +- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 4 - + arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts | 8 + + arch/arm64/boot/dts/toshiba/tmpv7708.dtsi | 9 + + arch/arm64/boot/dts/toshiba/tmpv7708_pins.dtsi | 5 + + arch/arm64/configs/defconfig | 17 +- + drivers/ata/Kconfig | 2 +- + drivers/ata/pata_ixp4xx_cf.c | 1 + + drivers/bus/qcom-ebi2.c | 4 +- + drivers/char/hw_random/Kconfig | 2 +- + drivers/char/hw_random/ixp4xx-rng.c | 53 +- + drivers/crypto/ixp4xx_crypto.c | 4 + + drivers/firmware/Kconfig | 3 +- + drivers/firmware/Makefile | 1 + + drivers/firmware/arm_ffa/Kconfig | 21 + + drivers/firmware/arm_ffa/Makefile | 6 + + drivers/firmware/arm_ffa/bus.c | 210 ++ + drivers/firmware/arm_ffa/common.h | 31 + + drivers/firmware/arm_ffa/driver.c | 731 +++++ + drivers/firmware/arm_ffa/smccc.c | 39 + + drivers/firmware/arm_scmi/common.h | 2 +- + drivers/firmware/arm_scmi/driver.c | 24 +- + drivers/firmware/arm_scmi/mailbox.c | 3 + + drivers/firmware/arm_scmi/scmi_pm_domain.c | 26 + + drivers/firmware/arm_scmi/smc.c | 3 + + drivers/firmware/arm_scpi.c | 11 + + drivers/firmware/qcom_scm.c | 3 + + drivers/firmware/tegra/Makefile | 1 + + drivers/firmware/tegra/bpmp-private.h | 3 +- + drivers/firmware/tegra/bpmp-tegra210.c | 2 +- + drivers/firmware/tegra/bpmp.c | 3 +- + drivers/firmware/turris-mox-rwtm.c | 56 +- + drivers/iommu/arm/arm-smmu/arm-smmu-impl.c | 3 +- + drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c | 90 +- + drivers/iommu/tegra-smmu.c | 16 +- + drivers/memory/atmel-ebi.c | 4 +- + drivers/memory/emif.c | 678 ----- + drivers/memory/fsl_ifc.c | 8 +- + drivers/memory/pl353-smc.c | 1 + + drivers/memory/stm32-fmc2-ebi.c | 4 + + drivers/memory/tegra/Kconfig | 18 +- + drivers/memory/tegra/Makefile | 6 +- + drivers/memory/tegra/mc.c | 321 +- + drivers/memory/tegra/mc.h | 25 + + drivers/memory/tegra/tegra114.c | 1245 ++++---- + drivers/memory/tegra/tegra124-emc.c | 8 +- + drivers/memory/tegra/tegra124.c | 1306 ++++---- + drivers/memory/tegra/tegra186.c | 1679 +++-------- + drivers/memory/tegra/tegra194.c | 1351 +++++++++ + drivers/memory/tegra/tegra20-emc.c | 52 +- + drivers/memory/tegra/tegra20.c | 110 +- + drivers/memory/tegra/tegra210-emc-core.c | 4 - + drivers/memory/tegra/tegra210.c | 1433 +++++---- + drivers/memory/tegra/tegra30-emc.c | 56 +- + drivers/memory/tegra/tegra30.c | 1292 ++++---- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 + + drivers/net/ethernet/xscale/ptp_ixp46x.c | 3 +- + drivers/net/wan/ixp4xx_hss.c | 1 + + drivers/pci/controller/Kconfig | 8 + + drivers/pci/controller/Makefile | 1 + + drivers/pci/controller/pci-ixp4xx.c | 671 +++++ + drivers/reset/Kconfig | 17 +- + drivers/reset/Makefile | 1 + + drivers/reset/core.c | 25 +- + drivers/reset/hisilicon/hi6220_reset.c | 2 +- + drivers/reset/reset-a10sr.c | 1 + + drivers/reset/reset-bcm6345.c | 2 +- + drivers/reset/reset-berlin.c | 12 +- + drivers/reset/reset-brcmstb.c | 1 + + drivers/reset/reset-lantiq.c | 2 +- + drivers/reset/reset-microchip-sparx5.c | 146 + + drivers/reset/reset-oxnas.c | 2 +- + drivers/reset/reset-ti-syscon.c | 4 +- + drivers/reset/reset-uniphier.c | 2 +- + drivers/reset/reset-zynqmp.c | 4 +- + drivers/reset/sti/reset-syscfg.c | 2 +- + drivers/soc/amlogic/meson-ee-pwrc.c | 46 +- + drivers/soc/bcm/brcmstb/common.c | 5 - + drivers/soc/imx/gpcv2.c | 634 +++- + drivers/soc/imx/soc-imx.c | 3 + + drivers/soc/ixp4xx/ixp4xx-npe.c | 2 + + drivers/soc/ixp4xx/ixp4xx-qmgr.c | 2 + + drivers/soc/mediatek/mtk-devapc.c | 1 + + drivers/soc/mediatek/mtk-pm-domains.c | 42 +- + drivers/soc/mediatek/mtk-pmic-wrap.c | 35 + + drivers/soc/qcom/rpmhpd.c | 21 + + drivers/soc/qcom/rpmpd.c | 22 + + drivers/soc/qcom/smd-rpm.c | 2 + + drivers/soc/qcom/socinfo.c | 56 +- + drivers/soc/renesas/Kconfig | 5 + + drivers/soc/renesas/renesas-soc.c | 33 +- + drivers/soc/rockchip/pm_domains.c | 252 +- + drivers/soc/tegra/Kconfig | 2 + + drivers/soc/tegra/common.c | 97 + + drivers/soc/tegra/fuse/fuse-tegra.c | 6 +- + drivers/soc/tegra/fuse/fuse-tegra30.c | 3 +- + drivers/soc/tegra/pmc.c | 144 + + drivers/soc/tegra/regulators-tegra20.c | 94 +- + drivers/soc/tegra/regulators-tegra30.c | 93 +- + drivers/soc/ti/smartreflex.c | 4 +- + drivers/soc/ti/wkup_m3_ipc.c | 4 +- + include/dt-bindings/mailbox/qcom-ipcc.h | 1 + + include/dt-bindings/pinctrl/hisi.h | 2 +- + include/dt-bindings/power/imx8mm-power.h | 22 + + include/dt-bindings/power/imx8mn-power.h | 15 + + include/dt-bindings/power/qcom-rpmpd.h | 21 + + include/dt-bindings/power/rk3568-power.h | 32 + + include/linux/arm_ffa.h | 267 ++ + include/linux/platform_data/pata_ixp4xx_cf.h | 21 + + include/linux/reset-controller.h | 22 + + include/linux/soc/ixp4xx/cpu.h | 106 + + include/linux/soc/samsung/exynos-regs-pmu.h | 6 - + include/memory/renesas-rpc-if.h | 6 +- + include/soc/imx/cpu.h | 1 + + include/soc/tegra/common.h | 31 + + include/soc/tegra/fuse.h | 20 +- + include/soc/tegra/mc.h | 65 +- + include/soc/tegra/pmc.h | 7 + + 722 files changed, 34492 insertions(+), 9243 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/rockchip/pmu.txt + create mode 100644 Documentation/devicetree/bindings/arm/rockchip/pmu.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt + create mode 100644 Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra114-car.txt + delete mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-car.txt + create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-car.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt + create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra20-car.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra210-car.txt + delete mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra30-car.txt + create mode 100644 Documentation/devicetree/bindings/pci/intel,ixp4xx-pci.yaml + create mode 100644 Documentation/devicetree/bindings/power/renesas,rzg2l-sysc.yaml + create mode 100644 Documentation/devicetree/bindings/power/rockchip,power-controller.yaml + create mode 100644 Documentation/devicetree/bindings/reset/microchip,rst.yaml + create mode 100644 Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.txt + create mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/rockchip/power_domain.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/aspeed-ast2600-evb-a1.dts + create mode 100644 arch/arm/boot/dts/bcm2711-rpi-400.dts + create mode 100644 arch/arm/boot/dts/bcm2711-rpi.dtsi + create mode 100644 arch/arm/boot/dts/imx28-lwe.dtsi + create mode 100644 arch/arm/boot/dts/imx28-xea.dts + create mode 100644 arch/arm/boot/dts/imx6dl-b105pv2.dts + create mode 100644 arch/arm/boot/dts/imx6dl-b105v2.dts + create mode 100644 arch/arm/boot/dts/imx6dl-b125pv2.dts + create mode 100644 arch/arm/boot/dts/imx6dl-b125v2.dts + create mode 100644 arch/arm/boot/dts/imx6dl-b155v2.dts + create mode 100644 arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-b1x5v2.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-qmx6.dtsi + create mode 100644 arch/arm/boot/dts/imx6q-ds.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-ds.dtsi + create mode 100644 arch/arm/boot/dts/intel-ixp42x-welltech-epbx100.dts + create mode 100644 arch/arm/boot/dts/sun8i-r40-feta40i.dtsi + create mode 100644 arch/arm/boot/dts/sun8i-r40-oka40i-c.dts + delete mode 100644 arch/arm/mach-ixp4xx/include/mach/cpu.h + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw7901.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel14.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-kappa.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow-sku0.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow-sku1.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/ipq8074-hk10-c1.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq8074-hk10-c2.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts + delete mode 100644 arch/arm64/boot/dts/qcom/msm8996-pins.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm7325.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmm8155au_2.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sa8155p-adp.dts + rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-coachz-r2-lte.dts => sc7180-trogdor-coachz-r3-lte.dts} (69%) + rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-coachz-r2.dts => sc7180-trogdor-coachz-r3.dts} (75%) + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8150-microsoft-surface-duo.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano-bahamut.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano-griffin.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx203.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044l1.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044l2-smarc.dts + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044l2.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi + create mode 100644 drivers/firmware/arm_ffa/Kconfig + create mode 100644 drivers/firmware/arm_ffa/Makefile + create mode 100644 drivers/firmware/arm_ffa/bus.c + create mode 100644 drivers/firmware/arm_ffa/common.h + create mode 100644 drivers/firmware/arm_ffa/driver.c + create mode 100644 drivers/firmware/arm_ffa/smccc.c + create mode 100644 drivers/memory/tegra/tegra194.c + create mode 100644 drivers/pci/controller/pci-ixp4xx.c + create mode 100644 drivers/reset/reset-microchip-sparx5.c + create mode 100644 include/dt-bindings/power/imx8mm-power.h + create mode 100644 include/dt-bindings/power/imx8mn-power.h + create mode 100644 include/dt-bindings/power/rk3568-power.h + create mode 100644 include/linux/arm_ffa.h + create mode 100644 include/linux/platform_data/pata_ixp4xx_cf.h + create mode 100644 include/linux/soc/ixp4xx/cpu.h +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge actions/for-next +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (b03485fe99f2 Merge tags 'amlogic-arm64-dt-for-v5.14-v2' and 'amlogic-arm-dt-for-v5.14' into for-next) +$ git merge amlogic/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (cd946cfe2e7e Merge branches 'defconfig-for-v5.14' and 'dt-for-v5.14' into for-next) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. +Merging at91/at91-next (80cbaa6d3450 Merge branches 'at91-dt' and 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging drivers-memory/for-next (316ce128fbbe Merge branch 'for-v5.14/tegra-mc-late-or-fixes' into for-next) +$ git merge drivers-memory/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 6 ++---- + include/soc/tegra/mc.h | 9 +++++++-- + 2 files changed, 9 insertions(+), 6 deletions(-) +Merging imx-mxs/for-next (5004b2d18827 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging keystone/next (9d2e21ed98a2 Merge branch 'for_5.12/drivers-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (a1c8c49de3d7 Merge branch 'v5.13-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (72a0a49b7c77 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (91ee322340fb Merge branch 'omap-for-v5.14/dt' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + drivers/bus/ti-sysc.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) +Merging qcom/for-next (c275bbc84be9 Merge branches 'arm64-defconfig-for-5.14', 'arm64-for-5.14', 'drivers-for-5.14' and 'dts-for-5.14' into for-next) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging raspberrypi/for-next (21c6bf8304f0 arm64: dts: broadcom: Add reference to RPi 400) +$ git merge raspberrypi/for-next +Already up to date. +Merging renesas/next (23df6d1f0971 Merge branches 'renesas-arm-defconfig-for-v5.14', 'renesas-arm-dt-for-v5.14', 'renesas-drivers-for-v5.14' and 'renesas-dt-bindings-for-v5.14' into renesas-next) +$ git merge renesas/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging reset/reset/next (48a74b1147f7 reset: Add compile-test stubs) +$ git merge reset/reset/next +Already up to date. +Merging rockchip/for-next (764f25388c38 Merge branch 'v5.14-clk/next' into for-next) +$ git merge rockchip/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging samsung-krzk/for-next (5ce16705e00d Merge branch 'next/defconfig' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. +Merging scmi/for-linux-next (35ba87e91308 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Merge made by the 'recursive' strategy. + drivers/firmware/arm_ffa/bus.c | 6 +++--- + drivers/firmware/arm_ffa/driver.c | 8 +++++--- + drivers/firmware/arm_scmi/bus.c | 8 +++----- + drivers/firmware/arm_scmi/driver.c | 7 ++++--- + 4 files changed, 15 insertions(+), 14 deletions(-) +Merging stm32/stm32-next (4bf4abe19089 ARM: dts: stm32: fix stpmic node for stm32mp1 boards) +$ git merge stm32/stm32-next +Already up to date. +Merging sunxi/sunxi/for-next (3f1c53207cf0 Merge branches 'sunxi/dt-for-5.14' and 'sunxi/fixes-for-5.13' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (eac9ab885bb5 Merge branch for-5.14/arm64/dt into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) +$ git merge ti-k3/ti-k3-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ti-k3-new/ti-k3-next (d71abfcc6c05 arm64: dts: ti: k3-am642-evm/sk: Add DDR carveout memory nodes for R5Fs) +$ git merge ti-k3-new/ti-k3-next +Already up to date. +Merging xilinx/for-next (d98fb9ab6255 Merge branch 'zynq/dt' into for-next) +$ git merge xilinx/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/zynq-7000.dtsi | 21 +++++++++++++++++++++ + arch/arm/boot/dts/zynq-ebaz4205.dts | 12 ++++++++++++ + arch/arm/configs/multi_v7_defconfig | 1 + + 3 files changed, 34 insertions(+) +Merging clk/clk-next (783d08bd02f5 Revert "clk: divider: Switch from .round_rate to .determine_rate by default") +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + drivers/clk/clk-divider.c | 75 ++++++++++++++++++++++++++++++------- + drivers/clk/clk-k210.c | 1 + + drivers/clk/clk-lmk04832.c | 20 +++++----- + drivers/clk/clk-stm32mp1.c | 1 + + drivers/clk/hisilicon/clk-hi3559a.c | 39 ++++++++++--------- + drivers/clk/meson/clk-regmap.c | 19 +++++----- + include/linux/clk-provider.h | 6 +++ + 7 files changed, 107 insertions(+), 54 deletions(-) +Merging clk-imx/for-next (c586f53ae159 clk: imx8mq: remove SYS PLL 1/2 clock gates) +$ git merge clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (2cd1e3883a57 clk: renesas: rzg2l: Fix off-by-one check in rzg2l_cpg_clk_src_twocell_get()) +$ git merge clk-renesas/renesas-clk +Merge made by the 'recursive' strategy. + drivers/clk/renesas/renesas-rzg2l-cpg.c | 20 ++++++-------------- + 1 file changed, 6 insertions(+), 14 deletions(-) +Merging clk-samsung/for-next (a38fd8748464 Linux 5.12-rc2) +$ git merge clk-samsung/for-next +Already up to date. +Merging csky/linux-next (90dc8c0e664e csky: Kconfig: Remove unused selects) +$ git merge csky/linux-next +Already up to date. +Merging h8300/h8300-next (6e5e55227c95 Merge tag 'v5.11' into h8300-next) +$ git merge h8300/h8300-next +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging arch/h8300/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/boot/dts/h8300h_sim.dts | 2 +- + arch/h8300/boot/dts/h8s_sim.dts | 2 +- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/kernel/setup.c | 2 +- + arch/h8300/lib/memset.S | 17 +++++---- + drivers/clocksource/h8300_timer8.c | 20 +++++----- + drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++- + drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++-------- + drivers/net/ethernet/smsc/Kconfig | 1 - + drivers/net/ethernet/smsc/smc91x.c | 10 +++++ + drivers/tty/serial/sh-sci.c | 5 +-- + 15 files changed, 123 insertions(+), 62 deletions(-) +Merging m68k/for-next (c1367ee016e3 m68k: atari: Fix ATARI_KBD_CORE kconfig unmet dependency warning) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (3f605ee17f8e m68knommu: fix missing LCD splash screen data initializer) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (14a832498c23 arch: microblaze: Fix spelling mistake "vesion" -> "version") +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (97e488073cfc mips: disable branch profiling in boot/decompress.o) +$ git merge mips/mips-next +Merge made by the 'recursive' strategy. + arch/mips/boot/compressed/Makefile | 4 ++-- + arch/mips/boot/compressed/decompress.c | 2 ++ + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging nds32/next (40e0dd851e7b nds32: Fix bogus reference to <asm/procinfo.h>) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (ad4e600cbf89 drivers/soc/litex: remove 8-bit subregister option) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (ca2b19a4bdb6 parisc: Increase gcc stack frame check to 2048 for 32- and 64-bit) +$ git merge parisc-hd/for-next +Auto-merging lib/Kconfig.debug +Merge made by the 'recursive' strategy. + drivers/parisc/led.c | 4 ++-- + lib/Kconfig.debug | 5 ++--- + 2 files changed, 4 insertions(+), 5 deletions(-) +Merging powerpc/next (019b3fd94ba7 Merge tag 'powerpc-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge powerpc/next +Already up to date. +Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM driver) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (7761e36bc722 riscv: Fix PTDUMP output now BPF region moved back to module region) +$ git merge risc-v/for-next +Auto-merging arch/riscv/kernel/traps.c +Auto-merging arch/riscv/kernel/setup.c +Auto-merging arch/riscv/kernel/probes/kprobes.c +Auto-merging arch/riscv/kernel/machine_kexec.c +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/include/asm/io.h +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Resolved 'arch/riscv/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 65c351eef4f6] Merge remote-tracking branch 'risc-v/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/riscv/Kconfig | 12 +- + arch/riscv/include/asm/asm-prototypes.h | 3 + + arch/riscv/include/asm/io.h | 13 -- + arch/riscv/include/asm/kfence.h | 63 +++++++ + arch/riscv/include/asm/kprobes.h | 7 - + arch/riscv/include/asm/mmu_context.h | 2 + + arch/riscv/include/asm/page.h | 81 +++++---- + arch/riscv/include/asm/pci.h | 2 + + arch/riscv/include/asm/pgtable-64.h | 5 +- + arch/riscv/include/asm/pgtable-bits.h | 5 + + arch/riscv/include/asm/pgtable.h | 171 ++++++++++++++++++- + arch/riscv/include/asm/ptrace.h | 31 ++++ + arch/riscv/include/asm/sections.h | 17 ++ + arch/riscv/include/asm/set_memory.h | 24 ++- + arch/riscv/include/asm/switch_to.h | 11 +- + arch/riscv/include/asm/thread_info.h | 15 ++ + arch/riscv/include/asm/tlbflush.h | 5 + + arch/riscv/kernel/asm-offsets.c | 2 + + arch/riscv/kernel/cpufeature.c | 6 +- + arch/riscv/kernel/entry.S | 108 ++++++++++++ + arch/riscv/kernel/head.S | 4 +- + arch/riscv/kernel/kexec_relocate.S | 4 +- + arch/riscv/kernel/machine_kexec.c | 2 +- + arch/riscv/kernel/probes/kprobes.c | 40 +---- + arch/riscv/kernel/process.c | 2 +- + arch/riscv/kernel/setup.c | 18 +- + arch/riscv/kernel/signal.c | 4 +- + arch/riscv/kernel/traps.c | 35 ++++ + arch/riscv/kernel/vmlinux.lds.S | 2 +- + arch/riscv/lib/uaccess.S | 181 ++++++++++++++++---- + arch/riscv/mm/context.c | 14 +- + arch/riscv/mm/fault.c | 11 +- + arch/riscv/mm/init.c | 283 +++++++++++++++----------------- + arch/riscv/mm/physaddr.c | 2 +- + arch/riscv/mm/ptdump.c | 6 +- + arch/riscv/mm/tlbflush.c | 69 ++++++-- + 36 files changed, 901 insertions(+), 359 deletions(-) + create mode 100644 arch/riscv/include/asm/kfence.h +Merging s390/for-next (bd39654a2282 s390/AP: support new dynamic AP bus size limit) +$ git merge s390/for-next +Removing arch/s390/kernel/perf_cpum_cf_diag.c +Merge made by the 'recursive' strategy. + arch/s390/boot/startup.c | 1 + + arch/s390/boot/uv.c | 1 + + arch/s390/include/asm/cpu_mcf.h | 36 +- + arch/s390/include/asm/ctl_reg.h | 2 - + arch/s390/include/asm/nmi.h | 6 +- + arch/s390/include/asm/setup.h | 2 + + arch/s390/include/asm/uv.h | 8 +- + arch/s390/kernel/Makefile | 1 - + arch/s390/kernel/asm-offsets.c | 6 - + arch/s390/kernel/early.c | 4 +- + arch/s390/kernel/entry.S | 141 ++-- + arch/s390/kernel/kprobes.c | 9 +- + arch/s390/kernel/nmi.c | 129 ++-- + arch/s390/kernel/perf_cpum_cf.c | 1026 +++++++++++++++++++++++++++- + arch/s390/kernel/perf_cpum_cf_common.c | 27 +- + arch/s390/kernel/perf_cpum_cf_diag.c | 1148 -------------------------------- + arch/s390/kernel/uv.c | 10 + + arch/s390/lib/string.c | 2 +- + arch/s390/lib/uaccess.c | 2 +- + arch/s390/mm/fault.c | 26 + + drivers/s390/crypto/ap_bus.c | 50 +- + drivers/s390/crypto/ap_bus.h | 11 +- + drivers/s390/crypto/ap_card.c | 16 +- + drivers/s390/crypto/ap_queue.c | 2 +- + drivers/s390/crypto/zcrypt_api.c | 6 + + drivers/s390/crypto/zcrypt_cex4.c | 9 +- + drivers/s390/crypto/zcrypt_msgtype50.c | 26 +- + drivers/s390/crypto/zcrypt_msgtype6.c | 54 +- + drivers/s390/crypto/zcrypt_msgtype6.h | 2 - + drivers/s390/crypto/zcrypt_queue.c | 6 +- + include/linux/cpuhotplug.h | 1 - + 31 files changed, 1344 insertions(+), 1426 deletions(-) + delete mode 100644 arch/s390/kernel/perf_cpum_cf_diag.c +Merging sh/for-next (2882b7626f49 sh: kernel: traps: remove unused variable) +$ git merge sh/for-next +Auto-merging drivers/sh/maple/maple.c +Merge made by the 'recursive' strategy. + arch/sh/boards/mach-landisk/irq.c | 4 ++-- + arch/sh/boot/Makefile | 4 ++-- + arch/sh/boot/compressed/.gitignore | 5 ----- + arch/sh/boot/compressed/Makefile | 32 +++++++++++++------------------- + arch/sh/boot/compressed/ashiftrt.S | 2 ++ + arch/sh/boot/compressed/ashldi3.c | 2 ++ + arch/sh/boot/compressed/ashlsi3.S | 2 ++ + arch/sh/boot/compressed/ashrsi3.S | 2 ++ + arch/sh/boot/compressed/lshrsi3.S | 2 ++ + arch/sh/include/asm/checksum_32.h | 5 +++-- + arch/sh/include/asm/uaccess.h | 4 ++-- + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 +++-- + arch/sh/kernel/crash_dump.c | 4 ++-- + arch/sh/kernel/traps_32.c | 8 ++++---- + arch/sh/math-emu/math.c | 4 ++-- + arch/sh/mm/nommu.c | 4 ++-- + drivers/sh/maple/maple.c | 5 ++++- + 17 files changed, 49 insertions(+), 45 deletions(-) + create mode 100644 arch/sh/boot/compressed/ashiftrt.S + create mode 100644 arch/sh/boot/compressed/ashldi3.c + create mode 100644 arch/sh/boot/compressed/ashlsi3.S + create mode 100644 arch/sh/boot/compressed/ashrsi3.S + create mode 100644 arch/sh/boot/compressed/lshrsi3.S +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge sparc-next/master +Already up to date. +Merging uml/linux-next (1aee020155f3 um: remove unneeded semicolon in um_arch.c) +$ git merge uml/linux-next +Auto-merging lib/Makefile +Auto-merging drivers/tty/Kconfig +Auto-merging drivers/input/joystick/Kconfig +Auto-merging arch/um/kernel/um_arch.c +Merge made by the 'recursive' strategy. + arch/um/Kconfig | 33 +- + arch/um/Makefile | 3 +- + arch/um/drivers/Kconfig | 20 + + arch/um/drivers/Makefile | 1 + + arch/um/drivers/chan_user.c | 3 +- + arch/um/drivers/slip_user.c | 3 +- + arch/um/drivers/ubd_kern.c | 3 +- + arch/um/drivers/virt-pci.c | 895 ++++++++++++++++++++++++++++++++ + arch/um/drivers/virtio_uml.c | 40 +- + arch/um/include/asm/Kbuild | 4 +- + arch/um/include/asm/cacheflush.h | 9 + + arch/um/include/asm/cpufeature.h | 157 ++++++ + arch/um/include/asm/fpu/api.h | 20 + + arch/um/include/asm/futex.h | 14 + + arch/um/include/asm/io.h | 7 + + arch/um/include/asm/irq.h | 8 +- + arch/um/include/asm/irqflags.h | 10 +- + arch/um/include/asm/msi.h | 1 + + arch/um/include/asm/pci.h | 39 ++ + arch/um/include/asm/processor-generic.h | 8 + + arch/um/include/asm/tlb.h | 2 +- + arch/um/include/asm/xor.h | 17 +- + arch/um/include/linux/time-internal.h | 12 +- + arch/um/include/linux/virtio-uml.h | 13 + + arch/um/include/shared/irq_user.h | 1 + + arch/um/include/shared/kern_util.h | 1 - + arch/um/include/shared/longjmp.h | 14 +- + arch/um/include/shared/os.h | 8 +- + arch/um/include/shared/timetravel.h | 22 + + arch/um/kernel/Makefile | 14 +- + arch/um/kernel/ioport.c | 13 + + arch/um/kernel/irq.c | 52 +- + arch/um/kernel/ksyms.c | 2 +- + arch/um/kernel/skas/clone.c | 2 +- + arch/um/kernel/skas/uaccess.c | 136 +++++ + arch/um/kernel/time.c | 35 +- + arch/um/kernel/um_arch.c | 48 +- + arch/um/os-Linux/helper.c | 4 +- + arch/um/os-Linux/signal.c | 64 ++- + arch/um/os-Linux/skas/process.c | 2 +- + arch/um/os-Linux/start_up.c | 32 ++ + arch/x86/Makefile.um | 2 +- + drivers/input/Kconfig | 1 - + drivers/input/gameport/Kconfig | 1 + + drivers/input/joystick/Kconfig | 1 + + drivers/tty/Kconfig | 5 +- + drivers/video/console/Kconfig | 2 +- + include/asm-generic/logic_io.h | 78 +++ + include/linux/logic_iomem.h | 62 +++ + include/uapi/linux/virtio_pcidev.h | 64 +++ + lib/Kconfig | 14 + + lib/Makefile | 2 + + lib/logic_iomem.c | 318 ++++++++++++ + 53 files changed, 2211 insertions(+), 111 deletions(-) + create mode 100644 arch/um/drivers/virt-pci.c + create mode 100644 arch/um/include/asm/cacheflush.h + create mode 100644 arch/um/include/asm/cpufeature.h + create mode 100644 arch/um/include/asm/fpu/api.h + create mode 100644 arch/um/include/asm/futex.h + create mode 100644 arch/um/include/asm/msi.h + create mode 100644 arch/um/include/asm/pci.h + create mode 100644 arch/um/include/linux/virtio-uml.h + create mode 100644 arch/um/include/shared/timetravel.h + create mode 100644 arch/um/kernel/ioport.c + create mode 100644 include/asm-generic/logic_io.h + create mode 100644 include/linux/logic_iomem.h + create mode 100644 include/uapi/linux/virtio_pcidev.h + create mode 100644 lib/logic_iomem.c +Merging xtensa/xtensa-for-next (21e0c3d5f633 xtensa: fix kconfig unmet dependency warning for HAVE_FUTEX_CMPXCHG) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging pidfd/for-next (5ddf9602d711 Merge branch 'fs.mount_setattr.nosymfollow' into for-next) +$ git merge pidfd/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging fscrypt/master (2fc2b430f559 fscrypt: fix derivation of SipHash keys on big endian CPUs) +$ git merge fscrypt/master +Already up to date. +Merging fscache/fscache-next (18d5803bc50e fscache: Use refcount_t for the cookie refcount instead of atomic_t) +$ git merge fscache/fscache-next +Removing fs/fscache/object-list.c +Removing fs/fscache/histogram.c +Removing fs/cachefiles/proc.c +Merge made by the 'recursive' strategy. + fs/cachefiles/Kconfig | 19 -- + fs/cachefiles/Makefile | 2 - + fs/cachefiles/bind.c | 2 - + fs/cachefiles/interface.c | 6 +- + fs/cachefiles/internal.h | 25 --- + fs/cachefiles/io.c | 6 +- + fs/cachefiles/key.c | 2 +- + fs/cachefiles/main.c | 7 - + fs/cachefiles/namei.c | 61 ++---- + fs/cachefiles/proc.c | 114 ----------- + fs/cachefiles/xattr.c | 4 +- + fs/fscache/Kconfig | 25 +-- + fs/fscache/Makefile | 2 - + fs/fscache/cache.c | 11 +- + fs/fscache/cookie.c | 201 +++++++++++++----- + fs/fscache/fsdef.c | 3 +- + fs/fscache/histogram.c | 87 -------- + fs/fscache/internal.h | 57 ++---- + fs/fscache/main.c | 39 ++++ + fs/fscache/netfs.c | 2 +- + fs/fscache/object-list.c | 414 -------------------------------------- + fs/fscache/object.c | 8 - + fs/fscache/operation.c | 3 - + fs/fscache/page.c | 6 - + fs/fscache/proc.c | 20 +- + include/linux/fscache-cache.h | 4 - + include/linux/fscache.h | 4 +- + include/linux/netfs.h | 2 +- + include/trace/events/cachefiles.h | 68 +++---- + include/trace/events/fscache.h | 160 +++++++-------- + include/trace/events/netfs.h | 2 +- + 31 files changed, 368 insertions(+), 998 deletions(-) + delete mode 100644 fs/cachefiles/proc.c + delete mode 100644 fs/fscache/histogram.c + delete mode 100644 fs/fscache/object-list.c +Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build") +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (808c6838dfee Merge branch 'for-next-current-v5.12-20210624' into for-next-20210624) +$ git merge btrfs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ceph/master (4c18347238ab ceph: take reference to req->r_parent at point of assignment) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/addr.c | 26 +++---- + fs/ceph/caps.c | 125 +++++++-------------------------- + fs/ceph/debugfs.c | 37 ++++++++-- + fs/ceph/dir.c | 16 +++-- + fs/ceph/export.c | 1 + + fs/ceph/file.c | 24 +++---- + fs/ceph/inode.c | 38 ++--------- + fs/ceph/mds_client.c | 54 ++++++--------- + fs/ceph/mds_client.h | 6 +- + fs/ceph/metric.c | 167 +++++++++++++++++++++++++++++---------------- + fs/ceph/metric.h | 89 +++++++++++------------- + fs/ceph/quota.c | 9 +-- + fs/ceph/snap.c | 45 ++++++------ + fs/ceph/super.h | 3 - + net/ceph/auth.c | 7 +- + net/ceph/auth_none.c | 4 +- + net/ceph/auth_none.h | 1 - + net/ceph/cls_lock_client.c | 12 +++- + 18 files changed, 312 insertions(+), 352 deletions(-) +Merging cifs/for-next (d4dc277c480c CIFS: Clarify SMB1 code for POSIX Lock) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsglob.h | 3 ++- + fs/cifs/cifspdu.h | 1 + + fs/cifs/cifssmb.c | 24 ++++++++++++++---------- + fs/cifs/connect.c | 5 +++++ + fs/cifs/smb2pdu.h | 2 +- + fs/cifs/transport.c | 2 ++ + 6 files changed, 25 insertions(+), 12 deletions(-) +Merging cifsd/cifsd-for-next (db0e04ad42bb Merge pull request #58 from namjaejeon/cifsd-for-next) +$ git merge cifsd/cifsd-for-next +Auto-merging fs/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/filesystems/index.rst +Merge made by the 'recursive' strategy. + Documentation/filesystems/cifs/index.rst | 10 + + Documentation/filesystems/cifs/ksmbd.rst | 164 + + Documentation/filesystems/index.rst | 2 +- + MAINTAINERS | 11 +- + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/ksmbd/Kconfig | 69 + + fs/ksmbd/Makefile | 20 + + fs/ksmbd/asn1.c | 343 ++ + fs/ksmbd/asn1.h | 21 + + fs/ksmbd/auth.c | 1364 +++++ + fs/ksmbd/auth.h | 67 + + fs/ksmbd/connection.c | 409 ++ + fs/ksmbd/connection.h | 205 + + fs/ksmbd/crypto_ctx.c | 282 + + fs/ksmbd/crypto_ctx.h | 74 + + fs/ksmbd/glob.h | 49 + + fs/ksmbd/ksmbd_netlink.h | 395 ++ + fs/ksmbd/ksmbd_spnego_negtokeninit.asn1 | 31 + + fs/ksmbd/ksmbd_spnego_negtokentarg.asn1 | 19 + + fs/ksmbd/ksmbd_work.c | 80 + + fs/ksmbd/ksmbd_work.h | 117 + + fs/ksmbd/mgmt/ksmbd_ida.c | 46 + + fs/ksmbd/mgmt/ksmbd_ida.h | 34 + + fs/ksmbd/mgmt/share_config.c | 238 + + fs/ksmbd/mgmt/share_config.h | 81 + + fs/ksmbd/mgmt/tree_connect.c | 121 + + fs/ksmbd/mgmt/tree_connect.h | 56 + + fs/ksmbd/mgmt/user_config.c | 69 + + fs/ksmbd/mgmt/user_config.h | 66 + + fs/ksmbd/mgmt/user_session.c | 369 ++ + fs/ksmbd/mgmt/user_session.h | 106 + + fs/ksmbd/misc.c | 338 ++ + fs/ksmbd/misc.h | 35 + + fs/ksmbd/ndr.c | 338 ++ + fs/ksmbd/ndr.h | 22 + + fs/ksmbd/nterr.h | 543 ++ + fs/ksmbd/ntlmssp.h | 169 + + fs/ksmbd/oplock.c | 1708 ++++++ + fs/ksmbd/oplock.h | 131 + + fs/ksmbd/server.c | 633 +++ + fs/ksmbd/server.h | 70 + + fs/ksmbd/smb2misc.c | 433 ++ + fs/ksmbd/smb2ops.c | 308 ++ + fs/ksmbd/smb2pdu.c | 8290 ++++++++++++++++++++++++++++++ + fs/ksmbd/smb2pdu.h | 1684 ++++++ + fs/ksmbd/smb_common.c | 657 +++ + fs/ksmbd/smb_common.h | 545 ++ + fs/ksmbd/smbacl.c | 1339 +++++ + fs/ksmbd/smbacl.h | 212 + + fs/ksmbd/smbfsctl.h | 91 + + fs/ksmbd/smbstatus.h | 1822 +++++++ + fs/ksmbd/transport_ipc.c | 874 ++++ + fs/ksmbd/transport_ipc.h | 47 + + fs/ksmbd/transport_rdma.c | 2045 ++++++++ + fs/ksmbd/transport_rdma.h | 61 + + fs/ksmbd/transport_tcp.c | 619 +++ + fs/ksmbd/transport_tcp.h | 13 + + fs/ksmbd/unicode.c | 384 ++ + fs/ksmbd/unicode.h | 357 ++ + fs/ksmbd/uniupr.h | 268 + + fs/ksmbd/vfs.c | 1898 +++++++ + fs/ksmbd/vfs.h | 197 + + fs/ksmbd/vfs_cache.c | 709 +++ + fs/ksmbd/vfs_cache.h | 178 + + fs/ksmbd/xattr.h | 122 + + 66 files changed, 32058 insertions(+), 2 deletions(-) + create mode 100644 Documentation/filesystems/cifs/index.rst + create mode 100644 Documentation/filesystems/cifs/ksmbd.rst + create mode 100644 fs/ksmbd/Kconfig + create mode 100644 fs/ksmbd/Makefile + create mode 100644 fs/ksmbd/asn1.c + create mode 100644 fs/ksmbd/asn1.h + create mode 100644 fs/ksmbd/auth.c + create mode 100644 fs/ksmbd/auth.h + create mode 100644 fs/ksmbd/connection.c + create mode 100644 fs/ksmbd/connection.h + create mode 100644 fs/ksmbd/crypto_ctx.c + create mode 100644 fs/ksmbd/crypto_ctx.h + create mode 100644 fs/ksmbd/glob.h + create mode 100644 fs/ksmbd/ksmbd_netlink.h + create mode 100644 fs/ksmbd/ksmbd_spnego_negtokeninit.asn1 + create mode 100644 fs/ksmbd/ksmbd_spnego_negtokentarg.asn1 + create mode 100644 fs/ksmbd/ksmbd_work.c + create mode 100644 fs/ksmbd/ksmbd_work.h + create mode 100644 fs/ksmbd/mgmt/ksmbd_ida.c + create mode 100644 fs/ksmbd/mgmt/ksmbd_ida.h + create mode 100644 fs/ksmbd/mgmt/share_config.c + create mode 100644 fs/ksmbd/mgmt/share_config.h + create mode 100644 fs/ksmbd/mgmt/tree_connect.c + create mode 100644 fs/ksmbd/mgmt/tree_connect.h + create mode 100644 fs/ksmbd/mgmt/user_config.c + create mode 100644 fs/ksmbd/mgmt/user_config.h + create mode 100644 fs/ksmbd/mgmt/user_session.c + create mode 100644 fs/ksmbd/mgmt/user_session.h + create mode 100644 fs/ksmbd/misc.c + create mode 100644 fs/ksmbd/misc.h + create mode 100644 fs/ksmbd/ndr.c + create mode 100644 fs/ksmbd/ndr.h + create mode 100644 fs/ksmbd/nterr.h + create mode 100644 fs/ksmbd/ntlmssp.h + create mode 100644 fs/ksmbd/oplock.c + create mode 100644 fs/ksmbd/oplock.h + create mode 100644 fs/ksmbd/server.c + create mode 100644 fs/ksmbd/server.h + create mode 100644 fs/ksmbd/smb2misc.c + create mode 100644 fs/ksmbd/smb2ops.c + create mode 100644 fs/ksmbd/smb2pdu.c + create mode 100644 fs/ksmbd/smb2pdu.h + create mode 100644 fs/ksmbd/smb_common.c + create mode 100644 fs/ksmbd/smb_common.h + create mode 100644 fs/ksmbd/smbacl.c + create mode 100644 fs/ksmbd/smbacl.h + create mode 100644 fs/ksmbd/smbfsctl.h + create mode 100644 fs/ksmbd/smbstatus.h + create mode 100644 fs/ksmbd/transport_ipc.c + create mode 100644 fs/ksmbd/transport_ipc.h + create mode 100644 fs/ksmbd/transport_rdma.c + create mode 100644 fs/ksmbd/transport_rdma.h + create mode 100644 fs/ksmbd/transport_tcp.c + create mode 100644 fs/ksmbd/transport_tcp.h + create mode 100644 fs/ksmbd/unicode.c + create mode 100644 fs/ksmbd/unicode.h + create mode 100644 fs/ksmbd/uniupr.h + create mode 100644 fs/ksmbd/vfs.c + create mode 100644 fs/ksmbd/vfs.h + create mode 100644 fs/ksmbd/vfs_cache.c + create mode 100644 fs/ksmbd/vfs_cache.h + create mode 100644 fs/ksmbd/xattr.h +Merging configfs/for-next (c886fa3cf6ff configfs: simplify configfs_release_bin_file) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) +$ git merge ecryptfs/next +Already up to date. +Merging erofs/dev (8215d5b7f15f MAINTAINERS: erofs: update my email address) +$ git merge erofs/dev +Already up to date. +Merging exfat/dev (1e5654de0f51 exfat: handle wrong stream entry size in exfat_readdir()) +$ git merge exfat/dev +Already up to date. +Merging ext3/for_next (5fd541e3a933 Pull writeback memcg fix from Munchun Song) +$ git merge ext3/for_next +Auto-merging mm/truncate.c +Auto-merging mm/shmem.c +Auto-merging mm/rmap.c +Auto-merging mm/memory-failure.c +Auto-merging mm/madvise.c +Auto-merging mm/filemap.c +Auto-merging include/linux/fs.h +Auto-merging fs/zonefs/super.c +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_inode.h +Auto-merging fs/xfs/xfs_inode.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_bmap_util.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/fuse/fuse_i.h +Auto-merging fs/fuse/file.c +Auto-merging fs/fuse/dir.c +Auto-merging fs/fuse/dax.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/ioctl.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/extents.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext2/inode.c +Auto-merging fs/cifs/smb2ops.c +Auto-merging fs/ceph/file.c +Auto-merging fs/ceph/addr.c +Auto-merging Documentation/filesystems/locking.rst +Merge made by the 'recursive' strategy. + Documentation/filesystems/locking.rst | 77 +++++++++++++++------- + fs/ceph/addr.c | 9 ++- + fs/ceph/file.c | 2 + + fs/cifs/smb2ops.c | 2 + + fs/ext2/ext2.h | 11 ---- + fs/ext2/file.c | 7 +- + fs/ext2/inode.c | 12 ++-- + fs/ext2/super.c | 3 - + fs/ext4/ext4.h | 10 --- + fs/ext4/extents.c | 25 +++---- + fs/ext4/file.c | 13 ++-- + fs/ext4/inode.c | 47 +++++-------- + fs/ext4/ioctl.c | 4 +- + fs/ext4/super.c | 13 ++-- + fs/ext4/truncate.h | 8 ++- + fs/f2fs/data.c | 4 +- + fs/f2fs/f2fs.h | 1 - + fs/f2fs/file.c | 62 +++++++++-------- + fs/f2fs/super.c | 1 - + fs/fuse/dax.c | 50 +++++++------- + fs/fuse/dir.c | 11 ++-- + fs/fuse/file.c | 10 +-- + fs/fuse/fuse_i.h | 7 -- + fs/fuse/inode.c | 1 - + fs/inode.c | 2 + + fs/xfs/xfs_bmap_util.c | 15 +++-- + fs/xfs/xfs_file.c | 13 ++-- + fs/xfs/xfs_inode.c | 121 ++++++++++++++++++---------------- + fs/xfs/xfs_inode.h | 3 +- + fs/xfs/xfs_super.c | 2 - + fs/zonefs/super.c | 23 ++----- + fs/zonefs/zonefs.h | 7 +- + include/linux/fs.h | 39 +++++++++++ + mm/filemap.c | 113 ++++++++++++++++++++++++++----- + mm/madvise.c | 2 +- + mm/memory-failure.c | 2 +- + mm/readahead.c | 2 + + mm/rmap.c | 41 ++++++------ + mm/shmem.c | 20 +++--- + mm/truncate.c | 9 +-- + 40 files changed, 453 insertions(+), 351 deletions(-) +Merging ext4/dev (1a40ce3dd853 ext4: inline jbd2_journal_[un]register_shrinker()) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/ioctl.c +Merge made by the 'recursive' strategy. + fs/ext4/ext4_jbd2.c | 2 +- + fs/ext4/ioctl.c | 16 +++++- + fs/ext4/mballoc.c | 9 ++-- + fs/ext4/mmp.c | 31 +++++------ + fs/ext4/resize.c | 4 -- + fs/ext4/super.c | 26 +++++---- + fs/jbd2/checkpoint.c | 4 +- + fs/jbd2/journal.c | 149 +++++++++++++++++++++------------------------------ + include/linux/jbd2.h | 6 +-- + 9 files changed, 114 insertions(+), 133 deletions(-) +Merging f2fs/dev (28607bf3aa6f f2fs: drop dirty node pages when cp is in error status) +$ git merge f2fs/dev +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/data.c +Auto-merging MAINTAINERS +Auto-merging Documentation/ABI/testing/sysfs-fs-f2fs +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 57 ++++- + Documentation/filesystems/f2fs.rst | 50 ++++- + MAINTAINERS | 2 +- + fs/f2fs/checkpoint.c | 4 +- + fs/f2fs/compress.c | 255 +++++++++++++++++----- + fs/f2fs/data.c | 360 ++++++++++++++------------------ + fs/f2fs/debug.c | 13 ++ + fs/f2fs/dir.c | 25 ++- + fs/f2fs/f2fs.h | 228 ++++++++++++++++---- + fs/f2fs/file.c | 37 ++-- + fs/f2fs/gc.c | 16 +- + fs/f2fs/inline.c | 4 +- + fs/f2fs/inode.c | 23 +- + fs/f2fs/namei.c | 36 +++- + fs/f2fs/node.c | 35 ++-- + fs/f2fs/node.h | 33 +-- + fs/f2fs/recovery.c | 29 ++- + fs/f2fs/segment.c | 34 ++- + fs/f2fs/super.c | 188 ++++++++++++++++- + fs/f2fs/sysfs.c | 232 +++++++++++++++----- + include/linux/f2fs_fs.h | 2 + + 21 files changed, 1168 insertions(+), 495 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-f2fs-Convert-to-using-invalidate_lock.patch +Applying: fix up for "f2fs: Convert to using invalidate_lock" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/f2fs/data.c +$ git add -A . +$ git commit -v -a --amend +[master 68cc5fb2e0ef] Merge remote-tracking branch 'f2fs/dev' + Date: Thu Jul 8 09:40:00 2021 +1000 +Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (c4e0cd4e0c16 virtiofs: Fix spelling mistakes) +$ git merge fuse/for-next +Already up to date. +Merging gfs2/for-next (41e5ef8ed733 gfs2: Add wrapper for iomap_file_buffered_write) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/file.c | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) +Merging jfs/jfs-next (5d299f44d765 jfs: Avoid field-overflowing memcpy()) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (2512f47b8bd8 Merge part 2 of branch 'sysfs-devel') +$ git merge nfs/linux-next +Auto-merging net/sunrpc/xprtmultipath.c +Merge made by the 'recursive' strategy. + fs/nfs/delegation.c | 94 ++++-- + fs/nfs/delegation.h | 1 + + fs/nfs/direct.c | 17 +- + fs/nfs/fscache.c | 18 +- + fs/nfs/getroot.c | 12 +- + fs/nfs/inode.c | 61 ++-- + fs/nfs/nfs3proc.c | 4 +- + fs/nfs/nfs4_fs.h | 4 +- + fs/nfs/nfs4client.c | 82 ++--- + fs/nfs/nfs4file.c | 8 +- + fs/nfs/nfs4proc.c | 114 +++++-- + fs/nfs/pagelist.c | 8 +- + fs/nfs/pnfs.c | 68 ++-- + fs/nfs/pnfs_nfs.c | 54 ++-- + fs/nfs/read.c | 20 +- + fs/nfs/write.c | 6 +- + include/linux/nfs_fs.h | 1 + + include/linux/nfs_xdr.h | 1 + + include/linux/sunrpc/clnt.h | 2 + + include/linux/sunrpc/sched.h | 2 + + include/linux/sunrpc/xprt.h | 10 + + include/linux/sunrpc/xprtmultipath.h | 6 + + include/linux/sunrpc/xprtsock.h | 1 + + net/sunrpc/Makefile | 2 +- + net/sunrpc/clnt.c | 30 ++ + net/sunrpc/sched.c | 12 +- + net/sunrpc/sunrpc_syms.c | 10 + + net/sunrpc/sysfs.c | 588 +++++++++++++++++++++++++++++++++++ + net/sunrpc/sysfs.h | 42 +++ + net/sunrpc/xdr.c | 7 +- + net/sunrpc/xprt.c | 30 +- + net/sunrpc/xprtmultipath.c | 38 ++- + net/sunrpc/xprtrdma/transport.c | 2 + + net/sunrpc/xprtsock.c | 19 +- + 34 files changed, 1140 insertions(+), 234 deletions(-) + create mode 100644 net/sunrpc/sysfs.c + create mode 100644 net/sunrpc/sysfs.h +Merging nfs-anna/linux-next (4f8be1f53bf6 nfs: we don't support removing system.nfs4_acl) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (ab1016d39cc0 nfsd: fix NULL dereference in nfs3svc_encode_getaclres) +$ git merge nfsd/nfsd-next +Already up to date. +Merging cel/for-next (b9f83ffaa0c0 SUNRPC: Fix null pointer dereference in svc_rqst_free()) +$ git merge cel/for-next +Already up to date. +Merging orangefs/for-next (0fdec1b3c9fb orangefs: fix orangefs df output.) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (5e717c6fa41f ovl: add debug print to ovl_do_getxattr()) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (a801fcfeef96 ubifs: Set/Clear I_LINKABLE under i_lock for whiteout inode) +$ git merge ubifs/next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/debug.c | 2 +- + fs/ubifs/debug.c | 2 +- + fs/ubifs/dir.c | 7 +++++++ + fs/ubifs/journal.c | 3 ++- + fs/ubifs/master.c | 2 +- + fs/ubifs/replay.c | 2 +- + fs/ubifs/super.c | 3 ++- + fs/ubifs/tnc_commit.c | 2 +- + fs/ubifs/ubifs.h | 4 +++- + fs/ubifs/xattr.c | 48 +++++++++++++++++++++++++++++++++--------------- + 10 files changed, 52 insertions(+), 23 deletions(-) +Merging v9fs/9p-next (cba7dcd8878e 9p/trans_virtio: Remove sysfs file on probe failure) +$ git merge v9fs/9p-next +Auto-merging net/9p/trans_virtio.c +Merge made by the 'recursive' strategy. + net/9p/trans_virtio.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging xfs/for-next (1effb72a8179 xfs: don't wait on future iclogs when pushing the CIL) +$ git merge xfs/for-next +Already up to date. +Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check) +$ git merge zonefs/for-next +Auto-merging fs/zonefs/super.c +Merge made by the 'recursive' strategy. + fs/zonefs/super.c | 3 --- + 1 file changed, 3 deletions(-) +Merging iomap/iomap-for-next (6e552494fb90 iomap: remove unused private field from ioend) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (e1cc6e8c1969 fcntl: fix potential deadlock for &fasync_struct.fa_lock) +$ git merge file-locks/locks-next +Merge made by the 'recursive' strategy. + fs/fcntl.c | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) +Merging vfs/for-next (303392fd5c16 Merge tag 'leds-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds) +$ git merge vfs/for-next +Already up to date. +Merging printk/for-next (48e72544d6f0 Merge branch 'printk-rework' into for-next) +$ git merge printk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci/next (d58b20611059 Merge branch 'remotes/lorenzo/pci/mobiveil') +$ git merge pci/next +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/controller/pci-hyperv.c +Auto-merging drivers/pci/controller/pci-aardvark.c +Auto-merging drivers/pci/controller/dwc/pcie-tegra194.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/PCI/pci-error-recovery.rst | 2 +- + .../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 3 + + MAINTAINERS | 6 +- + arch/x86/pci/mmconfig-shared.c | 10 +- + drivers/pci/controller/cadence/pcie-cadence.h | 7 +- + drivers/pci/controller/dwc/pci-imx6.c | 25 +- + drivers/pci/controller/dwc/pcie-intel-gw.c | 10 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 4 +- + .../pci/controller/mobiveil/pcie-layerscape-gen4.c | 11 - + drivers/pci/controller/pci-aardvark.c | 13 +- + drivers/pci/controller/pci-ftpci100.c | 30 +- + drivers/pci/controller/pci-hyperv.c | 64 ++-- + drivers/pci/controller/pci-tegra.c | 1 + + drivers/pci/controller/pci-xgene.c | 4 +- + drivers/pci/controller/pcie-iproc-msi.c | 33 +- + drivers/pci/controller/pcie-iproc.c | 24 +- + drivers/pci/controller/pcie-iproc.h | 16 +- + drivers/pci/controller/pcie-mediatek-gen3.c | 1 + + drivers/pci/controller/pcie-mediatek.c | 4 +- + drivers/pci/controller/pcie-microchip-host.c | 2 +- + drivers/pci/controller/pcie-rockchip-host.c | 12 +- + drivers/pci/ecam.c | 54 ++- + drivers/pci/hotplug/cpci_hotplug.h | 3 + + drivers/pci/hotplug/cpci_hotplug_pci.c | 2 - + drivers/pci/hotplug/cpqphp_core.c | 7 +- + drivers/pci/hotplug/cpqphp_ctrl.c | 2 +- + drivers/pci/hotplug/pci_hotplug_core.c | 8 +- + drivers/pci/hotplug/pciehp.h | 3 + + drivers/pci/hotplug/pciehp_hpc.c | 36 ++ + drivers/pci/hotplug/rpadlpar_sysfs.c | 4 +- + drivers/pci/hotplug/shpchp_sysfs.c | 38 ++- + drivers/pci/iov.c | 23 +- + drivers/pci/msi.c | 8 +- + drivers/pci/p2pdma.c | 376 +++++++++++---------- + drivers/pci/pci-label.c | 22 +- + drivers/pci/pci-sysfs.c | 2 +- + drivers/pci/pci.c | 54 +-- + drivers/pci/pci.h | 8 +- + drivers/pci/pcie/aer.c | 24 +- + drivers/pci/pcie/aspm.c | 4 +- + drivers/pci/pcie/dpc.c | 74 +++- + drivers/pci/probe.c | 51 ++- + drivers/pci/quirks.c | 11 + + drivers/pci/slot.c | 18 +- + drivers/pci/switch/switchtec.c | 18 +- + include/linux/pci-ecam.h | 1 + + include/linux/pci-ep-cfs.h | 2 +- + include/linux/pci-epc.h | 5 +- + include/linux/pci-epf.h | 5 +- + include/linux/pci.h | 2 +- + include/linux/pci_hotplug.h | 2 + + include/uapi/linux/pcitest.h | 2 +- + 52 files changed, 722 insertions(+), 429 deletions(-) +Merging pstore/for-next/pstore (c5d4fb2539ca pstore/blk: Use "%lu" to format unsigned long) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + fs/pstore/blk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hid/for-next (f3fb2deb517f Merge branch 'for-5.13/upstream-fixes' into for-next) +$ git merge hid/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (5bac2a5bf0c6 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. +Merging i3c/i3c/next (3e5feb11a829 i3c: master: svc: fix doc warning in svc-i3c-master.c) +$ git merge i3c/i3c/next +Merge made by the 'recursive' strategy. + drivers/i3c/master/svc-i3c-master.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved) +$ git merge dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (1b1cf8fe9983 Merge tag 'x86-splitlock-2021-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (98cf4951842a Merge branch 'path-lookup' into docs-next) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (50e7a31d30e8 media: Fix Media Controller API config checks) +$ git merge v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (50e7a31d30e8 media: Fix Media Controller API config checks) +$ git merge v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (7570e1f151ad Merge branch 'pm-domains' into linux-next) +$ git merge pm/linux-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (c503c193db7d Merge branch 'cpufreq/cppc-fie' into cpufreq/arm/linux-next) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (d07f6ca923ea Linux 5.13-rc2) +$ git merge cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (8c37d01e1a86 PM / devfreq: passive: Fix get_target_freq when not using required-opp) +$ git merge devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (4fa82a87ba55 opp: Allow required-opps to be used for non genpd use cases) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (fe6a6de6692e thermal/drivers/int340x/processor_thermal: Fix tcc setting) +$ git merge thermal/thermal/linux-next +Auto-merging drivers/thermal/thermal_core.c +Removing Documentation/devicetree/bindings/thermal/rockchip-thermal.txt +Auto-merging Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +Merge made by the 'recursive' strategy. + .../bindings/thermal/nvidia,tegra30-tsensor.yaml | 73 ++++ + .../devicetree/bindings/thermal/qcom-tsens.yaml | 2 + + .../bindings/thermal/rockchip-thermal.txt | 85 ----- + .../bindings/thermal/rockchip-thermal.yaml | 96 ++++++ + drivers/thermal/devfreq_cooling.c | 2 +- + drivers/thermal/imx_sc_thermal.c | 3 + + drivers/thermal/intel/int340x_thermal/Makefile | 3 + + .../intel/int340x_thermal/int3401_thermal.c | 82 +++++ + .../int340x_thermal/processor_thermal_device.c | 309 +++-------------- + .../int340x_thermal/processor_thermal_device.h | 9 + + .../int340x_thermal/processor_thermal_device_pci.c | 373 +++++++++++++++++++++ + .../processor_thermal_device_pci_legacy.c | 163 +++++++++ + .../intel/int340x_thermal/processor_thermal_mbox.c | 12 +- + .../intel/int340x_thermal/processor_thermal_rfim.c | 55 +++ + drivers/thermal/intel/intel_soc_dts_iosf.c | 15 +- + drivers/thermal/mtk_thermal.c | 6 + + drivers/thermal/rcar_gen3_thermal.c | 7 +- + drivers/thermal/rockchip_thermal.c | 121 +++++++ + drivers/thermal/sprd_thermal.c | 16 +- + drivers/thermal/st/st_thermal_memmap.c | 13 +- + drivers/thermal/thermal_core.c | 2 +- + drivers/thermal/thermal_of.c | 3 + + 22 files changed, 1066 insertions(+), 384 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/nvidia,tegra30-tsensor.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/rockchip-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml + create mode 100644 drivers/thermal/intel/int340x_thermal/int3401_thermal.c + create mode 100644 drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c + create mode 100644 drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci_legacy.c +Merging dlm/next (957adb68b3f7 fs: dlm: invalid buffer access in lookup error) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (7d31f1c65cc9 swiotlb: fix implicit debugfs declarations) +$ git merge swiotlb/linux-next +Auto-merging include/linux/device.h +Auto-merging drivers/xen/swiotlb-xen.c +Auto-merging drivers/of/of_private.h +Auto-merging drivers/of/device.c +Auto-merging drivers/of/address.c +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_ttm.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_internal.c +Auto-merging drivers/base/core.c +Merge made by the 'recursive' strategy. + .../bindings/reserved-memory/reserved-memory.txt | 36 ++- + drivers/base/core.c | 4 + + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +- + drivers/iommu/dma-iommu.c | 12 +- + drivers/of/address.c | 33 +++ + drivers/of/device.c | 3 + + drivers/of/of_private.h | 6 + + drivers/pci/xen-pcifront.c | 2 +- + drivers/xen/swiotlb-xen.c | 4 +- + include/linux/device.h | 4 + + include/linux/swiotlb.h | 53 ++++- + kernel/dma/Kconfig | 14 ++ + kernel/dma/direct.c | 59 +++-- + kernel/dma/direct.h | 8 +- + kernel/dma/swiotlb.c | 262 ++++++++++++++++----- + 16 files changed, 401 insertions(+), 103 deletions(-) +Merging rdma/for-next (3d8287544223 RDMA/core: Always release restrack object) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (5e437416ff66 Merge branch 'dsa-mv88e6xxx-topaz-fixes') +$ git merge net-next/master +Already up to date. +Merging bpf-next/for-next (5e437416ff66 Merge branch 'dsa-mv88e6xxx-topaz-fixes') +$ git merge bpf-next/for-next +Already up to date. +Merging ipsec-next/master (84fe73996c2e Merge branch 'do_once_lite') +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (9a1ac95a59d0 RDMA/mlx5: Refactor get_ts_format functions to simplify code) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (84fe73996c2e Merge branch 'do_once_lite') +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (84fe73996c2e Merge branch 'do_once_lite') +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (ff8744b5eb11 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (3c755b4545aa Bluetooth: hci_h5: Disable the hci_suspend_notifier for btrtl devices) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/hci_h5.c | 7 +++++++ + drivers/bluetooth/hci_serdev.c | 3 +++ + drivers/bluetooth/hci_uart.h | 7 ++++--- + 3 files changed, 14 insertions(+), 3 deletions(-) +Merging mac80211-next/master (5e437416ff66 Merge branch 'dsa-mv88e6xxx-topaz-fixes') +$ git merge mac80211-next/master +Already up to date. +Merging mtd/mtd/next (0bcc3939c98d Merge tag 'spi-nor/for-5.14' into mtd/next) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (c06dd49fd59a mtd: rawnand: omap: Add larger page NAND chips support) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (c17e5c85b32f mtd: spi-nor: remove redundant continue statement) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (66192b2e3fd8 crypto: hisilicon/sec - fix the process of disabling sva prefetching) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (8a02ea42bc1d Merge tag 'drm-intel-next-fixes-2021-06-29' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Already up to date. +Merging drm-misc/for-linux-next (f18f58012ee8 drm/radeon: Fix NULL dereference when updating memory stats) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 ++- + drivers/gpu/drm/gma500/framebuffer.c | 7 ++++++- + drivers/gpu/drm/radeon/radeon_object.c | 29 ++++++++++++----------------- + drivers/gpu/drm/radeon/radeon_object.h | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 13 ++++++++++--- + include/linux/dma-resv.h | 2 +- + 6 files changed, 32 insertions(+), 24 deletions(-) +Merging amdgpu/drm-next (6c1c27b52539 PCI: quirks: Quirk PCI d3hot delay for AMD xhci) +$ git merge amdgpu/drm-next +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 71f26fb54499] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.c | 239 ++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.h | 37 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 116 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 1257 +++++++++++++------- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 78 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 5 + + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 266 ++++- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c | 85 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 51 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 37 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 319 ++--- + drivers/gpu/drm/amd/amdgpu/smuio_v11_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 13 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 100 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 9 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 272 +++-- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 236 ++-- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 19 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +- + drivers/gpu/drm/amd/display/dc/dc.h | 1 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 31 +- + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 2 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 8 +- + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 4 +- + drivers/gpu/drm/amd/display/dc/irq_types.h | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 60 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 16 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 5 +- + drivers/gpu/drm/amd/include/amd_shared.h | 10 +- + .../amd/include/asic_reg/umc/umc_8_7_0_sh_mask.h | 179 +-- + drivers/gpu/drm/amd/include/navi10_enum.h | 2 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 95 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 1 + + drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 242 +--- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 118 ++ + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 241 +--- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 230 +--- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 3 +- + drivers/gpu/drm/radeon/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 95 ++ + drivers/gpu/drm/radeon/radeon_display.c | 1 + + drivers/gpu/drm/radeon/radeon_drv.c | 8 +- + drivers/pci/quirks.c | 1 + + drivers/usb/host/xhci-pci.c | 3 + + 73 files changed, 3084 insertions(+), 1738 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.h +Merging drm-intel/for-linux-next (3dd6c11b60d2 drm/i915: Drop all references to DRM IRQ midlayer) +$ git merge drm-intel/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_ddi.c | 19 ++++++++++++++++--- + drivers/gpu/drm/i915/display/intel_dp.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 7 +++++-- + drivers/gpu/drm/i915/i915_drv.c | 1 - + drivers/gpu/drm/i915/i915_irq.c | 10 +++++----- + drivers/gpu/drm/i915/i915_irq.h | 1 + + drivers/gpu/drm/i915/i915_reg.h | 3 --- + 8 files changed, 29 insertions(+), 16 deletions(-) +Merging drm-tegra/drm/tegra/for-next (a562c0783b5f drm/tegra: Don't call SET_APPLICATION_ID in VIC boot) +$ git merge drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/dpaux.c +Merge made by the 'recursive' strategy. +Merging drm-msm/msm-next (e88bbc91849b Revert "drm/msm/mdp5: provide dynamic bandwidth management") +$ git merge drm-msm/msm-next +Already up to date. +Merging imx-drm/imx-drm/next (fc1e985b67f9 drm/imx: ipuv3-plane: add color encoding and range properties) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (81fd23e2b3cc drm/etnaviv: Implement mmap as GEM object function) +$ git merge etnaviv/etnaviv/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 14 ++----------- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 3 --- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 18 +++++------------ + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 13 ------------ + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 6 ++++++ + drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 31 +++++++++++++++++++++++++++++ + 6 files changed, 44 insertions(+), 41 deletions(-) +Merging regmap/for-next (d17032f2befa Merge remote-tracking branch 'regmap/for-5.14' into regmap-next) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (307cc9baac5c ALSA: usb-audio: Reduce latency at playback start, take#2) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (fd96f1a6e5b4 Merge remote-tracking branch 'asoc/for-5.14' into asoc-linus) +$ git merge sound-asoc/for-next +Already up to date. +Merging modules/modules-next (2c0f0f363956 module: correctly exit module_kallsyms_on_each_symbol when fn() != 0) +$ git merge modules/modules-next +Already up to date. +Merging input/next (f8f84af5da9e Input: joydev - prevent use of not validated data in JSIOCSBTNMAP ioctl) +$ git merge input/next +Already up to date. +Merging block/for-next (e12ca7286849 Merge branch 'block-5.14' into for-next) +$ git merge block/for-next +Auto-merging arch/um/drivers/ubd_kern.c +Merge made by the 'recursive' strategy. + arch/um/drivers/ubd_kern.c | 160 ++++++-------------------------- + block/blk-cgroup.c | 15 +++ + block/blk-core.c | 4 +- + block/blk-exec.c | 25 ++++- + block/blk-mq.c | 3 +- + block/bsg-lib.c | 2 +- + block/bsg.c | 2 +- + block/genhd.c | 4 +- + block/partitions/core.c | 29 +++--- + block/scsi_ioctl.c | 6 +- + drivers/block/loop.c | 169 ++++++++++++++-------------------- + drivers/block/mtip32xx/mtip32xx.c | 150 +++++++++--------------------- + drivers/block/nbd.c | 60 +++++++++++- + drivers/block/null_blk/main.c | 1 - + drivers/block/pktcdvd.c | 2 +- + drivers/cdrom/cdrom.c | 2 +- + drivers/mmc/core/block.c | 29 +----- + drivers/mmc/core/queue.c | 23 ++--- + drivers/mmc/core/queue.h | 2 +- + drivers/nvme/host/core.c | 65 ++++++------- + drivers/nvme/host/fabrics.c | 13 ++- + drivers/nvme/host/fabrics.h | 2 +- + drivers/nvme/host/fc.c | 2 +- + drivers/nvme/host/ioctl.c | 6 +- + drivers/nvme/host/nvme.h | 4 +- + drivers/nvme/host/rdma.c | 3 +- + drivers/nvme/host/tcp.c | 2 +- + drivers/nvme/target/loop.c | 2 +- + drivers/nvme/target/passthru.c | 8 +- + drivers/nvme/target/tcp.c | 1 - + drivers/s390/block/dasd.c | 1 - + drivers/s390/block/dasd_eckd.c | 2 +- + drivers/s390/block/dasd_eckd.h | 6 +- + drivers/scsi/scsi_error.c | 2 +- + drivers/scsi/scsi_lib.c | 8 +- + drivers/scsi/sg.c | 2 +- + drivers/scsi/st.c | 2 +- + drivers/target/target_core_pscsi.c | 2 +- + fs/io_uring.c | 183 +++++++++++++------------------------ + fs/nfsd/blocklayout.c | 2 +- + include/linux/blk-mq.h | 2 - + include/linux/blk_types.h | 3 - + include/linux/blkdev.h | 37 ++------ + include/uapi/linux/nbd-netlink.h | 1 + + 44 files changed, 408 insertions(+), 641 deletions(-) +Merging device-mapper/for-next (5c0de3d72f8c dm writecache: make writeback pause configurable) +$ git merge device-mapper/for-next +Already up to date. +Merging pcmcia/pcmcia-next (e9d503fef7da pcmcia: rsrc_nonstatic: Fix call-back function as reference formatting) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (d0244847f9fc mmc: sdhci: Fix warning message when accessing RPMB in HS400 mode) +$ git merge mmc/next +Already up to date. +Merging mfd/for-mfd-next (495fb48dbd9b mfd: wm831x: Use DEFINE_RES_IRQ_NAMED() and DEFINE_RES_IRQ() to simplify code) +$ git merge mfd/for-mfd-next +Merge made by the 'recursive' strategy. +Merging backlight/for-backlight-next (1181f2164135 backlight: lm3630a: Convert to atomic PWM API and check for errors) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (f1c74a6c07e7 power: supply: ab8500: Fix an old bug) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (d2755ee2fc31 Merge remote-tracking branch 'regulator/for-5.14' into regulator-linus) +$ git merge regulator/for-next +Already up to date. +Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) +$ git merge security/next-testing +Already up to date! +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/policy.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/label.c +Auto-merging security/apparmor/include/label.h +Auto-merging security/apparmor/include/file.h +Auto-merging security/apparmor/apparmorfs.c +Merge made by the 'recursive' strategy. + security/apparmor/apparmorfs.c | 4 +-- + security/apparmor/include/file.h | 2 +- + security/apparmor/include/label.h | 1 + + security/apparmor/include/policy.h | 6 ++-- + security/apparmor/label.c | 4 +-- + security/apparmor/lsm.c | 22 +++++++------- + security/apparmor/path.c | 2 +- + security/apparmor/policy.c | 59 ++++++++++++++++++++++++++++++++------ + security/apparmor/policy_unpack.c | 2 +- + 9 files changed, 73 insertions(+), 29 deletions(-) +Merging integrity/next-integrity (907a399de7b0 evm: Check xattr size discrepancy between kernel and user) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring) +$ git merge keys/keys-next +Auto-merging scripts/Makefile +Auto-merging include/keys/system_keyring.h +Auto-merging certs/system_keyring.c +CONFLICT (content): Merge conflict in certs/system_keyring.c +Auto-merging certs/Makefile +Auto-merging certs/Kconfig +Resolved 'certs/system_keyring.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5d72ad9870ae] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. +Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata) +$ git merge safesetid/safesetid-next +Already up to date. +Merging selinux/next (d99cf13f1420 selinux: kill 'flags' argument in avc_has_perm_flags() and avc_audit()) +$ git merge selinux/next +Already up to date. +Merging smack/next (fe6bde732be8 Smack: fix doc warning) +$ git merge smack/next +Already up to date. +Merging tomoyo/master (122fa8c58831 Merge tag 'for-5.14-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (0178f9d0f60b tpm: Replace WARN_ONCE() with dev_err_once() in tpm_tis_status()) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (cf813c67d961 watchdog: iTCO_wdt: use dev_err() instead of pr_err()) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (2b9d8e3e9a9b Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/smmu', 'x86/vt-d', 'x86/amd', 'virtio' and 'core' into next) +$ git merge iommu/next +Already up to date. +Merging audit/next (0ecc617858fc audit: remove unnecessary 'ret' initialization) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (6a9a930dc441 dt-bindings: Fix 'unevaluatedProperties' errors in DT graph users) +$ git merge devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (4f197188da66 MAINTAINERS: add entry for polarfire soc mailbox) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (d2e3148a7035 Merge remote-tracking branch 'spi/for-5.14' into spi-linus) +$ git merge spi/for-next +Already up to date. +Merging tip/auto-latest (ae3527382df2 Merge branch 'locking/urgent') +$ git merge tip/auto-latest +Auto-merging kernel/sched/core.c +Auto-merging kernel/kprobes.c +Auto-merging include/linux/wait.h +Merge made by the 'recursive' strategy. + .../testing/sysfs-bus-event_source-devices-uncore | 13 + + arch/x86/events/intel/cstate.c | 23 +- + arch/x86/events/intel/uncore.c | 45 +- + arch/x86/events/intel/uncore.h | 4 + + arch/x86/events/intel/uncore_discovery.c | 42 +- + arch/x86/events/intel/uncore_discovery.h | 21 + + arch/x86/events/intel/uncore_snbep.c | 549 ++++++++++++++++++++- + include/linux/sched/sysctl.h | 18 - + include/linux/wait.h | 2 +- + kernel/jump_label.c | 13 +- + kernel/kprobes.c | 2 + + kernel/locking/lockdep_proc.c | 26 +- + kernel/sched/core.c | 6 +- + kernel/sched/debug.c | 7 + + kernel/sched/fair.c | 13 +- + kernel/sched/sched.h | 36 +- + kernel/static_call.c | 13 +- + 17 files changed, 728 insertions(+), 105 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-event_source-devices-uncore +Merging clockevents/timers/drivers/next (6f64c8159af9 clocksource/drivers/arm_global_timer: Remove duplicated argument in arm_global_timer) +$ git merge clockevents/timers/drivers/next +Auto-merging drivers/clocksource/Kconfig +Merge made by the 'recursive' strategy. + drivers/clocksource/ingenic-sysost.c | 315 ++++++++++++++++++++++++++--------- + 1 file changed, 236 insertions(+), 79 deletions(-) +Merging edac/edac-for-next (0a9ece9ba154 EDAC/igen6: fix core dependency) +$ git merge edac/edac-for-next +Already up to date. +Merging irqchip/irq/irqchip-next (c51e96dace68 Merge branch irq/irqchip-driver-updates into irq/irqchip-next) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (4030a6e6a6a4 tracing: Resize tgid_map to pid_max, not PID_MAX_DEFAULT) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (2a2ed5618a0e rcu: Fix pr_info() formats and values in show_rcu_gp_kthreads()) +$ git merge rcu/rcu/next +Merge made by the 'recursive' strategy. + kernel/rcu/refscale.c | 6 +++--- + kernel/rcu/tasks.h | 6 ++---- + kernel/rcu/tree_stall.h | 4 ++-- + kernel/scftorture.c | 6 +++--- + 4 files changed, 10 insertions(+), 12 deletions(-) +Merging kvm/next (a01b45e9d34d KVM: x86: rename apic_access_page_done to apic_access_memslot_enabled) +$ git merge kvm/next +Already up to date. +Merging kvm-arm/next (188982cda00e Merge branch kvm-arm64/mmu/mte into kvmarm-master/next) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (1f703d2cf204 KVM: s390: allow facility 192 (vector-packed-decimal-enhancement facility 2)) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (629a5d87e26f xen: sync include/xen/interface/io/ring.h with Xen's newest version) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + mm/percpu-km.c | 6 ++++++ + mm/percpu-vm.c | 5 +++-- + mm/percpu.c | 32 ++++++++++++++++++++++++++------ + 3 files changed, 35 insertions(+), 8 deletions(-) +Merging workqueues/for-next (89e28ce60cb6 workqueue/watchdog: Make unbound workqueues aware of touch_softlockup_watchdog() 84;0;0c84;0;0c There are two workqueue-specific watchdog timestamps:) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (0e695c3f7f66 platform/x86: dell-wmi-sysman: Change user experience when Admin/System Password is modified) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (6efb943b8616 Linux 5.13-rc1) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (6efb943b8616 Linux 5.13-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (7b97174cc93f leds: lgm: Fix up includes) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (5b32dd281ee0 ipmi: kcs_bmc_aspeed: Fix less than zero comparison of a unsigned int) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (77d34a4683b0 Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (77d34a4683b0 Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (8051334e901f USB: serial: cp210x: add support for GPIOs on CP2108) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/for-usb-next (956df1bb0ab8 usb: chipidea: host: fix port index underflow and UBSAN complains) +$ git merge usb-chipidea-next/for-usb-next +Auto-merging drivers/usb/cdns3/cdnsp-gadget.c +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/host.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) +Merging tty/tty-next (77d34a4683b0 Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (77d34a4683b0 Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (d97c0ff5a124 extcon: sm5502: Add support for SM5504) +$ git merge extcon/extcon-next +Already up to date. +Merging phy-next/next (15692a80d949 phy: Revert "phy: ralink: Kconfig: convert mt7621-pci-phy into 'bool'") +$ git merge phy-next/next +Already up to date. +Merging soundwire/next (3d3e88e33633 soundwire: stream: Fix test for DP prepare complete) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (b18f901382fd thunderbolt: Fix DROM handling for USB4 DROM) +$ git merge thunderbolt/next +Already up to date. +Merging vfio/next (6a45ece4c9af vfio/pci: Handle concurrent vma faults) +$ git merge vfio/next +Already up to date. +Merging staging/staging-next (77d34a4683b0 Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm) +$ git merge staging/staging-next +Already up to date. +Merging iio/togreg (6cbb3aa0f9d5 staging: rtl8723bs: rtw_efuse: Fix coding style) +$ git merge iio/togreg +Already up to date. +Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ git merge mux/for-next +Already up to date. +Merging icc/icc-next (46bdcac533cc interconnect: qcom: Add SC7280 interconnect provider driver) +$ git merge icc/icc-next +Already up to date. +Merging dmaengine/next (18ef082713ad Merge tag 'dmaengine-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine) +$ git merge dmaengine/next +Already up to date. +Merging cgroup/for-next (cfeaa699186e Merge branch 'for-5.13-fixes' into for-next) +$ git merge cgroup/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (4e65a83cd0b9 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 11 ++++ + drivers/message/fusion/mptfc.c | 35 +++++------ + drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +- + drivers/scsi/aic94xx/aic94xx_init.c | 1 + + drivers/scsi/be2iscsi/be_main.c | 103 +++++++++++++-------------------- + drivers/scsi/bnx2fc/bnx2fc_io.c | 2 +- + drivers/scsi/elx/efct/efct_lio.c | 8 +-- + drivers/scsi/elx/libefc_sli/sli4.c | 2 - + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 1 + + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 1 + + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 1 + + drivers/scsi/ipr.c | 4 +- + drivers/scsi/ipr.h | 1 + + drivers/scsi/isci/init.c | 1 + + drivers/scsi/libfc/fc_rport.c | 13 +++-- + drivers/scsi/libsas/sas_scsi_host.c | 9 +++ + drivers/scsi/megaraid/megaraid_mbox.c | 18 +++--- + drivers/scsi/mpi3mr/mpi3mr_os.c | 5 +- + drivers/scsi/mvsas/mv_init.c | 27 ++++----- + drivers/scsi/pm8001/pm8001_init.c | 1 + + drivers/scsi/qedf/qedf_attr.c | 14 ++--- + drivers/scsi/qedf/qedf_io.c | 22 ++++++- + drivers/scsi/qedi/qedi_sysfs.c | 14 ++--- + drivers/scsi/qla2xxx/qla_def.h | 4 ++ + drivers/scsi/qla2xxx/qla_gbl.h | 1 + + drivers/scsi/qla2xxx/qla_init.c | 6 +- + drivers/scsi/qla2xxx/qla_iocb.c | 4 ++ + drivers/scsi/qla2xxx/qla_isr.c | 4 ++ + drivers/scsi/qla2xxx/qla_mbx.c | 27 +++++++++ + drivers/scsi/qla2xxx/qla_nvme.c | 4 ++ + drivers/scsi/qla2xxx/qla_os.c | 68 ++++++++++++++++++++++ + drivers/scsi/scsi_lib.c | 13 +---- + drivers/scsi/scsi_priv.h | 1 - + drivers/scsi/scsi_scan.c | 12 ++-- + drivers/scsi/ufs/ufshcd.c | 4 ++ + drivers/scsi/virtio_scsi.c | 5 +- + 36 files changed, 287 insertions(+), 162 deletions(-) +Merging scsi-mkp/for-next (5f638e5ac61e scsi: virtio_scsi: Add validation for residual bytes from response) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (168a32fcc18a vdpa/mlx5: Clear vq ready indication upon device reset) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + drivers/block/virtio_blk.c | 17 ++++--- + drivers/char/virtio_console.c | 4 +- + drivers/net/virtio_net.c | 54 +++++++++++++++----- + drivers/vdpa/ifcvf/ifcvf_base.c | 4 ++ + drivers/vdpa/ifcvf/ifcvf_base.h | 14 +----- + drivers/vdpa/ifcvf/ifcvf_main.c | 39 +++++++++++---- + drivers/vdpa/mlx5/core/mlx5_vdpa.h | 2 + + drivers/vdpa/mlx5/core/mr.c | 95 ++++++++++++++++++++++++++++-------- + drivers/vdpa/mlx5/core/resources.c | 7 +++ + drivers/vdpa/mlx5/net/mlx5_vnet.c | 59 ++++++++++++++++------ + drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 1 - + drivers/vdpa/virtio_pci/vp_vdpa.c | 1 + + drivers/vhost/iotlb.c | 2 +- + drivers/vhost/scsi.c | 21 +++----- + drivers/vhost/vhost.c | 8 +-- + drivers/vhost/vhost.h | 21 ++++---- + drivers/vhost/vsock.c | 2 +- + drivers/virtio/virtio.c | 14 ++++-- + drivers/virtio/virtio_ring.c | 28 ++++++++++- + include/linux/mlx5/mlx5_ifc.h | 4 +- + include/linux/virtio.h | 6 ++- + include/uapi/linux/virtio_ids.h | 12 +++++ + 22 files changed, 296 insertions(+), 119 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 1bc6f58dc177 Merge remote-tracking branch 'scsi/for-next' +Merging next-20210707 version of vhost +$ git merge -m next-20210707/vhost b3634a892df49d8095a4c8dc8528ed67e0a1f1d9 +Merge made by the 'recursive' strategy. + drivers/block/virtio_blk.c | 17 ++++--- + drivers/char/virtio_console.c | 4 +- + drivers/net/virtio_net.c | 54 +++++++++++++++----- + drivers/vdpa/ifcvf/ifcvf_base.c | 4 ++ + drivers/vdpa/ifcvf/ifcvf_base.h | 14 +----- + drivers/vdpa/ifcvf/ifcvf_main.c | 39 +++++++++++---- + drivers/vdpa/mlx5/core/mlx5_vdpa.h | 1 + + drivers/vdpa/mlx5/core/mr.c | 95 ++++++++++++++++++++++++++++-------- + drivers/vdpa/mlx5/core/resources.c | 6 +++ + drivers/vdpa/mlx5/net/mlx5_vnet.c | 36 ++++++++------ + drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 1 - + drivers/vdpa/virtio_pci/vp_vdpa.c | 1 + + drivers/vhost/iotlb.c | 2 +- + drivers/vhost/scsi.c | 21 +++----- + drivers/vhost/vhost.c | 8 +-- + drivers/vhost/vhost.h | 21 ++++---- + drivers/vhost/vsock.c | 2 +- + drivers/virtio/virtio_ring.c | 28 ++++++++++- + include/linux/mlx5/mlx5_ifc.h | 4 +- + include/uapi/linux/virtio_ids.h | 12 +++++ + 20 files changed, 257 insertions(+), 113 deletions(-) +Merging rpmsg/for-next (7486f29e5e60 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) +$ git merge gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (c34c1228fc1c docs: driver-api: gpio: using-gpio.rst: avoid using ReST :doc:`foo` markup) +$ git merge gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (043d7f09bf61 gpiolib: acpi: Add acpi_gpio_get_io_resource()) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (bfa50166cd9d pinctrl: ralink: rt305x: add missing include) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (258435a1c818 pinctrl: tigerlake: Add Alder Lake-M ACPI ID) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (c3975a73ca94 pinctrl: renesas: r8a77980: Add bias pinconf support) +$ git merge pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (6efb943b8616 Linux 5.13-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (bebedf2bb4a9 pwm: Remove redundant assignment to pointer pwm) +$ git merge pwm/for-next +Auto-merging Documentation/firmware-guide/acpi/enumeration.rst +Auto-merging Documentation/driver-api/driver-model/devres.rst +Removing Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt +Removing Documentation/devicetree/bindings/pwm/pwm-tiecap.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/pwm-tiecap.txt | 51 ----- + .../devicetree/bindings/pwm/pwm-tiecap.yaml | 64 ++++++ + .../devicetree/bindings/pwm/pwm-tiehrpwm.txt | 50 ----- + .../devicetree/bindings/pwm/pwm-tiehrpwm.yaml | 65 ++++++ + Documentation/driver-api/driver-model/devres.rst | 3 +- + Documentation/driver-api/pwm.rst | 7 +- + Documentation/firmware-guide/acpi/enumeration.rst | 32 +++ + drivers/pwm/core.c | 222 +++++++-------------- + drivers/pwm/pwm-atmel-hlcdc.c | 2 - + drivers/pwm/pwm-atmel-tcb.c | 2 - + drivers/pwm/pwm-atmel.c | 2 - + drivers/pwm/pwm-bcm-iproc.c | 2 - + drivers/pwm/pwm-bcm-kona.c | 2 - + drivers/pwm/pwm-bcm2835.c | 2 - + drivers/pwm/pwm-berlin.c | 165 ++++++++------- + drivers/pwm/pwm-clps711x.c | 12 +- + drivers/pwm/pwm-crc.c | 12 +- + drivers/pwm/pwm-ep93xx.c | 167 ++++++++-------- + drivers/pwm/pwm-fsl-ftm.c | 2 - + drivers/pwm/pwm-hibvt.c | 2 - + drivers/pwm/pwm-img.c | 2 +- + drivers/pwm/pwm-imx-tpm.c | 2 - + drivers/pwm/pwm-imx1.c | 14 +- + drivers/pwm/pwm-imx27.c | 3 - + drivers/pwm/pwm-jz4740.c | 2 - + drivers/pwm/pwm-lpc18xx-sct.c | 2 - + drivers/pwm/pwm-lpss-pci.c | 4 - + drivers/pwm/pwm-lpss-platform.c | 4 +- + drivers/pwm/pwm-lpss.c | 8 +- + drivers/pwm/pwm-lpss.h | 1 - + drivers/pwm/pwm-meson.c | 14 +- + drivers/pwm/pwm-mxs.c | 2 - + drivers/pwm/pwm-omap-dmtimer.c | 2 - + drivers/pwm/pwm-pca9685.c | 198 ++++++++++++++---- + drivers/pwm/pwm-pxa.c | 40 ++-- + drivers/pwm/pwm-renesas-tpu.c | 2 - + drivers/pwm/pwm-rockchip.c | 5 - + drivers/pwm/pwm-samsung.c | 3 - + drivers/pwm/pwm-sifive.c | 2 - + drivers/pwm/pwm-spear.c | 40 +++- + drivers/pwm/pwm-sprd.c | 4 +- + drivers/pwm/pwm-stm32-lp.c | 2 - + drivers/pwm/pwm-stm32.c | 2 - + drivers/pwm/pwm-sun4i.c | 2 - + drivers/pwm/pwm-tegra.c | 24 +-- + drivers/pwm/pwm-tiecap.c | 58 ++++-- + drivers/pwm/pwm-tiehrpwm.c | 2 - + drivers/pwm/pwm-visconti.c | 17 +- + drivers/pwm/pwm-vt8500.c | 10 +- + include/linux/pwm.h | 15 +- + 50 files changed, 710 insertions(+), 642 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-tiecap.txt + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-tiecap.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.yaml +Merging userns/for-next (5e6b8a50a7ce cred: add missing return error code when set_cred_ucounts() failed) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ git merge ktest/for-next +Already up to date. +Merging kselftest/next (4896df9d53ae selftests/sgx: remove checks for file execute permissions) +$ git merge kselftest/next +Already up to date. +Merging livepatching/for-next (c150bbbb1731 Merge branch 'for-5.13/signal' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection()) +$ git merge coresight/next +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (94af1e732abe rtc: pcf8563: Fix the datasheet URL) +$ git merge rtc/rtc-next +Removing Documentation/devicetree/bindings/rtc/ti,bq32k.txt +Removing Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt +Removing Documentation/devicetree/bindings/rtc/epson,rx8900.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/epson,rx8900.txt | 22 -- + .../devicetree/bindings/rtc/epson,rx8900.yaml | 49 ++++ + .../devicetree/bindings/rtc/faraday,ftrtc010.txt | 28 -- + .../devicetree/bindings/rtc/faraday,ftrtc010.yaml | 59 ++++ + .../devicetree/bindings/rtc/rtc-m41t80.txt | 9 + + .../devicetree/bindings/rtc/ti,bq32000.yaml | 49 ++++ + Documentation/devicetree/bindings/rtc/ti,bq32k.txt | 18 -- + drivers/rtc/Kconfig | 6 +- + drivers/rtc/proc.c | 4 +- + drivers/rtc/rtc-bd70528.c | 316 +-------------------- + drivers/rtc/rtc-efi.c | 1 - + drivers/rtc/rtc-imxdi.c | 4 + + drivers/rtc/rtc-m41t80.c | 32 ++- + drivers/rtc/rtc-max77686.c | 4 +- + drivers/rtc/rtc-mxc_v2.c | 1 + + drivers/rtc/rtc-pcf2127.c | 2 +- + drivers/rtc/rtc-pcf85063.c | 4 +- + drivers/rtc/rtc-pcf8563.c | 2 +- + drivers/rtc/rtc-stm32.c | 6 +- + drivers/rtc/rtc-v3020.c | 2 +- + drivers/rtc/sysfs.c | 2 +- + 21 files changed, 219 insertions(+), 401 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/rtc/epson,rx8900.txt + create mode 100644 Documentation/devicetree/bindings/rtc/epson,rx8900.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt + create mode 100644 Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/ti,bq32000.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/ti,bq32k.txt +Merging nvdimm/libnvdimm-for-next (30c10d32152d Merge branch 'for-5.12/cxl' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at24/at24/for-next (6efb943b8616 Linux 5.13-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (28293b6c68cd ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data) +$ git merge ntb/ntb-next +Merge made by the 'recursive' strategy. + drivers/ntb/test/ntb_msi_test.c | 4 +++- + drivers/ntb/test/ntb_perf.c | 1 + + drivers/ntb/test/ntb_pingpong.c | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) +Merging seccomp/for-next/seccomp (19d67694745c Documentation: seccomp: Fix typo in user notification) +$ git merge seccomp/for-next/seccomp +Merge made by the 'recursive' strategy. + Documentation/userspace-api/seccomp_filter.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging kspp/for-next/kspp (6a0544606ec7 pgo: rectify comment to proper kernel-doc syntax) +$ git merge kspp/for-next/kspp +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/x86/boot/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/pgo.rst | 127 +++++++++++ + MAINTAINERS | 13 ++ + Makefile | 3 + + arch/Kconfig | 1 + + arch/x86/Kconfig | 1 + + arch/x86/boot/Makefile | 1 + + arch/x86/boot/compressed/Makefile | 1 + + arch/x86/crypto/Makefile | 3 + + arch/x86/entry/vdso/Makefile | 1 + + arch/x86/kernel/Makefile | 3 + + arch/x86/kernel/vmlinux.lds.S | 2 + + arch/x86/platform/efi/Makefile | 1 + + arch/x86/purgatory/Makefile | 1 + + arch/x86/realmode/rm/Makefile | 1 + + arch/x86/um/vdso/Makefile | 1 + + drivers/firmware/efi/libstub/Makefile | 1 + + include/asm-generic/vmlinux.lds.h | 32 +++ + kernel/Makefile | 1 + + kernel/pgo/Kconfig | 37 +++ + kernel/pgo/Makefile | 5 + + kernel/pgo/fs.c | 413 ++++++++++++++++++++++++++++++++++ + kernel/pgo/instrument.c | 188 ++++++++++++++++ + kernel/pgo/pgo.h | 211 +++++++++++++++++ + scripts/Makefile.lib | 10 + + 25 files changed, 1059 insertions(+) + create mode 100644 Documentation/dev-tools/pgo.rst + create mode 100644 kernel/pgo/Kconfig + create mode 100644 kernel/pgo/Makefile + create mode 100644 kernel/pgo/fs.c + create mode 100644 kernel/pgo/instrument.c + create mode 100644 kernel/pgo/pgo.h +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (994adcbd3714 gnss: drop stray semicolons) +$ git merge gnss/gnss-next +Merge made by the 'recursive' strategy. + drivers/gnss/mtk.c | 2 +- + drivers/gnss/serial.c | 2 +- + drivers/gnss/sirf.c | 2 +- + drivers/gnss/ubx.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging fsi/next (9ab1428dfe2c fsi/sbefifo: Fix reset timeout) +$ git merge fsi/next +Already up to date. +Merging slimbus/for-next (0320ed0a8236 drivers: slimbus: Fix word resposible -> responsible in slimbus.h) +$ git merge slimbus/for-next +Auto-merging drivers/of/platform.c +Auto-merging drivers/nvmem/Makefile +CONFLICT (content): Merge conflict in drivers/nvmem/Makefile +Auto-merging drivers/nvmem/Kconfig +CONFLICT (content): Merge conflict in drivers/nvmem/Kconfig +Resolved 'drivers/nvmem/Kconfig' using previous resolution. +Resolved 'drivers/nvmem/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1a8894983963] Merge remote-tracking branch 'slimbus/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/slimbus/slimbus.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nvmem/for-next (76a2b9a8ab44 nvmem: qfprom: Improve the comment about regulator setting) +$ git merge nvmem/for-next +Auto-merging drivers/nvmem/sprd-efuse.c +Auto-merging drivers/nvmem/core.c +Merge made by the 'recursive' strategy. + drivers/nvmem/qcom-spmi-sdam.c | 1 + + drivers/nvmem/sc27xx-efuse.c | 1 + + drivers/nvmem/sprd-efuse.c | 1 + + 3 files changed, 3 insertions(+) +Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1) +$ git merge xarray/main +Already up to date. +Merging hyperv/hyperv-next (7d815f4afa87 PCI: hv: Add check for hyperv_initialized in init_hv_pci_drv()) +$ git merge hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (c784e46c8445 auxdisplay: Add I2C gpio expander example) +$ git merge auxdisplay/auxdisplay +Merge made by the 'recursive' strategy. + .../bindings/auxdisplay/hit,hd44780.yaml | 31 +++++++++++++++++++++- + 1 file changed, 30 insertions(+), 1 deletion(-) +Merging kgdb/kgdb/for-next (c8daba4640ac kgdb: Fix fall-through warning for Clang) +$ git merge kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (d97176f6040f fpga: dfl: pci: add device IDs for Silicom N501x PAC cards) +$ git merge fpga/for-next +Auto-merging include/linux/fpga/fpga-mgr.h +Auto-merging drivers/fpga/fpga-bridge.c +Auto-merging Documentation/fpga/dfl.rst +Merge made by the 'recursive' strategy. + Documentation/driver-api/fpga/fpga-bridge.rst | 10 +++++----- + Documentation/driver-api/fpga/fpga-mgr.rst | 12 ++++++------ + Documentation/driver-api/fpga/fpga-programming.rst | 8 ++++---- + Documentation/driver-api/fpga/fpga-region.rst | 20 ++++++++++---------- + Documentation/fpga/dfl.rst | 4 ++-- + drivers/fpga/altera-cvp.c | 2 +- + drivers/fpga/dfl-fme-pr.c | 2 +- + drivers/fpga/dfl-n3000-nios.c | 2 +- + drivers/fpga/dfl-pci.c | 5 +++++ + drivers/fpga/dfl.h | 2 +- + drivers/fpga/fpga-bridge.c | 8 ++++---- + drivers/fpga/zynq-fpga.c | 6 +++--- + include/linux/fpga/fpga-mgr.h | 2 +- + 13 files changed, 44 insertions(+), 39 deletions(-) +Merging kunit/test (d07f6ca923ea Linux 5.13-rc2) +$ git merge kunit/test +Already up to date. +Merging cfi/cfi/next (6efb943b8616 Linux 5.13-rc1) +$ git merge cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (d07f6ca923ea Linux 5.13-rc2) +$ git merge kunit-next/kunit +Already up to date. +Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge trivial/for-next +Already up to date. +Merging mhi/mhi-next (3bd1d916c79b bus: mhi: core: Add range checks for BHI and BHIe) +$ git merge mhi/mhi-next +Auto-merging drivers/net/wireless/ath/ath11k/mhi.c +Auto-merging drivers/net/mhi/net.c +Auto-merging drivers/bus/mhi/pci_generic.c +Auto-merging drivers/bus/mhi/core/pm.c +Merge made by the 'recursive' strategy. + drivers/bus/mhi/core/init.c | 61 ++++++++++++++++++++++---------- + drivers/bus/mhi/core/internal.h | 2 +- + drivers/bus/mhi/core/main.c | 26 +++++++++----- + drivers/bus/mhi/core/pm.c | 28 +++------------ + drivers/bus/mhi/pci_generic.c | 65 ++++++++++++++++++++++++++++++----- + drivers/net/mhi/net.c | 2 +- + drivers/net/wireless/ath/ath11k/mhi.c | 1 + + drivers/net/wwan/mhi_wwan_ctrl.c | 2 +- + include/linux/mhi.h | 9 ++++- + net/qrtr/mhi.c | 2 +- + 10 files changed, 134 insertions(+), 64 deletions(-) +Merging memblock/for-next (a4d5613c4dc6 arm: extend pfn_valid to take into account freed memory map alignment) +$ git merge memblock/for-next +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge counters/counters +Already up to date. +Merging rust/rust-next (5d3986cf8ed6 MAINTAINERS: Rust) +$ git merge rust/rust-next +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.build +Auto-merging samples/Kconfig +Auto-merging lib/vsprintf.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/printk/printk.c +Auto-merging init/Kconfig +Auto-merging arch/riscv/Makefile +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .gitignore | 5 + + .rustfmt.toml | 12 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 4 + + Documentation/process/changes.rst | 13 + + Documentation/rust/arch-support.rst | 35 + + Documentation/rust/assets/favicon-16x16.png | Bin 0 -> 798 bytes + Documentation/rust/assets/favicon-32x32.png | Bin 0 -> 2076 bytes + Documentation/rust/assets/rust-logo.png | Bin 0 -> 53976 bytes + Documentation/rust/coding.rst | 92 + + Documentation/rust/docs.rst | 110 + + Documentation/rust/index.rst | 20 + + Documentation/rust/quick-start.rst | 222 ++ + MAINTAINERS | 14 + + Makefile | 176 +- + arch/arm/rust/target.json | 28 + + arch/arm64/rust/target.json | 35 + + arch/powerpc/rust/target.json | 30 + + arch/riscv/Makefile | 1 + + arch/riscv/rust/rv32ima.json | 37 + + arch/riscv/rust/rv32imac.json | 37 + + arch/riscv/rust/rv64ima.json | 37 + + arch/riscv/rust/rv64imac.json | 37 + + arch/x86/rust/target.json | 37 + + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 17 +- + init/Kconfig | 28 + + kernel/kallsyms.c | 7 + + kernel/livepatch/core.c | 4 +- + kernel/printk/printk.c | 5 +- + lib/Kconfig.debug | 144 ++ + lib/vsprintf.c | 12 + + rust/.gitignore | 6 + + rust/Makefile | 316 +++ + rust/alloc/README.md | 32 + + rust/alloc/alloc.rs | 425 ++++ + rust/alloc/borrow.rs | 493 ++++ + rust/alloc/boxed.rs | 1728 ++++++++++++++ + rust/alloc/collections/mod.rs | 116 + + rust/alloc/fmt.rs | 587 +++++ + rust/alloc/lib.rs | 197 ++ + rust/alloc/macros.rs | 128 ++ + rust/alloc/prelude/mod.rs | 17 + + rust/alloc/prelude/v1.rs | 16 + + rust/alloc/raw_vec.rs | 612 +++++ + rust/alloc/rc.rs | 2539 +++++++++++++++++++++ + rust/alloc/slice.rs | 1271 +++++++++++ + rust/alloc/str.rs | 614 +++++ + rust/alloc/string.rs | 2847 +++++++++++++++++++++++ + rust/alloc/sync.rs | 2631 ++++++++++++++++++++++ + rust/alloc/vec/drain.rs | 157 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 296 +++ + rust/alloc/vec/is_zero.rs | 106 + + rust/alloc/vec/mod.rs | 3255 +++++++++++++++++++++++++++ + rust/alloc/vec/partial_eq.rs | 49 + + rust/alloc/vec/set_len_on_drop.rs | 30 + + rust/alloc/vec/spec_extend.rs | 170 ++ + rust/bindgen_parameters | 13 + + rust/build_error.rs | 33 + + rust/compiler_builtins.rs | 146 ++ + rust/exports.c | 16 + + rust/helpers.c | 235 ++ + rust/kernel/allocator.rs | 63 + + rust/kernel/bindings.rs | 28 + + rust/kernel/bindings_helper.h | 24 + + rust/kernel/buffer.rs | 39 + + rust/kernel/build_assert.rs | 80 + + rust/kernel/c_types.rs | 119 + + rust/kernel/chrdev.rs | 212 ++ + rust/kernel/error.rs | 272 +++ + rust/kernel/file.rs | 130 ++ + rust/kernel/file_operations.rs | 698 ++++++ + rust/kernel/io_buffer.rs | 153 ++ + rust/kernel/iov_iter.rs | 95 + + rust/kernel/lib.rs | 220 ++ + rust/kernel/linked_list.rs | 245 ++ + rust/kernel/miscdev.rs | 113 + + rust/kernel/module_param.rs | 497 ++++ + rust/kernel/of.rs | 101 + + rust/kernel/pages.rs | 176 ++ + rust/kernel/platdev.rs | 166 ++ + rust/kernel/prelude.rs | 28 + + rust/kernel/print.rs | 412 ++++ + rust/kernel/random.rs | 50 + + rust/kernel/raw_list.rs | 361 +++ + rust/kernel/rbtree.rs | 570 +++++ + rust/kernel/security.rs | 79 + + rust/kernel/static_assert.rs | 39 + + rust/kernel/str.rs | 259 +++ + rust/kernel/sync/arc.rs | 227 ++ + rust/kernel/sync/condvar.rs | 136 ++ + rust/kernel/sync/guard.rs | 82 + + rust/kernel/sync/locked_by.rs | 112 + + rust/kernel/sync/mod.rs | 84 + + rust/kernel/sync/mutex.rs | 101 + + rust/kernel/sync/spinlock.rs | 109 + + rust/kernel/sysctl.rs | 198 ++ + rust/kernel/task.rs | 193 ++ + rust/kernel/traits.rs | 26 + + rust/kernel/types.rs | 249 ++ + rust/kernel/user_ptr.rs | 191 ++ + rust/macros/lib.rs | 127 ++ + rust/macros/module.rs | 754 +++++++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 113 + + samples/rust/Makefile | 12 + + samples/rust/rust_chrdev.rs | 51 + + samples/rust/rust_minimal.rs | 38 + + samples/rust/rust_miscdev.rs | 150 ++ + samples/rust/rust_module_parameters.rs | 72 + + samples/rust/rust_print.rs | 57 + + samples/rust/rust_random.rs | 61 + + samples/rust/rust_semaphore.rs | 177 ++ + samples/rust/rust_semaphore_c.c | 212 ++ + samples/rust/rust_stack_probing.rs | 40 + + samples/rust/rust_sync.rs | 81 + + scripts/Makefile.build | 22 + + scripts/Makefile.lib | 12 + + scripts/generate_rust_analyzer.py | 143 ++ + scripts/kallsyms.c | 33 +- + scripts/kconfig/confdata.c | 67 +- + scripts/rust-version.sh | 31 + + tools/include/linux/kallsyms.h | 2 +- + tools/include/linux/lockdep.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 129 files changed, 29600 insertions(+), 32 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/assets/favicon-16x16.png + create mode 100644 Documentation/rust/assets/favicon-32x32.png + create mode 100644 Documentation/rust/assets/rust-logo.png + create mode 100644 Documentation/rust/coding.rst + create mode 100644 Documentation/rust/docs.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 arch/arm/rust/target.json + create mode 100644 arch/arm64/rust/target.json + create mode 100644 arch/powerpc/rust/target.json + create mode 100644 arch/riscv/rust/rv32ima.json + create mode 100644 arch/riscv/rust/rv32imac.json + create mode 100644 arch/riscv/rust/rv64ima.json + create mode 100644 arch/riscv/rust/rv64imac.json + create mode 100644 arch/x86/rust/target.json + create mode 100644 rust/.gitignore + create mode 100644 rust/Makefile + create mode 100644 rust/alloc/README.md + create mode 100644 rust/alloc/alloc.rs + create mode 100644 rust/alloc/borrow.rs + create mode 100644 rust/alloc/boxed.rs + create mode 100644 rust/alloc/collections/mod.rs + create mode 100644 rust/alloc/fmt.rs + create mode 100644 rust/alloc/lib.rs + create mode 100644 rust/alloc/macros.rs + create mode 100644 rust/alloc/prelude/mod.rs + create mode 100644 rust/alloc/prelude/v1.rs + create mode 100644 rust/alloc/raw_vec.rs + create mode 100644 rust/alloc/rc.rs + create mode 100644 rust/alloc/slice.rs + create mode 100644 rust/alloc/str.rs + create mode 100644 rust/alloc/string.rs + create mode 100644 rust/alloc/sync.rs + create mode 100644 rust/alloc/vec/drain.rs + create mode 100644 rust/alloc/vec/drain_filter.rs + create mode 100644 rust/alloc/vec/into_iter.rs + create mode 100644 rust/alloc/vec/is_zero.rs + create mode 100644 rust/alloc/vec/mod.rs + create mode 100644 rust/alloc/vec/partial_eq.rs + create mode 100644 rust/alloc/vec/set_len_on_drop.rs + create mode 100644 rust/alloc/vec/spec_extend.rs + create mode 100644 rust/bindgen_parameters + create mode 100644 rust/build_error.rs + create mode 100644 rust/compiler_builtins.rs + create mode 100644 rust/exports.c + create mode 100644 rust/helpers.c + create mode 100644 rust/kernel/allocator.rs + create mode 100644 rust/kernel/bindings.rs + create mode 100644 rust/kernel/bindings_helper.h + create mode 100644 rust/kernel/buffer.rs + create mode 100644 rust/kernel/build_assert.rs + create mode 100644 rust/kernel/c_types.rs + create mode 100644 rust/kernel/chrdev.rs + create mode 100644 rust/kernel/error.rs + create mode 100644 rust/kernel/file.rs + create mode 100644 rust/kernel/file_operations.rs + create mode 100644 rust/kernel/io_buffer.rs + create mode 100644 rust/kernel/iov_iter.rs + create mode 100644 rust/kernel/lib.rs + create mode 100644 rust/kernel/linked_list.rs + create mode 100644 rust/kernel/miscdev.rs + create mode 100644 rust/kernel/module_param.rs + create mode 100644 rust/kernel/of.rs + create mode 100644 rust/kernel/pages.rs + create mode 100644 rust/kernel/platdev.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/print.rs + create mode 100644 rust/kernel/random.rs + create mode 100644 rust/kernel/raw_list.rs + create mode 100644 rust/kernel/rbtree.rs + create mode 100644 rust/kernel/security.rs + create mode 100644 rust/kernel/static_assert.rs + create mode 100644 rust/kernel/str.rs + create mode 100644 rust/kernel/sync/arc.rs + create mode 100644 rust/kernel/sync/condvar.rs + create mode 100644 rust/kernel/sync/guard.rs + create mode 100644 rust/kernel/sync/locked_by.rs + create mode 100644 rust/kernel/sync/mod.rs + create mode 100644 rust/kernel/sync/mutex.rs + create mode 100644 rust/kernel/sync/spinlock.rs + create mode 100644 rust/kernel/sysctl.rs + create mode 100644 rust/kernel/task.rs + create mode 100644 rust/kernel/traits.rs + create mode 100644 rust/kernel/types.rs + create mode 100644 rust/kernel/user_ptr.rs + create mode 100644 rust/macros/lib.rs + create mode 100644 rust/macros/module.rs + create mode 100644 samples/rust/Kconfig + create mode 100644 samples/rust/Makefile + create mode 100644 samples/rust/rust_chrdev.rs + create mode 100644 samples/rust/rust_minimal.rs + create mode 100644 samples/rust/rust_miscdev.rs + create mode 100644 samples/rust/rust_module_parameters.rs + create mode 100644 samples/rust/rust_print.rs + create mode 100644 samples/rust/rust_random.rs + create mode 100644 samples/rust/rust_semaphore.rs + create mode 100644 samples/rust/rust_semaphore_c.c + create mode 100644 samples/rust/rust_stack_probing.rs + create mode 100644 samples/rust/rust_sync.rs + create mode 100755 scripts/generate_rust_analyzer.py + create mode 100755 scripts/rust-version.sh +Merging cxl/next (4ad6181e4b21 cxl/pci: Rename CXL REGLOC ID) +$ git merge cxl/next +Already up to date. +Merging akpm-current/current (4bae9e362a11 linux-next-pre) +$ git merge --no-ff akpm-current/current +Auto-merging mm/truncate.c +Auto-merging mm/filemap.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/core.c +Auto-merging kernel/kthread.c +Auto-merging kernel/hung_task.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging kernel/cpu.c +Auto-merging init/main.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/highmem.h +Auto-merging include/linux/fs.h +Auto-merging fs/internal.h +Auto-merging fs/inode.c +Auto-merging fs/exec.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging arch/powerpc/mm/book3s64/radix_tlb.c +Auto-merging arch/powerpc/kernel/smp.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/smp.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/Kconfig +Resolved 'arch/powerpc/kernel/smp.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c9d9a4ae907f] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/mm/memory-hotplug.rst | 738 ++++++++++++++---------- + arch/Kconfig | 28 + + arch/arm/mach-rpc/ecard.c | 2 +- + arch/arm64/Kconfig | 1 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 +- + fs/buffer.c | 56 +- + fs/drop_caches.c | 3 +- + fs/exec.c | 4 +- + fs/hfsplus/catalog.c | 16 +- + fs/hfsplus/dir.c | 4 +- + fs/hfsplus/hfsplus_raw.h | 12 +- + fs/hfsplus/xattr.c | 18 +- + fs/inode.c | 48 +- + fs/internal.h | 1 - + fs/ocfs2/namei.c | 17 +- + fs/proc/kcore.c | 67 +++ + fs/proc/page.c | 40 +- + include/linux/compiler-clang.h | 11 + + include/linux/fs.h | 1 + + include/linux/highmem.h | 28 +- + include/linux/memremap.h | 6 + + include/linux/mm_types.h | 2 + + include/linux/mm_types_task.h | 5 + + include/linux/pagemap.h | 50 ++ + include/linux/sched.h | 8 + + include/linux/sched/mm.h | 21 + + init/main.c | 25 +- + kernel/cpu.c | 2 +- + kernel/exit.c | 2 +- + kernel/fork.c | 51 ++ + kernel/hung_task.c | 44 ++ + kernel/kthread.c | 21 +- + kernel/sched/core.c | 35 +- + kernel/sched/sched.h | 4 +- + kernel/sysctl.c | 8 +- + lib/Kconfig.debug | 6 + + mm/Kconfig | 2 +- + mm/filemap.c | 23 +- + mm/kasan/kasan.h | 6 + + mm/memory.c | 2 +- + mm/memremap.c | 20 + + mm/mprotect.c | 52 +- + mm/truncate.c | 47 +- + mm/vmscan.c | 16 +- + mm/workingset.c | 10 + + mm/zsmalloc.c | 5 +- + 49 files changed, 1112 insertions(+), 467 deletions(-) +$ 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/66)
Rebasing (2/66)
Rebasing (3/66)
Rebasing (4/66)
Rebasing (5/66)
Rebasing (6/66)
Rebasing (7/66)
Rebasing (8/66)
Rebasing (9/66)
Rebasing (10/66)
Rebasing (11/66)
Rebasing (12/66)
Rebasing (13/66)
Rebasing (14/66)
Rebasing (15/66)
Rebasing (16/66)
Rebasing (17/66)
Rebasing (18/66)
Rebasing (19/66)
Rebasing (20/66)
Rebasing (21/66)
Rebasing (22/66)
Rebasing (23/66)
Rebasing (24/66)
Rebasing (25/66)
Rebasing (26/66)
Rebasing (27/66)
Rebasing (28/66)
Rebasing (29/66)
Rebasing (30/66)
Rebasing (31/66)
Rebasing (32/66)
Rebasing (33/66)
Rebasing (34/66)
Rebasing (35/66)
Rebasing (36/66)
Rebasing (37/66)
Rebasing (38/66)
Rebasing (39/66)
Rebasing (40/66)
Rebasing (41/66)
Rebasing (42/66)
Rebasing (43/66)
Rebasing (44/66)
Rebasing (45/66)
Rebasing (46/66)
Rebasing (47/66)
Rebasing (48/66)
Rebasing (49/66)
Rebasing (50/66)
Rebasing (51/66)
Rebasing (52/66)
Rebasing (53/66)
Rebasing (54/66)
Rebasing (55/66)
Rebasing (56/66)
Rebasing (57/66)
Rebasing (58/66)
Rebasing (59/66)
Rebasing (60/66)
Rebasing (61/66)
Rebasing (62/66)
Rebasing (63/66)
Rebasing (64/66)
Rebasing (65/66)
Rebasing (66/66)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 35cd1c8eddab...93df9eb3bf3d akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (93df9eb3bf3d powerpc/mm: enable HAVE_MOVE_PMD support) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/core-api/printk-formats.rst | 11 + + arch/alpha/include/asm/pgtable.h | 8 +- + arch/arc/mm/init.c | 5 +- + arch/arm/include/asm/pgtable-3level.h | 2 +- + arch/arm/kernel/setup.c | 5 +- + arch/arm64/include/asm/Kbuild | 1 - + arch/arm64/include/asm/cacheflush.h | 6 - + arch/arm64/include/asm/kfence.h | 2 +- + arch/arm64/include/asm/pgtable.h | 8 +- + arch/arm64/include/asm/set_memory.h | 17 ++ + arch/arm64/include/uapi/asm/unistd.h | 1 + + arch/arm64/kernel/machine_kexec.c | 1 + + arch/arm64/kernel/setup.c | 5 +- + arch/arm64/kernel/stacktrace.c | 2 +- + arch/arm64/mm/mmu.c | 7 +- + arch/arm64/mm/pageattr.c | 13 +- + arch/csky/kernel/setup.c | 5 +- + arch/h8300/kernel/setup.c | 5 +- + arch/hexagon/Kconfig | 1 + + arch/hexagon/kernel/vmlinux.lds.S | 9 +- + arch/ia64/include/asm/pgtable.h | 4 +- + arch/m68k/include/asm/motorola_pgtable.h | 2 +- + arch/m68k/kernel/setup_mm.c | 5 +- + arch/m68k/kernel/setup_no.c | 5 +- + arch/mips/include/asm/pgtable-64.h | 8 +- + arch/nds32/kernel/setup.c | 5 +- + arch/nios2/kernel/setup.c | 5 +- + arch/openrisc/kernel/setup.c | 5 +- + arch/parisc/include/asm/pgtable.h | 4 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 11 +- + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 2 + + arch/powerpc/include/asm/nohash/64/pgtable-4k.h | 6 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 6 +- + arch/powerpc/include/asm/tlb.h | 6 + + arch/powerpc/kernel/setup-common.c | 5 +- + arch/powerpc/mm/book3s64/radix_hugetlbpage.c | 8 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 6 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 44 +-- + arch/powerpc/mm/pgtable_64.c | 4 +- + arch/powerpc/platforms/Kconfig.cputype | 2 + + arch/riscv/Kconfig | 4 +- + arch/riscv/include/asm/pgtable-64.h | 4 +- + arch/riscv/include/asm/unistd.h | 1 + + arch/riscv/kernel/setup.c | 5 +- + arch/s390/kernel/setup.c | 5 +- + arch/sh/include/asm/pgtable-3level.h | 4 +- + arch/sh/kernel/setup.c | 5 +- + arch/sparc/include/asm/pgtable_32.h | 6 +- + arch/sparc/include/asm/pgtable_64.h | 10 +- + arch/um/include/asm/pgtable-3level.h | 2 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/pgtable.h | 8 +- + arch/x86/kernel/dumpstack.c | 2 +- + arch/x86/kernel/setup.c | 5 +- + arch/x86/mm/init_64.c | 4 +- + arch/x86/mm/pat/set_memory.c | 4 +- + arch/x86/mm/pgtable.c | 2 +- + include/asm-generic/pgtable-nop4d.h | 2 +- + include/asm-generic/pgtable-nopmd.h | 2 +- + include/asm-generic/pgtable-nopud.h | 2 +- + include/linux/bootconfig.h | 4 +- + include/linux/buildid.h | 8 + + include/linux/compaction.h | 4 +- + include/linux/cpumask.h | 2 +- + include/linux/crash_core.h | 12 +- + include/linux/debugobjects.h | 2 +- + include/linux/hmm.h | 2 +- + include/linux/hugetlb.h | 6 +- + include/linux/kallsyms.h | 20 +- + include/linux/list_lru.h | 4 +- + include/linux/lru_cache.h | 8 +- + include/linux/mm.h | 3 + + include/linux/mmu_notifier.h | 8 +- + include/linux/module.h | 9 +- + include/linux/nodemask.h | 6 +- + include/linux/percpu-defs.h | 2 +- + include/linux/percpu-refcount.h | 2 +- + include/linux/pgtable.h | 4 +- + include/linux/scatterlist.h | 2 +- + include/linux/secretmem.h | 54 ++++ + include/linux/set_memory.h | 12 + + include/linux/shrinker.h | 2 +- + include/linux/syscalls.h | 1 + + include/linux/vmalloc.h | 4 +- + include/uapi/asm-generic/unistd.h | 7 +- + include/uapi/linux/magic.h | 1 + + init/Kconfig | 1 + + init/main.c | 2 + + kernel/crash_core.c | 50 +--- + kernel/kallsyms.c | 104 ++++++-- + kernel/module.c | 42 ++- + kernel/power/hibernate.c | 5 +- + kernel/sys_ni.c | 2 + + lib/Kconfig.debug | 17 +- + lib/asn1_encoder.c | 2 +- + lib/buildid.c | 74 ++++-- + lib/devres.c | 2 +- + lib/dump_stack.c | 13 +- + lib/dynamic_debug.c | 2 +- + lib/fonts/font_pearl_8x8.c | 2 +- + lib/kfifo.c | 2 +- + lib/list_sort.c | 2 +- + lib/nlattr.c | 4 +- + lib/oid_registry.c | 2 +- + lib/pldmfw/pldmfw.c | 2 +- + lib/reed_solomon/test_rslib.c | 2 +- + lib/refcount.c | 2 +- + lib/rhashtable.c | 2 +- + lib/sbitmap.c | 2 +- + lib/scatterlist.c | 4 +- + lib/seq_buf.c | 2 +- + lib/sort.c | 2 +- + lib/stackdepot.c | 2 +- + lib/test_bitops.c | 2 +- + lib/test_bpf.c | 2 +- + lib/test_kasan.c | 2 +- + lib/test_kmod.c | 6 +- + lib/test_scanf.c | 2 +- + lib/vsprintf.c | 10 +- + mm/Kconfig | 4 + + mm/Makefile | 1 + + mm/gup.c | 12 + + mm/init-mm.c | 9 + + mm/internal.h | 3 + + mm/mlock.c | 3 +- + mm/mmap.c | 5 +- + mm/mremap.c | 108 ++++++-- + mm/secretmem.c | 254 ++++++++++++++++++ + mm/slub.c | 79 +++--- + scripts/checksyscalls.sh | 4 + + scripts/decode_stacktrace.sh | 89 +++++-- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 3 +- + tools/testing/selftests/vm/memfd_secret.c | 296 +++++++++++++++++++++ + tools/testing/selftests/vm/mremap_test.c | 118 ++++---- + tools/testing/selftests/vm/run_vmtests.sh | 17 ++ + 137 files changed, 1465 insertions(+), 438 deletions(-) + create mode 100644 arch/arm64/include/asm/set_memory.h + create mode 100644 include/linux/secretmem.h + create mode 100644 mm/secretmem.c + create mode 100644 tools/testing/selftests/vm/memfd_secret.c diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..0776fe5a8a31 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20210708 |