diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-04-07 14:56:39 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-04-07 14:56:39 +1000 |
| commit | 5fab54423a0a88c4333e802155eeee944e82195b (patch) | |
| tree | 7ec25809feb75ae5eec3e363ea965ff09bd6604a | |
| parent | f88f47f3ce26872553c81648c51823e564216841 (diff) | |
| download | linux-next-20200407.tar.gz linux-next-20200407.tar.xz | |
Add linux-next specific files for 20200407next-20200407
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 317 | ||||
| -rw-r--r-- | Next/Trees | 319 | ||||
| -rw-r--r-- | Next/merge.log | 3459 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4100 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..24eba749beb8 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,317 @@ +Name SHA1 +---- ---- +origin 7e63420847ae5f1036e4f7c42f0b3282e73efbc2 +fixes a10c9c710f9ecea87b9f4bbb837467893b4bef01 +kbuild-current e595dd94515ed6bc5ba38fce0f9598db8c0ee9a9 +arc-current f09d3174f002ee2cf15623d5a0f68f7393536ce7 +arm-current 89604523a76eb3e13014b2bdab7f8870becee284 +arm-soc-fixes c8042d1e5cb3e654b47447229ace3cd092a8fc27 +arm64-fixes 6f5459da2b8736720afdbd67c4bd2d1edba7d0e3 +m68k-current 86cded5fc52567774b596827544874499532b8ae +powerpc-fixes 1d0c32ec3b860a32df593a22bad0d1dbc5546a59 +s390-fixes 7111951b8d4973bda27ff663f2cf18b663d15b48 +sparc 255a69a94b8cbbcfef142137b5e7f99b5d168771 +fscrypt-current 2b4eae95c7361e0a147b838715c8baa1380a428f +net aa81700cf2326e288c9ca1fe7b544039617f1fc2 +bpf 0ac16296ffc638f5163f9aeeeb1fe447268e449f +ipsec 0452800f6db4ed0a42ffb15867c0acfd68829f6a +netfilter b135fc0801b671c50de103572b819bcd41603613 +ipvs 0141317611ab913d6c227b82f3dd02ff3e6fc5d8 +wireless-drivers c9be1a642a7b9ec021e3f32e084dc781b3e5216d +mac80211 0452800f6db4ed0a42ffb15867c0acfd68829f6a +rdma-fixes 7111951b8d4973bda27ff663f2cf18b663d15b48 +sound-current fd60e0683e8e9107e09cd2e4798f3e27e85d2705 +sound-asoc-fixes 3ea00fb102ad61652c0114be0b68ddc1bc6060a0 +regmap-fixes 87fc8230f7aa11aeb382a2a6d1a1a02e3a038a7b +regulator-fixes bae4cb90541a5bb9625377f6edf94e3dd1b9bb96 +spi-fixes b3027f88cffbdfa83c1323dd84ea73b96521767d +pci-current 7e63420847ae5f1036e4f7c42f0b3282e73efbc2 +driver-core.current a10c9c710f9ecea87b9f4bbb837467893b4bef01 +tty.current a10c9c710f9ecea87b9f4bbb837467893b4bef01 +usb.current 7e63420847ae5f1036e4f7c42f0b3282e73efbc2 +usb-gadget-fixes 42cd5ffe46c1037d5d9a253c72e71a024a7bfbef +usb-serial-fixes 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +usb-chipidea-fixes 7cbf3dd3139ab4683d9cffe9d6972a1dbe3ecaa6 +phy be4e3c737eebd75815633f4b8fd766defaf0f1fc +staging.current a10c9c710f9ecea87b9f4bbb837467893b4bef01 +char-misc.current 7e63420847ae5f1036e4f7c42f0b3282e73efbc2 +soundwire-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +thunderbolt-fixes 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +input-current 4134252ab7e2c339a54302b88496cb5a89cdbaec +crypto-current 755bddd1e4eaf9178758bd554c60aaab46fc42ba +ide 78a515f9faf3af43cf9c4f61254dd1c5b3cb2d0b +vfio-fixes 95f89e090618efca63918b658c2002e57d393036 +kselftest-fixes f3a60268f5cec7dae0e9713f5fc65aecc3734c09 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +slave-dma-fixes 018af9be3dd54e6f24f828966bdd873f4d63ad9b +backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +mtd-fixes def9d2780727cec3313ed3522d0123158d87224d +mfd-fixes 603d9299da32955d49995738541f750f2ae74839 +v4l-dvb-fixes 2632e7b618a7730969f9782593c29ca53553aa22 +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes f7d5f5655ef7e5d2a128f6696ac35256e83b119b +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes 07bdc492cff6f555538df95e9812fe72e16d154a +kvm-fixes e1be9ac8e6014a9b0a216aebae7250f9863e9fc3 +kvms390-fixes e12e65de308490b5a6802eb6155358d663f3e955 +hwmon-fixes 4eb981e976791a08beede15a23cc862795e72afd +nvdimm-fixes f84afbdd3a9e5e10633695677b95422572f920dc +btrfs-fixes f5bf9a8fa525a858f520ba64618b35132dfd6ce1 +vfs-fixes 5bd73286d50fc242bbff1aaddb0e97c4527c9d78 +dma-mapping-fixes 9c24eaf81cc44d4bb38081c99eafd72ed85cf7f3 +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes 1a323ea5356edbb3073dc59d51b9e6b86908857d +samsung-krzk-fixes 0d935f0bf77d8d6f924f35da4b549c94d36795d2 +pinctrl-samsung-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +devicetree-fixes e33a814e772cdc36436c8c188d8c42d019fda639 +scsi-fixes ea697a8bf5a4161e59806fab14f6e4a46dc7dcb0 +drm-fixes c4b979ebcafe978338cad1df4c77cdc8f84bd51c +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 7111951b8d4973bda27ff663f2cf18b663d15b48 +mmc-fixes 2a7e3035f89d107c905438938067dc903b810ce5 +rtc-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +gnss-fixes f8788d86ab28f61f7b46eb6be375f8a726783636 +hyperv-fixes 032d4a4802209fe25ce44deb2c002dccf663925f +soc-fsl-fixes fe8fe7723a3a824790bda681b40efd767e2251a7 +risc-v-fixes 2191b4f298fa360f2d1d967c2c7db565bea2c32e +pidfd-fixes 10dab84caf400f2f5f8b010ebb0c7c4272ec5093 +fpga-fixes 3c2760b78f90db874401d97e3c17829e2e36f400 +spdx 5364abc57993b3bf60c41923cb98a8f1a594e749 +gpio-intel-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +pinctrl-intel-fixes 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +erofs-fixes d1eef1c619749b2a57e514a3fa67d9a516ffa919 +drm-misc-fixes 83a196773b8bc6702f49df1eddc848180e350340 +kspp-gustavo 90e5d84c7b06b849a330ea43625086ff81388ed4 +kbuild d49e72ada0b975f30513ecff8381a0d9e185b6d4 +compiler-attributes 98d54f81e36ba3bf92172791eba5ca5bd813989b +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping fd27a526bb381f43dded6db30b3b016468ab0e6c +asm-generic 060dc911501f6ee222569304f50962172a52b1d6 +arc def9d2780727cec3313ed3522d0123158d87224d +arm 52d3b2f98483c34af44171dd10f43f90b7cf1ae0 +arm64 e16e65a02913d29a7b27c4e3a415ceec967b0629 +arm-perf 8673e02e58410e6c4cefa499efa846286e45a991 +arm-soc d9725e56e1d806021cb277c3faf0c9ffad621576 +amlogic e304af8727dd515315dde08ce453df0e6897afc0 +aspeed de285b938cf330b30acfdb037d14018d38292c3e +at91 ec539e70d882af33660bcab178a59b1251588a22 +imx-mxs e506dba69a5e9aaff20fd73a108639f84e2c39d9 +keystone 560b4d4691b07819f8d3e0cb030f72f863ec1ba3 +mediatek 6906847e14b57ae3e624dea2e1766578840850fe +mvebu 9d32706f8aa8bbea3722e8f074801c0807d19951 +omap e90f16cc1a48c3ca39f3a1756b3f1fd34fedbc62 +qcom 8dc3769c8a680bfc1f38221e68d3fd994f490970 +raspberrypi e7b7daeb48e0bf5d8412d77f11069750ee7032bb +realtek 45698e00d5a904bdefd5d4cd4a751803674815f1 +renesas bf4540d5148c39f1339cc9c870b4075864a8c76c +reset 2ebf89fd4ecf37e7ae4c323a9fd69f9d9d0ea260 +rockchip c018aff1a20156b60e0cf9cc906a21e2e64767e6 +samsung-krzk 5c1cb4ae848e3cd49faa56ba30c9ac6aa978055c +scmi 7111951b8d4973bda27ff663f2cf18b663d15b48 +sunxi 8afff9da61eaa1ffd0fbf0296027c58c0e8074f2 +tegra df0a178cf2df7b29622514556e15a98c626fb23e +clk 28ecaf1c30fe3f616eef5ab2dd5990399957234e +clk-samsung 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky aefd9461d34a1b0a2acad0750c43216c1c27b9d4 +h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e +ia64 172e7890406d6183b9b39271ffb434ff0a97ce72 +m68k 86cded5fc52567774b596827544874499532b8ae +m68knommu ba000760eb0f182e6ef04faca70bb9737a9674b4 +microblaze 9fd1a1c9b3f2a38a5357a13335e0b9e5f21d093b +mips ba15533275dd70238b523417d222d43fb40dac9d +nds32 d785c5a324cd8812720a409dc85050558281a567 +nios2 051d75d3bb31d456a41c7dc8cf2b8bd23a96774f +openrisc 9737e2c5f0bc768b58416ec070bd96c91c52a153 +parisc-hd 106c90922e1e0cd5fcbb34be8ebbb3e8a8e71909 +powerpc 6ba4a2d3591039aea1cb45c7c42262d26351a2fa +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl 461c3ac0dc46ba7fc09628aadf63c81253c4c3de +risc-v 37809df4b1c88927fe944eb766e0553811c51f64 +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 2bc55eaeb88d30accfc1b6ac2708d4e4b81ca260 +sh a193018e5290ee9d9fe62ad80cd8f874711eb575 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml 4a7c46247f9c620c0390a15cb00b6ef9576b9c23 +xtensa 70cbddb973859158731ce77ab20cd5e53822c089 +fscrypt 861261f2a9cc488c845fc214d9035f7a11094591 +afs 4fe171bb81b13b40bf568330ec3716dfb304ced1 +btrfs 5a7ef5cb05dc077737d88162aeaa8661acc2a946 +ceph 3e10eb7331c7558dc84422fd77878b9a6f34dfe1 +cifs 543931076d046166f953c0b61866c82106738bcf +configfs e2f238f7d5a1fa69ff1884d37acf9a2a3a01b308 +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs 20741a6e146cab59745c7f25abf49d891a83f8e9 +ext3 a32f0ecd79b4757e417b778c8dc64916e93f7b80 +ext4 54d3adbc29f0c7c53890da1683e629cd220d7201 +f2fs 531dfae52e8c386f72fc4935b97486409291fdb1 +fsverity 98d54f81e36ba3bf92172791eba5ca5bd813989b +fuse 3e8cb8b2eaeb22f540f1cbc00cbb594047b7ba89 +jfs 7aba5dcc234635b44b2781dbc268048cfba388ad +nfs 93ce4af774bc3d8a72ce2271d03241c96383629d +nfs-anna 55dee1bc0d72877b99805e42e0205087e98b9edd +nfsd 2653de9f0398b3230bb098704451ba16be5458f0 +orangefs c472a4cbb3e82a21bc4cfd54090c396b53dea03f +overlayfs 2eda9eaa6d7ec129150df4c7b7be65f27ac47346 +ubifs 3676f32a98cd6ed4481c21bceb8b4829d4b6d1cf +v9fs 43657496e46672fe63bccc1fcfb5b68de6e1e2f4 +xfs 5833112df7e9a306af9af09c60127b92ed723962 +zonefs 0dda2ddb7ded1395189e95d43106469687c07795 +iomap 457df33e035a2cffc6561992f3f25a6c61605c46 +djw-vfs 56939e014a6c212b317414faa307029e2e80c3b9 +file-locks dbdaf6a3250b9cda6d7f761e9ff8b8bed8409a38 +vfs ffca8b2a77f27cdaec081a8bd447f8a5c59af142 +printk d34f14ae521f076f68f3ce213c64193f9a5a8adf +pci 7e63420847ae5f1036e4f7c42f0b3282e73efbc2 +pstore 8128d3aac0ee3420ede34950c9c0ef9ee118bec9 +hid 04f6305f8071ed2dfac9f98e27263e79fbd8ad33 +i2c a10c9c710f9ecea87b9f4bbb837467893b4bef01 +i3c c4b9de11d0101792c4d5458b18581f4f527862d1 +dmi 12028f913eb9090859d6cc1d579dd4f6c83306a3 +hwmon-staging 5b10a8194664a0d3b025f9b53de4476754ce8e41 +jc_docs abcb1e021ae5a36374c635eeaba5cec733169b78 +v4l-dvb 2632e7b618a7730969f9782593c29ca53553aa22 +v4l-dvb-next 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 7e63420847ae5f1036e4f7c42f0b3282e73efbc2 +cpufreq-arm a8811ec764f95a04ba82f6f457e28c5e9e36e36b +cpupower 2de7fb60a4740135e03cf55c1982e393ccb87b6b +opp 03758d60265c773e1d06d436b99ee338f2ac55d6 +thermal 76a5c400aae52f541737de982e2b5a2e1f423bab +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma b4d8ddf8356d8ac73fb931d16bcc661a83b2c0fe +net-next 1a323ea5356edbb3073dc59d51b9e6b86908857d +bpf-next 1a323ea5356edbb3073dc59d51b9e6b86908857d +ipsec-next 308491755f36c461ee67290af159fdba6be0169d +mlx5-next 826096d84f509d95ee8f72728fe19c44fbb9df6b +netfilter-next 1a323ea5356edbb3073dc59d51b9e6b86908857d +ipvs-next d54725cd11a57c30f650260cfb0a92c268bdc3e0 +wireless-drivers-next 5988b8ec713270fa29e0535ff3d0ef26a94c8220 +bluetooth d2a3f5f4635b7b0df8d4cd04ee0c75886ef699b9 +mac80211-next 1e8f471425f4012f2c98f228ac2ba19cea22c39b +gfs2 75b46c437f6b0f8e37032a407c7373f85f5c26a8 +mtd 025a06c1104cd8995646b761d117816b5f28c873 +nand fca88925d76978b7f20de42d8ead34fb91500003 +spi-nor f3f2b7eb2f1c5889b0a7162b6b5a69c0f357befd +crypto fcb90d51c375d09a034993cda262b68499e233a4 +drm 0e7e6198af28c1573267aba1be33dd0b7fb35691 +amdgpu f7c9c5d47481cb1ada8182cb327f18138d1102b2 +drm-intel 1aaea8476d9f014667d2cb24819f9bcaf3ebb7a4 +drm-tegra e32c8c2a5fbe1514e4ae9063a49e76ecf486ffb8 +drm-misc b513b0d4563ab70a0a25e7a0ed94afaf88ac28bf +drm-msm a5fb8b918920c6f7706a8b5b8ea535a7f077a7f6 +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm 2c76b324c7944fedf453abca5003569d9556c6df +etnaviv f232d9ec029ce3e2543b05213e2979e01e503408 +regmap 2060986f04ad409fa6cb8059251d215064618253 +sound fd60e0683e8e9107e09cd2e4798f3e27e85d2705 +sound-asoc 3ea00fb102ad61652c0114be0b68ddc1bc6060a0 +modules 0f74226649fb2875a91b68f3750f55220aa73425 +input 3a8579629665bd6c0b37afcb2291080e959b885d +block b630b0f59955fc2c68ac7504ec43ee19521038dc +device-mapper 8267d8fb4819afa76b2a54dca48efdda6f0b1910 +pcmcia a8c122f72d944f0e77b58c8b44a539a8f0e39017 +mmc 92075d98abf0f42db1cb518150364f196d4ad217 +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd d2923aa4535664ae5c46c3a093985afd18fec118 +backlight ee0c8e494cc3c135350cd5c4752e82af3feae1ab +battery f78c55e3b4806974f7d590b2aab8683232b7bd25 +regulator 24bd2afda8ce633385a3c96aa51181008d7252da +security 3e27a33932df104f4f9ff811467b0b4ccebde773 +apparmor 01df52d726b5d55d2970f5c957f1961930acd5d6 +integrity 9e2b4be377f0d715d9d910507890f9620cc22a9d +keys 43672cf93c6d96380222064aec06e9593113cdea +selinux c753924b628551564b6eea3c9896e4a95aa25ed9 +smack 92604e825304ce170955df44b00973843054dcd5 +tomoyo 9efcc4a129363187c9bf15338692f107c5c9b6f0 +tpmdd 2e356101e72ab1361821b3af024d64877d9a798d +watchdog 2d63908bdbfbce0d98195b22236ad5105dc6eba2 +iommu ff68eb23308e6538ec7864c83d39540f423bbe90 +vfio f44efca0493ddc1e8731047c234ec8e475943077 +audit 1320a4052ea11eb2879eb7361da15a106a780972 +devicetree 8967918e7cee84d8b781feec38286c7d3c1c05da +mailbox 0a67003b1985c79811160af1b01aca07cd5fbc53 +spi b3027f88cffbdfa83c1323dd84ea73b96521767d +tip ee8bac724cc7767dcf9480afb656318994f22c3d +clockevents c1ac28a4de6f848ef17b43ee76d1f28a219c3785 +edac ad49d9a8228e10cb4ee8b7f13c88d4711aa55894 +irqchip 4cea749d56bec9409f3bd126d2b2f949dc6c66e2 +ftrace 8e99cf91b99bb30e16727f10ad6828741c0e992f +rcu aa93ec620be378cce1454286122915533ff8fa48 +kvm 514ccc194971d0649e4e7ec8a9b3a6e33561d7bf +kvm-arm 463050599742a89e0508355e626e032e8d0dab8d +kvm-ppc 9a5788c615f52f6d7bf0b61986a632d4ec86791d +kvms390 7a2653612bb6f18fb236c5b0c4d28f7b459bf7c2 +xen-tip c3881eb58d56116c79ac4ee4f40fd15ead124c4b +percpu dedac37ea96b23c23b72d6e90f01d060d5287e4e +workqueues 4acf8a423cd321248b4cc9eb21c11bb88931938b +drivers-x86 1a323ea5356edbb3073dc59d51b9e6b86908857d +chrome-platform 317a0ebe53f46527aed912f7c3df963cd9a41536 +hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +leds 10a6cce3c1a15e40dd7b69e66e4780476e590f68 +ipmi 562bf7705885855ed8ed5483895ddff509acae7c +driver-core a10c9c710f9ecea87b9f4bbb837467893b4bef01 +usb 7e63420847ae5f1036e4f7c42f0b3282e73efbc2 +usb-gadget 4a5dbd9009570d3b23fd1392c4d178bfe3538d2c +usb-serial 57aa9f294b09463492f604feaa5cc719beaace32 +usb-chipidea-next 86b17c7f14ed1a442246a332c90df0e81003a2d3 +phy-next 89d715371a05b1dee32faf49014b1acff6138b83 +tty a10c9c710f9ecea87b9f4bbb837467893b4bef01 +char-misc 7e63420847ae5f1036e4f7c42f0b3282e73efbc2 +extcon 9c94553099efb2ba873cbdddfd416a8a09d0e5f1 +soundwire 39ec6f992131f0e88910700286d83f5f48f4ee8f +thunderbolt 3010518964dc96c41848a05a5b0ec11ccf8d5ebe +staging a10c9c710f9ecea87b9f4bbb837467893b4bef01 +mux f356d58c3a04159f35003b26f8c5183f9456f95d +icc 03c4e6186bbbe639b5277077c26786069e9e2b89 +slave-dma cea582b5ee5645839650b6667335cfb40ec71c19 +cgroup ee3d5a56f262410e6679c379dec0848cc723ab50 +scsi c128052e69912d263f01d93262c520f5395ad081 +scsi-mkp 1b55940b9bcc64acb7336224b0e49203ff7987c6 +vhost d54fc2d54ae9784f00234dcdab3b04e168586876 +rpmsg 45c2824de341e67ac80d888cd5ea5c90d5fc5ab6 +gpio 4ed7d7dd4890bb8120a3e77c16191a695fdfcc5a +gpio-brgl 03434e049439226f8d4f3420838c6987dd969a64 +gpio-intel bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +pinctrl c42f69b4207e104229242c3d9da43b55d4b95d6d +pinctrl-intel 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +pinctrl-samsung bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +pwm 9cc5f232a4b6a0ef6e9b57876d61b88f61bdd7c2 +userns d1e7fd6462ca9fc76650fbe6ca800e35b24267da +ktest 1091c8fce8aa9c5abe1a73acab4bcaf58a729005 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest 1056d3d2c97e47397d0037cbbdf24235ae8f88cb +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching d28b4c1b2b3d1337069cbe0bf0bec151d0e4d576 +coresight ed0efaa66ad871ee47af0c86f66538ea20e79fc8 +rtc 1821b79d6a7d6973d1630e71380da8bb5e95f3a5 +nvdimm f6d2b802f80d0ca89ee1f51c1781b3f79cdb25d5 +at24 4837621cd61e6b81a182098889143c6c9a06b0f3 +ntb b9fc54c38e2e0d189b027eaf10135e5a1a196bd4 +kspp 2e8993d7769738e2c99928d78759013a9edd9612 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss f8788d86ab28f61f7b46eb6be375f8a726783636 +fsi 2c01397b71c5e5001752046328d7f2aaf51b4c13 +slimbus ba1589ff458e032f40780188189eb0fb5a71a103 +nvmem 990df64027528086ea2160f51dcb481f9b6442c5 +xarray 27586ca786a729cda6c807621a1494900a56e7bc +hyperv 86fd319b92405fb8b52fcbbf9a8720c3d40458af +auxdisplay 2f920c0f0e29268827c2894c6e8f237a78159718 +kgdb 5ea771abd5a3734dfc55dee3772ff94ecc0b6f6a +pidfd 6952a4f646446fde9e190b62c5e45f84c6cf91aa +devfreq 19b5622d849bf678c1b5403208ae4f581948f7b8 +hmm bd5d3587b218d33d70a835582dfe1d8f8498e702 +fpga cef0ca6417de6c3805847b5e025a1e3af7c7d473 +kunit bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +cel 1a33d8a284b1e85e03b8c7b1ea8fb985fccd1d71 +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi b6fe8bc67d2d33a9eff1b0785482bccd14979115 +kunit-next e23349af9ee25a5760112a2f8476b94a4ec86f1c +trivial fad7c9020948eab2bc4661eade4e1ef357279590 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +akpm-current 04604a3939a65ef0f85b67faa851ccd23784a78e +akpm 4fe13b118e815814a742b9d993e96377291c5f9c diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..6bc38272c23a --- /dev/null +++ b/Next/Trees @@ -0,0 +1,319 @@ +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#master +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 +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/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#ci-for-usb-stable +phy git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +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 +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.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 +slave-dma-fixes git git://git.infradead.org/users/vkoul/slave-dma.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 +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#master +drivers-x86-fixes git git://git.infradead.org/linux-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#pinctrl-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-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 +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 +leaks git https://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git#leaks-next +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 +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux-at91.git#at91-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.infradead.org/linux-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 +realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.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 +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 +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-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 +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#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 +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/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 +sifive git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sh git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#sh-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 +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +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 +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 +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.infradead.org/ubifs-2.6.git#linux-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/pmladek/printk.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 quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +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 +fbdev git git://github.com/bzolnier/linux.git#fbdev-for-next +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 +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 +thermal-rzhang git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#master +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 +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +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 +amdgpu git git://people.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-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +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 +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-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 +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#for-next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.infradead.org/users/jjs/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 +vfio git git://github.com/awilliam/linux-vfio.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#linux-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.infradead.org/linux-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#ci-for-usb-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#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 +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 +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.linaro.org/people/georgi.djakov/linux.git#icc-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.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-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 +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +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 +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/linux-dax.git#xarray +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 +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-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 +cel git git://git.linux-nfs.org/projects/cel/cel-2.6.git#cel-next +generic-ioremap git git://git.infradead.org/users/hch/ioremap.git#for-next +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 +zx2c4 git git://git.kernel.org/pub/scm/linux/kernel/git/zx2c4/linux.git#for-next +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..252d530182b8 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3459 @@ +$ date -R +Tue, 07 Apr 2020 09:47:39 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at a10c9c710f9e Merge tag 'for-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply +Merging origin/master (7e63420847ae Merge tag 'acpi-5.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge origin/master +Updating a10c9c710f9e..7e63420847ae +Fast-forward + Documentation/admin-guide/kernel-parameters.txt | 11 +- + Documentation/admin-guide/pm/suspend-flows.rst | 270 +++++++++++ + Documentation/admin-guide/pm/system-wide.rst | 1 + + arch/csky/Kconfig | 13 + + arch/csky/abiv1/inc/abi/entry.h | 5 +- + arch/csky/abiv2/fpu.c | 5 - + arch/csky/abiv2/inc/abi/entry.h | 67 ++- + arch/csky/abiv2/inc/abi/fpu.h | 3 +- + arch/csky/abiv2/mcount.S | 48 ++ + arch/csky/include/asm/ftrace.h | 2 + + arch/csky/include/asm/kprobes.h | 48 ++ + arch/csky/include/asm/probes.h | 24 + + arch/csky/include/asm/processor.h | 1 + + arch/csky/include/asm/ptrace.h | 43 ++ + arch/csky/include/asm/thread_info.h | 2 + + arch/csky/include/asm/uprobes.h | 33 ++ + arch/csky/kernel/Makefile | 1 + + arch/csky/kernel/asm-offsets.c | 1 + + arch/csky/kernel/entry.S | 18 +- + arch/csky/kernel/ftrace.c | 42 ++ + arch/csky/kernel/head.S | 5 + + arch/csky/kernel/probes/Makefile | 7 + + arch/csky/kernel/probes/decode-insn.c | 49 ++ + arch/csky/kernel/probes/decode-insn.h | 20 + + arch/csky/kernel/probes/ftrace.c | 66 +++ + arch/csky/kernel/probes/kprobes.c | 499 +++++++++++++++++++++ + arch/csky/kernel/probes/kprobes_trampoline.S | 19 + + arch/csky/kernel/probes/simulate-insn.c | 398 ++++++++++++++++ + arch/csky/kernel/probes/simulate-insn.h | 49 ++ + arch/csky/kernel/probes/uprobes.c | 150 +++++++ + arch/csky/kernel/ptrace.c | 103 +++++ + arch/csky/kernel/setup.c | 63 +-- + arch/csky/kernel/signal.c | 6 + + arch/csky/kernel/smp.c | 6 + + arch/csky/kernel/traps.c | 29 +- + arch/csky/mm/cachev2.c | 45 +- + arch/csky/mm/fault.c | 11 + + arch/x86/kernel/acpi/cstate.c | 3 +- + drivers/acpi/acpica/acnamesp.h | 2 + + drivers/acpi/acpica/dbinput.c | 16 +- + drivers/acpi/acpica/dbxface.c | 1 + + drivers/acpi/acpica/dswexec.c | 33 ++ + drivers/acpi/acpica/dswload.c | 2 - + drivers/acpi/acpica/dswload2.c | 35 ++ + drivers/acpi/acpica/nsnames.c | 6 +- + drivers/acpi/acpica/utdecode.c | 2 +- + drivers/acpi/acpica/utdelete.c | 9 +- + drivers/acpi/acpica/utprint.c | 7 +- + drivers/acpi/cppc_acpi.c | 33 +- + drivers/acpi/device_pm.c | 2 +- + drivers/acpi/dptf/dptf_power.c | 2 +- + drivers/acpi/dptf/int340x_thermal.c | 8 +- + drivers/acpi/processor_throttling.c | 7 - + drivers/acpi/sleep.c | 4 + + drivers/acpi/sleep.h | 1 + + drivers/acpi/tables.c | 2 +- + drivers/acpi/video_detect.c | 9 + + drivers/acpi/wakeup.c | 81 ++++ + drivers/base/power/main.c | 7 +- + drivers/cpufreq/Kconfig | 4 +- + drivers/cpufreq/Kconfig.x86 | 2 + + drivers/platform/x86/intel-hid.c | 2 +- + drivers/platform/x86/intel_int0002_vgpio.c | 10 + + .../intel/int340x_thermal/int3400_thermal.c | 2 +- + .../intel/int340x_thermal/int3403_thermal.c | 2 +- + fs/9p/Kconfig | 20 +- + fs/9p/vfs_file.c | 5 +- + fs/9p/vfs_inode.c | 2 +- + fs/ext2/xattr.c | 18 +- + fs/ext2/xattr.h | 2 +- + fs/namei.c | 2 +- + fs/notify/fanotify/fanotify.c | 302 ++++++++++--- + fs/notify/fanotify/fanotify.h | 189 +++++--- + fs/notify/fanotify/fanotify_user.c | 220 +++++---- + fs/notify/fsnotify.c | 22 +- + fs/notify/inotify/inotify_fsnotify.c | 12 +- + fs/notify/inotify/inotify_user.c | 2 +- + fs/udf/udf_sb.h | 2 +- + include/acpi/acpixf.h | 2 +- + include/acpi/actbl2.h | 21 +- + include/acpi/actbl3.h | 6 +- + include/acpi/acuuid.h | 2 +- + include/acpi/processor.h | 8 + + include/linux/acpi.h | 5 + + include/linux/fanotify.h | 3 +- + include/linux/fsnotify.h | 138 +++--- + include/linux/fsnotify_backend.h | 70 ++- + include/net/9p/client.h | 4 +- + include/uapi/linux/fanotify.h | 13 +- + kernel/audit_fsnotify.c | 13 +- + kernel/audit_watch.c | 16 +- + kernel/power/hibernate.c | 2 +- + kernel/power/main.c | 7 + + net/9p/client.c | 134 +++--- + 94 files changed, 3094 insertions(+), 605 deletions(-) + create mode 100644 Documentation/admin-guide/pm/suspend-flows.rst + create mode 100644 arch/csky/include/asm/kprobes.h + create mode 100644 arch/csky/include/asm/probes.h + create mode 100644 arch/csky/include/asm/uprobes.h + create mode 100644 arch/csky/kernel/probes/Makefile + create mode 100644 arch/csky/kernel/probes/decode-insn.c + create mode 100644 arch/csky/kernel/probes/decode-insn.h + create mode 100644 arch/csky/kernel/probes/ftrace.c + create mode 100644 arch/csky/kernel/probes/kprobes.c + create mode 100644 arch/csky/kernel/probes/kprobes_trampoline.S + create mode 100644 arch/csky/kernel/probes/simulate-insn.c + create mode 100644 arch/csky/kernel/probes/simulate-insn.h + create mode 100644 arch/csky/kernel/probes/uprobes.c +Merging fixes/master (a10c9c710f9e Merge tag 'for-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (e595dd94515e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (f09d3174f002 ARC: allow userspace DSP applications to use AGU extensions) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (89604523a76e ARM: 8961/2: Fix Kbuild issue caused by per-task stack protector GCC plugin) +$ git merge arm-current/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (c8042d1e5cb3 soc: samsung: chipid: Fix return value on non-Exynos platforms) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (6f5459da2b87 arm64: alternative: fix build with clang integrated assembler) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (86cded5fc525 m68k: defconfig: Update defconfigs for v5.6-rc4) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (1d0c32ec3b86 KVM: PPC: Fix kernel crash with PR KVM) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (7111951b8d49 Linux 5.6) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (255a69a94b8c sparc32: use per-device dma_ops) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/include/asm/dma-mapping.h | 15 ++------------- + arch/sparc/kernel/ioport.c | 3 --- + arch/sparc/kernel/of_device_common.c | 1 + + arch/sparc/mm/io-unit.c | 9 ++++----- + arch/sparc/mm/iommu.c | 15 ++++++++------- + arch/sparc/mm/mm_32.h | 3 --- + arch/sparc/mm/srmmu.c | 4 +--- + 7 files changed, 16 insertions(+), 34 deletions(-) +Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (aa81700cf232 macsec: fix NULL dereference in macsec_upd_offload()) +$ git merge net/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/marvell,mvusb.yaml | 29 +++--- + drivers/crypto/chelsio/chcr_ktls.c | 1 + + drivers/net/can/slcan.c | 4 +- + drivers/net/dsa/bcm_sf2.c | 9 +- + drivers/net/dsa/mt7530.c | 3 + + .../ethernet/aquantia/atlantic/macsec/macsec_api.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 3 +- + drivers/net/ethernet/cavium/common/cavium_ptp.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 5 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c | 23 +++++ + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.h | 1 + + drivers/net/ethernet/faraday/ftgmac100.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 18 ++-- + .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 2 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 31 +++--- + drivers/net/ethernet/realtek/r8169_main.c | 29 +++--- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 11 +++ + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 17 +++- + drivers/net/macsec.c | 3 + + drivers/net/phy/at803x.c | 4 +- + drivers/net/phy/micrel.c | 7 ++ + drivers/net/tun.c | 10 +- + drivers/net/usb/pegasus.c | 38 ++----- + drivers/net/wimax/i2400m/driver.c | 7 +- + include/linux/skbuff.h | 38 +++---- + net/core/neighbour.c | 10 +- + net/core/sock.c | 2 +- + net/dsa/slave.c | 2 +- + net/ipv6/addrconf.c | 11 ++- + net/ipv6/ndisc.c | 4 +- + net/ipv6/rpl.c | 6 +- + net/ipv6/rpl_iptunnel.c | 2 +- + net/mptcp/options.c | 2 + + net/mptcp/pm.c | 2 + + net/mptcp/pm_netlink.c | 2 + + net/mptcp/protocol.c | 109 ++++++++++++++++++++- + net/mptcp/protocol.h | 2 + + net/mptcp/subflow.c | 3 +- + net/mptcp/token.c | 9 +- + net/openvswitch/flow_table.c | 10 +- + net/sched/cls_tcindex.c | 45 +++++++-- + 43 files changed, 361 insertions(+), 163 deletions(-) +Merging bpf/master (0ac16296ffc6 bpf: Fix a typo "inacitve" -> "inactive") +$ git merge bpf/master +Auto-merging net/core/sock.c +Auto-merging lib/Kconfig.debug +Merge made by the 'recursive' strategy. + arch/riscv/Kconfig | 2 +- + kernel/bpf/bpf_lru_list.h | 2 +- + lib/Kconfig.debug | 2 ++ + net/core/sock.c | 2 +- + net/xdp/xsk.c | 5 +++-- + tools/lib/bpf/netlink.c | 4 ++-- + tools/testing/selftests/bpf/prog_tests/test_lsm.c | 18 +++++++++--------- + tools/testing/selftests/bpf/progs/lsm.c | 8 ++++---- + tools/testing/selftests/bpf/verifier/bounds.c | 4 ++-- + 9 files changed, 25 insertions(+), 22 deletions(-) +Merging ipsec/master (0452800f6db4 net: dsa: mt7530: fix null pointer dereferencing in port5 setup) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (b135fc0801b6 netfilter: ipset: Pass lockdep expression to RCU lists) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + include/net/netfilter/nf_tables.h | 2 +- + include/uapi/linux/netfilter/xt_IDLETIMER.h | 1 + + net/netfilter/ipset/ip_set_core.c | 3 ++- + net/netfilter/nf_tables_api.c | 1 + + net/netfilter/nft_lookup.c | 12 +++++++----- + net/netfilter/nft_set_bitmap.c | 1 - + net/netfilter/nft_set_rbtree.c | 23 +++++++++++------------ + net/netfilter/xt_IDLETIMER.c | 3 +++ + 8 files changed, 26 insertions(+), 20 deletions(-) +Merging ipvs/master (0141317611ab Merge branch 'hns3-fixes') +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (c9be1a642a7b ath11k: fix compiler warnings without CONFIG_THERMAL) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath11k/thermal.h | 3 ++- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 9 +++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) +Merging mac80211/master (0452800f6db4 net: dsa: mt7530: fix null pointer dereferencing in port5 setup) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (7111951b8d49 Linux 5.6) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (fd60e0683e8e ALSA: usb-audio: Add registration quirk for Kingston HyperX Cloud Alpha S) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + drivers/firmware/edd.c | 6 +++--- + sound/core/oss/pcm_plugin.c | 22 ++++++++++++---------- + sound/pci/hda/patch_realtek.c | 1 + + sound/usb/quirks-table.h | 42 ++++++++++++++++++++++++++++++++++++++++++ + sound/usb/quirks.c | 1 + + 5 files changed, 59 insertions(+), 13 deletions(-) +Merging sound-asoc-fixes/for-linus (3ea00fb102ad Merge branch 'asoc-5.7' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/cirrus,cs42l51.yaml | 2 +- + include/sound/soc-dai.h | 2 +- + sound/soc/amd/raven/acp3x-i2s.c | 1 + + sound/soc/amd/raven/acp3x.h | 2 ++ + sound/soc/bcm/bcm63xx-pcm-whistler.c | 2 +- + sound/soc/codecs/rt5645.c | 8 ++++++++ + sound/soc/codecs/rt5682.c | 5 ++++- + sound/soc/intel/atom/sst-atom-controls.c | 4 ++++ + sound/soc/intel/atom/sst/sst_pvt.c | 2 +- + sound/soc/intel/boards/bdw-rt5650.c | 1 - + sound/soc/intel/boards/bdw-rt5677.c | 1 - + sound/soc/intel/boards/broadwell.c | 1 - + sound/soc/intel/boards/bytcr_rt5640.c | 11 +++++++++++ + sound/soc/intel/boards/haswell.c | 1 - + sound/soc/qcom/qdsp6/q6asm-dai.c | 4 ++-- + sound/soc/soc-dai.c | 8 ++++---- + sound/soc/soc-dapm.c | 8 +++++++- + sound/soc/soc-ops.c | 4 ++-- + sound/soc/soc-pcm.c | 6 ++++-- + sound/soc/soc-topology.c | 2 +- + sound/soc/sof/loader.c | 2 +- + sound/soc/stm/stm32_sai_sub.c | 4 +++- + 22 files changed, 58 insertions(+), 23 deletions(-) +Merging regmap-fixes/for-linus (87fc8230f7aa Merge branch 'regmap-5.6' into regmap-linus) +$ git merge regmap-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging regulator-fixes/for-linus (bae4cb90541a Merge branch 'regulator-5.6' into regulator-linus) +$ git merge regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (b3027f88cffb Merge branch 'spi-5.7' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-ep93xx.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) +Merging pci-current/for-linus (7e63420847ae Merge tag 'acpi-5.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (a10c9c710f9e Merge tag 'for-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (a10c9c710f9e Merge tag 'for-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (7e63420847ae Merge tag 'acpi-5.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (42cd5ffe46c1 usb: dwc3: debug: fix string position formatting mixup with ret and len) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (16fbf79b0f83 Linux 5.6-rc7) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (7cbf3dd3139a usb: chipidea: udc: fix sleeping function called from invalid context) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'recursive' strategy. +Merging phy/fixes (be4e3c737eeb phy: mapphone-mdm6600: Fix timeouts by adding wake-up handling) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (a10c9c710f9e Merge tag 'for-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (7e63420847ae Merge tag 'acpi-5.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (16fbf79b0f83 Linux 5.6-rc7) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (4134252ab7e2 Input: fix stale timestamp on key autorepeat events) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (755bddd1e4ea crypto: marvell/octeontx - fix double free of ptr) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + drivers/crypto/hisilicon/Kconfig | 2 ++ + drivers/crypto/marvell/octeontx/otx_cptvf_algs.c | 8 +++++--- + 2 files changed, 7 insertions(+), 3 deletions(-) +Merging ide/master (78a515f9faf3 drivers/ide: Fix build regression.) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/ide-scan-pci.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) +Merging vfio-fixes/for-linus (95f89e090618 vfio/type1: Initialize resv_msi_base) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (f3a60268f5ce selftest/lkdtm: Use local .gitignore) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (018af9be3dd5 dmaengine: ti: k3-udma-glue: Fix an error handling path in 'k3_udma_glue_cfg_rx_flow()') +$ git merge slave-dma-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (def9d2780727 Linux 5.5-rc7) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after changing mt6397-core) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (2632e7b618a7 media: venus: firmware: Ignore secure call error on first resume) +$ 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 (f7d5f5655ef7 MAINTAINERS: Correct MIPS patchwork URL) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (07bdc492cff6 ARM: dts: OMAP3: disable RNG on N950/N9) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/omap3-n950-n9.dtsi | 5 +++++ + 1 file changed, 5 insertions(+) +Merging kvm-fixes/master (e1be9ac8e601 KVM: X86: Narrow down the IPI fastpath to single target IPI) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (e12e65de3084 KVM: s390: vsie: Fix possible race when shadowing region 3 tables) +$ git merge kvms390-fixes/master +Merge made by the 'recursive' strategy. + arch/s390/kvm/vsie.c | 1 + + arch/s390/mm/gmap.c | 7 ++++++- + 2 files changed, 7 insertions(+), 1 deletion(-) +Merging hwmon-fixes/hwmon (4eb981e97679 hwmon: (pmbus/isl68137) Fix up chip IDs) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + Documentation/hwmon/isl68137.rst | 76 ++++++++++++++++----------------- + drivers/hwmon/pmbus/isl68137.c | 92 +++++++++++++++++++++++++++++++++++++--- + 2 files changed, 123 insertions(+), 45 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (f84afbdd3a9e libnvdimm: Out of bounds read in __nd_ioctl()) +$ git merge nvdimm-fixes/libnvdimm-fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/acpi/nfit/core.c | 10 ++++++---- + drivers/acpi/nfit/nfit.h | 1 + + drivers/nvdimm/bus.c | 6 ++++-- + tools/testing/nvdimm/test/nfit.c | 2 ++ + 5 files changed, 14 insertions(+), 6 deletions(-) +Merging btrfs-fixes/next-fixes (f5bf9a8fa525 Merge branch 'misc-5.6' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (5bd73286d50f fix a braino in legitimize_path()) +$ git merge vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (9c24eaf81cc4 iommu/vt-d: Return the correct dma mask when we are bypassing the IOMMU) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (0d935f0bf77d ARM: dts: exynos: Fix regulator node aliasing on Midas-based boards) +$ git merge samsung-krzk-fixes/fixes +Merge made by the 'recursive' strategy. +Merging pinctrl-samsung-fixes/pinctrl-fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (e33a814e772c scripts/dtc: Remove redundant YYLOC global declaration) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (ea697a8bf5a4 scsi: sd: Fix optimal I/O size for devices that change reported values) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (c4b979ebcafe Merge tag 'amd-drm-fixes-5.6-2020-03-26' of git://people.freedesktop.org/~agd5f/linux into drm-fixes) +$ 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 (7111951b8d49 Linux 5.6) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (2a7e3035f89d mmc: core: make mmc_interrupt_hpi() static) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/core/mmc_ops.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rtc-fixes/rtc-fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (f8788d86ab28 Linux 5.6-rc3) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (032d4a480220 hv: hyperv_vmbus.h: Replace zero-length array with flexible-array member) +$ git merge hyperv-fixes/hyperv-fixes +Merge made by the 'recursive' strategy. + drivers/hv/hyperv_vmbus.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq handlers after dpio create) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (2191b4f298fa RISC-V: Move all address space definition macros to one place) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (10dab84caf40 pid: make ENOMEM return value more obvious) +$ git merge pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (3c2760b78f90 fpga: dfl: pci: fix return value of cci_pci_sriov_configure) +$ git merge fpga-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/fpga/dfl-pci.c | 6 ++++-- + drivers/fpga/zynq-fpga.c | 3 ++- + 2 files changed, 6 insertions(+), 3 deletions(-) +Merging spdx/spdx-linus (5364abc57993 Merge tag 'arc-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (16fbf79b0f83 Linux 5.6-rc7) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (d1eef1c61974 Linux 5.5-rc2) +$ git merge erofs-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (83a196773b8b drm/bridge: analogix_dp: Split bind() into probe() and real bind()) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/exynos/exynos_dp.c +Auto-merging drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 33 +++++++++++++------- + drivers/gpu/drm/exynos/exynos_dp.c | 29 +++++++++-------- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 36 ++++++++++++---------- + include/drm/bridge/analogix_dp.h | 5 +-- + 4 files changed, 61 insertions(+), 42 deletions(-) +Merging kspp-gustavo/for-next/kspp (90e5d84c7b06 xattr.h: Replace zero-length array with flexible-array member) +$ git merge kspp-gustavo/for-next/kspp +Auto-merging include/linux/xattr.h +Auto-merging include/linux/swap.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/sched/topology.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/irq.h +Auto-merging include/linux/ethtool.h +Auto-merging include/linux/blk-mq.h +Auto-merging include/linux/bio.h +Merge made by the 'recursive' strategy. + drivers/firmware/dmi-sysfs.c | 2 +- + drivers/firmware/google/memconsole-coreboot.c | 2 +- + drivers/firmware/google/vpd.c | 2 +- + include/linux/bio.h | 2 +- + include/linux/blk-mq.h | 2 +- + include/linux/blk_types.h | 2 +- + include/linux/can/dev/peak_canfd.h | 4 ++-- + include/linux/cpu_rmap.h | 2 +- + include/linux/digsig.h | 4 ++-- + include/linux/dirent.h | 2 +- + include/linux/enclosure.h | 2 +- + include/linux/energy_model.h | 2 +- + include/linux/ethtool.h | 4 ++-- + include/linux/genalloc.h | 2 +- + include/linux/igmp.h | 2 +- + include/linux/ihex.h | 2 +- + include/linux/irq.h | 4 ++-- + include/linux/list_lru.h | 2 +- + include/linux/memcontrol.h | 4 ++-- + include/linux/platform_data/wilco-ec.h | 2 +- + include/linux/posix_acl.h | 2 +- + include/linux/rio.h | 4 ++-- + include/linux/rslib.h | 2 +- + include/linux/sched/topology.h | 2 +- + include/linux/skbuff.h | 2 +- + include/linux/swap.h | 2 +- + include/linux/ti_wilink_st.h | 6 +++--- + include/linux/tpm_eventlog.h | 6 +++--- + include/linux/xattr.h | 2 +- + include/uapi/linux/dlm_device.h | 4 ++-- + include/uapi/linux/fiemap.h | 2 +- + 31 files changed, 42 insertions(+), 42 deletions(-) +Merging kbuild/for-next (d49e72ada0b9 kbuild: remove -I$(srctree)/tools/include from scripts/Makefile) +$ git merge kbuild/for-next +Auto-merging net/netfilter/nf_tables_api.c +Removing arch/sh/include/uapi/asm/types.h +Removing arch/sh/include/uapi/asm/setup.h +Removing arch/h8300/include/uapi/asm/bitsperlong.h +Merge made by the 'recursive' strategy. + Documentation/kbuild/llvm.rst | 2 +- + Documentation/process/changes.rst | 4 +- + Makefile | 9 +- + arch/h8300/include/uapi/asm/bitsperlong.h | 15 --- + arch/h8300/include/uapi/asm/posix_types.h | 13 +++ + arch/sh/include/asm/bitops-op32.h | 8 +- + arch/sh/include/uapi/asm/setup.h | 2 - + arch/sh/include/uapi/asm/types.h | 2 - + arch/x86/Kconfig | 2 + + arch/x86/Kconfig.assembler | 17 +++ + arch/x86/Makefile | 22 ---- + arch/x86/crypto/Makefile | 162 ++++++++++---------------- + arch/x86/crypto/aesni-intel_avx-x86_64.S | 6 - + arch/x86/crypto/aesni-intel_glue.c | 21 +--- + arch/x86/crypto/blake2s-core.S | 2 - + arch/x86/crypto/chacha_glue.c | 6 +- + arch/x86/crypto/poly1305-x86_64-cryptogams.pl | 16 --- + arch/x86/crypto/poly1305_glue.c | 11 +- + arch/x86/crypto/sha1_ssse3_asm.S | 4 - + arch/x86/crypto/sha1_ssse3_glue.c | 13 --- + arch/x86/crypto/sha256-avx-asm.S | 3 - + arch/x86/crypto/sha256-avx2-asm.S | 3 - + arch/x86/crypto/sha256_ssse3_glue.c | 12 -- + arch/x86/crypto/sha512-avx-asm.S | 2 - + arch/x86/crypto/sha512-avx2-asm.S | 3 - + arch/x86/crypto/sha512_ssse3_glue.c | 10 -- + arch/x86/include/asm/dwarf2.h | 44 ------- + arch/x86/include/asm/xor_avx.h | 9 -- + drivers/gpu/drm/i915/Makefile | 3 - + drivers/gpu/drm/i915/i915_memcpy.c | 5 - + include/crypto/curve25519.h | 6 +- + init/Makefile | 2 +- + lib/raid6/algos.c | 8 +- + lib/raid6/avx2.c | 4 - + lib/raid6/recov_avx2.c | 6 - + lib/raid6/recov_ssse3.c | 6 - + lib/raid6/test/Makefile | 9 +- + net/netfilter/Makefile | 2 - + net/netfilter/nf_tables_api.c | 2 +- + net/netfilter/nft_set_pipapo.c | 2 +- + net/netfilter/nft_set_pipapo_avx2.h | 3 - + scripts/Kconfig.include | 3 - + scripts/Makefile | 4 - + scripts/Makefile.build | 19 +-- + scripts/Makefile.clean | 1 - + scripts/Makefile.extrawarn | 1 + + scripts/Makefile.host | 23 +--- + scripts/gcc-plugin.sh | 55 +-------- + scripts/gcc-plugins/Kconfig | 12 +- + scripts/gcc-plugins/Makefile | 21 +--- + scripts/kconfig/qconf.cc | 90 +++++++++----- + scripts/kconfig/qconf.h | 2 + + scripts/mkcompile_h | 6 +- + 53 files changed, 210 insertions(+), 508 deletions(-) + delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h + create mode 100644 arch/h8300/include/uapi/asm/posix_types.h + delete mode 100644 arch/sh/include/uapi/asm/setup.h + delete mode 100644 arch/sh/include/uapi/asm/types.h + create mode 100644 arch/x86/Kconfig.assembler +$ git am -3 ../patches/0001-Revert-x86-update-AS_-macros-to-binutils-2.23-suppor.patch +Applying: Revert "x86: update AS_* macros to binutils >=2.23, supporting ADX and AVX2" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/Kconfig.assembler +M arch/x86/crypto/Makefile +M arch/x86/crypto/aesni-intel_avx-x86_64.S +M arch/x86/crypto/aesni-intel_glue.c +M arch/x86/crypto/chacha_glue.c +M arch/x86/crypto/poly1305-x86_64-cryptogams.pl +M arch/x86/crypto/poly1305_glue.c +M arch/x86/crypto/sha1_ssse3_glue.c +M arch/x86/crypto/sha256-avx2-asm.S +M arch/x86/crypto/sha256_ssse3_glue.c +M arch/x86/crypto/sha512-avx2-asm.S +M arch/x86/crypto/sha512_ssse3_glue.c +M crypto/Kconfig +M lib/raid6/algos.c +M lib/raid6/avx2.c +M lib/raid6/recov_avx2.c +M lib/raid6/test/Makefile +M net/netfilter/Makefile +M net/netfilter/nf_tables_api.c +M net/netfilter/nft_set_pipapo.c +M net/netfilter/nft_set_pipapo_avx2.h +$ git add -A . +$ git commit -v -a --amend +[master 26dac3d15cbb] Merge remote-tracking branch 'kbuild/for-next' + Date: Tue Apr 7 10:16:55 2020 +1000 +Merging compiler-attributes/compiler-attributes (98d54f81e36b Linux 5.6-rc4) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge leaks/leaks-next +Already up to date. +Merging dma-mapping/for-next (fd27a526bb38 ARM/dma-mapping: merge __dma_supported into arm_dma_supported) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (060dc911501f nds32: fix build failure caused by page table folding updates) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (52d3b2f98483 Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (e16e65a02913 arm64: remove CONFIG_DEBUG_ALIGN_RODATA feature) +$ git merge arm64/for-next/core +Auto-merging init/Kconfig +Auto-merging drivers/firmware/efi/libstub/arm64-stub.c +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig | 5 ++++- + arch/arm64/Kconfig.debug | 13 ------------- + arch/arm64/Makefile | 7 ++++++- + arch/arm64/include/asm/memory.h | 12 +----------- + drivers/firmware/efi/libstub/arm64-stub.c | 8 +++----- + init/Kconfig | 4 ++++ + 6 files changed, 18 insertions(+), 31 deletions(-) +Merging arm-perf/for-next/perf (8673e02e5841 arm64: perf: Add support for ARMv8.5-PMU 64-bit counters) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (d9725e56e1d8 soc: document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 201 +++++++++++++++++++++++++++++++++ + 1 file changed, 201 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (e304af8727dd Merge branch 'v5.7/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (de285b938cf3 ARM: dts: aspeed: ast2600: Fix SCU IRQ controller nodes) +$ git merge aspeed/for-next +Auto-merging arch/arm/boot/dts/aspeed-g6.dtsi +Auto-merging arch/arm/boot/dts/aspeed-g5.dtsi +Auto-merging arch/arm/boot/dts/aspeed-g4.dtsi +Merge made by the 'recursive' strategy. + .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 74 ++++++++++ + .../boot/dts/aspeed-bmc-facebook-yosemitev2.dts | 151 +++++++++++++++++++++ + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 21 +++ + arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 4 + + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 34 +++++ + arch/arm/boot/dts/aspeed-g4.dtsi | 10 ++ + arch/arm/boot/dts/aspeed-g5.dtsi | 19 +++ + arch/arm/boot/dts/aspeed-g6.dtsi | 38 ++++++ + 8 files changed, 351 insertions(+) + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts +Merging at91/at91-next (ec539e70d882 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (e506dba69a5e 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 (560b4d4691b0 Merge branch 'for_5.7/keystone-dts' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/keystone-k2g-evm.dts | 101 +++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/keystone-k2g.dtsi | 22 +++++++ + 2 files changed, 123 insertions(+) +Merging mediatek/for-next (6906847e14b5 Merge branch 'v5.6-next/soc' into for-next) +$ git merge mediatek/for-next +Auto-merging drivers/gpu/drm/mediatek/mtk_hdmi.c +Auto-merging drivers/gpu/drm/mediatek/mtk_dsi.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_crtc.c +Auto-merging drivers/gpu/drm/mediatek/mtk_dpi.c +Merge made by the 'recursive' strategy. + .../bindings/arm/mediatek/mediatek,mmsys.txt | 7 +- + drivers/clk/mediatek/Kconfig | 7 + + drivers/clk/mediatek/Makefile | 1 + + drivers/clk/mediatek/clk-mt8173-mm.c | 146 +++++++++ + drivers/clk/mediatek/clk-mt8173.c | 104 ------- + drivers/gpu/drm/mediatek/Kconfig | 1 + + drivers/gpu/drm/mediatek/mtk_disp_color.c | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 5 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 12 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 19 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 259 +--------------- + drivers/gpu/drm/mediatek/mtk_drm_ddp.h | 7 - + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 45 +-- + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 2 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 8 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 4 +- + drivers/soc/mediatek/Kconfig | 8 + + drivers/soc/mediatek/Makefile | 1 + + drivers/soc/mediatek/mtk-mmsys.c | 337 +++++++++++++++++++++ + include/linux/soc/mediatek/mtk-mmsys.h | 20 ++ + 21 files changed, 592 insertions(+), 411 deletions(-) + create mode 100644 drivers/clk/mediatek/clk-mt8173-mm.c + create mode 100644 drivers/soc/mediatek/mtk-mmsys.c + create mode 100644 include/linux/soc/mediatek/mtk-mmsys.h +Merging mvebu/for-next (9d32706f8aa8 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts | 2 +- + arch/arm64/boot/dts/marvell/armada-8040-mcbin-singleshot.dts | 4 ++-- + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) +Merging omap/for-next (e90f16cc1a48 Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging qcom/for-next (8dc3769c8a68 Merge branches 'arm64-for-5.7', 'arm64-defconfig-for-5.7', 'defconfig-for-5.7', 'drivers-for-5.7' and 'dts-for-5.7' into for-next) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging raspberrypi/for-next (e7b7daeb48e0 ARM: dts: bcm283x: Use firmware PM driver for V3D) +$ git merge raspberrypi/for-next +Auto-merging arch/arm/configs/bcm2835_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/bcm2835_defconfig +Auto-merging arch/arm/boot/dts/bcm2711-rpi-4-b.dts +Resolved 'arch/arm/configs/bcm2835_defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8baa2e0e3f2a] Merge remote-tracking branch 'raspberrypi/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 13 ++++++++++++- + arch/arm/boot/dts/bcm2835-common.dtsi | 1 - + arch/arm/boot/dts/bcm2835-rpi-common.dtsi | 12 ++++++++++++ + arch/arm/boot/dts/bcm2835.dtsi | 1 + + arch/arm/boot/dts/bcm2836.dtsi | 1 + + arch/arm/boot/dts/bcm2837.dtsi | 1 + + arch/arm/configs/bcm2835_defconfig | 1 + + 7 files changed, 28 insertions(+), 2 deletions(-) + create mode 100644 arch/arm/boot/dts/bcm2835-rpi-common.dtsi +Merging realtek/for-next (45698e00d5a9 Merge branch 'v5.6/dt' into next) +$ git merge realtek/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/realtek.yaml | 21 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 2 + + arch/arm/Kconfig | 2 + + arch/arm/Makefile | 3 + + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/rtd1195-horseradish.dts | 32 +++ + arch/arm/boot/dts/rtd1195-mele-x1000.dts | 32 +++ + arch/arm/boot/dts/rtd1195.dtsi | 217 +++++++++++++++++++ + arch/arm/mach-realtek/Kconfig | 11 + + arch/arm/mach-realtek/Makefile | 2 + + arch/arm/mach-realtek/rtd1195.c | 40 ++++ + arch/arm64/boot/dts/realtek/Makefile | 6 + + arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts | 6 +- + arch/arm64/boot/dts/realtek/rtd1293.dtsi | 12 +- + arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts | 6 +- + .../arm64/boot/dts/realtek/rtd1295-probox2-ava.dts | 6 +- + arch/arm64/boot/dts/realtek/rtd1295-xnano-x5.dts | 30 +++ + arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts | 4 +- + arch/arm64/boot/dts/realtek/rtd1295.dtsi | 21 +- + arch/arm64/boot/dts/realtek/rtd1296-ds418.dts | 4 +- + arch/arm64/boot/dts/realtek/rtd1296.dtsi | 8 +- + arch/arm64/boot/dts/realtek/rtd129x.dtsi | 221 +++++++++++++------- + arch/arm64/boot/dts/realtek/rtd1395-bpi-m4.dts | 30 +++ + arch/arm64/boot/dts/realtek/rtd1395-lionskin.dts | 36 ++++ + arch/arm64/boot/dts/realtek/rtd1395.dtsi | 65 ++++++ + arch/arm64/boot/dts/realtek/rtd139x.dtsi | 193 +++++++++++++++++ + arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts | 44 ++++ + arch/arm64/boot/dts/realtek/rtd1619.dtsi | 12 ++ + arch/arm64/boot/dts/realtek/rtd16xx.dtsi | 229 +++++++++++++++++++++ + include/dt-bindings/reset/realtek,rtd1195.h | 74 +++++++ + include/dt-bindings/reset/realtek,rtd1295.h | 3 + + 32 files changed, 1268 insertions(+), 109 deletions(-) + create mode 100644 arch/arm/boot/dts/rtd1195-horseradish.dts + create mode 100644 arch/arm/boot/dts/rtd1195-mele-x1000.dts + create mode 100644 arch/arm/boot/dts/rtd1195.dtsi + create mode 100644 arch/arm/mach-realtek/Kconfig + create mode 100644 arch/arm/mach-realtek/Makefile + create mode 100644 arch/arm/mach-realtek/rtd1195.c + create mode 100644 arch/arm64/boot/dts/realtek/rtd1295-xnano-x5.dts + create mode 100644 arch/arm64/boot/dts/realtek/rtd1395-bpi-m4.dts + create mode 100644 arch/arm64/boot/dts/realtek/rtd1395-lionskin.dts + create mode 100644 arch/arm64/boot/dts/realtek/rtd1395.dtsi + create mode 100644 arch/arm64/boot/dts/realtek/rtd139x.dtsi + create mode 100644 arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts + create mode 100644 arch/arm64/boot/dts/realtek/rtd1619.dtsi + create mode 100644 arch/arm64/boot/dts/realtek/rtd16xx.dtsi + create mode 100644 include/dt-bindings/reset/realtek,rtd1195.h +Merging renesas/next (bf4540d5148c Merge branch 'renesas-arm64-dt-for-v5.7' into renesas-next) +$ git merge renesas/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging reset/reset/next (2ebf89fd4ecf reset: hi6220: Add support for AO reset controller) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/reset/fsl,imx7-src.txt | 6 +- + drivers/reset/hisilicon/hi6220_reset.c | 69 +++++++++++++- + drivers/reset/reset-imx7.c | 101 +++++++++++++++++++++ + .../dt-bindings/reset/amlogic,meson-gxbb-reset.h | 2 +- + include/dt-bindings/reset/imx8mp-reset.h | 50 ++++++++++ + include/dt-bindings/reset/imx8mq-reset.h | 56 ++++++------ + 6 files changed, 253 insertions(+), 31 deletions(-) + create mode 100644 include/dt-bindings/reset/imx8mp-reset.h +Merging rockchip/for-next (c018aff1a201 Merge branch 'v5.7-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + arch/arm/mach-rockchip/platsmp.c | 2 +- + arch/arm/mach-rockchip/rockchip.c | 2 +- + drivers/clk/rockchip/clk-pll.c | 70 +++++++++++++++++++++++---------------- + drivers/clk/rockchip/clk-rk3228.c | 17 +++------- + 4 files changed, 47 insertions(+), 44 deletions(-) +Merging samsung-krzk/for-next (5c1cb4ae848e Merge branch 'next/dt-late' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../bindings/arm/samsung/samsung-boards.yaml | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/exynos3250-monk.dts | 3 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 48 +- + arch/arm/boot/dts/exynos4210-i9100.dts | 768 +++++++++++++++++++++ + arch/arm/boot/dts/exynos4210-origen.dts | 7 +- + arch/arm/boot/dts/exynos4210-trats.dts | 41 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 33 +- + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 6 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 17 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 +- + arch/arm/boot/dts/exynos4412-origen.dts | 14 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 13 +- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 2 +- + arch/arm/configs/exynos_defconfig | 2 + + 15 files changed, 915 insertions(+), 49 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos4210-i9100.dts +Merging scmi/for-linux-next (7111951b8d49 Linux 5.6) +$ git merge scmi/for-linux-next +Already up to date. +Merging sunxi/sunxi/for-next (8afff9da61ea Merge branch 'sunxi/dt-for-5.7' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (df0a178cf2df Merge branch for-5.7/usb into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging clk/clk-next (28ecaf1c30fe Merge branches 'clk-unisoc', 'clk-tegra', 'clk-qcom' and 'clk-imx' into clk-next) +$ git merge clk/clk-next +Already up to date. +Merging clk-samsung/for-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge clk-samsung/for-next +Already up to date. +Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge c6x/for-linux-next +Already up to date. +Merging csky/linux-next (aefd9461d34a csky: Fixup cpu speculative execution to IO area) +$ git merge csky/linux-next +Already up to date. +Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h) +$ git merge h8300/h8300-next +Auto-merging arch/h8300/Kconfig +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig | 3 +++ + arch/h8300/lib/memset.S | 17 ++++++++++------- + 2 files changed, 13 insertions(+), 7 deletions(-) +Merging ia64/next (172e7890406d tty/serial: cleanup after ioc*_serial driver removal) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (86cded5fc525 m68k: defconfig: Update defconfigs for v5.6-rc4) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (ba000760eb0f m68k: Replace setup_irq() by request_irq()) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/68000/timers.c | 16 +++++++--------- + arch/m68k/coldfire/pit.c | 16 +++++++--------- + arch/m68k/coldfire/sltimers.c | 29 +++++++++++++++-------------- + arch/m68k/coldfire/timers.c | 31 +++++++++++++++---------------- + 4 files changed, 44 insertions(+), 48 deletions(-) +Merging microblaze/next (9fd1a1c9b3f2 microblaze: Replace setup_irq() by request_irq()) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (ba15533275dd Merge tag 'v5.6' into mips-next) +$ git merge mips/mips-next +Already up to date. +Merging nds32/next (d785c5a324cd nds32: configs: Cleanup CONFIG_CROSS_COMPILE) +$ git merge nds32/next +Merge made by the 'recursive' strategy. + arch/nds32/configs/defconfig | 1 - + arch/nds32/kernel/time.c | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging nios2/for-next (051d75d3bb31 MAINTAINERS: Update Ley Foon Tan's email address) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (9737e2c5f0bc openrisc: Remove obsolete show_trace_task function) +$ git merge openrisc/for-next +Auto-merging arch/openrisc/Kconfig +Merge made by the 'recursive' strategy. + Documentation/openrisc/openrisc_port.rst | 4 ++-- + arch/openrisc/Kconfig | 1 + + arch/openrisc/configs/or1ksim_defconfig | 1 - + arch/openrisc/configs/simple_smp_defconfig | 1 - + arch/openrisc/include/uapi/asm/unistd.h | 1 + + arch/openrisc/kernel/process.c | 18 ++++++------------ + arch/openrisc/kernel/smp.c | 3 ++- + arch/openrisc/kernel/traps.c | 7 ------- + 8 files changed, 12 insertions(+), 24 deletions(-) +Merging parisc-hd/for-next (106c90922e1e parisc: remove nargs from __SYSCALL) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/spinlock.h | 160 ++++++++++++++---------------- + arch/parisc/include/asm/spinlock_types.h | 14 ++- + arch/parisc/kernel/alternative.c | 37 +++---- + arch/parisc/kernel/irq.c | 22 ++-- + arch/parisc/kernel/syscall.S | 2 +- + arch/parisc/kernel/syscalls/syscalltbl.sh | 4 +- + drivers/parisc/eisa.c | 8 +- + 7 files changed, 114 insertions(+), 133 deletions(-) +Merging powerpc/next (6ba4a2d35910 selftests/powerpc: Always build the tm-poison test 64-bit) +$ git merge powerpc/next +Auto-merging arch/powerpc/Kconfig +Merge made by the 'recursive' strategy. + arch/powerpc/Kconfig | 5 +- + arch/powerpc/configs/ps3_defconfig | 2 + + arch/powerpc/include/asm/thread_info.h | 4 +- + arch/powerpc/include/asm/unistd.h | 1 + + arch/powerpc/kernel/Makefile | 5 +- + arch/powerpc/kernel/entry_64.S | 2 + + arch/powerpc/kernel/exceptions-64s.S | 19 -- + arch/powerpc/kernel/irq.c | 13 + + arch/powerpc/kernel/ppc_save_regs.S | 6 +- + arch/powerpc/kernel/ptrace/Makefile | 2 +- + arch/powerpc/kernel/signal.c | 144 ++++++++- + arch/powerpc/kernel/signal_32.c | 140 --------- + arch/powerpc/kernel/syscall_64.c | 6 +- + arch/powerpc/kernel/time.c | 48 +-- + arch/powerpc/kernel/vdso.c | 3 +- + arch/powerpc/perf/Makefile | 5 +- + arch/powerpc/perf/callchain.c | 356 +---------------------- + arch/powerpc/perf/callchain.h | 19 ++ + arch/powerpc/perf/callchain_32.c | 196 +++++++++++++ + arch/powerpc/perf/callchain_64.c | 174 +++++++++++ + arch/powerpc/perf/imc-pmu.c | 173 +++++++++-- + arch/powerpc/platforms/powernv/opal-imc.c | 9 +- + arch/powerpc/platforms/ps3/os-area.c | 4 +- + arch/powerpc/platforms/pseries/iommu.c | 9 + + arch/powerpc/platforms/pseries/ras.c | 11 + + drivers/ps3/sys-manager-core.c | 2 +- + fs/read_write.c | 3 +- + tools/testing/selftests/powerpc/eeh/eeh-basic.sh | 5 + + tools/testing/selftests/powerpc/tm/Makefile | 1 + + 29 files changed, 766 insertions(+), 601 deletions(-) + create mode 100644 arch/powerpc/perf/callchain.h + create mode 100644 arch/powerpc/perf/callchain_32.c + create mode 100644 arch/powerpc/perf/callchain_64.c +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (461c3ac0dc46 soc: fsl: qe: fix sparse warnings for ucc_slow.c) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (37809df4b1c8 riscv: create a loader.bin boot image for Kendryte SoC) +$ git merge risc-v/for-next +Auto-merging drivers/soc/Makefile +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/riscv/kernel/traps.c +Auto-merging arch/riscv/kernel/entry.S +Auto-merging arch/riscv/include/asm/pgtable.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/configs/rv32_defconfig +Auto-merging arch/riscv/configs/defconfig +Auto-merging arch/riscv/Makefile +Auto-merging arch/riscv/Kconfig.socs +CONFLICT (content): Merge conflict in arch/riscv/Kconfig.socs +Auto-merging arch/riscv/Kconfig +Resolved 'arch/riscv/Kconfig.socs' using previous resolution. +Resolved 'arch/riscv/include/asm/pgtable.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2fdf0c0fbc81] Merge remote-tracking branch 'risc-v/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/riscv/Kconfig | 26 +- + arch/riscv/Kconfig.socs | 10 + + arch/riscv/Makefile | 6 +- + arch/riscv/boot/Makefile | 3 + + arch/riscv/boot/dts/Makefile | 1 + + arch/riscv/boot/dts/kendryte/Makefile | 2 + + arch/riscv/boot/dts/kendryte/k210.dts | 23 ++ + arch/riscv/boot/dts/kendryte/k210.dtsi | 123 +++++++ + arch/riscv/configs/defconfig | 1 + + arch/riscv/configs/nommu_k210_defconfig | 68 ++++ + arch/riscv/configs/rv32_defconfig | 1 + + arch/riscv/include/asm/bug.h | 8 + + arch/riscv/include/asm/cacheflush.h | 2 +- + arch/riscv/include/asm/cpu_ops.h | 46 +++ + arch/riscv/include/asm/current.h | 5 +- + arch/riscv/include/asm/fixmap.h | 2 + + arch/riscv/include/asm/kasan.h | 2 +- + arch/riscv/include/asm/patch.h | 12 + + arch/riscv/include/asm/pgtable.h | 10 + + arch/riscv/include/asm/ptdump.h | 11 + + arch/riscv/include/asm/sbi.h | 195 +++++++---- + arch/riscv/include/asm/set_memory.h | 48 +++ + arch/riscv/include/asm/smp.h | 24 ++ + arch/riscv/include/asm/soc.h | 23 ++ + arch/riscv/kernel/Makefile | 13 +- + arch/riscv/kernel/cpu-hotplug.c | 87 +++++ + arch/riscv/kernel/cpu_ops.c | 46 +++ + arch/riscv/kernel/cpu_ops_sbi.c | 115 +++++++ + arch/riscv/kernel/cpu_ops_spinwait.c | 43 +++ + arch/riscv/kernel/entry.S | 143 ++++---- + arch/riscv/kernel/ftrace.c | 13 +- + arch/riscv/kernel/head.S | 180 ++++++---- + arch/riscv/kernel/patch.c | 120 +++++++ + arch/riscv/kernel/process.c | 5 +- + arch/riscv/kernel/sbi.c | 575 +++++++++++++++++++++++++++++++- + arch/riscv/kernel/setup.c | 32 +- + arch/riscv/kernel/smpboot.c | 53 +-- + arch/riscv/kernel/soc.c | 28 ++ + arch/riscv/kernel/stacktrace.c | 7 +- + arch/riscv/kernel/traps.c | 32 +- + arch/riscv/kernel/traps_misaligned.c | 370 ++++++++++++++++++++ + arch/riscv/kernel/vmlinux.lds.S | 23 +- + arch/riscv/lib/uaccess.S | 6 +- + arch/riscv/mm/Makefile | 3 +- + arch/riscv/mm/hugetlbpage.c | 6 +- + arch/riscv/mm/init.c | 44 +++ + arch/riscv/mm/pageattr.c | 187 +++++++++++ + arch/riscv/mm/ptdump.c | 317 ++++++++++++++++++ + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/kendryte/Kconfig | 14 + + drivers/soc/kendryte/Makefile | 3 + + drivers/soc/kendryte/k210-sysctl.c | 248 ++++++++++++++ + include/dt-bindings/clock/k210-clk.h | 20 ++ + 54 files changed, 3093 insertions(+), 294 deletions(-) + create mode 100644 arch/riscv/boot/dts/kendryte/Makefile + create mode 100644 arch/riscv/boot/dts/kendryte/k210.dts + create mode 100644 arch/riscv/boot/dts/kendryte/k210.dtsi + create mode 100644 arch/riscv/configs/nommu_k210_defconfig + create mode 100644 arch/riscv/include/asm/cpu_ops.h + create mode 100644 arch/riscv/include/asm/patch.h + create mode 100644 arch/riscv/include/asm/ptdump.h + create mode 100644 arch/riscv/include/asm/set_memory.h + create mode 100644 arch/riscv/include/asm/soc.h + create mode 100644 arch/riscv/kernel/cpu-hotplug.c + create mode 100644 arch/riscv/kernel/cpu_ops.c + create mode 100644 arch/riscv/kernel/cpu_ops_sbi.c + create mode 100644 arch/riscv/kernel/cpu_ops_spinwait.c + create mode 100644 arch/riscv/kernel/patch.c + create mode 100644 arch/riscv/kernel/soc.c + create mode 100644 arch/riscv/kernel/traps_misaligned.c + create mode 100644 arch/riscv/mm/pageattr.c + create mode 100644 arch/riscv/mm/ptdump.c + create mode 100644 drivers/soc/kendryte/Kconfig + create mode 100644 drivers/soc/kendryte/Makefile + create mode 100644 drivers/soc/kendryte/k210-sysctl.c + create mode 100644 include/dt-bindings/clock/k210-clk.h +Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge sifive/for-next +Already up to date. +Merging s390/features (2bc55eaeb88d s390/cio: generate delayed uevent for vfio-ccw subchannels) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/include/asm/qdio.h | 16 +++++----- + arch/s390/mm/fault.c | 2 -- + drivers/s390/cio/device.c | 13 +++++--- + drivers/s390/cio/qdio.h | 1 - + drivers/s390/cio/qdio_debug.c | 16 +--------- + drivers/s390/cio/qdio_debug.h | 3 +- + drivers/s390/cio/qdio_main.c | 63 +++++++++++++++++++++++++------------ + drivers/s390/cio/qdio_setup.c | 10 +++--- + drivers/s390/cio/qdio_thinint.c | 28 ++--------------- + drivers/s390/cio/vfio_ccw_drv.c | 5 +++ + drivers/s390/net/qeth_core.h | 5 +-- + drivers/s390/net/qeth_core_main.c | 65 ++++++++------------------------------- + drivers/s390/scsi/zfcp_qdio.c | 51 +++++++++++++----------------- + 13 files changed, 110 insertions(+), 168 deletions(-) +Merging sh/sh-next (a193018e5290 sh: add missing EXPORT_SYMBOL() for __delay) +$ git merge sh/sh-next +Merge made by the 'recursive' strategy. + arch/sh/include/asm/cache.h | 2 +- + arch/sh/kernel/Makefile | 2 -- + arch/sh/kernel/sh_ksyms_32.c | 17 +++++++++++++++++ + arch/sh/lib/delay.c | 1 + + 4 files changed, 19 insertions(+), 3 deletions(-) +Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge sparc-next/master +Already up to date. +Merging uml/linux-next (4a7c46247f9c um: Remove some unnecessary NULL checks in vector_user.c) +$ git merge uml/linux-next +Removing arch/um/include/shared/timer-internal.h +Auto-merging arch/um/drivers/vector_kern.c +Merge made by the 'recursive' strategy. + arch/um/Kconfig | 9 +- + arch/um/configs/i386_defconfig | 2 +- + arch/um/configs/x86_64_defconfig | 2 +- + arch/um/drivers/Kconfig | 3 + + arch/um/drivers/net_kern.c | 13 - + arch/um/drivers/ubd_kern.c | 12 +- + arch/um/drivers/vector_kern.c | 5 +- + arch/um/drivers/vector_user.c | 15 +- + arch/um/drivers/vhost_user.h | 12 +- + arch/um/drivers/virtio_uml.c | 153 +++++++-- + arch/um/include/asm/Kbuild | 1 - + arch/um/include/asm/delay.h | 30 ++ + arch/um/include/linux/time-internal.h | 84 +++++ + arch/um/include/shared/os.h | 1 + + arch/um/include/shared/timer-internal.h | 76 ----- + arch/um/kernel/kmsg_dump.c | 9 +- + arch/um/kernel/process.c | 39 +-- + arch/um/kernel/skas/syscall.c | 5 +- + arch/um/kernel/time.c | 538 ++++++++++++++++++++++++++++++-- + arch/um/kernel/uml.lds.S | 2 +- + arch/um/os-Linux/file.c | 31 ++ + arch/um/os-Linux/time.c | 1 - + arch/um/os-Linux/umid.c | 5 +- + arch/x86/um/asm/processor.h | 12 +- + fs/hostfs/hostfs_kern.c | 12 +- + include/uapi/linux/um_timetravel.h | 128 ++++++++ + 26 files changed, 986 insertions(+), 214 deletions(-) + create mode 100644 arch/um/include/asm/delay.h + create mode 100644 arch/um/include/linux/time-internal.h + delete mode 100644 arch/um/include/shared/timer-internal.h + create mode 100644 include/uapi/linux/um_timetravel.h +Merging xtensa/xtensa-for-next (70cbddb97385 arch/xtensa: fix grammar in Kconfig help text) +$ git merge xtensa/xtensa-for-next +Auto-merging arch/xtensa/Kconfig +Merge made by the 'recursive' strategy. + arch/xtensa/Kconfig | 2 +- + arch/xtensa/boot/Makefile | 1 - + arch/xtensa/kernel/smp.c | 8 ++------ + arch/xtensa/kernel/time.c | 12 +++++------- + 4 files changed, 8 insertions(+), 15 deletions(-) +Merging fscrypt/master (861261f2a9cc ubifs: wire up FS_IOC_GET_ENCRYPTION_NONCE) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (4fe171bb81b1 afs: Remove set but not used variable 'ret') +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (5a7ef5cb05dc Merge branch 'for-next-current-v5.6-20200331' into for-next-20200331) +$ git merge btrfs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ceph/master (3e10eb7331c7 rbd: don't mess with a page vector in rbd_notify_op_lock()) +$ git merge ceph/master +Auto-merging Documentation/filesystems/ceph.rst +Merge made by the 'recursive' strategy. + Documentation/filesystems/ceph.rst | 6 +- + drivers/block/rbd.c | 244 +++++++---------- + fs/ceph/addr.c | 90 ++++++- + fs/ceph/cache.c | 2 +- + fs/ceph/caps.c | 536 ++++++++++++++++++++----------------- + fs/ceph/debugfs.c | 16 +- + fs/ceph/dir.c | 132 ++++++++- + fs/ceph/export.c | 5 + + fs/ceph/file.c | 486 +++++++++++++++++++++++++-------- + fs/ceph/inode.c | 84 +++--- + fs/ceph/ioctl.c | 2 + + fs/ceph/locks.c | 31 ++- + fs/ceph/mds_client.c | 240 ++++++++++++++--- + fs/ceph/mds_client.h | 30 ++- + fs/ceph/super.c | 28 ++ + fs/ceph/super.h | 70 +++-- + include/linux/ceph/ceph_fs.h | 18 +- + include/linux/ceph/debugfs.h | 14 - + include/linux/ceph/libceph.h | 1 + + include/linux/ceph/osd_client.h | 17 -- + net/ceph/debugfs.c | 20 +- + net/ceph/mon_client.c | 8 +- + net/ceph/osd_client.c | 82 ------ + 23 files changed, 1395 insertions(+), 767 deletions(-) +Merging cifs/for-next (543931076d04 cifs: smbd: Do not schedule work to send immediate packet on every receive) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_debug.c | 6 +- + fs/cifs/cifsglob.h | 3 +- + fs/cifs/smb2misc.c | 15 +++ + fs/cifs/smb2proto.h | 6 +- + fs/cifs/smb2transport.c | 87 +++++++++----- + fs/cifs/smbdirect.c | 313 +++++++++++++++++++----------------------------- + fs/cifs/smbdirect.h | 7 +- + 7 files changed, 201 insertions(+), 236 deletions(-) +Merging configfs/for-next (e2f238f7d5a1 configfs: calculate the depth of parent item) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge ecryptfs/next +Already up to date. +Merging erofs/dev (20741a6e146c MAINTAINERS: erofs: update my email address) +$ git merge erofs/dev +Already up to date. +Merging ext3/for_next (a32f0ecd79b4 Merge fanotify fix from Nathan Chancellor.) +$ git merge ext3/for_next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ext4/dev (54d3adbc29f0 ext4: save all error info in save_error_info() and drop ext4_set_errno()) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (531dfae52e8c f2fs: keep inline_data when compression conversion) +$ git merge f2fs/dev +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging Documentation/filesystems/f2fs.rst +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 5 + + Documentation/filesystems/f2fs.rst | 4 +- + fs/f2fs/Kconfig | 9 + + fs/f2fs/checkpoint.c | 42 ++--- + fs/f2fs/compress.c | 317 ++++++++++++++++++++++++++------ + fs/f2fs/data.c | 141 ++++++++------ + fs/f2fs/debug.c | 3 + + fs/f2fs/dir.c | 16 +- + fs/f2fs/f2fs.h | 206 ++++++++++++--------- + fs/f2fs/file.c | 91 +++++---- + fs/f2fs/gc.c | 51 +++-- + fs/f2fs/inode.c | 29 ++- + fs/f2fs/namei.c | 12 +- + fs/f2fs/node.c | 33 ++-- + fs/f2fs/recovery.c | 12 +- + fs/f2fs/segment.c | 54 +++--- + fs/f2fs/segment.h | 2 +- + fs/f2fs/shrinker.c | 2 +- + fs/f2fs/super.c | 89 +++++---- + fs/f2fs/sysfs.c | 50 +++-- + fs/f2fs/xattr.c | 67 +++++-- + fs/f2fs/xattr.h | 9 +- + include/linux/f2fs_fs.h | 1 + + include/trace/events/f2fs.h | 3 +- + 24 files changed, 820 insertions(+), 428 deletions(-) +Merging fsverity/fsverity (98d54f81e36b Linux 5.6-rc4) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (3e8cb8b2eaeb fuse: fix stack use after return) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flexible-array member) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/jfs_dtree.c | 2 +- + fs/jfs/jfs_xattr.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging nfs/linux-next (93ce4af774bc NFS: Clean up process of marking inode stale.) +$ git merge nfs/linux-next +Auto-merging net/sunrpc/xprtsock.c +Auto-merging net/sunrpc/xprtrdma/rpc_rdma.c +Auto-merging net/sunrpc/clnt.c +Auto-merging net/sunrpc/auth_gss/auth_gss.c +Auto-merging include/trace/events/rpcrdma.h +Auto-merging include/linux/sunrpc/xdr.h +Auto-merging include/linux/nfs_xdr.h +Auto-merging fs/nfs/super.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/dir.c +Merge made by the 'recursive' strategy. + fs/nfs/blocklayout/blocklayout.c | 2 +- + fs/nfs/callback.h | 4 +- + fs/nfs/callback_proc.c | 69 ++-- + fs/nfs/delegation.c | 319 +++++++-------- + fs/nfs/dir.c | 79 ++-- + fs/nfs/direct.c | 197 ++++------ + fs/nfs/filelayout/filelayout.c | 165 +++----- + fs/nfs/flexfilelayout/flexfilelayout.c | 229 +++++------ + fs/nfs/flexfilelayout/flexfilelayout.h | 2 +- + fs/nfs/fs_context.c | 9 +- + fs/nfs/inode.c | 28 +- + fs/nfs/internal.h | 36 +- + fs/nfs/namespace.c | 67 +++- + fs/nfs/nfs4_fs.h | 4 +- + fs/nfs/nfs4file.c | 3 + + fs/nfs/nfs4namespace.c | 2 +- + fs/nfs/nfs4proc.c | 19 +- + fs/nfs/nfs4state.c | 24 +- + fs/nfs/nfs4trace.h | 8 +- + fs/nfs/nfsroot.c | 2 +- + fs/nfs/nfstrace.h | 1 + + fs/nfs/pagelist.c | 367 +++++++++++------- + fs/nfs/pnfs.c | 241 +++++++++--- + fs/nfs/pnfs.h | 143 +++++-- + fs/nfs/pnfs_nfs.c | 514 ++++++++++++++++++------- + fs/nfs/read.c | 2 +- + fs/nfs/super.c | 35 ++ + fs/nfs/unlink.c | 4 +- + fs/nfs/write.c | 276 +++++++------ + include/linux/nfs_fs.h | 1 + + include/linux/nfs_page.h | 5 + + include/linux/nfs_xdr.h | 32 +- + include/linux/sunrpc/sched.h | 1 + + include/linux/sunrpc/xdr.h | 1 - + include/trace/events/rpcrdma.h | 153 +++----- + net/sunrpc/auth_gss/auth_gss.c | 94 +++-- + net/sunrpc/clnt.c | 8 +- + net/sunrpc/sched.c | 22 +- + net/sunrpc/xdr.c | 55 --- + net/sunrpc/xprtrdma/backchannel.c | 8 +- + net/sunrpc/xprtrdma/frwr_ops.c | 154 ++++---- + net/sunrpc/xprtrdma/rpc_rdma.c | 32 +- + net/sunrpc/xprtrdma/transport.c | 72 ++-- + net/sunrpc/xprtrdma/verbs.c | 683 ++++++++++++--------------------- + net/sunrpc/xprtrdma/xprt_rdma.h | 89 ++--- + net/sunrpc/xprtsock.c | 2 +- + 46 files changed, 2305 insertions(+), 1958 deletions(-) +Merging nfs-anna/linux-next (55dee1bc0d72 nfs: add minor version to nfs_server_key for fscache) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (2653de9f0398 fs: nfsd: fileache.c: Use built-in RCU list checking) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/xprtrdma/svc_rdma_rw.c +Auto-merging net/sunrpc/cache.c +CONFLICT (content): Merge conflict in net/sunrpc/cache.c +Auto-merging include/linux/sunrpc/svc.h +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/nfs4state.c +Resolved 'net/sunrpc/cache.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8fad31d8dcf2] Merge remote-tracking branch 'nfsd/nfsd-next' +$ git diff -M --stat --summary HEAD^.. +Merging orangefs/for-next (c472a4cbb3e8 orangefs: complete Christoph's "remember count" reversion.) +$ git merge orangefs/for-next +Merge made by the 'recursive' strategy. + fs/orangefs/file.c | 34 +--------------------------------- + fs/orangefs/inode.c | 39 ++++++--------------------------------- + fs/orangefs/orangefs-kernel.h | 4 ---- + 3 files changed, 7 insertions(+), 70 deletions(-) +Merging overlayfs/overlayfs-next (2eda9eaa6d7e ovl: document xino expected behavior) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.rst | 82 +++++++++- + fs/overlayfs/copy_up.c | 16 +- + fs/overlayfs/dir.c | 31 +++- + fs/overlayfs/export.c | 40 ++--- + fs/overlayfs/inode.c | 99 ++++++++---- + fs/overlayfs/namei.c | 5 +- + fs/overlayfs/overlayfs.h | 25 +++- + fs/overlayfs/ovl_entry.h | 2 + + fs/overlayfs/readdir.c | 25 +++- + fs/overlayfs/super.c | 258 ++++++++++++++++++++++---------- + fs/overlayfs/util.c | 40 +++-- + 11 files changed, 460 insertions(+), 163 deletions(-) +Merging ubifs/linux-next (3676f32a98cd ubi: ubi-media.h: Replace zero-length array with flexible-array member) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/fastmap-wl.c | 15 +++++++++++++-- + drivers/mtd/ubi/ubi-media.h | 2 +- + drivers/mtd/ubi/wl.c | 3 ++- + fs/ubifs/io.c | 16 ++++++++++++++-- + fs/ubifs/journal.c | 1 + + fs/ubifs/orphan.c | 13 +++++++++---- + 6 files changed, 40 insertions(+), 10 deletions(-) +Merging v9fs/9p-next (43657496e466 net/9p: remove unused p9_req_t aux field) +$ git merge v9fs/9p-next +Already up to date. +Merging xfs/for-next (5833112df7e9 xfs: reflink should force the log out if mounted with wsync) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_sb.c | 32 +++++ + fs/xfs/xfs_buf.c | 11 +- + fs/xfs/xfs_dquot.c | 6 +- + fs/xfs/xfs_dquot_item.c | 3 +- + fs/xfs/xfs_export.c | 14 +- + fs/xfs/xfs_file.c | 16 +-- + fs/xfs/xfs_inode.c | 174 +++++++++++++--------- + fs/xfs/xfs_inode.h | 1 + + fs/xfs/xfs_inode_item.c | 31 ++-- + fs/xfs/xfs_log.c | 372 +++++++++++++++++------------------------------- + fs/xfs/xfs_log.h | 4 - + fs/xfs/xfs_log_cil.c | 55 +++++-- + fs/xfs/xfs_log_priv.h | 75 +++++++--- + fs/xfs/xfs_mount.h | 1 + + fs/xfs/xfs_qm.c | 14 +- + fs/xfs/xfs_super.c | 17 ++- + fs/xfs/xfs_symlink.c | 1 - + fs/xfs/xfs_trace.h | 15 +- + fs/xfs/xfs_trans.c | 27 ++-- + fs/xfs/xfs_trans_ail.c | 88 +++++++----- + fs/xfs/xfs_trans_priv.h | 6 +- + 21 files changed, 512 insertions(+), 451 deletions(-) +Merging zonefs/for-next (0dda2ddb7ded zonefs: select FS_IOMAP) +$ git merge zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (457df33e035a iomap: Handle memory allocation failure in readahead) +$ git merge iomap/iomap-for-next +Merge made by the 'recursive' strategy. + fs/iomap/buffered-io.c | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging djw-vfs/vfs-for-next (56939e014a6c hibernate: Allow uswsusp to write to swap) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (dbdaf6a3250b locks: reinstate locks_delete_block optimization) +$ git merge file-locks/locks-next +Auto-merging fs/cifs/file.c +Merge made by the 'recursive' strategy. +Merging vfs/for-next (ffca8b2a77f2 Merge branch 'work.exfat' into for-next) +$ git merge vfs/for-next +Auto-merging fs/namespace.c +Auto-merging fs/erofs/zdata.c +Auto-merging fs/erofs/super.c +Auto-merging fs/erofs/internal.h +Merge made by the 'recursive' strategy. + fs/erofs/internal.h | 27 +++--- + fs/erofs/super.c | 251 +++++++++++++++++++++++----------------------------- + fs/erofs/xattr.c | 4 +- + fs/erofs/zdata.c | 4 +- + fs/namespace.c | 5 +- + fs/super.c | 2 +- + 6 files changed, 134 insertions(+), 159 deletions(-) +Merging printk/for-next (d34f14ae521f Merge branch 'for-5.7-preferred-console' into for-next) +$ git merge printk/for-next +Auto-merging include/linux/console.h +Merge made by the 'recursive' strategy. + include/linux/console.h | 2 +- + kernel/printk/console_cmdline.h | 1 + + kernel/printk/printk.c | 128 +++++++++++++++++++++++++--------------- + 3 files changed, 83 insertions(+), 48 deletions(-) +Merging pci/next (7e63420847ae Merge tag 'acpi-5.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge pci/next +Already up to date. +Merging pstore/for-next/pstore (8128d3aac0ee pstore/ram: Replace zero-length array with flexible-array member) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (04f6305f8071 Merge branch 'for-5.8/logitech' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 6 +++--- + drivers/hid/hid-logitech-dj.c | 4 ++-- + drivers/hid/hid-logitech-hidpp.c | 2 +- + drivers/hid/wacom_sys.c | 4 +++- + 4 files changed, 9 insertions(+), 7 deletions(-) +Merging i2c/i2c/for-next (a10c9c710f9e Merge tag 'for-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply) +$ git merge i2c/i2c/for-next +Already up to date. +Merging i3c/i3c/next (c4b9de11d010 i3c: convert to use i2c_new_client_device()) +$ git merge i3c/i3c/next +Already up to date. +Merging dmi/master (12028f913eb9 firmware/dmi: Report DMI Bios & EC firmware release) +$ git merge dmi/master +Auto-merging scripts/mod/file2alias.c +Auto-merging include/linux/mod_devicetable.h +Auto-merging drivers/firmware/dmi_scan.c +Merge made by the 'recursive' strategy. + drivers/firmware/dmi-id.c | 6 ++++++ + drivers/firmware/dmi_scan.c | 30 ++++++++++++++++++++++++++++++ + include/linux/mod_devicetable.h | 2 ++ + scripts/mod/file2alias.c | 2 ++ + 4 files changed, 40 insertions(+) +Merging hwmon-staging/hwmon-next (5b10a8194664 docs: hwmon: Update documentation for isl68137 pmbus driver) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (abcb1e021ae5 Documentation: x86: exception-tables: document CONFIG_BUILDTIME_TABLE_SORT) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (2632e7b618a7 media: venus: firmware: Ignore secure call error on first resume) +$ git merge v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (54ecb8f7028c Linux 5.4-rc1) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (7e63420847ae Merge tag 'acpi-5.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge pm/linux-next +Already up to date. +Merging cpufreq-arm/cpufreq/arm/linux-next (a8811ec764f9 cpufreq: qcom: Add support for krait based socs) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (2de7fb60a474 cpupower: avoid multiple definition with gcc -fno-common) +$ git merge cpupower/cpupower +Already up to date. +Merging opp/opp/linux-next (03758d60265c opp: Replace list_kref with a local counter) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (76a5c400aae5 thermal: imx8mm: Fix build warning of incorrect argument type) +$ git merge thermal/thermal/linux-next +Auto-merging drivers/thermal/intel/x86_pkg_temp_thermal.c +Auto-merging drivers/thermal/intel/int340x_thermal/int3400_thermal.c +Auto-merging drivers/thermal/cpufreq_cooling.c +CONFLICT (content): Merge conflict in drivers/thermal/cpufreq_cooling.c +Auto-merging Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +Auto-merging Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt +Resolved 'drivers/thermal/cpufreq_cooling.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b2f3c299b2e2] Merge remote-tracking branch 'thermal/thermal/linux-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 16 + + .../devicetree/bindings/thermal/imx8mm-thermal.txt | 15 + + .../devicetree/bindings/thermal/qcom-tsens.yaml | 2 +- + .../bindings/thermal/rcar-gen3-thermal.txt | 1 + + .../devicetree/bindings/thermal/sprd-thermal.yaml | 107 ++++ + .../devicetree/bindings/thermal/thermal.txt | 2 +- + drivers/thermal/Kconfig | 42 +- + drivers/thermal/Makefile | 3 + + drivers/thermal/cpufreq_cooling.c | 4 +- + drivers/thermal/imx8mm_thermal.c | 236 +++++++++ + drivers/thermal/imx_sc_thermal.c | 148 ++++++ + drivers/thermal/imx_thermal.c | 16 +- + .../intel/int340x_thermal/int3400_thermal.c | 2 +- + .../int340x_thermal/processor_thermal_device.c | 5 + + drivers/thermal/of-thermal.c | 62 ++- + drivers/thermal/qcom/tsens-8960.c | 4 +- + drivers/thermal/qcom/tsens-common.c | 194 +++++++- + drivers/thermal/qcom/tsens-v0_1.c | 6 +- + drivers/thermal/qcom/tsens-v1.c | 6 +- + drivers/thermal/qcom/tsens-v2.c | 24 +- + drivers/thermal/qcom/tsens.c | 65 ++- + drivers/thermal/qcom/tsens.h | 105 +++- + drivers/thermal/qoriq_thermal.c | 40 +- + drivers/thermal/rcar_gen3_thermal.c | 31 +- + drivers/thermal/rcar_thermal.c | 53 +- + drivers/thermal/samsung/exynos_tmu.c | 4 +- + drivers/thermal/sprd_thermal.c | 552 +++++++++++++++++++++ + drivers/thermal/st/stm_thermal.c | 3 +- + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 44 +- + drivers/thermal/ti-soc-thermal/ti-bandgap.h | 4 +- + include/linux/thermal.h | 10 + + tools/thermal/tmon/tmon.c | 26 +- + 32 files changed, 1594 insertions(+), 238 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/imx8mm-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/sprd-thermal.yaml + create mode 100644 drivers/thermal/imx8mm_thermal.c + create mode 100644 drivers/thermal/imx_sc_thermal.c + create mode 100644 drivers/thermal/sprd_thermal.c +Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1) +$ git merge thermal-rzhang/next +Already up to date. +Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid') +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/net.c +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 2 -- + 1 file changed, 2 deletions(-) +Merging dlm/next (a48f9721e6db dlm: no need to check return value of debugfs_create functions) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region()) +$ git merge swiotlb/linux-next +Auto-merging include/linux/page-flags.h +Auto-merging drivers/xen/swiotlb-xen.c +Merge made by the 'recursive' strategy. +Merging rdma/for-next (b4d8ddf8356d RDMA/bnxt_re: make bnxt_re_ib_init static) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross) +$ git merge net-next/master +Already up to date. +Merging bpf-next/master (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (308491755f36 xfrm: add prep for esp beet mode offload) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (826096d84f50 mlx5: Remove uninitialized use of key in mlx5_core_create_mkey) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross) +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (d54725cd11a5 netfilter: nf_tables: support for multiple devices per netdev hook) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (5988b8ec7132 Merge tag 'iwlwifi-next-for-kalle-2020-03-27' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (d2a3f5f4635b Bluetooth: Add HCI device identifier for VIRTIO devices) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/qualcomm-bluetooth.txt | 1 + + drivers/bluetooth/btqca.c | 18 +- + drivers/bluetooth/btqca.h | 3 +- + drivers/bluetooth/btusb.c | 182 ++++++++++++++++----- + drivers/bluetooth/hci_bcm.c | 8 +- + drivers/bluetooth/hci_qca.c | 40 ++++- + include/net/bluetooth/bluetooth.h | 8 + + include/net/bluetooth/hci.h | 11 ++ + include/net/bluetooth/hci_core.h | 15 ++ + include/net/bluetooth/mgmt.h | 7 + + net/bluetooth/Kconfig | 23 ++- + net/bluetooth/Makefile | 1 + + net/bluetooth/hci_conn.c | 25 ++- + net/bluetooth/hci_core.c | 115 +++++++------ + net/bluetooth/hci_event.c | 51 +++++- + net/bluetooth/l2cap_sock.c | 138 +++++++++++++++- + net/bluetooth/mgmt.c | 55 ++++++- + net/bluetooth/msft.c | 141 ++++++++++++++++ + net/bluetooth/msft.h | 18 ++ + net/bluetooth/smp.c | 12 +- + 20 files changed, 741 insertions(+), 131 deletions(-) + create mode 100644 net/bluetooth/msft.c + create mode 100644 net/bluetooth/msft.h +Merging mac80211-next/master (1e8f471425f4 mac80211_hwsim: notify wmediumd of used MAC addresses) +$ git merge mac80211-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 51 +++++++++++++++++++++++++++++++++++ + drivers/net/wireless/mac80211_hwsim.h | 8 ++++++ + 2 files changed, 59 insertions(+) +Merging gfs2/for-next (75b46c437f6b gfs2: Fix oversight in gfs2_ail1_flush) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/mtd/next (025a06c1104c mtd: Convert fallthrough comments into statements) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (fca88925d769 mtd: rawnand: toshiba: Support reading the number of bitflips for BENAND (Built-in ECC NAND)) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (f3f2b7eb2f1c mtd: spi-nor: Enable locking for n25q512ax3/n25q512a) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (fcb90d51c375 crypto: af_alg - bool type cosmetics) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (0e7e6198af28 Merge branch 'ttm-transhuge' of git://people.freedesktop.org/~thomash/linux into drm-next) +$ git merge drm/drm-next +Already up to date. +Merging amdgpu/drm-next (f7c9c5d47481 PCI/P2PDMA: Add additional AMD ZEN root ports to the whitelist) +$ git merge amdgpu/drm-next +Auto-merging drivers/pci/p2pdma.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Merge made by the 'recursive' strategy. + Documentation/gpu/amdgpu.rst | 88 ++++ + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 160 ++----- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 153 ++++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 174 ++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h | 29 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 51 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 35 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 66 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 320 ++++++++------ + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 75 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 49 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 30 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 1 + + drivers/gpu/drm/amd/amdgpu/cik.c | 8 - + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 11 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 72 ++-- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 51 ++- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 41 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 74 ++-- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 3 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 97 +++-- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 44 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h | 3 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 302 ++++++++++++- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 18 - + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 18 - + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 7 - + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 20 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 17 +- + drivers/gpu/drm/amd/amdgpu/nvd.h | 49 +++ + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 11 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 40 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 127 ++++-- + drivers/gpu/drm/amd/amdgpu/si.c | 8 - + drivers/gpu/drm/amd/amdgpu/si_dma.c | 10 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +- + drivers/gpu/drm/amd/amdgpu/soc15d.h | 26 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 6 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 77 +++- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 90 +++- + drivers/gpu/drm/amd/amdgpu/vi.c | 24 -- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 41 ++ + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 44 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 + + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 9 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 48 ++- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 14 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 43 -- + drivers/gpu/drm/amd/display/dc/basics/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 37 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 355 ++++++++------- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 1 + + drivers/gpu/drm/amd/display/dc/dc.h | 5 +- + drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 1 + + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 417 ++++++++++++++++++ + .../dc/{basics/log_helpers.c => dce/dmub_abm.h} | 25 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 6 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 18 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 3 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 3 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 5 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 81 ++-- + drivers/gpu/drm/amd/display/dc/dml/dc_features.h | 2 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 7 +- + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 4 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 11 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 6 +- + .../gpu/drm/amd/display/include/logger_interface.h | 4 - + .../drm/amd/display/modules/freesync/freesync.c | 34 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 5 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 30 +- + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 2 +- + .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 2 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 478 ++++++++++++--------- + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 1 + + .../drm/amd/display/modules/power/power_helpers.c | 21 +- + .../amd/include/asic_reg/nbif/nbif_6_1_offset.h | 2 + + .../amd/include/asic_reg/nbio/nbio_7_0_offset.h | 2 + + .../amd/include/asic_reg/nbio/nbio_7_4_offset.h | 2 + + .../drm/amd/include/asic_reg/pwr/pwr_10_0_offset.h | 27 ++ + .../amd/include/asic_reg/pwr/pwr_10_0_sh_mask.h | 30 ++ + .../include/asic_reg/smuio/smuio_12_0_0_offset.h | 30 ++ + .../include/asic_reg/smuio/smuio_12_0_0_sh_mask.h | 33 ++ + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 6 +- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 15 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 174 +++++--- + .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 61 +-- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 135 +++--- + .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 40 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c | 17 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 157 ++++--- + drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 4 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_baco.c | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 141 +++--- + .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 9 +- + .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 6 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_baco.c | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 149 ++++--- + .../gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c | 7 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c | 8 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 181 ++++---- + .../gpu/drm/amd/powerplay/hwmgr/vega20_powertune.c | 6 +- + .../gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c | 7 +- + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 7 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 18 +- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 18 + + drivers/gpu/drm/amd/powerplay/renoir_ppt.h | 2 +- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 24 +- + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 12 +- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 18 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 35 +- + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 1 + + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 31 +- + .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 39 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 48 +-- + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 4 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 69 +-- + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 56 ++- + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 15 +- + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 56 ++- + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 68 +-- + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 106 +++-- + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 18 +- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 14 +- + drivers/gpu/drm/drm_mm.c | 8 +- + drivers/gpu/drm/radeon/Makefile | 35 +- + drivers/pci/p2pdma.c | 2 + + include/uapi/drm/amdgpu_drm.h | 15 +- + include/uapi/linux/kfd_ioctl.h | 19 +- + 184 files changed, 4505 insertions(+), 2188 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c + rename drivers/gpu/drm/amd/display/dc/{basics/log_helpers.c => dce/dmub_abm.h} (75%) + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/pwr/pwr_10_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/pwr/pwr_10_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_12_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_12_0_0_sh_mask.h +Merging drm-intel/for-linux-next (1aaea8476d9f drm/i915/gem: Flush all the reloc_gpu batch) +$ git merge drm-intel/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_ddi.c | 11 +++++--- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 14 +++++----- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 37 +++++++++++++++++++------- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 16 +++-------- + drivers/gpu/drm/i915/gvt/display.c | 6 ++--- + drivers/gpu/drm/i915/gvt/handlers.c | 8 ++++-- + drivers/gpu/drm/i915/gvt/scheduler.c | 4 +-- + 7 files changed, 57 insertions(+), 39 deletions(-) +Merging drm-tegra/drm/tegra/for-next (e32c8c2a5fbe drm/tegra: hdmi: Silence deferred-probe error) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (b513b0d4563a drm/virtio: fix OOB in virtio_gpu_object_create) +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + .../bindings/display/panel/panel-dpi.yaml | 10 ------ + .../bindings/display/ti/ti,am65x-dss.yaml | 4 +-- + .../bindings/display/ti/ti,j721e-dss.yaml | 4 +-- + .../devicetree/bindings/display/ti/ti,k2g-dss.yaml | 4 +-- + drivers/dma-buf/Kconfig | 11 ++++--- + drivers/gpu/drm/drm_prime.c | 37 +++++++++++++++------- + drivers/gpu/drm/panel/panel-simple.c | 11 ------- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 4 +++ + drivers/gpu/drm/vc4/vc4_hdmi.c | 20 +++++++++--- + drivers/gpu/drm/virtio/virtgpu_object.c | 14 ++++---- + drivers/gpu/drm/xen/xen_drm_front.c | 2 +- + drivers/video/fbdev/core/fbcon.c | 3 ++ + 12 files changed, 69 insertions(+), 55 deletions(-) +Merging drm-msm/msm-next (a5fb8b918920 drm/msm/a6xx: Use the DMA API for GMU memory objects) +$ git merge drm-msm/msm-next +Already up to date. +Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (2c76b324c794 drm/imx: parallel-display: Adjust bus_flags handling) +$ git merge imx-drm/imx-drm/next +Auto-merging drivers/gpu/drm/imx/parallel-display.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/parallel-display.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging etnaviv/etnaviv/next (f232d9ec029c drm/etnaviv: fix TS cache flushing on GPUs with BLT engine) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging regmap/for-next (2060986f04ad Merge branch 'regmap-5.7' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-debugfs.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging sound/for-next (fd60e0683e8e ALSA: usb-audio: Add registration quirk for Kingston HyperX Cloud Alpha S) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (3ea00fb102ad Merge branch 'asoc-5.7' into asoc-linus) +$ git merge sound-asoc/for-next +Already up to date. +Merging modules/modules-next (0f74226649fb kernel: module: Replace zero-length array with flexible-array member) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + kernel/module.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging input/next (3a8579629665 Input: update SPDX tag for input-event-codes.h) +$ git merge input/next +Auto-merging include/uapi/linux/input-event-codes.h +Auto-merging Documentation/devicetree/bindings/input/touchscreen/goodix.yaml +Removing Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.txt +Merge made by the 'recursive' strategy. + .../bindings/input/touchscreen/edt-ft5x06.txt | 77 --- + .../bindings/input/touchscreen/edt-ft5x06.yaml | 125 +++++ + .../bindings/input/touchscreen/goodix.yaml | 2 + + drivers/input/serio/i8042-x86ia64io.h | 11 + + drivers/input/touchscreen/elants_i2c.c | 1 + + drivers/input/touchscreen/goodix.c | 608 +++++++++++++++++---- + drivers/input/touchscreen/of_touchscreen.c | 35 +- + include/uapi/linux/input-event-codes.h | 2 +- + 8 files changed, 651 insertions(+), 210 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml +Merging block/for-next (b630b0f59955 Merge branch 'block-5.7' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + block/blk-cgroup.c | 22 +++- + block/blk-mq.c | 9 +- + drivers/block/loop.c | 49 +++++--- + fs/io-wq.c | 12 ++ + fs/io-wq.h | 2 + + fs/io_uring.c | 286 ++++++++++++++++++++++++++++----------------- + include/linux/blk-cgroup.h | 43 +++---- + mm/backing-dev.c | 6 +- + 8 files changed, 274 insertions(+), 155 deletions(-) +Merging device-mapper/for-next (8267d8fb4819 dm integrity: fix logic bug in integrity tag testing) +$ git merge device-mapper/for-next +Already up to date. +Merging pcmcia/pcmcia-next (a8c122f72d94 pcmcia: remove some unused space characters) +$ git merge pcmcia/pcmcia-next +Merge made by the 'recursive' strategy. + drivers/pcmcia/cs_internal.h | 2 +- + drivers/pcmcia/omap_cf.c | 2 +- + drivers/pcmcia/rsrc_nonstatic.c | 6 +++--- + drivers/pcmcia/sa1100_simpad.c | 6 +++--- + drivers/pcmcia/soc_common.h | 2 +- + drivers/pcmcia/yenta_socket.c | 10 +++++----- + 6 files changed, 14 insertions(+), 14 deletions(-) +Merging mmc/next (92075d98abf0 mmc: cavium-octeon: remove nonsense variable coercion) +$ git merge mmc/next +Already up to date. +Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier) +$ git merge md/for-next +Already up to date. +Merging mfd/for-mfd-next (d2923aa45356 mfd: intel-lpss: Fix Intel Elkhart Lake LPSS I2C input clock) +$ git merge mfd/for-mfd-next +Auto-merging drivers/rtc/Makefile +Auto-merging drivers/rtc/Kconfig +Auto-merging drivers/iio/light/Makefile +Auto-merging drivers/iio/light/Kconfig +Auto-merging drivers/iio/adc/Makefile +Auto-merging drivers/iio/adc/Kconfig +Removing Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.txt +Removing Documentation/devicetree/bindings/mfd/rohm,bd71837-pmic.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/iqs62x-keys.yaml | 132 +++ + Documentation/devicetree/bindings/mfd/iqs62x.yaml | 179 ++++ + Documentation/devicetree/bindings/mfd/rn5t618.txt | 4 + + .../devicetree/bindings/mfd/rohm,bd71837-pmic.txt | 90 -- + .../devicetree/bindings/mfd/rohm,bd71837-pmic.yaml | 236 +++++ + .../devicetree/bindings/mfd/rohm,bd71847-pmic.yaml | 222 ++++ + .../devicetree/bindings/mfd/st,stm32-lptimer.yaml | 16 + + .../devicetree/bindings/pwm/iqs620a-pwm.yaml | 32 + + .../bindings/regulator/rohm,bd71837-regulator.txt | 162 --- + .../bindings/regulator/rohm,bd71837-regulator.yaml | 103 ++ + .../bindings/regulator/rohm,bd71847-regulator.yaml | 97 ++ + drivers/iio/Kconfig | 1 + + drivers/iio/Makefile | 1 + + drivers/iio/adc/Kconfig | 10 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/rn5t618-adc.c | 256 +++++ + drivers/iio/light/Kconfig | 10 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/iqs621-als.c | 617 ++++++++++++ + drivers/iio/position/Kconfig | 19 + + drivers/iio/position/Makefile | 7 + + drivers/iio/position/iqs624-pos.c | 284 ++++++ + drivers/iio/temperature/Kconfig | 10 + + drivers/iio/temperature/Makefile | 1 + + drivers/iio/temperature/iqs620at-temp.c | 97 ++ + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/iqs62x-keys.c | 335 ++++++ + drivers/mfd/Kconfig | 23 +- + drivers/mfd/Makefile | 1 + + drivers/mfd/aat2870-core.c | 2 +- + drivers/mfd/cros_ec_dev.c | 2 +- + drivers/mfd/da9062-core.c | 44 +- + drivers/mfd/dln2.c | 30 +- + drivers/mfd/intel-lpss-pci.c | 31 +- + drivers/mfd/iqs62x.c | 1063 ++++++++++++++++++++ + drivers/mfd/omap-usb-host.c | 2 +- + drivers/mfd/omap-usb-tll.c | 4 +- + drivers/mfd/qcom-pm8xxx.c | 2 +- + drivers/mfd/rk808.c | 139 +-- + drivers/mfd/rn5t618.c | 109 +- + drivers/mfd/sprd-sc27xx-spi.c | 52 + + drivers/rtc/Kconfig | 10 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-rc5t619.c | 444 ++++++++ + include/linux/mfd/iqs62x.h | 139 +++ + include/linux/mfd/rk808.h | 2 - + include/linux/mfd/rn5t618.h | 26 + + include/linux/mfd/sc27xx-pmic.h | 7 + + 49 files changed, 4688 insertions(+), 379 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/iqs62x-keys.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/iqs62x.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd71837-pmic.txt + create mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd71837-pmic.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd71847-pmic.yaml + create mode 100644 Documentation/devicetree/bindings/pwm/iqs620a-pwm.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml + create mode 100644 drivers/iio/adc/rn5t618-adc.c + create mode 100644 drivers/iio/light/iqs621-als.c + create mode 100644 drivers/iio/position/Kconfig + create mode 100644 drivers/iio/position/Makefile + create mode 100644 drivers/iio/position/iqs624-pos.c + create mode 100644 drivers/iio/temperature/iqs620at-temp.c + create mode 100644 drivers/input/keyboard/iqs62x-keys.c + create mode 100644 drivers/mfd/iqs62x.c + create mode 100644 drivers/rtc/rtc-rc5t619.c + create mode 100644 include/linux/mfd/iqs62x.h + create mode 100644 include/linux/mfd/sc27xx-pmic.h +Merging backlight/for-backlight-next (ee0c8e494cc3 backlight: corgi: Convert to use GPIO descriptors) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + arch/arm/mach-pxa/cm-x300.c | 1 - + arch/arm/mach-pxa/colibri-pxa270-income.c | 1 - + arch/arm/mach-pxa/corgi.c | 12 +++++- + arch/arm/mach-pxa/ezx.c | 1 - + arch/arm/mach-pxa/hx4700.c | 1 - + arch/arm/mach-pxa/lpd270.c | 1 - + arch/arm/mach-pxa/magician.c | 1 - + arch/arm/mach-pxa/mainstone.c | 1 - + arch/arm/mach-pxa/mioa701.c | 1 - + arch/arm/mach-pxa/palm27x.c | 1 - + arch/arm/mach-pxa/palmtc.c | 11 ++++- + arch/arm/mach-pxa/palmte2.c | 1 - + arch/arm/mach-pxa/pcm990-baseboard.c | 1 - + arch/arm/mach-pxa/spitz.c | 34 ++++++++++++---- + arch/arm/mach-pxa/tavorevb.c | 2 - + arch/arm/mach-pxa/viper.c | 1 - + arch/arm/mach-pxa/z2.c | 2 - + arch/arm/mach-pxa/zylonite.c | 1 - + arch/arm/mach-s3c24xx/mach-h1940.c | 1 - + arch/arm/mach-s3c24xx/mach-rx1950.c | 1 - + arch/arm/mach-s3c64xx/dev-backlight.c | 3 -- + arch/arm/mach-s3c64xx/mach-crag6410.c | 1 - + arch/arm/mach-s3c64xx/mach-hmt.c | 1 - + arch/arm/mach-s3c64xx/mach-smartq.c | 1 - + arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- + arch/unicore32/kernel/puv3-nb0916.c | 1 - + drivers/video/backlight/corgi_lcd.c | 68 ++++++++----------------------- + drivers/video/backlight/pwm_bl.c | 19 --------- + include/linux/pwm_backlight.h | 2 - + include/linux/spi/corgi_lcd.h | 3 -- + 30 files changed, 65 insertions(+), 112 deletions(-) +Merging battery/for-next (f78c55e3b480 power: reset: sc27xx: Allow the SC27XX poweroff driver building into a module) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (24bd2afda8ce Merge branch 'regulator-5.7' into regulator-next) +$ git merge regulator/for-next +Already up to date. +Merging security/next-testing (3e27a33932df security: remove duplicated include from security.h) +$ git merge security/next-testing +Already up to date. +Merging apparmor/apparmor-next (01df52d726b5 apparmor: remove duplicate check of xattrs on profile attachment.) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/apparmorfs.c +Auto-merging fs/proc/base.c +Merge made by the 'recursive' strategy. + fs/proc/base.c | 13 ++++++++++ + security/apparmor/apparmorfs.c | 54 +++++++++------------------------------ + security/apparmor/domain.c | 39 ++++++++++------------------ + security/apparmor/include/label.h | 1 + + security/apparmor/include/match.h | 11 ++++++++ + security/apparmor/label.c | 37 +++++++++++++++++++++++++-- + security/apparmor/match.c | 53 +++++++++++++++++++++++++++++++++++++- + security/apparmor/path.c | 2 +- + security/apparmor/policy_unpack.c | 4 +++ + 9 files changed, 143 insertions(+), 71 deletions(-) +Merging integrity/next-integrity (9e2b4be377f0 ima: add a new CONFIG for loading arch-specific policies) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (43672cf93c6d Merge branch 'notifications-pipe-core' into keys-next) +$ git merge keys/keys-next +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/keys/keyring.c +Auto-merging security/keys/keyctl.c +Auto-merging security/keys/key.c +Auto-merging security/keys/internal.h +Auto-merging init/Kconfig +Auto-merging include/linux/security.h +Auto-merging include/linux/pipe_fs_i.h +Auto-merging include/linux/lsm_hooks.h +CONFLICT (content): Merge conflict in include/linux/lsm_hooks.h +Auto-merging fs/splice.c +Auto-merging fs/pipe.c +CONFLICT (content): Merge conflict in fs/pipe.c +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Resolved 'fs/pipe.c' using previous resolution. +Resolved 'include/linux/lsm_hooks.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0e9a95a6fea1] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/security/keys/core.rst | 58 ++ + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + Documentation/watch_queue.rst | 354 +++++++++++ + fs/pipe.c | 242 +++++--- + fs/splice.c | 12 +- + include/linux/key.h | 3 + + include/linux/lsm_audit.h | 1 + + include/linux/lsm_hooks.h | 18 + + include/linux/pipe_fs_i.h | 27 +- + include/linux/security.h | 31 + + include/linux/watch_queue.h | 127 ++++ + include/uapi/linux/keyctl.h | 2 + + include/uapi/linux/watch_queue.h | 104 ++++ + init/Kconfig | 12 + + kernel/Makefile | 1 + + kernel/watch_queue.c | 659 +++++++++++++++++++++ + samples/Kconfig | 6 + + samples/Makefile | 1 + + samples/watch_queue/Makefile | 7 + + samples/watch_queue/watch_test.c | 186 ++++++ + security/keys/Kconfig | 9 + + security/keys/compat.c | 3 + + security/keys/gc.c | 5 + + security/keys/internal.h | 30 +- + security/keys/key.c | 38 +- + security/keys/keyctl.c | 99 +++- + security/keys/keyring.c | 20 +- + security/keys/request_key.c | 4 +- + security/security.c | 23 + + security/selinux/hooks.c | 14 + + security/smack/smack_lsm.c | 83 ++- + 31 files changed, 2075 insertions(+), 105 deletions(-) + create mode 100644 Documentation/watch_queue.rst + create mode 100644 include/linux/watch_queue.h + create mode 100644 include/uapi/linux/watch_queue.h + create mode 100644 kernel/watch_queue.c + create mode 100644 samples/watch_queue/Makefile + create mode 100644 samples/watch_queue/watch_test.c +$ git am -3 ../patches/0001-io_uring-fix-up-get_pipe_info-API-change.patch +Applying: io_uring: fix up for get_pipe_info() API change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/io_uring.c +$ git add -A . +$ git commit -v -a --amend +[master 7c9627ae97e4] Merge remote-tracking branch 'keys/keys-next' + Date: Tue Apr 7 11:59:01 2020 +1000 +$ git am -3 ../patches/0001-security-keys-fixup-for-security-Refactor-declaratio.patch +Applying: security: keys: fixup for "security: Refactor declaration of LSM hooks" +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/lsm_hook_defs.h +$ git add -A . +$ git commit -v -a --amend +[master d1e47fd9c165] Merge remote-tracking branch 'keys/keys-next' + Date: Tue Apr 7 11:59:01 2020 +1000 +Merging selinux/next (c753924b6285 selinux: clean up indentation issue with assignment statement) +$ git merge selinux/next +Already up to date. +Merging smack/for-next (92604e825304 smack: use GFP_NOFS while holding inode_smack::smk_lock) +$ git merge smack/for-next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'recursive' strategy. +Merging tomoyo/master (9efcc4a12936 afs: Fix unpinned address list during probing) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (2e356101e72a KEYS: reaching the keys quotas correctly) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (2d63908bdbfb watchdog: Add K3 RTI watchdog support) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/watchdog/ti,rti-wdt.yaml | 65 ++++++ + drivers/watchdog/Kconfig | 8 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/imx2_wdt.c | 37 +-- + drivers/watchdog/imx7ulp_wdt.c | 1 - + drivers/watchdog/imx_sc_wdt.c | 2 - + drivers/watchdog/npcm_wdt.c | 19 +- + drivers/watchdog/orion_wdt.c | 2 +- + drivers/watchdog/pm8916_wdt.c | 25 ++ + drivers/watchdog/qcom-wdt.c | 34 ++- + drivers/watchdog/rti_wdt.c | 255 +++++++++++++++++++++ + drivers/watchdog/watchdog_core.c | 12 + + drivers/watchdog/watchdog_dev.c | 1 + + drivers/watchdog/wm831x_wdt.c | 27 --- + drivers/watchdog/ziirave_wdt.c | 2 +- + include/linux/mfd/wm831x/pdata.h | 1 - + 16 files changed, 412 insertions(+), 80 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml + create mode 100644 drivers/watchdog/rti_wdt.c +Merging iommu/next (ff68eb23308e Merge branches 'iommu/fixes', 'arm/qcom', 'arm/omap', 'arm/smmu', 'x86/amd', 'x86/vt-d', 'virtio' and 'core' into next) +$ git merge iommu/next +Auto-merging include/linux/device.h +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/acpi/arm64/iort.c | 6 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 2 +- + drivers/iommu/Kconfig | 21 +-- + drivers/iommu/amd_iommu_types.h | 2 +- + drivers/iommu/arm-smmu-v3.c | 214 ++++++++++++++++++++++++++----- + drivers/iommu/arm-smmu.c | 55 ++++---- + drivers/iommu/intel-iommu.c | 3 +- + drivers/iommu/intel-svm.c | 9 +- + drivers/iommu/iommu.c | 46 ++++--- + drivers/iommu/ipmmu-vmsa.c | 7 +- + drivers/iommu/mtk_iommu.c | 13 +- + drivers/iommu/mtk_iommu_v1.c | 14 +- + drivers/iommu/omap-iommu.c | 10 +- + drivers/iommu/omap-iopgtable.h | 3 +- + drivers/iommu/qcom_iommu.c | 63 +++++---- + drivers/iommu/tegra-gart.c | 2 +- + drivers/iommu/virtio-iommu.c | 42 +++--- + drivers/pci/ats.c | 4 + + include/linux/device.h | 9 +- + include/linux/iommu.h | 35 +++-- + include/uapi/linux/virtio_iommu.h | 12 +- + 22 files changed, 386 insertions(+), 187 deletions(-) +Merging vfio/next (f44efca0493d vfio: Ignore -ENODEV when getting MSI cookie) +$ git merge vfio/next +Already up to date. +Merging audit/next (1320a4052ea1 audit: trigger accompanying records when no rules present) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (8967918e7cee MAINTAINERS: drop an old reference to stm32 pwm timers doc) +$ git merge devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (0a67003b1985 mailbox: imx: add SCU MU support) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (b3027f88cffb Merge branch 'spi-5.7' into spi-linus) +$ git merge spi/for-next +Already up to date. +Merging tip/auto-latest (ee8bac724cc7 Merge branch 'irq/urgent') +$ git merge tip/auto-latest +Auto-merging scripts/Makefile.lib +Auto-merging mm/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/Makefile +Auto-merging init/main.c +Auto-merging init/init_task.c +Auto-merging include/linux/sched.h +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Resolved 'arch/x86/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4563defa3fc1] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kcsan.rst | 266 ++++++++ + MAINTAINERS | 11 + + Makefile | 3 +- + arch/x86/Kconfig | 1 + + arch/x86/boot/Makefile | 2 + + arch/x86/boot/compressed/Makefile | 2 + + arch/x86/entry/vdso/Makefile | 6 + + arch/x86/include/asm/bitops.h | 6 +- + arch/x86/kernel/Makefile | 4 + + arch/x86/kernel/cpu/Makefile | 3 + + arch/x86/kernel/e820.c | 10 +- + arch/x86/lib/Makefile | 9 + + arch/x86/mm/Makefile | 4 + + arch/x86/purgatory/.gitignore | 1 + + arch/x86/purgatory/Makefile | 21 +- + arch/x86/realmode/Makefile | 3 + + arch/x86/realmode/rm/Makefile | 3 + + drivers/firmware/efi/libstub/Makefile | 2 + + include/asm-generic/atomic-instrumented.h | 711 ++++++++++---------- + include/asm-generic/atomic-long.h | 331 +++++----- + include/asm-generic/bitops/instrumented-atomic.h | 14 +- + include/asm-generic/bitops/instrumented-lock.h | 10 +- + .../asm-generic/bitops/instrumented-non-atomic.h | 16 +- + include/linux/atomic-fallback.h | 340 +++++----- + include/linux/compiler-clang.h | 11 +- + include/linux/compiler-gcc.h | 6 + + include/linux/compiler.h | 60 +- + include/linux/instrumented.h | 109 +++ + include/linux/kcsan-checks.h | 251 +++++++ + include/linux/kcsan.h | 72 ++ + include/linux/sched.h | 4 + + include/linux/seqlock.h | 51 +- + include/linux/uaccess.h | 14 +- + init/init_task.c | 9 + + init/main.c | 2 + + kernel/Makefile | 6 + + kernel/kcsan/Makefile | 14 + + kernel/kcsan/atomic.h | 27 + + kernel/kcsan/core.c | 730 +++++++++++++++++++++ + kernel/kcsan/debugfs.c | 326 +++++++++ + kernel/kcsan/encoding.h | 95 +++ + kernel/kcsan/kcsan.h | 138 ++++ + kernel/kcsan/report.c | 515 +++++++++++++++ + kernel/kcsan/test.c | 131 ++++ + kernel/locking/Makefile | 3 + + kernel/sched/Makefile | 6 + + kernel/trace/Makefile | 3 + + lib/Kconfig.debug | 2 + + lib/Kconfig.kcsan | 156 +++++ + lib/Makefile | 4 + + lib/iov_iter.c | 7 +- + lib/usercopy.c | 7 +- + mm/Makefile | 8 + + scripts/Makefile.kcsan | 6 + + scripts/Makefile.lib | 10 + + scripts/atomic/fallbacks/acquire | 2 +- + scripts/atomic/fallbacks/add_negative | 2 +- + scripts/atomic/fallbacks/add_unless | 2 +- + scripts/atomic/fallbacks/andnot | 2 +- + scripts/atomic/fallbacks/dec | 2 +- + scripts/atomic/fallbacks/dec_and_test | 2 +- + scripts/atomic/fallbacks/dec_if_positive | 2 +- + scripts/atomic/fallbacks/dec_unless_positive | 2 +- + scripts/atomic/fallbacks/fence | 2 +- + scripts/atomic/fallbacks/fetch_add_unless | 2 +- + scripts/atomic/fallbacks/inc | 2 +- + scripts/atomic/fallbacks/inc_and_test | 2 +- + scripts/atomic/fallbacks/inc_not_zero | 2 +- + scripts/atomic/fallbacks/inc_unless_negative | 2 +- + scripts/atomic/fallbacks/read_acquire | 2 +- + scripts/atomic/fallbacks/release | 2 +- + scripts/atomic/fallbacks/set_release | 2 +- + scripts/atomic/fallbacks/sub_and_test | 2 +- + scripts/atomic/fallbacks/try_cmpxchg | 2 +- + scripts/atomic/gen-atomic-fallback.sh | 2 + + scripts/atomic/gen-atomic-instrumented.sh | 9 +- + scripts/atomic/gen-atomic-long.sh | 3 +- + tools/objtool/check.c | 18 + + 79 files changed, 3866 insertions(+), 767 deletions(-) + create mode 100644 Documentation/dev-tools/kcsan.rst + create mode 100644 arch/x86/purgatory/.gitignore + create mode 100644 include/linux/instrumented.h + create mode 100644 include/linux/kcsan-checks.h + create mode 100644 include/linux/kcsan.h + create mode 100644 kernel/kcsan/Makefile + create mode 100644 kernel/kcsan/atomic.h + create mode 100644 kernel/kcsan/core.c + create mode 100644 kernel/kcsan/debugfs.c + create mode 100644 kernel/kcsan/encoding.h + create mode 100644 kernel/kcsan/kcsan.h + create mode 100644 kernel/kcsan/report.c + create mode 100644 kernel/kcsan/test.c + create mode 100644 lib/Kconfig.kcsan + create mode 100644 scripts/Makefile.kcsan +Merging clockevents/timers/drivers/next (c1ac28a4de6f Revert "clocksource: Avoid creating dead devices") +$ git merge clockevents/timers/drivers/next +Merge made by the 'recursive' strategy. +Merging edac/edac-for-next (ad49d9a8228e Merge branch 'edac-misc' into edac-for-next) +$ git merge edac/edac-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging irqchip/irq/irqchip-next (4cea749d56be Revert "irqchip/xilinx: Enable generic irq multi handler") +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (8e99cf91b99b tracing: Do not allocate buffer in trace_find_next_entry() in atomic) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (aa93ec620be3 Merge branches 'doc.2020.02.27a', 'fixes.2020.03.21a', 'kfree_rcu.2020.02.20a', 'locktorture.2020.02.20a', 'ovld.2020.02.20a', 'rcu-tasks.2020.02.20a', 'srcu.2020.02.20a' and 'torture.2020.02.20a' into HEAD) +$ git merge rcu/rcu/next +Already up to date. +Merging kvm/linux-next (514ccc194971 x86/kvm: fix a missing-prototypes "vmread_error") +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (463050599742 Merge tag 'kvm-arm-removal' into kvmarm-master/next) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (9a5788c615f5 KVM: PPC: Book3S HV: Add a capability for enabling secure guests) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (7a2653612bb6 s390/gmap: return proper error code on ksm unsharing) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (c3881eb58d56 x86/xen: Make the secondary CPU idle tasks reliable) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (dedac37ea96b Merge branch 'for-5.7' into for-next) +$ git merge percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (4acf8a423cd3 Merge branch 'for-5.7' into for-next) +$ git merge workqueues/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (317a0ebe53f4 iio: cros_ec: Use Hertz as unit for sampling frequency) +$ git merge chrome-platform/for-next +Auto-merging include/linux/platform_data/wilco-ec.h +Auto-merging include/linux/iio/iio.h +Auto-merging drivers/power/supply/Kconfig +Auto-merging drivers/iio/industrialio-core.c +Merge made by the 'recursive' strategy. + drivers/iio/accel/cros_ec_accel_legacy.c | 8 +- + .../iio/common/cros_ec_sensors/cros_ec_lid_angle.c | 3 +- + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 13 +- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 375 +++++-- + drivers/iio/industrialio-core.c | 8 +- + drivers/iio/light/cros_ec_light_prox.c | 15 +- + drivers/iio/pressure/cros_ec_baro.c | 14 +- + drivers/platform/chrome/Kconfig | 27 +- + drivers/platform/chrome/Makefile | 5 +- + drivers/platform/chrome/chromeos_laptop.c | 2 +- + drivers/platform/chrome/cros_ec.c | 32 +- + drivers/platform/chrome/cros_ec_chardev.c | 4 +- + drivers/platform/chrome/cros_ec_lightbar.c | 50 +- + drivers/platform/chrome/cros_ec_proto.c | 9 +- + drivers/platform/chrome/cros_ec_rpmsg.c | 16 +- + drivers/platform/chrome/cros_ec_sensorhub.c | 111 ++- + drivers/platform/chrome/cros_ec_sensorhub_ring.c | 1046 ++++++++++++++++++++ + drivers/platform/chrome/cros_ec_spi.c | 6 +- + drivers/platform/chrome/cros_ec_sysfs.c | 36 +- + drivers/platform/chrome/cros_ec_typec.c | 357 +++++++ + drivers/platform/chrome/cros_ec_vbc.c | 4 +- + drivers/platform/chrome/cros_usbpd_notify.c | 306 ++++++ + drivers/platform/chrome/wilco_ec/event.c | 4 +- + drivers/platform/chrome/wilco_ec/properties.c | 3 + + drivers/platform/chrome/wilco_ec/sysfs.c | 4 + + drivers/power/supply/Kconfig | 2 +- + drivers/power/supply/cros_usbpd-charger.c | 50 +- + include/linux/iio/common/cros_ec_sensors_core.h | 104 +- + include/linux/iio/iio.h | 2 + + include/linux/platform_data/cros_ec_proto.h | 4 + + include/linux/platform_data/cros_ec_sensorhub.h | 163 +++ + include/linux/platform_data/cros_usbpd_notify.h | 17 + + include/linux/platform_data/wilco-ec.h | 8 +- + 33 files changed, 2466 insertions(+), 342 deletions(-) + create mode 100644 drivers/platform/chrome/cros_ec_sensorhub_ring.c + create mode 100644 drivers/platform/chrome/cros_ec_typec.c + create mode 100644 drivers/platform/chrome/cros_usbpd_notify.c + create mode 100644 include/linux/platform_data/cros_usbpd_notify.h +Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (10a6cce3c1a1 Group LED functions according to functionality, and add some explaining comments.) +$ git merge leds/for-next +Removing include/linux/platform_data/leds-kirkwood-ns2.h +Removing include/linux/leds_pwm.h +Merge made by the 'recursive' strategy. + drivers/leds/Kconfig | 25 ++ + drivers/leds/Makefile | 100 ++++---- + drivers/leds/leds-bd2802.c | 2 - + drivers/leds/leds-ip30.c | 86 +++++++ + drivers/leds/leds-is31fl32xx.c | 2 +- + drivers/leds/leds-lm3532.c | 2 +- + drivers/leds/leds-lm3697.c | 2 +- + drivers/leds/leds-ns2.c | 99 ++++---- + drivers/leds/leds-pwm.c | 55 ++--- + drivers/leds/leds-turris-omnia.c | 295 ++++++++++++++++++++++++ + include/dt-bindings/leds/common.h | 36 ++- + include/linux/leds.h | 1 + + include/linux/leds_pwm.h | 22 -- + include/linux/platform_data/leds-kirkwood-ns2.h | 38 --- + 14 files changed, 563 insertions(+), 202 deletions(-) + create mode 100644 drivers/leds/leds-ip30.c + create mode 100644 drivers/leds/leds-turris-omnia.c + delete mode 100644 include/linux/leds_pwm.h + delete mode 100644 include/linux/platform_data/leds-kirkwood-ns2.h +Merging ipmi/for-next (562bf7705885 ipmi: Add missing annotation for ipmi_ssif_lock_cond() and ipmi_ssif_unlock_cond()) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ipmi/aspeed-kcs-bmc.txt | 20 ++- + drivers/char/ipmi/ipmi_msghandler.c | 18 ++- + drivers/char/ipmi/ipmi_ssif.c | 2 + + drivers/char/ipmi/kcs_bmc_aspeed.c | 151 +++++++++++++++++---- + 4 files changed, 153 insertions(+), 38 deletions(-) +Merging driver-core/driver-core-next (a10c9c710f9e Merge tag 'for-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (7e63420847ae Merge tag 'acpi-5.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (4a5dbd900957 dt-bindings: usb: add documentation for aspeed usb-vhub) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (57aa9f294b09 USB: serial: io_edgeport: fix slab-out-of-bounds read in edge_interrupt_callback) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (86b17c7f14ed usb: chipidea: core: show the real pointer value for register) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/core.c | 42 ++++++++---------------------------------- + drivers/usb/chipidea/udc.h | 5 +---- + 2 files changed, 9 insertions(+), 38 deletions(-) +Merging phy-next/next (89d715371a05 phy: qcom-qusb2: Add new overriding tuning parameters in QUSB2 V2 PHY) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (a10c9c710f9e Merge tag 'for-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (7e63420847ae Merge tag 'acpi-5.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (9c94553099ef extcon: axp288: Add wakeup support) +$ git merge extcon/extcon-next +Already up to date. +Merging soundwire/next (39ec6f992131 soundwire: qcom: add support for get_sdw_stream()) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (3010518964dc thunderbolt: Use scnprintf() for avoiding potential buffer overflow) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (a10c9c710f9e Merge tag 'for-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply) +$ git merge staging/staging-next +Already up to date. +Merging mux/for-next (f356d58c3a04 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging icc/icc-next (03c4e6186bbb interconnect: qcom: Add OSM L3 support on SC7180) +$ git merge icc/icc-next +Already up to date. +Merging slave-dma/next (cea582b5ee56 dt-bindings: dma: renesas,usb-dmac: add r8a77961 support) +$ git merge slave-dma/next +Already up to date. +Merging cgroup/for-next (ee3d5a56f262 Merge branch 'for-5.7' into for-next) +$ git merge cgroup/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (c128052e6991 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/lpfc/lpfc_attr.c +Auto-merging drivers/s390/scsi/zfcp_fsf.c +Merge made by the 'recursive' strategy. + drivers/s390/scsi/zfcp_erp.c | 10 +- + drivers/s390/scsi/zfcp_fsf.c | 23 ++- + drivers/scsi/aacraid/commsup.c | 7 +- + drivers/scsi/aic7xxx/aic7xxx_core.c | 23 --- + drivers/scsi/bnx2fc/bnx2fc.h | 13 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 8 +- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 103 ++++++++--- + drivers/scsi/bnx2fc/bnx2fc_io.c | 34 ++-- + drivers/scsi/constants.c | 2 +- + drivers/scsi/libfc/fc_rport.c | 10 +- + drivers/scsi/lpfc/lpfc.h | 25 ++- + drivers/scsi/lpfc/lpfc_attr.c | 73 +------- + drivers/scsi/lpfc/lpfc_crtn.h | 3 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 333 ++++++++++++++++++++++++----------- + drivers/scsi/lpfc/lpfc_debugfs.h | 3 +- + drivers/scsi/lpfc/lpfc_hw.h | 20 +-- + drivers/scsi/lpfc/lpfc_init.c | 106 ++++++++--- + drivers/scsi/lpfc/lpfc_mbox.c | 2 - + drivers/scsi/lpfc/lpfc_nvme.c | 147 ++++------------ + drivers/scsi/lpfc/lpfc_nvmet.c | 62 ++++--- + drivers/scsi/lpfc/lpfc_scsi.c | 90 +++------- + drivers/scsi/lpfc/lpfc_sli.c | 47 ++--- + drivers/scsi/lpfc/lpfc_sli.h | 2 +- + drivers/scsi/lpfc/lpfc_sli4.h | 19 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 8 +- + drivers/scsi/scsi_transport_iscsi.c | 4 +- + drivers/scsi/sr.c | 4 +- + drivers/scsi/ufs/ufs-mediatek.c | 13 +- + drivers/scsi/ufs/ufshcd.c | 87 +++++---- + drivers/scsi/ufs/ufshcd.h | 15 ++ + drivers/target/target_core_xcopy.c | 187 +++++++------------- + drivers/target/target_core_xcopy.h | 9 +- + 33 files changed, 723 insertions(+), 771 deletions(-) +Merging scsi-mkp/for-next (1b55940b9bcc scsi: core: Add DID_ALLOC_FAILURE and DID_MEDIUM_ERROR to hostbyte_table) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (d54fc2d54ae9 vhost: batching fetches) +$ git merge vhost/linux-next +Removing drivers/vhost/Kconfig.vringh +Auto-merging drivers/remoteproc/remoteproc_virtio.c +Auto-merging drivers/remoteproc/remoteproc_core.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_ioctl.c +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/Makefile +Auto-merging drivers/Kconfig +CONFLICT (modify/delete): arch/arm/kvm/Kconfig deleted in HEAD and modified in vhost/linux-next. Version vhost/linux-next of arch/arm/kvm/Kconfig left in tree. +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/kvm/Kconfig +rm 'arch/arm/kvm/Kconfig' +$ git commit --no-edit -v -a +[master 404f1076cd0a] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 3 + + arch/arm64/kvm/Kconfig | 2 - + arch/mips/kvm/Kconfig | 2 - + arch/powerpc/kvm/Kconfig | 2 - + arch/s390/kvm/Kconfig | 4 - + arch/x86/kvm/Kconfig | 4 - + drivers/Kconfig | 4 + + drivers/Makefile | 1 + + drivers/block/virtio_blk.c | 1 + + drivers/char/hw_random/virtio-rng.c | 1 + + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 1 + + drivers/misc/mic/Kconfig | 4 - + drivers/misc/mic/vop/vop_main.c | 5 +- + drivers/misc/mic/vop/vop_vringh.c | 8 +- + drivers/net/caif/Kconfig | 4 - + drivers/platform/mellanox/mlxbf-tmfifo.c | 6 +- + drivers/remoteproc/remoteproc_core.c | 2 +- + drivers/remoteproc/remoteproc_sysfs.c | 1 + + drivers/remoteproc/remoteproc_virtio.c | 2 +- + drivers/vdpa/Kconfig | 38 ++ + drivers/vdpa/Makefile | 4 + + drivers/vdpa/ifcvf/Makefile | 3 + + drivers/vdpa/ifcvf/ifcvf_base.c | 387 ++++++++++++++ + drivers/vdpa/ifcvf/ifcvf_base.h | 118 +++++ + drivers/vdpa/ifcvf/ifcvf_main.c | 433 +++++++++++++++ + drivers/vdpa/vdpa.c | 180 +++++++ + drivers/vdpa/vdpa_sim/Makefile | 2 + + drivers/vdpa/vdpa_sim/vdpa_sim.c | 629 ++++++++++++++++++++++ + drivers/vhost/Kconfig | 46 +- + drivers/vhost/Kconfig.vringh | 6 - + drivers/vhost/Makefile | 6 + + drivers/vhost/iotlb.c | 177 +++++++ + drivers/vhost/net.c | 33 +- + drivers/vhost/scsi.c | 16 +- + drivers/vhost/test.c | 73 ++- + drivers/vhost/test.h | 1 + + drivers/vhost/vdpa.c | 878 +++++++++++++++++++++++++++++++ + drivers/vhost/vhost.c | 504 +++++++++--------- + drivers/vhost/vhost.h | 95 ++-- + drivers/vhost/vringh.c | 426 ++++++++++++++- + drivers/vhost/vsock.c | 16 +- + drivers/virtio/Kconfig | 13 + + drivers/virtio/Makefile | 1 + + drivers/virtio/virtio_balloon.c | 107 ++-- + drivers/virtio/virtio_input.c | 1 + + drivers/virtio/virtio_mmio.c | 4 +- + drivers/virtio/virtio_pci_modern.c | 1 + + drivers/virtio/virtio_ring.c | 15 +- + drivers/virtio/virtio_vdpa.c | 396 ++++++++++++++ + include/linux/vdpa.h | 253 +++++++++ + include/linux/vhost_iotlb.h | 47 ++ + include/linux/virtio.h | 1 - + include/linux/virtio_ring.h | 46 ++ + include/linux/vringh.h | 43 ++ + include/uapi/linux/vhost.h | 24 + + include/uapi/linux/vhost_types.h | 8 + + include/uapi/linux/virtio_net.h | 102 +++- + include/uapi/linux/virtio_ring.h | 30 +- + tools/virtio/Makefile | 30 +- + tools/virtio/asm/barrier.h | 1 + + tools/virtio/generated/autoconf.h | 0 + tools/virtio/linux/compiler.h | 1 + + tools/virtio/ringtest/virtio_ring_0_9.c | 6 +- + tools/virtio/virtio_test.c | 101 +++- + tools/virtio/vringh_test.c | 18 +- + 65 files changed, 4876 insertions(+), 501 deletions(-) + create mode 100644 drivers/vdpa/Kconfig + create mode 100644 drivers/vdpa/Makefile + create mode 100644 drivers/vdpa/ifcvf/Makefile + create mode 100644 drivers/vdpa/ifcvf/ifcvf_base.c + create mode 100644 drivers/vdpa/ifcvf/ifcvf_base.h + create mode 100644 drivers/vdpa/ifcvf/ifcvf_main.c + create mode 100644 drivers/vdpa/vdpa.c + create mode 100644 drivers/vdpa/vdpa_sim/Makefile + create mode 100644 drivers/vdpa/vdpa_sim/vdpa_sim.c + delete mode 100644 drivers/vhost/Kconfig.vringh + create mode 100644 drivers/vhost/iotlb.c + create mode 100644 drivers/vhost/vdpa.c + create mode 100644 drivers/virtio/virtio_vdpa.c + create mode 100644 include/linux/vdpa.h + create mode 100644 include/linux/vhost_iotlb.h + create mode 100644 tools/virtio/generated/autoconf.h +$ git am -3 ../patches/0001-Revert-virtio-balloon-Switch-back-to-OOM-handler-for.patch +Applying: Revert "virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/virtio/virtio_balloon.c +$ git add -A . +$ git commit -v -a --amend +[master e94d7c6fff4c] Merge remote-tracking branch 'vhost/linux-next' + Date: Tue Apr 7 12:45:03 2020 +1000 +$ git am -3 ../patches/0001-drm-virtio-fix-up-for-include-file-changes.patch +Applying: drm/virtio: fix up for include file changes +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/virtio/virtgpu_kms.c +$ git add -A . +$ git commit -v -a --amend +[master 9c7eb041207f] Merge remote-tracking branch 'vhost/linux-next' + Date: Tue Apr 7 12:45:03 2020 +1000 +Merging rpmsg/for-next (45c2824de341 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 (4ed7d7dd4890 Revert "gpio: eic-sprd: Use devm_platform_ioremap_resource()") +$ git merge gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (03434e049439 gpio: Extend TODO to cover code duplication avoidance) +$ git merge gpio-brgl/gpio/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/TODO | 4 ++++ + drivers/gpio/gpio-xgene-sb.c | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) +Merging gpio-intel/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (c42f69b4207e pinctrl: qcom: fix compilation error) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (16fbf79b0f83 Linux 5.6-rc7) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-samsung/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (9cc5f232a4b6 pwm: pca9685: Fix PWM/GPIO inter-operation) +$ git merge pwm/for-next +Removing include/linux/platform_data/pwm_omap_dmtimer.h +Removing Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/google,cros-ec-pwm.txt | 23 --- + .../bindings/pwm/google,cros-ec-pwm.yaml | 40 ++++ + .../devicetree/bindings/pwm/nvidia,tegra20-pwm.txt | 1 + + drivers/pwm/Kconfig | 58 +++--- + drivers/pwm/core.c | 135 ++++++++++++- + drivers/pwm/pwm-bcm2835.c | 1 + + drivers/pwm/pwm-imx-tpm.c | 2 - + drivers/pwm/pwm-imx27.c | 32 +-- + drivers/pwm/pwm-jz4740.c | 162 ++++++++++----- + drivers/pwm/pwm-meson.c | 4 +- + drivers/pwm/pwm-mxs.c | 1 - + drivers/pwm/pwm-omap-dmtimer.c | 219 ++++++++++++++------- + drivers/pwm/pwm-pca9685.c | 97 ++++----- + drivers/pwm/pwm-rcar.c | 10 +- + drivers/pwm/pwm-renesas-tpu.c | 11 +- + drivers/pwm/pwm-sun4i.c | 13 +- + drivers/pwm/pwm-tegra.c | 6 + + include/clocksource/timer-ti-dm.h | 3 +- + include/linux/platform_data/pwm_omap_dmtimer.h | 90 --------- + include/linux/pwm.h | 4 +- + 20 files changed, 563 insertions(+), 349 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.yaml + delete mode 100644 include/linux/platform_data/pwm_omap_dmtimer.h +Merging userns/for-next (d1e7fd6462ca signal: Extend exec_id to 64bits) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (1091c8fce8aa ktest: Fix typos in ktest.pl) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) +$ git merge random/dev +Already up to date. +Merging kselftest/next (1056d3d2c97e selftests: enforce local header dependency in lib.mk) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (d28b4c1b2b3d Merge branch 'for-5.6/selftests' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (ed0efaa66ad8 docs: trace: coresight-ect.rst: fix a build warning) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + Documentation/trace/coresight/coresight-ect.rst | 6 +- + Documentation/trace/coresight/coresight.rst | 85 ++++++++++ + drivers/hwtracing/coresight/Makefile | 3 +- + drivers/hwtracing/coresight/coresight-cti.c | 52 +++++- + drivers/hwtracing/coresight/coresight-platform.c | 2 +- + drivers/hwtracing/coresight/coresight-priv.h | 12 +- + drivers/hwtracing/coresight/coresight-sysfs.c | 204 +++++++++++++++++++++++ + drivers/hwtracing/coresight/coresight.c | 75 ++++++--- + include/linux/coresight.h | 22 +++ + 9 files changed, 429 insertions(+), 32 deletions(-) + create mode 100644 drivers/hwtracing/coresight/coresight-sysfs.c +Merging rtc/rtc-next (1821b79d6a7d rtc: ds1307: check for failed memory allocation on wdt) +$ git merge rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (f6d2b802f80d Merge branch 'for-5.7/libnvdimm' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging mm/memremap.c +Auto-merging mm/mempolicy.c +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/memremap.h +Auto-merging include/linux/acpi.h +Auto-merging fs/iomap/buffered-io.c +Auto-merging drivers/s390/block/dcssblk.c +Auto-merging drivers/nvdimm/pmem.c +Auto-merging drivers/md/dm.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/platforms/pseries/papr_scm.c +Auto-merging arch/powerpc/Kconfig +Merge made by the 'recursive' strategy. + arch/powerpc/Kconfig | 1 + + arch/powerpc/mm/ioremap.c | 21 +++++ + arch/powerpc/platforms/pseries/papr_scm.c | 27 ++----- + arch/x86/Kconfig | 1 + + arch/x86/mm/numa.c | 67 +++++++++++---- + drivers/acpi/nfit/core.c | 4 +- + drivers/acpi/nfit/nfit.h | 12 +-- + drivers/acpi/numa/srat.c | 41 ---------- + drivers/dax/bus.c | 4 +- + drivers/dax/super.c | 28 ++++++- + drivers/md/dm-linear.c | 18 +++++ + drivers/md/dm-log-writes.c | 17 ++++ + drivers/md/dm-stripe.c | 23 ++++++ + drivers/md/dm.c | 32 +++++++- + drivers/nvdimm/dimm.c | 2 +- + drivers/nvdimm/dimm_devs.c | 95 +++++++++++++++++----- + drivers/nvdimm/e820.c | 18 +---- + drivers/nvdimm/label.h | 2 +- + drivers/nvdimm/namespace_devs.c | 28 ++++++- + drivers/nvdimm/nd.h | 7 +- + drivers/nvdimm/of_pmem.c | 4 +- + drivers/nvdimm/pfn.h | 12 +++ + drivers/nvdimm/pfn_devs.c | 40 +++++++-- + drivers/nvdimm/pmem.c | 101 ++++++++++++++--------- + drivers/nvdimm/region_devs.c | 130 ++++++++++++++++++++++++++---- + drivers/s390/block/dcssblk.c | 20 ++++- + fs/dax.c | 59 ++++++-------- + fs/iomap/buffered-io.c | 9 +-- + include/linux/acpi.h | 23 +++++- + include/linux/dax.h | 21 ++--- + include/linux/device-mapper.h | 3 + + include/linux/io.h | 2 - + include/linux/libnvdimm.h | 2 + + include/linux/memremap.h | 8 ++ + include/linux/mmzone.h | 1 + + include/linux/numa.h | 30 ++++++- + lib/Kconfig | 3 + + mm/Kconfig | 5 ++ + mm/mempolicy.c | 26 ++++++ + mm/memremap.c | 23 ++++++ + tools/testing/nvdimm/Kbuild | 4 +- + tools/testing/nvdimm/test/Kbuild | 4 +- + 42 files changed, 723 insertions(+), 255 deletions(-) +Merging at24/at24/for-next (4837621cd61e eeprom: at24: add TPF0001 ACPI ID for 24c1024 device) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (b9fc54c38e2e NTB: ntb_test: Fix bug when counting remote files) +$ git merge ntb/ntb-next +Auto-merging drivers/ntb/hw/idt/ntb_hw_idt.c +Merge made by the 'recursive' strategy. + drivers/ntb/core.c | 9 ++------- + drivers/ntb/hw/amd/ntb_hw_amd.c | 4 ---- + drivers/ntb/hw/idt/ntb_hw_idt.c | 6 ------ + drivers/ntb/hw/intel/ntb_hw_gen1.c | 4 ---- + drivers/ntb/test/ntb_perf.c | 29 ++++++++++++++++++++++------- + drivers/ntb/test/ntb_pingpong.c | 14 ++++++-------- + drivers/ntb/test/ntb_tool.c | 9 ++++----- + tools/testing/selftests/ntb/ntb_test.sh | 2 +- + 8 files changed, 35 insertions(+), 42 deletions(-) +Merging kspp/for-next/kspp (2e8993d77697 gcc-plugins/stackleak: Avoid assignment for unused macro argument) +$ git merge kspp/for-next/kspp +Merge made by the 'recursive' strategy. + scripts/gcc-plugins/stackleak_plugin.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (f8788d86ab28 Linux 5.6-rc3) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (2c01397b71c5 fsi: aspeed: Fix OPB0 byte order register values) +$ git merge fsi/next +Auto-merging drivers/fsi/Kconfig +CONFLICT (content): Merge conflict in drivers/fsi/Kconfig +Resolved 'drivers/fsi/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9c8a130d83d3] Merge remote-tracking branch 'fsi/next' +$ git diff -M --stat --summary HEAD^.. +Merging slimbus/for-next (ba1589ff458e slimbus: ngd: add v2.1.0 compatible) +$ git merge slimbus/for-next +Merge made by the 'recursive' strategy. +Merging nvmem/for-next (990df6402752 nvmem: mxs-ocotp: Use devm_add_action_or_reset() for cleanup) +$ git merge nvmem/for-next +CONFLICT (modify/delete): drivers/nvmem/nvmem-sysfs.c deleted in HEAD and modified in nvmem/for-next. Version nvmem/for-next of drivers/nvmem/nvmem-sysfs.c left in tree. +Auto-merging drivers/nvmem/core.c +Auto-merging drivers/nvmem/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/nvmem/nvmem-sysfs.c +rm 'drivers/nvmem/nvmem-sysfs.c' +$ git commit --no-edit -v -a +[master c3b0ef14d907] Merge remote-tracking branch 'nvmem/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging xarray/xarray (27586ca786a7 XArray: Handle retry entries within xas_find_marked) +$ git merge xarray/xarray +Merge made by the 'recursive' strategy. + Documentation/core-api/xarray.rst | 13 +++++++------ + drivers/infiniband/core/device.c | 6 +----- + include/linux/xarray.h | 23 +++++++++++++++++++++- + lib/idr.c | 1 + + lib/test_xarray.c | 20 +++++++++++++++++++ + lib/xarray.c | 39 +++++++++++++++++++++++++++++++------ + tools/testing/radix-tree/idr-test.c | 29 +++++++++++++++++++++++++++ + 7 files changed, 113 insertions(+), 18 deletions(-) +Merging hyperv/hyperv-next (86fd319b9240 x86/Hyper-V: Report crash register data when sysctl_record_panic_msg is not set) +$ git merge hyperv/hyperv-next +Merge made by the 'recursive' strategy. + arch/x86/kernel/cpu/mshyperv.c | 10 +++++++ + drivers/hv/channel_mgmt.c | 3 +++ + drivers/hv/vmbus_drv.c | 61 +++++++++++++++++++++++++++++------------- + 3 files changed, 56 insertions(+), 18 deletions(-) +Merging auxdisplay/auxdisplay (2f920c0f0e29 auxdisplay: charlcd: replace zero-length array with flexible-array member) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (5ea771abd5a3 kdb: Censor attempts to set PROMPT without ENABLE_MEM_READ) +$ git merge kgdb/kgdb/for-next +Merge made by the 'recursive' strategy. +Merging pidfd/for-next (6952a4f64644 selftests: add pid namespace ENOMEM regression test) +$ git merge pidfd/for-next +Already up to date. +Merging devfreq/devfreq-next (19b5622d849b PM / devfreq: tegra30: Delete an error message in tegra_devfreq_probe()) +$ git merge devfreq/devfreq-next +Merge made by the 'recursive' strategy. + drivers/devfreq/tegra30-devfreq.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) +Merging hmm/hmm (bd5d3587b218 mm/hmm: return error for non-vma snapshots) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (cef0ca6417de fpga: dfl: afu: support debug access to memory-mapped afu regions) +$ git merge fpga/for-next +Auto-merging arch/arm64/boot/dts/intel/socfpga_agilex.dtsi +Merge made by the 'recursive' strategy. + .../bindings/firmware/intel,stratix10-svc.txt | 2 +- + .../bindings/fpga/intel-stratix10-soc-fpga-mgr.txt | 3 +- + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 4 +-- + drivers/fpga/dfl-afu-main.c | 35 +++++++++++++------- + drivers/fpga/dfl-fme-main.c | 19 +++++++---- + drivers/fpga/dfl.c | 15 +++++++-- + drivers/fpga/dfl.h | 37 ++++++++++++++++------ + drivers/fpga/ice40-spi.c | 10 ++++-- + drivers/fpga/machxo2-spi.c | 12 ++++--- + drivers/fpga/stratix10-soc.c | 3 +- + 10 files changed, 100 insertions(+), 40 deletions(-) +Merging kunit/test (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge kunit/test +Already up to date. +Merging cel/cel-next (1a33d8a284b1 svcrdma: Fix leak of transport addresses) +$ git merge cel/cel-next +Already up to date. +Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) +$ git merge generic-ioremap/for-next +Already up to date. +Merging cfi/cfi/next (b6fe8bc67d2d mtd: hyperbus: move direct mapping setup to AM654 HBMC driver) +$ git merge cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (e23349af9ee2 kunit: tool: add missing test data file content) +$ git merge kunit-next/kunit +Already up to date. +Merging trivial/for-next (fad7c9020948 err.h: remove deprecated PTR_RET for good) +$ git merge trivial/for-next +Already up to date. +Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) +$ git merge zx2c4/for-next +Already up to date. +Merging akpm-current/current (04604a3939a6 ipc/shm.c: make compat_ksys_shmctl() static) +$ git merge --no-ff akpm-current/current +Auto-merging mm/memremap.c +Auto-merging mm/mempolicy.c +Auto-merging mm/Makefile +Auto-merging mm/Kconfig +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/module.c +Auto-merging kernel/events/core.c +Auto-merging init/Kconfig +Auto-merging include/linux/sched.h +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/memremap.h +Auto-merging include/linux/compiler.h +Auto-merging drivers/virtio/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/platforms/powernv/memtrace.c +Auto-merging arch/csky/mm/fault.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 20 +- + Documentation/admin-guide/mm/transhuge.rst | 14 + + Documentation/admin-guide/mm/userfaultfd.rst | 51 ++ + Documentation/dev-tools/kcov.rst | 17 +- + Documentation/vm/free_page_reporting.rst | 41 ++ + Documentation/vm/zswap.rst | 20 +- + MAINTAINERS | 42 +- + arch/alpha/include/asm/mmzone.h | 2 - + arch/alpha/kernel/syscalls/syscallhdr.sh | 2 +- + arch/arm64/mm/init.c | 6 + + arch/csky/mm/fault.c | 2 +- + arch/ia64/kernel/syscalls/syscallhdr.sh | 2 +- + arch/ia64/kernel/vmlinux.lds.S | 2 + + arch/m68k/mm/fault.c | 2 +- + arch/microblaze/kernel/syscalls/syscallhdr.sh | 2 +- + arch/mips/kernel/syscalls/syscallhdr.sh | 3 +- + arch/mips/mm/fault.c | 2 +- + arch/nds32/kernel/vmlinux.lds.S | 1 + + arch/parisc/kernel/syscalls/syscallhdr.sh | 2 +- + arch/powerpc/kernel/syscalls/syscallhdr.sh | 3 +- + arch/powerpc/kvm/e500_mmu_host.c | 2 +- + arch/powerpc/mm/fault.c | 2 +- + arch/powerpc/platforms/powernv/memtrace.c | 14 +- + arch/sh/kernel/syscalls/syscallhdr.sh | 2 +- + arch/sh/mm/fault.c | 2 +- + arch/sparc/kernel/syscalls/syscallhdr.sh | 2 +- + arch/sparc/vdso/vdso32/vclock_gettime.c | 4 - + arch/x86/Kconfig | 1 + + arch/x86/configs/i386_defconfig | 1 - + arch/x86/configs/x86_64_defconfig | 1 - + arch/x86/entry/vdso/vdso32/vclock_gettime.c | 4 - + arch/x86/include/asm/pgtable.h | 67 +++ + arch/x86/include/asm/pgtable_64.h | 8 +- + arch/x86/include/asm/pgtable_types.h | 12 +- + arch/x86/kernel/setup.c | 4 + + arch/x86/mm/fault.c | 2 +- + arch/xtensa/kernel/syscalls/syscallhdr.sh | 2 +- + drivers/base/memory.c | 174 +++--- + drivers/hv/hv_balloon.c | 25 +- + drivers/misc/lkdtm/bugs.c | 75 +++ + drivers/misc/lkdtm/core.c | 3 + + drivers/misc/lkdtm/lkdtm.h | 3 + + drivers/tty/serial/sh-sci.c | 2 +- + drivers/usb/core/hcd.c | 3 + + drivers/virtio/Kconfig | 1 + + drivers/virtio/virtio_balloon.c | 180 +++++-- + fs/aio.c | 9 +- + fs/binfmt_elf.c | 48 +- + fs/buffer.c | 56 +- + fs/eventpoll.c | 64 ++- + fs/exec.c | 14 +- + fs/hfsplus/attributes.c | 4 + + fs/proc/array.c | 39 +- + fs/proc/cpuinfo.c | 1 + + fs/proc/generic.c | 31 +- + fs/proc/inode.c | 188 +++++-- + fs/proc/internal.h | 6 + + fs/proc/kmsg.c | 1 + + fs/proc/page.c | 40 +- + fs/proc/stat.c | 1 + + fs/proc/task_mmu.c | 95 ++-- + fs/ramfs/inode.c | 12 + + fs/reiserfs/do_balan.c | 2 +- + fs/reiserfs/ioctl.c | 11 +- + fs/reiserfs/namei.c | 10 +- + fs/seq_file.c | 28 - + fs/userfaultfd.c | 106 +++- + include/asm-generic/pgtable.h | 1 + + include/asm-generic/pgtable_uffd.h | 66 +++ + include/asm-generic/tlb.h | 3 +- + include/linux/bitops.h | 4 +- + include/linux/bits.h | 22 +- + include/linux/compiler.h | 2 +- + include/linux/compiler_types.h | 11 +- + include/linux/gfp.h | 5 + + include/linux/huge_mm.h | 2 +- + include/linux/hugetlb.h | 8 + + include/linux/list.h | 50 +- + include/linux/memory.h | 1 - + include/linux/memory_hotplug.h | 13 +- + include/linux/memremap.h | 8 +- + include/linux/mm.h | 25 +- + include/linux/mm_inline.h | 15 +- + include/linux/mm_types.h | 4 +- + include/linux/mmzone.h | 47 +- + include/linux/nmi.h | 1 + + include/linux/page-flags.h | 16 + + include/linux/page_reporting.h | 26 + + include/linux/pagemap.h | 4 +- + include/linux/percpu_counter.h | 4 +- + include/linux/proc_fs.h | 17 +- + include/linux/sched.h | 11 + + include/linux/seq_file.h | 1 - + include/linux/shmem_fs.h | 10 +- + include/linux/stackdepot.h | 2 + + include/linux/swapops.h | 5 +- + include/linux/userfaultfd_k.h | 42 +- + include/linux/vm_event_item.h | 5 + + include/linux/wait.h | 4 +- + include/trace/events/huge_memory.h | 1 + + include/trace/events/mmflags.h | 1 + + include/trace/events/vmscan.h | 2 +- + include/uapi/linux/userfaultfd.h | 40 +- + include/uapi/linux/virtio_balloon.h | 1 + + init/Kconfig | 8 +- + ipc/mqueue.c | 39 +- + ipc/shm.c | 2 +- + ipc/util.c | 1 + + kernel/configs/tiny.config | 1 - + kernel/events/core.c | 3 +- + kernel/extable.c | 3 +- + kernel/fork.c | 10 +- + kernel/gcov/fs.c | 2 +- + kernel/gcov/gcc_3_4.c | 6 +- + kernel/gcov/gcc_4_7.c | 2 +- + kernel/hung_task.c | 44 ++ + kernel/kallsyms.c | 2 - + kernel/kcov.c | 266 ++++++--- + kernel/kmod.c | 2 +- + kernel/module.c | 1 + + kernel/relay.c | 17 +- + kernel/sched/fair.c | 2 +- + kernel/watchdog.c | 22 + + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 41 +- + lib/Kconfig.ubsan | 49 +- + lib/Makefile | 8 + + lib/bch.c | 2 +- + lib/cpumask.c | 102 +++- + lib/dynamic_debug.c | 2 +- + lib/rbtree.c | 4 +- + lib/scatterlist.c | 2 +- + lib/stackdepot.c | 39 +- + lib/test_bitmap.c | 2 + + lib/test_kmod.c | 2 +- + lib/test_lockup.c | 599 +++++++++++++++++++++ + lib/test_stackinit.c | 28 +- + lib/ts_bm.c | 2 +- + lib/ts_fsm.c | 2 +- + lib/ts_kmp.c | 2 +- + lib/ubsan.c | 47 +- + mm/Kconfig | 135 ++++- + mm/Makefile | 1 + + mm/compaction.c | 3 +- + mm/dmapool.c | 4 +- + mm/filemap.c | 14 +- + mm/gup.c | 9 +- + mm/huge_memory.c | 36 +- + mm/hugetlb.c | 112 ++++ + mm/hugetlb_cgroup.c | 6 +- + mm/internal.h | 2 + + mm/kasan/common.c | 23 - + mm/kasan/report.c | 10 +- + mm/khugepaged.c | 39 +- + mm/ksm.c | 5 +- + mm/list_lru.c | 2 +- + mm/memcontrol.c | 59 +- + mm/memory-failure.c | 2 +- + mm/memory.c | 38 +- + mm/memory_hotplug.c | 49 +- + mm/mempolicy.c | 11 +- + mm/memremap.c | 20 + + mm/migrate.c | 118 ++-- + mm/mm_init.c | 2 +- + mm/mmap.c | 53 +- + mm/mprotect.c | 76 ++- + mm/page_alloc.c | 178 ++++-- + mm/page_ext.c | 5 +- + mm/page_isolation.c | 6 +- + mm/page_reporting.c | 364 +++++++++++++ + mm/page_reporting.h | 54 ++ + mm/rmap.c | 23 +- + mm/shmem.c | 166 +++--- + mm/shuffle.c | 12 +- + mm/shuffle.h | 6 + + mm/slab_common.c | 3 +- + mm/slub.c | 3 +- + mm/sparse.c | 136 +++-- + mm/swap.c | 20 +- + mm/swapfile.c | 1 + + mm/userfaultfd.c | 94 +++- + mm/vmalloc.c | 2 +- + mm/vmscan.c | 12 +- + mm/vmstat.c | 3 + + mm/zsmalloc.c | 10 +- + mm/zswap.c | 24 +- + samples/hw_breakpoint/data_breakpoint.c | 11 +- + scripts/Makefile.ubsan | 16 +- + scripts/checkpatch.pl | 155 ++++-- + tools/lib/rbtree.c | 4 +- + .../filesystems/epoll/epoll_wakeup_test.c | 67 ++- + tools/testing/selftests/vm/userfaultfd.c | 225 ++++++-- + 192 files changed, 4469 insertions(+), 1405 deletions(-) + create mode 100644 Documentation/vm/free_page_reporting.rst + create mode 100644 include/asm-generic/pgtable_uffd.h + create mode 100644 include/linux/page_reporting.h + create mode 100644 lib/test_lockup.c + create mode 100644 mm/page_reporting.c + create mode 100644 mm/page_reporting.h +$ 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 +First, rewinding head to replay your work on top of it... +Applying: Change email address for Pali Rohár +Applying: mm/kmemleak: silence KCSAN splats in checksum +Applying: drivers/dma/tegra20-apb-dma.c: fix platform_get_irq.cocci warnings +Applying: mm/frontswap: mark various intentional data races +Applying: mm/page_io: mark various intentional data races +Applying: mm-page_io-mark-various-intentional-data-races-v2 +Applying: mm/swap_state: mark various intentional data races +Applying: mm/filemap.c: fix a data race in filemap_fault() +Applying: mm/swapfile: fix and annotate various data races +Applying: mm-swapfile-fix-and-annotate-various-data-races-v2 +Applying: mm/page_counter: fix various data races at memsw +Applying: mm/memcontrol: fix a data race in scan count +Applying: mm/list_lru: fix a data race in list_lru_count_one +Applying: mm/mempool: fix a data race in mempool_free() +Applying: mm/util.c: annotate an data race at vm_committed_as +Applying: mm/rmap: annotate a data race at tlb_flush_batched +Applying: mm: annotate a data race in page_zonenum() +Applying: mm/swap.c: annotate data races for lru_rotate_pvecs +Applying: mm/memory.c: refactor insert_page to prepare for batched-lock insert +Applying: mm: bring sparc pte_index() semantics inline with other platforms +Applying: mm: define pte_index as macro for x86 +Applying: mm/memory.c: add vm_insert_pages() +Applying: mm-add-vm_insert_pages-fix +Applying: add missing page_count() check to vm_insert_pages(). +Applying: mm: vm_insert_pages() checks if pte_index defined. +Applying: net-zerocopy: use vm_insert_pages() for tcp rcv zerocopy +Applying: net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix +Applying: mm/vma: define a default value for VM_DATA_DEFAULT_FLAGS +Applying: mm/vma: introduce VM_ACCESS_FLAGS +Applying: mm/special: create generic fallbacks for pte_special() and pte_mkspecial() +Applying: mm-special-create-generic-fallbacks-for-pte_special-and-pte_mkspecial-v3 +Applying: mm/debug: add tests validating architecture page table helpers +Applying: mm/memory_hotplug: drop the flags field from struct mhp_restrictions +Applying: mm/memory_hotplug: rename mhp_restrictions to mhp_params +Applying: x86/mm: thread pgprot_t through init_memory_mapping() +Applying: x86/mm: introduce __set_memory_prot() +Applying: powerpc/mm: thread pgprot_t through create_section_mapping() +Applying: mm/memory_hotplug: add pgprot_t to mhp_params +Applying: mm/memremap: set caching mode for PCI P2PDMA memory to WC +Applying: mm/madvise: pass task and mm to do_madvise +Applying: mm/madvise: introduce process_madvise() syscall: an external memory hinting API +Applying: fix process_madvise build break for arm64 +Applying: mm/madvise: check fatal signal pending of target process +Applying: pid: move pidfd_get_pid() to pid.c +Applying: mm/madvise: support both pid and pidfd for process_madvise +Applying: mm/madvise: employ mmget_still_valid() for write lock +Applying: mm/madvise: allow KSM hints for remote API +Applying: kmod: make request_module() return an error when autoloading is disabled +Applying: fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once() +Applying: docs: admin-guide: document the kernel.modprobe sysctl +Applying: docs-admin-guide-document-the-kernelmodprobe-sysctl-v5 +Applying: selftests: kmod: fix handling test numbers above 9 +Applying: selftests: kmod: test disabling module autoloading +Applying: kexec: prevent removal of memory in use by a loaded kexec image +Applying: mm/memory_hotplug: allow arch override of non boot memory resource names +Applying: arm64: memory: give hotplug memory a different resource name +Applying: fs/seq_file.c: seq_read(): add info message about buggy .next functions +Applying: seq_read-info-message-about-buggy-next-functions-fix +Applying: kernel/gcov/fs.c: gcov_seq_next() should increase position index +Applying: ipc/util.c: sysvipc_find_ipc() should increase position index +Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 9845c5492531...4fe13b118e81 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (4fe13b118e81 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-platform-dell-laptop | 8 +- + Documentation/admin-guide/sysctl/kernel.rst | 21 ++ + .../debug/debug-vm-pgtable/arch-support.txt | 34 ++ + MAINTAINERS | 16 +- + arch/alpha/include/asm/page.h | 3 - + arch/alpha/include/asm/pgtable.h | 2 - + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arc/Kconfig | 1 + + arch/arc/include/asm/page.h | 2 +- + arch/arm/include/asm/page.h | 4 +- + arch/arm/include/asm/pgtable-2level.h | 2 - + arch/arm/include/asm/pgtable.h | 15 +- + arch/arm/mach-omap2/omap-secure.c | 2 +- + arch/arm/mach-omap2/omap-secure.h | 2 +- + arch/arm/mach-omap2/omap-smc.S | 2 +- + arch/arm/mm/fault.c | 2 +- + arch/arm/mm/mmu.c | 14 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/memory.h | 11 + + arch/arm64/include/asm/page.h | 4 +- + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/arm64/mm/fault.c | 2 +- + arch/arm64/mm/mmu.c | 7 +- + arch/c6x/include/asm/page.h | 5 +- + arch/csky/include/asm/page.h | 3 - + arch/csky/include/asm/pgtable.h | 3 - + arch/h8300/include/asm/page.h | 2 - + arch/hexagon/include/asm/page.h | 3 +- + arch/hexagon/include/asm/pgtable.h | 2 - + arch/ia64/include/asm/page.h | 5 +- + arch/ia64/include/asm/pgtable.h | 2 - + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/ia64/mm/init.c | 7 +- + arch/m68k/include/asm/mcf_pgtable.h | 10 - + arch/m68k/include/asm/motorola_pgtable.h | 2 - + arch/m68k/include/asm/page.h | 3 - + arch/m68k/include/asm/sun3_pgtable.h | 2 - + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/include/asm/page.h | 2 - + arch/microblaze/include/asm/pgtable.h | 4 - + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/include/asm/page.h | 5 +- + arch/mips/include/asm/pgtable.h | 44 ++- + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/nds32/include/asm/page.h | 3 - + arch/nds32/include/asm/pgtable.h | 9 - + arch/nds32/mm/fault.c | 2 +- + arch/nios2/include/asm/page.h | 3 +- + arch/nios2/include/asm/pgtable.h | 3 - + arch/openrisc/include/asm/page.h | 5 - + arch/openrisc/include/asm/pgtable.h | 2 - + arch/parisc/include/asm/page.h | 3 - + arch/parisc/include/asm/pgtable.h | 2 - + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/book3s/64/hash.h | 3 +- + arch/powerpc/include/asm/book3s/64/radix.h | 3 +- + arch/powerpc/include/asm/page.h | 9 +- + arch/powerpc/include/asm/page_64.h | 7 +- + arch/powerpc/include/asm/sparsemem.h | 3 +- + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/mm/book3s64/hash_utils.c | 5 +- + arch/powerpc/mm/book3s64/pgtable.c | 7 +- + arch/powerpc/mm/book3s64/pkeys.c | 2 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 18 +- + arch/powerpc/mm/mem.c | 10 +- + arch/riscv/include/asm/page.h | 3 +- + arch/s390/Kconfig | 1 + + arch/s390/include/asm/page.h | 3 +- + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/s390/mm/fault.c | 2 +- + arch/s390/mm/init.c | 9 +- + arch/sh/include/asm/page.h | 3 - + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sh/mm/init.c | 7 +- + arch/sparc/include/asm/page_32.h | 3 - + arch/sparc/include/asm/page_64.h | 3 - + arch/sparc/include/asm/pgtable_32.h | 7 - + arch/sparc/include/asm/pgtable_64.h | 10 +- + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/um/include/asm/pgtable.h | 10 - + arch/unicore32/include/asm/page.h | 3 - + arch/unicore32/include/asm/pgtable.h | 3 - + arch/unicore32/mm/fault.c | 2 +- + arch/x86/Kconfig | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/page_types.h | 7 +- + arch/x86/include/asm/pgtable.h | 6 + + arch/x86/include/asm/pgtable_64.h | 6 + + arch/x86/include/asm/set_memory.h | 1 + + arch/x86/kernel/amd_gart_64.c | 3 +- + arch/x86/mm/init.c | 9 +- + arch/x86/mm/init_32.c | 19 +- + arch/x86/mm/init_64.c | 40 ++- + arch/x86/mm/mm_internal.h | 3 +- + arch/x86/mm/pat/set_memory.c | 13 + + arch/x86/mm/pkeys.c | 2 +- + arch/x86/platform/uv/bios_uv.c | 3 +- + arch/x86/um/asm/vm-flags.h | 10 +- + arch/xtensa/include/asm/page.h | 3 - + arch/xtensa/include/asm/pgtable.h | 3 - + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + drivers/char/hw_random/omap3-rom-rng.c | 4 +- + drivers/dma/tegra20-apb-dma.c | 1 - + drivers/hwmon/dell-smm-hwmon.c | 4 +- + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/platform/x86/dell-laptop.c | 4 +- + drivers/platform/x86/dell-rbtn.c | 4 +- + drivers/platform/x86/dell-rbtn.h | 2 +- + drivers/platform/x86/dell-smbios-base.c | 4 +- + drivers/platform/x86/dell-smbios-smm.c | 2 +- + drivers/platform/x86/dell-smbios.h | 2 +- + drivers/platform/x86/dell-smo8800.c | 2 +- + drivers/platform/x86/dell-wmi.c | 4 +- + drivers/power/supply/bq2415x_charger.c | 4 +- + drivers/power/supply/bq27xxx_battery.c | 2 +- + drivers/power/supply/isp1704_charger.c | 2 +- + drivers/power/supply/rx51_battery.c | 4 +- + drivers/staging/gasket/gasket_core.c | 2 +- + fs/filesystems.c | 4 +- + fs/io_uring.c | 2 +- + fs/seq_file.c | 7 +- + fs/udf/ecma_167.h | 2 +- + fs/udf/osta_udf.h | 2 +- + include/linux/memcontrol.h | 2 +- + include/linux/memory_hotplug.h | 21 +- + include/linux/mm.h | 38 +- + include/linux/mmdebug.h | 5 + + include/linux/pid.h | 1 + + include/linux/power/bq2415x_charger.h | 2 +- + include/linux/syscalls.h | 3 + + include/uapi/asm-generic/unistd.h | 4 +- + init/main.c | 2 + + ipc/util.c | 2 +- + kernel/exit.c | 17 - + kernel/gcov/fs.c | 2 +- + kernel/kexec_core.c | 56 +++ + kernel/kmod.c | 4 +- + kernel/pid.c | 17 + + kernel/sys_ni.c | 1 + + lib/Kconfig.debug | 26 ++ + mm/Makefile | 1 + + mm/debug_vm_pgtable.c | 392 +++++++++++++++++++++ + mm/filemap.c | 20 +- + mm/frontswap.c | 8 +- + mm/kmemleak.c | 2 + + mm/list_lru.c | 2 +- + mm/madvise.c | 144 ++++++-- + mm/memory.c | 172 ++++++++- + mm/memory_hotplug.c | 17 +- + mm/mempool.c | 2 +- + mm/memremap.c | 17 +- + mm/mmap.c | 2 +- + mm/mprotect.c | 4 +- + mm/page_counter.c | 13 +- + mm/page_io.c | 8 +- + mm/rmap.c | 2 +- + mm/swap.c | 5 +- + mm/swap_state.c | 4 +- + mm/swapfile.c | 31 +- + mm/util.c | 8 +- + net/ipv4/tcp.c | 70 +++- + tools/laptop/freefall/freefall.c | 2 +- + tools/testing/selftests/kmod/kmod.sh | 43 ++- + 168 files changed, 1364 insertions(+), 452 deletions(-) + create mode 100644 Documentation/features/debug/debug-vm-pgtable/arch-support.txt + create mode 100644 mm/debug_vm_pgtable.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..5f76052bfe22 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing dmi based on 5.5 +Unchanged quilt series dmi +Importing dmi based on 5.5 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..c6857c0177c8 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20200407 |