diff options
| -rw-r--r-- | Next/SHA1s | 314 | ||||
| -rw-r--r-- | Next/Trees | 316 | ||||
| -rw-r--r-- | Next/merge.log | 2039 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 2672 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..930397806ce8 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,314 @@ +Name SHA1 +---- ---- +origin 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +fixes 04e6dac68d9b7c4c5e8579b8e435c3b7ec945b7c +kbuild-current f97c81dc6ca5996560b3944064f63fc87eb18d00 +arc-current 41277ba7eb4ef344a807cfb0f4319151abc9ffa3 +arm-current 5b3efa4f1479c91cb8361acef55f9c6662feba57 +arm-soc-fixes a304c0a60252fde9daccd9f8a07a598021f6956a +arm64-fixes 799c85105233514309b201a2d2d7a7934458c999 +m68k-current 0f1979b402df5f0dd86425830ddaa191d70f3655 +powerpc-fixes 253c892193ab58da6b1d94371285971b22c63260 +s390-fixes d45331b00ddb179e291766617259261c112db872 +sparc 038029c03e21be3bab44ff9d8005b51b597a5bf2 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 0e141f757b2c78c983df893e9993313e2dc21e38 +bpf 55d554f5d14071f7c2c5dbd88d0a2eb695c97d16 +ipsec 00b368502d18f790ab715e055869fd4bb7484a9b +netfilter 02dc96ef6c25f990452c114c59d75c368a1f4c8f +ipvs 58e8b37069ff2609c4c972c2f127a73a0855c6aa +wireless-drivers 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +mac80211 f794dc2304d83ab998c2eee5bab0549aff5c53a2 +rdma-fixes 531a64e4c35bb9844b0cf813a6c9a87e00be05ff +sound-current f41f900568d9ffd896cc941db7021eb14bd55910 +sound-asoc-fixes 84b66885fdcf48c6999e3a7f67778050988ee118 +regmap-fixes 0161b8716465a93db726147e12f2514ba356c271 +regulator-fixes f9a60abc26d98d3058a4c71e21eaeec8460cb699 +spi-fixes 60b76d1c3b0a5c818ae9e1cc94c771aed6d0ad54 +pci-current 5184d449600f501a8688069f35c138c6b3bf8b94 +driver-core.current 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +tty.current 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +usb.current 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +usb-gadget-fixes 4a56a478a525d6427be90753451c40e1327caa1a +usb-serial-fixes d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1 +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy 609488bc979f99f805f34e9a32c1e3b71179d10b +staging.current 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +char-misc.current 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +soundwire-fixes d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1 +thunderbolt-fixes 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +input-current 0898782247ae533d1f4e47a06bc5d4870931b284 +crypto-current bf6a7a5ad6fa69e48b735be75eeb90569d9584bb +ide baf6722aa0cbc5381f11520eb661be71b3ac379e +vfio-fixes 5715c4dd66a315515eedef3fc4cbe1bf4620f009 +kselftest-fixes fbb01c52471c8fb4ec2422c0ab26c134bd90bbff +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes 04cbfba6208592999d7bfe6609ec01dc3fde73f5 +backlight-fixes e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd +mtd-fixes dc9cfd2692225a2164f4f20b7deaf38ca8645de3 +mfd-fixes 4d82fa67dd6b0e2635ae9dad44fbf3d747eca9ed +v4l-dvb-fixes 63ad05e36ec5afc92c6b787c2e419d1ae3d0c8e6 +reset-fixes a71dcd3757e29cc8b43383ff18595d707cf08345 +mips-fixes 74034a09267c1f48d5ce7ae4c4a317fac7d43418 +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes f90ec6cdf674248dcad85bf9af6e064bf472b841 +kvm-fixes fd3edd4a9066f28de99a16685a586d68a9f551f8 +kvms390-fixes 53936b5bf35e140ae27e4bbf0447a61063f400da +hwmon-fixes 98d1a3c245e4beb450867bcc7798c85a09aa0095 +nvdimm-fixes 4c806b897d6075bfa5067e524fb058c57ab64e7b +btrfs-fixes 47e95c92bce85791c5668b22501511ba344d7971 +vfs-fixes d4f4de5e5ef8efde85febb6876cd3c8ab1631999 +dma-mapping-fixes 33dcb37cef741294b481f4d889a465b8091f11bf +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +samsung-krzk-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +pinctrl-samsung-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +devicetree-fixes 83f82d7a42583e93d0f0dde3d61ed10f75c0f4d8 +scsi-fixes 0aabb6b699f72dca96988d3f428e222f932dc889 +drm-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +amdgpu-fixes 104c307147ad379617472dd91a5bcb368d72bd6d +drm-intel-fixes 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +mmc-fixes e51df6ce668a8f75ce27f83ce0f60103c568c375 +rtc-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +gnss-fixes f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +hyperv-fixes e395071a12f9df7d22ca6657614e93453b69f72a +soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27 +risc-v-fixes c82dd6d078a2bb29d41eda032bb96d05699a524d +pidfd-fixes 3969e76909d3aa06715997896184ee684f68d164 +fpga-fixes dec43da46f63eb71f519d963ba6832838e4262a3 +spdx 02dc96ef6c25f990452c114c59d75c368a1f4c8f +gpio-intel-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +pinctrl-intel-fixes 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +erofs-fixes dc76ea8c1087b5c44235566ed4be2202d21a8504 +drm-misc-fixes a0ecd6fdbf5d648123a7315c695fb6850d702835 +kspp-gustavo 609488bc979f99f805f34e9a32c1e3b71179d10b +kbuild 337bf824b735ccf501179702aff8872105b139d0 +compiler-attributes 32ee8230b2b06c50f583e14fcd174d7d2edb52f5 +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping c7d9eccb3c1e802c5cbb2a764eb0eb9807d9f12e +asm-generic 9b87647c665dbf93173ca2f43986902b59dfbbba +arc 6fbc7275c7a9ba97877050335f290341a1fd8dbf +arm 3a6d5fc4376059d0f4047b58170325df9bd90e18 +arm64 e376897f424a1c807779a2635f62eb02d7e382f9 +arm-perf 3724e186fead350d1446d5202cd92fa6250bffda +arm-soc 4705d9f7f6f0a25af99fe8872c0a674efd5511ff +actions fb9c1c1deb5ece57810afdbd743358d02e632d2c +amlogic d1150f2a0bbabc7d6295a174b94a2f5ae55ad004 +aspeed ba0fdbb07d0511384e736e3b0b9b10c8c9e275fd +at91 3253ffa16c9ad6cc3095506c9ca5ee64b003f5bb +bcm2835 c165c01bb6f7873a31ddcc338ed6df2a3aa94cb1 +imx-mxs d26d83e3e1fc7c7d21f1406cbd842fa612079828 +keystone 78145dbeaea103586940696d4acbf2b1d62cf14e +mediatek 4ae1ce88e9a010b6227f0345b0abea0eebd38599 +mvebu 153e97d3bdf3549705d352ae49ce9d8fea2262c8 +omap 75e66cd99933cdcd8c89cb1a31f207370a91243d +qcom 63e5846442478bbd493377aee59ed817226c6475 +renesas ae688e1720fd387de34f2140a735917411672bf1 +renesas-geert e180e8bda8292eb2ed3f396f44487ef6e4dc26b9 +reset 2d94bccca49ff6b9c6795bf5206cf56f56718a57 +rockchip 155cb7cd4cd417d54b57b731cc2331bf9e545156 +samsung-krzk 2f776c5a7270d5c8f45d7115042655767535f3df +scmi a561f1ecaee0b5d8ce26081d52934f338514c94f +sunxi 15ea63583bfb82c93bc9d6b21321b4133c0b8482 +tegra 6290ae1fb7e26c04b4eddc8aa4c99d1af3dbc556 +clk 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +clk-samsung a188339ca5a396acc588e5851ed7e19f66b0ebd9 +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky e2c750853b66cf94b46430b5eaa4454daa19a138 +h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e +ia64 0d3d343560bad8e1b7879fe94251cfe731a2dd13 +m68k 0f1979b402df5f0dd86425830ddaa191d70f3655 +m68knommu 372ea263b3d9cdeb70f8cffa025b2e0875e51b62 +microblaze 7cca9b8b7c5bcc56d627851550840586a25aaa1b +mips 05d013a0366d50f4f0dbebf8c1b22b42020bf49a +nds32 932296120543149e3397af252e7daee7af37eb05 +nios2 91d99a724e9c60e14332c26ab2284bf696b94c8e +openrisc f3b17320db25b4cdd50f0396b096644455357dac +parisc-hd e563af53af8bf17e4326eeac9f6a95cc6964a40f +powerpc 45824fc0da6e46cc5d563105e1eaaf3098a686f9 +fsl 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7 +soc-fsl eadf0b17b43db4e73a6bdde1ad745d3b582a71c5 +risc-v 9ce06497c2722a0f9109e4cc3ce35b7a69617886 +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 ab5758848039de9a4b249d46e4ab591197eebaf2 +sh baf58858e8b6d853a7a8308901fcdd438e92a522 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml 73625ed66389d4c620520058d828f43a93ab4d0c +xtensa 8ceba26043e544a2e787d674eb5d75d760110e32 +fscrypt 0642ea2409f3bfa105570e12854b8e2628db6835 +afs a0753c29004f4983e303abce019f29e183b1ee48 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave feee7d2306b24cb361f278587ce78790f4c94717 +ceph 3ee5a7015c8b7cb4de21f7345f8381946f2fce55 +cifs 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +configfs e9c03af21cc7e5723d4f1e90fe45d2cdccb70dc7 +ecryptfs b4a81b87a4cfe2bb26a4a943b748d96a43ef20e8 +erofs 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +ext3 0f7dbaee76f40c0089b573f56b262ce3be92a24a +ext4 040823b5372b445d1d9483811e85a24d71314d33 +f2fs 619e17cf75dd58905aa67ccd494a6ba5f19d6cc6 +fsverity 95ae251fe82838b85c6d37e5a1775006e2a42ae0 +fuse b7c8525a97d7735266f78d0dcfbda2cf9b14fd95 +jfs a5fdd713d256887b5f012608701149fa939e5645 +nfs 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +nfs-anna a8fd0feeca35cb8f9ddd950191f4aeb777f52f89 +nfsd e41f9efb85d38d95744b9f35b9903109032b93d4 +orangefs e6b998ab62be29eb244fdb0fa41dcb5a8ad065f2 +overlayfs 5c2e9f346b815841f9bed6029ebcb06415caf640 +ubifs 6a379f67454a3c740671ed6c7793b76ffecef50b +v9fs aafee43b72863f1f70aeaf1332d049916e8df239 +xfs 88d32d3983e72f2a7de72a49b701e2529c48e9c1 +iomap 838c4f3d7515efe9d0e32c846fb5d102b6d8a29d +djw-vfs dc617f29dbe5ef0c8ced65ce62c464af1daaab3d +file-locks b41dae061bbd722b9d7fa828f35d22035b218e18 +vfs 3e501af8dd7b581240b476a1aa623f97dc1666ef +printk c38822ab9bd624e6f99bbc2576aa04151bff93f4 +pci 5184d449600f501a8688069f35c138c6b3bf8b94 +pstore 609488bc979f99f805f34e9a32c1e3b71179d10b +hid 8c97be0a0aa0844b7972358318a230ab2deb6b41 +i2c 11af27f494086188620e7768e421894af93c126a +i3c 6030f42d20cedc04df019891851320f3e257038b +dmi 57361846b52bc686112da6ca5368d11210796804 +hwmon-staging 4e19e72f45d360975c59df8272f98bff59f6b748 +jc_docs fe013f8bc160d79c6e33bb66d9bb0cd24949274c +v4l-dvb 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +v4l-dvb-next 167f4555184b552f04e7274d1b23e4a9d39a0d58 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 315ea754a4c4b180c262041dbba6c8c9808d53c5 +cpufreq-arm f75d2accca7785657311653c125bb22f342dc5d9 +cpupower 87ce243206944a57383309dcbcdcc5750e6c905b +opp 071afa50609d46f2f760851b90696f9a09714d24 +thermal f1f2f614d535564992f32e720739cb53cf03489f +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 812cd88749e098ad976b6a1c149984dfd6c0f195 +dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma 3eca7fc2d8d1275d9cf0c709f0937becbfcf6d96 +net-next 02dc96ef6c25f990452c114c59d75c368a1f4c8f +bpf-next 02dc96ef6c25f990452c114c59d75c368a1f4c8f +ipsec-next 990925fad5c227269c3fcb76c7c46811b1e86c73 +mlx5-next fc603294267f890b34684588f6980ea8c7b72ecf +netfilter-next 67e80b99a5546b26561c7848f9fc1cf73d707792 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next 1b0b807dd7469e36b761f5bb4ee40b61331aeee8 +wireless-drivers-next 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +bluetooth 840aff3994c89f6a84373ba5b3c3e8ea3e9b37f0 +mac80211-next c1d3ad84eae35414b6b334790048406bd6301b12 +gfs2 f0b444b349e33ae0d3dd93e25ca365482a5d17d4 +mtd 2cfcfadb8e1380938d6631cffa4fa567b13f52b2 +nand f480b969448ee3896f55ef6d037ad4a2df3914bf +spi-nor 9607af6f857ff062b29562fc1fe36d22b16b9d27 +crypto 9575d1a5c0780ea26ff8dd29c94a32be32ce3c85 +drm 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +amdgpu 9c9284f9cee9052da4cad575da8dc5f2bbb31065 +drm-intel 458863e08e13ecf22b9ba1ee6d4baba0ce9990ea +drm-tegra 2a6fc3cb5cb68597f1072bfeef28d2ca02310220 +drm-misc d7d44b6fe40a98e960be92ea8617954c2596d140 +drm-msm 9f614197c744002f9968e82c649fdf7fe778e1e7 +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp 4cf643a39221af24a151ad2cff4e3f95f12f368e +imx-drm 4d24376370fbfc87231d54434a683f2913abcce4 +etnaviv dbcc574a4bfad810ce6e118f3cf327c7b6e7c897 +regmap 1bd4584626a9715634d2cb91ae2ed0364c070b01 +sound f41f900568d9ffd896cc941db7021eb14bd55910 +sound-asoc 84b66885fdcf48c6999e3a7f67778050988ee118 +modules 2e6fcfeb9df6048a63fe0d5f7dfa39274bacbb71 +input 410f25de467ee94c1a577c6ee7370c37b376c17c +block dd8f920bbca1527eb989026ed2274a5bf8cd7f33 +device-mapper afa179eb603847494aa5061d4f501224a30dd187 +pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc +mmc e51df6ce668a8f75ce27f83ce0f60103c568c375 +kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd 8391c6cb2414d9a75bbe247a838d28cb0cee77ee +backlight c0b64faf0fe6ca2574a00faed1ae833130db4e08 +battery 7f7378618b4103c083db7de5017df958f8ada070 +regulator f9a60abc26d98d3058a4c71e21eaeec8460cb699 +security 45893a0abee6b5fd52994a3a1095735aeaec472b +apparmor 136db994852a9b405ac1074de0e7a1c4c840b8ee +integrity 2a7f0e53daf29ca6dc9fbe2a27158f13474ec1b5 +keys 1f96e0f129eb2bea15a00c154eee8b85aa181d1a +selinux 15322a0d90b6fd62ae8f22e5b87f735c3fdfeff7 +smack 92604e825304ce170955df44b00973843054dcd5 +tpmdd e13cd21ffd50a07b55dcc4d8c38cedf27f28eaa1 +watchdog ca2fc5efffde5a3827adfb0ab6a51b6f1c64d5ff +iommu 142dfcda5a35555906946912713885960cbaf1db +vfio e6c5d727db0a86a3ff21aca6824aae87f3bc055f +audit 5f9e832c137075045d15cd6899ab0505cfb2ca4b +devicetree 59e9fcf8772bd97b6d681706fb8c9a972500c524 +mailbox 556a0964e28c4441dcdd50fb07596fd042246bd5 +spi 60b76d1c3b0a5c818ae9e1cc94c771aed6d0ad54 +tip 4a6158fb485ea99f6262f903bf69fde26d3166f5 +clockevents befd04abfbe4b933515dddb5659d0744be9dba6a +edac f05390d30e20cccd8f8de981dee42bcdd8d2d137 +irqchip bb0fed1c60cccbe4063b455a7228818395dac86e +ftrace 8ed4889eb83179dbc9a105cfed65cc42ecb61097 +rcu 049b405029c00f3fd9e4ffa269bdd29b429c4672 +kvm fd3edd4a9066f28de99a16685a586d68a9f551f8 +kvm-arm aac60f1a867773de9eb164013d89c99f3ea1f009 +kvm-ppc ff42df49e75f053a8a6b4c2533100cdcc23afe69 +kvms390 0af2889f89bbb8bdab463862c59ceb5586f290eb +xen-tip a4098bc6eed5e31e0391bcc068e61804c98138df +percpu 69f98a60cdbb22aeb565044b858eee4930502a7c +workqueues 30ae2fc0a75eb5f1a38bbee7355d8e3bc823a6e1 +drivers-x86 24a8d78a9affb63e5ced313ccde6888fe96edc6e +chrome-platform 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +hsi c1030cd456198a2c58f718c3c4b215698d635553 +leds 6d4faf3b6b6eb3c8a750b2e6659a5b1ff3dd9e75 +ipmi c9acc3c4f8e42ae538aea7f418fddc16f257ba75 +driver-core 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +usb 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +usb-gadget 18a93cd38be3e69ac5b067c570a78a369b79e31d +usb-serial 7a786b84790789eff5bad49e3f6c15f75b7bf691 +usb-chipidea-next f14ac41f977fffd13971ad2dd63f348c112cf133 +phy-next 5af67635c36ed92ef172c7bbf4d711364bc3bdf7 +tty 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +char-misc 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +extcon f25379de41238ccf59f53202b38fdcc0a2dbf2f5 +soundwire dfcff3f8a5f18a0cfa233522b5647c2e6035fcb5 +thunderbolt dfda204198848b47bdb98ab83b94dbb7c7692b55 +staging 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +mux 05fb8284a41719d5f827af2f383dd7592d8dcfda +icc 6311b6521bcc804e4d2fd45a5640562a7b8b5241 +slave-dma c5c6faaee6e0c374c7dfaf053aa23750f5a68e20 +cgroup 275278e1525a43d19ae50dbf20e597dd5ca3a5e3 +scsi e41df1533a4f7e2591645713dd0e4425c4d5180e +scsi-mkp 4f38b20f40c2c0b2b6f21d5320001254aad46a22 +vhost 0d4a3f2abbef73b9e5bb5f12213c275565473588 +rpmsg 741dc0aa4122c5e1ec8c6b576503284281e29960 +gpio 367677d498390067a7b2769862185787077da412 +gpio-brgl b630cea7bee7c72382cbd106179ee4503838960a +gpio-intel 85af79659f455ddbdc5b6b6e2a888a430cb58948 +pinctrl cb0438e4436085d89706b5ccfce4d5da531253de +pinctrl-intel 55dac43747be98516a337285428806d177afaa3a +pinctrl-samsung 10971e2ab6eb86c490fea92eb67549a8f46f0ae9 +pwm da635e7abe3f4ec9a8270ca4f5ba946d1a43f678 +userns 318759b4737c3b3789e2fd64d539f437d52386f5 +ktest aecea57f84b0586b62c010bea946468d77f6bf0f +random 58be0106c5306b939b07b4b8bf00669a20593f4b +kselftest 721cb3c8bc8890e824b7be53bf951960ff7811f9 +y2038 870e0167cd9cff1246746bd163db90df60d1dd61 +livepatching 1cfe141e17159a9b9488ff2a5fb1a2c0a87548d9 +coresight c165d8947bc41ebd3b0de3f520490cffb627af90 +rtc 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +nvdimm 4c806b897d6075bfa5067e524fb058c57ab64e7b +at24 10742fee98eb3b3e8453ef27a33dee314b15f7bd +ntb 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +kspp 6f88ed285e67555e31e2601f0e8c5fb25501c366 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +fsi 799e064cc79e7a9e6be2d4721c882d4fb92aad65 +siox 1e4b044d22517cae7047c99038abb444423243ca +slimbus 0a43bffb7e21345444cd09302808b75cd8b6f9d5 +nvmem ad732da57bded90c99c3d9f9e63bfae1f9783e33 +xarray 91abab83839aa2eba073e4a63c729832fdb27ea1 +hyperv d8bd2d442bb2688b428ac7164e5dc6d95d4fa65b +auxdisplay 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +kgdb-dt d8a050f5a3e8242242df6430d5980c142350e461 +pidfd 590ef0128b4277eaa9cb74d7ba878d48b261950c +devfreq d2f5fccd1ac9363247888de40f2d05b6a1593e9f +hmm 62974fc389b364d8af70e044836362222bd3ae53 +fpga e56476897448a0cc6f748535a199d2b68ad47d55 +kunit 741a98d022362c90609ac9dcd8ad56314d8e68b3 +akpm-current 580a3a106e1d7b4512c714658f1126688850dfba +akpm acf6ebaa6b5113baba91d06ab8fff63ed6112462 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..50059a737e94 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,316 @@ +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/davem/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 +actions git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions.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 +bcm2835 git git://github.com/anholt/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.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 +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +renesas-geert 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/mason/linux-btrfs.git#next +btrfs-kdave 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 +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/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/davem/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 +nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-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 +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +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 +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-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 +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#clockevents/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/j.anaszewski/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://github.com/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 +siox git https://git.pengutronix.de/git/ukl/linux#siox/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-dt 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/mzx/devfreq.git#for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +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..fffc206cb49a --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2039 @@ +$ date -R +Tue, 01 Oct 2019 08:08:46 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at a3c0e7b1fe1f Merge tag 'libnvdimm-fixes-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm +Merging origin/master (54ecb8f7028c Linux 5.4-rc1) +$ git merge origin/master +Updating a3c0e7b1fe1f..54ecb8f7028c +Fast-forward + .../process/embargoed-hardware-issues.rst | 42 ++- + Makefile | 4 +- + arch/arm/boot/dts/am3517-evm.dts | 23 +- + arch/arm/boot/dts/logicpd-som-lv.dtsi | 26 +- + arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 37 +-- + arch/arm/configs/omap2plus_defconfig | 1 + + arch/arm/mach-aspeed/Kconfig | 1 - + arch/arm/mach-omap2/pdata-quirks.c | 4 +- + arch/csky/abiv1/alignment.c | 62 +++- + arch/csky/abiv1/cacheflush.c | 70 ++-- + arch/csky/abiv1/inc/abi/cacheflush.h | 45 ++- + arch/csky/abiv1/inc/abi/page.h | 5 +- + arch/csky/abiv1/mmap.c | 75 +++-- + arch/csky/include/asm/barrier.h | 15 +- + arch/csky/include/asm/cache.h | 1 + + arch/csky/include/asm/io.h | 23 +- + arch/csky/include/asm/pgtable.h | 10 + + arch/csky/kernel/entry.S | 54 ++-- + arch/csky/kernel/perf_event.c | 4 +- + arch/csky/kernel/process.c | 2 +- + arch/csky/mm/cachev1.c | 7 +- + arch/csky/mm/cachev2.c | 11 +- + arch/csky/mm/dma-mapping.c | 76 ++--- + arch/csky/mm/init.c | 16 - + arch/csky/mm/ioremap.c | 27 +- + drivers/bus/ti-sysc.c | 52 ++- + drivers/char/random.c | 62 +++- + drivers/firmware/arm_scmi/reset.c | 2 +- + drivers/mmc/host/Kconfig | 1 + + drivers/mmc/host/Makefile | 2 +- + drivers/mmc/host/sdhci-of-esdhc.c | 7 +- + drivers/mmc/host/sdhci-pci-core.c | 2 + + drivers/mmc/host/sdhci-pci-gli.c | 352 +++++++++++++++++++++ + drivers/mmc/host/sdhci-pci.h | 5 + + drivers/mmc/host/sdhci-tegra.c | 48 +-- + drivers/mmc/host/sdhci.c | 27 +- + drivers/mmc/host/sdhci.h | 1 + + drivers/reset/reset-scmi.c | 1 + + fs/afs/dynroot.c | 7 - + fs/afs/inode.c | 2 +- + fs/afs/internal.h | 1 - + fs/btrfs/extent_io.c | 13 + + fs/btrfs/qgroup.c | 38 ++- + fs/btrfs/relocation.c | 9 +- + fs/btrfs/tests/btrfs-tests.c | 8 +- + fs/btrfs/volumes.c | 8 +- + fs/cifs/cifs_ioctl.h | 9 + + fs/cifs/cifsacl.h | 81 ++++- + fs/cifs/cifsglob.h | 6 +- + fs/cifs/cifsproto.h | 3 +- + fs/cifs/cifssmb.c | 3 +- + fs/cifs/inode.c | 3 +- + fs/cifs/ioctl.c | 29 ++ + fs/cifs/sess.c | 3 +- + fs/cifs/smb2inode.c | 34 +- + fs/cifs/smb2ops.c | 10 + + fs/cifs/smb2pdu.c | 23 +- + fs/cifs/smb2proto.h | 3 +- + fs/cifs/smbfsctl.h | 11 + + fs/cifs/xattr.c | 2 +- + fs/ext4/inode.c | 3 + + fs/fhandle.c | 2 +- + include/trace/events/kmem.h | 7 +- + kernel/trace/trace.h | 10 +- + kernel/trace/trace_events_filter.c | 6 +- + kernel/trace/trace_probe.c | 16 + + .../ftrace/test.d/kprobe/kprobe_syntax_errors.tc | 2 +- + 67 files changed, 1151 insertions(+), 404 deletions(-) + create mode 100644 drivers/mmc/host/sdhci-pci-gli.c +Merging fixes/master (04e6dac68d9b powerpc/64s/radix: fix for "tidy up TLB flushing code" and !CONFIG_PPC_RADIX_MMU) +$ git merge fixes/master +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/book3s/64/tlbflush-radix.h | 4 ++++ + 1 file changed, 4 insertions(+) +Merging kbuild-current/fixes (f97c81dc6ca5 Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (41277ba7eb4e ARC: mm: tlb flush optim: elide redundant uTLB invalidates for MMUv3) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/include/asm/entry-compact.h | 4 +- + arch/arc/include/asm/mmu.h | 6 +++ + arch/arc/include/asm/mmu_context.h | 2 +- + arch/arc/include/asm/pgtable.h | 2 +- + arch/arc/mm/tlb.c | 81 +++++++++++++----------------------- + arch/arc/mm/tlbex.S | 18 ++++---- + 6 files changed, 51 insertions(+), 62 deletions(-) +Merging arm-current/fixes (5b3efa4f1479 ARM: 8901/1: add a criteria for pfn_valid of arm) +$ git merge arm-current/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (a304c0a60252 arm64/ARM: configs: Change CONFIG_REMOTEPROC from m to y) +$ git merge arm-soc-fixes/arm/fixes +Merge made by the 'recursive' strategy. + arch/arm/configs/davinci_all_defconfig | 2 +- + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm/configs/omap2plus_defconfig | 2 +- + arch/arm64/configs/defconfig | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging arm64-fixes/for-next/fixes (799c85105233 arm64: Fix reference to docs for ARM64_TAGGED_ADDR_ABI) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (0f1979b402df m68k: Remove ioremap_fullcache()) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (253c892193ab powerpc/eeh: Fix eeh eeh_debugfs_break_device() with SRIOV devices) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (d45331b00ddb Linux 5.3-rc4) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h) +$ git merge sparc/master +Removing arch/sparc/include/uapi/asm/statfs.h +Merge made by the 'recursive' strategy. + arch/sparc/include/uapi/asm/statfs.h | 7 ------- + 1 file changed, 7 deletions(-) + delete mode 100644 arch/sparc/include/uapi/asm/statfs.h +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (0e141f757b2c erspan: remove the incorrect mtu limit for erspan) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/dsa/qca8k.c | 4 ++-- + net/ipv4/ip_gre.c | 1 + + net/sched/sch_cbq.c | 43 +++++++++++++++++++++++++++++-------------- + 3 files changed, 32 insertions(+), 16 deletions(-) +Merging bpf/master (55d554f5d140 tools: bpf: Use !building_out_of_srctree to determine srctree) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + tools/bpf/Makefile | 6 +++++- + tools/lib/bpf/Makefile | 6 +++++- + 2 files changed, 10 insertions(+), 2 deletions(-) +Merging ipsec/master (00b368502d18 xen-netfront: do not assume sk_buff_head list is empty in error handling) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (02dc96ef6c25 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes') +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (54ecb8f7028c Linux 5.4-rc1) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (f794dc2304d8 sctp: fix the missing put_user when dumping transport thresholds) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (531a64e4c35b RDMA/siw: Fix IPv6 addr_list locking) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (f41f900568d9 ALSA: usb-audio: Add DSD support for EVGA NU Audio) +$ git merge sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (84b66885fdcf Merge branch 'asoc-5.4' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Auto-merging sound/soc/soc-topology.c +Merge made by the 'recursive' strategy. + sound/soc/codecs/wm8994.c | 43 +++++++++++++++++++++++--------------- + sound/soc/samsung/arndale_rt5631.c | 34 ++++++++++++++++++++++++++---- + sound/soc/soc-pcm.c | 4 ++-- + sound/soc/soc-topology.c | 2 +- + 4 files changed, 59 insertions(+), 24 deletions(-) +Merging regmap-fixes/for-linus (0161b8716465 Merge branch 'regmap-5.3' into regmap-linus) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (f9a60abc26d9 Merge branch 'regulator-5.4' into regulator-linus) +$ git merge regulator-fixes/for-linus +Auto-merging drivers/regulator/of_regulator.c +Merge made by the 'recursive' strategy. + .../bindings/regulator/fixed-regulator.yaml | 4 +- + drivers/regulator/core.c | 13 +++ + drivers/regulator/da9062-regulator.c | 118 ++++++++------------- + drivers/regulator/fixed.c | 5 +- + drivers/regulator/of_regulator.c | 27 +++-- + 5 files changed, 82 insertions(+), 85 deletions(-) +Merging spi-fixes/for-linus (60b76d1c3b0a Merge branch 'spi-5.4' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-mxic.c | 6 +++--- + drivers/spi/spi-orion.c | 3 --- + drivers/spi/spidev.c | 3 +++ + 3 files changed, 6 insertions(+), 6 deletions(-) +Merging pci-current/for-linus (5184d449600f Merge tag 'microblaze-v5.4-rc1' of git://git.monstr.eu/linux-2.6-microblaze) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (54ecb8f7028c Linux 5.4-rc1) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (54ecb8f7028c Linux 5.4-rc1) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (54ecb8f7028c Linux 5.4-rc1) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (4a56a478a525 usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (d1abaeb3be7b Linux 5.3-rc5) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue) +$ 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 (609488bc979f Linux 5.3-rc2) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (54ecb8f7028c Linux 5.4-rc1) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (54ecb8f7028c Linux 5.4-rc1) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (d1abaeb3be7b Linux 5.3-rc5) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (4d856f72c10e Linux 5.3) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (0898782247ae Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (bf6a7a5ad6fa crypto: hisilicon - avoid unused function warning) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (baf6722aa0cb ide: Use dev_get_drvdata where possible) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/siimage.c | 3 +-- + drivers/ide/via82cxxx.c | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging vfio-fixes/for-linus (5715c4dd66a3 vfio/mdev: Synchronize device create/remove with parent removal) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (fbb01c52471c selftests/livepatch: push and pop dynamic debug config) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (04cbfba62085 Merge tag 'dmaengine-5.4-rc1' of git://git.infradead.org/users/vkoul/slave-dma) +$ git merge slave-dma-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (dc9cfd269222 mtd: hyperbus: fix dependency and build error) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (4d82fa67dd6b mfd: rk808: Make PM function declaration static) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (63ad05e36ec5 media: cec-notifier: clear cec_adap in cec_notifier_unregister) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. +Merging reset-fixes/reset/fixes (a71dcd3757e2 reset: remove redundant null check on pointer dev) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (74034a09267c MIPS: BCM63XX: Mark expected switch fall-through) +$ 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 (f90ec6cdf674 ARM: dts: am4372: Set memory bandwidth limit for DISPC) +$ git merge omap-fixes/fixes +Auto-merging arch/arm/mach-omap2/omap_hwmod_33xx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging arch/arm/boot/dts/omap3-gta04.dtsi +Auto-merging arch/arm/boot/dts/dra7-l4.dtsi +Auto-merging arch/arm/boot/dts/am33xx-l4.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-icev2.dts | 2 +- + arch/arm/boot/dts/am33xx-l4.dtsi | 6 +- + arch/arm/boot/dts/am4372.dtsi | 2 + + arch/arm/boot/dts/dra7-l4.dtsi | 48 +++++----- + arch/arm/boot/dts/omap3-gta04.dtsi | 1 + + arch/arm/configs/omap2plus_defconfig | 3 + + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 3 +- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 5 +- + arch/arm/mach-omap2/pm.c | 100 --------------------- + drivers/clk/ti/clk-7xx.c | 6 +- + 10 files changed, 40 insertions(+), 136 deletions(-) +Merging kvm-fixes/master (fd3edd4a9066 KVM: nVMX: cleanup and fix host 64-bit mode checks) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (53936b5bf35e KVM: s390: Do not leak kernel stack data in the KVM_S390_INTERRUPT ioctl) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (98d1a3c245e4 hwmon: (nct7904) Fix the incorrect value of vsen_mask in nct7904_data struct) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/nct7904.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (4c806b897d60 libnvdimm/region: Enable MAP_SYNC for volatile regions) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (47e95c92bce8 Merge branch 'misc-5.4' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (d4f4de5e5ef8 Fix the locking in dcache_readdir() and friends) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/libfs.c | 134 +++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 69 insertions(+), 65 deletions(-) +Merging dma-mapping-fixes/for-linus (33dcb37cef74 dma-mapping: fix page attributes for dma_mmap_*) +$ 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 (4d856f72c10e Linux 5.3) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (5f9e832c1370 Linus 5.3-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (5f9e832c1370 Linus 5.3-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (83f82d7a4258 of: irq: fix a trivial typo in a doc comment) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (0aabb6b699f7 scsi: qla2xxx: Fix Nport ID display value) +$ git merge scsi-fixes/fixes +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/qla2xxx/qla_init.c +Auto-merging drivers/scsi/qla2xxx/qla_attr.c +Auto-merging drivers/scsi/qedf/qedf_main.c +Merge made by the 'recursive' strategy. + drivers/scsi/bnx2fc/bnx2fc_io.c | 29 +++++++-- + drivers/scsi/hisi_sas/hisi_sas_main.c | 6 +- + drivers/scsi/megaraid.c | 4 +- + drivers/scsi/qedf/qedf_main.c | 2 +- + drivers/scsi/qla2xxx/qla_attr.c | 2 + + drivers/scsi/qla2xxx/qla_def.h | 4 +- + drivers/scsi/qla2xxx/qla_gs.c | 3 +- + drivers/scsi/qla2xxx/qla_init.c | 109 ++++++++++++++++++++++++---------- + drivers/scsi/qla2xxx/qla_iocb.c | 7 ++- + drivers/scsi/qla2xxx/qla_mbx.c | 25 +++++++- + drivers/scsi/qla2xxx/qla_mid.c | 32 ++++++---- + drivers/scsi/qla2xxx/qla_os.c | 18 ++++-- + drivers/scsi/qla2xxx/qla_target.c | 26 ++++---- + drivers/scsi/storvsc_drv.c | 3 +- + drivers/scsi/ufs/ufshcd.c | 3 + + 15 files changed, 193 insertions(+), 80 deletions(-) +Merging drm-fixes/drm-fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (104c307147ad drm/amd/display: prevent memory leak) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (4d856f72c10e Linux 5.3) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (e51df6ce668a mmc: host: sdhci-pci: Add Genesys Logic GL975x support) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (5f9e832c1370 Linus 5.3-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (e395071a12f9 HID: hyperv: Use in-place iterator API in the channel callback) +$ git merge hyperv-fixes/hyperv-fixes +Auto-merging drivers/hid/hid-hyperv.c +Merge made by the 'recursive' strategy. + drivers/hid/hid-hyperv.c | 56 +++++++++--------------------------------------- + 1 file changed, 10 insertions(+), 46 deletions(-) +Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request()) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (c82dd6d078a2 riscv: Avoid interrupts being erroneously enabled in handle_exception()) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (3969e76909d3 selftests: pidfd: Fix undefined reference to pthread_create()) +$ git merge pidfd-fixes/fixes +Merge made by the 'recursive' strategy. + include/uapi/linux/sched.h | 2 ++ + tools/testing/selftests/pidfd/Makefile | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) +Merging fpga-fixes/fixes (dec43da46f63 fpga: altera-ps-spi: Fix getting of optional confd gpio) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (02dc96ef6c25 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (5f9e832c1370 Linus 5.3-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (4d856f72c10e Linux 5.3) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (dc76ea8c1087 erofs: fix mis-inplace determination related with noio chain) +$ git merge erofs-fixes/fixes +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +++ + fs/erofs/data.c | 10 +++++++--- + fs/erofs/super.c | 4 ++-- + fs/erofs/zdata.c | 12 ++++++++++-- + 4 files changed, 22 insertions(+), 7 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (a0ecd6fdbf5d drm/komeda: prevent memory leak in komeda_wb_connector_add) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/vc4/vc4_txp.c +Auto-merging drivers/gpu/drm/arm/malidp_mw.c +Merge made by the 'recursive' strategy. + .../drm/arm/display/komeda/komeda_wb_connector.c | 7 ++++--- + drivers/gpu/drm/arm/malidp_mw.c | 4 ++-- + drivers/gpu/drm/drm_atomic.c | 13 ++++++++---- + drivers/gpu/drm/drm_writeback.c | 23 ++++++++++++++-------- + drivers/gpu/drm/rcar-du/rcar_du_writeback.c | 4 ++-- + drivers/gpu/drm/vc4/vc4_txp.c | 5 ++--- + 6 files changed, 34 insertions(+), 22 deletions(-) +Merging kspp-gustavo/for-next/kspp (609488bc979f Linux 5.3-rc2) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (337bf824b735 Corrected formatting of header in kbuild module docs) +$ git merge kbuild/for-next +Auto-merging scripts/Makefile +Removing arch/ia64/include/uapi/asm/ioctls.h +Removing arch/ia64/include/uapi/asm/ioctl.h +Removing arch/ia64/include/uapi/asm/errno.h +Removing arch/hexagon/include/uapi/asm/bitsperlong.h +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/kbuild/makefiles.rst | 5 ---- + Documentation/kbuild/modules.rst | 3 ++- + Makefile | 24 ++----------------- + arch/hexagon/include/uapi/asm/bitsperlong.h | 27 ---------------------- + arch/ia64/include/uapi/asm/errno.h | 2 -- + arch/ia64/include/uapi/asm/ioctl.h | 2 -- + arch/ia64/include/uapi/asm/ioctls.h | 7 ------ + arch/powerpc/boot/Makefile | 2 +- + drivers/video/logo/.gitignore | 1 + + drivers/video/logo/Makefile | 36 ++++++----------------------- + {scripts => drivers/video/logo}/pnmtologo.c | 0 + scripts/.gitignore | 1 - + scripts/Kbuild.include | 5 ---- + scripts/Makefile | 2 -- + scripts/Makefile.build | 2 +- + scripts/Makefile.lib | 2 +- + scripts/kconfig/Makefile | 2 +- + scripts/kconfig/parser.y | 1 - + security/integrity/Makefile | 3 --- + 19 files changed, 16 insertions(+), 111 deletions(-) + delete mode 100644 arch/hexagon/include/uapi/asm/bitsperlong.h + delete mode 100644 arch/ia64/include/uapi/asm/errno.h + delete mode 100644 arch/ia64/include/uapi/asm/ioctl.h + delete mode 100644 arch/ia64/include/uapi/asm/ioctls.h + rename {scripts => drivers/video/logo}/pnmtologo.c (100%) +Merging compiler-attributes/compiler-attributes (32ee8230b2b0 x86: bug.h: use asm_inline in _BUG_FLAGS definitions) +$ 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 (c7d9eccb3c1e mmc: renesas_sdhi_internal_dmac: Add MMC_CAP2_MERGE_CAPABLE) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (9b87647c665d asm-generic: add unlikely to default BUG_ON(x)) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (3a6d5fc43760 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (e376897f424a arm64: remove __iounmap) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (3724e186fead docs/perf: Add documentation for the i.MX8 DDR PMU) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (4705d9f7f6f0 ARM: Document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next) +$ git merge actions/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (d1150f2a0bba Merge branch 'v5.5/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 9 +- + .../devicetree/bindings/nvmem/amlogic-efuse.txt | 6 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm64/boot/dts/amlogic/Makefile | 2 + + arch/arm64/boot/dts/amlogic/meson-a1-ad401.dts | 30 ++ + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 130 +++++ + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 13 +- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 354 ++----------- + arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 344 +++++++++++++ + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 3 + + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 3 + + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 15 +- + .../dts/amlogic/meson-g12b-a311d-khadas-vim3.dts | 25 + + .../dts/amlogic/meson-g12b-s922x-khadas-vim3.dts | 25 + + .../boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 557 +++++++++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 20 +- + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 3 + + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 1 + + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 3 + + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 3 + + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 20 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 3 + + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 3 + + arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 3 + + .../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 2 +- + .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 3 + + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 7 +- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 5 +- + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 3 + + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 3 + + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 6 + + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 3 + + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 7 + + .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 25 + + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 3 + + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 9 + + drivers/firmware/meson/meson_sm.c | 110 ++-- + drivers/nvmem/meson-efuse.c | 24 +- + drivers/soc/amlogic/meson-gx-socinfo.c | 2 + + include/linux/firmware/meson/meson_sm.h | 15 +- + 40 files changed, 1389 insertions(+), 415 deletions(-) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-a1-ad401.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-a1.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts +Merging aspeed/for-next (ba0fdbb07d05 Merge branch 'dt-for-v5.4' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (3253ffa16c9a Merge branches 'at91-drivers' and 'at91-soc' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + Documentation/arm/microchip.rst | 4 ++-- + drivers/memory/atmel-ebi.c | 11 +++++------ + include/linux/mfd/syscon/atmel-matrix.h | 1 - + 3 files changed, 7 insertions(+), 9 deletions(-) +Merging bcm2835/for-next (c165c01bb6f7 Merge branch 'bcm2835-dt-next' into for-next) +$ git merge bcm2835/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (d26d83e3e1fc 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 (78145dbeaea1 Merge branch 'for_5.3/driver-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (4ae1ce88e9a0 Merge branch 'v5.3-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (153e97d3bdf3 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (75e66cd99933 Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/mach-omap2/Makefile +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Makefile +Resolved 'arch/arm/mach-omap2/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c37e645fbb5b] Merge remote-tracking branch 'omap/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging qcom/for-next (63e584644247 Merge tag 'qcom-arm64-defconfig-for-5.4' into all-for-5.4) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (ae688e1720fd arm64: dts: renesas: hihope-common: Fix eMMC status) +$ git merge renesas/next +Already up to date. +Merging renesas-geert/next (e180e8bda829 Merge remote-tracking branch 'origin/fixes-for-v5.3' into renesas-next) +$ git merge renesas-geert/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging reset/reset/next (2d94bccca49f reset: uniphier-glue: Add Pro5 USB3 support) +$ git merge reset/reset/next +Removing Documentation/devicetree/bindings/reset/qcom,pdc-global.txt +Removing Documentation/devicetree/bindings/reset/qcom,aoss-reset.txt +Merge made by the 'recursive' strategy. + .../bindings/reset/amlogic,meson-axg-audio-arb.txt | 3 +- + .../devicetree/bindings/reset/qcom,aoss-reset.txt | 52 ---------------------- + .../devicetree/bindings/reset/qcom,aoss-reset.yaml | 47 +++++++++++++++++++ + .../devicetree/bindings/reset/qcom,pdc-global.txt | 52 ---------------------- + .../devicetree/bindings/reset/qcom,pdc-global.yaml | 47 +++++++++++++++++++ + .../devicetree/bindings/reset/uniphier-reset.txt | 5 ++- + drivers/reset/core.c | 2 - + drivers/reset/reset-meson-audio-arb.c | 43 ++++++++++++++++-- + drivers/reset/reset-uniphier-glue.c | 4 ++ + .../reset/amlogic,meson-axg-audio-arb.h | 2 + + 10 files changed, 145 insertions(+), 112 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/reset/qcom,aoss-reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/qcom,aoss-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/qcom,pdc-global.txt + create mode 100644 Documentation/devicetree/bindings/reset/qcom,pdc-global.yaml +Merging rockchip/for-next (155cb7cd4cd4 Merge branch 'v5.4-clk/next' into for-next) +$ git merge rockchip/for-next +Auto-merging Documentation/devicetree/bindings/arm/rockchip.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/rockchip.yaml +Resolved 'Documentation/devicetree/bindings/arm/rockchip.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b929c440b30d] Merge remote-tracking branch 'rockchip/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging samsung-krzk/for-next (2f776c5a7270 Merge branch 'next/defconfig' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm64/Kconfig.platforms +Merge made by the 'recursive' strategy. + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 2 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 102 ++++++++++----------- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 2 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 23 +++-- + 4 files changed, 64 insertions(+), 65 deletions(-) +Merging scmi/for-linux-next (a561f1ecaee0 Merge tag 'scmi-fixes-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging sunxi/sunxi/for-next (15ea63583bfb Merge branch 'sunxi/dt-for-5.4' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (6290ae1fb7e2 Merge branch for-5.4/firmware into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/firmware/tegra/bpmp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging clk/clk-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge clk/clk-next +Already up to date. +Merging clk-samsung/for-next (a188339ca5a3 Linux 5.2-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 (e2c750853b66 csky: Fixup csky_pmu.max_period assignment) +$ git merge csky/linux-next +Auto-merging arch/csky/kernel/perf_event.c +Auto-merging arch/csky/kernel/entry.S +Merge made by the 'recursive' strategy. +Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h) +$ git merge h8300/h8300-next +Removing arch/h8300/include/uapi/asm/bitsperlong.h +Auto-merging arch/h8300/Kconfig +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig | 3 +++ + arch/h8300/include/uapi/asm/bitsperlong.h | 15 --------------- + arch/h8300/include/uapi/asm/posix_types.h | 13 +++++++++++++ + arch/h8300/lib/memset.S | 17 ++++++++++------- + 4 files changed, 26 insertions(+), 22 deletions(-) + delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h + create mode 100644 arch/h8300/include/uapi/asm/posix_types.h +Merging ia64/next (0d3d343560ba genirq: remove the is_affinity_mask_valid hook) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (0f1979b402df m68k: Remove ioremap_fullcache()) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (372ea263b3d9 m68k: coldfire: Include the GPIO driver header) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (7cca9b8b7c5b microblaze: Switch to standard restart handler) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (05d013a0366d MIPS: Detect bad _PFN_SHIFT values) +$ git merge mips/mips-next +Already up to date. +Merging nds32/next (932296120543 nds32: add new emulations for floating point instruction) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (91d99a724e9c nios2: force the string buffer NULL-terminated) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (f3b17320db25 openrisc: map as uncached in ioremap) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (e563af53af8b parisc: Do not hardcode registers in checksum functions) +$ git merge parisc-hd/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++ + arch/parisc/include/asm/checksum.h | 101 +++++++++++++++++++------------------ + drivers/parisc/sba_iommu.c | 8 --- + 3 files changed, 55 insertions(+), 57 deletions(-) +Merging powerpc/next (45824fc0da6e Merge tag 'powerpc-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask") +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (eadf0b17b43d bus: fsl-mc: remove explicit device_link_del) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (9ce06497c272 irqchip/sifive-plic: set max threshold for ignored handlers) +$ git merge risc-v/for-next +Already up to date. +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 (ab5758848039 s390/cio: exclude subchannels with no parent from pseudo check) +$ git merge s390/features +Already up to date. +Merging sh/sh-next (baf58858e8b6 sh: prefer __section from compiler_attributes.h) +$ git merge sh/sh-next +Auto-merging arch/sh/kernel/hw_breakpoint.c +CONFLICT (modify/delete): arch/sh/include/uapi/asm/types.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/types.h left in tree. +CONFLICT (modify/delete): arch/sh/include/uapi/asm/setup.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/setup.h left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/sh/include/uapi/asm/setup.h arch/sh/include/uapi/asm/types.h +rm 'arch/sh/include/uapi/asm/setup.h' +rm 'arch/sh/include/uapi/asm/types.h' +$ git commit --no-edit -v -a +[master c437ba8238e5] Merge remote-tracking branch 'sh/sh-next' +$ git diff -M --stat --summary HEAD^.. + arch/sh/include/asm/bitops-op32.h | 8 +++----- + arch/sh/include/asm/cache.h | 2 +- + arch/sh/include/uapi/asm/setup.h | 2 -- + arch/sh/include/uapi/asm/types.h | 2 -- + arch/sh/kernel/Makefile | 2 -- + 5 files changed, 4 insertions(+), 12 deletions(-) + delete mode 100644 arch/sh/include/uapi/asm/setup.h + delete mode 100644 arch/sh/include/uapi/asm/types.h +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 (73625ed66389 um: irq: Fix LAST_IRQ usage in init_IRQ()) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (8ceba26043e5 Merge branch 'xtensa-5.5' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Auto-merging arch/xtensa/mm/init.c +Auto-merging arch/xtensa/kernel/setup.c +Auto-merging arch/xtensa/kernel/head.S +Removing arch/xtensa/include/asm/user.h +Removing arch/xtensa/include/asm/hw_irq.h +Auto-merging arch/xtensa/Kconfig +Auto-merging Documentation/features/locking/queued-spinlocks/arch-support.txt +Merge made by the 'recursive' strategy. + .../features/core/tracehook/arch-support.txt | 2 +- + arch/xtensa/Kconfig | 39 +++++++ + arch/xtensa/Makefile | 3 +- + arch/xtensa/boot/Makefile | 5 + + arch/xtensa/configs/xip_kc705_defconfig | 120 +++++++++++++++++++++ + arch/xtensa/include/asm/Kbuild | 2 + + arch/xtensa/include/asm/cache.h | 6 ++ + arch/xtensa/include/asm/hw_irq.h | 14 --- + arch/xtensa/include/asm/initialize_mmu.h | 3 +- + arch/xtensa/include/asm/kmem_layout.h | 29 +++++ + arch/xtensa/include/asm/page.h | 11 ++ + arch/xtensa/include/asm/user.h | 20 ---- + arch/xtensa/include/asm/vectors.h | 44 ++------ + arch/xtensa/kernel/head.S | 13 ++- + arch/xtensa/kernel/setup.c | 7 ++ + arch/xtensa/kernel/vmlinux.lds.S | 52 ++++++++- + arch/xtensa/mm/init.c | 4 +- + 17 files changed, 292 insertions(+), 82 deletions(-) + create mode 100644 arch/xtensa/configs/xip_kc705_defconfig + delete mode 100644 arch/xtensa/include/asm/hw_irq.h + delete mode 100644 arch/xtensa/include/asm/user.h +Merging fscrypt/master (0642ea2409f3 ext4 crypto: fix to check feature status before get policy) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (a0753c29004f afs: Support RCU pathwalk) +$ git merge afs/afs-next +Already up to date. +Merging btrfs/next (29dcea88779c Linux 4.17) +$ git merge btrfs/next +Already up to date. +Merging btrfs-kdave/for-next (feee7d2306b2 Merge branch 'misc-5.4' into for-next-20190924) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/qgroup.c +Merge made by the 'recursive' strategy. +Merging ceph/master (3ee5a7015c8b ceph: call ceph_mdsc_destroy from destroy_fs_client) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge cifs/for-next +Already up to date. +Merging configfs/for-next (e9c03af21cc7 configfs: calculate the symlink target only once) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (b4a81b87a4cf ecryptfs: fix a memory leak bug in ecryptfs_init_messaging()) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/messaging.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging erofs/dev (54ecb8f7028c Linux 5.4-rc1) +$ git merge erofs/dev +Already up to date. +Merging ext3/for_next (0f7dbaee76f4 Merge quota initialization check fix from Chao Yu.) +$ git merge ext3/for_next +Auto-merging fs/notify/fanotify/fanotify_user.c +Merge made by the 'recursive' strategy. + fs/notify/fanotify/fanotify_user.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ext4/dev (040823b5372b Merge tag 'unicode-next-v5.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode into dev) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (619e17cf75dd Merge tag 'for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply) +$ git merge f2fs/dev +Already up to date. +Merging fsverity/fsverity (95ae251fe828 f2fs: add fs-verity support) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (b7c8525a97d7 Merge branch 'virtio-fs' into for-next) +$ git merge fuse/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (a8fd0feeca35 pNFS/filelayout: enable LAYOUTGET on OPEN) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (e41f9efb85d3 sunrpc: clean up indentation issue) +$ git merge nfsd/nfsd-next +Already up to date. +Merging orangefs/for-next (e6b998ab62be orangefs: remove redundant assignment to err) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (5c2e9f346b81 ovl: filter of trusted xattr results in audit) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/linux-next (6a379f67454a jffs2: Fix memory leak in jffs2_scan_eraseblock() error path) +$ git merge ubifs/linux-next +Already up to date. +Merging v9fs/9p-next (aafee43b7286 9p/vfs_super.c: Remove unused parameter data in v9fs_fill_super) +$ git merge v9fs/9p-next +Already up to date. +Merging xfs/for-next (88d32d3983e7 xfs: avoid unused to_mp() function warning) +$ git merge xfs/for-next +Already up to date. +Merging iomap/iomap-for-next (838c4f3d7515 iomap: move the iomap_dio_rw ->end_io callback into a structure) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (dc617f29dbe5 vfs: don't allow writes to swap files) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (b41dae061bbd Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (3e501af8dd7b Merge branches 'work.misc', 'work.mount3', 'work.namei', 'work.dcache' and 'work.autofs' into for-next) +$ git merge vfs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging printk/for-next (c38822ab9bd6 Merge branch 'for-5.4' into for-next) +$ git merge printk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci/next (5184d449600f Merge tag 'microblaze-v5.4-rc1' of git://git.monstr.eu/linux-2.6-microblaze) +$ git merge pci/next +Already up to date. +Merging pstore/for-next/pstore (609488bc979f Linux 5.3-rc2) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (8c97be0a0aa0 Merge branch 'for-5.4/core' into for-next) +$ git merge hid/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (11af27f49408 i2c: slave-eeprom: Add read only mode) +$ git merge i2c/i2c/for-next +Already up to date. +Merging i3c/i3c/next (6030f42d20ce i3c: master: Use dev_to_i3cmaster()) +$ git merge i3c/i3c/next +Already up to date. +Merging dmi/master (57361846b52b Linux 4.19-rc2) +$ git merge dmi/master +Already up to date. +Merging hwmon-staging/hwmon-next (4e19e72f45d3 hwmon: submitting-patches: Add note on comment style) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (fe013f8bc160 Documentation: kbuild: Add document about reproducible builds) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (54ecb8f7028c Linux 5.4-rc1) +$ git merge v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (167f4555184b Merge branch fixes_for_upstream into to_next) +$ git merge v4l-dvb-next/master +Already up to date! +Merge made by the 'recursive' strategy. +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 (315ea754a4c4 Merge branch 'pm-cpuidle' into linux-next) +$ git merge pm/linux-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (f75d2accca77 Merge branch 'cpufreq/qcom-updates' into cpufreq/arm/linux-next) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (87ce24320694 cpupower: update German translation) +$ git merge cpupower/cpupower +Already up to date. +Merging opp/opp/linux-next (071afa50609d Merge branch 'opp/qcom-updates' into opp/linux-next) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/next (f1f2f614d535 Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity) +$ git merge thermal/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 (812cd88749e0 firewire: mark expected switch fall-throughs) +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/core-topology.c +Auto-merging drivers/firewire/core-iso.c +Auto-merging drivers/firewire/core-device.c +Merge made by the 'recursive' strategy. +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 (3eca7fc2d8d1 RDMA: Fix double-free in srq creation error flow) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (02dc96ef6c25 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge net-next/master +Already up to date. +Merging bpf-next/master (02dc96ef6c25 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (990925fad5c2 Merge branch 'mlxsw-spectrum_buffers-Add-the-ability-to-query-the-CPU-ports-shared-buffer') +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (fc603294267f net/mlx5: Set only stag for match untagged packets) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (67e80b99a554 net: phylink: clarify where phylink should be used) +$ git merge netfilter-next/master +Already up to date. +Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) +$ git merge nfc-next/master +Auto-merging net/nfc/netlink.c +Auto-merging net/nfc/hci/core.c +Auto-merging drivers/nfc/st95hf/core.c +Auto-merging drivers/nfc/st21nfca/se.c +CONFLICT (content): Merge conflict in drivers/nfc/st21nfca/se.c +Auto-merging drivers/nfc/st21nfca/dep.c +Auto-merging drivers/nfc/fdp/i2c.c +Auto-merging drivers/nfc/fdp/fdp.c +Resolved 'drivers/nfc/st21nfca/se.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e4bdbea40776] Merge remote-tracking branch 'nfc-next/master' +$ git diff -M --stat --summary HEAD^.. + drivers/nfc/fdp/fdp.c | 35 +++++------------------------------ + drivers/nfc/fdp/i2c.c | 26 +++++++++++++------------- + drivers/nfc/st21nfca/dep.c | 3 ++- + drivers/nfc/st21nfca/se.c | 3 +-- + drivers/nfc/st95hf/core.c | 7 ++----- + net/nfc/netlink.c | 3 ++- + 6 files changed, 25 insertions(+), 52 deletions(-) +Merging ipvs-next/master (1b0b807dd746 Merge branch 'r8169-fw') +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (54ecb8f7028c Linux 5.4-rc1) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (840aff3994c8 Bluetooth: btusb: Use IS_ENABLED instead of #ifdef) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btrtl.c | 2 +- + drivers/bluetooth/btusb.c | 34 ++++++++++++++++------------------ + drivers/bluetooth/hci_nokia.c | 2 +- + net/bluetooth/smp.c | 6 ------ + 4 files changed, 18 insertions(+), 26 deletions(-) +Merging mac80211-next/master (c1d3ad84eae3 cfg80211: Purge frame registrations on iftype change) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (f0b444b349e3 gfs2: clear buf_in_tr when ending a transaction in sweep_bh_for_rgrps) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/mtd/next (2cfcfadb8e13 mtd: pmc551: Remove set but not used variable 'soff_lo') +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (f480b969448e mtd: rawnand: omap2: Fix number of bitflips reporting with ELM) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (9607af6f857f mtd: spi-nor: Rename "n25q512a" to "mt25qu512a (n25q512a)") +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (9575d1a5c078 crypto: caam - Cast to long first before pointer conversion) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge drm/drm-next +Already up to date. +Merging amdgpu/drm-next (9c9284f9cee9 drm/amdgpu: Move null pointer dereference check) +$ git merge amdgpu/drm-next +Already up to date. +Merging drm-intel/for-linux-next (458863e08e13 drm/i915: Mark contents as dirty on a write fault) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_display.c | 15 ++++++++++++++- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 12 +++++++----- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 3 --- + drivers/gpu/drm/i915/gt/intel_lrc.c | 21 ++++++++++++--------- + drivers/gpu/drm/i915/gt/intel_reset.c | 8 +++----- + drivers/gpu/drm/i915/gt/intel_reset.h | 2 +- + drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 2 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 3 +++ + drivers/gpu/drm/i915/i915_drv.c | 5 +++++ + drivers/gpu/drm/i915/i915_request.c | 25 ++++++++++++++++++++++--- + drivers/gpu/drm/i915/selftests/i915_gem.c | 6 ++++++ + 11 files changed, 74 insertions(+), 28 deletions(-) +Merging drm-tegra/drm/tegra/for-next (2a6fc3cb5cb6 drm/tegra: Fix gpiod_get_from_of_node() regression) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (d7d44b6fe40a drm/tilcdc: include linux/pinctrl/consumer.h again) +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 1 + + 1 file changed, 1 insertion(+) +Merging drm-msm/msm-next (9f614197c744 drm/msm: Use the correct dma_sync calls harder) +$ git merge drm-msm/msm-next +Already up to date. +Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (4cf643a39221 Merge tag 'drm-next-5.3-2019-06-27' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge mali-dp/for-upstream/mali-dp +Already up to date. +Merging imx-drm/imx-drm/next (4d24376370fb gpu: ipu-v3: image-convert: only sample into the next tile if necessary) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (dbcc574a4bfa drm/etnaviv: fix missing unlock on error in etnaviv_iommuv1_context_alloc()) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging regmap/for-next (1bd4584626a9 Merge branch 'regmap-5.4' into regmap-next) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (f41f900568d9 ALSA: usb-audio: Add DSD support for EVGA NU Audio) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (84b66885fdcf Merge branch 'asoc-5.4' into asoc-linus) +$ git merge sound-asoc/for-next +Already up to date. +Merging modules/modules-next (2e6fcfeb9df6 module: Remove leftover '#undef' from export header) +$ git merge modules/modules-next +Already up to date. +Merging input/next (410f25de467e Input: sidewinder - make array seq static const, makes object smaller) +$ git merge input/next +Already up to date. +Merging block/for-next (dd8f920bbca1 Merge branch 'for-5.4/io_uring' into for-next) +$ git merge block/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (afa179eb6038 dm: introduce DM_GET_TARGET_VERSION) +$ git merge device-mapper/for-next +Already up to date. +Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (e51df6ce668a mmc: host: sdhci-pci: Add Genesys Logic GL975x support) +$ git merge mmc/next +Already up to date. +Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_support.c +Auto-merging kernel/debug/kdb/kdb_main.c +Auto-merging kernel/debug/kdb/kdb_bt.c +CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c +Resolved 'kernel/debug/kdb/kdb_bt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 46af3046fb50] Merge remote-tracking branch 'kgdb/kgdb-next' +$ git diff -M --stat --summary HEAD^.. +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 (8391c6cb2414 mfd: mt6323: Add MT6323 RTC and PWRC) +$ git merge mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (c0b64faf0fe6 backlight: pwm_bl: Set scale type for brightness curves specified in the DT) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (7f7378618b41 power: supply: cpcap-charger: Enable vbus boost voltage) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (f9a60abc26d9 Merge branch 'regulator-5.4' into regulator-linus) +$ git merge regulator/for-next +Already up to date. +Merging security/next-testing (45893a0abee6 kexec: Fix file verification on S390) +$ git merge security/next-testing +Already up to date. +Merging apparmor/apparmor-next (136db994852a apparmor: increase left match history buffer size) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/policy.c +Auto-merging security/apparmor/mount.c +Auto-merging security/apparmor/match.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/include/policy_unpack.h +Auto-merging security/apparmor/include/path.h +Auto-merging security/apparmor/include/match.h +Auto-merging security/apparmor/include/apparmor.h +Auto-merging security/apparmor/file.c +Auto-merging security/apparmor/domain.c +Auto-merging security/apparmor/apparmorfs.c +Auto-merging security/apparmor/Kconfig +Merge made by the 'recursive' strategy. + security/apparmor/Kconfig | 2 + + security/apparmor/apparmorfs.c | 130 ++++++++++++++++++++++-- + security/apparmor/domain.c | 46 ++++----- + security/apparmor/file.c | 26 +++-- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/match.h | 3 +- + security/apparmor/include/path.h | 49 +-------- + security/apparmor/include/policy_unpack.h | 8 +- + security/apparmor/lsm.c | 160 ++++++++++++++++++++++++------ + security/apparmor/match.c | 6 +- + security/apparmor/mount.c | 67 ++++++++++--- + security/apparmor/policy.c | 5 +- + security/apparmor/policy_unpack.c | 116 +++++++++++++++++++++- + 13 files changed, 477 insertions(+), 142 deletions(-) +Merging integrity/next-integrity (2a7f0e53daf2 ima: ima_api: Use struct_size() in kzalloc()) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (1f96e0f129eb Merge branch 'keys-acl' into keys-next) +$ git merge keys/keys-next +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/keys/request_key_auth.c +Auto-merging security/keys/request_key.c +Auto-merging security/integrity/integrity.h +Auto-merging security/integrity/digsig.c +Auto-merging net/wireless/reg.c +Auto-merging net/ceph/ceph_common.c +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging include/linux/usb.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/key.h +CONFLICT (content): Merge conflict in include/linux/key.h +Auto-merging include/linux/device.h +Auto-merging include/linux/blkdev.h +Auto-merging fs/ubifs/auth.c +Auto-merging fs/ecryptfs/keystore.c +CONFLICT (modify/delete): fs/crypto/keyinfo.c deleted in HEAD and modified in keys/keys-next. Version keys/keys-next of fs/crypto/keyinfo.c left in tree. +Auto-merging fs/cifs/connect.c +Auto-merging fs/cifs/cifsacl.c +Auto-merging fs/afs/security.c +CONFLICT (content): Merge conflict in fs/afs/security.c +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/nvdimm/security.c +Auto-merging drivers/misc/Makefile +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/base/Kconfig +Auto-merging certs/system_keyring.c +Auto-merging block/blk-core.c +Auto-merging block/Kconfig +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging Documentation/ioctl/ioctl-number.rst +Resolved 'fs/afs/security.c' using previous resolution. +Resolved 'include/linux/key.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f fs/crypto/keyinfo.c +rm 'fs/crypto/keyinfo.c' +$ git commit --no-edit -v -a +[master 40d65fd6f4ac] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ioctl/ioctl-number.rst | 1 + + Documentation/security/keys/core.rst | 186 ++++- + Documentation/security/keys/request-key.rst | 9 +- + Documentation/watch_queue.rst | 460 +++++++++++ + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + block/Kconfig | 9 + + block/blk-core.c | 29 + + certs/blacklist.c | 7 +- + certs/system_keyring.c | 12 +- + drivers/base/Kconfig | 9 + + drivers/base/Makefile | 1 + + drivers/base/watch.c | 90 +++ + drivers/md/dm-crypt.c | 2 +- + drivers/misc/Kconfig | 13 + + drivers/misc/Makefile | 1 + + drivers/misc/watch_queue.c | 898 +++++++++++++++++++++ + drivers/nvdimm/security.c | 2 +- + drivers/usb/core/Kconfig | 9 + + drivers/usb/core/devio.c | 49 ++ + drivers/usb/core/hub.c | 4 + + fs/afs/security.c | 2 +- + fs/cifs/cifs_spnego.c | 25 +- + fs/cifs/cifsacl.c | 28 +- + fs/cifs/connect.c | 4 +- + fs/ecryptfs/ecryptfs_kernel.h | 2 +- + fs/ecryptfs/keystore.c | 2 +- + fs/fscache/object-list.c | 2 +- + fs/nfs/nfs4idmap.c | 30 +- + fs/ubifs/auth.c | 2 +- + include/linux/blkdev.h | 15 + + include/linux/device.h | 7 + + include/linux/key.h | 124 +-- + include/linux/lsm_audit.h | 1 + + include/linux/lsm_hooks.h | 38 + + include/linux/security.h | 32 +- + include/linux/syscalls.h | 1 + + include/linux/usb.h | 18 + + include/linux/watch_queue.h | 94 +++ + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/keyctl.h | 68 ++ + include/uapi/linux/watch_queue.h | 181 +++++ + kernel/sys_ni.c | 1 + + lib/digsig.c | 2 +- + net/ceph/ceph_common.c | 2 +- + net/dns_resolver/dns_key.c | 12 +- + net/dns_resolver/dns_query.c | 15 +- + net/rxrpc/key.c | 19 +- + net/wireless/reg.c | 6 +- + samples/Kconfig | 6 + + samples/Makefile | 1 + + samples/watch_queue/Makefile | 8 + + samples/watch_queue/watch_test.c | 231 ++++++ + security/integrity/digsig.c | 31 +- + security/integrity/digsig_asymmetric.c | 2 +- + security/integrity/evm/evm_crypto.c | 2 +- + security/integrity/ima/ima_mok.c | 13 +- + security/integrity/integrity.h | 6 +- + .../integrity/platform_certs/platform_keyring.c | 14 +- + security/keys/Kconfig | 9 + + security/keys/compat.c | 5 + + security/keys/encrypted-keys/encrypted.c | 2 +- + security/keys/encrypted-keys/masterkey_trusted.c | 2 +- + security/keys/gc.c | 7 +- + security/keys/internal.h | 46 +- + security/keys/key.c | 67 +- + security/keys/keyctl.c | 201 ++++- + security/keys/keyring.c | 47 +- + security/keys/permission.c | 363 ++++++++- + security/keys/persistent.c | 27 +- + security/keys/proc.c | 22 +- + security/keys/process_keys.c | 86 +- + security/keys/request_key.c | 38 +- + security/keys/request_key_auth.c | 15 +- + security/security.c | 23 + + security/selinux/hooks.c | 30 +- + security/smack/smack_lsm.c | 85 +- + 93 files changed, 3583 insertions(+), 354 deletions(-) + create mode 100644 Documentation/watch_queue.rst + create mode 100644 drivers/base/watch.c + create mode 100644 drivers/misc/watch_queue.c + create mode 100644 include/linux/watch_queue.h + create mode 100644 include/uapi/linux/watch_queue.h + create mode 100644 samples/watch_queue/Makefile + create mode 100644 samples/watch_queue/watch_test.c +$ git am -3 ../patches/0001-fsverity-merge-fix-for-keyring_alloc-API-change.patch +Applying: fsverity: merge fix for keyring_alloc API change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/verity/signature.c +$ git add -A . +$ git commit -v -a --amend +[master 5af0dfd75d0c] Merge remote-tracking branch 'keys/keys-next' + Date: Tue Oct 1 09:17:42 2019 +1000 +$ git am -3 ../patches/0001-fscrypt-merge-resolution-for-keys-Replace-uid-gid-pe.patch +Applying: fscrypt: merge resolution for "keys: Replace uid/gid/perm permissions checking with an ACL" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/crypto/keyring.c +M fs/crypto/keysetup_v1.c +$ git add -A . +$ git commit -v -a --amend +[master 93561d776373] Merge remote-tracking branch 'keys/keys-next' + Date: Tue Oct 1 09:17:42 2019 +1000 +$ git am -3 ../patches/0001-dm-verity-merge-fix-for-keys-Replace-uid-gid-perm-pe.patch +Applying: dm verity: merge fix for "keys: Replace uid/gid/perm permissions checking with an ACL" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/md/dm-verity-verify-sig.c +$ git add -A . +$ git commit -v -a --amend +[master e1679932241a] Merge remote-tracking branch 'keys/keys-next' + Date: Tue Oct 1 09:17:42 2019 +1000 +Merging selinux/next (15322a0d90b6 lsm: remove current_security()) +$ 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 tpmdd/next (e13cd21ffd50 tpm: Wrap the buffer from the caller to tpm_buf in tpm_send()) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (ca2fc5efffde watchdog: f71808e_wdt: Add F81803 support) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (142dfcda5a35 Merge branch 'iommu/fixes' into next) +$ git merge iommu/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfio/next (e6c5d727db0a Merge branches 'v5.4/vfio/alexey-tce-memory-free-v1', 'v5.4/vfio/connie-re-arrange-v2', 'v5.4/vfio/hexin-pci-reset-v3', 'v5.4/vfio/parav-mtty-uuid-v2' and 'v5.4/vfio/shameer-iova-list-v8' into v5.4/vfio/next) +$ git merge vfio/next +Already up to date. +Merging audit/next (5f9e832c1370 Linus 5.3-rc1) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (59e9fcf8772b of: restore old handling of cells_name=NULL in of_*_phandle_with_args()) +$ git merge devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (556a0964e28c mailbox: qcom-apcs: fix max_register value) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (60b76d1c3b0a Merge branch 'spi-5.4' into spi-linus) +$ git merge spi/for-next +Already up to date. +Merging tip/auto-latest (4a6158fb485e Merge branch 'timers/urgent') +$ git merge tip/auto-latest +Merge made by the 'recursive' strategy. + arch/x86/Kconfig | 1 + + arch/x86/include/asm/pgtable-3level.h | 46 +++++++++++++------------- + arch/x86/kernel/cpu/intel.c | 8 ++--- + kernel/time/tick-broadcast-hrtimer.c | 62 ++++++++++++++++------------------- + 4 files changed, 58 insertions(+), 59 deletions(-) +Merging clockevents/clockevents/next (befd04abfbe4 clocksource/drivers/sh_cmt: Document "cmt-48" as deprecated) +$ git merge clockevents/clockevents/next +Auto-merging kernel/time/posix-timers.c +CONFLICT (content): Merge conflict in kernel/time/posix-timers.c +Auto-merging drivers/clocksource/Kconfig +Auto-merging arch/arm64/boot/dts/freescale/imx8mq.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mm.dtsi +Resolved 'kernel/time/posix-timers.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 75489641d6d4] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. +Merging edac/edac-for-next (f05390d30e20 EDAC: skx_common: get rid of unused type var) +$ git merge edac/edac-for-next +Merge made by the 'recursive' strategy. + drivers/edac/i5100_edac.c | 2 -- + drivers/edac/i5400_edac.c | 15 +++------------ + drivers/edac/i7300_edac.c | 4 ++-- + drivers/edac/sb_edac.c | 21 ++++++++------------- + drivers/edac/skx_common.c | 5 +---- + 5 files changed, 14 insertions(+), 33 deletions(-) +Merging irqchip/irq/irqchip-next (bb0fed1c60cc irqchip/sifive-plic: Switch to fasteoi flow) +$ git merge irqchip/irq/irqchip-next +Auto-merging drivers/irqchip/irq-sifive-plic.c +Merge made by the 'recursive' strategy. + .../bindings/interrupt-controller/atmel,aic.txt | 7 ++++-- + drivers/irqchip/irq-al-fic.c | 12 +++++++++ + drivers/irqchip/irq-atmel-aic5.c | 10 ++++++++ + drivers/irqchip/irq-gic-v3.c | 2 +- + drivers/irqchip/irq-sifive-plic.c | 29 +++++++++++----------- + 5 files changed, 43 insertions(+), 17 deletions(-) +Merging ftrace/for-next (8ed4889eb831 selftests/ftrace: Fix same probe error test) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (049b405029c0 MAINTAINERS: Update from paulmck@linux.ibm.com to paulmck@kernel.org) +$ git merge rcu/rcu/next +Already up to date. +Merging kvm/linux-next (fd3edd4a9066 KVM: nVMX: cleanup and fix host 64-bit mode checks) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (aac60f1a8677 KVM: arm/arm64: vgic: Use the appropriate TRACE_INCLUDE_PATH) +$ git merge kvm-arm/next +Auto-merging arch/arm64/kvm/hyp/switch.c +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/kvm_hyp.h | 24 ------------------------ + arch/arm64/kvm/hyp/switch.c | 17 ++--------------- + arch/arm64/kvm/hyp/tlb.c | 36 ++++++++++++++++++++++-------------- + virt/kvm/arm/vgic/trace.h | 2 +- + 4 files changed, 25 insertions(+), 54 deletions(-) +Merging kvm-ppc/kvm-ppc-next (ff42df49e75f KVM: PPC: Book3S HV: Don't lose pending doorbell request on migration on P9) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (0af2889f89bb KVM: s390: Remove unused parameter from __inject_sigp_restart()) +$ git merge kvms390/next +Auto-merging arch/s390/kvm/interrupt.c +Merge made by the 'recursive' strategy. + arch/s390/kvm/interrupt.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging xen-tip/linux-next (a4098bc6eed5 xen/pci: reserve MCFG areas earlier) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (69f98a60cdbb Merge branch 'for-5.4' into for-next) +$ git merge percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (30ae2fc0a75e workqueue: Minor follow-ups to the rescuer destruction change) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 29 ++++++++++++++++++++++------- + 1 file changed, 22 insertions(+), 7 deletions(-) +Merging drivers-x86/for-next (24a8d78a9aff platform/x86: i2c-multi-instantiate: Derive the device name from parent) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (c1030cd45619 HSI: Remove dev_err() usage after platform_get_irq()) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (6d4faf3b6b6e leds: lm3532: Fix optional led-max-microamp prop error handling) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (c9acc3c4f8e4 ipmi_si_intf: Fix race in timer shutdown handling) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (18a93cd38be3 usb: gadget: net2280: Add workaround for AB chip Errata 11) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (7a786b847907 USB: serial: ftdi_sio: add support for FT232H CBUS gpios) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (f14ac41f977f usb: chipidea: core: change vbus-regulator as optional) +$ git merge usb-chipidea-next/ci-for-usb-next +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/ci_hdrc_imx.c | 8 +++++ + drivers/usb/chipidea/ci_hdrc_imx.h | 2 ++ + drivers/usb/chipidea/core.c | 2 +- + drivers/usb/chipidea/udc.c | 73 ++++++++++++++++++++------------------ + drivers/usb/chipidea/usbmisc_imx.c | 31 +++++++++++----- + 5 files changed, 72 insertions(+), 44 deletions(-) +Merging phy-next/next (5af67635c36e phy: marvell: phy-mvebu-cp110-comphy: rename instances of DLT) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (f25379de4123 extcon-intel-cht-wc: Don't reset USB data connection at probe) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-intel-cht-wc.c | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) +Merging soundwire/next (dfcff3f8a5f1 soundwire: stream: make stream name a const pointer) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (dfda20419884 ACPI / property: Add two new Thunderbolt property GUIDs to the list) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge staging/staging-next +Already up to date. +Merging mux/for-next (05fb8284a417 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. +Merging icc/icc-next (6311b6521bcc drivers: qcom: Add BCM vote macro to header) +$ git merge icc/icc-next +Already up to date. +Merging slave-dma/next (c5c6faaee6e0 dmaengine: ti: edma: Use bitmap_set() instead of open coded edma_set_bits()) +$ git merge slave-dma/next +Already up to date. +Merging cgroup/for-next (275278e1525a Merge branch 'for-5.3-fixes' into for-next) +$ git merge cgroup/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (e41df1533a4f Merge remote-tracking branch 'mkp-scsi/5.4/scsi-postmerge' into for-next) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/scsi_lib.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging scsi-mkp/for-next (4f38b20f40c2 Merge branch '5.4/scsi-fixes' into 5.4/scsi-next) +$ git merge scsi-mkp/for-next +Auto-merging include/linux/blk-mq.h +Auto-merging drivers/scsi/lpfc/lpfc_sli4.h +CONFLICT (content): Merge conflict in drivers/scsi/lpfc/lpfc_sli4.h +Auto-merging drivers/md/dm-rq.c +Resolved 'drivers/scsi/lpfc/lpfc_sli4.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0b5fe325d918] Merge remote-tracking branch 'scsi-mkp/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging vhost/linux-next (0d4a3f2abbef Revert "vhost: block speculation of translated descriptors") +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (741dc0aa4122 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging gpio/for-next (367677d49839 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging gpio-brgl/gpio/for-next (b630cea7bee7 gpio: mxc: Only get the second IRQ when there is more than one IRQ) +$ git merge gpio-brgl/gpio/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-mxc.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) +Merging gpio-intel/for-next (85af79659f45 MAINTAINERS: Remove stale record for gpio-intel-mid.c) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (cb0438e44360 pinctrl: meson-gxbb: Fix wrong pinning definition for uart_c) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (55dac43747be pinctrl: intel: mark intel_pin_to_gpio __maybe_unused) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-samsung/for-next (10971e2ab6eb pinctrl: samsung: Fix device node refcount leaks in init code) +$ git merge pinctrl-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/pinctrl-exynos.c | 14 +++++++++++--- + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 6 +++++- + drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 6 +++++- + drivers/pinctrl/samsung/pinctrl-samsung.c | 10 ++++++++-- + 4 files changed, 29 insertions(+), 7 deletions(-) +Merging pwm/for-next (da635e7abe3f MAINTAINERS: Add myself as reviewer for the PWM subsystem) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (318759b4737c signal/x86: Move tsk inside of CONFIG_MEMORY_FAILURE in do_sigbus) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (aecea57f84b0 ktest: Fix some typos in config-bisect.pl) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (58be0106c530 random: fix soft lockup when trying to read from an uninitialized blocking pool) +$ git merge random/dev +Already up to date. +Merging kselftest/next (721cb3c8bc88 selftests: tpm2: install python files) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (870e0167cd9c Merge tag 'compat-ioctl-5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground into y2038) +$ git merge y2038/y2038 +Auto-merging lib/iov_iter.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/blkdev.h +Auto-merging fs/userfaultfd.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/fuse/dev.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/ext4/ioctl.c +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/file.c +Auto-merging fs/btrfs/super.c +Auto-merging drivers/watchdog/f71808e_wdt.c +Auto-merging drivers/watchdog/ath79_wdt.c +Auto-merging drivers/video/fbdev/aty/atyfb_base.c +Auto-merging drivers/vhost/vsock.c +Auto-merging drivers/vhost/test.c +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/usb/class/usbtmc.c +Auto-merging drivers/usb/class/cdc-wdm.c +Auto-merging drivers/tty/tty_io.c +Auto-merging drivers/staging/android/ion/ion.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/pmcraid.c +Auto-merging drivers/scsi/cxlflash/main.c +Auto-merging drivers/rtc/rtc-ds1374.c +Auto-merging drivers/platform/x86/wmi.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/nvdimm/bus.c +Auto-merging drivers/net/tap.c +Auto-merging drivers/net/ppp/ppp_generic.c +Auto-merging drivers/misc/mei/main.c +Auto-merging drivers/isdn/capi/capi.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/hwtracing/stm/core.c +Auto-merging drivers/hid/usbhid/hiddev.c +Auto-merging drivers/hid/hidraw.c +Auto-merging drivers/dma-buf/sync_file.c +Auto-merging drivers/dma-buf/sw_sync.c +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging drivers/char/random.c +Auto-merging drivers/char/ppdev.c +Auto-merging drivers/block/pktcdvd.c +Auto-merging drivers/android/binder.c +Auto-merging arch/um/drivers/hostaudio_kern.c +Merge made by the 'recursive' strategy. + Documentation/networking/ppp_generic.txt | 2 + + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 1 + + arch/um/drivers/harddog_kern.c | 1 + + arch/um/drivers/hostaudio_kern.c | 1 + + block/scsi_ioctl.c | 132 +++- + drivers/android/binder.c | 2 +- + drivers/block/pktcdvd.c | 25 + + drivers/char/ipmi/ipmi_watchdog.c | 1 + + drivers/char/ppdev.c | 12 +- + drivers/char/random.c | 1 + + drivers/char/tpm/tpm_vtpm_proxy.c | 12 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 2 +- + drivers/dma-buf/dma-buf.c | 4 +- + drivers/dma-buf/sw_sync.c | 2 +- + drivers/dma-buf/sync_file.c | 2 +- + drivers/firewire/core-cdev.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- + drivers/hid/hidraw.c | 4 +- + drivers/hid/usbhid/hiddev.c | 11 +- + drivers/hwmon/fschmd.c | 1 + + drivers/hwtracing/stm/core.c | 12 +- + drivers/ide/ide-tape.c | 27 +- + drivers/iio/industrialio-core.c | 2 +- + drivers/infiniband/core/uverbs_main.c | 4 +- + drivers/isdn/capi/capi.c | 31 + + drivers/media/rc/lirc_dev.c | 4 +- + drivers/misc/cxl/flash.c | 8 +- + drivers/misc/genwqe/card_dev.c | 23 +- + drivers/misc/mei/main.c | 22 +- + drivers/misc/vmw_vmci/vmci_host.c | 2 +- + drivers/mtd/ubi/cdev.c | 36 +- + drivers/net/ppp/ppp_generic.c | 245 +++++--- + drivers/net/tap.c | 12 +- + drivers/nvdimm/bus.c | 4 +- + drivers/nvme/host/core.c | 2 +- + drivers/pci/switch/switchtec.c | 2 +- + drivers/platform/x86/wmi.c | 2 +- + drivers/rpmsg/rpmsg_char.c | 4 +- + drivers/rtc/dev.c | 13 +- + drivers/rtc/rtc-ds1374.c | 1 + + drivers/rtc/rtc-vr41xx.c | 10 + + drivers/s390/char/tape_char.c | 41 +- + drivers/sbus/char/display7seg.c | 2 +- + drivers/sbus/char/envctrl.c | 4 +- + drivers/scsi/3w-xxxx.c | 4 +- + drivers/scsi/cxlflash/main.c | 2 +- + drivers/scsi/esas2r/esas2r_main.c | 2 +- + drivers/scsi/megaraid/megaraid_mm.c | 28 +- + drivers/scsi/pmcraid.c | 4 +- + drivers/scsi/sd.c | 14 +- + drivers/scsi/sg.c | 59 +- + drivers/scsi/st.c | 28 +- + drivers/staging/android/ion/ion.c | 4 +- + drivers/staging/pi433/pi433_if.c | 12 +- + drivers/staging/vme/devices/vme_user.c | 2 +- + drivers/tee/tee_core.c | 2 +- + drivers/tty/tty_io.c | 5 + + drivers/usb/class/cdc-wdm.c | 2 +- + drivers/usb/class/usbtmc.c | 4 +- + drivers/usb/core/devio.c | 16 +- + drivers/usb/gadget/function/f_fs.c | 12 +- + drivers/vfio/vfio.c | 39 +- + drivers/vhost/net.c | 12 +- + drivers/vhost/scsi.c | 12 +- + drivers/vhost/test.c | 12 +- + drivers/vhost/vsock.c | 12 +- + drivers/video/fbdev/aty/atyfb_base.c | 12 +- + drivers/virt/fsl_hypervisor.c | 2 +- + drivers/watchdog/acquirewdt.c | 1 + + drivers/watchdog/advantechwdt.c | 1 + + drivers/watchdog/alim1535_wdt.c | 1 + + drivers/watchdog/alim7101_wdt.c | 1 + + drivers/watchdog/ar7_wdt.c | 1 + + drivers/watchdog/at91rm9200_wdt.c | 1 + + drivers/watchdog/ath79_wdt.c | 1 + + drivers/watchdog/bcm63xx_wdt.c | 1 + + drivers/watchdog/cpu5wdt.c | 1 + + drivers/watchdog/eurotechwdt.c | 1 + + drivers/watchdog/f71808e_wdt.c | 1 + + drivers/watchdog/gef_wdt.c | 1 + + drivers/watchdog/geodewdt.c | 1 + + drivers/watchdog/ib700wdt.c | 1 + + drivers/watchdog/ibmasr.c | 1 + + drivers/watchdog/indydog.c | 1 + + drivers/watchdog/intel_scu_watchdog.c | 1 + + drivers/watchdog/iop_wdt.c | 1 + + drivers/watchdog/it8712f_wdt.c | 1 + + drivers/watchdog/ixp4xx_wdt.c | 1 + + drivers/watchdog/m54xx_wdt.c | 1 + + drivers/watchdog/machzwd.c | 1 + + drivers/watchdog/mixcomwd.c | 1 + + drivers/watchdog/mtx-1_wdt.c | 1 + + drivers/watchdog/mv64x60_wdt.c | 1 + + drivers/watchdog/nv_tco.c | 1 + + drivers/watchdog/pc87413_wdt.c | 1 + + drivers/watchdog/pcwd.c | 1 + + drivers/watchdog/pcwd_pci.c | 1 + + drivers/watchdog/pcwd_usb.c | 1 + + drivers/watchdog/pika_wdt.c | 1 + + drivers/watchdog/pnx833x_wdt.c | 1 + + drivers/watchdog/rc32434_wdt.c | 1 + + drivers/watchdog/rdc321x_wdt.c | 1 + + drivers/watchdog/riowd.c | 1 + + drivers/watchdog/sa1100_wdt.c | 1 + + drivers/watchdog/sb_wdog.c | 1 + + drivers/watchdog/sbc60xxwdt.c | 1 + + drivers/watchdog/sbc7240_wdt.c | 1 + + drivers/watchdog/sbc_epx_c3.c | 1 + + drivers/watchdog/sbc_fitpc2_wdt.c | 1 + + drivers/watchdog/sc1200wdt.c | 1 + + drivers/watchdog/sc520_wdt.c | 1 + + drivers/watchdog/sch311x_wdt.c | 1 + + drivers/watchdog/scx200_wdt.c | 1 + + drivers/watchdog/smsc37b787_wdt.c | 1 + + drivers/watchdog/w83877f_wdt.c | 1 + + drivers/watchdog/w83977f_wdt.c | 1 + + drivers/watchdog/wafer5823wdt.c | 1 + + drivers/watchdog/watchdog_dev.c | 1 + + drivers/watchdog/wdrtas.c | 1 + + drivers/watchdog/wdt.c | 1 + + drivers/watchdog/wdt285.c | 1 + + drivers/watchdog/wdt977.c | 1 + + drivers/watchdog/wdt_pci.c | 1 + + fs/btrfs/super.c | 2 +- + fs/ceph/dir.c | 1 + + fs/ceph/file.c | 2 +- + fs/ceph/super.h | 1 + + fs/compat_ioctl.c | 917 ++-------------------------- + fs/ecryptfs/file.c | 1 + + fs/ext4/ioctl.c | 1 + + fs/f2fs/file.c | 1 + + fs/fat/file.c | 13 +- + fs/fuse/dev.c | 2 +- + fs/gfs2/file.c | 30 + + fs/hpfs/dir.c | 1 + + fs/hpfs/file.c | 1 + + fs/ioctl.c | 80 ++- + fs/nilfs2/ioctl.c | 1 + + fs/notify/fanotify/fanotify_user.c | 2 +- + fs/ocfs2/ioctl.c | 1 + + fs/userfaultfd.c | 2 +- + include/linux/blkdev.h | 2 + + include/linux/falloc.h | 20 + + include/linux/fs.h | 7 + + include/linux/mtio.h | 60 ++ + include/uapi/linux/ppp-ioctl.h | 2 + + include/uapi/linux/ppp_defs.h | 14 + + lib/iov_iter.c | 1 + + net/bluetooth/hci_sock.c | 21 +- + net/bluetooth/rfcomm/sock.c | 14 +- + net/rfkill/core.c | 2 +- + net/socket.c | 3 + + net/unix/af_unix.c | 19 + + sound/core/oss/pcm_oss.c | 4 + + sound/oss/dmasound/dmasound_core.c | 2 + + 155 files changed, 935 insertions(+), 1394 deletions(-) + create mode 100644 include/linux/mtio.h +Merging livepatching/for-next (1cfe141e1715 Merge branch 'for-5.4-core' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (c165d8947bc4 eeprom: Deprecate the legacy eeprom driver) +$ git merge coresight/next +Already up to date. +Merging rtc/rtc-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (4c806b897d60 libnvdimm/region: Enable MAP_SYNC for volatile regions) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (10742fee98eb eeprom: at24: remove unneeded include) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge ntb/ntb-next +Already up to date. +Merging kspp/for-next/kspp (6f88ed285e67 Merge branch 'fixes/usercopy/highmem-fromlist' into for-next/kspp) +$ git merge kspp/for-next/kspp +Already up to date! +Merge made by the 'recursive' strategy. +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (799e064cc79e fsi: scom: Don't abort operations for minor errors) +$ git merge fsi/next +Merge made by the 'recursive' strategy. +Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) +$ git merge siox/siox/next +Already up to date. +Merging slimbus/for-next (0a43bffb7e21 slimbus: fix slim_tid_txn()) +$ git merge slimbus/for-next +Merge made by the 'recursive' strategy. +Merging nvmem/for-next (ad732da57bde nvmem: core: fix nvmem_cell_write inline function) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + include/linux/nvmem-consumer.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging xarray/xarray (91abab83839a XArray: Fix xas_next() with a single entry at 0) +$ git merge xarray/xarray +Merge made by the 'recursive' strategy. + lib/test_xarray.c | 24 ++++++++++++++++++++++++ + lib/xarray.c | 4 ++++ + 2 files changed, 28 insertions(+) +Merging hyperv/hyperv-next (d8bd2d442bb2 Drivers: hv: vmbus: Resume after fixing up old primary channels) +$ git merge hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (54ecb8f7028c Linux 5.4-rc1) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb-dt/kgdb/for-next (d8a050f5a3e8 kgdb: fix comment regarding static function) +$ git merge kgdb-dt/kgdb/for-next +Already up to date. +Merging pidfd/for-next (590ef0128b42 waitid: Add support for waiting for the current process group) +$ git merge pidfd/for-next +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging include/uapi/linux/sched.h +Auto-merging include/linux/sched/task.h +Merge made by the 'recursive' strategy. + include/linux/pid.h | 2 +- + include/linux/sched/task.h | 1 + + include/uapi/linux/sched.h | 1 + + kernel/fork.c | 14 +- + kernel/pid.c | 37 +++- + tools/testing/selftests/clone3/.gitignore | 2 + + tools/testing/selftests/clone3/Makefile | 11 ++ + tools/testing/selftests/clone3/clone3.c | 231 ++++++++++++++++++++++++ + tools/testing/selftests/clone3/clone3_set_tid.c | 161 +++++++++++++++++ + 9 files changed, 450 insertions(+), 10 deletions(-) + create mode 100644 tools/testing/selftests/clone3/.gitignore + create mode 100644 tools/testing/selftests/clone3/Makefile + create mode 100644 tools/testing/selftests/clone3/clone3.c + create mode 100644 tools/testing/selftests/clone3/clone3_set_tid.c +Merging devfreq/for-next (d2f5fccd1ac9 PM / devfreq: Make log message more explicit when devfreq device already exists) +$ git merge devfreq/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/devfreq/devfreq.c | 2 +- + include/dt-bindings/pmu/exynos_ppmu.h | 25 +++++++++++++++++++++++++ + 3 files changed, 27 insertions(+), 1 deletion(-) + create mode 100644 include/dt-bindings/pmu/exynos_ppmu.h +Merging hmm/hmm (62974fc389b3 libnvdimm: Enable unit test infrastructure compile checks) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (e56476897448 fpga: Remove dev_err() usage after platform_get_irq()) +$ git merge fpga/for-next +Merge made by the 'recursive' strategy. + drivers/fpga/zynq-fpga.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +Merging kunit/test (741a98d02236 kunit: fix failure to build without printk) +$ git merge kunit/test +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kunit/api/index.rst | 16 + + Documentation/dev-tools/kunit/api/test.rst | 11 + + Documentation/dev-tools/kunit/faq.rst | 62 + + Documentation/dev-tools/kunit/index.rst | 79 ++ + Documentation/dev-tools/kunit/start.rst | 180 +++ + Documentation/dev-tools/kunit/usage.rst | 576 ++++++++ + MAINTAINERS | 13 + + arch/um/configs/kunit_defconfig | 3 + + include/kunit/assert.h | 356 +++++ + include/kunit/string-stream.h | 51 + + include/kunit/test.h | 1490 ++++++++++++++++++++ + include/kunit/try-catch.h | 75 + + kernel/Makefile | 2 + + kernel/sysctl-test.c | 392 +++++ + lib/Kconfig.debug | 13 + + lib/Makefile | 2 + + lib/kunit/Kconfig | 36 + + lib/kunit/Makefile | 9 + + lib/kunit/assert.c | 141 ++ + lib/kunit/example-test.c | 88 ++ + lib/kunit/string-stream-test.c | 52 + + lib/kunit/string-stream.c | 217 +++ + lib/kunit/test-test.c | 331 +++++ + lib/kunit/test.c | 478 +++++++ + lib/kunit/try-catch.c | 118 ++ + tools/objtool/check.c | 1 + + tools/testing/kunit/.gitignore | 3 + + tools/testing/kunit/configs/all_tests.config | 3 + + tools/testing/kunit/kunit.py | 136 ++ + tools/testing/kunit/kunit_config.py | 66 + + tools/testing/kunit/kunit_kernel.py | 149 ++ + tools/testing/kunit/kunit_parser.py | 310 ++++ + tools/testing/kunit/kunit_tool_test.py | 206 +++ + .../test_data/test_is_test_passed-all_passed.log | 32 + + .../kunit/test_data/test_is_test_passed-crash.log | 69 + + .../test_data/test_is_test_passed-failure.log | 36 + + .../test_data/test_is_test_passed-no_tests_run.log | 75 + + .../test_data/test_output_isolated_correctly.log | 106 ++ + .../kunit/test_data/test_read_from_file.kconfig | 17 + + 40 files changed, 6001 insertions(+) + create mode 100644 Documentation/dev-tools/kunit/api/index.rst + create mode 100644 Documentation/dev-tools/kunit/api/test.rst + create mode 100644 Documentation/dev-tools/kunit/faq.rst + create mode 100644 Documentation/dev-tools/kunit/index.rst + create mode 100644 Documentation/dev-tools/kunit/start.rst + create mode 100644 Documentation/dev-tools/kunit/usage.rst + create mode 100644 arch/um/configs/kunit_defconfig + create mode 100644 include/kunit/assert.h + create mode 100644 include/kunit/string-stream.h + create mode 100644 include/kunit/test.h + create mode 100644 include/kunit/try-catch.h + create mode 100644 kernel/sysctl-test.c + create mode 100644 lib/kunit/Kconfig + create mode 100644 lib/kunit/Makefile + create mode 100644 lib/kunit/assert.c + create mode 100644 lib/kunit/example-test.c + create mode 100644 lib/kunit/string-stream-test.c + create mode 100644 lib/kunit/string-stream.c + create mode 100644 lib/kunit/test-test.c + create mode 100644 lib/kunit/test.c + create mode 100644 lib/kunit/try-catch.c + create mode 100644 tools/testing/kunit/.gitignore + create mode 100644 tools/testing/kunit/configs/all_tests.config + create mode 100755 tools/testing/kunit/kunit.py + create mode 100644 tools/testing/kunit/kunit_config.py + create mode 100644 tools/testing/kunit/kunit_kernel.py + create mode 100644 tools/testing/kunit/kunit_parser.py + create mode 100755 tools/testing/kunit/kunit_tool_test.py + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-all_passed.log + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-crash.log + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-failure.log + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-no_tests_run.log + create mode 100644 tools/testing/kunit/test_data/test_output_isolated_correctly.log + create mode 100644 tools/testing/kunit/test_data/test_read_from_file.kconfig +Merging akpm-current/current (580a3a106e1d ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging lib/Kconfig.debug +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/memremap.h +Auto-merging fs/ocfs2/ioctl.c +Auto-merging fs/fat/file.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 20 +++-- + Documentation/admin-guide/sysctl/kernel.rst | 20 ++++- + Documentation/core-api/genalloc.rst | 2 +- + Documentation/core-api/memory-allocation.rst | 4 + + Documentation/process/deprecated.rst | 10 +-- + arch/arm/mm/dma-mapping.c | 2 +- + drivers/misc/sram-exec.c | 2 +- + fs/aio.c | 9 +-- + fs/buffer.c | 56 +++++++++++++- + fs/fat/fat.h | 1 + + fs/fat/file.c | 8 +- + fs/fat/inode.c | 22 ++++-- + fs/fs-writeback.c | 9 ++- + fs/ocfs2/aops.c | 25 ++++++- + fs/ocfs2/ioctl.c | 2 +- + fs/ocfs2/xattr.c | 56 ++++++-------- + fs/proc/page.c | 40 +++++----- + fs/ramfs/inode.c | 12 +++ + include/linux/genalloc.h | 2 +- + include/linux/memcontrol.h | 29 ++++++++ + include/linux/memory_hotplug.h | 1 + + include/linux/memremap.h | 6 ++ + include/linux/sched.h | 9 +++ + include/linux/sched/sysctl.h | 1 + + include/linux/slab.h | 4 + + include/linux/string.h | 45 ++++++++++++ + include/linux/wait.h | 4 +- + include/trace/events/vmscan.h | 71 +++++++++++++++--- + ipc/msg.c | 18 ++--- + kernel/dma/remap.c | 2 +- + kernel/fork.c | 4 +- + kernel/hung_task.c | 94 ++++++++++++++++++++---- + kernel/sysctl.c | 8 ++ + lib/Kconfig.debug | 6 ++ + lib/genalloc.c | 5 +- + lib/math/rational.c | 63 ++++++++++++---- + mm/memcontrol.c | 5 ++ + mm/memory_hotplug.c | 17 ++++- + mm/memremap.c | 27 ++++++- + mm/mmap.c | 43 +++++++---- + mm/oom_kill.c | 67 +++++++++-------- + mm/shuffle.c | 2 +- + mm/slab_common.c | 19 ++++- + mm/slob.c | 62 ++++++++++++---- + mm/slub.c | 14 +++- + mm/sparse.c | 2 +- + mm/vmscan.c | 105 +++++++++++++++++++++------ + scripts/checkpatch.pl | 24 ++++++ + 48 files changed, 816 insertions(+), 243 deletions(-) +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: pinctrl: fix pxa2xx.c build warnings +Applying: drivers/tty/serial/sh-sci.c: suppress warning +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 + + ed9c4f28223d...acf6ebaa6b51 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (acf6ebaa6b51 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/media/platform/sti/delta/delta-ipc.c | 4 ++-- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + + drivers/tty/serial/sh-sci.c | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..ebc034a1a1b4 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..0f27523b2a4c --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20191001 |