diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-04-06 15:38:09 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-04-06 15:38:09 +1000 |
| commit | 5e1dacccbb87780856219e29122f1eccec912ebb (patch) | |
| tree | 661cff8d7c5982bf2e58be3a9c3c081c4000e620 | |
| parent | b93555203d969e03376f3043789680f54f972c0f (diff) | |
| download | linux-next-5e1dacccbb87780856219e29122f1eccec912ebb.tar.gz | |
Add linux-next specific files for 20180406next-20180406
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 260 | ||||
| -rw-r--r-- | Next/Trees | 262 | ||||
| -rw-r--r-- | Next/merge.log | 9012 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 9537 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..1b024f00b06a --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,260 @@ +Name SHA1 +---- ---- +origin 052c220da392c4dcbc628852d04970447a315683 +fixes 147a89bc71e7db40f011454a40add7ff2d10f8d8 +kbuild-current 28913ee8191adf4bbc01cbfb9ee18cca782ab141 +arc-current 661e50bc853209e41a5c14a290ca4decc43cbfd1 +arm-current 1b8837b61714c3743fadb3a6bbb57ffd53839e7c +arm64-fixes e21da1c992007594d391e7b301779cf30f438691 +m68k-current ecd685580c8feb9a91c758257a66355a673594d9 +powerpc-fixes 52396500f97c53860164debc7d4f759077853423 +sparc 17dec0a949153d9ac00760ba2f5b78cb583e995f +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net d68a19f89bcfa53cc2aaa3153d7243226df08456 +bpf 33491588c1fb2c76ed114a211ad0ee76c16b5a0c +ipsec 9a3fb9fb84cc30577c1b012a6a3efda944684291 +netfilter b9fc828debc8ac2bb21b5819a44d2aea456f1c95 +ipvs f7fb77fc12352d15180dc3c08ffba10573d5167d +wireless-drivers 4608f064532c28c0ea3c03fe26a3a5909852811a +mac80211 b5dbc28762fd3fd40ba76303be0c7f707826f982 +rdma-fixes 84652aefb347297aa08e91e283adf7b18f77c2d5 +sound-current a820ccbe21e8ce8e86c39cd1d3bc8c7d1cbb949b +pci-current fc110ebdd014dd1368c98e7685b47789c31fab42 +driver-core.current 0c8efd610b58cb23cefdfa12015799079aef94ae +tty.current c698ca5278934c0ae32297a8725ced2e27585d7f +usb.current c698ca5278934c0ae32297a8725ced2e27585d7f +usb-gadget-fixes c6ba5084ce0d00d4a005b0577d9e764d39b638e1 +usb-serial-fixes 86d71233b615e4c514eddf17914f0168a8b70db9 +usb-chipidea-fixes 964728f9f407eca0b417fdf8e784b7a76979490c +phy 59fba0869acae06ff594dd7e9808ed673f53538a +staging.current df34df483a97b1591a3e90a6941f99fe9f863508 +char-misc.current 06dd3dfeea60e2a6457a6aedf97afc8e6d2ba497 +input-current 664b0bae0b87f69bc9deb098f5e0158b9cf18e04 +crypto-current f444ec106407d600f17fa1a4bd14f84577401dec +ide 8e44e6600caa7b96a5b71ae36c8829db753c2d70 +vfio-fixes 834814e80268c818f354c8f402e0c6604ed75589 +kselftest-fixes ba004a2955f759946d8c98ca1a9c8d09818b1223 +backlight-fixes 8ff5cbc6e3c5c2855245c014f3ba572ddfc5ab0f +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +mfd-fixes 107b7d9fa94c4692d9104243f0e793e2a4e1366e +v4l-dvb-fixes a95845ba184b854106972f5d8f50354c2d272c06 +reset-fixes f450f28e70a2378d9d6ded0932fe480055888cfa +mips-fixes a63d706ea719190a79a6c769e898f70680044d3e +kvm-fixes 17a1079d9c63579d6e392a526405b8888e9ede37 +kvms390-fixes f07afa0462b76a5b9c4f3a43d5ac24fdb86a90c2 +drm-intel-fixes 3eb2ce825ea1ad89d20f7a3b5780df850e4be274 +drm-misc-fixes 5a9f698feb11b198f17b2acebbfe0e2716a3beed +syscalls c9a211951c7c79cfb5de888d7d9550872868b086 +kbuild d20f47687e2fb0d0947deff20cc52ba4e1e3c032 +leaks 9f84a0f7f1a613335a9aaf0abd5858906752bf93 +efi-lock-down 89bcd5b02f125335f74289c5f4ae03e9b893ab7f +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping 1f674e16f9ce6eb20ee2e81ae7514737376874de +asm-generic 17dec0a949153d9ac00760ba2f5b78cb583e995f +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm f85aba3f09538e1c84da0fdfdfbad6afcda4b16f +arm-perf 44300aed5d28e61aae124c401170ac94c98d2127 +arm-soc d0370b195f102baf6f37879dc9ea2fb8053b1e8b +actions 61862a89e6acb61e1193c3ad6d4eeab966c470ed +alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +amlogic 059e40d9087632cda6a48c41a537a5789e8204c4 +aspeed 6534b2d0de3693b8508375c2f01951d6eb5c69be +at91 20d3f36b0feaad5ab90ccff77e18c13939065cad +bcm2835 cf172af3be59ccd818960064b30722582a4c7fb5 +imx-mxs 98f9530adda3b5929e2593e8e5b5681ff4b193b3 +keystone dacf3785016797379dc4bc4ec05f87d746adcaee +mvebu 4c1b45a44e3508372da9dac9d3b701074baa66d5 +omap d1cc5c055f7a5bd996706e790932d8d9a8159189 +reset 0089313d8595b76422b189b44c55556cb1004190 +qcom 186d88395e05eb087d730ff7f8fc6b7f4dbd8d90 +realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9 +renesas 58eb42a95b247359a3ce4badb69c732561781854 +rockchip f5a45eb9772809eb6b758043c7f30cd88026807b +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk 0bc590a59ce6682d9792d7b59fb5f5283e2052a8 +sunxi 2d567752a056453f9767d0d26d1cc54aa38624a6 +tegra 6b9b5116227d5841813ede01857e1962fb98bebd +arm64 65896545b69ffaac947c12e11d3dcc57fd1fb772 +clk 804a4481ff5037397587b8be7a1bf2878123a217 +clk-samsung 182c084da5d1e4d7c02d913de154cf5167521580 +c6x 9d440f7a282433338207c4ffb13cafaccaa27818 +m68k ecd685580c8feb9a91c758257a66355a673594d9 +m68knommu f61e64310b75733d782e930d1fb404b84699eed6 +microblaze 70f6283a372bef685fd64564646a3b49a55be1ea +mips ea4d340cbea470247b19ee696e31f102bc64466a +mips-james 5468af4fae55f27cbc1b428d1f8ec50cdc4b3363 +nds32 6fc61ee69433e7e0433cabd36f78bb5fb3b26524 +nios2 e0691ebb33c12084ef11b6b59228c004e19f59c8 +openrisc 0fedb7653af7a8cac606c3eff213ac92693035b9 +parisc-hd 186536608fd164fea56dab67f1927bf8e0d335d1 +powerpc c1b25a17d24925b0961c319cfc3fd7e1dc778914 +fsl c095ff93f901c1620b28dce4d813dd548bc5236b +risc-v 0adb32858b0bddf4ada5f364a84ed60b196dbcda +s390 92fa7a13c845c91f6a8177250474bbcab7fcf45e +sparc-next 17dec0a949153d9ac00760ba2f5b78cb583e995f +sh d67cbbb113b71b81166d54e4e4d92ee4ed7dd3e3 +uml e40238dedb484c8a19f8257e4ef5d77d038f9ad8 +xtensa ae6063c83634cbef7f73ec8a3ab7a6adf5294716 +fscrypt 0b1dfa4cc6c60052b2c30ead316fa84c46d3c43c +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 7c9a09f56a91c4ee5636703d3a95c72710917718 +btrfs-kdave ed754f23c36335d305e9c9b8155c61bbbf461eb2 +ceph 50b37a1c3d59255b29287e7b6e17dc13d48cbacc +cifs 5a45c8a6c8e92f01981f68d529c6791c9f47d671 +configfs 6ace4f6bbcfde70278a33c11443ecda3ed0ec1b6 +ecryptfs f62fd7a77717350e850f3c4a5373fe8e64871025 +ext3 b91ed9d8082c394dda63f94f935219cd0a565938 +ext4 b025a674fc5d0f1b1d1c87bb85198541c9fc93e3 +f2fs 214c2461a864a46b11856426b80dc7db453043c5 +fuse 5ba24197b94d4070d8c2a17fa4944a55cc39ef03 +jfs 86313903430d08739e391ad51b4865dc3a2bf522 +nfs 0adb32858b0bddf4ada5f364a84ed60b196dbcda +nfs-anna 7e8b4fa9fce9f35d7a3a31ebe0f51e1344793be9 +nfsd 880a3a5325489a143269a8e172e7563ebf9897bc +orangefs 8e9ba5c48ea690060a814fbac6a8c046ab935d79 +overlayfs 3e277162a768bb98def8baf31bb3d981883fc908 +ubifs b5094b7f135be34630e3ea8a98fa215715d0f29d +xfs dc1baa715bbfbb1902da942d06497e79b40e7bc7 +file-locks 86f84779d8e92a690b2f281175ea06b884cb6fa4 +vfs fd70f4425f9b2f131d6a565f2df68d4f84447753 +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk 23545acc2a0e121c3712a0ddc9d0b96eb4483bf3 +pci 7432acf315254aae540609d2370543b5488a317a +pstore 58eb5b6707477ff458db3ee522aac317da719e2a +hid e221c81efb0ca8f647380523ccd77a6fa4914f9b +i2c af43a578585364ddcbe4fea8de1d7596d6e70fc9 +dmi eb693e35e850d915fae2c63dc5cef6751b466fa6 +hwmon-staging e3a2d2be510ec8a35ecd2a17a42467d417962bb7 +jc_docs 86afad7d87f535ebb1a0e978bc32a8c58ac99268 +v4l-dvb 17dec0a949153d9ac00760ba2f5b78cb583e995f +v4l-dvb-next 17dec0a949153d9ac00760ba2f5b78cb583e995f +fbdev 7c9b845e79eadd074820e36d426502a9c54cafcf +pm 4606b87beeff9d9564d28464185aa7a3ea513e7f +cpupower 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f +opp 4a823c0be80fa996234ebb41c80d40458b1bec1e +thermal f8837aac36cdc7430422cd65f4466071b42654bb +thermal-soc 2db48884bb51f2ad26b1b716297ceaab624a2e68 +ieee1394 188775181bc05f29372b305ef96485840e351fde +dlm 9250e523592a8ced3ecd14abe29fbb1e036bd7eb +swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a +rdma 2d93fc856959bb940b3cf1e7cbad38721d6bea75 +net-next 17dec0a949153d9ac00760ba2f5b78cb583e995f +bpf-next 4608f064532c28c0ea3c03fe26a3a5909852811a +ipsec-next 415a13296a1a49639cabf9d2fe92267810caa47a +netfilter-next 159f02977b2feb18a4bece5e586c838a6d26d44b +nfc-next 4d63adfe12dd9cb61ed8badb4d798955399048c2 +ipvs-next a910d20aa007b94cf1799df59341f5e27ca60e6f +wireless-drivers-next 14c99949a3398a655c47b262ca8e2e83edfae7fd +bluetooth 1c663c629bb81d48f81b2c052e8ab9851c503a68 +mac80211-next 159f02977b2feb18a4bece5e586c838a6d26d44b +gfs2 06dd3dfeea60e2a6457a6aedf97afc8e6d2ba497 +mtd 87a73eb5b56fd6e07c8e499fe8608ef2d8912b82 +l2-mtd b756816dad0aaca4f57c857a86a6a4a85a9f478b +nand 097ccca726ffedb277c104aba45c59d075969e51 +spi-nor e8de85d5a107352ff428f735b0afc8133bcbc3e5 +crypto f444ec106407d600f17fa1a4bd14f84577401dec +drm 694f54f680f7fd8e9561928fbfc537d9afbc3d79 +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel 38057aa1639b74d5c1e0dc1ca7c22bc7a31de714 +drm-tegra 27e92f1f1600c214bf649daddb9b88b68330a8d1 +drm-misc 41613a1a7df27a0aa34bf77d51278bbe8e108a8f +drm-msm 288e5c8898c488298c39ff4bbf58928d30fbf99f +hdlcd f73e8b82531573a198a4d0e5bff0d3256cbbd1d8 +mali-dp 6e810eb508f4b937bc2a718bd4e5cd74cca55500 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm 28e228073b070d843541daaf5d50705a9d747675 +etnaviv 4ed75c3e525598ff1aa6aed09c419c73a4efd2f2 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap 2889312616aecf1a1153be0fab19206a6b1f768f +sound a820ccbe21e8ce8e86c39cd1d3bc8c7d1cbb949b +sound-asoc 445bb423f6a3c50788529a33b82e45148001e855 +modules 3f553b308bb004eb730da8e00a28150c157c7724 +input 04bb1719c4de94700056241d4c0fe3c1413f5aff +block 667eea5d591b85501e7b36464cfa14bb125d0097 +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper 5bd5e8d891c1fd2d966a7e2c26f0452d22410683 +mmc fc167daff581c01ebce8695e9618231cae3561a1 +kgdb 2cf2f0d5b91fd1b06a6ae260462fc7945ea84add +md 3de59bb9d551428cbdc76a9ea57883f82e350b4d +mfd b45bf45f1b827d05e8209e2adf35f777ada0c5d4 +backlight ea388d6cffd43d353f9c2b3d711953e7525c7d97 +battery fd73a3e618889877d32e338622a363d04d9be709 +regulator 36fd679f45a25a7c634b3dbec35a2d7fdb832a65 +security 3f3122c1b84c8f60a89184f2b0d854ffd89c7534 +apparmor 588558eb6d0e0b6edfa65a67e906c2ffeba63ff1 +integrity ab60368ab6a452466885ef4edf0cefd089465132 +keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 +selinux 6b6bc6205d98796361962ee282a063f18ba8dc57 +tpmdd 2be8ffed093b91536d52b5cd2c99b52f605c9ba6 +watchdog 1991a55dc87e8f2557bc90d7f0062b7110ab8437 +iommu d4f96fd5c249defda290299f9646287dd3df0803 +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio da9147140fe3de5a3a3fe5fe7f69739d4f39bea1 +trivial 75a24b822d383489badd343cab4cb171d09f93ef +audit ea841bafda3f7f9aa8b06a09f0f3e41c207af84f +devicetree 827473268ee492b30b576ef156ab524a2b9f3520 +mailbox 41c0e939d70ddb6860e340e7532df8984783f867 +spi 0930437e8f9d1f513ca7f130a650b608358f8805 +tip f78e5d05f9f11802a01f8711a0d67dd73d4f03e5 +clockevents 0136c741ff40e03323419feec05fcd594f36a463 +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 6fd052665274b4e7570491ba272f2dbb09cbbcd5 +irqchip aa08192a254d362a4d5317647a81de6996961aef +ftrace 80765597bc587feae8dbc8ce97a0f32e12a6e625 +rcu 338c46403f169dd76bff8ed58fd0be0d600e7aba +kvm 27aa8962817afdf7754e719a8a072584a747aff3 +kvm-arm dc6ed61d2f824a595033744fc1f3bf4cb98768b5 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc 31c8b0d0694a1f7e3b46df0d1341a874ecb5e0de +kvms390 ccc40c53c07ba22cfe711cd625f9f0c77f272ae6 +xen-tip c37a3c94775855567b90f91775b9691e10bd2806 +percpu b3a5d111994450909158929560906f2c1c6c1d85 +workqueues 1aa3798360db38d3131ac011b50c397a7cdb754e +drivers-x86 7129707ec2356ef9ef9cce469ad14eb37fbbe67e +chrome-platform 3b7cedb4242034595cd268046f3cf2e6eb68e989 +hsi e3d7fbab062b877b96c09ffb43733502cdc1bd0a +leds 92d7ec1d71e351f11ba503369eb78225510cfcc7 +ipmi c6185e285c5c7cfeab739bae7f206ced695f09c7 +driver-core 1fe56e0cafd7e4cf26f3582aad0c7705fceff498 +usb 5267c5e09c25e2ee6242b37833a9bdf9d97f54a2 +usb-gadget aaeab02ddcc830e31c33cdb72a3c117b2d499ae2 +usb-serial 79a0b33165d8d8ec0840fcfc74fd0a8f219abeee +usb-chipidea-next ce4c1b820c5269437ce2e7831f638159b3b83269 +phy-next e7f4da4c44fe74e1c9277bac9b12ea1ef4eb70db +tty 4f794097797f551917b68797e39f25fcb17d5b3a +char-misc 06dd3dfeea60e2a6457a6aedf97afc8e6d2ba497 +extcon eb7768e774d12eac1189984a62925bc3bb386e13 +staging df34df483a97b1591a3e90a6941f99fe9f863508 +mux fa934c06c0f40443566e7cb0d46eac6da65dce48 +slave-dma df0517c76e89d26e3c5ecbc5212c7a56d7ef5a00 +cgroup d1897c9538edafd4ae6bbd03cc075962ddde2c21 +scsi 2e1f44f6ad8008be353c7c99286f7a747b4b3cf4 +scsi-mkp e5ad169824033369bb41c133cc6e724bc2c2a2bd +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +libata d64c228ea18170596d65b01f6481b7c048b09e24 +vhost dc32bb678e103afbcfa4d814489af0566307f528 +rpmsg 1e2832764f26f9a4fa1c86334e86818f93b05d30 +gpio 348f3cde84ab5b1f53cd3c0eaac1ca99a4dcb148 +pinctrl 4fc97ef94bbfa185d16b3e44199b7559d0668747 +pinctrl-samsung 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +pwm 6873842235d678a245a378669f35e145df2441b9 +userns 4be33329d46f80e87afe7db61271d1370607260a +ktest f7c6401ff84ab8ffffc281a29aa0a787f7eb346e +random 9e66317d3c92ddaab330c125dfe9d06eee268aff +aio 2a8a98673c13cb2a61a6476153acf8344adfa992 +kselftest 6aa69043d9f3f4adc5b3817ccfcac1fddfe10ded +y2038 ce380619fab99036f5e745c7a865b21c59f005f6 +livepatching d13f5d84ca2774e76f8461a383c222cbc75adad5 +coresight 7e7408725e0d96ef6dfbd2588a78f5001d949bd1 +rtc 1485991c024603b2fb4ae77beb7a0d741128a48e +nvdimm bb37fbce88f0382f98c26abc620297fbef127078 +idr f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371 +at24 84e10623c0b9c81557918804f309d66aec86a233 +ntb 53c3677c56c76f90cacd3a1063272fc6d6bc8f76 +kspp 0adb32858b0bddf4ada5f364a84ed60b196dbcda +init_task e1e871aff3ded26348c631b1370e257d401cd22d +akpm-current f3edcb47a8f6924f77bbb4f68ddbc47b0f8e74ef +akpm 97f45c3487f991cc5ce9104e3dcb33ccdd6c661a diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..445d26ab16a9 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,262 @@ +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 +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 +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/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 +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 +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 +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +nand-fixes git git://git.infradead.org/linux-mtd.git#nand/fixes +spi-nor-fixes git git://git.infradead.org/linux-mtd.git#spi-nor/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/jhogan/mips.git#mips-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 +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +syscalls git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#syscalls-next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +leaks git https://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git#leaks-next +efi-lock-down git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#efi-lock-down +uuid git git://git.infradead.org/users/hch/uuid.git#for-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 +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/arm/arm-soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions.git#for-next +alpine git git://git.kernel.org/pub/scm/linux/kernel/git/atenart/linux.git#alpine/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/nferre/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 +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 +reset git https://git.pengutronix.de/git/pza/linux#reset/next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-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 +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +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 +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.linux-mips.org/pub/scm/ralf/upstream-sfr#mips-next +mips-james git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.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 +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +sh git git://git.libc.org/linux-sh#for-next +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/linux/kernel/git/tytso/fscrypt.git#master +befs git git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs.git#for-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 +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 +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 +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#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-2.6.git#for-next +vfs-miklos git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#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/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-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 +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/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 +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.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/linux-mtd.git#mtd/next +nand git git://git.infradead.org/linux-mtd.git#nand/next +spi-nor git git://git.infradead.org/linux-mtd.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +drm-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-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 git://people.freedesktop.org/~robclark/linux#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 +sunxi-drm git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi-drm/for-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/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 +lightnvm git git://github.com/OpenChannelSSD/linux.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-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 +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 +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-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/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#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-mips git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips.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/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git https://github.com/dvhart/linux-pdx86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.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 +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 +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 +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-bva git git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.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 +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.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 +aio git git://git.kvack.org/~bcrl/aio-next.git#master +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/jikos/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 +idr git git://git.infradead.org/users/willy/linux-dax.git#idr-4.11 +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 +init_task git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#init_task +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..fce674579392 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,9012 @@ +$ date -R +Fri, 06 Apr 2018 08:58:41 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 5b1f3dc927a2 Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip +Merging origin/master (052c220da392 Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge origin/master +Updating 5b1f3dc927a2..052c220da392 +Fast-forward + Documentation/ABI/stable/sysfs-bus-vmbus | 7 + + .../ABI/testing/sysfs-bus-iio-chemical-vz89x | 2 +- + .../ABI/testing/sysfs-bus-iio-proximity-as3935 | 4 +- + Documentation/ABI/testing/sysfs-bus-thunderbolt | 33 + + Documentation/ABI/testing/sysfs-bus-usb | 10 + + Documentation/ABI/testing/sysfs-class-mei | 9 + + Documentation/ABI/testing/sysfs-class-usb_role | 21 + + .../ABI/testing/sysfs-driver-fsi-master-gpio | 10 + + .../ABI/testing/sysfs-driver-hid-logitech-hidpp | 19 + + Documentation/ABI/testing/sysfs-driver-hid-ntrig | 70 + + Documentation/ABI/testing/sysfs-driver-ufs | 885 ++++ + Documentation/admin-guide/kernel-parameters.txt | 61 + + Documentation/admin-guide/thunderbolt.rst | 15 +- + Documentation/arm64/cpu-feature-registers.txt | 18 +- + Documentation/arm64/elf_hwcaps.txt | 16 + + Documentation/arm64/silicon-errata.txt | 1 + + Documentation/cdrom/cdrom-standard.tex | 31 +- + Documentation/crypto/crypto_engine.rst | 48 + + Documentation/crypto/devel-algos.rst | 8 + + .../bindings/arm/hisilicon/hisilicon.txt | 23 + + .../connector/samsung,usb-connector-11pin.txt | 49 + + .../bindings/connector/usb-connector.txt | 75 + + .../devicetree/bindings/crypto/arm-cryptocell.txt | 3 +- + .../bindings/crypto/inside-secure-safexcel.txt | 6 +- + Documentation/devicetree/bindings/fsi/fsi.txt | 151 + + .../devicetree/bindings/gpio/gpio-eic-sprd.txt | 97 + + .../devicetree/bindings/gpio/gpio-pca953x.txt | 2 + + .../devicetree/bindings/gpio/gpio-sprd.txt | 28 + + .../devicetree/bindings/gpio/gpio-tz1090-pdc.txt | 45 - + .../devicetree/bindings/gpio/gpio-tz1090.txt | 88 - + Documentation/devicetree/bindings/gpio/gpio.txt | 7 +- + .../bindings/gpio/nintendo,hollywood-gpio.txt | 27 + + .../bindings/gpio/raspberrypi,firmware-gpio.txt | 30 + + .../devicetree/bindings/iio/adc/axp20x_adc.txt | 48 + + .../bindings/iio/adc/st,stm32-dfsdm-adc.txt | 8 +- + .../bindings/iio/potentiometer/ad5272.txt | 27 + + .../bindings/iio/temperature/mlx90632.txt | 28 + + .../devicetree/bindings/input/gpio-keys.txt | 8 + + .../bindings/input/zii,rave-sp-pwrbutton.txt | 22 + + .../devicetree/bindings/mfd/aspeed-lpc.txt | 41 + + .../devicetree/bindings/nvmem/imx-ocotp.txt | 23 +- + .../devicetree/bindings/nvmem/snvs-lpgpr.txt | 3 +- + .../devicetree/bindings/phy/meson-gxl-usb2-phy.txt | 4 + + .../devicetree/bindings/phy/meson-gxl-usb3-phy.txt | 31 + + .../bindings/phy/phy-hi3798cv200-combphy.txt | 59 + + .../devicetree/bindings/phy/phy-hisi-inno-usb2.txt | 71 + + .../bindings/phy/phy-mapphone-mdm6600.txt | 29 + + .../devicetree/bindings/phy/phy-mtk-tphy.txt | 4 + + .../devicetree/bindings/phy/phy-rockchip-typec.txt | 35 +- + .../devicetree/bindings/phy/phy-stm32-usbphyc.txt | 73 + + .../devicetree/bindings/phy/qcom-qmp-phy.txt | 6 +- + .../devicetree/bindings/phy/qcom-qusb2-phy.txt | 5 +- + .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 2 + + .../devicetree/bindings/phy/rcar-gen3-phy-usb3.txt | 2 + + .../devicetree/bindings/phy/sun4i-usb-phy.txt | 1 + + .../devicetree/bindings/powerpc/nintendo/wii.txt | 9 +- + .../bindings/rng/{imx-rngc.txt => imx-rng.txt} | 11 +- + .../devicetree/bindings/rng/ks-sa-rng.txt | 21 + + Documentation/devicetree/bindings/rng/omap_rng.txt | 7 +- + .../devicetree/bindings/rng/st,stm32-rng.txt | 4 + + .../devicetree/bindings/scsi/hisilicon-sas.txt | 7 + + Documentation/devicetree/bindings/serial/8250.txt | 1 + + .../bindings/serial/renesas,sci-serial.txt | 2 + + .../devicetree/bindings/serial/st,stm32-usart.txt | 2 + + .../bindings/soc/bcm/brcm,bcm2835-vchiq.txt | 16 + + Documentation/devicetree/bindings/sound/ak4458.txt | 23 + + Documentation/devicetree/bindings/sound/ak5558.txt | 22 + + Documentation/devicetree/bindings/sound/da7219.txt | 6 + + Documentation/devicetree/bindings/sound/dmic.txt | 2 + + .../devicetree/bindings/sound/fsl-asoc-card.txt | 1 - + .../devicetree/bindings/sound/imx-audio-wm8962.txt | 53 - + .../devicetree/bindings/sound/max98090.txt | 2 + + .../devicetree/bindings/sound/maxim,max9759.txt | 18 + + .../devicetree/bindings/sound/mt2701-afe-pcm.txt | 2 +- + .../devicetree/bindings/sound/pcm1789.txt | 22 + + .../devicetree/bindings/sound/renesas,rsnd.txt | 1 + + .../bindings/sound/rockchip,rk3288-hdmi-analog.txt | 2 +- + .../devicetree/bindings/sound/rohm,bd28623.txt | 29 + + Documentation/devicetree/bindings/sound/rt5651.txt | 17 + + Documentation/devicetree/bindings/sound/rt5665.txt | 4 +- + .../devicetree/bindings/sound/samsung,odroid.txt | 8 +- + .../bindings/sound/samsung,tm2-audio.txt | 14 +- + .../devicetree/bindings/sound/samsung-i2s.txt | 22 +- + .../devicetree/bindings/sound/sgtl5000.txt | 3 + + Documentation/devicetree/bindings/sound/snow.txt | 13 +- + .../devicetree/bindings/sound/st,stm32-sai.txt | 6 + + .../devicetree/bindings/sound/tda7419.txt | 38 + + .../devicetree/bindings/sound/uniphier,aio.txt | 45 + + Documentation/devicetree/bindings/sound/wm8524.txt | 2 +- + .../devicetree/bindings/usb/amlogic,dwc3.txt | 42 + + Documentation/devicetree/bindings/usb/dwc3.txt | 16 + + .../devicetree/bindings/usb/mediatek,mtk-xhci.txt | 5 +- + .../devicetree/bindings/usb/mediatek,mtu3.txt | 5 +- + Documentation/devicetree/bindings/usb/usb-ehci.txt | 6 +- + Documentation/devicetree/bindings/usb/usb-hcd.txt | 9 + + Documentation/devicetree/bindings/usb/usb-ohci.txt | 6 +- + Documentation/devicetree/bindings/usb/usb-uhci.txt | 3 + + Documentation/devicetree/bindings/usb/usb-xhci.txt | 5 + + Documentation/driver-api/device_connection.rst | 43 + + .../driver-api/firmware/fallback-mechanisms.rst | 2 +- + .../driver-api/firmware/request_firmware.rst | 14 + + .../{gpio/board.txt => driver-api/gpio/board.rst} | 39 +- + .../consumer.txt => driver-api/gpio/consumer.rst} | 85 +- + .../driver.txt => driver-api/gpio/driver.rst} | 80 +- + .../gpio/drivers-on-gpio.rst} | 1 + + .../driver-api/{gpio.rst => gpio/index.rst} | 21 +- + .../{gpio/gpio.txt => driver-api/gpio/intro.rst} | 9 +- + .../gpio-legacy.txt => driver-api/gpio/legacy.rst} | 68 +- + Documentation/driver-api/index.rst | 2 +- + Documentation/driver-api/scsi.rst | 6 - + Documentation/driver-api/uio-howto.rst | 5 + + Documentation/driver-api/usb/typec.rst | 73 +- + Documentation/fault-injection/fault-injection.txt | 8 + + .../fault-injection/nvme-fault-injection.txt | 116 + + Documentation/gpio/00-INDEX | 13 - + Documentation/gpio/sysfs.txt | 5 +- + Documentation/input/devices/pxrc.rst | 57 + + Documentation/networking/dpaa2/index.rst | 8 + + .../networking/dpaa2}/overview.rst | 0 + Documentation/networking/index.rst | 1 + + Documentation/networking/irda.txt | 10 - + Documentation/scsi/ChangeLog.1992-1997 | 2023 --------- + Documentation/scsi/Mylex.txt | 5 - + Documentation/scsi/scsi-parameters.txt | 14 - + Documentation/scsi/scsi_mid_low_api.txt | 122 +- + Documentation/scsi/sd-parameters.txt | 22 + + Documentation/scsi/tmscsim.txt | 443 -- + Documentation/x86/00-INDEX | 4 +- + MAINTAINERS | 80 +- + arch/arm/boot/dts/bcm2835-rpi.dtsi | 6 + + arch/arm/boot/dts/stih407-b2120.dts | 4 +- + arch/arm/boot/dts/stih410-b2120.dts | 4 +- + arch/arm/boot/dts/stih410-b2260.dts | 4 +- + arch/arm/boot/dts/stih418-b2199.dts | 4 +- + arch/arm/crypto/Kconfig | 6 + + arch/arm/crypto/Makefile | 4 + + arch/arm/crypto/aes-cipher-core.S | 19 +- + arch/arm/crypto/speck-neon-core.S | 432 ++ + arch/arm/crypto/speck-neon-glue.c | 288 ++ + arch/arm64/Kconfig | 47 +- + arch/arm64/Makefile | 15 +- + arch/arm64/crypto/Kconfig | 6 + + arch/arm64/crypto/Makefile | 8 +- + arch/arm64/crypto/aes-ce-ccm-glue.c | 47 +- + arch/arm64/crypto/aes-glue.c | 95 +- + arch/arm64/crypto/aes-modes.S | 355 +- + arch/arm64/crypto/aes-neonbs-glue.c | 48 +- + arch/arm64/crypto/chacha20-neon-glue.c | 12 +- + arch/arm64/crypto/sha256-glue.c | 36 +- + arch/arm64/crypto/speck-neon-core.S | 352 ++ + arch/arm64/crypto/speck-neon-glue.c | 282 ++ + arch/arm64/include/asm/assembler.h | 34 +- + arch/arm64/include/asm/cache.h | 4 + + arch/arm64/include/asm/cacheflush.h | 3 + + arch/arm64/include/asm/cmpxchg.h | 29 +- + arch/arm64/include/asm/cpucaps.h | 6 +- + arch/arm64/include/asm/cpufeature.h | 262 +- + arch/arm64/include/asm/cputype.h | 43 + + arch/arm64/include/asm/esr.h | 9 + + arch/arm64/include/asm/fpsimd.h | 34 +- + arch/arm64/include/asm/lse.h | 3 + + arch/arm64/include/asm/module.h | 2 + + arch/arm64/include/asm/percpu.h | 29 + + arch/arm64/include/asm/pgtable-hwdef.h | 1 + + arch/arm64/include/asm/processor.h | 47 +- + arch/arm64/include/asm/sysreg.h | 3 + + arch/arm64/include/asm/system_misc.h | 11 - + arch/arm64/include/asm/tlbflush.h | 25 +- + arch/arm64/include/asm/traps.h | 8 +- + arch/arm64/include/asm/virt.h | 6 - + arch/arm64/include/uapi/asm/hwcap.h | 4 + + arch/arm64/include/uapi/asm/siginfo.h | 21 - + arch/arm64/kernel/armv8_deprecated.c | 2 +- + arch/arm64/kernel/cpu_errata.c | 316 +- + arch/arm64/kernel/cpufeature.c | 438 +- + arch/arm64/kernel/cpuinfo.c | 4 + + arch/arm64/kernel/debug-monitors.c | 3 +- + arch/arm64/kernel/fpsimd.c | 105 +- + arch/arm64/kernel/kaslr.c | 35 +- + arch/arm64/kernel/kgdb.c | 21 +- + arch/arm64/kernel/module-plts.c | 90 +- + arch/arm64/kernel/module.c | 44 +- + arch/arm64/kernel/process.c | 6 +- + arch/arm64/kernel/ptrace.c | 32 +- + arch/arm64/kernel/reloc_test_core.c | 4 +- + arch/arm64/kernel/reloc_test_syms.S | 12 +- + arch/arm64/kernel/signal.c | 9 +- + arch/arm64/kernel/signal32.c | 15 +- + arch/arm64/kernel/smp.c | 44 - + arch/arm64/kernel/sys_compat.c | 23 +- + arch/arm64/kernel/traps.c | 76 +- + arch/arm64/lib/Makefile | 3 +- + arch/arm64/mm/cache.S | 21 +- + arch/arm64/mm/fault.c | 236 +- + arch/arm64/mm/proc.S | 22 +- + arch/mips/Kconfig | 1 + + arch/powerpc/configs/c2k_defconfig | 1 - + arch/riscv/Kconfig | 12 +- + arch/riscv/Makefile | 8 + + arch/riscv/configs/defconfig | 2 + + arch/riscv/include/asm/atomic.h | 417 +- + arch/riscv/include/asm/barrier.h | 15 + + arch/riscv/include/asm/cmpxchg.h | 391 +- + arch/riscv/include/asm/fence.h | 12 + + arch/riscv/include/asm/ftrace.h | 56 + + arch/riscv/include/asm/module.h | 113 + + arch/riscv/include/asm/spinlock.h | 29 +- + arch/riscv/include/uapi/asm/elf.h | 7 + + arch/riscv/kernel/Makefile | 6 +- + arch/riscv/kernel/ftrace.c | 175 +- + arch/riscv/kernel/mcount-dyn.S | 239 + + arch/riscv/kernel/mcount.S | 22 +- + arch/riscv/kernel/module-sections.c | 156 + + arch/riscv/kernel/module.c | 179 +- + arch/riscv/kernel/module.lds | 8 + + arch/riscv/kernel/stacktrace.c | 6 + + arch/x86/Kconfig | 12 +- + arch/x86/crypto/aesni-intel_asm.S | 1414 +++--- + arch/x86/crypto/aesni-intel_glue.c | 230 +- + arch/x86/crypto/blowfish_glue.c | 230 +- + arch/x86/crypto/camellia_aesni_avx2_glue.c | 491 +- + arch/x86/crypto/camellia_aesni_avx_glue.c | 495 +- + arch/x86/crypto/camellia_glue.c | 356 +- + arch/x86/crypto/cast5_avx_glue.c | 352 +- + arch/x86/crypto/cast6_avx_glue.c | 489 +- + arch/x86/crypto/des3_ede_glue.c | 238 +- + arch/x86/crypto/glue_helper.c | 391 +- + arch/x86/crypto/serpent_avx2_glue.c | 478 +- + arch/x86/crypto/serpent_avx_glue.c | 518 +-- + arch/x86/crypto/serpent_sse2_glue.c | 519 +-- + arch/x86/crypto/sha1-mb/sha1_mb.c | 28 +- + arch/x86/crypto/sha1-mb/sha1_mb_ctx.h | 8 +- + arch/x86/crypto/sha256-mb/sha256_mb.c | 27 +- + arch/x86/crypto/sha256-mb/sha256_mb_ctx.h | 8 +- + arch/x86/crypto/sha512-mb/sha512_mb.c | 30 +- + arch/x86/crypto/sha512-mb/sha512_mb_ctx.h | 8 +- + arch/x86/crypto/twofish_avx_glue.c | 493 +- + arch/x86/crypto/twofish_glue_3way.c | 339 +- + arch/x86/entry/entry_32.S | 3 + + arch/x86/entry/entry_64.S | 3 + + arch/x86/include/asm/atomic64_32.h | 2 +- + arch/x86/include/asm/crypto/camellia.h | 16 +- + arch/x86/include/asm/crypto/glue_helper.h | 75 +- + arch/x86/include/asm/crypto/serpent-avx.h | 17 +- + arch/x86/include/asm/crypto/twofish.h | 19 - + arch/x86/include/asm/hardirq.h | 1 + + arch/x86/include/asm/irq_vectors.h | 3 +- + arch/x86/include/asm/mshyperv.h | 13 + + arch/x86/include/asm/platform_sst_audio.h | 1 + + arch/x86/include/uapi/asm/hyperv.h | 3 + + arch/x86/kernel/cpu/microcode/amd.c | 2 +- + arch/x86/kernel/cpu/mshyperv.c | 40 + + arch/x86/kernel/irq.c | 7 + + arch/x86/kernel/signal_compat.c | 2 +- + arch/xtensa/platforms/iss/simdisk.c | 1 - + block/bfq-iosched.c | 25 +- + block/bfq-iosched.h | 2 +- + block/bio.c | 4 +- + block/blk-cgroup.c | 78 +- + block/blk-core.c | 250 +- + block/blk-mq-debugfs.c | 150 +- + block/blk-mq-pci.c | 6 +- + block/blk-mq.c | 20 +- + block/blk-settings.c | 6 +- + block/blk-stat.c | 6 +- + block/blk-sysfs.c | 29 +- + block/blk-timeout.c | 8 +- + block/blk-zoned.c | 4 +- + block/blk.h | 69 + + block/bsg-lib.c | 165 +- + block/bsg.c | 262 +- + block/genhd.c | 19 +- + block/sed-opal.c | 37 +- + crypto/Kconfig | 129 +- + crypto/Makefile | 4 +- + crypto/ablk_helper.c | 150 - + crypto/ahash.c | 25 +- + crypto/algapi.c | 8 - + crypto/api.c | 34 +- + crypto/cfb.c | 353 ++ + crypto/crypto_engine.c | 301 +- + crypto/crypto_user.c | 2 +- + crypto/ecc.c | 23 +- + crypto/ecdh.c | 23 +- + crypto/internal.h | 1 - + crypto/lrw.c | 154 +- + crypto/mcryptd.c | 34 +- + crypto/md4.c | 17 - + crypto/md5.c | 17 - + crypto/rsa-pkcs1pad.c | 2 +- + crypto/simd.c | 50 + + crypto/sm4_generic.c | 244 + + crypto/speck.c | 307 ++ + crypto/tcrypt.c | 3 + + crypto/testmgr.c | 45 + + crypto/testmgr.h | 4766 ++++++++++++++------ + crypto/xts.c | 72 - + drivers/Kconfig | 4 +- + drivers/acpi/arm64/iort.c | 12 - + drivers/acpi/custom_method.c | 2 +- + drivers/acpi/fan.c | 2 +- + drivers/acpi/nfit/core.c | 27 + + drivers/base/Makefile | 5 +- + drivers/base/arch_topology.c | 12 +- + drivers/base/cpu.c | 4 +- + drivers/base/dd.c | 3 +- + drivers/base/devcon.c | 136 + + drivers/base/firmware_loader/Makefile | 7 + + drivers/base/firmware_loader/fallback.c | 675 +++ + drivers/base/firmware_loader/fallback.h | 67 + + drivers/base/firmware_loader/fallback_table.c | 55 + + drivers/base/firmware_loader/firmware.h | 115 + + .../{firmware_class.c => firmware_loader/main.c} | 833 +--- + drivers/base/node.c | 4 +- + drivers/base/platform.c | 4 +- + drivers/base/soc.c | 2 + + drivers/block/brd.c | 1 - + drivers/block/drbd/drbd_main.c | 3 +- + drivers/block/drbd/drbd_nl.c | 4 +- + drivers/block/loop.c | 77 +- + drivers/block/mtip32xx/mtip32xx.c | 8 +- + drivers/block/nbd.c | 8 +- + drivers/block/null_blk.c | 124 +- + drivers/block/paride/pcd.c | 2 + + drivers/block/rbd.c | 13 +- + drivers/block/rsxx/dev.c | 6 +- + drivers/block/skd_main.c | 4 +- + drivers/block/umem.c | 7 +- + drivers/block/xen-blkfront.c | 10 +- + drivers/block/zram/zram_drv.c | 8 +- + drivers/block/zram/zram_drv.h | 1 - + drivers/bus/Kconfig | 2 + + drivers/bus/Makefile | 4 + + drivers/bus/fsl-mc/Kconfig | 16 + + drivers/bus/fsl-mc/Makefile | 18 + + drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp.c | 85 +- + drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpcon.c | 20 +- + drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.c | 8 +- + .../fsl-mc/bus => bus/fsl-mc}/dprc-driver.c | 2 +- + drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc.c | 31 +- + .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-allocator.c | 7 +- + .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-bus.c | 2 +- + .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-msi.c | 1 + + .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-private.h | 91 +- + drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-io.c | 2 +- + .../{staging/fsl-mc/bus => bus/fsl-mc}/mc-sys.c | 22 +- + drivers/cdrom/cdrom.c | 3 - + drivers/cdrom/gdrom.c | 3 + + drivers/char/Kconfig | 2 +- + drivers/char/hw_random/Kconfig | 7 + + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/bcm2835-rng.c | 2 + + drivers/char/hw_random/cavium-rng-vf.c | 2 +- + drivers/char/hw_random/cavium-rng.c | 2 +- + drivers/char/hw_random/imx-rngc.c | 2 +- + drivers/char/hw_random/ks-sa-rng.c | 257 ++ + drivers/char/hw_random/mxc-rnga.c | 23 +- + drivers/char/hw_random/omap-rng.c | 22 +- + drivers/char/hw_random/stm32-rng.c | 44 +- + drivers/char/mem.c | 6 +- + drivers/char/tpm/tpm_tis_core.h | 8 +- + drivers/char/xillybus/xillybus_pcie.c | 1 - + drivers/crypto/Kconfig | 34 +- + drivers/crypto/Makefile | 2 +- + drivers/crypto/atmel-aes.c | 8 +- + drivers/crypto/atmel-sha.c | 9 +- + drivers/crypto/atmel-tdes.c | 9 +- + drivers/crypto/bcm/cipher.c | 4 +- + drivers/crypto/bcm/util.c | 1 - + drivers/crypto/bfin_crc.c | 743 --- + drivers/crypto/bfin_crc.h | 124 - + drivers/crypto/caam/caamalg.c | 21 +- + drivers/crypto/caam/caamalg_desc.c | 165 +- + drivers/crypto/caam/caamalg_desc.h | 24 +- + drivers/crypto/caam/caamalg_qi.c | 388 +- + drivers/crypto/caam/ctrl.c | 42 +- + drivers/crypto/caam/qi.c | 11 +- + drivers/crypto/cavium/cpt/cptpf_main.c | 2 +- + drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 2 +- + drivers/crypto/ccp/ccp-crypto-rsa.c | 7 +- + drivers/crypto/ccp/ccp-crypto-sha.c | 2 +- + drivers/crypto/ccp/ccp-debugfs.c | 7 +- + drivers/crypto/ccp/ccp-dmaengine.c | 2 +- + drivers/crypto/ccp/ccp-ops.c | 108 +- + drivers/crypto/ccp/psp-dev.c | 15 +- + drivers/crypto/ccp/sp-dev.c | 6 +- + drivers/{staging => crypto}/ccree/Makefile | 0 + drivers/{staging => crypto}/ccree/cc_aead.c | 81 +- + drivers/{staging => crypto}/ccree/cc_aead.h | 0 + drivers/{staging => crypto}/ccree/cc_buffer_mgr.c | 28 +- + drivers/{staging => crypto}/ccree/cc_buffer_mgr.h | 15 +- + drivers/{staging => crypto}/ccree/cc_cipher.c | 400 +- + drivers/{staging => crypto}/ccree/cc_cipher.h | 25 +- + drivers/{staging => crypto}/ccree/cc_crypto_ctx.h | 37 - + drivers/{staging => crypto}/ccree/cc_debugfs.c | 0 + drivers/{staging => crypto}/ccree/cc_debugfs.h | 0 + drivers/{staging => crypto}/ccree/cc_driver.c | 96 +- + drivers/{staging => crypto}/ccree/cc_driver.h | 38 +- + drivers/{staging => crypto}/ccree/cc_fips.c | 13 +- + drivers/{staging => crypto}/ccree/cc_fips.h | 1 - + drivers/{staging => crypto}/ccree/cc_hash.c | 205 +- + drivers/{staging => crypto}/ccree/cc_hash.h | 13 +- + drivers/{staging => crypto}/ccree/cc_host_regs.h | 3 + + .../{staging => crypto}/ccree/cc_hw_queue_defs.h | 30 +- + drivers/{staging => crypto}/ccree/cc_ivgen.c | 7 +- + drivers/{staging => crypto}/ccree/cc_ivgen.h | 0 + drivers/{staging => crypto}/ccree/cc_kernel_regs.h | 1 + + drivers/{staging => crypto}/ccree/cc_lli_defs.h | 0 + drivers/{staging => crypto}/ccree/cc_pm.c | 0 + drivers/{staging => crypto}/ccree/cc_pm.h | 1 - + drivers/{staging => crypto}/ccree/cc_request_mgr.c | 12 +- + drivers/{staging => crypto}/ccree/cc_request_mgr.h | 0 + drivers/{staging => crypto}/ccree/cc_sram_mgr.c | 15 +- + drivers/{staging => crypto}/ccree/cc_sram_mgr.h | 0 + drivers/crypto/chelsio/chcr_algo.c | 577 ++- + drivers/crypto/chelsio/chcr_algo.h | 11 +- + drivers/crypto/chelsio/chcr_core.h | 6 +- + drivers/crypto/chelsio/chcr_crypto.h | 31 +- + drivers/crypto/chelsio/chcr_ipsec.c | 5 +- + drivers/crypto/inside-secure/safexcel.c | 114 +- + drivers/crypto/inside-secure/safexcel.h | 22 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 5 +- + drivers/crypto/inside-secure/safexcel_hash.c | 258 +- + drivers/crypto/ixp4xx_crypto.c | 2 + + drivers/crypto/marvell/cesa.c | 1 - + drivers/crypto/mxs-dcp.c | 14 + + drivers/crypto/n2_core.c | 12 + + drivers/crypto/nx/nx-842-pseries.c | 5 +- + drivers/crypto/omap-aes.c | 112 +- + drivers/crypto/omap-aes.h | 3 + + drivers/crypto/omap-crypto.c | 4 + + drivers/crypto/omap-des.c | 24 +- + drivers/crypto/omap-sham.c | 106 +- + drivers/crypto/picoxcell_crypto.c | 2 + + drivers/crypto/qat/qat_common/qat_algs.c | 3 + + drivers/crypto/qat/qat_common/qat_asym_algs.c | 9 +- + drivers/crypto/s5p-sss.c | 34 +- + drivers/crypto/sahara.c | 6 +- + drivers/crypto/stm32/stm32-cryp.c | 964 +++- + drivers/crypto/stm32/stm32-hash.c | 41 +- + drivers/crypto/sunxi-ss/sun4i-ss-core.c | 1 + + drivers/crypto/talitos.c | 218 +- + drivers/crypto/ux500/cryp/cryp_core.c | 14 +- + drivers/crypto/ux500/hash/hash_core.c | 18 + + drivers/crypto/virtio/Kconfig | 1 - + drivers/crypto/virtio/virtio_crypto_algs.c | 16 +- + drivers/crypto/virtio/virtio_crypto_common.h | 4 +- + drivers/crypto/virtio/virtio_crypto_core.c | 3 - + drivers/edac/Kconfig | 7 +- + drivers/edac/edac_mc.c | 41 +- + drivers/edac/edac_mc_sysfs.c | 26 +- + drivers/edac/sb_edac.c | 12 +- + drivers/edac/skx_edac.c | 67 +- + drivers/extcon/Kconfig | 3 +- + drivers/extcon/extcon-axp288.c | 176 +- + drivers/extcon/extcon-gpio.c | 103 +- + drivers/extcon/extcon-intel-cht-wc.c | 11 +- + drivers/extcon/extcon-intel-int3496.c | 9 +- + drivers/extcon/extcon.c | 44 +- + drivers/firmware/dmi_scan.c | 31 + + drivers/firmware/edd.c | 8 +- + drivers/fmc/fmc-core.c | 2 +- + drivers/fpga/altera-cvp.c | 2 - + drivers/fsi/Kconfig | 1 + + drivers/fsi/fsi-core.c | 129 +- + drivers/fsi/fsi-master-gpio.c | 89 +- + drivers/fsi/fsi-master-hub.c | 27 +- + drivers/fsi/fsi-master.h | 17 + + drivers/gpio/Kconfig | 75 +- + drivers/gpio/Makefile | 7 +- + drivers/gpio/gpio-104-dio-48e.c | 47 + + drivers/gpio/gpio-104-idi-48.c | 47 + + drivers/gpio/gpio-104-idio-16.c | 15 + + drivers/gpio/gpio-ath79.c | 2 + + drivers/gpio/gpio-davinci.c | 6 + + drivers/gpio/gpio-dln2.c | 7 +- + drivers/gpio/gpio-dwapb.c | 81 +- + drivers/gpio/gpio-eic-sprd.c | 606 +++ + drivers/gpio/gpio-em.c | 2 +- + drivers/gpio/gpio-ftgpio010.c | 7 +- + drivers/gpio/gpio-ge.c | 1 - + drivers/gpio/gpio-gpio-mm.c | 47 + + drivers/gpio/gpio-grgpio.c | 3 +- + drivers/gpio/gpio-hlwd.c | 115 + + drivers/gpio/gpio-htc-egpio.c | 1 + + drivers/gpio/gpio-ich.c | 21 +- + drivers/gpio/gpio-intel-mid.c | 4 +- + drivers/gpio/gpio-it87.c | 2 +- + drivers/gpio/gpio-janz-ttl.c | 15 +- + drivers/gpio/gpio-kempld.c | 2 +- + drivers/gpio/gpio-ks8695.c | 2 +- + drivers/gpio/gpio-max3191x.c | 7 +- + drivers/gpio/gpio-merrifield.c | 4 +- + drivers/gpio/gpio-ml-ioh.c | 1 - + drivers/gpio/gpio-mockup.c | 6 +- + drivers/gpio/gpio-omap.c | 6 +- + drivers/gpio/gpio-pca953x.c | 4 + + drivers/gpio/gpio-pci-idio-16.c | 50 + + drivers/gpio/gpio-pcie-idio-24.c | 117 + + drivers/gpio/gpio-pmic-eic-sprd.c | 330 ++ + drivers/gpio/gpio-raspberrypi-exp.c | 252 ++ + drivers/gpio/gpio-rcar.c | 60 +- + drivers/gpio/gpio-sprd.c | 290 ++ + drivers/gpio/gpio-tegra.c | 16 +- + drivers/gpio/gpio-timberdale.c | 7 +- + drivers/gpio/gpio-tps68470.c | 10 +- + drivers/gpio/gpio-tz1090-pdc.c | 231 - + drivers/gpio/gpio-tz1090.c | 602 --- + drivers/gpio/gpio-wm831x.c | 2 +- + drivers/gpio/gpio-ws16c48.c | 47 + + drivers/gpio/gpio-xra1403.c | 8 +- + drivers/gpio/gpiolib-of.c | 24 + + drivers/gpio/gpiolib.c | 68 +- + drivers/gpio/gpiolib.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 97 +- + drivers/gpu/drm/drm_color_mgmt.c | 4 +- + drivers/gpu/drm/i915/intel_cdclk.c | 4 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 47 +- + drivers/hid/Kconfig | 20 +- + drivers/hid/Makefile | 2 + + drivers/hid/hid-asus.c | 7 +- + drivers/hid/hid-core.c | 47 +- + drivers/hid/hid-corsair.c | 24 +- + drivers/hid/hid-elan.c | 421 ++ + drivers/hid/hid-elecom.c | 32 +- + drivers/hid/hid-generic.c | 33 - + drivers/hid/hid-google-hammer.c | 138 + + drivers/hid/hid-ids.h | 21 +- + drivers/hid/hid-input.c | 13 +- + drivers/hid/hid-multitouch.c | 68 +- + drivers/hid/hid-ntrig.c | 12 +- + drivers/hid/hid-quirks.c | 20 +- + drivers/hid/hid-rmi.c | 4 +- + drivers/hid/hid-sony.c | 131 +- + drivers/hid/hid-uclogic.c | 1 - + drivers/hid/i2c-hid/i2c-hid.c | 17 +- + drivers/hid/uhid.c | 12 +- + drivers/hid/usbhid/hid-core.c | 12 +- + drivers/hid/wacom_sys.c | 4 +- + drivers/hid/wacom_wac.c | 223 +- + drivers/hid/wacom_wac.h | 4 +- + drivers/hv/Kconfig | 2 + + drivers/hv/Makefile | 1 + + drivers/hv/channel_mgmt.c | 8 +- + drivers/hv/hv.c | 64 +- + drivers/hv/hv_balloon.c | 121 +- + drivers/hv/hv_trace.c | 2 + + drivers/hv/hv_trace.h | 2 + + drivers/hv/hv_trace_balloon.h | 48 + + drivers/hv/hyperv_vmbus.h | 4 +- + drivers/hwtracing/Kconfig | 7 + + drivers/hwtracing/coresight/coresight-cpu-debug.c | 2 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 4 +- + drivers/hwtracing/intel_th/Kconfig | 12 + + drivers/hwtracing/intel_th/Makefile | 3 + + drivers/hwtracing/intel_th/acpi.c | 79 + + drivers/hwtracing/intel_th/core.c | 31 +- + drivers/hwtracing/intel_th/debug.c | 10 +- + drivers/hwtracing/intel_th/debug.h | 10 +- + drivers/hwtracing/intel_th/gth.c | 10 +- + drivers/hwtracing/intel_th/gth.h | 10 +- + drivers/hwtracing/intel_th/intel_th.h | 14 +- + drivers/hwtracing/intel_th/msu.c | 10 +- + drivers/hwtracing/intel_th/msu.h | 10 +- + drivers/hwtracing/intel_th/pci.c | 10 +- + drivers/hwtracing/intel_th/pti.c | 10 +- + drivers/hwtracing/intel_th/pti.h | 10 +- + drivers/hwtracing/intel_th/sth.c | 10 +- + drivers/hwtracing/intel_th/sth.h | 10 +- + drivers/hwtracing/stm/console.c | 10 +- + drivers/hwtracing/stm/core.c | 10 +- + drivers/hwtracing/stm/dummy_stm.c | 34 +- + drivers/hwtracing/stm/heartbeat.c | 10 +- + drivers/hwtracing/stm/policy.c | 10 +- + drivers/hwtracing/stm/stm.h | 10 +- + drivers/ide/ide-cd.c | 10 +- + drivers/ide/ide-cd.h | 6 +- + drivers/ide/ide-disk.c | 4 +- + drivers/ide/ide-probe.c | 4 +- + drivers/iio/accel/bmc150-accel-core.c | 6 +- + drivers/iio/accel/hid-sensor-accel-3d.c | 2 +- + drivers/iio/accel/st_accel_i2c.c | 3 +- + drivers/iio/adc/Kconfig | 6 +- + drivers/iio/adc/ad7476.c | 26 +- + drivers/iio/adc/axp20x_adc.c | 168 +- + drivers/iio/adc/ep93xx_adc.c | 4 - + drivers/iio/adc/ti-adc161s626.c | 16 +- + drivers/iio/chemical/ams-iaq-core.c | 17 +- + drivers/iio/chemical/atlas-ph-sensor.c | 16 +- + drivers/iio/chemical/ccs811.c | 10 +- + drivers/iio/chemical/vz89x.c | 17 +- + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 1 + + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 49 + + .../common/cros_ec_sensors/cros_ec_sensors_core.h | 2 + + drivers/iio/counter/Kconfig | 3 +- + drivers/iio/dac/Kconfig | 3 +- + drivers/iio/dac/ad5380.c | 2 +- + drivers/iio/dac/ad5764.c | 2 +- + drivers/iio/dummy/Kconfig | 27 +- + drivers/iio/gyro/hid-sensor-gyro-3d.c | 2 +- + drivers/iio/health/max30100.c | 16 +- + drivers/iio/humidity/Kconfig | 2 + + drivers/iio/humidity/dht11.c | 2 +- + drivers/iio/humidity/hdc100x.c | 16 +- + drivers/iio/humidity/hts221.h | 21 +- + drivers/iio/humidity/hts221_buffer.c | 39 +- + drivers/iio/humidity/hts221_core.c | 132 +- + drivers/iio/humidity/hts221_i2c.c | 64 +- + drivers/iio/humidity/hts221_spi.c | 81 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 29 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 161 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 104 +- + drivers/iio/light/Kconfig | 10 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/apds9960.c | 16 +- + drivers/iio/light/cros_ec_light_prox.c | 1 + + drivers/iio/light/hid-sensor-als.c | 2 +- + drivers/iio/light/lm3533-als.c | 2 +- + drivers/iio/light/lv0104cs.c | 531 +++ + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 2 +- + drivers/iio/potentiometer/Kconfig | 21 + + drivers/iio/potentiometer/Makefile | 2 + + drivers/iio/potentiometer/ad5272.c | 231 + + drivers/iio/potentiometer/ds1803.c | 2 +- + drivers/iio/potentiometer/mcp4018.c | 194 + + drivers/iio/potentiometer/tpl0102.c | 16 +- + drivers/iio/potentiostat/lmp91000.c | 16 +- + drivers/iio/pressure/ms5611.h | 2 +- + drivers/iio/proximity/as3935.c | 17 +- + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 16 +- + drivers/iio/proximity/sx9500.c | 25 +- + drivers/iio/temperature/Kconfig | 12 + + drivers/iio/temperature/Makefile | 1 + + drivers/iio/temperature/maxim_thermocouple.c | 16 +- + drivers/iio/temperature/mlx90632.c | 752 +++ + drivers/input/joystick/Kconfig | 10 + + drivers/input/joystick/Makefile | 1 + + drivers/input/joystick/analog.c | 2 +- + drivers/input/joystick/pxrc.c | 303 ++ + drivers/input/joystick/xpad.c | 9 +- + drivers/input/keyboard/gpio_keys.c | 145 +- + drivers/input/keyboard/stmpe-keypad.c | 16 +- + drivers/input/misc/Kconfig | 9 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/rave-sp-pwrbutton.c | 94 + + drivers/input/mouse/alps.c | 64 +- + drivers/input/mouse/appletouch.c | 6 +- + drivers/input/mouse/elantech.c | 40 +- + drivers/input/mouse/lifebook.c | 62 +- + drivers/input/mouse/logips2pp.c | 152 +- + drivers/input/mouse/psmouse-base.c | 189 +- + drivers/input/mouse/psmouse.h | 5 +- + drivers/input/mouse/sentelic.c | 11 +- + drivers/input/mouse/synaptics.c | 90 +- + drivers/input/mouse/synaptics_usb.c | 31 +- + drivers/input/mouse/trackpoint.c | 60 +- + drivers/input/serio/i8042-x86ia64io.h | 24 + + drivers/input/serio/libps2.c | 322 +- + drivers/input/tablet/pegasus_notetaker.c | 32 +- + drivers/input/touchscreen/s6sy761.c | 2 +- + drivers/input/touchscreen/silead.c | 1 + + drivers/input/touchscreen/stmfts.c | 4 +- + drivers/input/touchscreen/usbtouchscreen.c | 24 +- + drivers/irqchip/Kconfig | 6 + + drivers/irqchip/Makefile | 1 + + .../bus => irqchip}/irq-gic-v3-its-fsl-mc-msi.c | 4 +- + drivers/lightnvm/core.c | 240 +- + drivers/lightnvm/pblk-cache.c | 4 + + drivers/lightnvm/pblk-core.c | 202 +- + drivers/lightnvm/pblk-gc.c | 12 +- + drivers/lightnvm/pblk-init.c | 820 ++-- + drivers/lightnvm/pblk-map.c | 6 +- + drivers/lightnvm/pblk-rb.c | 21 +- + drivers/lightnvm/pblk-read.c | 2 +- + drivers/lightnvm/pblk-recovery.c | 91 +- + drivers/lightnvm/pblk-rl.c | 2 +- + drivers/lightnvm/pblk-sysfs.c | 235 +- + drivers/lightnvm/pblk-write.c | 2 +- + drivers/lightnvm/pblk.h | 304 +- + drivers/mcb/mcb-pci.c | 1 + + drivers/md/bcache/alloc.c | 3 +- + drivers/md/bcache/bcache.h | 57 +- + drivers/md/bcache/bset.c | 4 +- + drivers/md/bcache/bset.h | 5 +- + drivers/md/bcache/btree.c | 26 +- + drivers/md/bcache/closure.c | 17 +- + drivers/md/bcache/closure.h | 5 +- + drivers/md/bcache/debug.c | 14 +- + drivers/md/bcache/extents.c | 2 - + drivers/md/bcache/io.c | 16 +- + drivers/md/bcache/journal.c | 8 +- + drivers/md/bcache/request.c | 186 +- + drivers/md/bcache/super.c | 160 +- + drivers/md/bcache/sysfs.c | 55 +- + drivers/md/bcache/util.c | 25 +- + drivers/md/bcache/util.h | 6 - + drivers/md/bcache/writeback.c | 92 +- + drivers/md/bcache/writeback.h | 4 +- + drivers/md/dm-table.c | 16 +- + drivers/md/dm.c | 2 +- + drivers/md/md-linear.c | 4 +- + drivers/md/md.c | 10 +- + drivers/md/raid0.c | 4 +- + drivers/md/raid1.c | 6 +- + drivers/md/raid10.c | 6 +- + drivers/md/raid5.c | 4 +- + drivers/media/i2c/msp3400-kthreads.c | 2 +- + drivers/message/fusion/mptsas.c | 2 +- + drivers/misc/Kconfig | 1 - + drivers/misc/Makefile | 20 +- + drivers/misc/aspeed-lpc-ctrl.c | 44 +- + drivers/misc/cardreader/rts5260.c | 12 +- + drivers/misc/cardreader/rtsx_pcr.c | 4 +- + drivers/misc/eeprom/at24.c | 293 +- + drivers/misc/eeprom/at25.c | 2 +- + drivers/misc/genwqe/card_utils.c | 4 +- + drivers/misc/lkdtm/Makefile | 20 + + drivers/misc/{lkdtm_bugs.c => lkdtm/bugs.c} | 0 + drivers/misc/{lkdtm_core.c => lkdtm/core.c} | 0 + drivers/misc/{lkdtm_heap.c => lkdtm/heap.c} | 0 + drivers/misc/{ => lkdtm}/lkdtm.h | 0 + drivers/misc/{lkdtm_perms.c => lkdtm/perms.c} | 0 + .../misc/{lkdtm_refcount.c => lkdtm/refcount.c} | 1 + + drivers/misc/{lkdtm_rodata.c => lkdtm/rodata.c} | 0 + .../misc/{lkdtm_usercopy.c => lkdtm/usercopy.c} | 0 + drivers/misc/mei/bus.c | 83 +- + drivers/misc/mei/client.c | 87 +- + drivers/misc/mei/debugfs.c | 7 +- + drivers/misc/mei/init.c | 1 + + drivers/misc/mei/main.c | 66 +- + drivers/misc/mei/mei_dev.h | 10 +- + drivers/misc/mic/bus/vop_bus.c | 6 +- + drivers/misc/ocxl/pci.c | 2 +- + drivers/mmc/core/block.c | 2 +- + drivers/mmc/core/queue.c | 8 +- + drivers/mtd/mtd_blkdevs.c | 6 +- + drivers/net/dsa/b53/b53_mmap.c | 33 +- + drivers/net/dsa/mt7530.c | 6 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 11 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 11 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 4 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 2 +- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 16 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 9 +- + .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_int.c | 2 +- + drivers/net/ethernet/sfc/ef10.c | 2 - + drivers/net/ethernet/sfc/nic.h | 1 - + drivers/net/ethernet/ti/tlan.c | 2 +- + drivers/net/netdevsim/devlink.c | 2 +- + drivers/net/netdevsim/fib.c | 2 +- + drivers/net/phy/marvell10g.c | 184 +- + drivers/net/ppp/pptp.c | 1 - + drivers/net/usb/lan78xx.c | 34 +- + drivers/net/wireless/ath/ath9k/xmit.c | 2 +- + drivers/net/wireless/atmel/atmel.c | 2 +- + drivers/net/wireless/mediatek/mt7601u/mcu.c | 2 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 +- + drivers/nvdimm/blk.c | 2 +- + drivers/nvdimm/btt.c | 2 +- + drivers/nvdimm/nd.h | 1 - + drivers/nvdimm/pmem.c | 6 +- + drivers/nvme/host/Makefile | 1 + + drivers/nvme/host/core.c | 123 +- + drivers/nvme/host/fault_inject.c | 79 + + drivers/nvme/host/fc.c | 36 +- + drivers/nvme/host/lightnvm.c | 757 +++- + drivers/nvme/host/multipath.c | 8 +- + drivers/nvme/host/nvme.h | 35 +- + drivers/nvme/host/pci.c | 26 +- + drivers/nvme/host/rdma.c | 34 +- + drivers/nvme/target/configfs.c | 65 +- + drivers/nvme/target/core.c | 12 +- + drivers/nvme/target/discovery.c | 30 +- + drivers/nvme/target/fc.c | 23 +- + drivers/nvme/target/loop.c | 4 +- + drivers/nvme/target/nvmet.h | 12 +- + drivers/nvme/target/rdma.c | 72 +- + drivers/nvmem/Kconfig | 6 +- + drivers/nvmem/bcm-ocotp.c | 15 +- + drivers/nvmem/core.c | 70 +- + drivers/nvmem/imx-iim.c | 18 +- + drivers/nvmem/imx-ocotp.c | 18 +- + drivers/nvmem/lpc18xx_otp.c | 16 +- + drivers/nvmem/meson-efuse.c | 16 +- + drivers/nvmem/meson-mx-efuse.c | 16 +- + drivers/nvmem/mtk-efuse.c | 16 +- + drivers/nvmem/qfprom.c | 16 +- + drivers/nvmem/rockchip-efuse.c | 32 +- + drivers/nvmem/snvs_lpgpr.c | 53 +- + drivers/nvmem/sunxi_sid.c | 71 +- + drivers/nvmem/uniphier-efuse.c | 16 +- + drivers/nvmem/vf610-ocotp.c | 24 +- + drivers/parport/parport_ax88796.c | 8 +- + drivers/parport/parport_pc.c | 4 + + drivers/parport/parport_serial.c | 125 +- + drivers/perf/arm_pmu_platform.c | 2 +- + drivers/perf/arm_spe_pmu.c | 14 + + drivers/phy/allwinner/phy-sun4i-usb.c | 22 +- + drivers/phy/amlogic/Kconfig | 13 +- + drivers/phy/amlogic/Makefile | 1 + + drivers/phy/amlogic/phy-meson-gxl-usb2.c | 78 +- + drivers/phy/amlogic/phy-meson-gxl-usb3.c | 282 ++ + drivers/phy/hisilicon/Kconfig | 20 + + drivers/phy/hisilicon/Makefile | 2 + + drivers/phy/hisilicon/phy-hisi-inno-usb2.c | 197 + + drivers/phy/hisilicon/phy-histb-combphy.c | 289 ++ + drivers/phy/marvell/phy-berlin-usb.c | 2 +- + drivers/phy/mediatek/phy-mtk-tphy.c | 23 +- + drivers/phy/motorola/Kconfig | 8 + + drivers/phy/motorola/Makefile | 1 + + drivers/phy/motorola/phy-mapphone-mdm6600.c | 542 +++ + drivers/phy/phy-core.c | 2 + + drivers/phy/phy-lpc18xx-usb-otg.c | 8 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 647 ++- + drivers/phy/qualcomm/phy-qcom-qmp.h | 280 ++ + drivers/phy/qualcomm/phy-qcom-qusb2.c | 418 +- + drivers/phy/ralink/Kconfig | 1 + + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 4 + + drivers/phy/rockchip/Kconfig | 1 + + drivers/phy/rockchip/phy-rockchip-emmc.c | 60 +- + drivers/phy/rockchip/phy-rockchip-typec.c | 160 +- + drivers/phy/samsung/Kconfig | 2 +- + drivers/phy/st/Kconfig | 14 + + drivers/phy/st/Makefile | 1 + + drivers/phy/st/phy-stm32-usbphyc.c | 461 ++ + drivers/phy/tegra/xusb-tegra210.c | 6 +- + drivers/phy/tegra/xusb.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 65 +- + drivers/platform/x86/eeepc-laptop.c | 2 +- + drivers/platform/x86/intel_cht_int33fe.c | 24 + + drivers/pps/clients/pps_parport.c | 21 +- + drivers/pps/generators/pps_gen_parport.c | 12 +- + drivers/rtc/rtc-ab-b5ze-s3.c | 2 +- + drivers/s390/block/dasd.c | 4 +- + drivers/s390/block/dcssblk.c | 2 +- + drivers/s390/block/scm_blk.c | 4 +- + drivers/s390/block/xpram.c | 4 +- + drivers/s390/scsi/zfcp_fc.c | 4 +- + drivers/scsi/Kconfig | 114 +- + drivers/scsi/Makefile | 5 - + drivers/scsi/NCR53c406a.c | 1090 ----- + drivers/scsi/aacraid/aacraid.h | 5 + + drivers/scsi/aacraid/src.c | 209 +- + drivers/scsi/aha1740.c | 2 +- + drivers/scsi/aic7xxx/aic79xx_core.c | 8 +- + drivers/scsi/aic7xxx/aic79xx_seq.h_shipped | 3 +- + drivers/scsi/aic7xxx/aic7xxx_core.c | 8 +- + drivers/scsi/aic7xxx/aic7xxx_seq.h_shipped | 3 +- + drivers/scsi/aic7xxx/aicasm/aicasm.c | 3 +- + drivers/scsi/arcmsr/arcmsr.h | 4 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 90 + + drivers/scsi/atp870u.c | 4 +- + drivers/scsi/bfa/bfad_bsg.c | 2 +- + drivers/scsi/csiostor/csio_attr.c | 16 +- + drivers/scsi/csiostor/csio_hw.c | 275 +- + drivers/scsi/csiostor/csio_hw.h | 59 + + drivers/scsi/csiostor/csio_lnode.c | 8 + + drivers/scsi/csiostor/csio_mb.c | 70 +- + drivers/scsi/csiostor/csio_mb.h | 9 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 10 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 2 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 2 +- + drivers/scsi/dpt_i2o.c | 29 +- + drivers/scsi/dpti.h | 1 - + drivers/scsi/eata.c | 2571 ----------- + drivers/scsi/eata_generic.h | 401 -- + drivers/scsi/eata_pio.c | 966 ---- + drivers/scsi/eata_pio.h | 54 - + drivers/scsi/esas2r/esas2r.h | 2 - + drivers/scsi/esas2r/esas2r_init.c | 21 - + drivers/scsi/esas2r/esas2r_main.c | 72 +- + drivers/scsi/fdomain.c | 1783 -------- + drivers/scsi/fdomain.h | 24 - + drivers/scsi/gdth.h | 3 - + drivers/scsi/hisi_sas/Kconfig | 2 +- + drivers/scsi/hisi_sas/hisi_sas.h | 1 - + drivers/scsi/hisi_sas/hisi_sas_main.c | 34 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 13 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 62 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 72 +- + drivers/scsi/hosts.c | 36 +- + drivers/scsi/ipr.c | 53 +- + drivers/scsi/ipr.h | 2 +- + drivers/scsi/ips.c | 4 - + drivers/scsi/isci/host.c | 2 +- + drivers/scsi/iscsi_tcp.c | 2 +- + drivers/scsi/jazz_esp.c | 2 +- + drivers/scsi/libfc/fc_disc.c | 2 +- + drivers/scsi/libsas/sas_ata.c | 2 +- + drivers/scsi/libsas/sas_discover.c | 13 +- + drivers/scsi/libsas/sas_expander.c | 29 +- + drivers/scsi/libsas/sas_init.c | 2 +- + drivers/scsi/libsas/sas_port.c | 5 +- + drivers/scsi/lpfc/lpfc.h | 23 +- + drivers/scsi/lpfc/lpfc_attr.c | 107 +- + drivers/scsi/lpfc/lpfc_bsg.c | 6 +- + drivers/scsi/lpfc/lpfc_crtn.h | 5 +- + drivers/scsi/lpfc/lpfc_ct.c | 8 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 22 +- + drivers/scsi/lpfc/lpfc_debugfs.h | 13 +- + drivers/scsi/lpfc/lpfc_els.c | 11 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 13 +- + drivers/scsi/lpfc/lpfc_hw.h | 15 +- + drivers/scsi/lpfc/lpfc_hw4.h | 141 +- + drivers/scsi/lpfc/lpfc_ids.h | 4 +- + drivers/scsi/lpfc/lpfc_init.c | 320 +- + drivers/scsi/lpfc/lpfc_mbox.c | 10 +- + drivers/scsi/lpfc/lpfc_mem.c | 12 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 22 +- + drivers/scsi/lpfc/lpfc_nvme.c | 427 +- + drivers/scsi/lpfc/lpfc_nvme.h | 4 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 470 +- + drivers/scsi/lpfc/lpfc_nvmet.h | 10 +- + drivers/scsi/lpfc/lpfc_scsi.c | 64 +- + drivers/scsi/lpfc/lpfc_scsi.h | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 692 ++- + drivers/scsi/lpfc/lpfc_sli.h | 6 +- + drivers/scsi/lpfc/lpfc_sli4.h | 42 +- + drivers/scsi/lpfc/lpfc_version.h | 8 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 5 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 +- + drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 1 + + drivers/scsi/mpt3sas/mpt3sas_base.c | 699 ++- + drivers/scsi/mpt3sas/mpt3sas_base.h | 19 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 3 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 22 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 76 +- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 8 +- + drivers/scsi/mvme147.c | 107 +- + drivers/scsi/mvsas/mv_94xx.c | 23 +- + drivers/scsi/pcmcia/Kconfig | 9 - + drivers/scsi/pcmcia/Makefile | 2 - + drivers/scsi/pcmcia/fdomain_core.c | 2 - + drivers/scsi/pcmcia/fdomain_stub.c | 209 - + drivers/scsi/pmcraid.c | 51 +- + drivers/scsi/pmcraid.h | 3 +- + drivers/scsi/qedf/qedf_dbg.c | 2 +- + drivers/scsi/qedf/qedf_dbg.h | 17 +- + drivers/scsi/qedf/qedf_debugfs.c | 6 +- + drivers/scsi/qedf/qedf_io.c | 2 +- + drivers/scsi/qedf/qedf_main.c | 8 +- + drivers/scsi/qedi/qedi_dbg.h | 4 +- + drivers/scsi/qedi/qedi_debugfs.c | 4 +- + drivers/scsi/qedi/qedi_fw.c | 2 +- + drivers/scsi/qedi/qedi_gbl.h | 4 +- + drivers/scsi/qedi/qedi_main.c | 4 +- + drivers/scsi/qla2xxx/qla_bsg.c | 3 +- + drivers/scsi/qla2xxx/qla_dbg.c | 8 +- + drivers/scsi/qla2xxx/qla_def.h | 12 +- + drivers/scsi/qla2xxx/qla_gbl.h | 4 +- + drivers/scsi/qla2xxx/qla_gs.c | 353 +- + drivers/scsi/qla2xxx/qla_init.c | 72 +- + drivers/scsi/qla2xxx/qla_inline.h | 1 + + drivers/scsi/qla2xxx/qla_iocb.c | 25 +- + drivers/scsi/qla2xxx/qla_isr.c | 101 +- + drivers/scsi/qla2xxx/qla_mbx.c | 33 +- + drivers/scsi/qla2xxx/qla_mid.c | 6 - + drivers/scsi/qla2xxx/qla_mr.c | 36 +- + drivers/scsi/qla2xxx/qla_nvme.c | 245 +- + drivers/scsi/qla2xxx/qla_nvme.h | 9 +- + drivers/scsi/qla2xxx/qla_nx.c | 7 +- + drivers/scsi/qla2xxx/qla_nx2.c | 19 +- + drivers/scsi/qla2xxx/qla_nx2.h | 4 - + drivers/scsi/qla2xxx/qla_os.c | 16 +- + drivers/scsi/qla2xxx/qla_sup.c | 1 + + drivers/scsi/qla2xxx/qla_target.c | 29 +- + drivers/scsi/qla2xxx/qla_target.h | 2 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 6 +- + drivers/scsi/qla4xxx/ql4_nx.c | 2 + + drivers/scsi/qla4xxx/ql4_nx.h | 7 - + drivers/scsi/qla4xxx/ql4_os.c | 4 +- + drivers/scsi/raid_class.c | 1 + + drivers/scsi/scsi.c | 2 +- + drivers/scsi/scsi_debug.c | 243 +- + drivers/scsi/scsi_devinfo.c | 13 +- + drivers/scsi/scsi_error.c | 8 +- + drivers/scsi/scsi_lib.c | 33 +- + drivers/scsi/scsi_module.c | 73 - + drivers/scsi/scsi_sysfs.c | 14 +- + drivers/scsi/scsi_transport_sas.c | 3 +- + drivers/scsi/scsi_transport_spi.c | 4 +- + drivers/scsi/sd.c | 8 +- + drivers/scsi/sd_zbc.c | 3 +- + drivers/scsi/smartpqi/smartpqi_init.c | 91 +- + drivers/scsi/sr.c | 2 + + drivers/scsi/sun3x_esp.c | 2 +- + drivers/scsi/sym53c416.c | 844 ---- + drivers/scsi/sym53c416.h | 33 - + drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- + drivers/scsi/ufs/Makefile | 3 +- + drivers/scsi/ufs/tc-dwc-g210-pci.c | 4 +- + drivers/scsi/ufs/tc-dwc-g210-pltfrm.c | 2 +- + drivers/scsi/ufs/ufs-sysfs.c | 817 ++++ + drivers/scsi/ufs/ufs-sysfs.h | 17 + + drivers/scsi/ufs/ufs.h | 115 +- + drivers/scsi/ufs/ufshcd-pci.c | 7 +- + drivers/scsi/ufs/ufshcd.c | 338 +- + drivers/scsi/ufs/ufshcd.h | 37 + + drivers/scsi/ufs/ufshci.h | 7 + + drivers/siox/siox-core.c | 2 +- + drivers/slimbus/core.c | 2 +- + drivers/staging/Kconfig | 18 +- + drivers/staging/Makefile | 11 +- + drivers/staging/android/ashmem.c | 2 +- + drivers/staging/android/ion/Kconfig | 2 +- + drivers/staging/android/ion/ion.c | 26 +- + drivers/staging/android/ion/ion.h | 22 +- + drivers/staging/android/ion/ion_page_pool.c | 33 +- + drivers/staging/android/ion/ion_system_heap.c | 76 +- + drivers/staging/ccree/Kconfig | 27 - + drivers/staging/ccree/TODO | 10 - + drivers/staging/comedi/drivers/adl_pci6208.c | 3 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 40 +- + drivers/staging/comedi/drivers/das16.c | 2 +- + drivers/staging/comedi/drivers/das16m1.c | 2 +- + drivers/staging/comedi/drivers/jr3_pci.c | 1 - + drivers/staging/comedi/drivers/ni_atmio.c | 9 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 10 +- + drivers/staging/comedi/drivers/ni_stc.h | 2 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +- + drivers/staging/comedi/drivers/s626.c | 10 +- + drivers/staging/emxx_udc/emxx_udc.c | 10 +- + drivers/staging/fsl-dpaa2/Kconfig | 10 +- + drivers/staging/fsl-dpaa2/Makefile | 1 + + drivers/staging/fsl-dpaa2/ethernet/README | 2 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 69 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 22 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c | 26 +- + drivers/staging/fsl-dpaa2/ethernet/dpni-cmd.h | 4 +- + drivers/staging/fsl-dpaa2/ethernet/dpni.c | 86 +- + drivers/staging/fsl-dpaa2/ethsw/Makefile | 10 + + drivers/staging/fsl-dpaa2/ethsw/README | 106 + + drivers/staging/fsl-dpaa2/ethsw/TODO | 14 + + drivers/staging/fsl-dpaa2/ethsw/dpsw-cmd.h | 346 ++ + drivers/staging/fsl-dpaa2/ethsw/dpsw.c | 1123 +++++ + drivers/staging/fsl-dpaa2/ethsw/dpsw.h | 586 +++ + drivers/staging/fsl-dpaa2/ethsw/ethsw-ethtool.c | 182 + + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 1508 +++++++ + drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 67 + + drivers/staging/fsl-mc/TODO | 18 - + drivers/staging/fsl-mc/bus/Kconfig | 12 +- + drivers/staging/fsl-mc/bus/Makefile | 13 - + drivers/staging/fsl-mc/bus/dpbp-cmd.h | 54 - + drivers/staging/fsl-mc/bus/dpcon-cmd.h | 53 - + drivers/staging/fsl-mc/bus/dpio/Makefile | 2 - + drivers/staging/fsl-mc/bus/dpio/dpio-driver.c | 2 +- + drivers/staging/fsl-mc/bus/dpio/dpio-service.c | 6 +- + drivers/staging/fsl-mc/bus/dpio/dpio.c | 14 +- + drivers/staging/fsl-mc/bus/dpio/qbman-portal.c | 27 +- + drivers/staging/fsl-mc/bus/dpio/qbman-portal.h | 24 +- + drivers/staging/fsl-mc/include/dpaa2-fd.h | 6 +- + drivers/staging/fsl-mc/include/dpaa2-io.h | 2 +- + drivers/staging/fsl-mc/include/dpbp.h | 63 - + drivers/staging/fsl-mc/include/dpcon.h | 79 - + drivers/staging/gdm724x/gdm_endian.c | 24 +- + drivers/staging/gdm724x/gdm_endian.h | 13 +- + drivers/staging/gdm724x/gdm_lte.c | 62 +- + drivers/staging/gdm724x/gdm_lte.h | 2 +- + drivers/staging/gdm724x/gdm_mux.c | 6 +- + drivers/staging/gdm724x/gdm_tty.c | 29 +- + drivers/staging/gdm724x/gdm_usb.c | 30 +- + drivers/staging/gdm724x/gdm_usb.h | 2 +- + drivers/staging/iio/accel/adis16201.c | 10 +- + drivers/staging/iio/accel/adis16209.c | 272 +- + drivers/staging/iio/adc/ad7192.c | 6 +- + drivers/staging/iio/adc/ad7816.c | 2 +- + drivers/staging/iio/addac/adt7316.c | 3 +- + drivers/staging/iio/cdc/ad7150.c | 5 +- + drivers/staging/iio/cdc/ad7152.c | 6 +- + drivers/staging/iio/cdc/ad7746.c | 12 +- + drivers/staging/iio/light/tsl2x7x.c | 290 +- + drivers/staging/iio/light/tsl2x7x.h | 6 +- + drivers/staging/iio/meter/ade7753.c | 18 +- + drivers/staging/iio/meter/ade7754.c | 6 +- + drivers/staging/iio/meter/ade7758.h | 2 +- + drivers/staging/iio/meter/ade7758_core.c | 52 +- + drivers/staging/iio/meter/ade7758_trigger.c | 8 +- + drivers/staging/iio/meter/ade7759.c | 98 +- + drivers/staging/iio/meter/ade7854-i2c.c | 28 +- + drivers/staging/iio/meter/ade7854-spi.c | 60 +- + drivers/staging/iio/meter/ade7854.h | 28 +- + drivers/staging/iio/meter/meter.h | 3 - + drivers/staging/iio/resolver/ad2s1210.c | 20 +- + drivers/staging/irda/TODO | 4 - + drivers/staging/irda/drivers/Kconfig | 398 -- + drivers/staging/irda/drivers/Makefile | 44 - + drivers/staging/irda/drivers/act200l-sir.c | 250 - + drivers/staging/irda/drivers/actisys-sir.c | 245 - + drivers/staging/irda/drivers/ali-ircc.c | 2217 --------- + drivers/staging/irda/drivers/ali-ircc.h | 227 - + drivers/staging/irda/drivers/au1k_ir.c | 985 ---- + drivers/staging/irda/drivers/bfin_sir.c | 819 ---- + drivers/staging/irda/drivers/bfin_sir.h | 93 - + drivers/staging/irda/drivers/donauboe.c | 1732 ------- + drivers/staging/irda/drivers/donauboe.h | 362 -- + drivers/staging/irda/drivers/esi-sir.c | 157 - + drivers/staging/irda/drivers/girbil-sir.c | 252 -- + drivers/staging/irda/drivers/irda-usb.c | 1906 -------- + drivers/staging/irda/drivers/irda-usb.h | 175 - + drivers/staging/irda/drivers/irtty-sir.c | 570 --- + drivers/staging/irda/drivers/irtty-sir.h | 34 - + drivers/staging/irda/drivers/kingsun-sir.c | 634 --- + drivers/staging/irda/drivers/ks959-sir.c | 912 ---- + drivers/staging/irda/drivers/ksdazzle-sir.c | 813 ---- + drivers/staging/irda/drivers/litelink-sir.c | 199 - + drivers/staging/irda/drivers/ma600-sir.c | 253 -- + drivers/staging/irda/drivers/mcp2120-sir.c | 224 - + drivers/staging/irda/drivers/mcs7780.c | 990 ---- + drivers/staging/irda/drivers/mcs7780.h | 165 - + drivers/staging/irda/drivers/nsc-ircc.c | 2410 ---------- + drivers/staging/irda/drivers/nsc-ircc.h | 281 -- + drivers/staging/irda/drivers/old_belkin-sir.c | 146 - + drivers/staging/irda/drivers/pxaficp_ir.c | 1075 ----- + drivers/staging/irda/drivers/sa1100_ir.c | 1150 ----- + drivers/staging/irda/drivers/sh_sir.c | 810 ---- + drivers/staging/irda/drivers/sir-dev.h | 191 - + drivers/staging/irda/drivers/sir_dev.c | 987 ---- + drivers/staging/irda/drivers/sir_dongle.c | 133 - + drivers/staging/irda/drivers/smsc-ircc2.c | 3026 ------------- + drivers/staging/irda/drivers/smsc-ircc2.h | 191 - + drivers/staging/irda/drivers/smsc-sio.h | 100 - + drivers/staging/irda/drivers/stir4200.c | 1134 ----- + drivers/staging/irda/drivers/tekram-sir.c | 225 - + drivers/staging/irda/drivers/toim3232-sir.c | 358 -- + drivers/staging/irda/drivers/via-ircc.c | 1593 ------- + drivers/staging/irda/drivers/via-ircc.h | 846 ---- + drivers/staging/irda/drivers/vlsi_ir.c | 1872 -------- + drivers/staging/irda/drivers/vlsi_ir.h | 757 ---- + drivers/staging/irda/drivers/w83977af.h | 53 - + drivers/staging/irda/drivers/w83977af_ir.c | 1285 ------ + drivers/staging/irda/drivers/w83977af_ir.h | 198 - + drivers/staging/irda/include/net/irda/af_irda.h | 87 - + drivers/staging/irda/include/net/irda/crc.h | 29 - + drivers/staging/irda/include/net/irda/discovery.h | 95 - + .../staging/irda/include/net/irda/ircomm_core.h | 106 - + .../staging/irda/include/net/irda/ircomm_event.h | 83 - + drivers/staging/irda/include/net/irda/ircomm_lmp.h | 36 - + .../staging/irda/include/net/irda/ircomm_param.h | 147 - + drivers/staging/irda/include/net/irda/ircomm_ttp.h | 37 - + drivers/staging/irda/include/net/irda/ircomm_tty.h | 121 - + .../irda/include/net/irda/ircomm_tty_attach.h | 92 - + drivers/staging/irda/include/net/irda/irda.h | 115 - + .../staging/irda/include/net/irda/irda_device.h | 285 -- + drivers/staging/irda/include/net/irda/iriap.h | 108 - + .../staging/irda/include/net/irda/iriap_event.h | 85 - + .../staging/irda/include/net/irda/irias_object.h | 108 - + .../staging/irda/include/net/irda/irlan_client.h | 42 - + .../staging/irda/include/net/irda/irlan_common.h | 230 - + drivers/staging/irda/include/net/irda/irlan_eth.h | 32 - + .../staging/irda/include/net/irda/irlan_event.h | 81 - + .../staging/irda/include/net/irda/irlan_filter.h | 35 - + .../staging/irda/include/net/irda/irlan_provider.h | 52 - + drivers/staging/irda/include/net/irda/irlap.h | 311 -- + .../staging/irda/include/net/irda/irlap_event.h | 129 - + .../staging/irda/include/net/irda/irlap_frame.h | 167 - + drivers/staging/irda/include/net/irda/irlmp.h | 295 -- + .../staging/irda/include/net/irda/irlmp_event.h | 98 - + .../staging/irda/include/net/irda/irlmp_frame.h | 62 - + drivers/staging/irda/include/net/irda/irmod.h | 109 - + drivers/staging/irda/include/net/irda/irqueue.h | 96 - + drivers/staging/irda/include/net/irda/irttp.h | 210 - + drivers/staging/irda/include/net/irda/parameters.h | 100 - + drivers/staging/irda/include/net/irda/qos.h | 101 - + drivers/staging/irda/include/net/irda/timer.h | 102 - + drivers/staging/irda/include/net/irda/wrapper.h | 58 - + drivers/staging/irda/net/Kconfig | 96 - + drivers/staging/irda/net/Makefile | 17 - + drivers/staging/irda/net/af_irda.c | 2692 ----------- + drivers/staging/irda/net/discovery.c | 417 -- + drivers/staging/irda/net/ircomm/Kconfig | 12 - + drivers/staging/irda/net/ircomm/Makefile | 8 - + drivers/staging/irda/net/ircomm/ircomm_core.c | 563 --- + drivers/staging/irda/net/ircomm/ircomm_event.c | 246 - + drivers/staging/irda/net/ircomm/ircomm_lmp.c | 350 -- + drivers/staging/irda/net/ircomm/ircomm_param.c | 501 -- + drivers/staging/irda/net/ircomm/ircomm_ttp.c | 350 -- + drivers/staging/irda/net/ircomm/ircomm_tty.c | 1329 ------ + .../staging/irda/net/ircomm/ircomm_tty_attach.c | 987 ---- + drivers/staging/irda/net/ircomm/ircomm_tty_ioctl.c | 291 -- + drivers/staging/irda/net/irda_device.c | 316 -- + drivers/staging/irda/net/iriap.c | 1085 ----- + drivers/staging/irda/net/iriap_event.c | 496 -- + drivers/staging/irda/net/irias_object.c | 555 --- + drivers/staging/irda/net/irlan/Kconfig | 14 - + drivers/staging/irda/net/irlan/Makefile | 7 - + drivers/staging/irda/net/irlan/irlan_client.c | 559 --- + .../staging/irda/net/irlan/irlan_client_event.c | 511 --- + drivers/staging/irda/net/irlan/irlan_common.c | 1176 ----- + drivers/staging/irda/net/irlan/irlan_eth.c | 340 -- + drivers/staging/irda/net/irlan/irlan_event.c | 60 - + drivers/staging/irda/net/irlan/irlan_filter.c | 240 - + drivers/staging/irda/net/irlan/irlan_provider.c | 408 -- + .../staging/irda/net/irlan/irlan_provider_event.c | 233 - + drivers/staging/irda/net/irlap.c | 1207 ----- + drivers/staging/irda/net/irlap_event.c | 2316 ---------- + drivers/staging/irda/net/irlap_frame.c | 1407 ------ + drivers/staging/irda/net/irlmp.c | 1996 -------- + drivers/staging/irda/net/irlmp_event.c | 886 ---- + drivers/staging/irda/net/irlmp_frame.c | 476 -- + drivers/staging/irda/net/irmod.c | 199 - + drivers/staging/irda/net/irnet/Kconfig | 13 - + drivers/staging/irda/net/irnet/Makefile | 7 - + drivers/staging/irda/net/irnet/irnet.h | 522 --- + drivers/staging/irda/net/irnet/irnet_irda.c | 1885 -------- + drivers/staging/irda/net/irnet/irnet_irda.h | 178 - + drivers/staging/irda/net/irnet/irnet_ppp.c | 1189 ----- + drivers/staging/irda/net/irnet/irnet_ppp.h | 116 - + drivers/staging/irda/net/irnetlink.c | 162 - + drivers/staging/irda/net/irproc.c | 96 - + drivers/staging/irda/net/irqueue.c | 912 ---- + drivers/staging/irda/net/irsysctl.c | 258 -- + drivers/staging/irda/net/irttp.c | 1886 -------- + drivers/staging/irda/net/parameters.c | 584 --- + drivers/staging/irda/net/qos.c | 771 ---- + drivers/staging/irda/net/timer.c | 231 - + drivers/staging/irda/net/wrapper.c | 492 -- + drivers/staging/ks7010/Makefile | 1 - + drivers/staging/ks7010/eap_packet.h | 41 +- + drivers/staging/ks7010/ks7010_sdio.c | 197 +- + drivers/staging/ks7010/ks_hostif.c | 756 ++-- + drivers/staging/ks7010/ks_hostif.h | 95 +- + drivers/staging/ks7010/ks_wlan.h | 21 +- + drivers/staging/ks7010/ks_wlan_ioctl.h | 1 - + drivers/staging/ks7010/ks_wlan_net.c | 117 +- + drivers/staging/ks7010/michael_mic.c | 144 +- + drivers/staging/ks7010/michael_mic.h | 19 +- + drivers/staging/lustre/TODO | 310 +- + .../staging/lustre/include/linux/libcfs/curproc.h | 37 +- + .../staging/lustre/include/linux/libcfs/libcfs.h | 27 +- + .../lustre/include/linux/libcfs/libcfs_crypto.h | 11 +- + .../lustre/include/linux/libcfs/libcfs_debug.h | 4 +- + .../lustre/include/linux/libcfs/libcfs_time.h | 2 +- + .../lustre/include/linux/libcfs/linux/linux-time.h | 7 +- + drivers/staging/lustre/include/linux/lnet/api.h | 1 + + drivers/staging/lustre/lnet/Kconfig | 2 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 8 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 10 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 6 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 11 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 32 +- + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 2 +- + drivers/staging/lustre/lnet/libcfs/Makefile | 4 +- + drivers/staging/lustre/lnet/libcfs/debug.c | 4 +- + drivers/staging/lustre/lnet/libcfs/fail.c | 2 +- + .../staging/lustre/lnet/libcfs/linux/linux-cpu.c | 2 +- + .../lustre/lnet/libcfs/linux/linux-crypto.c | 29 +- + .../lustre/lnet/libcfs/linux/linux-curproc.c | 108 - + .../staging/lustre/lnet/libcfs/linux/linux-mem.c | 51 - + .../staging/lustre/lnet/libcfs/linux/linux-prim.c | 113 - + drivers/staging/lustre/lnet/libcfs/tracefile.c | 4 +- + drivers/staging/lustre/lnet/lnet/acceptor.c | 6 +- + drivers/staging/lustre/lnet/lnet/api-ni.c | 26 +- + drivers/staging/lustre/lnet/lnet/lib-eq.c | 10 +- + drivers/staging/lustre/lnet/lnet/lib-move.c | 4 +- + drivers/staging/lustre/lnet/lnet/lib-ptl.c | 5 +- + drivers/staging/lustre/lnet/lnet/net_fault.c | 14 +- + drivers/staging/lustre/lnet/lnet/peer.c | 2 +- + drivers/staging/lustre/lnet/lnet/router.c | 10 +- + drivers/staging/lustre/lnet/selftest/conctl.c | 14 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 4 +- + drivers/staging/lustre/lnet/selftest/framework.c | 2 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 2 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 2 +- + drivers/staging/lustre/lnet/selftest/timer.c | 4 +- + drivers/staging/lustre/lustre/Kconfig | 1 - + drivers/staging/lustre/lustre/fid/fid_request.c | 107 +- + drivers/staging/lustre/lustre/fid/lproc_fid.c | 44 +- + drivers/staging/lustre/lustre/fld/fld_cache.c | 2 +- + drivers/staging/lustre/lustre/include/cl_object.h | 2 +- + .../staging/lustre/lustre/include/lprocfs_status.h | 2 +- + drivers/staging/lustre/lustre/include/lu_object.h | 7 - + drivers/staging/lustre/lustre/include/lustre_dlm.h | 2 +- + .../staging/lustre/lustre/include/lustre_export.h | 2 + + drivers/staging/lustre/lustre/include/lustre_fid.h | 2 +- + .../staging/lustre/lustre/include/lustre_import.h | 4 +- + drivers/staging/lustre/lustre/include/lustre_lib.h | 296 +- + drivers/staging/lustre/lustre/include/lustre_lmv.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_mdc.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_net.h | 22 +- + drivers/staging/lustre/lustre/include/lustre_sec.h | 3 - + drivers/staging/lustre/lustre/include/obd.h | 2 +- + drivers/staging/lustre/lustre/include/obd_class.h | 8 +- + .../staging/lustre/lustre/include/obd_support.h | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 30 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 14 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 24 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 104 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 53 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 14 +- + drivers/staging/lustre/lustre/llite/dcache.c | 10 + + drivers/staging/lustre/lustre/llite/dir.c | 10 +- + drivers/staging/lustre/lustre/llite/file.c | 12 +- + .../staging/lustre/lustre/llite/llite_internal.h | 4 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 60 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 8 +- + drivers/staging/lustre/lustre/llite/namei.c | 60 +- + drivers/staging/lustre/lustre/llite/statahead.c | 215 +- + drivers/staging/lustre/lustre/llite/super25.c | 17 +- + drivers/staging/lustre/lustre/llite/xattr.c | 21 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 6 +- + drivers/staging/lustre/lustre/lov/lov_ea.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 4 +- + drivers/staging/lustre/lustre/lov/lov_lock.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 22 +- + drivers/staging/lustre/lustre/lov/lov_pack.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 12 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 2 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 16 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 19 +- + drivers/staging/lustre/lustre/obdclass/cl_io.c | 23 +- + drivers/staging/lustre/lustre/obdclass/cl_lock.c | 2 +- + drivers/staging/lustre/lustre/obdclass/cl_object.c | 2 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 211 +- + drivers/staging/lustre/lustre/obdclass/linkea.c | 16 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 4 +- + drivers/staging/lustre/lustre/obdclass/llog.c | 22 +- + drivers/staging/lustre/lustre/obdclass/llog_obd.c | 5 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 4 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 89 +- + .../lustre/lustre/obdclass/lustre_handles.c | 4 +- + .../staging/lustre/lustre/obdclass/obd_config.c | 2 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 2 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 10 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 34 +- + drivers/staging/lustre/lustre/osc/osc_object.c | 6 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 8 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 8 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 194 +- + drivers/staging/lustre/lustre/ptlrpc/events.c | 7 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 85 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 15 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 9 +- + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 99 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 2 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 56 +- + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 33 +- + drivers/staging/lustre/lustre/ptlrpc/recover.c | 38 +- + drivers/staging/lustre/lustre/ptlrpc/sec.c | 44 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 99 +- + drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 8 +- + drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 8 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 111 +- + drivers/staging/most/core.c | 9 +- + drivers/staging/most/core.h | 2 +- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 3 + + drivers/staging/mt7621-dma/Kconfig | 12 + + drivers/staging/mt7621-dma/Makefile | 4 + + drivers/staging/mt7621-dma/TODO | 5 + + drivers/staging/mt7621-dma/mtk-hsdma.c | 768 ++++ + drivers/staging/mt7621-dma/ralink-gdma.c | 930 ++++ + drivers/staging/mt7621-dts/Kconfig | 5 + + drivers/staging/mt7621-dts/Makefile | 3 + + drivers/staging/mt7621-dts/TODO | 5 + + drivers/staging/mt7621-dts/gbpc1.dts | 143 + + drivers/staging/mt7621-dts/mt7621.dtsi | 471 ++ + .../devicetree/bindings/net/mediatek-net-gsw.txt | 48 + + drivers/staging/mt7621-eth/Kconfig | 39 + + drivers/staging/mt7621-eth/Makefile | 14 + + drivers/staging/mt7621-eth/TODO | 13 + + drivers/staging/mt7621-eth/ethtool.c | 225 + + drivers/staging/mt7621-eth/ethtool.h | 22 + + drivers/staging/mt7621-eth/gsw_mt7620.h | 277 ++ + drivers/staging/mt7621-eth/gsw_mt7621.c | 298 ++ + drivers/staging/mt7621-eth/mdio.c | 271 ++ + drivers/staging/mt7621-eth/mdio.h | 27 + + drivers/staging/mt7621-eth/mdio_mt7620.c | 173 + + drivers/staging/mt7621-eth/mtk_eth_soc.c | 2178 +++++++++ + drivers/staging/mt7621-eth/mtk_eth_soc.h | 721 +++ + drivers/staging/mt7621-eth/soc_mt7621.c | 160 + + drivers/staging/mt7621-gpio/Kconfig | 6 + + drivers/staging/mt7621-gpio/Makefile | 3 + + drivers/staging/mt7621-gpio/TODO | 5 + + drivers/staging/mt7621-gpio/gpio-mt7621.c | 352 ++ + drivers/staging/mt7621-mmc/Kconfig | 16 + + drivers/staging/mt7621-mmc/Makefile | 42 + + drivers/staging/mt7621-mmc/TODO | 8 + + drivers/staging/mt7621-mmc/board.h | 137 + + drivers/staging/mt7621-mmc/dbg.c | 347 ++ + drivers/staging/mt7621-mmc/dbg.h | 156 + + drivers/staging/mt7621-mmc/mt6575_sd.h | 1001 ++++ + drivers/staging/mt7621-mmc/sd.c | 3074 +++++++++++++ + drivers/staging/mt7621-pci/Makefile | 1 + + drivers/staging/mt7621-pci/TODO | 12 + + drivers/staging/mt7621-pci/pci-mt7621.c | 840 ++++ + drivers/staging/mt7621-pinctrl/Kconfig | 4 + + drivers/staging/mt7621-pinctrl/Makefile | 3 + + drivers/staging/mt7621-pinctrl/TODO | 6 + + drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | 472 ++ + drivers/staging/mt7621-spi/Kconfig | 6 + + drivers/staging/mt7621-spi/Makefile | 1 + + drivers/staging/mt7621-spi/TODO | 5 + + drivers/staging/mt7621-spi/spi-mt7621.c | 489 ++ + drivers/staging/netlogic/xlr_net.c | 3 +- + drivers/staging/pi433/Documentation/pi433.txt | 28 +- + drivers/staging/pi433/pi433_if.c | 87 +- + drivers/staging/pi433/pi433_if.h | 12 +- + drivers/staging/pi433/rf69.c | 178 +- + drivers/staging/pi433/rf69.h | 28 +- + drivers/staging/pi433/rf69_enum.h | 52 +- + drivers/staging/rtl8188eu/Kconfig | 4 + + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 16 +- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 14 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 14 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 72 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 227 +- + drivers/staging/rtl8188eu/core/rtw_security.c | 450 +- + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 6 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 125 +- + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 5 +- + drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 2 +- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 8 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 2 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 2 +- + drivers/staging/rtl8188eu/include/rtw_security.h | 2 +- + drivers/staging/rtl8188eu/include/xmit_osdep.h | 13 - + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +- + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 37 - + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 51 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 2 +- + drivers/staging/rtl8192e/rtllib_rx.c | 4 +- + drivers/staging/rtl8192e/rtllib_wx.c | 3 +- + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 22 +- + .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 7 +- + drivers/staging/rtl8192u/r8192U_core.c | 2 + + drivers/staging/rtl8712/drv_types.h | 2 +- + drivers/staging/rtl8712/ieee80211.c | 11 +- + drivers/staging/rtl8712/ieee80211.h | 6 +- + drivers/staging/rtl8712/mlme_linux.c | 2 +- + drivers/staging/rtl8712/os_intfs.c | 3 +- + drivers/staging/rtl8712/recv_linux.c | 4 +- + drivers/staging/rtl8712/rtl8712_bitdef.h | 1 - + drivers/staging/rtl8712/rtl8712_cmd.c | 8 +- + drivers/staging/rtl8712/rtl8712_cmd.h | 4 +- + drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | 2 +- + drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h | 2 - + drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h | 1 - + drivers/staging/rtl8712/rtl8712_debugctrl_regdef.h | 2 - + drivers/staging/rtl8712/rtl8712_fifoctrl_bitdef.h | 1 - + drivers/staging/rtl8712/rtl8712_fifoctrl_regdef.h | 2 - + drivers/staging/rtl8712/rtl8712_gp_bitdef.h | 2 +- + drivers/staging/rtl8712/rtl8712_gp_regdef.h | 1 - + drivers/staging/rtl8712/rtl8712_interrupt_bitdef.h | 1 - + drivers/staging/rtl8712/rtl8712_led.c | 70 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 3 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 4 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 3 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 8 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 2 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 10 +- + drivers/staging/rtl8723bs/hal/odm.h | 90 +- + drivers/staging/rtl8723bs/hal/odm_CfoTracking.c | 4 +- + drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 122 +- + drivers/staging/rtl8723bs/hal/odm_HWConfig.h | 4 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 3 +- + drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 205 +- + drivers/staging/rtl8723bs/include/drv_types.h | 4 +- + drivers/staging/rtl8723bs/include/ieee80211.h | 154 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_recv.h | 10 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 13 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 99 +- + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 7 +- + drivers/staging/rtl8723bs/os_dep/rtw_proc.c | 18 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 2 +- + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 24 +- + drivers/staging/rtlwifi/base.c | 6 +- + .../staging/rtlwifi/btcoexist/halbtc8822b2ant.c | 8 +- + drivers/staging/rtlwifi/phydm/phydm_features.h | 2 +- + drivers/staging/rtlwifi/phydm/phydm_kfree.h | 2 +- + drivers/staging/rtlwifi/phydm/phydm_rainfo.c | 1 - + .../rtlwifi/phydm/rtl8822b/phydm_iqk_8822b.c | 2 +- + drivers/staging/rtlwifi/rtl8822be/phy.c | 2 +- + drivers/staging/rtlwifi/wifi.h | 29 +- + drivers/staging/rts5208/rtsx_chip.h | 12 +- + drivers/staging/rts5208/rtsx_transport.c | 10 +- + drivers/staging/sm750fb/ddk750_chip.c | 4 +- + drivers/staging/sm750fb/ddk750_chip.h | 14 +- + drivers/staging/sm750fb/ddk750_display.c | 2 +- + drivers/staging/sm750fb/ddk750_display.h | 7 +- + drivers/staging/sm750fb/ddk750_mode.c | 2 +- + drivers/staging/sm750fb/ddk750_mode.h | 2 +- + drivers/staging/sm750fb/sm750_hw.c | 4 +- + drivers/staging/speakup/main.c | 8 +- + drivers/staging/speakup/speakup_decpc.c | 6 +- + drivers/staging/speakup/speakup_dectlk.c | 4 +- + drivers/staging/speakup/speakup_dtlk.c | 25 +- + drivers/staging/speakup/speakup_dummy.c | 2 +- + drivers/staging/speakup/speakup_keypc.c | 4 +- + drivers/staging/speakup/spk_priv.h | 1 + + drivers/staging/speakup/spk_ttyio.c | 21 +- + drivers/staging/speakup/spk_types.h | 1 + + drivers/staging/speakup/synth.c | 25 +- + drivers/staging/typec/tcpci.c | 127 +- + drivers/staging/typec/tcpci.h | 14 + + drivers/staging/unisys/visorinput/Kconfig | 2 +- + drivers/staging/unisys/visorinput/Makefile | 1 - + .../staging/unisys/visorinput/ultrainputreport.h | 57 - + drivers/staging/unisys/visorinput/visorinput.c | 169 +- + drivers/staging/vc04_services/Makefile | 1 - + .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 6 +- + .../staging/vc04_services/bcm2835-audio/bcm2835.c | 54 +- + .../vc04_services/bcm2835-camera/controls.c | 1 + + drivers/staging/vc04_services/interface/vchi/TODO | 45 +- + .../interface/vchiq_arm/vchiq_2835_arm.c | 20 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 352 +- + .../interface/vchiq_arm/vchiq_build_info.h | 37 - + .../vc04_services/interface/vchiq_arm/vchiq_if.h | 10 - + .../interface/vchiq_arm/vchiq_kern_lib.c | 431 -- + .../interface/vchiq_arm/vchiq_memdrv.h | 59 - + .../interface/vchiq_arm/vchiq_pagelist.h | 6 - + .../interface/vchiq_arm/vchiq_version.c | 59 - + drivers/staging/vme/devices/vme_user.c | 4 +- + drivers/staging/vt6655/baseband.h | 11 +- + drivers/staging/vt6655/card.h | 13 - + drivers/staging/vt6655/device_cfg.h | 11 - + drivers/staging/vt6655/device_main.c | 6 +- + drivers/staging/vt6655/rxtx.c | 12 +- + drivers/staging/vt6656/usbpipe.c | 3 - + drivers/staging/wilc1000/coreconfigurator.c | 32 +- + drivers/staging/wilc1000/host_interface.c | 2247 ++++----- + drivers/staging/wilc1000/host_interface.h | 2 +- + drivers/staging/wilc1000/linux_mon.c | 12 +- + drivers/staging/wilc1000/linux_wlan.c | 22 +- + drivers/staging/wilc1000/wilc_sdio.c | 145 +- + drivers/staging/wilc1000/wilc_spi.c | 551 +-- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 351 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 2 +- + drivers/staging/wilc1000/wilc_wlan.c | 501 +- + drivers/staging/wilc1000/wilc_wlan.h | 5 + + drivers/staging/wilc1000/wilc_wlan_cfg.c | 21 +- + drivers/staging/wlan-ng/prism2mgmt.c | 2 +- + drivers/staging/xgifb/XGI_main_26.c | 59 +- + drivers/target/iscsi/iscsi_target.c | 28 +- + drivers/target/loopback/tcm_loop.c | 2 +- + drivers/thunderbolt/dma_port.c | 28 +- + drivers/thunderbolt/domain.c | 130 +- + drivers/thunderbolt/icm.c | 764 +++- + drivers/thunderbolt/nhi.c | 5 +- + drivers/thunderbolt/nhi.h | 5 + + drivers/thunderbolt/switch.c | 61 +- + drivers/thunderbolt/tb.h | 14 + + drivers/thunderbolt/tb_msgs.h | 180 +- + drivers/thunderbolt/xdomain.c | 47 +- + drivers/tty/hvc/Kconfig | 10 + + drivers/tty/hvc/Makefile | 1 + + drivers/tty/hvc/hvc_riscv_sbi.c | 60 + + drivers/tty/serdev/core.c | 2 +- + drivers/tty/serial/8250/8250_dw.c | 34 +- + drivers/tty/serial/8250/8250_men_mcb.c | 125 +- + drivers/tty/serial/8250/8250_of.c | 1 + + drivers/tty/serial/8250/8250_omap.c | 11 +- + drivers/tty/serial/8250/8250_pci.c | 3 - + drivers/tty/serial/8250/8250_port.c | 36 +- + drivers/tty/serial/8250/Kconfig | 5 +- + drivers/tty/serial/Kconfig | 15 + + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/altera_uart.c | 58 +- + drivers/tty/serial/arc_uart.c | 5 + + drivers/tty/serial/fsl_lpuart.c | 4 + + drivers/tty/serial/imx.c | 1209 ++--- + drivers/tty/serial/max310x.c | 2 +- + drivers/tty/serial/mvebu-uart.c | 4 +- + drivers/tty/serial/mxs-auart.c | 40 +- + drivers/tty/serial/pxa.c | 4 + + drivers/tty/serial/qcom_geni_serial.c | 1158 +++++ + drivers/tty/serial/samsung.c | 4 + + drivers/tty/serial/serial_core.c | 2 + + drivers/tty/serial/sh-sci.c | 51 +- + drivers/tty/serial/sirfsoc_uart.c | 5 + + drivers/tty/serial/st-asc.c | 4 +- + drivers/tty/serial/stm32-usart.c | 134 +- + drivers/tty/serial/stm32-usart.h | 3 + + drivers/tty/serial/xilinx_uartps.c | 2 +- + drivers/tty/vt/vt.c | 6 +- + drivers/uio/uio_hv_generic.c | 89 + + drivers/usb/Kconfig | 5 + + drivers/usb/Makefile | 2 + + drivers/usb/chipidea/ci_hdrc_imx.c | 15 +- + drivers/usb/chipidea/debug.c | 65 +- + drivers/usb/chipidea/host.c | 6 +- + drivers/usb/chipidea/usbmisc_imx.c | 26 +- + drivers/usb/common/Makefile | 1 + + drivers/usb/common/roles.c | 305 ++ + drivers/usb/core/Makefile | 2 +- + drivers/usb/core/generic.c | 9 +- + drivers/usb/core/hcd.c | 64 +- + drivers/usb/core/hub.c | 26 +- + drivers/usb/core/hub.h | 1 + + drivers/usb/core/phy.c | 158 + + drivers/usb/core/phy.h | 7 + + drivers/usb/core/port.c | 10 + + drivers/usb/core/quirks.c | 186 +- + drivers/usb/core/urb.c | 8 + + drivers/usb/core/usb-acpi.c | 4 +- + drivers/usb/core/usb.c | 1 + + drivers/usb/core/usb.h | 1 + + drivers/usb/dwc2/core.c | 395 +- + drivers/usb/dwc2/core.h | 136 +- + drivers/usb/dwc2/core_intr.c | 304 +- + drivers/usb/dwc2/debugfs.c | 91 +- + drivers/usb/dwc2/gadget.c | 403 +- + drivers/usb/dwc2/hcd.c | 445 +- + drivers/usb/dwc2/hcd.h | 56 - + drivers/usb/dwc2/hw.h | 44 +- + drivers/usb/dwc2/params.c | 91 +- + drivers/usb/dwc2/pci.c | 27 +- + drivers/usb/dwc2/platform.c | 16 +- + drivers/usb/dwc3/Makefile | 2 +- + drivers/usb/dwc3/core.c | 134 +- + drivers/usb/dwc3/core.h | 146 + + drivers/usb/dwc3/debugfs.c | 84 +- + drivers/usb/dwc3/drd.c | 489 +- + drivers/usb/dwc3/dwc3-of-simple.c | 31 +- + drivers/usb/dwc3/dwc3-pci.c | 2 +- + drivers/usb/dwc3/ep0.c | 2 +- + drivers/usb/dwc3/gadget.c | 82 +- + drivers/usb/gadget/composite.c | 126 +- + drivers/usb/gadget/function/f_fs.c | 6 +- + drivers/usb/gadget/function/f_midi.c | 3 +- + drivers/usb/gadget/function/f_tcm.c | 2 +- + drivers/usb/gadget/legacy/mass_storage.c | 2 +- + drivers/usb/gadget/u_f.h | 2 + + drivers/usb/gadget/udc/atmel_usba_udc.c | 158 +- + drivers/usb/gadget/udc/atmel_usba_udc.h | 4 +- + drivers/usb/gadget/udc/bcm63xx_udc.c | 33 +- + drivers/usb/gadget/udc/bdc/bdc_ep.c | 3 +- + drivers/usb/gadget/udc/core.c | 7 +- + drivers/usb/gadget/udc/dummy_hcd.c | 2 +- + drivers/usb/gadget/udc/goku_udc.h | 2 +- + drivers/usb/gadget/udc/gr_udc.c | 17 +- + drivers/usb/gadget/udc/pxa25x_udc.c | 20 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 42 +- + drivers/usb/host/Kconfig | 25 - + drivers/usb/host/Makefile | 2 +- + drivers/usb/host/ehci-fsl.c | 2 + + drivers/usb/host/ehci-mem.c | 3 +- + drivers/usb/host/ehci-platform.c | 55 +- + drivers/usb/host/ehci-sched.c | 6 +- + drivers/usb/host/ehci-tegra.c | 1 + + drivers/usb/host/fhci-dbg.c | 26 +- + drivers/usb/host/imx21-dbg.c | 65 +- + drivers/usb/host/isp116x-hcd.c | 15 +- + drivers/usb/host/ohci-omap.c | 1 + + drivers/usb/host/ohci-platform.c | 56 +- + drivers/usb/host/sl811-hcd.c | 17 +- + drivers/usb/host/whci/debug.c | 48 +- + drivers/usb/host/xhci-dbgtty.c | 5 +- + drivers/usb/host/xhci-ext-caps.c | 90 + + drivers/usb/host/xhci-ext-caps.h | 7 +- + drivers/usb/host/xhci-mem.c | 2 + + drivers/usb/host/xhci-mtk.c | 98 +- + drivers/usb/host/xhci-pci.c | 5 + + drivers/usb/host/xhci-plat.c | 1 + + drivers/usb/host/xhci-ring.c | 27 +- + drivers/usb/host/xhci.c | 139 +- + drivers/usb/host/xhci.h | 4 + + drivers/usb/isp1760/isp1760-udc.c | 6 +- + drivers/usb/misc/adutux.c | 4 +- + drivers/usb/misc/chaoskey.c | 8 +- + drivers/usb/misc/sisusbvga/sisusb_con.c | 68 +- + drivers/usb/misc/usbtest.c | 5 +- + drivers/usb/misc/uss720.c | 7 +- + drivers/usb/musb/musb_debugfs.c | 13 +- + drivers/usb/musb/musb_gadget_ep0.c | 14 +- + drivers/usb/phy/phy-ab8500-usb.c | 508 +-- + drivers/usb/phy/phy-generic.c | 6 +- + drivers/usb/phy/phy-mxs-usb.c | 2 +- + drivers/usb/phy/phy-tegra-usb.c | 14 +- + drivers/usb/roles/Kconfig | 14 + + drivers/usb/roles/Makefile | 1 + + drivers/usb/roles/intel-xhci-usb-role-switch.c | 192 + + drivers/usb/serial/cp210x.c | 1 + + drivers/usb/serial/ftdi_sio.c | 2 + + drivers/usb/serial/ftdi_sio_ids.h | 9 + + drivers/usb/serial/option.c | 457 +- + drivers/usb/typec/Kconfig | 3 + + drivers/usb/typec/Makefile | 2 + + drivers/usb/typec/{typec.c => class.c} | 168 +- + drivers/usb/typec/fusb302/fusb302.c | 19 +- + drivers/usb/typec/mux.c | 191 + + drivers/usb/typec/mux/Kconfig | 10 + + drivers/usb/typec/mux/Makefile | 3 + + drivers/usb/typec/mux/pi3usb30532.c | 178 + + drivers/usb/typec/tcpm.c | 96 +- + drivers/usb/typec/tps6598x.c | 41 +- + drivers/usb/typec/typec_wcove.c | 1 + + drivers/usb/typec/ucsi/ucsi.c | 44 +- + drivers/usb/usb-skeleton.c | 2 +- + drivers/usb/usbip/Kconfig | 2 +- + drivers/usb/wusbcore/crypto.c | 8 +- + drivers/usb/wusbcore/wa-nep.c | 1 - + drivers/uwb/uwb-debug.c | 32 +- + drivers/video/console/dummycon.c | 69 +- + drivers/video/console/newport_con.c | 8 +- + drivers/video/console/vgacon.c | 20 +- + drivers/video/fbdev/core/fbcon.c | 3 +- + drivers/w1/w1.c | 1 + + drivers/watchdog/Kconfig | 3 +- + fs/char_dev.c | 10 +- + fs/devpts/inode.c | 66 +- + fs/direct-io.c | 9 +- + fs/locks.c | 2 +- + fs/ocfs2/stack_user.c | 2 +- + fs/orangefs/orangefs-utils.c | 2 +- + fs/xfs/xfs_export.c | 2 +- + include/acpi/nfit.h | 18 + + include/asm-generic/vmlinux.lds.h | 1 - + include/crypto/ablk_helper.h | 32 - + include/crypto/algapi.h | 1 - + include/crypto/engine.h | 68 +- + include/crypto/hash.h | 11 +- + include/crypto/internal/hash.h | 5 - + include/crypto/internal/simd.h | 7 + + include/crypto/lrw.h | 44 - + include/crypto/sm4.h | 28 + + include/crypto/speck.h | 62 + + include/crypto/xts.h | 17 - + include/dt-bindings/input/gpio-keys.h | 13 + + include/dt-bindings/sound/rt5651.h | 15 + + include/linux/blk-cgroup.h | 1 + + include/linux/blk-mq-pci.h | 3 +- + include/linux/blk_types.h | 5 + + include/linux/blkdev.h | 121 +- + include/linux/bsg-lib.h | 7 +- + include/linux/bsg.h | 35 +- + include/linux/byteorder/generic.h | 17 + + include/linux/console.h | 58 +- + include/linux/crypto.h | 8 + + include/linux/device-mapper.h | 2 - + include/linux/device.h | 23 + + include/linux/dma-mapping.h | 19 +- + include/linux/dmapool.h | 30 +- + include/linux/dmi.h | 2 + + include/linux/edac.h | 3 + + include/linux/extcon.h | 6 + + include/linux/extcon/extcon-gpio.h | 47 - + include/linux/firmware.h | 3 + + include/linux/fs.h | 6 - + .../fsl-mc/include => include/linux/fsl}/mc.h | 118 +- + include/linux/gpio/driver.h | 16 + + include/linux/gpio_keys.h | 2 + + include/linux/hid.h | 75 +- + include/linux/hyperv.h | 2 +- + include/linux/ide.h | 1 - + include/linux/inet.h | 1 + + include/linux/kernel.h | 80 +- + include/linux/libps2.h | 38 +- + include/linux/lightnvm.h | 334 +- + include/linux/mfd/axp20x.h | 2 + + include/linux/nvmem-provider.h | 42 + + include/linux/pci_ids.h | 5 + + include/linux/phy/phy.h | 31 +- + include/linux/platform_data/gpio-htc-egpio.h | 2 - + include/linux/raid_class.h | 1 + + include/linux/rtsx_pci.h | 12 +- + include/linux/sbitmap.h | 8 + + include/linux/scatterlist.h | 23 +- + include/linux/serial_core.h | 2 +- + include/linux/sizes.h | 4 + + include/linux/stm.h | 10 +- + include/linux/thunderbolt.h | 19 + + include/linux/usb/audio-v2.h | 8 +- + include/linux/usb/audio-v3.h | 395 ++ + include/linux/usb/composite.h | 3 + + include/linux/usb/gadget.h | 13 + + include/linux/usb/hcd.h | 8 +- + include/linux/usb/pd.h | 185 +- + include/linux/usb/pd_ado.h | 42 + + include/linux/usb/pd_ext_sdb.h | 31 + + include/linux/usb/role.h | 53 + + include/linux/usb/tcpm.h | 15 +- + include/linux/usb/typec.h | 28 +- + include/linux/usb/typec_mux.h | 55 + + include/linux/wait.h | 114 + + include/net/ip6_route.h | 3 + + include/net/ipv6.h | 3 +- + include/net/iw_handler.h | 2 +- + include/scsi/scsi.h | 2 + + include/scsi/scsi_cmnd.h | 5 + + include/scsi/scsi_host.h | 36 +- + include/soc/bcm2835/raspberrypi-firmware.h | 18 + + include/sound/da7219.h | 2 + + include/sound/dmaengine_pcm.h | 7 + + include/sound/emu10k1.h | 4 +- + include/sound/hdaudio.h | 2 + + include/sound/pcm_oss.h | 1 + + include/sound/rt5651.h | 29 - + include/sound/rt5659.h | 1 + + include/sound/soc-dapm.h | 16 + + include/sound/soc.h | 14 +- + include/uapi/asm-generic/siginfo.h | 3 +- + include/uapi/linux/blktrace_api.h | 2 +- + include/uapi/linux/irda.h | 252 -- + include/uapi/linux/ixjuser.h | 721 --- + include/uapi/linux/msdos_fs.h | 2 + + include/uapi/linux/serial_core.h | 3 + + include/uapi/linux/stm.h | 13 +- + include/uapi/linux/telephony.h | 263 -- + include/uapi/linux/usb/audio.h | 1 + + include/uapi/sound/asound.h | 1 + + init/Kconfig | 2 +- + kernel/audit.c | 6 +- + kernel/signal.c | 4 - + kernel/sysctl.c | 11 + + kernel/trace/trace.c | 2 +- + kernel/trace/trace_printk.c | 4 +- + lib/devres.c | 78 +- + lib/int_sqrt.c | 30 + + lib/kfifo.c | 2 +- + lib/kobject.c | 39 +- + lib/raid6/sse2.c | 14 +- + lib/sbitmap.c | 10 +- + mm/backing-dev.c | 2 - + net/core/utils.c | 23 + + net/ieee802154/6lowpan/reassembly.c | 2 - + net/ipv4/ip_fragment.c | 5 +- + net/ipv4/ip_output.c | 3 +- + net/ipv6/datagram.c | 9 +- + net/ipv6/ip6_output.c | 18 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 2 - + net/ipv6/ping.c | 2 +- + net/ipv6/reassembly.c | 2 - + net/ipv6/route.c | 17 + + net/ipv6/udp.c | 31 +- + net/rxrpc/input.c | 6 + + net/rxrpc/protocol.h | 6 + + net/socket.c | 2 +- + net/tipc/socket.c | 3 +- + net/tipc/subscr.c | 2 + + net/unix/af_unix.c | 10 - + scripts/kallsyms.c | 1 + + scripts/recordmcount.pl | 5 + + sound/core/control.c | 18 +- + sound/core/init.c | 4 +- + sound/core/oss/pcm_oss.c | 185 +- + sound/core/pcm.c | 8 +- + sound/core/pcm_lib.c | 8 +- + sound/core/pcm_native.c | 19 +- + sound/core/vmaster.c | 7 +- + sound/drivers/aloop.c | 12 +- + sound/hda/hdac_device.c | 35 + + sound/pci/echoaudio/echoaudio.c | 3 +- + sound/pci/emu10k1/emu10k1_main.c | 71 +- + sound/pci/emu10k1/emupcm.c | 10 +- + sound/pci/emu10k1/memory.c | 101 +- + sound/pci/hda/hda_beep.c | 17 +- + sound/pci/hda/hda_beep.h | 17 +- + sound/pci/hda/hda_codec.c | 28 +- + sound/pci/hda/hda_intel.c | 3 + + sound/pci/hda/hda_local.h | 6 +- + sound/pci/ice1712/juli.c | 8 +- + sound/pci/ice1712/quartet.c | 8 +- + sound/soc/Kconfig | 1 - + sound/soc/Makefile | 1 - + sound/soc/amd/Kconfig | 9 + + sound/soc/amd/Makefile | 2 + + sound/soc/amd/acp-da7219-max98357a.c | 276 ++ + sound/soc/amd/acp-pcm-dma.c | 206 +- + sound/soc/amd/acp-rt5645.c | 4 +- + sound/soc/amd/acp.h | 8 +- + sound/soc/atmel/atmel-classd.c | 65 +- + sound/soc/atmel/atmel-pcm-pdc.c | 6 +- + sound/soc/atmel/atmel-pdmic.c | 67 +- + sound/soc/au1x/dbdma2.c | 13 +- + sound/soc/au1x/dma.c | 12 +- + sound/soc/bcm/cygnus-pcm.c | 7 +- + sound/soc/bcm/cygnus-ssp.c | 2 +- + sound/soc/blackfin/Kconfig | 205 - + sound/soc/blackfin/Makefile | 40 - + sound/soc/blackfin/bf5xx-ac97-pcm.c | 480 -- + sound/soc/blackfin/bf5xx-ac97.c | 388 -- + sound/soc/blackfin/bf5xx-ac97.h | 57 - + sound/soc/blackfin/bf5xx-ad1836.c | 109 - + sound/soc/blackfin/bf5xx-ad193x.c | 131 - + sound/soc/blackfin/bf5xx-ad1980.c | 109 - + sound/soc/blackfin/bf5xx-ad73311.c | 212 - + sound/soc/blackfin/bf5xx-i2s-pcm.c | 373 -- + sound/soc/blackfin/bf5xx-i2s-pcm.h | 17 - + sound/soc/blackfin/bf5xx-i2s.c | 391 -- + sound/soc/blackfin/bf5xx-sport.c | 1102 ----- + sound/soc/blackfin/bf5xx-sport.h | 174 - + sound/soc/blackfin/bf5xx-ssm2602.c | 126 - + sound/soc/blackfin/bf6xx-i2s.c | 239 - + sound/soc/blackfin/bf6xx-sport.c | 425 -- + sound/soc/blackfin/bf6xx-sport.h | 82 - + sound/soc/blackfin/bfin-eval-adau1373.c | 173 - + sound/soc/blackfin/bfin-eval-adau1701.c | 113 - + sound/soc/blackfin/bfin-eval-adau1x61.c | 142 - + sound/soc/blackfin/bfin-eval-adau1x81.c | 129 - + sound/soc/blackfin/bfin-eval-adav80x.c | 145 - + sound/soc/codecs/88pm860x-codec.c | 166 +- + sound/soc/codecs/88pm860x-codec.h | 4 +- + sound/soc/codecs/Kconfig | 50 +- + sound/soc/codecs/Makefile | 17 +- + sound/soc/codecs/ab8500-codec.c | 295 +- + sound/soc/codecs/ac97.c | 46 +- + sound/soc/codecs/ad1836.c | 68 +- + sound/soc/codecs/ad193x-i2c.c | 7 - + sound/soc/codecs/ad193x-spi.c | 7 - + sound/soc/codecs/ad193x.c | 46 +- + sound/soc/codecs/ad1980.c | 87 +- + sound/soc/codecs/ad73311.c | 27 +- + sound/soc/codecs/adau1373.c | 84 +- + sound/soc/codecs/adau1701.c | 101 +- + sound/soc/codecs/adau1761.c | 88 +- + sound/soc/codecs/adau1781.c | 51 +- + sound/soc/codecs/adau17x1.c | 69 +- + sound/soc/codecs/adau17x1.h | 8 +- + sound/soc/codecs/adau1977-i2c.c | 7 - + sound/soc/codecs/adau1977-spi.c | 7 - + sound/soc/codecs/adau1977.c | 59 +- + sound/soc/codecs/adau7002.c | 30 +- + sound/soc/codecs/adav801.c | 7 - + sound/soc/codecs/adav803.c | 7 - + sound/soc/codecs/adav80x.c | 130 +- + sound/soc/codecs/ads117x.c | 27 +- + sound/soc/codecs/ak4104.c | 68 +- + sound/soc/codecs/ak4458.c | 657 +++ + sound/soc/codecs/ak4458.h | 86 + + sound/soc/codecs/ak4535.c | 78 +- + sound/soc/codecs/ak4554.c | 27 +- + sound/soc/codecs/ak4613.c | 72 +- + sound/soc/codecs/ak4641.c | 91 +- + sound/soc/codecs/ak4642.c | 104 +- + sound/soc/codecs/ak4671.c | 67 +- + sound/soc/codecs/ak5386.c | 62 +- + sound/soc/codecs/ak5558.c | 415 ++ + sound/soc/codecs/ak5558.h | 52 + + sound/soc/codecs/alc5623.c | 147 +- + sound/soc/codecs/alc5632.c | 138 +- + sound/soc/codecs/arizona.c | 249 +- + sound/soc/codecs/arizona.h | 24 +- + sound/soc/codecs/bd28623.c | 242 + + sound/soc/codecs/bt-sco.c | 21 +- + sound/soc/codecs/cpcap.c | 1562 +++++++ + sound/soc/codecs/cq93vc.c | 33 +- + sound/soc/codecs/cs35l32.c | 45 +- + sound/soc/codecs/cs35l33.c | 186 +- + sound/soc/codecs/cs35l34.c | 127 +- + sound/soc/codecs/cs35l35.c | 104 +- + sound/soc/codecs/cs4265.c | 98 +- + sound/soc/codecs/cs4270.c | 124 +- + sound/soc/codecs/cs4271-i2c.c | 7 - + sound/soc/codecs/cs4271-spi.c | 7 - + sound/soc/codecs/cs4271.c | 105 +- + sound/soc/codecs/cs42l42.c | 154 +- + sound/soc/codecs/cs42l42.h | 2 +- + sound/soc/codecs/cs42l51-i2c.c | 8 - + sound/soc/codecs/cs42l51.c | 81 +- + sound/soc/codecs/cs42l52.c | 146 +- + sound/soc/codecs/cs42l56.c | 158 +- + sound/soc/codecs/cs42l73.c | 122 +- + sound/soc/codecs/cs42xx8-i2c.c | 1 - + sound/soc/codecs/cs42xx8.c | 57 +- + sound/soc/codecs/cs43130.c | 243 +- + sound/soc/codecs/cs43130.h | 2 +- + sound/soc/codecs/cs4349.c | 39 +- + sound/soc/codecs/cs47l24.c | 136 +- + sound/soc/codecs/cs53l30.c | 57 +- + sound/soc/codecs/cx20442.c | 89 +- + sound/soc/codecs/da7210.c | 181 +- + sound/soc/codecs/da7213.c | 328 +- + sound/soc/codecs/da7218.c | 498 +- + sound/soc/codecs/da7218.h | 2 +- + sound/soc/codecs/da7219-aad.c | 236 +- + sound/soc/codecs/da7219-aad.h | 12 +- + sound/soc/codecs/da7219.c | 434 +- + sound/soc/codecs/da7219.h | 11 +- + sound/soc/codecs/da732x.c | 241 +- + sound/soc/codecs/da9055.c | 186 +- + sound/soc/codecs/dmic.c | 92 +- + sound/soc/codecs/es7134.c | 27 +- + sound/soc/codecs/es8316.c | 80 +- + sound/soc/codecs/es8328-i2c.c | 7 - + sound/soc/codecs/es8328-spi.c | 7 - + sound/soc/codecs/es8328.c | 147 +- + sound/soc/codecs/gtm601.c | 28 +- + sound/soc/codecs/hdac_hdmi.c | 65 +- + sound/soc/codecs/hdac_hdmi.h | 2 +- + sound/soc/codecs/hdmi-codec.c | 30 +- + sound/soc/codecs/ics43432.c | 16 +- + sound/soc/codecs/inno_rk3036.c | 70 +- + sound/soc/codecs/isabelle.c | 57 +- + sound/soc/codecs/jz4740.c | 50 +- + sound/soc/codecs/lm49453.c | 65 +- + sound/soc/codecs/max9759.c | 207 + + sound/soc/codecs/max98088.c | 314 +- + sound/soc/codecs/max98090.c | 319 +- + sound/soc/codecs/max98090.h | 4 +- + sound/soc/codecs/max98095.c | 448 +- + sound/soc/codecs/max98095.h | 2 +- + sound/soc/codecs/max98357a.c | 29 +- + sound/soc/codecs/max98371.c | 43 +- + sound/soc/codecs/max98371.h | 1 - + sound/soc/codecs/max98373.c | 75 +- + sound/soc/codecs/max9850.c | 80 +- + sound/soc/codecs/max9860.c | 70 +- + sound/soc/codecs/max9867.c | 91 +- + sound/soc/codecs/max9867.h | 1 - + sound/soc/codecs/max98925.c | 72 +- + sound/soc/codecs/max98925.h | 2 +- + sound/soc/codecs/max98926.c | 56 +- + sound/soc/codecs/max98926.h | 2 +- + sound/soc/codecs/max98927.c | 82 +- + sound/soc/codecs/max98927.h | 2 +- + sound/soc/codecs/mc13783.c | 68 +- + sound/soc/codecs/ml26124.c | 103 +- + sound/soc/codecs/msm8916-wcd-analog.c | 207 +- + sound/soc/codecs/msm8916-wcd-digital.c | 115 +- + sound/soc/codecs/nau8540.c | 79 +- + sound/soc/codecs/nau8810.c | 73 +- + sound/soc/codecs/nau8824.c | 153 +- + sound/soc/codecs/nau8824.h | 2 +- + sound/soc/codecs/nau8825.c | 107 +- + sound/soc/codecs/nau8825.h | 2 +- + sound/soc/codecs/pcm1681.c | 62 +- + sound/soc/codecs/pcm1789-i2c.c | 62 + + sound/soc/codecs/pcm1789.c | 274 ++ + sound/soc/codecs/pcm1789.h | 17 + + sound/soc/codecs/pcm179x-i2c.c | 6 - + sound/soc/codecs/pcm179x-spi.c | 6 - + sound/soc/codecs/pcm179x.c | 45 +- + sound/soc/codecs/pcm179x.h | 1 - + sound/soc/codecs/pcm186x-i2c.c | 8 - + sound/soc/codecs/pcm186x-spi.c | 8 - + sound/soc/codecs/pcm186x.c | 143 +- + sound/soc/codecs/pcm186x.h | 1 - + sound/soc/codecs/pcm3008.c | 36 +- + sound/soc/codecs/pcm3168a.c | 51 +- + sound/soc/codecs/pcm5102a.c | 16 +- + sound/soc/codecs/pcm512x.c | 162 +- + sound/soc/codecs/rt274.c | 206 +- + sound/soc/codecs/rt286.c | 205 +- + sound/soc/codecs/rt286.h | 2 +- + sound/soc/codecs/rt298.c | 217 +- + sound/soc/codecs/rt298.h | 2 +- + sound/soc/codecs/rt5514-spi.c | 36 +- + sound/soc/codecs/rt5514.c | 128 +- + sound/soc/codecs/rt5514.h | 2 +- + sound/soc/codecs/rt5616.c | 219 +- + sound/soc/codecs/rt5631.c | 324 +- + sound/soc/codecs/rt5640.c | 260 +- + sound/soc/codecs/rt5640.h | 6 +- + sound/soc/codecs/rt5645.c | 370 +- + sound/soc/codecs/rt5645.h | 4 +- + sound/soc/codecs/rt5651.c | 752 +-- + sound/soc/codecs/rt5651.h | 23 +- + sound/soc/codecs/rt5659.c | 472 +- + sound/soc/codecs/rt5659.h | 21 +- + sound/soc/codecs/rt5660.c | 145 +- + sound/soc/codecs/rt5660.h | 2 +- + sound/soc/codecs/rt5663.c | 600 ++- + sound/soc/codecs/rt5663.h | 4 +- + sound/soc/codecs/rt5665.c | 350 +- + sound/soc/codecs/rt5665.h | 3 +- + sound/soc/codecs/rt5670.c | 295 +- + sound/soc/codecs/rt5670.h | 10 +- + sound/soc/codecs/rt5677.c | 205 +- + sound/soc/codecs/rt5677.h | 4 +- + sound/soc/codecs/sgtl5000.c | 275 +- + sound/soc/codecs/sgtl5000.h | 7 + + sound/soc/codecs/si476x.c | 42 +- + sound/soc/codecs/sirf-audio-codec.c | 58 +- + sound/soc/codecs/spdif_receiver.c | 26 +- + sound/soc/codecs/spdif_transmitter.c | 26 +- + sound/soc/codecs/ssm2518.c | 57 +- + sound/soc/codecs/ssm2602-i2c.c | 7 - + sound/soc/codecs/ssm2602-spi.c | 7 - + sound/soc/codecs/ssm2602.c | 96 +- + sound/soc/codecs/ssm4567.c | 44 +- + sound/soc/codecs/sta32x.c | 134 +- + sound/soc/codecs/sta350.c | 117 +- + sound/soc/codecs/sta529.c | 69 +- + sound/soc/codecs/stac9766.c | 77 +- + sound/soc/codecs/sti-sas.c | 84 +- + sound/soc/codecs/tas2552.c | 178 +- + sound/soc/codecs/tas5086.c | 94 +- + sound/soc/codecs/tas571x.c | 55 +- + sound/soc/codecs/tas5720.c | 151 +- + sound/soc/codecs/tas6424.c | 99 +- + sound/soc/codecs/tda7419.c | 654 +++ + sound/soc/codecs/tfa9879.c | 50 +- + sound/soc/codecs/tlv320aic23-i2c.c | 7 - + sound/soc/codecs/tlv320aic23-spi.c | 7 - + sound/soc/codecs/tlv320aic23.c | 120 +- + sound/soc/codecs/tlv320aic26.c | 83 +- + sound/soc/codecs/tlv320aic31xx.c | 339 +- + sound/soc/codecs/tlv320aic31xx.h | 1 + + sound/soc/codecs/tlv320aic32x4.c | 207 +- + sound/soc/codecs/tlv320aic3x.c | 295 +- + sound/soc/codecs/tlv320dac33.c | 402 +- + sound/soc/codecs/tscs42xx.c | 244 +- + sound/soc/codecs/twl4030.c | 383 +- + sound/soc/codecs/twl6040.c | 269 +- + sound/soc/codecs/twl6040.h | 10 +- + sound/soc/codecs/uda134x.c | 78 +- + sound/soc/codecs/uda1380.c | 160 +- + sound/soc/codecs/wl1273.c | 93 +- + sound/soc/codecs/wl1273.h | 2 +- + sound/soc/codecs/wm0010.c | 181 +- + sound/soc/codecs/wm1250-ev1.c | 27 +- + sound/soc/codecs/wm2000.c | 78 +- + sound/soc/codecs/wm2200.c | 157 +- + sound/soc/codecs/wm5100.c | 260 +- + sound/soc/codecs/wm5100.h | 2 +- + sound/soc/codecs/wm5102.c | 154 +- + sound/soc/codecs/wm5110.c | 222 +- + sound/soc/codecs/wm8350.c | 183 +- + sound/soc/codecs/wm8350.h | 4 +- + sound/soc/codecs/wm8400.c | 211 +- + sound/soc/codecs/wm8510.c | 149 +- + sound/soc/codecs/wm8523.c | 98 +- + sound/soc/codecs/wm8524.c | 56 +- + sound/soc/codecs/wm8580.c | 150 +- + sound/soc/codecs/wm8711.c | 116 +- + sound/soc/codecs/wm8727.c | 29 +- + sound/soc/codecs/wm8728.c | 82 +- + sound/soc/codecs/wm8731.c | 101 +- + sound/soc/codecs/wm8737.c | 109 +- + sound/soc/codecs/wm8741.c | 133 +- + sound/soc/codecs/wm8750.c | 115 +- + sound/soc/codecs/wm8753.c | 289 +- + sound/soc/codecs/wm8770.c | 131 +- + sound/soc/codecs/wm8776.c | 105 +- + sound/soc/codecs/wm8782.c | 27 +- + sound/soc/codecs/wm8804.c | 100 +- + sound/soc/codecs/wm8900.c | 251 +- + sound/soc/codecs/wm8903.c | 211 +- + sound/soc/codecs/wm8903.h | 2 +- + sound/soc/codecs/wm8904.c | 355 +- + sound/soc/codecs/wm8940.c | 159 +- + sound/soc/codecs/wm8955.c | 189 +- + sound/soc/codecs/wm8958-dsp2.c | 278 +- + sound/soc/codecs/wm8960.c | 249 +- + sound/soc/codecs/wm8961.c | 241 +- + sound/soc/codecs/wm8962.c | 397 +- + sound/soc/codecs/wm8962.h | 2 +- + sound/soc/codecs/wm8971.c | 108 +- + sound/soc/codecs/wm8974.c | 143 +- + sound/soc/codecs/wm8978.c | 185 +- + sound/soc/codecs/wm8983.c | 170 +- + sound/soc/codecs/wm8985.c | 201 +- + sound/soc/codecs/wm8988.c | 127 +- + sound/soc/codecs/wm8990.c | 179 +- + sound/soc/codecs/wm8991.c | 167 +- + sound/soc/codecs/wm8993.c | 237 +- + sound/soc/codecs/wm8994.c | 810 ++-- + sound/soc/codecs/wm8994.h | 8 +- + sound/soc/codecs/wm8995.c | 286 +- + sound/soc/codecs/wm8996.c | 401 +- + sound/soc/codecs/wm8996.h | 4 +- + sound/soc/codecs/wm8997.c | 72 +- + sound/soc/codecs/wm8998.c | 115 +- + sound/soc/codecs/wm9081.c | 228 +- + sound/soc/codecs/wm9090.c | 109 +- + sound/soc/codecs/wm9705.c | 83 +- + sound/soc/codecs/wm9712.c | 111 +- + sound/soc/codecs/wm9713.c | 203 +- + sound/soc/codecs/wm_adsp.c | 99 +- + sound/soc/codecs/wm_adsp.h | 14 +- + sound/soc/codecs/wm_hubs.c | 254 +- + sound/soc/codecs/wm_hubs.h | 18 +- + sound/soc/codecs/zx_aud96p22.c | 35 +- + sound/soc/davinci/davinci-i2s.c | 13 +- + sound/soc/dwc/dwc-i2s.c | 4 + + sound/soc/dwc/dwc-pcm.c | 5 +- + sound/soc/fsl/Kconfig | 11 - + sound/soc/fsl/Makefile | 2 - + sound/soc/fsl/fsl-asoc-card.c | 6 +- + sound/soc/fsl/fsl_asrc.c | 10 - + sound/soc/fsl/fsl_asrc.h | 3 +- + sound/soc/fsl/fsl_asrc_dma.c | 14 +- + sound/soc/fsl/fsl_dma.c | 29 +- + sound/soc/fsl/fsl_esai.c | 2 +- + sound/soc/fsl/fsl_ssi.c | 758 ++-- + sound/soc/fsl/fsl_ssi.h | 3 - + sound/soc/fsl/fsl_utils.c | 2 +- + sound/soc/fsl/imx-pcm-fiq.c | 6 +- + sound/soc/fsl/imx-wm8962.c | 312 -- + sound/soc/fsl/mpc5200_dma.c | 16 +- + sound/soc/fsl/wm1133-ev1.c | 6 +- + sound/soc/img/pistachio-internal-dac.c | 34 +- + sound/soc/intel/atom/sst-atom-controls.c | 36 +- + sound/soc/intel/atom/sst-mfld-platform-compress.c | 4 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 32 +- + sound/soc/intel/atom/sst-mfld-platform.h | 4 +- + sound/soc/intel/atom/sst/sst.c | 24 +- + sound/soc/intel/atom/sst/sst.h | 20 +- + sound/soc/intel/atom/sst/sst_acpi.c | 3 +- + sound/soc/intel/atom/sst/sst_drv_interface.c | 19 - + sound/soc/intel/atom/sst/sst_pvt.c | 8 - + sound/soc/intel/atom/sst/sst_stream.c | 117 +- + sound/soc/intel/baytrail/sst-baytrail-pcm.c | 66 +- + sound/soc/intel/boards/Kconfig | 25 + + sound/soc/intel/boards/Makefile | 4 + + sound/soc/intel/boards/bdw-rt5677.c | 41 +- + sound/soc/intel/boards/broadwell.c | 17 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 12 +- + sound/soc/intel/boards/bxt_rt298.c | 27 +- + sound/soc/intel/boards/byt-rt5640.c | 4 +- + sound/soc/intel/boards/bytcr_rt5640.c | 8 +- + sound/soc/intel/boards/bytcr_rt5651.c | 466 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 282 ++ + sound/soc/intel/boards/cht_bsw_rt5645.c | 8 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 18 +- + sound/soc/intel/boards/haswell.c | 3 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 613 +++ + sound/soc/intel/boards/kbl_rt5663_max98927.c | 19 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 14 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 12 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 12 +- + sound/soc/intel/boards/skl_rt286.c | 12 +- + sound/soc/intel/common/soc-acpi-intel-cht-match.c | 9 + + sound/soc/intel/haswell/sst-haswell-ipc.h | 2 + + sound/soc/intel/haswell/sst-haswell-pcm.c | 118 +- + sound/soc/intel/skylake/skl-debug.c | 2 +- + sound/soc/intel/skylake/skl-messages.c | 9 +- + sound/soc/intel/skylake/skl-pcm.c | 72 +- + sound/soc/intel/skylake/skl-ssp-clk.c | 4 +- + sound/soc/intel/skylake/skl-sst-ipc.h | 3 + + sound/soc/intel/skylake/skl-topology.c | 133 +- + sound/soc/intel/skylake/skl-topology.h | 15 +- + sound/soc/intel/skylake/skl.c | 40 + + sound/soc/intel/skylake/skl.h | 6 +- + sound/soc/kirkwood/kirkwood-dma.c | 3 +- + sound/soc/kirkwood/kirkwood-i2s.c | 20 +- + sound/soc/kirkwood/kirkwood.h | 4 +- + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 16 +- + .../soc/mediatek/common/mtk-afe-platform-driver.c | 9 +- + .../soc/mediatek/common/mtk-afe-platform-driver.h | 3 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 54 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 42 +- + sound/soc/mediatek/mt8173/mt8173-max98090.c | 4 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 6 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 12 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 12 +- + sound/soc/nuc900/nuc900-pcm.c | 5 +- + sound/soc/omap/ams-delta.c | 20 +- + sound/soc/omap/omap-abe-twl6040.c | 8 +- + sound/soc/omap/omap-pcm.c | 5 +- + sound/soc/pxa/mioa701_wm9713.c | 30 +- + sound/soc/pxa/mmp-pcm.c | 11 +- + sound/soc/pxa/mmp-sspa.c | 1 - + sound/soc/pxa/pxa2xx-pcm.c | 5 +- + sound/soc/pxa/ttc-dkb.c | 6 +- + sound/soc/qcom/lpass-platform.c | 42 +- + sound/soc/rockchip/Kconfig | 3 + + sound/soc/rockchip/rk3288_hdmi_analog.c | 2 +- + sound/soc/rockchip/rk3399_gru_sound.c | 4 +- + sound/soc/rockchip/rockchip_rt5645.c | 8 +- + sound/soc/samsung/Makefile | 3 - + sound/soc/samsung/i2s-regs.h | 11 +- + sound/soc/samsung/i2s.c | 52 +- + sound/soc/samsung/i2s.h | 11 +- + sound/soc/samsung/idma.c | 5 +- + sound/soc/samsung/littlemill.c | 8 +- + sound/soc/samsung/lowland.c | 12 +- + sound/soc/samsung/odroid.c | 33 +- + sound/soc/samsung/snow.c | 229 +- + sound/soc/samsung/speyside.c | 12 +- + sound/soc/samsung/tm2_wm5110.c | 206 +- + sound/soc/samsung/tobermory.c | 6 +- + sound/soc/sh/dma-sh7760.c | 5 +- + sound/soc/sh/fsi.c | 24 +- + sound/soc/sh/rcar/core.c | 36 +- + sound/soc/sh/rcar/rsnd.h | 20 + + sound/soc/sh/rcar/src.c | 22 +- + sound/soc/sh/rcar/ssi.c | 16 +- + sound/soc/sh/siu.h | 2 +- + sound/soc/sh/siu_dai.c | 10 +- + sound/soc/sh/siu_pcm.c | 9 +- + sound/soc/sirf/sirf-usp.h | 2 +- + sound/soc/soc-ac97.c | 84 +- + sound/soc/soc-core.c | 117 +- + sound/soc/soc-dapm.c | 46 +- + sound/soc/soc-generic-dmaengine-pcm.c | 121 +- + sound/soc/soc-io.c | 7 +- + sound/soc/soc-pcm.c | 11 + + sound/soc/soc-topology.c | 35 +- + sound/soc/soc-utils.c | 28 +- + sound/soc/stm/stm32_adfsdm.c | 7 +- + sound/soc/stm/stm32_sai.c | 2 + + sound/soc/stm/stm32_sai.h | 2 + + sound/soc/stm/stm32_sai_sub.c | 153 +- + sound/soc/stm/stm32_spdifrx.c | 7 +- + sound/soc/sunxi/sun4i-codec.c | 71 +- + sound/soc/sunxi/sun8i-codec.c | 23 +- + sound/soc/tegra/tegra_wm8903.c | 8 +- + sound/soc/txx9/txx9aclc.c | 26 +- + sound/soc/uniphier/Kconfig | 33 + + sound/soc/uniphier/Makefile | 8 + + sound/soc/uniphier/aio-compress.c | 438 ++ + sound/soc/uniphier/aio-core.c | 1138 +++++ + sound/soc/uniphier/aio-cpu.c | 578 +++ + sound/soc/uniphier/aio-dma.c | 319 ++ + sound/soc/uniphier/aio-ld11.c | 431 ++ + sound/soc/uniphier/aio-pxs2.c | 320 ++ + sound/soc/uniphier/aio-reg.h | 465 ++ + sound/soc/uniphier/aio.h | 359 ++ + sound/soc/uniphier/evea.c | 102 +- + sound/soc/xtensa/xtfpga-i2s.c | 17 +- + sound/usb/card.c | 7 +- + sound/usb/card.h | 2 +- + sound/usb/clock.c | 231 +- + sound/usb/clock.h | 4 +- + sound/usb/format.c | 93 +- + sound/usb/format.h | 6 +- + sound/usb/mixer.c | 511 ++- + sound/usb/quirks.c | 102 +- + sound/usb/quirks.h | 4 + + sound/usb/stream.c | 395 +- + tools/gpio/gpio-event-mon.c | 2 +- + tools/hv/hv_fcopy_daemon.c | 4 +- + tools/hv/hv_kvp_daemon.c | 138 +- + tools/hv/hv_vss_daemon.c | 1 + + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/filesystems/.gitignore | 1 + + tools/testing/selftests/filesystems/Makefile | 2 +- + tools/testing/selftests/filesystems/devpts_pts.c | 313 ++ + tools/testing/selftests/firmware/Makefile | 2 +- + tools/testing/selftests/firmware/config | 4 + + tools/testing/selftests/firmware/fw_fallback.sh | 65 +- + tools/testing/selftests/firmware/fw_filesystem.sh | 72 +- + tools/testing/selftests/firmware/fw_lib.sh | 194 + + tools/testing/selftests/firmware/fw_run_tests.sh | 70 + + tools/thermal/tmon/sysfs.c | 12 +- + tools/thermal/tmon/tmon.c | 1 - + tools/usb/usbip/libsrc/usbip_common.c | 23 + + tools/usb/usbip/libsrc/usbip_common.h | 11 + + tools/usb/usbip/libsrc/usbip_host_common.c | 5 +- + tools/usb/usbip/src/usbip_attach.c | 10 +- + tools/usb/usbip/src/usbip_list.c | 6 +- + tools/usb/usbip/src/usbip_network.c | 10 +- + tools/usb/usbip/src/usbip_network.h | 6 +- + tools/usb/usbip/src/usbipd.c | 34 +- + 2347 files changed, 105393 insertions(+), 136861 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-usb_role + create mode 100644 Documentation/ABI/testing/sysfs-driver-fsi-master-gpio + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-logitech-hidpp + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-ntrig + create mode 100644 Documentation/ABI/testing/sysfs-driver-ufs + create mode 100644 Documentation/crypto/crypto_engine.rst + create mode 100644 Documentation/devicetree/bindings/connector/samsung,usb-connector-11pin.txt + create mode 100644 Documentation/devicetree/bindings/connector/usb-connector.txt + create mode 100644 Documentation/devicetree/bindings/fsi/fsi.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-eic-sprd.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-sprd.txt + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-tz1090-pdc.txt + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-tz1090.txt + create mode 100644 Documentation/devicetree/bindings/gpio/nintendo,hollywood-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/raspberrypi,firmware-gpio.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/axp20x_adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/potentiometer/ad5272.txt + create mode 100644 Documentation/devicetree/bindings/iio/temperature/mlx90632.txt + create mode 100644 Documentation/devicetree/bindings/input/zii,rave-sp-pwrbutton.txt + create mode 100644 Documentation/devicetree/bindings/phy/meson-gxl-usb3-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/phy-hi3798cv200-combphy.txt + create mode 100644 Documentation/devicetree/bindings/phy/phy-hisi-inno-usb2.txt + create mode 100644 Documentation/devicetree/bindings/phy/phy-mapphone-mdm6600.txt + create mode 100644 Documentation/devicetree/bindings/phy/phy-stm32-usbphyc.txt + rename Documentation/devicetree/bindings/rng/{imx-rngc.txt => imx-rng.txt} (54%) + create mode 100644 Documentation/devicetree/bindings/rng/ks-sa-rng.txt + create mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt + create mode 100644 Documentation/devicetree/bindings/sound/ak4458.txt + create mode 100644 Documentation/devicetree/bindings/sound/ak5558.txt + delete mode 100644 Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt + create mode 100644 Documentation/devicetree/bindings/sound/maxim,max9759.txt + create mode 100644 Documentation/devicetree/bindings/sound/pcm1789.txt + create mode 100644 Documentation/devicetree/bindings/sound/rohm,bd28623.txt + create mode 100644 Documentation/devicetree/bindings/sound/tda7419.txt + create mode 100644 Documentation/devicetree/bindings/sound/uniphier,aio.txt + create mode 100644 Documentation/devicetree/bindings/usb/amlogic,dwc3.txt + create mode 100644 Documentation/devicetree/bindings/usb/usb-hcd.txt + create mode 100644 Documentation/driver-api/device_connection.rst + rename Documentation/{gpio/board.txt => driver-api/gpio/board.rst} (88%) + rename Documentation/{gpio/consumer.txt => driver-api/gpio/consumer.rst} (89%) + rename Documentation/{gpio/driver.txt => driver-api/gpio/driver.rst} (93%) + rename Documentation/{gpio/drivers-on-gpio.txt => driver-api/gpio/drivers-on-gpio.rst} (99%) + rename Documentation/driver-api/{gpio.rst => gpio/index.rst} (74%) + rename Documentation/{gpio/gpio.txt => driver-api/gpio/intro.rst} (96%) + rename Documentation/{gpio/gpio-legacy.txt => driver-api/gpio/legacy.rst} (96%) + create mode 100644 Documentation/fault-injection/nvme-fault-injection.txt + create mode 100644 Documentation/input/devices/pxrc.rst + create mode 100644 Documentation/networking/dpaa2/index.rst + rename {drivers/staging/fsl-mc => Documentation/networking/dpaa2}/overview.rst (100%) + delete mode 100644 Documentation/networking/irda.txt + delete mode 100644 Documentation/scsi/ChangeLog.1992-1997 + delete mode 100644 Documentation/scsi/Mylex.txt + create mode 100644 Documentation/scsi/sd-parameters.txt + delete mode 100644 Documentation/scsi/tmscsim.txt + create mode 100644 arch/arm/crypto/speck-neon-core.S + create mode 100644 arch/arm/crypto/speck-neon-glue.c + create mode 100644 arch/arm64/crypto/speck-neon-core.S + create mode 100644 arch/arm64/crypto/speck-neon-glue.c + create mode 100644 arch/riscv/include/asm/fence.h + create mode 100644 arch/riscv/include/asm/module.h + create mode 100644 arch/riscv/kernel/mcount-dyn.S + create mode 100644 arch/riscv/kernel/module-sections.c + create mode 100644 arch/riscv/kernel/module.lds + delete mode 100644 crypto/ablk_helper.c + create mode 100644 crypto/cfb.c + create mode 100644 crypto/sm4_generic.c + create mode 100644 crypto/speck.c + create mode 100644 drivers/base/devcon.c + create mode 100644 drivers/base/firmware_loader/Makefile + create mode 100644 drivers/base/firmware_loader/fallback.c + create mode 100644 drivers/base/firmware_loader/fallback.h + create mode 100644 drivers/base/firmware_loader/fallback_table.c + create mode 100644 drivers/base/firmware_loader/firmware.h + rename drivers/base/{firmware_class.c => firmware_loader/main.c} (60%) + create mode 100644 drivers/bus/fsl-mc/Kconfig + create mode 100644 drivers/bus/fsl-mc/Makefile + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp.c (69%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpcon.c (94%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.c (95%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc-driver.c (99%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc.c (96%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-allocator.c (99%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-bus.c (99%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-msi.c (99%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-private.h (86%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-io.c (99%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-sys.c (93%) + create mode 100644 drivers/char/hw_random/ks-sa-rng.c + delete mode 100644 drivers/crypto/bfin_crc.c + delete mode 100644 drivers/crypto/bfin_crc.h + rename drivers/{staging => crypto}/ccree/Makefile (100%) + rename drivers/{staging => crypto}/ccree/cc_aead.c (97%) + rename drivers/{staging => crypto}/ccree/cc_aead.h (100%) + rename drivers/{staging => crypto}/ccree/cc_buffer_mgr.c (98%) + rename drivers/{staging => crypto}/ccree/cc_buffer_mgr.h (81%) + rename drivers/{staging => crypto}/ccree/cc_cipher.c (75%) + rename drivers/{staging => crypto}/ccree/cc_cipher.h (73%) + rename drivers/{staging => crypto}/ccree/cc_crypto_ctx.h (78%) + rename drivers/{staging => crypto}/ccree/cc_debugfs.c (100%) + rename drivers/{staging => crypto}/ccree/cc_debugfs.h (100%) + rename drivers/{staging => crypto}/ccree/cc_driver.c (82%) + rename drivers/{staging => crypto}/ccree/cc_driver.h (89%) + rename drivers/{staging => crypto}/ccree/cc_fips.c (92%) + rename drivers/{staging => crypto}/ccree/cc_fips.h (99%) + rename drivers/{staging => crypto}/ccree/cc_hash.c (94%) + rename drivers/{staging => crypto}/ccree/cc_hash.h (91%) + rename drivers/{staging => crypto}/ccree/cc_host_regs.h (97%) + rename drivers/{staging => crypto}/ccree/cc_hw_queue_defs.h (98%) + rename drivers/{staging => crypto}/ccree/cc_ivgen.c (99%) + rename drivers/{staging => crypto}/ccree/cc_ivgen.h (100%) + rename drivers/{staging => crypto}/ccree/cc_kernel_regs.h (99%) + rename drivers/{staging => crypto}/ccree/cc_lli_defs.h (100%) + rename drivers/{staging => crypto}/ccree/cc_pm.c (100%) + rename drivers/{staging => crypto}/ccree/cc_pm.h (99%) + rename drivers/{staging => crypto}/ccree/cc_request_mgr.c (98%) + rename drivers/{staging => crypto}/ccree/cc_request_mgr.h (100%) + rename drivers/{staging => crypto}/ccree/cc_sram_mgr.c (88%) + rename drivers/{staging => crypto}/ccree/cc_sram_mgr.h (100%) + create mode 100644 drivers/gpio/gpio-eic-sprd.c + create mode 100644 drivers/gpio/gpio-hlwd.c + create mode 100644 drivers/gpio/gpio-pmic-eic-sprd.c + create mode 100644 drivers/gpio/gpio-raspberrypi-exp.c + create mode 100644 drivers/gpio/gpio-sprd.c + delete mode 100644 drivers/gpio/gpio-tz1090-pdc.c + delete mode 100644 drivers/gpio/gpio-tz1090.c + create mode 100644 drivers/hid/hid-elan.c + create mode 100644 drivers/hid/hid-google-hammer.c + create mode 100644 drivers/hv/hv_trace_balloon.h + create mode 100644 drivers/hwtracing/Kconfig + create mode 100644 drivers/hwtracing/intel_th/acpi.c + create mode 100644 drivers/iio/light/lv0104cs.c + create mode 100644 drivers/iio/potentiometer/ad5272.c + create mode 100644 drivers/iio/potentiometer/mcp4018.c + create mode 100644 drivers/iio/temperature/mlx90632.c + create mode 100644 drivers/input/joystick/pxrc.c + create mode 100644 drivers/input/misc/rave-sp-pwrbutton.c + rename drivers/{staging/fsl-mc/bus => irqchip}/irq-gic-v3-its-fsl-mc-msi.c (97%) + create mode 100644 drivers/misc/lkdtm/Makefile + rename drivers/misc/{lkdtm_bugs.c => lkdtm/bugs.c} (100%) + rename drivers/misc/{lkdtm_core.c => lkdtm/core.c} (100%) + rename drivers/misc/{lkdtm_heap.c => lkdtm/heap.c} (100%) + rename drivers/misc/{ => lkdtm}/lkdtm.h (100%) + rename drivers/misc/{lkdtm_perms.c => lkdtm/perms.c} (100%) + rename drivers/misc/{lkdtm_refcount.c => lkdtm/refcount.c} (99%) + rename drivers/misc/{lkdtm_rodata.c => lkdtm/rodata.c} (100%) + rename drivers/misc/{lkdtm_usercopy.c => lkdtm/usercopy.c} (100%) + create mode 100644 drivers/nvme/host/fault_inject.c + create mode 100644 drivers/phy/amlogic/phy-meson-gxl-usb3.c + create mode 100644 drivers/phy/hisilicon/phy-hisi-inno-usb2.c + create mode 100644 drivers/phy/hisilicon/phy-histb-combphy.c + create mode 100644 drivers/phy/motorola/phy-mapphone-mdm6600.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp.h + create mode 100644 drivers/phy/st/phy-stm32-usbphyc.c + delete mode 100644 drivers/scsi/NCR53c406a.c + delete mode 100644 drivers/scsi/eata.c + delete mode 100644 drivers/scsi/eata_generic.h + delete mode 100644 drivers/scsi/eata_pio.c + delete mode 100644 drivers/scsi/eata_pio.h + delete mode 100644 drivers/scsi/fdomain.c + delete mode 100644 drivers/scsi/fdomain.h + delete mode 100644 drivers/scsi/pcmcia/fdomain_core.c + delete mode 100644 drivers/scsi/pcmcia/fdomain_stub.c + delete mode 100644 drivers/scsi/scsi_module.c + delete mode 100644 drivers/scsi/sym53c416.c + delete mode 100644 drivers/scsi/sym53c416.h + create mode 100644 drivers/scsi/ufs/ufs-sysfs.c + create mode 100644 drivers/scsi/ufs/ufs-sysfs.h + delete mode 100644 drivers/staging/ccree/Kconfig + delete mode 100644 drivers/staging/ccree/TODO + create mode 100644 drivers/staging/fsl-dpaa2/ethsw/Makefile + create mode 100644 drivers/staging/fsl-dpaa2/ethsw/README + create mode 100644 drivers/staging/fsl-dpaa2/ethsw/TODO + create mode 100644 drivers/staging/fsl-dpaa2/ethsw/dpsw-cmd.h + create mode 100644 drivers/staging/fsl-dpaa2/ethsw/dpsw.c + create mode 100644 drivers/staging/fsl-dpaa2/ethsw/dpsw.h + create mode 100644 drivers/staging/fsl-dpaa2/ethsw/ethsw-ethtool.c + create mode 100644 drivers/staging/fsl-dpaa2/ethsw/ethsw.c + create mode 100644 drivers/staging/fsl-dpaa2/ethsw/ethsw.h + delete mode 100644 drivers/staging/fsl-mc/TODO + delete mode 100644 drivers/staging/fsl-mc/bus/dpbp-cmd.h + delete mode 100644 drivers/staging/fsl-mc/bus/dpcon-cmd.h + delete mode 100644 drivers/staging/fsl-mc/include/dpbp.h + delete mode 100644 drivers/staging/fsl-mc/include/dpcon.h + delete mode 100644 drivers/staging/irda/TODO + delete mode 100644 drivers/staging/irda/drivers/Kconfig + delete mode 100644 drivers/staging/irda/drivers/Makefile + delete mode 100644 drivers/staging/irda/drivers/act200l-sir.c + delete mode 100644 drivers/staging/irda/drivers/actisys-sir.c + delete mode 100644 drivers/staging/irda/drivers/ali-ircc.c + delete mode 100644 drivers/staging/irda/drivers/ali-ircc.h + delete mode 100644 drivers/staging/irda/drivers/au1k_ir.c + delete mode 100644 drivers/staging/irda/drivers/bfin_sir.c + delete mode 100644 drivers/staging/irda/drivers/bfin_sir.h + delete mode 100644 drivers/staging/irda/drivers/donauboe.c + delete mode 100644 drivers/staging/irda/drivers/donauboe.h + delete mode 100644 drivers/staging/irda/drivers/esi-sir.c + delete mode 100644 drivers/staging/irda/drivers/girbil-sir.c + delete mode 100644 drivers/staging/irda/drivers/irda-usb.c + delete mode 100644 drivers/staging/irda/drivers/irda-usb.h + delete mode 100644 drivers/staging/irda/drivers/irtty-sir.c + delete mode 100644 drivers/staging/irda/drivers/irtty-sir.h + delete mode 100644 drivers/staging/irda/drivers/kingsun-sir.c + delete mode 100644 drivers/staging/irda/drivers/ks959-sir.c + delete mode 100644 drivers/staging/irda/drivers/ksdazzle-sir.c + delete mode 100644 drivers/staging/irda/drivers/litelink-sir.c + delete mode 100644 drivers/staging/irda/drivers/ma600-sir.c + delete mode 100644 drivers/staging/irda/drivers/mcp2120-sir.c + delete mode 100644 drivers/staging/irda/drivers/mcs7780.c + delete mode 100644 drivers/staging/irda/drivers/mcs7780.h + delete mode 100644 drivers/staging/irda/drivers/nsc-ircc.c + delete mode 100644 drivers/staging/irda/drivers/nsc-ircc.h + delete mode 100644 drivers/staging/irda/drivers/old_belkin-sir.c + delete mode 100644 drivers/staging/irda/drivers/pxaficp_ir.c + delete mode 100644 drivers/staging/irda/drivers/sa1100_ir.c + delete mode 100644 drivers/staging/irda/drivers/sh_sir.c + delete mode 100644 drivers/staging/irda/drivers/sir-dev.h + delete mode 100644 drivers/staging/irda/drivers/sir_dev.c + delete mode 100644 drivers/staging/irda/drivers/sir_dongle.c + delete mode 100644 drivers/staging/irda/drivers/smsc-ircc2.c + delete mode 100644 drivers/staging/irda/drivers/smsc-ircc2.h + delete mode 100644 drivers/staging/irda/drivers/smsc-sio.h + delete mode 100644 drivers/staging/irda/drivers/stir4200.c + delete mode 100644 drivers/staging/irda/drivers/tekram-sir.c + delete mode 100644 drivers/staging/irda/drivers/toim3232-sir.c + delete mode 100644 drivers/staging/irda/drivers/via-ircc.c + delete mode 100644 drivers/staging/irda/drivers/via-ircc.h + delete mode 100644 drivers/staging/irda/drivers/vlsi_ir.c + delete mode 100644 drivers/staging/irda/drivers/vlsi_ir.h + delete mode 100644 drivers/staging/irda/drivers/w83977af.h + delete mode 100644 drivers/staging/irda/drivers/w83977af_ir.c + delete mode 100644 drivers/staging/irda/drivers/w83977af_ir.h + delete mode 100644 drivers/staging/irda/include/net/irda/af_irda.h + delete mode 100644 drivers/staging/irda/include/net/irda/crc.h + delete mode 100644 drivers/staging/irda/include/net/irda/discovery.h + delete mode 100644 drivers/staging/irda/include/net/irda/ircomm_core.h + delete mode 100644 drivers/staging/irda/include/net/irda/ircomm_event.h + delete mode 100644 drivers/staging/irda/include/net/irda/ircomm_lmp.h + delete mode 100644 drivers/staging/irda/include/net/irda/ircomm_param.h + delete mode 100644 drivers/staging/irda/include/net/irda/ircomm_ttp.h + delete mode 100644 drivers/staging/irda/include/net/irda/ircomm_tty.h + delete mode 100644 drivers/staging/irda/include/net/irda/ircomm_tty_attach.h + delete mode 100644 drivers/staging/irda/include/net/irda/irda.h + delete mode 100644 drivers/staging/irda/include/net/irda/irda_device.h + delete mode 100644 drivers/staging/irda/include/net/irda/iriap.h + delete mode 100644 drivers/staging/irda/include/net/irda/iriap_event.h + delete mode 100644 drivers/staging/irda/include/net/irda/irias_object.h + delete mode 100644 drivers/staging/irda/include/net/irda/irlan_client.h + delete mode 100644 drivers/staging/irda/include/net/irda/irlan_common.h + delete mode 100644 drivers/staging/irda/include/net/irda/irlan_eth.h + delete mode 100644 drivers/staging/irda/include/net/irda/irlan_event.h + delete mode 100644 drivers/staging/irda/include/net/irda/irlan_filter.h + delete mode 100644 drivers/staging/irda/include/net/irda/irlan_provider.h + delete mode 100644 drivers/staging/irda/include/net/irda/irlap.h + delete mode 100644 drivers/staging/irda/include/net/irda/irlap_event.h + delete mode 100644 drivers/staging/irda/include/net/irda/irlap_frame.h + delete mode 100644 drivers/staging/irda/include/net/irda/irlmp.h + delete mode 100644 drivers/staging/irda/include/net/irda/irlmp_event.h + delete mode 100644 drivers/staging/irda/include/net/irda/irlmp_frame.h + delete mode 100644 drivers/staging/irda/include/net/irda/irmod.h + delete mode 100644 drivers/staging/irda/include/net/irda/irqueue.h + delete mode 100644 drivers/staging/irda/include/net/irda/irttp.h + delete mode 100644 drivers/staging/irda/include/net/irda/parameters.h + delete mode 100644 drivers/staging/irda/include/net/irda/qos.h + delete mode 100644 drivers/staging/irda/include/net/irda/timer.h + delete mode 100644 drivers/staging/irda/include/net/irda/wrapper.h + delete mode 100644 drivers/staging/irda/net/Kconfig + delete mode 100644 drivers/staging/irda/net/Makefile + delete mode 100644 drivers/staging/irda/net/af_irda.c + delete mode 100644 drivers/staging/irda/net/discovery.c + delete mode 100644 drivers/staging/irda/net/ircomm/Kconfig + delete mode 100644 drivers/staging/irda/net/ircomm/Makefile + delete mode 100644 drivers/staging/irda/net/ircomm/ircomm_core.c + delete mode 100644 drivers/staging/irda/net/ircomm/ircomm_event.c + delete mode 100644 drivers/staging/irda/net/ircomm/ircomm_lmp.c + delete mode 100644 drivers/staging/irda/net/ircomm/ircomm_param.c + delete mode 100644 drivers/staging/irda/net/ircomm/ircomm_ttp.c + delete mode 100644 drivers/staging/irda/net/ircomm/ircomm_tty.c + delete mode 100644 drivers/staging/irda/net/ircomm/ircomm_tty_attach.c + delete mode 100644 drivers/staging/irda/net/ircomm/ircomm_tty_ioctl.c + delete mode 100644 drivers/staging/irda/net/irda_device.c + delete mode 100644 drivers/staging/irda/net/iriap.c + delete mode 100644 drivers/staging/irda/net/iriap_event.c + delete mode 100644 drivers/staging/irda/net/irias_object.c + delete mode 100644 drivers/staging/irda/net/irlan/Kconfig + delete mode 100644 drivers/staging/irda/net/irlan/Makefile + delete mode 100644 drivers/staging/irda/net/irlan/irlan_client.c + delete mode 100644 drivers/staging/irda/net/irlan/irlan_client_event.c + delete mode 100644 drivers/staging/irda/net/irlan/irlan_common.c + delete mode 100644 drivers/staging/irda/net/irlan/irlan_eth.c + delete mode 100644 drivers/staging/irda/net/irlan/irlan_event.c + delete mode 100644 drivers/staging/irda/net/irlan/irlan_filter.c + delete mode 100644 drivers/staging/irda/net/irlan/irlan_provider.c + delete mode 100644 drivers/staging/irda/net/irlan/irlan_provider_event.c + delete mode 100644 drivers/staging/irda/net/irlap.c + delete mode 100644 drivers/staging/irda/net/irlap_event.c + delete mode 100644 drivers/staging/irda/net/irlap_frame.c + delete mode 100644 drivers/staging/irda/net/irlmp.c + delete mode 100644 drivers/staging/irda/net/irlmp_event.c + delete mode 100644 drivers/staging/irda/net/irlmp_frame.c + delete mode 100644 drivers/staging/irda/net/irmod.c + delete mode 100644 drivers/staging/irda/net/irnet/Kconfig + delete mode 100644 drivers/staging/irda/net/irnet/Makefile + delete mode 100644 drivers/staging/irda/net/irnet/irnet.h + delete mode 100644 drivers/staging/irda/net/irnet/irnet_irda.c + delete mode 100644 drivers/staging/irda/net/irnet/irnet_irda.h + delete mode 100644 drivers/staging/irda/net/irnet/irnet_ppp.c + delete mode 100644 drivers/staging/irda/net/irnet/irnet_ppp.h + delete mode 100644 drivers/staging/irda/net/irnetlink.c + delete mode 100644 drivers/staging/irda/net/irproc.c + delete mode 100644 drivers/staging/irda/net/irqueue.c + delete mode 100644 drivers/staging/irda/net/irsysctl.c + delete mode 100644 drivers/staging/irda/net/irttp.c + delete mode 100644 drivers/staging/irda/net/parameters.c + delete mode 100644 drivers/staging/irda/net/qos.c + delete mode 100644 drivers/staging/irda/net/timer.c + delete mode 100644 drivers/staging/irda/net/wrapper.c + delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c + delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-mem.c + delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c + create mode 100644 drivers/staging/mt7621-dma/Kconfig + create mode 100644 drivers/staging/mt7621-dma/Makefile + create mode 100644 drivers/staging/mt7621-dma/TODO + create mode 100644 drivers/staging/mt7621-dma/mtk-hsdma.c + create mode 100644 drivers/staging/mt7621-dma/ralink-gdma.c + create mode 100644 drivers/staging/mt7621-dts/Kconfig + create mode 100644 drivers/staging/mt7621-dts/Makefile + create mode 100644 drivers/staging/mt7621-dts/TODO + create mode 100644 drivers/staging/mt7621-dts/gbpc1.dts + create mode 100644 drivers/staging/mt7621-dts/mt7621.dtsi + create mode 100644 drivers/staging/mt7621-eth/Documentation/devicetree/bindings/net/mediatek-net-gsw.txt + create mode 100644 drivers/staging/mt7621-eth/Kconfig + create mode 100644 drivers/staging/mt7621-eth/Makefile + create mode 100644 drivers/staging/mt7621-eth/TODO + create mode 100644 drivers/staging/mt7621-eth/ethtool.c + create mode 100644 drivers/staging/mt7621-eth/ethtool.h + create mode 100644 drivers/staging/mt7621-eth/gsw_mt7620.h + create mode 100644 drivers/staging/mt7621-eth/gsw_mt7621.c + create mode 100644 drivers/staging/mt7621-eth/mdio.c + create mode 100644 drivers/staging/mt7621-eth/mdio.h + create mode 100644 drivers/staging/mt7621-eth/mdio_mt7620.c + create mode 100644 drivers/staging/mt7621-eth/mtk_eth_soc.c + create mode 100644 drivers/staging/mt7621-eth/mtk_eth_soc.h + create mode 100644 drivers/staging/mt7621-eth/soc_mt7621.c + create mode 100644 drivers/staging/mt7621-gpio/Kconfig + create mode 100644 drivers/staging/mt7621-gpio/Makefile + create mode 100644 drivers/staging/mt7621-gpio/TODO + create mode 100644 drivers/staging/mt7621-gpio/gpio-mt7621.c + create mode 100644 drivers/staging/mt7621-mmc/Kconfig + create mode 100644 drivers/staging/mt7621-mmc/Makefile + create mode 100644 drivers/staging/mt7621-mmc/TODO + create mode 100644 drivers/staging/mt7621-mmc/board.h + create mode 100644 drivers/staging/mt7621-mmc/dbg.c + create mode 100644 drivers/staging/mt7621-mmc/dbg.h + create mode 100644 drivers/staging/mt7621-mmc/mt6575_sd.h + create mode 100644 drivers/staging/mt7621-mmc/sd.c + create mode 100644 drivers/staging/mt7621-pci/Makefile + create mode 100644 drivers/staging/mt7621-pci/TODO + create mode 100644 drivers/staging/mt7621-pci/pci-mt7621.c + create mode 100644 drivers/staging/mt7621-pinctrl/Kconfig + create mode 100644 drivers/staging/mt7621-pinctrl/Makefile + create mode 100644 drivers/staging/mt7621-pinctrl/TODO + create mode 100644 drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c + create mode 100644 drivers/staging/mt7621-spi/Kconfig + create mode 100644 drivers/staging/mt7621-spi/Makefile + create mode 100644 drivers/staging/mt7621-spi/TODO + create mode 100644 drivers/staging/mt7621-spi/spi-mt7621.c + delete mode 100644 drivers/staging/unisys/visorinput/ultrainputreport.h + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_build_info.h + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_memdrv.h + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_version.c + create mode 100644 drivers/tty/hvc/hvc_riscv_sbi.c + create mode 100644 drivers/tty/serial/qcom_geni_serial.c + create mode 100644 drivers/usb/common/roles.c + create mode 100644 drivers/usb/core/phy.c + create mode 100644 drivers/usb/core/phy.h + create mode 100644 drivers/usb/host/xhci-ext-caps.c + create mode 100644 drivers/usb/roles/Kconfig + create mode 100644 drivers/usb/roles/Makefile + create mode 100644 drivers/usb/roles/intel-xhci-usb-role-switch.c + rename drivers/usb/typec/{typec.c => class.c} (91%) + create mode 100644 drivers/usb/typec/mux.c + create mode 100644 drivers/usb/typec/mux/Kconfig + create mode 100644 drivers/usb/typec/mux/Makefile + create mode 100644 drivers/usb/typec/mux/pi3usb30532.c + create mode 100644 include/acpi/nfit.h + delete mode 100644 include/crypto/ablk_helper.h + delete mode 100644 include/crypto/lrw.h + create mode 100644 include/crypto/sm4.h + create mode 100644 include/crypto/speck.h + create mode 100644 include/dt-bindings/input/gpio-keys.h + create mode 100644 include/dt-bindings/sound/rt5651.h + delete mode 100644 include/linux/extcon/extcon-gpio.h + rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc.h (82%) + create mode 100644 include/linux/usb/audio-v3.h + create mode 100644 include/linux/usb/pd_ado.h + create mode 100644 include/linux/usb/pd_ext_sdb.h + create mode 100644 include/linux/usb/role.h + create mode 100644 include/linux/usb/typec_mux.h + delete mode 100644 include/sound/rt5651.h + delete mode 100644 include/uapi/linux/irda.h + delete mode 100644 include/uapi/linux/ixjuser.h + delete mode 100644 include/uapi/linux/telephony.h + create mode 100644 sound/soc/amd/acp-da7219-max98357a.c + delete mode 100644 sound/soc/blackfin/Kconfig + delete mode 100644 sound/soc/blackfin/Makefile + delete mode 100644 sound/soc/blackfin/bf5xx-ac97-pcm.c + delete mode 100644 sound/soc/blackfin/bf5xx-ac97.c + delete mode 100644 sound/soc/blackfin/bf5xx-ac97.h + delete mode 100644 sound/soc/blackfin/bf5xx-ad1836.c + delete mode 100644 sound/soc/blackfin/bf5xx-ad193x.c + delete mode 100644 sound/soc/blackfin/bf5xx-ad1980.c + delete mode 100644 sound/soc/blackfin/bf5xx-ad73311.c + delete mode 100644 sound/soc/blackfin/bf5xx-i2s-pcm.c + delete mode 100644 sound/soc/blackfin/bf5xx-i2s-pcm.h + delete mode 100644 sound/soc/blackfin/bf5xx-i2s.c + delete mode 100644 sound/soc/blackfin/bf5xx-sport.c + delete mode 100644 sound/soc/blackfin/bf5xx-sport.h + delete mode 100644 sound/soc/blackfin/bf5xx-ssm2602.c + delete mode 100644 sound/soc/blackfin/bf6xx-i2s.c + delete mode 100644 sound/soc/blackfin/bf6xx-sport.c + delete mode 100644 sound/soc/blackfin/bf6xx-sport.h + delete mode 100644 sound/soc/blackfin/bfin-eval-adau1373.c + delete mode 100644 sound/soc/blackfin/bfin-eval-adau1701.c + delete mode 100644 sound/soc/blackfin/bfin-eval-adau1x61.c + delete mode 100644 sound/soc/blackfin/bfin-eval-adau1x81.c + delete mode 100644 sound/soc/blackfin/bfin-eval-adav80x.c + create mode 100644 sound/soc/codecs/ak4458.c + create mode 100644 sound/soc/codecs/ak4458.h + create mode 100644 sound/soc/codecs/ak5558.c + create mode 100644 sound/soc/codecs/ak5558.h + create mode 100644 sound/soc/codecs/bd28623.c + create mode 100644 sound/soc/codecs/cpcap.c + create mode 100644 sound/soc/codecs/max9759.c + create mode 100644 sound/soc/codecs/pcm1789-i2c.c + create mode 100644 sound/soc/codecs/pcm1789.c + create mode 100644 sound/soc/codecs/pcm1789.h + create mode 100644 sound/soc/codecs/tda7419.c + delete mode 100644 sound/soc/fsl/imx-wm8962.c + create mode 100644 sound/soc/intel/boards/cht_bsw_nau8824.c + create mode 100644 sound/soc/intel/boards/kbl_da7219_max98357a.c + create mode 100644 sound/soc/uniphier/aio-compress.c + create mode 100644 sound/soc/uniphier/aio-core.c + create mode 100644 sound/soc/uniphier/aio-cpu.c + create mode 100644 sound/soc/uniphier/aio-dma.c + create mode 100644 sound/soc/uniphier/aio-ld11.c + create mode 100644 sound/soc/uniphier/aio-pxs2.c + create mode 100644 sound/soc/uniphier/aio-reg.h + create mode 100644 sound/soc/uniphier/aio.h + create mode 100644 tools/testing/selftests/filesystems/devpts_pts.c + create mode 100755 tools/testing/selftests/firmware/fw_lib.sh + create mode 100755 tools/testing/selftests/firmware/fw_run_tests.sh +Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (28913ee8191a netfilter: nf_nat_snmp_basic: add correct dependency to Makefile) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (661e50bc8532 Linux 4.16-rc4) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (1b8837b61714 ARM: 8750/1: deflate_xip_data.sh: minor fixes) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (e21da1c99200 arm64: Relax ARM_SMCCC_ARCH_WORKAROUND_1 discovery) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (ecd685580c8f m68k/mac: Remove bogus "FIXME" comment) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (52396500f97c powerpc/64s: Fix i-side SLB miss bad address handler saving nonvolatile GPRs) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging sparc/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (d68a19f89bcf Merge branch 'net-tunnel-name-validate') +$ git merge net/master +Merge made by the 'recursive' strategy. + net/core/dev.c | 2 +- + net/ipv4/ip_tunnel.c | 11 ++++++----- + net/ipv6/ip6_gre.c | 8 +++++--- + net/ipv6/ip6_tunnel.c | 11 +++++++---- + net/ipv6/ip6_vti.c | 7 +++++-- + net/ipv6/sit.c | 8 +++++--- + 6 files changed, 29 insertions(+), 18 deletions(-) +Merging bpf/master (33491588c1fb kernel/bpf/syscall: fix warning defined but not used) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + kernel/bpf/sockmap.c | 12 ++++++++++-- + kernel/bpf/syscall.c | 24 ++++++++++++------------ + 2 files changed, 22 insertions(+), 14 deletions(-) +Merging ipsec/master (9a3fb9fb84cc xfrm: Fix transport mode skb control buffer usage.) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (b9fc828debc8 qede: Fix barrier usage after tx doorbell write.) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (4608f064532c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (b5dbc28762fd Merge tag 'kbuild-fixes-v4.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (84652aefb347 RDMA/ucma: Introduce safer rdma_addr_size() variants) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (a820ccbe21e8 ALSA: pcm: Fix UAF at PCM release via PCM timer access) +$ git merge sound-current/for-linus +Already up to date. +Merging pci-current/for-linus (fc110ebdd014 PCI: dwc: Fix enumeration end when reaching root subordinate) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (0c8efd610b58 Linux 4.16-rc5) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (c698ca527893 Linux 4.16-rc6) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (c698ca527893 Linux 4.16-rc6) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (c6ba5084ce0d usb: gadget: udc: renesas_usb3: add binging for r8a77965) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (86d71233b615 USB: serial: ftdi_sio: add support for Harman FirmwareHubEmulator) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. +Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up to date. +Merging phy/fixes (59fba0869aca phy: qcom-ufs: add MODULE_LICENSE tag) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (df34df483a97 Merge tag 'staging-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (06dd3dfeea60 Merge tag 'char-misc-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging input-current/for-linus (664b0bae0b87 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (f444ec106407 crypto: ccree - remove unused enums) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time') +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (834814e80268 Revert: "vfio-pci: Mask INTx if a device is not capabable of enabling it") +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (ba004a2955f7 selftests: memory-hotplug: fix emit_tests regression) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: fix device-tree node leaks) +$ git merge backlight-fixes/for-backlight-fixes +Merge made by the 'recursive' strategy. + drivers/video/backlight/as3711_bl.c | 45 ++++++++++++++++++++++------------- + drivers/video/backlight/max8925_bl.c | 4 +++- + drivers/video/backlight/tps65217_bl.c | 4 ++-- + include/linux/mfd/as3711.h | 4 ++-- + 4 files changed, 36 insertions(+), 21 deletions(-) +Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check) +$ git merge nand-fixes/nand/fixes +Already up to date. +Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1) +$ git merge spi-nor-fixes/spi-nor/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (107b7d9fa94c mfd: rtsx: Release IRQ during shutdown) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (a95845ba184b media: v4l2-core: fix size of devnode_nums[] bitarray) +$ git merge v4l-dvb-fixes/fixes +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_default.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_default.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_default.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_default.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_default.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_default.host.c +Merge made by the 'recursive' strategy. + Documentation/media/kapi/v4l2-dev.rst | 2 +- + .../uapi/mediactl/media-ioc-enum-entities.rst | 2 +- + .../media/uapi/mediactl/media-ioc-g-topology.rst | 8 +- + Documentation/media/uapi/mediactl/media-types.rst | 4 +- + Documentation/media/uapi/v4l/extended-controls.rst | 2 +- + .../media/uapi/v4l/pixfmt-v4l2-mplane.rst | 36 ++-- + Documentation/media/uapi/v4l/pixfmt-v4l2.rst | 36 ++-- + drivers/media/cec/cec-pin.c | 6 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 2 +- + drivers/media/dvb-core/dvb_frontend.c | 2 +- + drivers/media/i2c/adv748x/adv748x-afe.c | 3 +- + drivers/media/i2c/dw9714.c | 14 +- + drivers/media/i2c/imx274.c | 2 +- + drivers/media/i2c/ov13858.c | 19 +- + drivers/media/i2c/ov2685.c | 1 - + drivers/media/i2c/ov5640.c | 38 +++- + drivers/media/i2c/ov5645.c | 29 +-- + drivers/media/i2c/ov5670.c | 19 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 +- + drivers/media/platform/qcom/venus/vdec.c | 13 +- + drivers/media/platform/qcom/venus/venc.c | 13 +- + drivers/media/platform/vivid/vivid-vid-cap.c | 5 +- + drivers/media/platform/vsp1/vsp1_wpf.c | 2 +- + drivers/media/tuners/r820t.c | 4 +- + drivers/media/usb/cx231xx/cx231xx-dvb.c | 2 +- + drivers/media/usb/gspca/Kconfig | 2 +- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 4 +- + drivers/media/v4l2-core/v4l2-dev.c | 8 +- + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 2 +- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 25 +-- + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 18 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 18 +- + drivers/staging/media/atomisp/i2c/gc0310.h | 3 +- + drivers/staging/media/atomisp/i2c/ov2722.h | 2 +- + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 28 +-- + drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 2 +- + .../media/atomisp/include/linux/atomisp_platform.h | 4 + + .../staging/media/atomisp/pci/atomisp2/Makefile | 4 - + .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 42 ++--- + .../media/atomisp/pci/atomisp2/atomisp_cmd.h | 2 +- + .../media/atomisp/pci/atomisp2/atomisp_compat.h | 20 +-- + .../atomisp/pci/atomisp2/atomisp_compat_css20.c | 58 ++---- + .../atomisp/pci/atomisp2/atomisp_compat_css20.h | 3 +- + .../media/atomisp/pci/atomisp2/atomisp_drvfs.c | 1 + + .../media/atomisp/pci/atomisp2/atomisp_fops.c | 14 +- + .../media/atomisp/pci/atomisp2/atomisp_ioctl.c | 10 +- + .../media/atomisp/pci/atomisp2/atomisp_subdev.c | 14 +- + .../media/atomisp/pci/atomisp2/atomisp_subdev.h | 8 +- + .../css2400/camera/util/interface/ia_css_util.h | 6 +- + .../pci/atomisp2/css2400/camera/util/src/util.c | 72 ++++---- + .../css2400/css_2401_csi2p_system/system_global.h | 4 +- + .../css2400/hive_isp_css_common/host/debug.c | 2 +- + .../css2400/hive_isp_css_common/host/gp_timer.c | 2 +- + .../hive_isp_css_common/host/input_formatter.c | 5 +- + .../hive_isp_css_common/host/input_system.c | 24 +-- + .../hive_isp_css_common/host/input_system_local.h | 2 +- + .../host/input_system_private.h | 4 +- + .../css2400/hive_isp_css_common/system_global.h | 4 +- + .../host/input_system_public.h | 14 +- + .../pci/atomisp2/css2400/ia_css_input_port.h | 20 +-- + .../atomisp/pci/atomisp2/css2400/ia_css_irq.h | 4 +- + .../atomisp/pci/atomisp2/css2400/ia_css_metadata.h | 4 +- + .../atomisp/pci/atomisp2/css2400/ia_css_mipi.h | 4 +- + .../pci/atomisp2/css2400/ia_css_stream_format.h | 71 +------- + .../pci/atomisp2/css2400/ia_css_stream_public.h | 8 +- + .../css2400/isp/kernels/bnlm/ia_css_bnlm.host.h | 1 - + .../isp/kernels/bnlm/ia_css_bnlm_default.host.c | 71 -------- + .../isp/kernels/bnlm/ia_css_bnlm_default.host.h | 22 --- + .../css2400/isp/kernels/dpc2/ia_css_dpc2.host.h | 1 - + .../isp/kernels/dpc2/ia_css_dpc2_default.host.c | 26 --- + .../isp/kernels/dpc2/ia_css_dpc2_default.host.h | 23 --- + .../isp/kernels/eed1_8/ia_css_eed1_8.host.h | 1 - + .../kernels/eed1_8/ia_css_eed1_8_default.host.c | 94 ---------- + .../kernels/eed1_8/ia_css_eed1_8_default.host.h | 22 --- + .../kernels/output/output_1.0/ia_css_output.host.c | 2 +- + .../isp/kernels/raw/raw_1.0/ia_css_raw.host.c | 42 ++--- + .../isp/kernels/raw/raw_1.0/ia_css_raw_types.h | 2 +- + .../isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c | 2 +- + .../isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h | 1 - + .../kernels/tdf/tdf_1.0/ia_css_tdf_default.host.c | 36 ---- + .../kernels/tdf/tdf_1.0/ia_css_tdf_default.host.h | 23 --- + .../css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c | 10 +- + .../runtime/binary/interface/ia_css_binary.h | 8 +- + .../atomisp2/css2400/runtime/binary/src/binary.c | 6 +- + .../pci/atomisp2/css2400/runtime/bufq/src/bufq.c | 9 +- + .../css2400/runtime/debug/src/ia_css_debug.c | 111 ++++++------ + .../pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c | 96 +++++----- + .../runtime/inputfifo/interface/ia_css_inputfifo.h | 6 +- + .../css2400/runtime/inputfifo/src/inputfifo.c | 22 +-- + .../css2400/runtime/isys/interface/ia_css_isys.h | 20 +-- + .../css2400/runtime/isys/src/csi_rx_rmgr.c | 4 +- + .../atomisp2/css2400/runtime/isys/src/isys_init.c | 4 +- + .../pci/atomisp2/css2400/runtime/isys/src/rx.c | 146 ++++++++-------- + .../css2400/runtime/isys/src/virtual_isys.c | 12 +- + .../css2400/runtime/pipeline/src/pipeline.c | 6 +- + .../atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c | 8 +- + .../media/atomisp/pci/atomisp2/css2400/sh_css.c | 194 ++++++++++----------- + .../atomisp/pci/atomisp2/css2400/sh_css_mipi.c | 58 +++--- + .../atomisp/pci/atomisp2/css2400/sh_css_params.c | 9 +- + .../media/atomisp/pci/atomisp2/css2400/sh_css_sp.c | 25 +-- + .../media/atomisp/pci/atomisp2/css2400/sh_css_sp.h | 2 +- + .../pci/atomisp2/css2400/sh_css_stream_format.c | 58 +++--- + .../pci/atomisp2/css2400/sh_css_stream_format.h | 2 +- + .../atomisp/pci/atomisp2/include/mmu/isp_mmu.h | 4 +- + .../media/atomisp/pci/atomisp2/mmu/isp_mmu.c | 13 +- + .../media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c | 16 +- + .../platform/intel-mid/atomisp_gmin_platform.c | 8 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 4 +- + drivers/staging/media/imx/imx-media-csi.c | 7 +- + include/media/v4l2-common.h | 5 +- + include/media/v4l2-dev.h | 12 +- + 111 files changed, 815 insertions(+), 1249 deletions(-) + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_default.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_default.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_default.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_default.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_default.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_default.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.h +Merging reset-fixes/reset/fixes (f450f28e70a2 reset: socfpga: fix for 64-bit compilation) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (a63d706ea719 MIPS: ralink: Fix booting on MT7621) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging kvm-fixes/master (17a1079d9c63 KVM: x86: Fix pv tlb flush dependencies) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (f07afa0462b7 KVM: s390: fix memory overwrites when not using SCA entries) +$ git merge kvms390-fixes/master +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (3eb2ce825ea1 Linux 4.16-rc7) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (5a9f698feb11 drm/ast: Fixed 1280x800 Display Issue) +$ git merge drm-misc-fixes/for-linux-next-fixes +Already up to date. +Merging syscalls/syscalls-next (c9a211951c7c bpf: whitelist all syscalls for error injection) +$ git merge syscalls/syscalls-next +Already up to date. +Merging kbuild/for-next (d20f47687e2f Merge branch 'kbuild2' into for-next) +$ git merge kbuild/for-next +Removing scripts/genksyms/parse.tab.h_shipped +Removing scripts/genksyms/parse.tab.c_shipped +Removing scripts/genksyms/lex.lex.c_shipped +Removing scripts/dtc/dtc-parser.tab.h_shipped +Removing scripts/dtc/dtc-parser.tab.c_shipped +Removing scripts/dtc/dtc-lexer.lex.c_shipped +Auto-merging drivers/gpio/gpiolib-of.c +Removing drivers/crypto/qat/qat_common/.gitignore +Removing crypto/asymmetric_keys/.gitignore +Auto-merging crypto/Makefile +Removing crypto/.gitignore +Auto-merging arch/arm64/crypto/Makefile +Auto-merging arch/arm/crypto/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .gitignore | 7 +- + .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 4 +- + .../devicetree/bindings/trivial-devices.txt | 12 + + Documentation/devicetree/overlay-notes.txt | 4 +- + MAINTAINERS | 4 + + Makefile | 5 + + arch/arc/boot/dts/Makefile | 2 - + arch/arm/boot/compressed/string.c | 10 + + arch/arm/crypto/Makefile | 2 +- + arch/arm64/crypto/Makefile | 2 +- + arch/arm64/kernel/image.h | 1 + + arch/arm64/lib/strrchr.S | 2 +- + arch/powerpc/boot/stdio.c | 10 + + arch/powerpc/boot/string.h | 1 + + arch/sparc/vdso/Makefile | 4 +- + arch/x86/entry/vdso/Makefile | 4 +- + crypto/.gitignore | 1 - + crypto/Makefile | 14 +- + crypto/asymmetric_keys/.gitignore | 1 - + crypto/asymmetric_keys/Makefile | 31 +- + crypto/asymmetric_keys/mscode_parser.c | 2 +- + crypto/asymmetric_keys/pkcs7_parser.c | 2 +- + crypto/asymmetric_keys/x509_cert_parser.c | 4 +- + crypto/rsa_helper.c | 4 +- + drivers/crypto/qat/qat_common/.gitignore | 1 - + drivers/gpio/gpiolib-of.c | 4 +- + drivers/of/base.c | 270 ++- + drivers/of/dynamic.c | 21 +- + drivers/of/of_private.h | 6 +- + drivers/of/overlay.c | 20 +- + drivers/of/resolver.c | 3 - + drivers/of/unittest-data/Makefile | 6 - + drivers/of/unittest-data/tests-phandle.dtsi | 25 + + drivers/of/unittest.c | 304 ++- + include/linux/libfdt_env.h | 6 +- + include/linux/of.h | 12 + + net/ipv4/netfilter/Makefile | 5 +- + net/ipv4/netfilter/nf_nat_snmp_basic_main.c | 2 +- + scripts/Makefile.build | 23 +- + scripts/Makefile.host | 2 +- + scripts/Makefile.lib | 40 +- + scripts/asn1_compiler.c | 2 +- + scripts/dtc/.gitignore | 3 - + scripts/dtc/Makefile | 3 - + scripts/dtc/checks.c | 439 ++-- + scripts/dtc/dtc-lexer.lex.c_shipped | 2259 ------------------ + scripts/dtc/dtc-parser.tab.c_shipped | 2321 ------------------- + scripts/dtc/dtc-parser.tab.h_shipped | 125 - + scripts/dtc/dtc-parser.y | 17 +- + scripts/dtc/dtc.c | 7 +- + scripts/dtc/dtc.h | 11 +- + scripts/dtc/flattree.c | 2 +- + scripts/dtc/libfdt/fdt.c | 13 +- + scripts/dtc/libfdt/fdt.h | 6 +- + scripts/dtc/libfdt/fdt_overlay.c | 51 + + scripts/dtc/libfdt/fdt_ro.c | 132 +- + scripts/dtc/libfdt/fdt_rw.c | 90 +- + scripts/dtc/libfdt/fdt_sw.c | 24 +- + scripts/dtc/libfdt/fdt_wip.c | 10 +- + scripts/dtc/libfdt/libfdt.h | 37 +- + scripts/dtc/libfdt/libfdt_env.h | 33 +- + scripts/dtc/libfdt/libfdt_internal.h | 32 +- + scripts/dtc/livetree.c | 10 +- + scripts/dtc/srcpos.c | 5 - + scripts/dtc/srcpos.h | 6 +- + scripts/dtc/update-dtc-source.sh | 7 +- + scripts/dtc/util.h | 9 +- + scripts/dtc/version_gen.h | 2 +- + scripts/genksyms/.gitignore | 3 - + scripts/genksyms/Makefile | 27 +- + scripts/genksyms/lex.lex.c_shipped | 2291 ------------------- + scripts/genksyms/parse.tab.c_shipped | 2394 -------------------- + scripts/genksyms/parse.tab.h_shipped | 119 - + scripts/kconfig/.gitignore | 3 - + scripts/kconfig/Makefile | 4 +- + scripts/package/Makefile | 34 +- + scripts/package/builddeb | 221 +- + scripts/package/mkdebian | 189 ++ + 78 files changed, 1502 insertions(+), 10322 deletions(-) + delete mode 100644 crypto/.gitignore + delete mode 100644 crypto/asymmetric_keys/.gitignore + delete mode 100644 drivers/crypto/qat/qat_common/.gitignore + delete mode 100644 scripts/dtc/dtc-lexer.lex.c_shipped + delete mode 100644 scripts/dtc/dtc-parser.tab.c_shipped + delete mode 100644 scripts/dtc/dtc-parser.tab.h_shipped + delete mode 100644 scripts/genksyms/lex.lex.c_shipped + delete mode 100644 scripts/genksyms/parse.tab.c_shipped + delete mode 100644 scripts/genksyms/parse.tab.h_shipped + create mode 100755 scripts/package/mkdebian +Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address) +$ git merge leaks/leaks-next +Merge made by the 'recursive' strategy. + scripts/leaking_addresses.pl | 372 ++++++++++++++++++++++++++++++------------- + 1 file changed, 259 insertions(+), 113 deletions(-) +Merging efi-lock-down/efi-lock-down (89bcd5b02f12 lockdown: Print current->comm in restriction messages) +$ git merge efi-lock-down/efi-lock-down +Auto-merging kernel/power/user.c +Auto-merging kernel/power/hibernate.c +Auto-merging kernel/module.c +Auto-merging kernel/kexec.c +Auto-merging kernel/events/core.c +Auto-merging kernel/bpf/syscall.c +Auto-merging include/linux/security.h +Auto-merging include/linux/kexec.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/efi.h +Auto-merging fs/debugfs/inode.c +Auto-merging drivers/tty/sysrq.c +Auto-merging drivers/tty/serial/serial_core.c +CONFLICT (modify/delete): drivers/scsi/eata.c deleted in HEAD and modified in efi-lock-down/efi-lock-down. Version efi-lock-down/efi-lock-down of drivers/scsi/eata.c left in tree. +Auto-merging drivers/char/mem.c +Auto-merging drivers/acpi/tables.c +Auto-merging drivers/acpi/osl.c +Auto-merging drivers/acpi/custom_method.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/machine_kexec_64.c +Auto-merging arch/x86/kernel/ioport.c +Auto-merging arch/x86/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/scsi/eata.c +drivers/scsi/eata.c: needs merge +rm 'drivers/scsi/eata.c' +$ git commit -v -a +[master 47cf7ddbbccf] Merge remote-tracking branch 'efi-lock-down/efi-lock-down' +$ git diff -M --stat --summary HEAD^.. + arch/x86/Kconfig | 20 ++++-- + arch/x86/include/asm/setup.h | 2 + + arch/x86/kernel/ioport.c | 6 +- + arch/x86/kernel/kexec-bzimage64.c | 1 + + arch/x86/kernel/machine_kexec_64.c | 2 +- + arch/x86/kernel/msr.c | 10 +++ + arch/x86/kernel/setup.c | 18 ++---- + arch/x86/mm/testmmiotrace.c | 3 + + crypto/asymmetric_keys/verify_pefile.c | 4 +- + drivers/acpi/apei/einj.c | 3 + + drivers/acpi/custom_method.c | 3 + + drivers/acpi/osl.c | 2 +- + drivers/acpi/tables.c | 5 ++ + drivers/char/mem.c | 2 + + drivers/firmware/efi/Makefile | 1 + + drivers/firmware/efi/secureboot.c | 38 ++++++++++++ + drivers/input/misc/uinput.c | 1 + + drivers/pci/pci-sysfs.c | 9 +++ + drivers/pci/proc.c | 9 ++- + drivers/pci/syscall.c | 3 +- + drivers/pcmcia/cistpl.c | 3 + + drivers/tty/serial/serial_core.c | 6 ++ + drivers/tty/sysrq.c | 19 ++++-- + fs/debugfs/file.c | 28 +++++++++ + fs/debugfs/inode.c | 30 ++++++++- + fs/proc/kcore.c | 2 + + include/linux/efi.h | 16 +++-- + include/linux/input.h | 5 ++ + include/linux/kernel.h | 17 ++++++ + include/linux/kexec.h | 4 +- + include/linux/security.h | 8 +++ + include/linux/sysrq.h | 8 ++- + kernel/bpf/syscall.c | 3 + + kernel/debug/kdb/kdb_main.c | 2 +- + kernel/events/core.c | 5 ++ + kernel/kexec.c | 7 +++ + kernel/kexec_file.c | 56 ++++++++++++++--- + kernel/kprobes.c | 3 + + kernel/module.c | 56 +++++++++++++---- + kernel/params.c | 26 ++++++-- + kernel/power/hibernate.c | 2 +- + kernel/power/user.c | 3 + + security/Kconfig | 32 ++++++++++ + security/Makefile | 3 + + security/integrity/ima/ima_policy.c | 39 +++++++++--- + security/lock_down.c | 108 +++++++++++++++++++++++++++++++++ + 46 files changed, 553 insertions(+), 80 deletions(-) + create mode 100644 drivers/firmware/efi/secureboot.c + create mode 100644 security/lock_down.c +Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API) +$ git merge uuid/for-next +Already up to date. +Merging dma-mapping/for-next (1f674e16f9ce usb: gadget: Add NO_DMA dummies for DMA mapping API) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (f85aba3f0953 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Removing drivers/pcmcia/sa1100_shannon.c +Removing drivers/pcmcia/sa1100_nanoengine.c +Removing drivers/pcmcia/sa1100_cerf.c +Removing drivers/pcmcia/sa1100_assabet.c +Auto-merging drivers/pcmcia/Makefile +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 1 + + arch/arm/boot/compressed/decompress.c | 5 +- + arch/arm/boot/compressed/misc.c | 7 +- + arch/arm/boot/compressed/misc.h | 10 ++ + arch/arm/kernel/vmlinux-xip.lds.S | 166 ++------------------------- + arch/arm/kernel/vmlinux.lds.S | 172 ++-------------------------- + arch/arm/kernel/vmlinux.lds.h | 135 ++++++++++++++++++++++ + arch/arm/mach-sa1100/Kconfig | 4 + + arch/arm/mach-sa1100/assabet.c | 39 ++++++- + arch/arm/mach-sa1100/cerf.c | 18 ++- + arch/arm/mach-sa1100/clock.c | 2 + + arch/arm/mach-sa1100/generic.c | 44 ++++++- + arch/arm/mach-sa1100/generic.h | 8 ++ + arch/arm/mach-sa1100/h3xxx.c | 17 +++ + arch/arm/mach-sa1100/include/mach/assabet.h | 6 - + arch/arm/mach-sa1100/nanoengine.c | 23 ++++ + arch/arm/mach-sa1100/shannon.c | 38 ++++++ + arch/arm/mach-sa1100/simpad.c | 11 ++ + arch/arm/mm/init.c | 11 -- + arch/arm/mm/proc-v7.S | 11 ++ + drivers/pcmcia/Makefile | 3 - + drivers/pcmcia/sa1100_assabet.c | 100 ---------------- + drivers/pcmcia/sa1100_cerf.c | 86 -------------- + drivers/pcmcia/sa1100_generic.c | 115 ++++++++++++++++--- + drivers/pcmcia/sa1100_generic.h | 4 - + drivers/pcmcia/sa1100_h3600.c | 16 ++- + drivers/pcmcia/sa1100_nanoengine.c | 133 --------------------- + drivers/pcmcia/sa1100_shannon.c | 104 ----------------- + drivers/pcmcia/sa1100_simpad.c | 12 +- + 29 files changed, 492 insertions(+), 809 deletions(-) + create mode 100644 arch/arm/boot/compressed/misc.h + create mode 100644 arch/arm/kernel/vmlinux.lds.h + delete mode 100644 drivers/pcmcia/sa1100_assabet.c + delete mode 100644 drivers/pcmcia/sa1100_cerf.c + delete mode 100644 drivers/pcmcia/sa1100_nanoengine.c + delete mode 100644 drivers/pcmcia/sa1100_shannon.c +Merging arm-perf/for-next/perf (44300aed5d28 perf: arm_spe: include linux/vmalloc.h for vmap()) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. +Merging arm-soc/for-next (d0370b195f10 arm-soc: document merges) +$ git merge arm-soc/for-next +Resolved 'arch/arm/boot/dts/stih407-b2120.dts' using previous resolution. +Resolved 'arch/arm/boot/dts/stih410-b2120.dts' using previous resolution. +Resolved 'arch/arm/boot/dts/stih410-b2260.dts' using previous resolution. +Resolved 'arch/arm/boot/dts/stih418-b2199.dts' using previous resolution. +Resolved 'drivers/bus/arm-cci.c' using previous resolution. +Auto-merging include/clocksource/timer-ti-dm.h +Removing drivers/mtd/nand/pxa3xx_nand.c +Auto-merging drivers/cpufreq/Makefile +Auto-merging drivers/cpufreq/Kconfig.arm +Auto-merging drivers/clocksource/timer-ti-dm.c +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Auto-merging drivers/bus/arm-cci.c +CONFLICT (content): Merge conflict in drivers/bus/arm-cci.c +Auto-merging drivers/bus/Makefile +Auto-merging drivers/bus/Kconfig +Auto-merging arch/arm64/boot/dts/hisilicon/hi3660.dtsi +Auto-merging arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts +Auto-merging arch/arm/mach-pxa/raumfeld.c +Auto-merging arch/arm/mach-pxa/cm-x300.c +Auto-merging arch/arm/mach-omap1/i2c.h +Removing arch/arm/mach-imx/epit.c +Auto-merging arch/arm/boot/dts/stih418-b2199.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/stih418-b2199.dts +Auto-merging arch/arm/boot/dts/stih410-b2260.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/stih410-b2260.dts +Auto-merging arch/arm/boot/dts/stih410-b2120.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/stih410-b2120.dts +Auto-merging arch/arm/boot/dts/stih407-b2120.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/stih407-b2120.dts +Removing arch/arm/boot/dts/samsung_k3pe0e000b.dtsi +Auto-merging arch/arm/boot/dts/mt7623.dtsi +Auto-merging arch/arm/boot/dts/bcm2835-rpi.dtsi +Auto-merging arch/arm/boot/dts/armada-370-rd.dts +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/mtd/pxa3xx-nand.txt +Auto-merging Documentation/devicetree/bindings/mfd/aspeed-lpc.txt +Removing Documentation/arm/stm32/stm32h743-overview.txt +Removing Documentation/arm/stm32/stm32f746-overview.txt +Removing Documentation/arm/stm32/stm32f429-overview.txt +Removing Documentation/arm/stm32/overview.txt +Auto-merging Documentation/arm/Microchip/README +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8edcaaf6f778] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/{Atmel => Microchip}/README | 52 +- + Documentation/arm/stm32/overview.rst | 34 + + Documentation/arm/stm32/overview.txt | 33 - + Documentation/arm/stm32/stm32f429-overview.rst | 26 + + Documentation/arm/stm32/stm32f429-overview.txt | 22 - + Documentation/arm/stm32/stm32f746-overview.rst | 33 + + Documentation/arm/stm32/stm32f746-overview.txt | 34 - + Documentation/arm/stm32/stm32f769-overview.rst | 35 + + Documentation/arm/stm32/stm32h743-overview.rst | 34 + + Documentation/arm/stm32/stm32h743-overview.txt | 30 - + Documentation/arm/stm32/stm32mp157-overview.rst | 19 + + Documentation/devicetree/bindings/arm/arm,scmi.txt | 179 ++ + .../arm/cpu-enable-method/nuvoton,npcm750-smp | 42 + + Documentation/devicetree/bindings/arm/cpus.txt | 2 + + Documentation/devicetree/bindings/arm/mediatek.txt | 9 + + .../bindings/arm/mediatek/mediatek,ethsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,pciesys.txt | 2 + + .../bindings/arm/mediatek/mediatek,ssusbsys.txt | 2 + + .../devicetree/bindings/arm/npcm/npcm.txt | 6 + + .../devicetree/bindings/arm/omap/ctrl.txt | 1 + + Documentation/devicetree/bindings/arm/omap/mpu.txt | 16 + + Documentation/devicetree/bindings/arm/qcom.txt | 1 + + Documentation/devicetree/bindings/arm/rockchip.txt | 12 + + .../devicetree/bindings/arm/samsung/pmu.txt | 6 + + .../bindings/arm/samsung/samsung-boards.txt | 4 + + Documentation/devicetree/bindings/arm/shmobile.txt | 18 +- + Documentation/devicetree/bindings/arm/stm32.txt | 1 + + .../devicetree/bindings/arm/sunxi/smp-sram.txt | 44 + + Documentation/devicetree/bindings/arm/tegra.txt | 16 + + .../bindings/arm/tegra/nvidia,tegra186-pmc.txt | 2 + + Documentation/devicetree/bindings/arm/xilinx.txt | 56 + + .../devicetree/bindings/bus/nvidia,tegra20-gmi.txt | 6 +- + .../devicetree/bindings/crypto/fsl-sec4.txt | 17 + + .../devicetree/bindings/dma/brcm,bcm2835-dma.txt | 4 +- + .../devicetree/bindings/gpu/arm,mali-utgard.txt | 1 + + .../devicetree/bindings/mailbox/mailbox.txt | 28 + + .../bindings/memory-controllers/ti/emif.txt | 13 +- + .../devicetree/bindings/mfd/aspeed-lpc.txt | 21 + + .../devicetree/bindings/mtd/pxa3xx-nand.txt | 50 - + .../bindings/{arm/ccn.txt => perf/arm-ccn.txt} | 0 + .../bindings/phy/nvidia,tegra20-usb-phy.txt | 4 +- + .../bindings/pinctrl/st,stm32-pinctrl.txt | 1 + + .../bindings/power/renesas,rcar-sysc.txt | 2 + + .../devicetree/bindings/reset/renesas,rst.txt | 2 + + .../devicetree/bindings/reset/st,stm32mp1-rcc.txt | 6 + + .../devicetree/bindings/soc/mediatek/scpsys.txt | 5 +- + .../devicetree/bindings/sound/brcm,bcm2835-i2s.txt | 9 +- + .../devicetree/bindings/watchdog/sunxi-wdt.txt | 6 +- + Documentation/{arm/CCN.txt => perf/arm-ccn.txt} | 0 + MAINTAINERS | 100 +- + arch/arm/Kconfig | 54 +- + arch/arm/Makefile | 1 + + arch/arm/arm-soc-for-next-contents.txt | 270 ++ + arch/arm/boot/dts/Makefile | 37 +- + arch/arm/boot/dts/am335x-boneblue.dts | 2 +- + arch/arm/boot/dts/am335x-pdu001.dts | 595 ++++ + arch/arm/boot/dts/am33xx.dtsi | 21 + + arch/arm/boot/dts/am4372.dtsi | 30 + + arch/arm/boot/dts/am437x-gp-evm.dts | 2 +- + arch/arm/boot/dts/am437x-sk-evm.dts | 2 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- + arch/arm/boot/dts/am571x-idk.dts | 2 +- + arch/arm/boot/dts/am572x-idk.dts | 3 +- + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 1 + + arch/arm/boot/dts/am57xx-idk-common.dtsi | 12 + + arch/arm/boot/dts/animeo_ip.dts | 2 +- + arch/arm/boot/dts/arm-realview-eb.dtsi | 64 +- + arch/arm/boot/dts/arm-realview-pb1176.dts | 66 +- + arch/arm/boot/dts/arm-realview-pb11mp.dts | 78 +- + arch/arm/boot/dts/arm-realview-pbx.dtsi | 82 +- + arch/arm/boot/dts/armada-370-db.dts | 39 +- + arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 39 +- + arch/arm/boot/dts/armada-370-mirabox.dts | 39 +- + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 41 +- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 41 +- + arch/arm/boot/dts/armada-370-rd.dts | 39 +- + arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts | 5 +- + arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts | 5 +- + arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi | 5 +- + .../dts/armada-370-seagate-personal-cloud-2bay.dts | 5 +- + .../boot/dts/armada-370-seagate-personal-cloud.dts | 5 +- + .../dts/armada-370-seagate-personal-cloud.dtsi | 5 +- + arch/arm/boot/dts/armada-370-synology-ds213j.dts | 39 +- + arch/arm/boot/dts/armada-370-xp.dtsi | 39 +- + arch/arm/boot/dts/armada-370.dtsi | 39 +- + arch/arm/boot/dts/armada-375-db.dts | 39 +- + arch/arm/boot/dts/armada-375.dtsi | 39 +- + arch/arm/boot/dts/armada-380.dtsi | 39 +- + arch/arm/boot/dts/armada-385-db-ap.dts | 33 +- + arch/arm/boot/dts/armada-385-linksys-caiman.dts | 34 +- + arch/arm/boot/dts/armada-385-linksys-cobra.dts | 34 +- + arch/arm/boot/dts/armada-385-linksys-rango.dts | 34 +- + arch/arm/boot/dts/armada-385-linksys-shelby.dts | 34 +- + arch/arm/boot/dts/armada-385-linksys.dtsi | 39 +- + arch/arm/boot/dts/armada-385-synology-ds116.dts | 33 +- + arch/arm/boot/dts/armada-385-turris-omnia.dts | 35 +- + arch/arm/boot/dts/armada-385.dtsi | 39 +- + arch/arm/boot/dts/armada-388-clearfog-base.dts | 38 +- + arch/arm/boot/dts/armada-388-clearfog-pro.dts | 38 +- + arch/arm/boot/dts/armada-388-clearfog.dts | 38 +- + arch/arm/boot/dts/armada-388-clearfog.dtsi | 90 +- + arch/arm/boot/dts/armada-388-db.dts | 39 +- + arch/arm/boot/dts/armada-388-gp.dts | 33 +- + arch/arm/boot/dts/armada-388-rd.dts | 39 +- + arch/arm/boot/dts/armada-388.dtsi | 34 +- + .../arm/boot/dts/armada-38x-solidrun-microsom.dtsi | 38 +- + arch/arm/boot/dts/armada-38x.dtsi | 39 +- + arch/arm/boot/dts/armada-390-db.dts | 39 +- + arch/arm/boot/dts/armada-390.dtsi | 39 +- + arch/arm/boot/dts/armada-395-gp.dts | 33 +- + arch/arm/boot/dts/armada-395.dtsi | 39 +- + arch/arm/boot/dts/armada-398-db.dts | 39 +- + arch/arm/boot/dts/armada-398.dtsi | 39 +- + arch/arm/boot/dts/armada-39x.dtsi | 39 +- + arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 39 +- + arch/arm/boot/dts/armada-xp-98dx3336.dtsi | 39 +- + arch/arm/boot/dts/armada-xp-98dx4251.dtsi | 39 +- + arch/arm/boot/dts/armada-xp-axpwifiap.dts | 39 +- + arch/arm/boot/dts/armada-xp-db-dxbc2.dts | 39 +- + arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | 39 +- + arch/arm/boot/dts/armada-xp-db.dts | 38 +- + arch/arm/boot/dts/armada-xp-gp.dts | 39 +- + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 39 +- + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 33 +- + arch/arm/boot/dts/armada-xp-matrix.dts | 39 +- + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 39 +- + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 39 +- + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 39 +- + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 41 +- + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 39 +- + arch/arm/boot/dts/armada-xp-synology-ds414.dts | 39 +- + arch/arm/boot/dts/armada-xp.dtsi | 39 +- + arch/arm/boot/dts/artpec6-devboard.dts | 3 +- + arch/arm/boot/dts/artpec6.dtsi | 163 +- + .../boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 225 ++ + arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 206 ++ + arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 16 +- + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 4 + + arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 4 + + arch/arm/boot/dts/aspeed-g4.dtsi | 18 + + arch/arm/boot/dts/aspeed-g5.dtsi | 25 +- + arch/arm/boot/dts/at91-nattis-2-natte-2.dts | 60 +- + arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts | 2 +- + arch/arm/boot/dts/at91-tse850-3.dts | 3 +- + arch/arm/boot/dts/at91rm9200.dtsi | 16 +- + arch/arm/boot/dts/at91sam9260.dtsi | 24 +- + arch/arm/boot/dts/at91sam9260ek.dts | 2 +- + arch/arm/boot/dts/at91sam9261.dtsi | 12 +- + arch/arm/boot/dts/at91sam9263.dtsi | 12 +- + arch/arm/boot/dts/at91sam9263ek.dts | 2 +- + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g25.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g45.dtsi | 16 +- + arch/arm/boot/dts/at91sam9n12.dtsi | 4 +- + arch/arm/boot/dts/at91sam9rl.dtsi | 15 +- + arch/arm/boot/dts/at91sam9rlek.dts | 3 +- + arch/arm/boot/dts/at91sam9x5.dtsi | 12 +- + arch/arm/boot/dts/at91sam9x5_usart3.dtsi | 4 +- + arch/arm/boot/dts/atlas7-evb.dts | 2 +- + arch/arm/boot/dts/axp209.dtsi | 5 + + arch/arm/boot/dts/axp22x.dtsi | 5 + + arch/arm/boot/dts/axp81x.dtsi | 12 +- + arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 16 +- + arch/arm/boot/dts/bcm2835-rpi.dtsi | 4 +- + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 17 + + arch/arm/boot/dts/bcm283x.dtsi | 20 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 68 + + arch/arm/boot/dts/bcm958622hr.dts | 6 +- + arch/arm/boot/dts/bcm958623hr.dts | 6 +- + arch/arm/boot/dts/bcm958625hr.dts | 6 +- + arch/arm/boot/dts/bcm958625k.dts | 6 +- + arch/arm/boot/dts/bcm988312hr.dts | 6 +- + arch/arm/boot/dts/da850-evm.dts | 5 + + arch/arm/boot/dts/da850-lego-ev3.dts | 19 +- + arch/arm/boot/dts/dra7-evm.dts | 28 +- + arch/arm/boot/dts/dra7.dtsi | 2 - + arch/arm/boot/dts/dra71-evm.dts | 17 +- + arch/arm/boot/dts/dra76-evm.dts | 50 +- + arch/arm/boot/dts/dra76x-mmc-iodelay.dtsi | 285 ++ + arch/arm/boot/dts/emev2-kzm9d.dts | 8 +- + arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi | 5 +- + arch/arm/boot/dts/exynos-syscon-restart.dtsi | 5 +- + arch/arm/boot/dts/exynos3250-artik5.dtsi | 36 + + arch/arm/boot/dts/exynos3250.dtsi | 15 +- + arch/arm/boot/dts/exynos4.dtsi | 1719 +++++------ + arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 1680 ++++++----- + arch/arm/boot/dts/exynos4210-trats.dts | 74 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 115 +- + arch/arm/boot/dts/exynos4210.dtsi | 610 ++-- + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 140 + + arch/arm/boot/dts/exynos4412-i9300.dts | 22 + + arch/arm/boot/dts/exynos4412-i9305.dts | 20 + + arch/arm/boot/dts/exynos4412-itop-elite.dts | 16 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 1308 +++++++++ + arch/arm/boot/dts/exynos4412-n710x.dts | 77 + + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 12 +- + arch/arm/boot/dts/exynos4412-pinctrl.dtsi | 1914 +++++++------ + arch/arm/boot/dts/exynos4412-tiny4412.dts | 7 +- + arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi | 6 +- + arch/arm/boot/dts/exynos4412-trats2.dts | 1396 +-------- + arch/arm/boot/dts/exynos4412.dtsi | 868 +++--- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 18 + + arch/arm/boot/dts/exynos5250-snow.dts | 11 + + arch/arm/boot/dts/exynos5250.dtsi | 15 +- + arch/arm/boot/dts/exynos5260-xyref5260.dts | 1 - + arch/arm/boot/dts/exynos5410.dtsi | 9 +- + arch/arm/boot/dts/exynos5420-cpus.dtsi | 16 - + arch/arm/boot/dts/exynos5420-peach-pit.dts | 17 + + arch/arm/boot/dts/exynos5422-cpus.dtsi | 16 - + arch/arm/boot/dts/exynos5440.dtsi | 514 ++-- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 22 +- + arch/arm/boot/dts/exynos5800.dtsi | 5 +- + arch/arm/boot/dts/gemini-dlink-dns-313.dts | 2 - + arch/arm/boot/dts/imx1-ads.dts | 2 +- + arch/arm/boot/dts/imx1-apf9328.dts | 2 +- + arch/arm/boot/dts/imx1.dtsi | 2 +- + arch/arm/boot/dts/imx23-evk.dts | 2 +- + arch/arm/boot/dts/imx23-olinuxino.dts | 2 +- + arch/arm/boot/dts/imx23-sansa.dts | 2 +- + arch/arm/boot/dts/imx23-stmp378x_devb.dts | 2 +- + arch/arm/boot/dts/imx23-xfi3.dts | 2 +- + arch/arm/boot/dts/imx23.dtsi | 8 +- + arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi | 2 +- + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 12 +- + arch/arm/boot/dts/imx25-karo-tx25.dts | 2 +- + arch/arm/boot/dts/imx25-pdk.dts | 14 +- + arch/arm/boot/dts/imx25-pinfunc.h | 72 +- + arch/arm/boot/dts/imx25.dtsi | 4 +- + arch/arm/boot/dts/imx27-apf27.dts | 2 +- + arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi | 17 +- + .../boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts | 2 +- + arch/arm/boot/dts/imx27-pdk.dts | 2 +- + arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi | 2 +- + arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 2 +- + arch/arm/boot/dts/imx27.dtsi | 2 +- + arch/arm/boot/dts/imx28-apf28.dts | 2 +- + arch/arm/boot/dts/imx28-apx4devkit.dts | 6 +- + arch/arm/boot/dts/imx28-cfa10036.dts | 2 +- + arch/arm/boot/dts/imx28-cfa10049.dts | 130 +- + arch/arm/boot/dts/imx28-duckbill-2-485.dts | 2 +- + arch/arm/boot/dts/imx28-duckbill-2-enocean.dts | 2 +- + arch/arm/boot/dts/imx28-duckbill-2-spi.dts | 2 +- + arch/arm/boot/dts/imx28-duckbill-2.dts | 2 +- + arch/arm/boot/dts/imx28-duckbill.dts | 2 +- + arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts | 2 +- + arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts | 2 +- + arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi | 1 + + arch/arm/boot/dts/imx28-evk.dts | 3 +- + arch/arm/boot/dts/imx28-m28.dtsi | 2 +- + arch/arm/boot/dts/imx28-m28cu3.dts | 2 +- + arch/arm/boot/dts/imx28-m28evk.dts | 1 + + arch/arm/boot/dts/imx28-sps1.dts | 2 +- + arch/arm/boot/dts/imx28-ts4600.dts | 2 +- + arch/arm/boot/dts/imx28-tx28.dts | 34 +- + arch/arm/boot/dts/imx28.dtsi | 20 +- + arch/arm/boot/dts/imx31-bug.dts | 2 +- + arch/arm/boot/dts/imx31.dtsi | 2 +- + arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi | 2 +- + arch/arm/boot/dts/imx35-pdk.dts | 2 +- + arch/arm/boot/dts/imx35.dtsi | 2 +- + arch/arm/boot/dts/imx50-evk.dts | 2 +- + arch/arm/boot/dts/imx50.dtsi | 2 +- + arch/arm/boot/dts/imx51-apf51.dts | 2 +- + arch/arm/boot/dts/imx51-babbage.dts | 3 +- + arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts | 2 +- + arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 2 +- + arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 2 +- + arch/arm/boot/dts/imx51-ts4800.dts | 2 +- + arch/arm/boot/dts/imx51-zii-rdu1.dts | 14 + + arch/arm/boot/dts/imx51.dtsi | 2 +- + arch/arm/boot/dts/imx53-ard.dts | 2 +- + arch/arm/boot/dts/imx53-cx9020.dts | 2 +- + arch/arm/boot/dts/imx53-m53.dtsi | 2 +- + arch/arm/boot/dts/imx53-m53evk.dts | 1 + + arch/arm/boot/dts/imx53-ppd.dts | 12 + + arch/arm/boot/dts/imx53-qsb-common.dtsi | 3 +- + arch/arm/boot/dts/imx53-smd.dts | 2 +- + arch/arm/boot/dts/imx53-tqma53.dtsi | 2 +- + arch/arm/boot/dts/imx53-tx53-x03x.dts | 1 + + arch/arm/boot/dts/imx53-tx53-x13x.dts | 1 + + arch/arm/boot/dts/imx53-tx53.dtsi | 5 + + arch/arm/boot/dts/imx53-usbarmory.dts | 2 +- + arch/arm/boot/dts/imx53-voipac-bsb.dts | 1 + + arch/arm/boot/dts/imx53.dtsi | 2 +- + arch/arm/boot/dts/imx6dl-apf6dev.dts | 2 +- + arch/arm/boot/dts/imx6dl-aristainetos2_4.dts | 2 +- + arch/arm/boot/dts/imx6dl-aristainetos2_7.dts | 2 +- + arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 2 +- + arch/arm/boot/dts/imx6dl-aristainetos_7.dts | 2 +- + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 9 + + arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts | 5 + + arch/arm/boot/dts/imx6dl-phytec-mira-rdk-nand.dts | 64 + + arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi | 2 +- + arch/arm/boot/dts/imx6dl-rex-basic.dts | 2 +- + arch/arm/boot/dts/imx6dl-riotboard.dts | 2 +- + arch/arm/boot/dts/imx6dl-ts4900.dts | 5 + + arch/arm/boot/dts/imx6dl-ts7970.dts | 5 + + arch/arm/boot/dts/imx6dl-wandboard-revb1.dts | 2 +- + arch/arm/boot/dts/imx6dl-wandboard-revd1.dts | 2 +- + arch/arm/boot/dts/imx6dl-wandboard.dts | 2 +- + arch/arm/boot/dts/imx6dl.dtsi | 10 - + arch/arm/boot/dts/imx6q-apf6dev.dts | 2 +- + arch/arm/boot/dts/imx6q-arm2.dts | 2 +- + arch/arm/boot/dts/imx6q-ba16.dtsi | 2 +- + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 8 + + arch/arm/boot/dts/imx6q-cm-fx6.dts | 2 +- + arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts | 5 + + arch/arm/boot/dts/imx6q-display5.dtsi | 2 +- + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +- + arch/arm/boot/dts/imx6q-dms-ba16.dts | 139 + + arch/arm/boot/dts/imx6q-evi.dts | 2 +- + arch/arm/boot/dts/imx6q-gk802.dts | 2 +- + arch/arm/boot/dts/imx6q-gw5400-a.dts | 2 +- + arch/arm/boot/dts/imx6q-h100.dts | 7 +- + arch/arm/boot/dts/imx6q-marsboard.dts | 2 +- + arch/arm/boot/dts/imx6q-mccmon6.dts | 2 +- + arch/arm/boot/dts/imx6q-novena.dts | 5 + + arch/arm/boot/dts/imx6q-phytec-mira-rdk-emmc.dts | 72 + + arch/arm/boot/dts/imx6q-phytec-mira-rdk-nand.dts | 72 + + arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 2 +- + arch/arm/boot/dts/imx6q-pistachio.dts | 2 +- + arch/arm/boot/dts/imx6q-rex-pro.dts | 2 +- + arch/arm/boot/dts/imx6q-sbc6x.dts | 2 +- + arch/arm/boot/dts/imx6q-tbs2910.dts | 2 +- + arch/arm/boot/dts/imx6q-ts4900.dts | 5 + + arch/arm/boot/dts/imx6q-ts7970.dts | 5 + + arch/arm/boot/dts/imx6q-wandboard-revb1.dts | 2 +- + arch/arm/boot/dts/imx6q-wandboard-revd1.dts | 2 +- + arch/arm/boot/dts/imx6q-wandboard.dts | 2 +- + arch/arm/boot/dts/imx6q-zii-rdu2.dts | 5 + + arch/arm/boot/dts/imx6q.dtsi | 5 - + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-gw5903.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 9 +- + arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl-icore.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi | 390 +++ + arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 279 ++ + arch/arm/boot/dts/imx6qdl-rex.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-var-dart.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 22 +- + arch/arm/boot/dts/imx6qdl.dtsi | 4 +- + arch/arm/boot/dts/imx6qp-phytec-mira-rdk-nand.dts | 72 + + arch/arm/boot/dts/imx6qp-wandboard-revd1.dts | 2 +- + arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 5 + + arch/arm/boot/dts/imx6sl-evk.dts | 2 +- + arch/arm/boot/dts/imx6sl-warp.dts | 2 +- + arch/arm/boot/dts/imx6sl.dtsi | 2 +- + arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 2 +- + arch/arm/boot/dts/imx6sx-sabreauto.dts | 2 +- + arch/arm/boot/dts/imx6sx-sdb.dtsi | 2 +- + arch/arm/boot/dts/imx6sx-softing-vining-2000.dts | 2 +- + arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 2 +- + arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts | 2 +- + arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 2 +- + arch/arm/boot/dts/imx6sx.dtsi | 20 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 480 +--- + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 499 ++++ + arch/arm/boot/dts/imx6ul-geam.dts | 3 +- + arch/arm/boot/dts/imx6ul-isiot.dtsi | 3 +- + arch/arm/boot/dts/imx6ul-litesom.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-opos6ul.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 2 +- + arch/arm/boot/dts/imx6ul-pinfunc.h | 169 +- + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 4 +- + arch/arm/boot/dts/imx6ul.dtsi | 31 +- + arch/arm/boot/dts/imx6ull-14x14-evk.dts | 5 +- + arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts | 14 + + arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 157 + + arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 23 + + arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts | 14 + + arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 65 + + arch/arm/boot/dts/imx6ull-colibri.dtsi | 553 ++++ + arch/arm/boot/dts/imx6ull-pinfunc-snvs.h | 26 + + arch/arm/boot/dts/imx6ull.dtsi | 32 + + arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 54 +- + arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 2 +- + arch/arm/boot/dts/imx7d-colibri.dtsi | 2 +- + arch/arm/boot/dts/imx7d-nitrogen7.dts | 2 +- + arch/arm/boot/dts/imx7d-pico.dtsi | 2 +- + arch/arm/boot/dts/imx7d-sdb.dts | 7 +- + arch/arm/boot/dts/imx7s-colibri.dtsi | 2 +- + arch/arm/boot/dts/imx7s-warp.dts | 18 +- + arch/arm/boot/dts/imx7s.dtsi | 280 +- + arch/arm/boot/dts/keystone-k2e-clocks.dtsi | 2 +- + arch/arm/boot/dts/keystone-k2e.dtsi | 13 +- + arch/arm/boot/dts/keystone-k2g.dtsi | 82 +- + arch/arm/boot/dts/keystone-k2hk.dtsi | 104 +- + arch/arm/boot/dts/keystone-k2l.dtsi | 52 +- + arch/arm/boot/dts/keystone.dtsi | 42 +- + arch/arm/boot/dts/kirkwood-b3.dts | 5 +- + arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts | 3 +- + arch/arm/boot/dts/kirkwood-d2net.dts | 4 +- + arch/arm/boot/dts/kirkwood-db-88f6281.dts | 4 +- + arch/arm/boot/dts/kirkwood-db-88f6282.dts | 4 +- + arch/arm/boot/dts/kirkwood-db.dtsi | 5 +- + arch/arm/boot/dts/kirkwood-dir665.dts | 4 +- + arch/arm/boot/dts/kirkwood-ds109.dts | 4 +- + arch/arm/boot/dts/kirkwood-ds110jv10.dts | 4 +- + arch/arm/boot/dts/kirkwood-ds111.dts | 4 +- + arch/arm/boot/dts/kirkwood-ds112.dts | 4 +- + arch/arm/boot/dts/kirkwood-ds209.dts | 4 +- + arch/arm/boot/dts/kirkwood-ds210.dts | 4 +- + arch/arm/boot/dts/kirkwood-ds212.dts | 4 +- + arch/arm/boot/dts/kirkwood-ds212j.dts | 4 +- + arch/arm/boot/dts/kirkwood-ds409.dts | 4 +- + arch/arm/boot/dts/kirkwood-ds409slim.dts | 4 +- + arch/arm/boot/dts/kirkwood-ds411.dts | 4 +- + arch/arm/boot/dts/kirkwood-ds411j.dts | 4 +- + arch/arm/boot/dts/kirkwood-ds411slim.dts | 4 +- + arch/arm/boot/dts/kirkwood-laplug.dts | 4 +- + arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi | 39 +- + .../boot/dts/kirkwood-linkstation-duo-6281.dtsi | 39 +- + arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts | 39 +- + arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts | 39 +- + arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts | 39 +- + arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts | 39 +- + arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts | 39 +- + arch/arm/boot/dts/kirkwood-linkstation.dtsi | 39 +- + arch/arm/boot/dts/kirkwood-linksys-viper.dts | 4 +- + arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 5 +- + arch/arm/boot/dts/kirkwood-nas2big.dts | 4 +- + arch/arm/boot/dts/kirkwood-net2big.dts | 4 +- + arch/arm/boot/dts/kirkwood-net5big.dts | 4 +- + .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 6 +- + .../boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 6 +- + arch/arm/boot/dts/kirkwood-netxbig.dtsi | 4 +- + arch/arm/boot/dts/kirkwood-nsa320.dts | 5 +- + arch/arm/boot/dts/kirkwood-nsa325.dts | 5 +- + arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 4 +- + arch/arm/boot/dts/kirkwood-openrd-base.dts | 5 +- + arch/arm/boot/dts/kirkwood-openrd-client.dts | 5 +- + arch/arm/boot/dts/kirkwood-openrd-ultimate.dts | 5 +- + arch/arm/boot/dts/kirkwood-openrd.dtsi | 5 +- + arch/arm/boot/dts/kirkwood-pogo_e02.dts | 4 +- + arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts | 2 +- + arch/arm/boot/dts/kirkwood-rd88f6192.dts | 5 +- + arch/arm/boot/dts/kirkwood-rd88f6281-a.dts | 5 +- + arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts | 5 +- + arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 5 +- + arch/arm/boot/dts/kirkwood-rs212.dts | 4 +- + arch/arm/boot/dts/kirkwood-rs409.dts | 4 +- + arch/arm/boot/dts/kirkwood-rs411.dts | 4 +- + arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 3 +- + arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts | 3 +- + arch/arm/boot/dts/kirkwood-sheevaplug.dts | 3 +- + arch/arm/boot/dts/kirkwood-synology.dtsi | 4 +- + arch/arm/boot/dts/kirkwood-t5325.dts | 4 +- + arch/arm/boot/dts/kirkwood-ts419-6281.dts | 6 +- + arch/arm/boot/dts/kirkwood-ts419-6282.dts | 6 +- + arch/arm/boot/dts/kirkwood-ts419.dtsi | 6 +- + arch/arm/boot/dts/kirkwood.dtsi | 2 +- + arch/arm/boot/dts/logicpd-som-lv.dtsi | 16 + + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 16 + + arch/arm/boot/dts/ls1021a.dtsi | 16 + + arch/arm/boot/dts/meson8.dtsi | 9 + + arch/arm/boot/dts/meson8b-odroidc1.dts | 88 + + arch/arm/boot/dts/meson8b.dtsi | 59 +- + arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 13 + + arch/arm/boot/dts/mt7623.dtsi | 126 +- + arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 133 +- + arch/arm/boot/dts/mt7623n-rfb-nand.dts | 6 +- + arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi | 187 ++ + arch/arm/boot/dts/nuvoton-npcm750-evb.dts | 39 + + arch/arm/boot/dts/nuvoton-npcm750.dtsi | 44 + + arch/arm/boot/dts/omap3-n9.dts | 7 + + arch/arm/boot/dts/omap3.dtsi | 1 + + arch/arm/boot/dts/omap4-droid4-xt894.dts | 203 +- + arch/arm/boot/dts/omap443x.dtsi | 2 - + arch/arm/boot/dts/omap4460.dtsi | 2 - + arch/arm/boot/dts/omap5-board-common.dtsi | 4 +- + arch/arm/boot/dts/omap5.dtsi | 24 +- + arch/arm/boot/dts/omap54xx-clocks.dtsi | 10 + + arch/arm/boot/dts/orion5x-lacie-d2-network.dts | 2 +- + .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 2 +- + arch/arm/boot/dts/orion5x-linkstation.dtsi | 2 +- + arch/arm/boot/dts/orion5x-lswsgl.dts | 2 +- + .../boot/dts/orion5x-maxtor-shared-storage-2.dts | 2 +- + arch/arm/boot/dts/orion5x-rd88f5182-nas.dts | 2 +- + arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts | 2 +- + arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts | 2 +- + arch/arm/boot/dts/pxa3xx.dtsi | 6 +- + arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 2 +- + arch/arm/boot/dts/qcom-apq8064.dtsi | 63 + + arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts | 24 + + .../boot/dts/qcom-msm8974-sony-xperia-castor.dts | 4 +- + arch/arm/boot/dts/r8a7743-iwg20m.dtsi | 4 + + arch/arm/boot/dts/r8a7743.dtsi | 1324 +++++---- + arch/arm/boot/dts/r8a7745-iwg22m.dtsi | 4 + + arch/arm/boot/dts/r8a7745.dtsi | 1778 ++++++------ + arch/arm/boot/dts/r8a7779-marzen.dts | 14 + + arch/arm/boot/dts/r8a7790-lager.dts | 287 +- + arch/arm/boot/dts/r8a7790-stout.dts | 363 +++ + arch/arm/boot/dts/r8a7790.dtsi | 2837 ++++++++++--------- + arch/arm/boot/dts/r8a7791-koelsch.dts | 232 +- + arch/arm/boot/dts/r8a7791-porter.dts | 130 +- + arch/arm/boot/dts/r8a7791.dtsi | 2986 ++++++++++---------- + arch/arm/boot/dts/r8a7792.dtsi | 498 ++-- + arch/arm/boot/dts/r8a7793-gose.dts | 252 +- + arch/arm/boot/dts/r8a7793.dtsi | 2392 ++++++++-------- + arch/arm/boot/dts/r8a7794-alt.dts | 53 +- + arch/arm/boot/dts/r8a7794-silk.dts | 189 +- + arch/arm/boot/dts/r8a7794.dtsi | 2421 ++++++++-------- + arch/arm/boot/dts/rk322x.dtsi | 2 +- + arch/arm/boot/dts/rk3288-phycore-rdk.dts | 6 +- + arch/arm/boot/dts/rk3288-phycore-som.dtsi | 5 +- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 4 + + arch/arm/boot/dts/rk3288-rock2-square.dts | 41 + + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 1 - + arch/arm/boot/dts/rk3288-vyasa.dts | 11 + + arch/arm/boot/dts/sama5d3.dtsi | 24 +- + arch/arm/boot/dts/sama5d34ek.dts | 2 +- + arch/arm/boot/dts/sama5d3_uart.dtsi | 8 +- + arch/arm/boot/dts/sama5d4.dtsi | 30 +- + arch/arm/boot/dts/samsung_k3pe0e000b.dtsi | 68 - + arch/arm/boot/dts/socfpga.dtsi | 2 +- + arch/arm/boot/dts/stih407-b2120.dts | 4 +- + arch/arm/boot/dts/stih407-clock.dtsi | 92 +- + arch/arm/boot/dts/stih407-family.dtsi | 42 +- + arch/arm/boot/dts/stih407-pinctrl.dtsi | 10 +- + arch/arm/boot/dts/stih407.dtsi | 5 +- + arch/arm/boot/dts/stih410-b2120.dts | 10 +- + arch/arm/boot/dts/stih410-b2260.dts | 91 +- + arch/arm/boot/dts/stih410-clock.dtsi | 96 +- + arch/arm/boot/dts/stih410-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/stih410.dtsi | 14 +- + arch/arm/boot/dts/stih418-b2199.dts | 32 +- + arch/arm/boot/dts/stih418-clock.dtsi | 95 +- + arch/arm/boot/dts/stih418.dtsi | 6 +- + arch/arm/boot/dts/stihxxx-b2120.dtsi | 126 +- + arch/arm/boot/dts/stm32429i-eval.dts | 19 + + arch/arm/boot/dts/stm32746g-eval.dts | 20 +- + arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 31 + + arch/arm/boot/dts/stm32f429.dtsi | 11 + + arch/arm/boot/dts/stm32f469-disco.dts | 50 + + arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 289 ++ + arch/arm/boot/dts/stm32f746-disco.dts | 20 + + arch/arm/boot/dts/stm32f746-pinctrl.dtsi | 11 + + arch/arm/boot/dts/stm32f746.dtsi | 242 +- + arch/arm/boot/dts/stm32f769-disco.dts | 65 +- + arch/arm/boot/dts/stm32f769-pinctrl.dtsi | 11 + + arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 44 + + arch/arm/boot/dts/stm32h743.dtsi | 112 +- + arch/arm/boot/dts/stm32h743i-disco.dts | 2 +- + arch/arm/boot/dts/stm32h743i-eval.dts | 20 + + arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 185 ++ + arch/arm/boot/dts/stm32mp157c-ed1.dts | 32 + + arch/arm/boot/dts/stm32mp157c-ev1.dts | 21 + + arch/arm/boot/dts/stm32mp157c.dtsi | 194 ++ + arch/arm/boot/dts/sun4i-a10-a1000.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-inet1.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 3 +- + .../boot/dts/sun4i-a10-itead-iteaduino-plus.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-marsboard.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-mk802.dts | 28 +- + arch/arm/boot/dts/sun4i-a10-mk802ii.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 4 +- + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 3 +- + arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 3 +- + arch/arm/boot/dts/sun4i-a10.dtsi | 2 - + arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 3 +- + arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 3 +- + arch/arm/boot/dts/sun5i-a10s-mk802.dts | 3 +- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 6 +- + arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 3 +- + arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 3 +- + .../boot/dts/sun5i-a13-empire-electronix-d709.dts | 3 +- + arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 3 +- + arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 3 +- + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 3 +- + arch/arm/boot/dts/sun5i-a13.dtsi | 2 - + arch/arm/boot/dts/sun5i-gr8-evb.dts | 3 +- + .../boot/dts/sun5i-reference-design-tablet.dtsi | 3 +- + arch/arm/boot/dts/sun6i-a31-colombus.dts | 3 +- + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 3 +- + arch/arm/boot/dts/sun6i-a31-i7.dts | 32 +- + arch/arm/boot/dts/sun6i-a31-m9.dts | 3 +- + arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 3 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 2 - + arch/arm/boot/dts/sun6i-a31s-primo81.dts | 3 +- + arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 3 +- + arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 3 +- + .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 3 +- + .../boot/dts/sun6i-reference-design-tablet.dtsi | 3 +- + arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 28 +- + arch/arm/boot/dts/sun7i-a20-bananapro.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-m3.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-mk808c.dts | 28 +- + arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 31 +- + .../boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts | 36 + + arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 335 +++ + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 6 +- + arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 31 +- + arch/arm/boot/dts/sun7i-a20-orangepi.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 3 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 29 +- + arch/arm/boot/dts/sun8i-a23-evb.dts | 3 +- + arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 58 +- + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 3 +- + arch/arm/boot/dts/sun8i-a33.dtsi | 1 - + .../boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 3 +- + arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 42 +- + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 3 +- + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 12 + + arch/arm/boot/dts/sun8i-a83t.dtsi | 230 +- + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 121 + + arch/arm/boot/dts/sun8i-h2-plus-orangepi-r1.dts | 8 + + arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 11 +- + arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 32 +- + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 32 +- + arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dts | 30 +- + arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 12 +- + arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts | 25 + + arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 27 +- + arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 5 +- + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 32 +- + arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 32 +- + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 29 +- + arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 2 - + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 30 +- + arch/arm/boot/dts/sun8i-h3.dtsi | 27 + + arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 3 +- + arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 3 +- + .../boot/dts/sun8i-reference-design-tablet.dtsi | 11 +- + arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 3 +- + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 71 +- + arch/arm/boot/dts/sun9i-a80-optimus.dts | 3 +- + arch/arm/boot/dts/sun9i-a80.dtsi | 475 ++++ + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 122 +- + arch/arm/boot/dts/tegra114-dalmore.dts | 2 +- + arch/arm/boot/dts/tegra124-apalis-eval.dts | 23 +- + arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 250 ++ + arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 2052 ++++++++++++++ + arch/arm/boot/dts/tegra124-apalis.dtsi | 72 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 2 +- + arch/arm/boot/dts/tegra124-venice2.dts | 9 +- + arch/arm/boot/dts/tegra20-colibri-512.dtsi | 16 +- + arch/arm/boot/dts/tegra20.dtsi | 4 +- + arch/arm/boot/dts/tegra30-apalis-eval.dts | 4 +- + arch/arm/boot/dts/tegra30-apalis.dtsi | 7 +- + arch/arm/boot/dts/tegra30-beaver.dts | 32 +- + arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 6 +- + arch/arm/boot/dts/tegra30-colibri.dtsi | 3 +- + arch/arm/boot/dts/tegra30.dtsi | 35 + + arch/arm/boot/dts/uniphier-ld4-ref.dts | 14 +- + arch/arm/boot/dts/uniphier-ld4.dtsi | 14 +- + arch/arm/boot/dts/uniphier-ld6b-ref.dts | 25 +- + arch/arm/boot/dts/uniphier-ld6b.dtsi | 14 +- + arch/arm/boot/dts/uniphier-pinctrl.dtsi | 64 +- + arch/arm/boot/dts/uniphier-pro4-ace.dts | 25 +- + arch/arm/boot/dts/uniphier-pro4-ref.dts | 25 +- + arch/arm/boot/dts/uniphier-pro4-sanji.dts | 25 +- + arch/arm/boot/dts/uniphier-pro4.dtsi | 32 +- + arch/arm/boot/dts/uniphier-pro5.dtsi | 14 +- + arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 49 +- + arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 62 +- + arch/arm/boot/dts/uniphier-pxs2.dtsi | 89 +- + arch/arm/boot/dts/uniphier-ref-daughter.dtsi | 14 +- + arch/arm/boot/dts/uniphier-sld8-ref.dts | 14 +- + arch/arm/boot/dts/uniphier-sld8.dtsi | 14 +- + arch/arm/boot/dts/uniphier-support-card.dtsi | 14 +- + arch/arm/boot/dts/versatile-ab-ib2.dts | 26 + + arch/arm/boot/dts/versatile-ab.dts | 83 +- + arch/arm/boot/dts/vf500-colibri.dtsi | 2 +- + arch/arm/boot/dts/vf500.dtsi | 7 +- + arch/arm/boot/dts/vf610-colibri.dtsi | 2 +- + arch/arm/boot/dts/vf610-cosmic.dts | 2 +- + arch/arm/boot/dts/vf610-twr.dts | 2 +- + arch/arm/boot/dts/vf610-zii-dev.dtsi | 2 +- + arch/arm/boot/dts/vf610m4-colibri.dts | 4 +- + arch/arm/boot/dts/vf610m4.dtsi | 9 +- + arch/arm/boot/dts/zynq-7000.dtsi | 12 +- + arch/arm/boot/dts/zynq-cc108.dts | 75 + + arch/arm/boot/dts/zynq-microzed.dts | 12 +- + arch/arm/boot/dts/zynq-parallella.dts | 10 +- + arch/arm/boot/dts/zynq-zc702.dts | 12 +- + arch/arm/boot/dts/zynq-zc706.dts | 12 +- + arch/arm/boot/dts/zynq-zc770-xm010.dts | 95 + + arch/arm/boot/dts/zynq-zc770-xm011.dts | 64 + + arch/arm/boot/dts/zynq-zc770-xm012.dts | 64 + + arch/arm/boot/dts/zynq-zc770-xm013.dts | 78 + + arch/arm/boot/dts/zynq-zed.dts | 10 +- + arch/arm/boot/dts/zynq-zybo-z7.dts | 58 + + arch/arm/boot/dts/zynq-zybo.dts | 10 +- + arch/arm/configs/bcm2835_defconfig | 4 + + arch/arm/configs/cm_x300_defconfig | 2 +- + arch/arm/configs/davinci_all_defconfig | 3 +- + arch/arm/configs/imx_v4_v5_defconfig | 9 +- + arch/arm/configs/imx_v6_v7_defconfig | 28 +- + arch/arm/configs/multi_v7_defconfig | 65 +- + arch/arm/configs/mxs_defconfig | 15 +- + arch/arm/configs/omap2plus_defconfig | 99 +- + arch/arm/configs/oxnas_v6_defconfig | 93 + + arch/arm/configs/pxa3xx_defconfig | 3 +- + arch/arm/configs/pxa_defconfig | 2 +- + arch/arm/configs/raumfeld_defconfig | 2 +- + arch/arm/configs/realview_defconfig | 21 +- + arch/arm/configs/shmobile_defconfig | 9 +- + arch/arm/configs/stm32_defconfig | 3 + + arch/arm/configs/versatile_defconfig | 18 +- + arch/arm/include/debug/exynos.S | 7 +- + arch/arm/include/debug/samsung.S | 10 +- + arch/arm/mach-at91/Kconfig | 14 +- + arch/arm/mach-davinci/board-da830-evm.c | 35 +- + arch/arm/mach-davinci/board-da850-evm.c | 7 +- + arch/arm/mach-davinci/board-dm355-evm.c | 3 +- + arch/arm/mach-davinci/board-dm355-leopard.c | 3 +- + arch/arm/mach-davinci/board-dm365-evm.c | 3 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 3 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 21 +- + arch/arm/mach-davinci/board-mityomapl138.c | 7 +- + arch/arm/mach-davinci/board-neuros-osd2.c | 3 +- + arch/arm/mach-davinci/board-omapl138-hawk.c | 7 +- + arch/arm/mach-davinci/board-sffsdr.c | 3 +- + arch/arm/mach-davinci/clock.h | 3 - + arch/arm/mach-davinci/da830.c | 7 +- + arch/arm/mach-davinci/da850.c | 7 +- + arch/arm/mach-davinci/da8xx-dt.c | 3 +- + arch/arm/mach-davinci/davinci.h | 4 + + arch/arm/mach-davinci/devices-da8xx.c | 57 +- + arch/arm/mach-davinci/devices.c | 7 +- + arch/arm/mach-davinci/dm355.c | 8 +- + arch/arm/mach-davinci/dm365.c | 8 +- + arch/arm/mach-davinci/dm644x.c | 8 +- + arch/arm/mach-davinci/dm646x.c | 22 +- + arch/arm/mach-davinci/include/mach/common.h | 2 - + arch/arm/mach-davinci/include/mach/da8xx.h | 7 +- + arch/arm/mach-davinci/time.c | 57 - + arch/arm/mach-davinci/usb-da8xx.c | 18 +- + arch/arm/mach-exynos/exynos.c | 3 +- + arch/arm/mach-exynos/pm.c | 8 +- + arch/arm/mach-imx/Kconfig | 22 +- + arch/arm/mach-imx/Makefile | 3 +- + arch/arm/mach-imx/anatop.c | 56 +- + arch/arm/mach-imx/avic.c | 37 + + arch/arm/mach-imx/cpu.c | 3 + + arch/arm/mach-imx/cpuidle-imx6sl.c | 7 +- + arch/arm/mach-imx/cpuidle-imx6sx.c | 1 + + arch/arm/mach-imx/epit.c | 228 -- + arch/arm/mach-imx/mach-imx6sl.c | 10 +- + arch/arm/mach-imx/mxc.h | 6 + + arch/arm/mach-imx/pm-imx6.c | 7 +- + arch/arm/mach-mmp/aspenite.c | 6 +- + arch/arm/mach-mmp/ttc_dkb.c | 9 +- + arch/arm/mach-npcm/Kconfig | 30 + + arch/arm/mach-npcm/Makefile | 4 + + arch/arm/mach-npcm/headsmp.S | 17 + + arch/arm/mach-npcm/npcm7xx.c | 20 + + arch/arm/mach-npcm/platsmp.c | 81 + + arch/arm/mach-nspire/nspire.c | 6 - + arch/arm/mach-omap1/Kconfig | 1 + + arch/arm/mach-omap1/common.h | 3 +- + arch/arm/mach-omap1/i2c.c | 2 - + .../{plat-omap/include/plat => mach-omap1}/i2c.h | 9 +- + arch/arm/mach-omap1/pm.c | 2 +- + arch/arm/mach-omap1/timer.c | 2 +- + arch/arm/mach-omap2/Kconfig | 1 + + arch/arm/mach-omap2/Makefile | 16 + + arch/arm/mach-omap2/board-n8x0.c | 4 +- + arch/arm/mach-omap2/common.h | 7 + + arch/arm/mach-omap2/control.c | 20 +- + arch/arm/mach-omap2/devices.c | 2 +- + arch/arm/mach-omap2/hsmmc.c | 2 - + arch/arm/mach-omap2/i2c.h | 15 +- + arch/arm/mach-omap2/io.c | 2 + + arch/arm/mach-omap2/msdi.c | 1 - + arch/arm/mach-omap2/omap4-sar-layout.h | 2 +- + arch/arm/mach-omap2/omap_device.c | 5 + + arch/arm/mach-omap2/omap_hwmod.c | 418 ++- + arch/arm/mach-omap2/omap_hwmod.h | 7 + + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 11 - + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 18 - + arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 61 +- + .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 3 - + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 25 +- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 4 - + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 116 - + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 8 - + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 75 - + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 54 - + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 53 - + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 31 +- + arch/arm/mach-omap2/omap_hwmod_common_data.h | 1 - + arch/arm/mach-omap2/pdata-quirks.c | 86 +- + arch/arm/mach-omap2/pm-asm-offsets.c | 31 + + arch/arm/mach-omap2/pm.h | 3 + + arch/arm/mach-omap2/pm33xx-core.c | 189 ++ + arch/arm/mach-omap2/sleep33xx.S | 214 ++ + arch/arm/mach-omap2/sleep43xx.S | 391 +++ + arch/arm/mach-omap2/sleep44xx.S | 7 +- + arch/arm/mach-omap2/sr_device.c | 27 +- + arch/arm/mach-omap2/timer.c | 2 +- + arch/arm/mach-pxa/cm-x300.c | 14 +- + arch/arm/mach-pxa/colibri-pxa3xx.c | 8 +- + arch/arm/mach-pxa/colibri.h | 2 +- + arch/arm/mach-pxa/littleton.c | 10 +- + arch/arm/mach-pxa/mxm8x10.c | 10 +- + arch/arm/mach-pxa/pxa3xx-ulpi.c | 6 +- + arch/arm/mach-pxa/raumfeld.c | 12 +- + arch/arm/mach-pxa/zylonite.c | 10 +- + arch/arm/mach-rockchip/platsmp.c | 1 + + arch/arm/mach-shmobile/common.h | 4 + + arch/arm/mach-shmobile/headsmp.S | 55 + + arch/arm/mach-shmobile/platsmp-apmu.c | 1 + + arch/arm/mach-shmobile/pm-rcar-gen2.c | 15 +- + arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 25 +- + arch/arm/mach-socfpga/pm.c | 1 - + arch/arm/mach-stm32/Kconfig | 46 +- + arch/arm/mach-stm32/board-dt.c | 11 +- + arch/arm/mach-sunxi/Kconfig | 7 + + arch/arm/mach-sunxi/Makefile | 3 + + arch/arm/mach-sunxi/mc_smp.c | 856 ++++++ + arch/arm/plat-omap/Kconfig | 6 - + arch/arm/plat-omap/Makefile | 1 - + arch/arm64/Kconfig.platforms | 12 + + arch/arm64/boot/dts/allwinner/Makefile | 3 + + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 3 +- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 3 +- + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 3 +- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 3 +- + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 8 +- + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 265 ++ + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 99 + + .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 4 - + .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 2 - + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 27 +- + .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 29 +- + .../dts/allwinner/sun50i-h5-orangepi-zero-plus.dts | 143 + + .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 29 +- + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 29 + + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 175 ++ + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 5 + + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 18 +- + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 275 +- + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 40 +- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 40 +- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 42 +- + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 40 +- + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 42 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 39 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts | 39 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 40 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95-meta.dts | 39 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95-pro.dts | 39 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95-telos.dts | 39 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 40 +- + .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 82 +- + .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 122 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 256 ++ + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 50 +- + arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi | 14 +- + .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 39 +- + .../boot/dts/amlogic/meson-gxl-s905d-p231.dts | 39 +- + arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi | 39 +- + .../dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts | 4 +- + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 +- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 4 +- + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 40 +- + .../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 39 +- + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 4 +- + arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi | 39 +- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 39 +- + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 9 +- + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 40 +- + arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 39 +- + arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts | 39 +- + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 40 +- + arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dts | 3 +- + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 39 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 21 +- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 90 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 24 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 80 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 83 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 66 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 134 +- + arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 8 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 98 +- + .../boot/dts/freescale/qoriq-bman-portals.dtsi | 6 + + .../boot/dts/freescale/qoriq-qman-portals.dtsi | 7 + + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 32 +- + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 + + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 10 +- + arch/arm64/boot/dts/hisilicon/hip06.dtsi | 56 + + arch/arm64/boot/dts/hisilicon/hip07.dtsi | 33 + + arch/arm64/boot/dts/marvell/armada-371x.dtsi | 38 +- + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 39 +- + .../boot/dts/marvell/armada-3720-espressobin.dts | 41 +- + arch/arm64/boot/dts/marvell/armada-372x.dtsi | 38 +- + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 38 +- + arch/arm64/boot/dts/marvell/armada-7020.dtsi | 41 +- + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 93 +- + arch/arm64/boot/dts/marvell/armada-7040.dtsi | 41 +- + arch/arm64/boot/dts/marvell/armada-70x0.dtsi | 41 +- + arch/arm64/boot/dts/marvell/armada-8020.dtsi | 41 +- + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 87 +- + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 65 +- + arch/arm64/boot/dts/marvell/armada-8040.dtsi | 41 +- + arch/arm64/boot/dts/marvell/armada-8080-db.dts | 41 +- + arch/arm64/boot/dts/marvell/armada-8080.dtsi | 41 +- + arch/arm64/boot/dts/marvell/armada-80x0.dtsi | 41 +- + arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 41 +- + arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 41 +- + arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 41 +- + .../dts/marvell/armada-ap810-ap0-octa-core.dtsi | 41 +- + arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi | 41 +- + arch/arm64/boot/dts/marvell/armada-common.dtsi | 2 +- + arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 118 +- + arch/arm64/boot/dts/mediatek/mt2712-evb.dts | 4 + + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 9 + + arch/arm64/boot/dts/mediatek/mt6380.dtsi | 86 + + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 469 +++ + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 675 ++++- + arch/arm64/boot/dts/nvidia/Makefile | 1 + + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 248 ++ + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 16 + + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 344 +++ + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 5 + + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 16 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 60 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 23 +- + arch/arm64/boot/dts/renesas/Makefile | 2 + + arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 3 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 194 +- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 130 +- + .../arm64/boot/dts/renesas/r8a77965-salvator-x.dts | 21 + + .../boot/dts/renesas/r8a77965-salvator-xs.dts | 21 + + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 878 ++++++ + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 33 + + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 11 + + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 218 +- + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 58 + + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 385 +++ + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 124 + + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 193 +- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 8 + + arch/arm64/boot/dts/renesas/ulcb.dtsi | 1 + + arch/arm64/boot/dts/rockchip/Makefile | 3 + + arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 267 ++ + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 6 +- + .../arm64/boot/dts/rockchip/rk3368-lion-haikou.dts | 146 + + arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi | 317 +++ + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 13 +- + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 71 +- + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 28 + + .../dts/rockchip/rk3399-sapphire-excavator.dts | 44 +- + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dts | 12 + + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 67 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 79 +- + .../boot/dts/socionext/uniphier-ld11-global.dts | 109 +- + .../arm64/boot/dts/socionext/uniphier-ld11-ref.dts | 25 +- + arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 127 +- + .../boot/dts/socionext/uniphier-ld20-global.dts | 111 +- + .../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 25 +- + arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 138 +- + .../arm64/boot/dts/socionext/uniphier-pxs3-ref.dts | 36 +- + arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 50 +- + arch/arm64/boot/dts/sprd/sc2731.dtsi | 169 ++ + arch/arm64/boot/dts/sprd/sp9860g-1h10.dts | 2 + + arch/arm64/boot/dts/sprd/whale2.dtsi | 81 + + arch/arm64/boot/dts/xilinx/Makefile | 16 + + arch/arm64/boot/dts/xilinx/zynqmp-clk.dtsi | 213 ++ + arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi | 1 + + arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 13 +- + arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts | 54 + + arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts | 42 + + arch/arm64/boot/dts/xilinx/zynqmp-zc1275-revA.dts | 42 + + .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 131 + + .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 168 ++ + .../boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 150 + + .../boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 178 ++ + .../boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 125 + + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 289 ++ + .../arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts | 36 + + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 548 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts | 40 + + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 195 ++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 522 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 444 +++ + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 17 +- + arch/arm64/configs/defconfig | 39 +- + drivers/bus/Kconfig | 36 - + drivers/bus/Makefile | 2 - + drivers/bus/arm-cci.c | 1763 +----------- + drivers/bus/ti-sysc.c | 526 +++- + drivers/clk/Kconfig | 10 + + drivers/clk/Makefile | 1 + + drivers/clk/clk-scmi.c | 194 ++ + drivers/clk/imx/clk-imx7d.c | 3 + + drivers/clocksource/Kconfig | 3 + + drivers/clocksource/Makefile | 1 + + .../dmtimer.c => drivers/clocksource/timer-ti-dm.c | 286 +- + drivers/cpufreq/Kconfig.arm | 12 + + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/scmi-cpufreq.c | 264 ++ + drivers/firmware/Kconfig | 34 + + drivers/firmware/Makefile | 1 + + drivers/firmware/arm_scmi/Makefile | 5 + + drivers/firmware/arm_scmi/base.c | 253 ++ + drivers/firmware/arm_scmi/bus.c | 221 ++ + drivers/firmware/arm_scmi/clock.c | 343 +++ + drivers/firmware/arm_scmi/common.h | 105 + + drivers/firmware/arm_scmi/driver.c | 871 ++++++ + drivers/firmware/arm_scmi/perf.c | 481 ++++ + drivers/firmware/arm_scmi/power.c | 221 ++ + drivers/firmware/arm_scmi/scmi_pm_domain.c | 129 + + drivers/firmware/arm_scmi/sensors.c | 291 ++ + drivers/firmware/arm_scpi.c | 211 +- + drivers/firmware/meson/meson_sm.c | 25 +- + drivers/firmware/tegra/bpmp.c | 144 +- + drivers/hwmon/Kconfig | 12 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/scmi-hwmon.c | 225 ++ + drivers/memory/emif.c | 2 +- + drivers/memory/samsung/Kconfig | 1 + + drivers/memory/samsung/Makefile | 1 + + drivers/memory/samsung/exynos-srom.c | 18 +- + drivers/memory/samsung/exynos-srom.h | 7 +- + drivers/memory/ti-emif-pm.c | 1 - + drivers/mtd/nand/Kconfig | 11 - + drivers/mtd/nand/Makefile | 1 - + drivers/mtd/nand/marvell_nand.c | 3 +- + drivers/mtd/nand/pxa3xx_nand.c | 2105 -------------- + drivers/perf/Kconfig | 33 + + drivers/perf/Makefile | 2 + + drivers/perf/arm-cci.c | 1722 +++++++++++ + drivers/{bus => perf}/arm-ccn.c | 0 + drivers/phy/ti/phy-da8xx-usb.c | 16 +- + drivers/power/avs/smartreflex.c | 41 +- + drivers/pwm/pwm-omap-dmtimer.c | 68 +- + drivers/reset/Kconfig | 17 +- + drivers/reset/Makefile | 1 + + drivers/reset/core.c | 96 +- + drivers/reset/reset-meson.c | 22 +- + drivers/reset/reset-simple.c | 2 + + drivers/reset/reset-stm32mp1.c | 115 + + drivers/reset/reset-uniphier.c | 5 + + drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 9 +- + drivers/soc/amlogic/meson-gx-socinfo.c | 12 +- + drivers/soc/amlogic/meson-mx-socinfo.c | 2 +- + drivers/soc/imx/gpc.c | 1 + + drivers/soc/mediatek/mtk-scpsys.c | 104 +- + drivers/soc/qcom/Kconfig | 1 + + drivers/soc/qcom/rmtfs_mem.c | 34 + + drivers/soc/qcom/wcnss_ctrl.c | 2 +- + drivers/soc/renesas/Kconfig | 14 +- + drivers/soc/renesas/Makefile | 2 + + drivers/soc/renesas/r8a77965-sysc.c | 37 + + drivers/soc/renesas/r8a77970-sysc.c | 12 +- + drivers/soc/renesas/r8a77980-sysc.c | 52 + + drivers/soc/renesas/rcar-rst.c | 37 +- + drivers/soc/renesas/rcar-sysc.c | 8 +- + drivers/soc/renesas/rcar-sysc.h | 2 + + drivers/soc/renesas/renesas-soc.c | 16 + + drivers/soc/rockchip/grf.c | 28 + + drivers/soc/rockchip/pm_domains.c | 95 +- + drivers/soc/samsung/exynos-pmu.c | 7 + + drivers/soc/tegra/Kconfig | 10 + + drivers/soc/tegra/pmc.c | 98 +- + drivers/soc/ti/Kconfig | 9 + + drivers/soc/ti/Makefile | 1 + + drivers/soc/ti/pm33xx.c | 349 +++ + drivers/tee/optee/core.c | 23 + + drivers/tee/optee/optee_smc.h | 10 +- + drivers/tee/tee_core.c | 14 +- + .../dmtimer.h => include/clocksource/timer-ti-dm.h | 44 +- + include/dt-bindings/clock/imx7d-clock.h | 5 +- + include/dt-bindings/clock/tegra194-clock.h | 321 +++ + include/dt-bindings/gpio/tegra194-gpio.h | 61 + + include/dt-bindings/mfd/stm32f7-rcc.h | 1 + + include/dt-bindings/power/mt2712-power.h | 3 + + include/dt-bindings/power/mt7623a-power.h | 10 + + include/dt-bindings/power/r8a77965-sysc.h | 30 + + include/dt-bindings/power/r8a77980-sysc.h | 43 + + include/dt-bindings/power/tegra194-powergate.h | 35 + + include/dt-bindings/reset/stm32mp1-resets.h | 108 + + include/dt-bindings/reset/tegra194-reset.h | 152 + + include/linux/clk/ti.h | 1 + + include/linux/hwmon.h | 1 + + include/linux/platform_data/asoc-ti-mcbsp.h | 12 - + include/linux/platform_data/dmtimer-omap.h | 38 + + include/linux/platform_data/gpio-omap.h | 5 - + include/linux/platform_data/mtd-nand-pxa3xx.h | 43 +- + include/linux/platform_data/phy-da8xx-usb.h | 21 + + include/linux/platform_data/pm33xx.h | 42 + + include/linux/platform_data/spi-omap2-mcspi.h | 8 - + include/linux/platform_data/ti-sysc.h | 50 + + include/linux/power/smartreflex.h | 10 +- + include/linux/reset-controller.h | 30 + + include/linux/scmi_protocol.h | 277 ++ + include/linux/serial_s3c.h | 17 +- + include/linux/soc/mediatek/infracfg.h | 4 + + include/linux/soc/samsung/exynos-pmu.h | 5 +- + include/linux/soc/samsung/exynos-regs-pmu.h | 6 +- + include/soc/tegra/bpmp.h | 4 +- + 1142 files changed, 51848 insertions(+), 26611 deletions(-) + rename Documentation/arm/{Atmel => Microchip}/README (64%) + create mode 100644 Documentation/arm/stm32/overview.rst + delete mode 100644 Documentation/arm/stm32/overview.txt + create mode 100644 Documentation/arm/stm32/stm32f429-overview.rst + delete mode 100644 Documentation/arm/stm32/stm32f429-overview.txt + create mode 100644 Documentation/arm/stm32/stm32f746-overview.rst + delete mode 100644 Documentation/arm/stm32/stm32f746-overview.txt + create mode 100644 Documentation/arm/stm32/stm32f769-overview.rst + create mode 100644 Documentation/arm/stm32/stm32h743-overview.rst + delete mode 100644 Documentation/arm/stm32/stm32h743-overview.txt + create mode 100644 Documentation/arm/stm32/stm32mp157-overview.rst + create mode 100644 Documentation/devicetree/bindings/arm/arm,scmi.txt + create mode 100644 Documentation/devicetree/bindings/arm/cpu-enable-method/nuvoton,npcm750-smp + create mode 100644 Documentation/devicetree/bindings/arm/npcm/npcm.txt + create mode 100644 Documentation/devicetree/bindings/arm/sunxi/smp-sram.txt + delete mode 100644 Documentation/devicetree/bindings/mtd/pxa3xx-nand.txt + rename Documentation/devicetree/bindings/{arm/ccn.txt => perf/arm-ccn.txt} (100%) + create mode 100644 Documentation/devicetree/bindings/reset/st,stm32mp1-rcc.txt + rename Documentation/{arm/CCN.txt => perf/arm-ccn.txt} (100%) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am335x-pdu001.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts + create mode 100644 arch/arm/boot/dts/dra76x-mmc-iodelay.dtsi + create mode 100644 arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi + create mode 100644 arch/arm/boot/dts/exynos4412-i9300.dts + create mode 100644 arch/arm/boot/dts/exynos4412-i9305.dts + create mode 100644 arch/arm/boot/dts/exynos4412-midas.dtsi + create mode 100644 arch/arm/boot/dts/exynos4412-n710x.dts + create mode 100644 arch/arm/boot/dts/imx6dl-phytec-mira-rdk-nand.dts + create mode 100644 arch/arm/boot/dts/imx6q-dms-ba16.dts + create mode 100644 arch/arm/boot/dts/imx6q-phytec-mira-rdk-emmc.dts + create mode 100644 arch/arm/boot/dts/imx6q-phytec-mira-rdk-nand.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi + create mode 100644 arch/arm/boot/dts/imx6qp-phytec-mira-rdk-nand.dts + create mode 100644 arch/arm/boot/dts/imx6ul-14x14-evk.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts + create mode 100644 arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts + create mode 100644 arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-colibri.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-pinfunc-snvs.h + create mode 100644 arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi + create mode 100644 arch/arm/boot/dts/nuvoton-npcm750-evb.dts + create mode 100644 arch/arm/boot/dts/nuvoton-npcm750.dtsi + create mode 100644 arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts + create mode 100644 arch/arm/boot/dts/r8a7790-stout.dts + delete mode 100644 arch/arm/boot/dts/samsung_k3pe0e000b.dtsi + create mode 100644 arch/arm/boot/dts/stm32f7-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stm32f746-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stm32f769-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp157-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp157c-ed1.dts + create mode 100644 arch/arm/boot/dts/stm32mp157c-ev1.dts + create mode 100644 arch/arm/boot/dts/stm32mp157c.dtsi + create mode 100644 arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts + create mode 100644 arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts + create mode 100644 arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts + create mode 100644 arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi + create mode 100644 arch/arm/boot/dts/versatile-ab-ib2.dts + create mode 100644 arch/arm/boot/dts/zynq-cc108.dts + create mode 100644 arch/arm/boot/dts/zynq-zc770-xm010.dts + create mode 100644 arch/arm/boot/dts/zynq-zc770-xm011.dts + create mode 100644 arch/arm/boot/dts/zynq-zc770-xm012.dts + create mode 100644 arch/arm/boot/dts/zynq-zc770-xm013.dts + create mode 100644 arch/arm/boot/dts/zynq-zybo-z7.dts + create mode 100644 arch/arm/configs/oxnas_v6_defconfig + delete mode 100644 arch/arm/mach-imx/epit.c + create mode 100644 arch/arm/mach-npcm/Kconfig + create mode 100644 arch/arm/mach-npcm/Makefile + create mode 100644 arch/arm/mach-npcm/headsmp.S + create mode 100644 arch/arm/mach-npcm/npcm7xx.c + create mode 100644 arch/arm/mach-npcm/platsmp.c + rename arch/arm/{plat-omap/include/plat => mach-omap1}/i2c.h (90%) + create mode 100644 arch/arm/mach-omap2/pm-asm-offsets.c + create mode 100644 arch/arm/mach-omap2/pm33xx-core.c + create mode 100644 arch/arm/mach-omap2/sleep33xx.S + create mode 100644 arch/arm/mach-omap2/sleep43xx.S + create mode 100644 arch/arm/mach-sunxi/mc_smp.c + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt6380.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra194.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a77965-salvator-x.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77965-salvator-xs.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77965.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a77980-condor.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77980.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-sapphire.dts + create mode 100644 arch/arm64/boot/dts/sprd/sc2731.dtsi + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-clk.dtsi + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zc1275-revA.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts + create mode 100644 drivers/clk/clk-scmi.c + rename arch/arm/plat-omap/dmtimer.c => drivers/clocksource/timer-ti-dm.c (87%) + create mode 100644 drivers/cpufreq/scmi-cpufreq.c + create mode 100644 drivers/firmware/arm_scmi/Makefile + create mode 100644 drivers/firmware/arm_scmi/base.c + create mode 100644 drivers/firmware/arm_scmi/bus.c + create mode 100644 drivers/firmware/arm_scmi/clock.c + create mode 100644 drivers/firmware/arm_scmi/common.h + create mode 100644 drivers/firmware/arm_scmi/driver.c + create mode 100644 drivers/firmware/arm_scmi/perf.c + create mode 100644 drivers/firmware/arm_scmi/power.c + create mode 100644 drivers/firmware/arm_scmi/scmi_pm_domain.c + create mode 100644 drivers/firmware/arm_scmi/sensors.c + create mode 100644 drivers/hwmon/scmi-hwmon.c + delete mode 100644 drivers/mtd/nand/pxa3xx_nand.c + create mode 100644 drivers/perf/arm-cci.c + rename drivers/{bus => perf}/arm-ccn.c (100%) + create mode 100644 drivers/reset/reset-stm32mp1.c + create mode 100644 drivers/soc/renesas/r8a77965-sysc.c + create mode 100644 drivers/soc/renesas/r8a77980-sysc.c + create mode 100644 drivers/soc/ti/pm33xx.c + rename arch/arm/plat-omap/include/plat/dmtimer.h => include/clocksource/timer-ti-dm.h (87%) + create mode 100644 include/dt-bindings/clock/tegra194-clock.h + create mode 100644 include/dt-bindings/gpio/tegra194-gpio.h + create mode 100644 include/dt-bindings/power/mt7623a-power.h + create mode 100644 include/dt-bindings/power/r8a77965-sysc.h + create mode 100644 include/dt-bindings/power/r8a77980-sysc.h + create mode 100644 include/dt-bindings/power/tegra194-powergate.h + create mode 100644 include/dt-bindings/reset/stm32mp1-resets.h + create mode 100644 include/dt-bindings/reset/tegra194-reset.h + create mode 100644 include/linux/platform_data/phy-da8xx-usb.h + create mode 100644 include/linux/platform_data/pm33xx.h + create mode 100644 include/linux/scmi_protocol.h +Merging actions/for-next (61862a89e6ac Merge branch 'v4.16/drivers' into next) +$ git merge actions/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge alpine/alpine/for-next +Already up to date. +Merging amlogic/for-next (059e40d90876 Merge branch 'v4.17/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (6534b2d0de36 Merge branch 'dt-for-v4.17' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (20d3f36b0fea Merge tag 'at91-ab-4.17-dt2' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (cf172af3be59 Merge branch anholt/bcm2835-defconfig-next into for-next) +$ git merge bcm2835/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (98f9530adda3 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + drivers/clk/imx/clk-imx6sx.c | 14 ++++---- + drivers/clk/imx/clk-imx6ul.c | 5 ++- + drivers/clk/imx/clk-imx7d.c | 84 +++++++++++++++++++++++--------------------- + 3 files changed, 55 insertions(+), 48 deletions(-) +Merging keystone/next (dacf37850167 Merge branch 'for_4.17/soc-drivers' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (4c1b45a44e35 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 (d1cc5c055f7a Merge branch 'omap-for-v4.17/defconfig' into for-next) +$ git merge omap/for-next +Resolved 'arch/arm/boot/dts/logicpd-torpedo-som.dtsi' using previous resolution. +Auto-merging arch/arm/boot/dts/logicpd-torpedo-som.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/logicpd-torpedo-som.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d305d410cbd4] Merge remote-tracking branch 'omap/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 1 + + 1 file changed, 1 insertion(+) +Merging reset/reset/next (0089313d8595 Merge branch 'reset/lookup' into reset/next) +$ git merge reset/reset/next +Already up to date. +Merging qcom/for-next (186d88395e05 Merge tag 'qcom-arm64-defconfig-for-4.17' into all-for-4.17-final) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next) +$ git merge realtek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (58eb42a95b24 Merge branches 'arm64-defconfig-for-v4.17', 'arm64-dt-for-v4.17', 'defconfig-for-v4.17', 'dt-bindings-for-v4.17', 'dt-for-v4.17' and 'soc-for-v4.17' into next) +$ git merge renesas/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging rockchip/for-next (f5a45eb97728 Merge branch 'v4.17-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/rockchip,rk3328-cru.txt | 1 + + arch/arm/boot/dts/rk3288.dtsi | 8 +-- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 8 +++ + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 8 ++- + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 4 ++ + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 4 ++ + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 8 +++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 14 ++-- + drivers/clk/rockchip/clk-mmc-phase.c | 78 +++++++++++++++++++- + drivers/clk/rockchip/clk-rk3228.c | 2 +- + drivers/clk/rockchip/clk-rk3328.c | 83 +++++++++++++--------- + drivers/clk/rockchip/clk-rk3399.c | 5 +- + drivers/clk/rockchip/clk.c | 22 ++++-- + include/dt-bindings/clock/rk3328-cru.h | 1 - + 14 files changed, 194 insertions(+), 52 deletions(-) +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (0bc590a59ce6 Merge branch 'next/soc' into for-next) +$ git merge samsung-krzk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging sunxi/sunxi/for-next (2d567752a056 Merge branch 'sunxi/clk-for-4.17' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/sunxi-ccu.txt | 4 + + drivers/clk/sunxi-ng/Kconfig | 12 +- + drivers/clk/sunxi-ng/Makefile | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 1211 ++++++++++++++++++++ + drivers/clk/sunxi-ng/ccu-sun50i-h6.h | 56 + + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 32 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.h | 4 +- + drivers/clk/sunxi-ng/ccu_nkmp.c | 58 +- + drivers/clk/sunxi-ng/ccu_nkmp.h | 2 + + drivers/clk/sunxi-ng/ccu_nm.c | 7 + + drivers/clk/sunxi-ng/ccu_nm.h | 27 + + include/dt-bindings/clock/sun50i-h6-ccu.h | 125 ++ + include/dt-bindings/clock/sun8i-h3-ccu.h | 2 + + include/dt-bindings/reset/sun50i-h6-ccu.h | 73 ++ + 14 files changed, 1579 insertions(+), 35 deletions(-) + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-h6.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-h6.h + create mode 100644 include/dt-bindings/clock/sun50i-h6-ccu.h + create mode 100644 include/dt-bindings/reset/sun50i-h6-ccu.h +Merging tegra/for-next (6b9b5116227d Merge branch for-4.17/clk into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/clk/tegra/clk-emc.c | 2 +- + drivers/clk/tegra/clk-pll.c | 2 + + drivers/clk/tegra/clk-tegra-periph.c | 2 +- + drivers/clk/tegra/clk-tegra-super-gen4.c | 8 +- + drivers/clk/tegra/clk-tegra114.c | 4 +- + drivers/clk/tegra/clk-tegra124.c | 9 +- + drivers/clk/tegra/clk-tegra20.c | 24 +- + drivers/clk/tegra/clk-tegra210.c | 361 ++++++++++++++++++++++++++++++- + drivers/clk/tegra/clk-tegra30.c | 15 +- + drivers/clk/tegra/clk.h | 7 + + drivers/soc/tegra/pmc.c | 2 +- + include/dt-bindings/clock/tegra210-car.h | 2 +- + include/linux/clk/tegra.h | 1 + + 13 files changed, 398 insertions(+), 41 deletions(-) +Merging arm64/for-next/core (65896545b69f arm64: uaccess: Fix omissions from usercopy whitelist) +$ git merge arm64/for-next/core +Already up to date. +Merging clk/clk-next (804a4481ff50 Merge branch 'clk-si544' into clk-next) +$ git merge clk/clk-next +Auto-merging include/linux/clk/ti.h +Removing drivers/clk/ux500/u9540_clk.c +Removing drivers/clk/ux500/u8540_clk.c +Removing drivers/clk/meson/gxbb-aoclk-regmap.c +Removing drivers/clk/meson/clk-cpu.c +Auto-merging drivers/clk/Makefile +Auto-merging drivers/clk/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/clk.txt | 16 +- + .../bindings/arm/mediatek/mediatek,audsys.txt | 20 +- + .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 6 +- + .../devicetree/bindings/clock/silabs,si544.txt | 25 + + .../devicetree/bindings/clock/st,stm32mp1-rcc.txt | 60 + + .../bindings/clock/ti/davinci/da8xx-cfgchip.txt | 93 + + .../devicetree/bindings/clock/ti/davinci/pll.txt | 96 + + .../devicetree/bindings/clock/ti/davinci/psc.txt | 71 + + .../devicetree/bindings/clock/ti/divider.txt | 3 + + Documentation/devicetree/bindings/clock/ti/mux.txt | 3 + + MAINTAINERS | 8 + + drivers/clk/Kconfig | 35 +- + drivers/clk/Makefile | 7 +- + drivers/clk/clk-divider.c | 58 +- + drivers/clk/clk-gpio.c | 4 +- + drivers/clk/clk-mux.c | 75 +- + drivers/clk/clk-si544.c | 411 ++++ + drivers/clk/clk-stm32f4.c | 14 +- + drivers/clk/clk-stm32mp1.c | 2117 ++++++++++++++++++++ + drivers/clk/clk.c | 85 +- + drivers/clk/davinci/Makefile | 21 + + drivers/clk/davinci/da8xx-cfgchip.c | 790 ++++++++ + drivers/clk/davinci/pll-da830.c | 70 + + drivers/clk/davinci/pll-da850.c | 212 ++ + drivers/clk/davinci/pll-dm355.c | 79 + + drivers/clk/davinci/pll-dm365.c | 145 ++ + drivers/clk/davinci/pll-dm644x.c | 80 + + drivers/clk/davinci/pll-dm646x.c | 84 + + drivers/clk/davinci/pll.c | 899 +++++++++ + drivers/clk/davinci/pll.h | 141 ++ + drivers/clk/davinci/psc-da830.c | 116 ++ + drivers/clk/davinci/psc-da850.c | 149 ++ + drivers/clk/davinci/psc-dm355.c | 88 + + drivers/clk/davinci/psc-dm365.c | 96 + + drivers/clk/davinci/psc-dm644x.c | 83 + + drivers/clk/davinci/psc-dm646x.c | 80 + + drivers/clk/davinci/psc.c | 550 +++++ + drivers/clk/davinci/psc.h | 108 + + drivers/clk/hisilicon/Makefile | 2 +- + drivers/clk/hisilicon/clk-hisi-phase.c | 121 ++ + drivers/clk/hisilicon/clk.c | 26 + + drivers/clk/hisilicon/clk.h | 19 + + drivers/clk/hisilicon/crg-hi3516cv300.c | 2 +- + drivers/clk/hisilicon/crg-hi3798cv200.c | 100 +- + drivers/clk/imx/clk-pllv2.c | 6 +- + drivers/clk/keystone/sci-clk.c | 380 +--- + drivers/clk/mediatek/Kconfig | 6 + + drivers/clk/mediatek/Makefile | 1 + + drivers/clk/mediatek/clk-mt2701-aud.c | 186 ++ + drivers/clk/mediatek/clk-mt2701.c | 15 +- + drivers/clk/mediatek/clk-mt2712.c | 69 +- + drivers/clk/mediatek/clk-mt7622-aud.c | 15 +- + drivers/clk/meson/Kconfig | 9 + + drivers/clk/meson/Makefile | 5 +- + drivers/clk/meson/axg.c | 955 +++++---- + drivers/clk/meson/axg.h | 12 +- + drivers/clk/meson/clk-audio-divider.c | 63 +- + drivers/clk/meson/clk-cpu.c | 178 -- + drivers/clk/meson/clk-mpll.c | 125 +- + drivers/clk/meson/clk-pll.c | 306 +-- + drivers/clk/meson/clk-regmap.c | 166 ++ + drivers/clk/meson/clk-regmap.h | 111 + + drivers/clk/meson/clkc.h | 107 +- + drivers/clk/meson/gxbb-aoclk-regmap.c | 46 - + drivers/clk/meson/gxbb-aoclk.c | 20 +- + drivers/clk/meson/gxbb-aoclk.h | 11 - + drivers/clk/meson/gxbb.c | 1591 ++++++++------- + drivers/clk/meson/gxbb.h | 14 +- + drivers/clk/meson/meson8b.c | 705 ++++--- + drivers/clk/meson/meson8b.h | 17 +- + drivers/clk/mvebu/armada-38x.c | 14 +- + drivers/clk/mvebu/cp110-system-controller.c | 94 +- + drivers/clk/nxp/clk-lpc32xx.c | 1 + + drivers/clk/qcom/clk-regmap-divider.c | 20 +- + drivers/clk/qcom/clk-rpm.c | 79 +- + drivers/clk/qcom/clk-smd-rpm.c | 9 +- + drivers/clk/qcom/gcc-msm8996.c | 8 +- + drivers/clk/renesas/Kconfig | 13 +- + drivers/clk/renesas/Makefile | 2 + + drivers/clk/renesas/clk-div6.c | 22 +- + drivers/clk/renesas/clk-mstp.c | 4 +- + drivers/clk/renesas/clk-r8a73a4.c | 11 +- + drivers/clk/renesas/clk-r8a7740.c | 8 +- + drivers/clk/renesas/clk-rcar-gen2.c | 17 +- + drivers/clk/renesas/clk-rz.c | 4 +- + drivers/clk/renesas/clk-sh73a0.c | 20 +- + drivers/clk/renesas/r8a7743-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a7745-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a7790-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a7791-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a7792-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a7794-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a7795-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a7796-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a77965-cpg-mssr.c | 334 +++ + drivers/clk/renesas/r8a77980-cpg-mssr.c | 227 +++ + drivers/clk/renesas/rcar-gen3-cpg.c | 143 ++ + drivers/clk/renesas/rcar-gen3-cpg.h | 2 + + drivers/clk/renesas/renesas-cpg-mssr.c | 12 + + drivers/clk/renesas/renesas-cpg-mssr.h | 2 + + drivers/clk/samsung/Makefile | 2 + + drivers/clk/samsung/clk-exynos-audss.c | 4 +- + drivers/clk/samsung/clk-exynos3250.c | 114 +- + drivers/clk/samsung/clk-exynos4.c | 103 +- + drivers/clk/samsung/clk-exynos5-subcmu.c | 189 ++ + drivers/clk/samsung/clk-exynos5-subcmu.h | 26 + + drivers/clk/samsung/clk-exynos5250.c | 111 +- + drivers/clk/samsung/clk-exynos5260.c | 90 +- + drivers/clk/samsung/clk-exynos5410.c | 20 +- + drivers/clk/samsung/clk-exynos5420.c | 189 +- + drivers/clk/samsung/clk-exynos5433.c | 121 +- + drivers/clk/samsung/clk-exynos7.c | 2 +- + drivers/clk/samsung/clk-pll.h | 48 +- + drivers/clk/samsung/clk-s3c2410.c | 148 +- + drivers/clk/samsung/clk-s3c2412.c | 25 +- + drivers/clk/samsung/clk-s3c2443.c | 55 +- + drivers/clk/samsung/clk-s3c64xx.c | 17 +- + drivers/clk/sprd/sc9860-clk.c | 76 + + drivers/clk/ti/clk.c | 38 + + drivers/clk/ti/clock.h | 4 + + drivers/clk/ti/divider.c | 26 +- + drivers/clk/ti/mux.c | 13 +- + drivers/clk/uniphier/clk-uniphier-sys.c | 13 + + drivers/clk/ux500/Makefile | 2 - + drivers/clk/ux500/abx500-clk.c | 16 - + drivers/clk/ux500/u8540_clk.c | 597 ------ + drivers/clk/ux500/u9540_clk.c | 18 - + drivers/clk/versatile/clk-vexpress-osc.c | 5 +- + drivers/soc/samsung/pm_domains.c | 11 + + include/dt-bindings/clock/axg-clkc.h | 1 + + include/dt-bindings/clock/histb-clock.h | 55 +- + include/dt-bindings/clock/mt2701-clk.h | 3 +- + include/dt-bindings/clock/mt2712-clk.h | 12 +- + include/dt-bindings/clock/mt7622-clk.h | 3 +- + include/dt-bindings/clock/qcom,rpmcc.h | 5 + + include/dt-bindings/clock/r8a77965-cpg-mssr.h | 62 + + include/dt-bindings/clock/r8a77980-cpg-mssr.h | 51 + + include/dt-bindings/clock/sprd,sc9860-clk.h | 21 +- + include/dt-bindings/clock/stm32fx-clock.h | 7 +- + include/dt-bindings/clock/stm32mp1-clks.h | 254 +++ + include/linux/clk-provider.h | 23 +- + include/linux/clk.h | 16 +- + include/linux/clk/ti.h | 2 + + include/linux/platform_data/clk-da8xx-cfgchip.h | 21 + + include/linux/platform_data/clk-davinci-pll.h | 21 + + 145 files changed, 12329 insertions(+), 3760 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/silabs,si544.txt + create mode 100644 Documentation/devicetree/bindings/clock/st,stm32mp1-rcc.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/davinci/da8xx-cfgchip.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/davinci/pll.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/davinci/psc.txt + create mode 100644 drivers/clk/clk-si544.c + create mode 100644 drivers/clk/clk-stm32mp1.c + create mode 100644 drivers/clk/davinci/Makefile + create mode 100644 drivers/clk/davinci/da8xx-cfgchip.c + create mode 100644 drivers/clk/davinci/pll-da830.c + create mode 100644 drivers/clk/davinci/pll-da850.c + create mode 100644 drivers/clk/davinci/pll-dm355.c + create mode 100644 drivers/clk/davinci/pll-dm365.c + create mode 100644 drivers/clk/davinci/pll-dm644x.c + create mode 100644 drivers/clk/davinci/pll-dm646x.c + create mode 100644 drivers/clk/davinci/pll.c + create mode 100644 drivers/clk/davinci/pll.h + create mode 100644 drivers/clk/davinci/psc-da830.c + create mode 100644 drivers/clk/davinci/psc-da850.c + create mode 100644 drivers/clk/davinci/psc-dm355.c + create mode 100644 drivers/clk/davinci/psc-dm365.c + create mode 100644 drivers/clk/davinci/psc-dm644x.c + create mode 100644 drivers/clk/davinci/psc-dm646x.c + create mode 100644 drivers/clk/davinci/psc.c + create mode 100644 drivers/clk/davinci/psc.h + create mode 100644 drivers/clk/hisilicon/clk-hisi-phase.c + create mode 100644 drivers/clk/mediatek/clk-mt2701-aud.c + delete mode 100644 drivers/clk/meson/clk-cpu.c + create mode 100644 drivers/clk/meson/clk-regmap.c + create mode 100644 drivers/clk/meson/clk-regmap.h + delete mode 100644 drivers/clk/meson/gxbb-aoclk-regmap.c + create mode 100644 drivers/clk/renesas/r8a77965-cpg-mssr.c + create mode 100644 drivers/clk/renesas/r8a77980-cpg-mssr.c + create mode 100644 drivers/clk/samsung/clk-exynos5-subcmu.c + create mode 100644 drivers/clk/samsung/clk-exynos5-subcmu.h + delete mode 100644 drivers/clk/ux500/u8540_clk.c + delete mode 100644 drivers/clk/ux500/u9540_clk.c + create mode 100644 include/dt-bindings/clock/r8a77965-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/r8a77980-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/stm32mp1-clks.h + create mode 100644 include/linux/platform_data/clk-da8xx-cfgchip.h + create mode 100644 include/linux/platform_data/clk-davinci-pll.h +Merging clk-samsung/for-next (182c084da5d1 clk: samsung: Add fout=196608001 Hz EPLL rate entry for exynos4412) +$ git merge clk-samsung/for-next +Already up to date. +Merging c6x/for-linux-next (9d440f7a2824 c6x: fix platforms/plldata.c get_coreid build error) +$ git merge c6x/for-linux-next +Auto-merging arch/c6x/kernel/asm-offsets.c +Merge made by the 'recursive' strategy. + arch/c6x/kernel/asm-offsets.c | 1 - + arch/c6x/platforms/plldata.c | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) +Merging m68k/for-next (ecd685580c8f m68k/mac: Remove bogus "FIXME" comment) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (f61e64310b75 m68k: set dma and coherent masks for platform FEC ethernets) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/coldfire/device.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) +Merging microblaze/next (70f6283a372b microblaze: Use generic pci_mmap_resource_range()) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/pci.h | 7 +-- + arch/microblaze/include/asm/pgtable.h | 2 + + arch/microblaze/pci/pci-common.c | 99 ++++------------------------------- + 3 files changed, 15 insertions(+), 93 deletions(-) +Merging mips/mips-next (ea4d340cbea4 Merge branches '4.15-fixes', '4.16-features' and 'octeon-3-net-mips-bits' into mips-next) +$ git merge mips/mips-next +Auto-merging drivers/staging/octeon/ethernet-tx.c +Auto-merging drivers/staging/octeon/ethernet-rx.c +Auto-merging drivers/staging/octeon/ethernet-defines.h +Auto-merging arch/mips/include/asm/mipsregs.h +Auto-merging arch/mips/cavium-octeon/Kconfig +Merge made by the 'recursive' strategy. + arch/mips/cavium-octeon/Kconfig | 27 +- + arch/mips/cavium-octeon/Makefile | 1 + + arch/mips/cavium-octeon/resource-mgr.c | 351 +++++++++++++++++++++ + arch/mips/cavium-octeon/setup.c | 22 +- + arch/mips/include/asm/barrier.h | 2 +- + .../asm/mach-cavium-octeon/kernel-entry-init.h | 20 +- + arch/mips/include/asm/mipsregs.h | 2 + + arch/mips/include/asm/octeon/octeon.h | 32 +- + arch/mips/include/asm/processor.h | 2 +- + arch/mips/kernel/octeon_switch.S | 2 - + arch/mips/mm/tlbex.c | 29 +- + drivers/staging/octeon/ethernet-defines.h | 6 - + drivers/staging/octeon/ethernet-rx.c | 25 +- + drivers/staging/octeon/ethernet-tx.c | 85 ++--- + 14 files changed, 473 insertions(+), 133 deletions(-) + create mode 100644 arch/mips/cavium-octeon/resource-mgr.c +Merging mips-james/mips-next (5468af4fae55 MIPS: BCM47XX: Use standard reset button for Luxul XWR-1750) +$ git merge mips-james/mips-next +Auto-merging crypto/Kconfig +Auto-merging arch/riscv/Kconfig +Removing arch/mips/lib/ucmpdi2.c +Removing arch/mips/lib/lshrdi3.c +Removing arch/mips/lib/cmpdi2.c +Removing arch/mips/lib/ashrdi3.c +Removing arch/mips/lib/ashldi3.c +Auto-merging arch/mips/include/asm/mipsregs.h +Auto-merging arch/mips/cavium-octeon/octeon-irq.c +Removing arch/mips/boot/compressed/.gitignore +Auto-merging arch/mips/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mips/mscc.txt | 43 +++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 9 + + arch/mips/Kconfig | 12 +- + arch/mips/Makefile | 64 ++-- + arch/mips/alchemy/board-gpr.c | 2 +- + arch/mips/alchemy/board-mtx1.c | 2 +- + arch/mips/ar7/platform.c | 14 +- + arch/mips/bcm47xx/buttons.c | 2 +- + arch/mips/bcm47xx/leds.c | 21 ++ + arch/mips/boot/compressed/.gitignore | 2 - + arch/mips/boot/compressed/Makefile | 8 +- + arch/mips/boot/dts/Makefile | 1 + + arch/mips/boot/dts/brcm/bcm7125.dtsi | 7 + + arch/mips/boot/dts/brcm/bcm7346.dtsi | 62 ++++ + arch/mips/boot/dts/brcm/bcm7358.dtsi | 17 + + arch/mips/boot/dts/brcm/bcm7360.dtsi | 62 ++++ + arch/mips/boot/dts/brcm/bcm7362.dtsi | 62 ++++ + arch/mips/boot/dts/brcm/bcm7420.dtsi | 7 + + arch/mips/boot/dts/brcm/bcm7425.dtsi | 89 ++++++ + arch/mips/boot/dts/brcm/bcm7435.dtsi | 89 ++++++ + arch/mips/boot/dts/brcm/bcm97125cbmb.dts | 4 + + arch/mips/boot/dts/brcm/bcm97346dbsmb.dts | 8 + + arch/mips/boot/dts/brcm/bcm97358svmb.dts | 8 + + arch/mips/boot/dts/brcm/bcm97360svmb.dts | 8 + + arch/mips/boot/dts/brcm/bcm97362svmb.dts | 8 + + arch/mips/boot/dts/brcm/bcm97420c.dts | 4 + + arch/mips/boot/dts/brcm/bcm97425svmb.dts | 8 + + arch/mips/boot/dts/brcm/bcm97435svmb.dts | 8 + + arch/mips/boot/dts/img/boston.dts | 2 +- + arch/mips/boot/dts/ingenic/ci20.dts | 8 +- + arch/mips/boot/dts/mscc/Makefile | 3 + + arch/mips/boot/dts/mscc/ocelot.dtsi | 117 +++++++ + arch/mips/boot/dts/mscc/ocelot_pcb123.dts | 27 ++ + arch/mips/cavium-octeon/octeon-irq.c | 10 +- + arch/mips/configs/bmips_stb_defconfig | 1 + + arch/mips/configs/generic/32r6.config | 2 + + arch/mips/configs/generic/64r6.config | 2 + + arch/mips/configs/generic/board-ocelot.config | 35 +++ + arch/mips/crypto/Makefile | 6 + + arch/mips/crypto/crc32-mips.c | 348 +++++++++++++++++++++ + arch/mips/generic/Kconfig | 16 + + arch/mips/generic/Makefile | 1 + + arch/mips/generic/board-ocelot.c | 78 +++++ + arch/mips/include/asm/cpu-features.h | 5 +- + arch/mips/include/asm/isa-rev.h | 24 ++ + arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 2 +- + arch/mips/include/asm/mipsregs.h | 1 + + arch/mips/include/uapi/asm/hwcap.h | 1 + + arch/mips/kernel/cpu-probe.c | 3 + + arch/mips/kernel/pm-cps.c | 31 ++ + arch/mips/kernel/reset.c | 68 +++- + arch/mips/kernel/setup.c | 5 +- + arch/mips/lib/Makefile | 3 +- + arch/mips/lib/ashldi3.c | 30 -- + arch/mips/lib/ashrdi3.c | 32 -- + arch/mips/lib/cmpdi2.c | 28 -- + arch/mips/lib/lshrdi3.c | 30 -- + arch/mips/lib/ucmpdi2.c | 22 -- + arch/mips/mm/init.c | 2 - + arch/mips/net/bpf_jit_asm.S | 9 +- + arch/mips/pci/pci-mt7620.c | 1 + + arch/mips/txx9/rbtx4927/setup.c | 2 +- + arch/mips/vdso/elf.S | 10 +- + arch/riscv/Kconfig | 6 +- + crypto/Kconfig | 9 + + drivers/firmware/broadcom/Kconfig | 1 + + drivers/firmware/broadcom/bcm47xx_sprom.c | 18 +- + lib/Kconfig | 12 +- + lib/Makefile | 12 +- + lib/ucmpdi2.c | 2 +- + 71 files changed, 1407 insertions(+), 250 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/mscc.txt + delete mode 100644 arch/mips/boot/compressed/.gitignore + create mode 100644 arch/mips/boot/dts/mscc/Makefile + create mode 100644 arch/mips/boot/dts/mscc/ocelot.dtsi + create mode 100644 arch/mips/boot/dts/mscc/ocelot_pcb123.dts + create mode 100644 arch/mips/configs/generic/board-ocelot.config + create mode 100644 arch/mips/crypto/Makefile + create mode 100644 arch/mips/crypto/crc32-mips.c + create mode 100644 arch/mips/generic/board-ocelot.c + create mode 100644 arch/mips/include/asm/isa-rev.h + delete mode 100644 arch/mips/lib/ashldi3.c + delete mode 100644 arch/mips/lib/ashrdi3.c + delete mode 100644 arch/mips/lib/cmpdi2.c + delete mode 100644 arch/mips/lib/lshrdi3.c + delete mode 100644 arch/mips/lib/ucmpdi2.c +Merging nds32/next (6fc61ee69433 nds32: To use the generic dump_stack()) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (e0691ebb33c1 nios2: defconfig: Cleanup from old Kconfig options) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (0fedb7653af7 openrisc: remove unused __ARCH_HAVE_MMU define) +$ git merge openrisc/for-next +Merge made by the 'recursive' strategy. + arch/openrisc/include/uapi/asm/unistd.h | 2 -- + 1 file changed, 2 deletions(-) +Merging parisc-hd/for-next (186536608fd1 parisc/signal: Add FPE_CONDTRAP for conditional trap handling) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/uapi/asm/siginfo.h | 7 ------- + arch/parisc/kernel/time.c | 2 +- + arch/parisc/kernel/traps.c | 7 ++++--- + include/uapi/asm-generic/siginfo.h | 3 ++- + 4 files changed, 7 insertions(+), 12 deletions(-) +$ git am -3 ../patches/0001-parisc-signal-Add-FPE_CONDTRAP-for-conditional-trap-.patch +Applying: parisc/signal: Add FPE_CONDTRAP for conditional trap handling fix +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/kernel/signal_compat.c +$ git add -A . +$ git commit -v -a --amend +[master bed31981186f] Merge remote-tracking branch 'parisc-hd/for-next' + Date: Fri Apr 6 09:55:35 2018 +1000 +Merging powerpc/next (c1b25a17d249 powerpc/64s/idle: Fix restore of AMOR on POWER9 after deep sleep) +$ git merge powerpc/next +Resolved 'lib/raid6/test/Makefile' using previous resolution. +Auto-merging mm/memblock.c +Auto-merging lib/raid6/test/Makefile +CONFLICT (content): Merge conflict in lib/raid6/test/Makefile +Auto-merging lib/raid6/algos.c +Auto-merging lib/raid6/Makefile +Auto-merging include/linux/raid/pq.h +Auto-merging include/linux/memblock.h +Auto-merging drivers/macintosh/via-pmu68k.c +Removing arch/powerpc/perf/power4-pmu.c +Auto-merging arch/powerpc/perf/core-book3s.c +Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kernel/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e73aaede2d8f] Merge remote-tracking branch 'powerpc/next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/Makefile | 14 +- + arch/powerpc/boot/dts/acadia.dts | 2 +- + arch/powerpc/boot/dts/adder875-redboot.dts | 2 +- + arch/powerpc/boot/dts/adder875-uboot.dts | 2 +- + arch/powerpc/boot/dts/akebono.dts | 2 +- + arch/powerpc/boot/dts/amigaone.dts | 2 +- + arch/powerpc/boot/dts/asp834x-redboot.dts | 2 +- + arch/powerpc/boot/dts/bamboo.dts | 2 +- + arch/powerpc/boot/dts/c2k.dts | 2 +- + arch/powerpc/boot/dts/currituck.dts | 2 +- + arch/powerpc/boot/dts/digsy_mtc.dts | 2 +- + arch/powerpc/boot/dts/ebony.dts | 2 +- + arch/powerpc/boot/dts/eiger.dts | 2 +- + arch/powerpc/boot/dts/ep405.dts | 2 +- + arch/powerpc/boot/dts/fsl/mvme7100.dts | 2 +- + arch/powerpc/boot/dts/fsp2.dts | 2 +- + arch/powerpc/boot/dts/holly.dts | 2 +- + arch/powerpc/boot/dts/hotfoot.dts | 2 +- + arch/powerpc/boot/dts/icon.dts | 2 +- + arch/powerpc/boot/dts/iss4xx-mpic.dts | 2 +- + arch/powerpc/boot/dts/iss4xx.dts | 2 +- + arch/powerpc/boot/dts/katmai.dts | 2 +- + arch/powerpc/boot/dts/klondike.dts | 2 +- + arch/powerpc/boot/dts/ksi8560.dts | 2 +- + arch/powerpc/boot/dts/media5200.dts | 2 +- + arch/powerpc/boot/dts/mpc8272ads.dts | 2 +- + arch/powerpc/boot/dts/mpc866ads.dts | 2 +- + arch/powerpc/boot/dts/mpc885ads.dts | 2 +- + arch/powerpc/boot/dts/mvme5100.dts | 2 +- + arch/powerpc/boot/dts/obs600.dts | 2 +- + arch/powerpc/boot/dts/pq2fads.dts | 2 +- + arch/powerpc/boot/dts/rainier.dts | 2 +- + arch/powerpc/boot/dts/redwood.dts | 2 +- + arch/powerpc/boot/dts/sam440ep.dts | 2 +- + arch/powerpc/boot/dts/sequoia.dts | 2 +- + arch/powerpc/boot/dts/storcenter.dts | 2 +- + arch/powerpc/boot/dts/taishan.dts | 2 +- + arch/powerpc/boot/dts/virtex440-ml507.dts | 2 +- + arch/powerpc/boot/dts/virtex440-ml510.dts | 2 +- + arch/powerpc/boot/dts/walnut.dts | 2 +- + arch/powerpc/boot/dts/warp.dts | 2 +- + arch/powerpc/boot/dts/wii.dts | 21 + + arch/powerpc/boot/dts/xpedite5200_xmon.dts | 2 +- + arch/powerpc/boot/dts/yosemite.dts | 2 +- + arch/powerpc/boot/libfdt_env.h | 2 - + arch/powerpc/include/asm/asm-prototypes.h | 15 + + arch/powerpc/include/asm/barrier.h | 3 +- + arch/powerpc/include/asm/book3s/64/hash-4k.h | 14 + + arch/powerpc/include/asm/book3s/64/hash-64k.h | 25 +- + arch/powerpc/include/asm/book3s/64/hash.h | 2 +- + arch/powerpc/include/asm/book3s/64/mmu.h | 54 +- + arch/powerpc/include/asm/book3s/64/pgalloc.h | 12 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 19 - + arch/powerpc/include/asm/book3s/64/radix-4k.h | 5 + + arch/powerpc/include/asm/book3s/64/radix-64k.h | 6 + + arch/powerpc/include/asm/book3s/64/radix.h | 2 +- + arch/powerpc/include/asm/book3s/64/slice.h | 27 + + arch/powerpc/include/asm/cacheflush.h | 1 - + arch/powerpc/include/asm/cputable.h | 263 +++++---- + arch/powerpc/include/asm/debug.h | 1 + + arch/powerpc/include/asm/eeh.h | 6 + + arch/powerpc/include/asm/eeh_event.h | 3 +- + arch/powerpc/include/asm/epapr_hcalls.h | 22 +- + arch/powerpc/include/asm/hugetlb.h | 8 +- + arch/powerpc/include/asm/hvcall.h | 4 + + arch/powerpc/include/asm/hw_breakpoint.h | 5 +- + arch/powerpc/include/asm/io.h | 4 +- + arch/powerpc/include/asm/irq.h | 1 + + arch/powerpc/include/asm/irq_work.h | 1 + + arch/powerpc/include/asm/kvm_asm.h | 2 + + arch/powerpc/include/asm/kvm_book3s.h | 4 + + arch/powerpc/include/asm/kvm_book3s_64.h | 43 ++ + arch/powerpc/include/asm/kvm_book3s_asm.h | 1 + + arch/powerpc/include/asm/kvm_host.h | 1 + + arch/powerpc/include/asm/kvm_ppc.h | 8 +- + arch/powerpc/include/asm/lppaca.h | 29 +- + arch/powerpc/include/asm/mmu-8xx.h | 21 + + arch/powerpc/include/asm/mmu.h | 6 +- + arch/powerpc/include/asm/mmu_context.h | 39 ++ + arch/powerpc/include/asm/nohash/32/slice.h | 18 + + arch/powerpc/include/asm/nohash/64/slice.h | 12 + + arch/powerpc/include/asm/opal-api.h | 4 +- + arch/powerpc/include/asm/opal.h | 4 +- + arch/powerpc/include/asm/paca.h | 27 +- + arch/powerpc/include/asm/page.h | 11 +- + arch/powerpc/include/asm/page_64.h | 59 -- + arch/powerpc/include/asm/perf_event_server.h | 2 + + arch/powerpc/include/asm/plpar_wrappers.h | 24 +- + arch/powerpc/include/asm/pmc.h | 13 +- + arch/powerpc/include/asm/pnv-pci.h | 6 + + arch/powerpc/include/asm/powernv.h | 1 + + arch/powerpc/include/asm/ppc-opcode.h | 10 + + arch/powerpc/include/asm/ppc_asm.h | 11 +- + arch/powerpc/include/asm/processor.h | 16 +- + arch/powerpc/include/asm/reg.h | 7 + + arch/powerpc/include/asm/security_features.h | 74 +++ + arch/powerpc/include/asm/setup.h | 3 +- + arch/powerpc/include/asm/slice.h | 40 ++ + arch/powerpc/include/asm/smp.h | 5 +- + arch/powerpc/include/asm/sparsemem.h | 2 +- + arch/powerpc/include/asm/spinlock.h | 2 + + arch/powerpc/include/asm/switch_to.h | 1 - + arch/powerpc/include/asm/synch.h | 4 - + arch/powerpc/include/asm/thread_info.h | 1 + + arch/powerpc/include/asm/time.h | 4 +- + arch/powerpc/include/asm/uaccess.h | 10 +- + arch/powerpc/kernel/Makefile | 2 +- + arch/powerpc/kernel/asm-offsets.c | 8 + + arch/powerpc/kernel/cpu_setup_6xx.S | 2 +- + arch/powerpc/kernel/cpu_setup_fsl_booke.S | 2 +- + arch/powerpc/kernel/cputable.c | 59 +- + arch/powerpc/kernel/crash.c | 2 +- + arch/powerpc/kernel/dt_cpu_ftrs.c | 36 +- + arch/powerpc/kernel/eeh.c | 19 +- + arch/powerpc/kernel/eeh_cache.c | 3 +- + arch/powerpc/kernel/eeh_driver.c | 205 ++++--- + arch/powerpc/kernel/eeh_event.c | 6 +- + arch/powerpc/kernel/entry_64.S | 2 +- + arch/powerpc/kernel/exceptions-64s.S | 86 ++- + arch/powerpc/kernel/head_64.S | 19 +- + arch/powerpc/kernel/hw_breakpoint.c | 3 + + arch/powerpc/kernel/idle_book3s.S | 50 +- + arch/powerpc/kernel/iomap.c | 40 ++ + arch/powerpc/kernel/kprobes.c | 30 +- + arch/powerpc/kernel/machine_kexec_64.c | 37 +- + arch/powerpc/kernel/machine_kexec_file_64.c | 2 +- + arch/powerpc/kernel/misc_64.S | 38 -- + arch/powerpc/kernel/nvram_64.c | 9 +- + arch/powerpc/kernel/paca.c | 242 ++++---- + arch/powerpc/kernel/process.c | 26 +- + arch/powerpc/kernel/prom.c | 19 +- + arch/powerpc/kernel/prom_init.c | 29 +- + arch/powerpc/kernel/prom_init_check.sh | 2 +- + arch/powerpc/kernel/ptrace.c | 16 +- + arch/powerpc/kernel/security.c | 88 +++ + arch/powerpc/kernel/setup-common.c | 37 +- + arch/powerpc/kernel/setup.h | 9 +- + arch/powerpc/kernel/setup_32.c | 8 +- + arch/powerpc/kernel/setup_64.c | 113 ++-- + arch/powerpc/kernel/signal.h | 5 + + arch/powerpc/kernel/signal_32.c | 4 +- + arch/powerpc/kernel/smp.c | 23 +- + arch/powerpc/kernel/sysfs.c | 20 +- + arch/powerpc/kernel/time.c | 5 +- + arch/powerpc/kernel/traps.c | 31 +- + arch/powerpc/kernel/vdso.c | 12 +- + arch/powerpc/kvm/Makefile | 7 + + arch/powerpc/kvm/book3s_hv.c | 55 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 2 +- + arch/powerpc/kvm/book3s_hv_interrupts.S | 3 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 187 ++++++- + arch/powerpc/kvm/book3s_hv_tm.c | 216 +++++++ + arch/powerpc/kvm/book3s_hv_tm_builtin.c | 109 ++++ + arch/powerpc/kvm/emulate.c | 6 - + arch/powerpc/kvm/powerpc.c | 5 +- + arch/powerpc/lib/Makefile | 6 +- + arch/powerpc/lib/copypage_64.S | 2 + + arch/powerpc/lib/copypage_power7.S | 3 - + arch/powerpc/lib/copyuser_64.S | 2 + + arch/powerpc/lib/copyuser_power7.S | 3 - + arch/powerpc/lib/feature-fixups.c | 9 +- + arch/powerpc/lib/memcpy_64.S | 2 + + arch/powerpc/lib/memcpy_power7.S | 3 - + arch/powerpc/lib/sstep.c | 4 +- + arch/powerpc/mm/8xx_mmu.c | 2 +- + arch/powerpc/mm/copro_fault.c | 2 +- + arch/powerpc/mm/fault.c | 28 +- + arch/powerpc/mm/hash_native_64.c | 15 - + arch/powerpc/mm/hash_utils_64.c | 34 +- + arch/powerpc/mm/hugetlbpage.c | 26 +- + arch/powerpc/mm/init_32.c | 7 +- + arch/powerpc/mm/init_64.c | 8 +- + arch/powerpc/mm/mem.c | 25 +- + arch/powerpc/mm/mmu_context_book3s64.c | 24 +- + arch/powerpc/mm/mmu_context_nohash.c | 15 +- + arch/powerpc/mm/mmu_decl.h | 1 - + arch/powerpc/mm/numa.c | 36 +- + arch/powerpc/mm/pgtable-book3s64.c | 8 +- + arch/powerpc/mm/pgtable-hash64.c | 6 +- + arch/powerpc/mm/pgtable-radix.c | 218 +++++--- + arch/powerpc/mm/pgtable_32.c | 2 +- + arch/powerpc/mm/pgtable_64.c | 5 - + arch/powerpc/mm/pkeys.c | 17 +- + arch/powerpc/mm/slb.c | 108 ++++ + arch/powerpc/mm/slb_low.S | 19 +- + arch/powerpc/mm/slice.c | 485 ++++++++-------- + arch/powerpc/mm/tlb-radix.c | 14 +- + arch/powerpc/mm/tlb_hash64.c | 2 +- + arch/powerpc/oprofile/cell/spu_task_sync.c | 2 +- + arch/powerpc/oprofile/cell/vma_map.c | 4 +- + arch/powerpc/perf/Makefile | 2 +- + arch/powerpc/perf/core-book3s.c | 50 ++ + arch/powerpc/perf/power4-pmu.c | 622 --------------------- + arch/powerpc/perf/power9-events-list.h | 28 + + arch/powerpc/perf/power9-pmu.c | 48 ++ + arch/powerpc/platforms/4xx/msi.c | 5 +- + arch/powerpc/platforms/4xx/ocm.c | 2 +- + arch/powerpc/platforms/85xx/smp.c | 8 +- + arch/powerpc/platforms/8xx/m8xx_setup.c | 8 +- + arch/powerpc/platforms/Kconfig.cputype | 20 +- + arch/powerpc/platforms/cell/axon_msi.c | 2 +- + arch/powerpc/platforms/cell/smp.c | 4 +- + arch/powerpc/platforms/cell/spider-pci.c | 2 +- + arch/powerpc/platforms/cell/spufs/lscsa_alloc.c | 2 +- + arch/powerpc/platforms/embedded6xx/flipper-pic.c | 2 +- + arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c | 2 +- + arch/powerpc/platforms/embedded6xx/wii.c | 23 +- + arch/powerpc/platforms/powermac/low_i2c.c | 2 +- + arch/powerpc/platforms/powermac/pfunc_core.c | 4 +- + arch/powerpc/platforms/powernv/Makefile | 1 - + arch/powerpc/platforms/powernv/eeh-powernv.c | 9 +- + arch/powerpc/platforms/powernv/idle.c | 88 ++- + arch/powerpc/platforms/powernv/npu-dma.c | 261 +++++---- + arch/powerpc/platforms/powernv/opal-flash.c | 32 +- + arch/powerpc/platforms/powernv/opal-hmi.c | 2 +- + arch/powerpc/platforms/powernv/opal-imc.c | 10 +- + .../powerpc/platforms/powernv/opal-memory-errors.c | 2 +- + arch/powerpc/platforms/powernv/opal-nvram.c | 4 + + arch/powerpc/platforms/powernv/opal-psr.c | 2 +- + .../powerpc/platforms/powernv/opal-sensor-groups.c | 4 +- + arch/powerpc/platforms/powernv/opal-wrappers.S | 2 + + arch/powerpc/platforms/powernv/opal-xscom.c | 2 +- + arch/powerpc/platforms/powernv/opal.c | 5 +- + arch/powerpc/platforms/powernv/pci-cxl.c | 8 - + arch/powerpc/platforms/powernv/pci-ioda.c | 29 +- + arch/powerpc/platforms/powernv/pci.c | 135 +++++ + arch/powerpc/platforms/powernv/setup.c | 114 ++-- + arch/powerpc/platforms/powernv/smp.c | 2 +- + arch/powerpc/platforms/powernv/subcore.c | 2 +- + arch/powerpc/platforms/powernv/vas-debug.c | 19 +- + arch/powerpc/platforms/powernv/vas-trace.h | 113 ++++ + arch/powerpc/platforms/powernv/vas-window.c | 9 + + arch/powerpc/platforms/powernv/vas.c | 6 +- + arch/powerpc/platforms/ps3/mm.c | 6 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +- + arch/powerpc/platforms/pseries/kexec.c | 7 +- + arch/powerpc/platforms/pseries/lpar.c | 18 +- + arch/powerpc/platforms/pseries/mobility.c | 3 + + arch/powerpc/platforms/pseries/pseries.h | 10 + + arch/powerpc/platforms/pseries/setup.c | 85 ++- + arch/powerpc/platforms/pseries/smp.c | 6 +- + arch/powerpc/sysdev/mpic.c | 2 +- + arch/powerpc/sysdev/xics/icp-native.c | 2 +- + arch/powerpc/sysdev/xive/common.c | 2 +- + arch/powerpc/xmon/xmon.c | 56 +- + drivers/macintosh/adb-iop.c | 14 +- + drivers/macintosh/ans-lcd.c | 1 + + drivers/macintosh/macio-adb.c | 15 +- + drivers/macintosh/rack-meter.c | 6 +- + drivers/macintosh/via-macii.c | 14 +- + drivers/macintosh/via-pmu.c | 16 +- + drivers/macintosh/via-pmu68k.c | 14 +- + drivers/misc/cxl/cxl.h | 6 +- + drivers/misc/cxl/cxllib.c | 87 ++- + drivers/misc/cxl/native.c | 11 +- + drivers/misc/cxl/pci.c | 102 ++-- + drivers/misc/cxl/sysfs.c | 12 + + drivers/pci/hotplug/pnv_php.c | 2 +- + include/linux/memblock.h | 3 + + include/linux/raid/pq.h | 4 + + lib/raid6/.gitignore | 1 + + lib/raid6/Makefile | 27 +- + lib/raid6/algos.c | 4 + + lib/raid6/altivec.uc | 3 + + lib/raid6/test/Makefile | 22 +- + lib/raid6/vpermxor.uc | 105 ++++ + mm/memblock.c | 2 +- + .../selftests/powerpc/benchmarks/.gitignore | 2 + + .../testing/selftests/powerpc/benchmarks/Makefile | 7 +- + .../selftests/powerpc/benchmarks/exec_target.c | 13 + + tools/testing/selftests/powerpc/benchmarks/fork.c | 325 +++++++++++ + tools/testing/selftests/powerpc/copyloops/Makefile | 4 +- + tools/testing/selftests/powerpc/tm/Makefile | 2 +- + tools/testing/selftests/powerpc/tm/tm-sigreturn.c | 92 +++ + .../testing/selftests/powerpc/tm/tm-unavailable.c | 24 +- + 275 files changed, 4643 insertions(+), 2428 deletions(-) + create mode 100644 arch/powerpc/include/asm/book3s/64/slice.h + create mode 100644 arch/powerpc/include/asm/nohash/32/slice.h + create mode 100644 arch/powerpc/include/asm/nohash/64/slice.h + create mode 100644 arch/powerpc/include/asm/security_features.h + create mode 100644 arch/powerpc/include/asm/slice.h + create mode 100644 arch/powerpc/kernel/security.c + create mode 100644 arch/powerpc/kvm/book3s_hv_tm.c + create mode 100644 arch/powerpc/kvm/book3s_hv_tm_builtin.c + delete mode 100644 arch/powerpc/perf/power4-pmu.c + create mode 100644 arch/powerpc/platforms/powernv/vas-trace.h + create mode 100644 lib/raid6/vpermxor.uc + create mode 100644 tools/testing/selftests/powerpc/benchmarks/exec_target.c + create mode 100644 tools/testing/selftests/powerpc/benchmarks/fork.c + create mode 100644 tools/testing/selftests/powerpc/tm/tm-sigreturn.c +Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device) +$ git merge fsl/next +Already up to date. +Merging risc-v/for-next (0adb32858b0b Linux 4.16) +$ git merge risc-v/for-next +Already up to date. +Merging s390/features (92fa7a13c845 s390/kvm: improve stack frame constants in entry.S) +$ git merge s390/features +Resolved 'drivers/video/console/Kconfig' using previous resolution. +Auto-merging drivers/video/console/Kconfig +CONFLICT (content): Merge conflict in drivers/video/console/Kconfig +Auto-merging drivers/tty/Kconfig +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging drivers/s390/block/dasd.c +Auto-merging arch/s390/kernel/entry.S +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9256913373d3] Merge remote-tracking branch 's390/features' +$ git diff -M --stat --summary HEAD^.. + Documentation/s390/vfio-ccw.txt | 79 +++-- + arch/s390/Kconfig | 3 +- + arch/s390/Makefile | 8 +- + arch/s390/boot/compressed/Makefile | 16 +- + arch/s390/boot/compressed/head.S | 6 +- + arch/s390/boot/compressed/misc.c | 10 +- + arch/s390/boot/compressed/vmlinux.lds.S | 1 + + arch/s390/crypto/aes_s390.c | 5 +- + arch/s390/include/asm/alternative-asm.h | 108 ++++++ + arch/s390/include/asm/ccwdev.h | 2 +- + arch/s390/include/asm/chpid.h | 2 +- + arch/s390/include/asm/cio.h | 2 +- + arch/s390/include/asm/cpu_mf.h | 4 +- + arch/s390/include/asm/css_chars.h | 6 +- + arch/s390/include/asm/nospec-branch.h | 6 +- + arch/s390/include/asm/pgalloc.h | 3 + + arch/s390/include/asm/scsw.h | 4 +- + arch/s390/include/asm/setup.h | 2 - + arch/s390/include/uapi/asm/dasd.h | 38 ++- + arch/s390/kernel/Makefile | 4 +- + arch/s390/kernel/alternative.c | 24 +- + arch/s390/kernel/asm-offsets.c | 1 + + arch/s390/kernel/early.c | 4 +- + arch/s390/kernel/entry.S | 96 ++---- + arch/s390/kernel/module.c | 11 +- + arch/s390/kernel/nospec-branch.c | 120 +++++-- + arch/s390/kernel/setup.c | 22 +- + arch/s390/kernel/suspend.c | 4 +- + arch/s390/mm/dump_pagetables.c | 4 +- + arch/s390/mm/pgalloc.c | 293 +++++++++++++++- + drivers/s390/block/dasd.c | 9 +- + drivers/s390/block/dasd_3990_erp.c | 17 +- + drivers/s390/block/dasd_devmap.c | 43 ++- + drivers/s390/block/dasd_eckd.c | 27 +- + drivers/s390/char/Makefile | 2 +- + drivers/s390/char/defkeymap.c | 66 ++-- + drivers/s390/char/keyboard.c | 32 +- + drivers/s390/char/keyboard.h | 11 + + drivers/s390/char/sclp.c | 58 ++-- + drivers/s390/char/sclp.h | 61 +++- + drivers/s390/char/sclp_early.c | 2 +- + drivers/s390/char/sclp_early_core.c | 38 ++- + drivers/s390/char/sclp_sd.c | 569 ++++++++++++++++++++++++++++++++ + drivers/s390/char/sclp_tty.c | 5 +- + drivers/s390/cio/chp.c | 34 +- + drivers/s390/cio/chp.h | 5 +- + drivers/s390/cio/chsc.c | 59 ++-- + drivers/s390/cio/chsc.h | 11 +- + drivers/s390/cio/device.c | 16 +- + drivers/s390/cio/device_ops.c | 4 +- + drivers/s390/cio/qdio_main.c | 131 ++++---- + drivers/s390/cio/vfio_ccw_fsm.c | 5 + + drivers/s390/net/qeth_core_main.c | 2 +- + drivers/tty/Kconfig | 2 +- + drivers/video/Kconfig | 5 +- + drivers/video/console/Kconfig | 6 +- + 56 files changed, 1633 insertions(+), 475 deletions(-) + create mode 100644 arch/s390/include/asm/alternative-asm.h + create mode 100644 drivers/s390/char/sclp_sd.c +Merging sparc-next/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge sparc-next/master +Already up to date. +Merging sh/for-next (d67cbbb113b7 arch/sh: pcie-sh7786: handle non-zero DMA offset) +$ git merge sh/for-next +Merge made by the 'recursive' strategy. + arch/sh/boards/of-generic.c | 6 --- + arch/sh/drivers/pci/pci.c | 5 +++ + arch/sh/drivers/pci/pcie-sh7786.c | 78 +++++++++++++++++++++++++----------- + arch/sh/include/asm/futex.h | 5 +-- + arch/sh/include/cpu-sh4/cpu/sh7786.h | 7 ++++ + arch/sh/kernel/dma-nommu.c | 7 +++- + arch/sh/kernel/entry-common.S | 2 +- + arch/sh/kernel/setup.c | 8 ++++ + arch/sh/mm/consistent.c | 4 +- + 9 files changed, 84 insertions(+), 38 deletions(-) +Merging uml/linux-next (e40238dedb48 Fix vector raw inintialization logic) +$ git merge uml/linux-next +Merge made by the 'recursive' strategy. + arch/um/Kconfig.net | 11 + + arch/um/drivers/Makefile | 4 +- + arch/um/drivers/chan_kern.c | 53 +- + arch/um/drivers/line.c | 2 +- + arch/um/drivers/net_kern.c | 4 +- + arch/um/drivers/random.c | 11 +- + arch/um/drivers/ubd_kern.c | 4 +- + arch/um/drivers/vector_kern.c | 1633 ++++++++++++++++++++++++++++++++++ + arch/um/drivers/vector_kern.h | 130 +++ + arch/um/drivers/vector_transports.c | 458 ++++++++++ + arch/um/drivers/vector_user.c | 590 ++++++++++++ + arch/um/drivers/vector_user.h | 100 +++ + arch/um/include/asm/asm-prototypes.h | 1 + + arch/um/include/asm/irq.h | 12 + + arch/um/include/shared/irq_user.h | 12 +- + arch/um/include/shared/net_kern.h | 2 + + arch/um/include/shared/os.h | 17 +- + arch/um/kernel/irq.c | 461 ++++++---- + arch/um/kernel/time.c | 6 +- + arch/um/os-Linux/file.c | 1 + + arch/um/os-Linux/irq.c | 202 +++-- + arch/um/os-Linux/signal.c | 3 +- + arch/x86/um/stub_segv.c | 3 +- + 23 files changed, 3395 insertions(+), 325 deletions(-) + create mode 100644 arch/um/drivers/vector_kern.c + create mode 100644 arch/um/drivers/vector_kern.h + create mode 100644 arch/um/drivers/vector_transports.c + create mode 100644 arch/um/drivers/vector_user.c + create mode 100644 arch/um/drivers/vector_user.h + create mode 100644 arch/um/include/asm/asm-prototypes.h +Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/kernel/pci-dma.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging fscrypt/master (0b1dfa4cc6c6 fscrypt: fix build with pre-4.6 gcc versions) +$ git merge fscrypt/master +Already up to date. +Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. + fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 51 insertions(+), 46 deletions(-) +Merging btrfs/next (7c9a09f56a91 btrfs: don't use async helpers for crcs when under IO limits) +$ git merge btrfs/next +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/backing-dev.h +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext2/super.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/check-integrity.c +Auto-merging fs/block_dev.c +Auto-merging block/blk-cgroup.c +Merge made by the 'recursive' strategy. + block/blk-cgroup.c | 1 + + fs/block_dev.c | 3 +-- + fs/btrfs/check-integrity.c | 2 +- + fs/btrfs/disk-io.c | 4 ++++ + fs/btrfs/inode.c | 15 ++++++++++++--- + fs/btrfs/ioctl.c | 8 +++++++- + fs/btrfs/super.c | 1 - + fs/buffer.c | 42 ++++++++++++++++++++++++++++++++++-------- + fs/ext2/inode.c | 3 ++- + fs/ext2/super.c | 1 - + fs/ext4/inode.c | 4 +++- + fs/ext4/super.c | 2 -- + include/linux/backing-dev.h | 2 +- + include/linux/buffer_head.h | 3 +++ + include/linux/fs.h | 3 ++- + kernel/cgroup/cgroup.c | 1 + + 16 files changed, 72 insertions(+), 23 deletions(-) +$ git am -3 ../patches/0001-f2fs-fixup-for-cgroup-writeback-change.patch +Applying: f2fs: fixup for cgroup/writeback change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/f2fs/inode.c +M fs/f2fs/super.c +$ git add -A . +$ git commit -v -a --amend +[master 022228db6af5] Merge remote-tracking branch 'btrfs/next' + Date: Fri Apr 6 10:28:00 2018 +1000 +Merging btrfs-kdave/for-next (ed754f23c363 Merge branch 'for-next-next-v4.17-20180405' into for-next-20180405) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/check-integrity.c +Merge made by the 'recursive' strategy. + fs/btrfs/Kconfig | 2 ++ + fs/btrfs/acl.c | 15 +--------- + fs/btrfs/async-thread.c | 15 +--------- + fs/btrfs/async-thread.h | 21 ++++---------- + fs/btrfs/backref.c | 15 +--------- + fs/btrfs/backref.h | 19 ++----------- + fs/btrfs/btrfs_inode.h | 19 ++----------- + fs/btrfs/check-integrity.c | 15 +--------- + fs/btrfs/check-integrity.h | 19 ++----------- + fs/btrfs/compression.c | 36 ++++++++++++------------ + fs/btrfs/compression.h | 19 ++----------- + fs/btrfs/ctree.c | 15 +--------- + fs/btrfs/ctree.h | 22 +++------------ + fs/btrfs/dedupe.h | 20 +++----------- + fs/btrfs/delayed-inode.c | 15 +--------- + fs/btrfs/delayed-inode.h | 19 ++----------- + fs/btrfs/delayed-ref.c | 24 +++------------- + fs/btrfs/delayed-ref.h | 25 ++++------------- + fs/btrfs/dev-replace.c | 16 ++--------- + fs/btrfs/dev-replace.h | 20 +++----------- + fs/btrfs/dir-item.c | 15 +--------- + fs/btrfs/disk-io.c | 18 ++---------- + fs/btrfs/disk-io.h | 20 +++----------- + fs/btrfs/export.c | 1 + + fs/btrfs/export.h | 1 + + fs/btrfs/extent-tree.c | 39 ++++++++++++-------------- + fs/btrfs/extent_io.c | 1 + + fs/btrfs/extent_io.h | 6 ++-- + fs/btrfs/extent_map.c | 1 + + fs/btrfs/extent_map.h | 6 ++-- + fs/btrfs/file-item.c | 15 +--------- + fs/btrfs/file.c | 15 +--------- + fs/btrfs/free-space-cache.c | 15 +--------- + fs/btrfs/free-space-cache.h | 19 ++----------- + fs/btrfs/free-space-tree.c | 15 +--------- + fs/btrfs/free-space-tree.h | 19 ++----------- + fs/btrfs/inode-item.c | 15 +--------- + fs/btrfs/inode-map.c | 15 +--------- + fs/btrfs/inode-map.h | 5 ++-- + fs/btrfs/inode.c | 15 +--------- + fs/btrfs/ioctl.c | 50 ++++++++++++++++++++++------------ + fs/btrfs/locking.c | 16 ++--------- + fs/btrfs/locking.h | 19 ++----------- + fs/btrfs/lzo.c | 15 +--------- + fs/btrfs/math.h | 20 ++------------ + fs/btrfs/ordered-data.c | 15 +--------- + fs/btrfs/ordered-data.h | 20 +++----------- + fs/btrfs/orphan.c | 15 +--------- + fs/btrfs/print-tree.c | 15 +--------- + fs/btrfs/print-tree.h | 21 ++++---------- + fs/btrfs/props.c | 17 ++---------- + fs/btrfs/props.h | 19 ++----------- + fs/btrfs/qgroup.c | 15 +--------- + fs/btrfs/qgroup.h | 22 ++++----------- + fs/btrfs/raid56.c | 16 ++--------- + fs/btrfs/raid56.h | 21 ++++---------- + fs/btrfs/rcu-string.h | 20 ++++---------- + fs/btrfs/reada.c | 15 +--------- + fs/btrfs/ref-verify.c | 15 +--------- + fs/btrfs/ref-verify.h | 23 ++++------------ + fs/btrfs/relocation.c | 15 +--------- + fs/btrfs/root-tree.c | 15 +--------- + fs/btrfs/scrub.c | 15 +--------- + fs/btrfs/send.c | 15 +--------- + fs/btrfs/send.h | 20 ++++---------- + fs/btrfs/struct-funcs.c | 15 +--------- + fs/btrfs/super.c | 18 ++---------- + fs/btrfs/sysfs.c | 15 +--------- + fs/btrfs/sysfs.h | 7 +++-- + fs/btrfs/tests/btrfs-tests.c | 15 +--------- + fs/btrfs/tests/btrfs-tests.h | 19 ++----------- + fs/btrfs/tests/extent-buffer-tests.c | 15 +--------- + fs/btrfs/tests/extent-io-tests.c | 15 +--------- + fs/btrfs/tests/extent-map-tests.c | 15 +--------- + fs/btrfs/tests/free-space-tests.c | 15 +--------- + fs/btrfs/tests/free-space-tree-tests.c | 15 +--------- + fs/btrfs/tests/inode-tests.c | 15 +--------- + fs/btrfs/tests/qgroup-tests.c | 15 +--------- + fs/btrfs/transaction.c | 15 +--------- + fs/btrfs/transaction.h | 20 +++----------- + fs/btrfs/tree-checker.c | 13 +-------- + fs/btrfs/tree-checker.h | 17 ++---------- + fs/btrfs/tree-defrag.c | 15 +--------- + fs/btrfs/tree-log.c | 26 ++++++------------ + fs/btrfs/tree-log.h | 20 +++----------- + fs/btrfs/ulist.c | 2 +- + fs/btrfs/ulist.h | 7 ++--- + fs/btrfs/uuid-tree.c | 16 ++--------- + fs/btrfs/volumes.c | 16 ++--------- + fs/btrfs/volumes.h | 19 ++----------- + fs/btrfs/xattr.c | 16 +---------- + fs/btrfs/xattr.h | 21 +++----------- + fs/btrfs/zlib.c | 15 +--------- + fs/btrfs/zstd.c | 29 +++++++++++--------- + 94 files changed, 293 insertions(+), 1264 deletions(-) +Merging ceph/master (50b37a1c3d59 rbd: avoid Wreturn-type warnings) +$ git merge ceph/master +Auto-merging net/ceph/ceph_common.c +Auto-merging drivers/block/rbd.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/ceph.txt | 16 + + drivers/block/rbd.c | 2452 ++++++++++++++---------------------- + fs/ceph/Makefile | 2 +- + fs/ceph/addr.c | 63 +- + fs/ceph/cache.c | 4 +- + fs/ceph/caps.c | 128 +- + fs/ceph/debugfs.c | 8 +- + fs/ceph/dir.c | 204 +-- + fs/ceph/file.c | 117 +- + fs/ceph/inode.c | 26 +- + fs/ceph/ioctl.c | 13 +- + fs/ceph/locks.c | 20 +- + fs/ceph/mds_client.c | 87 +- + fs/ceph/mds_client.h | 4 + + fs/ceph/quota.c | 361 ++++++ + fs/ceph/snap.c | 2 + + fs/ceph/super.c | 50 +- + fs/ceph/super.h | 42 + + fs/ceph/xattr.c | 44 + + include/linux/ceph/ceph_features.h | 1 + + include/linux/ceph/ceph_fs.h | 17 + + include/linux/ceph/libceph.h | 1 + + include/linux/ceph/messenger.h | 101 +- + include/linux/ceph/osd_client.h | 19 +- + include/linux/ceph/osdmap.h | 6 - + include/linux/ceph/striper.h | 69 + + net/ceph/Makefile | 1 + + net/ceph/ceph_common.c | 8 +- + net/ceph/crypto.c | 6 +- + net/ceph/debugfs.c | 17 +- + net/ceph/messenger.c | 188 ++- + net/ceph/mon_client.c | 2 +- + net/ceph/osd_client.c | 67 +- + net/ceph/osdmap.c | 71 -- + net/ceph/striper.c | 261 ++++ + 35 files changed, 2558 insertions(+), 1920 deletions(-) + create mode 100644 fs/ceph/quota.c + create mode 100644 include/linux/ceph/striper.h + create mode 100644 net/ceph/striper.c +Merging cifs/for-next (5a45c8a6c8e9 cifs: Use ULL suffix for 64-bit constant) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifssmb.c | 4 +++- + fs/cifs/inode.c | 2 +- + fs/cifs/smb2pdu.c | 9 +++++++-- + 3 files changed, 11 insertions(+), 4 deletions(-) +Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (f62fd7a77717 ecryptfs: fix spelling mistake: "cadidate" -> "candidate") +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/inode.c | 3 +-- + fs/ecryptfs/keystore.c | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) +Merging ext3/for_next (b91ed9d8082c quota: Kill an unused extern entry form quota.h) +$ git merge ext3/for_next +Auto-merging fs/notify/inotify/inotify_user.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/ext2/super.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/udf.txt | 26 +--- + fs/ext2/super.c | 4 +- + fs/notify/fanotify/fanotify.c | 28 +++- + fs/notify/fanotify/fanotify.h | 3 +- + fs/notify/fanotify/fanotify_user.c | 2 +- + fs/notify/inotify/inotify_fsnotify.c | 8 +- + fs/notify/inotify/inotify_user.c | 14 ++ + fs/notify/notification.c | 3 +- + fs/reiserfs/reiserfs.h | 2 +- + fs/udf/file.c | 10 ++ + fs/udf/ialloc.c | 4 + + fs/udf/inode.c | 23 ++-- + fs/udf/super.c | 260 ++++++++++++++++++----------------- + fs/udf/udf_sb.h | 15 +- + fs/udf/udfdecl.h | 2 + + include/linux/fsnotify_backend.h | 6 + + include/linux/quota.h | 1 - + include/uapi/linux/inotify.h | 8 ++ + 18 files changed, 240 insertions(+), 179 deletions(-) +Merging ext4/dev (b025a674fc5d ext4: force revalidation of directory pointer after seekdir(2)) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. +Merging f2fs/dev (214c2461a864 f2fs: remain written times to update inode during fsync) +$ git merge f2fs/dev +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/inode.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 11 + + Documentation/filesystems/f2fs.txt | 77 +++++++ + fs/f2fs/checkpoint.c | 101 +++++---- + fs/f2fs/data.c | 85 ++++++-- + fs/f2fs/dir.c | 32 +-- + fs/f2fs/extent_cache.c | 5 +- + fs/f2fs/f2fs.h | 188 ++++++++++------- + fs/f2fs/file.c | 94 ++++++--- + fs/f2fs/gc.c | 23 ++- + fs/f2fs/inline.c | 3 +- + fs/f2fs/inode.c | 11 +- + fs/f2fs/namei.c | 147 ++++++++++---- + fs/f2fs/node.c | 55 ++++- + fs/f2fs/node.h | 5 +- + fs/f2fs/recovery.c | 25 ++- + fs/f2fs/segment.c | 133 ++++++++++-- + fs/f2fs/segment.h | 27 ++- + fs/f2fs/super.c | 348 ++++++++++++++++++++++---------- + fs/f2fs/sysfs.c | 73 ++++++- + include/linux/f2fs_fs.h | 20 +- + 20 files changed, 1081 insertions(+), 382 deletions(-) +Merging fuse/for-next (5ba24197b94d fuse: add writeback documentation) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/fuse-io.txt | 38 +++++++++++++++++++++++++++++ + fs/fuse/acl.c | 4 ++-- + fs/fuse/control.c | 2 +- + fs/fuse/cuse.c | 11 ++++++--- + fs/fuse/dev.c | 40 +++++++++++++++---------------- + fs/fuse/dir.c | 45 +++++++++++++++++++++++++---------- + fs/fuse/fuse_i.h | 14 +++++++++-- + fs/fuse/inode.c | 40 +++++++++++++++++++------------ + include/uapi/linux/fuse.h | 7 +++++- + kernel/user_namespace.c | 1 + + 10 files changed, 145 insertions(+), 57 deletions(-) + create mode 100644 Documentation/filesystems/fuse-io.txt +Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (0adb32858b0b Linux 4.16) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (7e8b4fa9fce9 NFSv4.1: Fix exclusive create) +$ git merge nfs-anna/linux-next +Auto-merging net/sunrpc/xprtsock.c +Auto-merging net/sunrpc/clnt.c +Auto-merging fs/nfs/write.c +Auto-merging fs/nfs/inode.c +Merge made by the 'recursive' strategy. + fs/nfs/callback_xdr.c | 37 +---- + fs/nfs/delegation.c | 52 +++++-- + fs/nfs/delegation.h | 7 +- + fs/nfs/dir.c | 15 +- + fs/nfs/inode.c | 138 +++++++++-------- + fs/nfs/nfs3proc.c | 19 +-- + fs/nfs/nfs4proc.c | 168 ++++++++++++++------ + fs/nfs/nfs4state.c | 22 ++- + fs/nfs/nfs4xdr.c | 238 +++++++++++++---------------- + fs/nfs/proc.c | 19 +-- + fs/nfs/unlink.c | 7 +- + fs/nfs/write.c | 8 +- + include/linux/nfs_fs.h | 35 +++-- + include/linux/nfs_xdr.h | 9 +- + include/linux/sunrpc/clnt.h | 7 + + include/linux/sunrpc/xdr.h | 94 ++++++++++++ + include/linux/sunrpc/xprt.h | 9 +- + include/trace/events/rpcrdma.h | 40 ++++- + include/trace/events/sunrpc.h | 106 ++++++++++--- + net/sunrpc/clnt.c | 9 +- + net/sunrpc/sched.c | 10 +- + net/sunrpc/stats.c | 16 +- + net/sunrpc/sunrpc.h | 6 - + net/sunrpc/xdr.c | 82 ++++++++++ + net/sunrpc/xprt.c | 51 ++++--- + net/sunrpc/xprtrdma/backchannel.c | 111 +++++--------- + net/sunrpc/xprtrdma/fmr_ops.c | 13 +- + net/sunrpc/xprtrdma/frwr_ops.c | 53 ++++--- + net/sunrpc/xprtrdma/rpc_rdma.c | 57 ++++--- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 1 + + net/sunrpc/xprtrdma/transport.c | 94 ++++++------ + net/sunrpc/xprtrdma/verbs.c | 227 +++++++++++++-------------- + net/sunrpc/xprtrdma/xprt_rdma.h | 22 +-- + net/sunrpc/xprtsock.c | 8 + + 34 files changed, 1089 insertions(+), 701 deletions(-) +Merging nfsd/nfsd-next (880a3a532548 nfsd: fix incorrect umasks) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/svcsock.c +Auto-merging net/sunrpc/cache.c +Auto-merging include/trace/events/sunrpc.h +Merge made by the 'recursive' strategy. + fs/lockd/svc.c | 4 +- + fs/nfsd/nfs3proc.c | 18 +- + fs/nfsd/nfs3xdr.c | 67 ++------ + fs/nfsd/nfs4callback.c | 4 +- + fs/nfsd/nfs4layouts.c | 16 +- + fs/nfsd/nfs4proc.c | 38 ++-- + fs/nfsd/nfs4state.c | 286 ++++++++++++++----------------- + fs/nfsd/nfs4xdr.c | 22 +-- + fs/nfsd/nfsfh.c | 12 +- + fs/nfsd/nfsproc.c | 23 ++- + fs/nfsd/nfsxdr.c | 63 ++++--- + fs/nfsd/trace.h | 98 +++++++++-- + fs/nfsd/vfs.c | 65 +++---- + fs/nfsd/vfs.h | 11 +- + fs/nfsd/xdr.h | 3 +- + fs/nfsd/xdr3.h | 3 +- + fs/nfsd/xdr4.h | 5 +- + include/linux/sunrpc/svc.h | 6 + + include/linux/sunrpc/svc_rdma.h | 3 - + include/linux/sunrpc/svc_xprt.h | 6 +- + include/trace/events/sunrpc.h | 204 +++++++++++++--------- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 3 - + net/sunrpc/auth_gss/gss_krb5_seal.c | 5 +- + net/sunrpc/auth_gss/gss_krb5_unseal.c | 4 +- + net/sunrpc/cache.c | 32 ++-- + net/sunrpc/svc.c | 118 ++++++++++++- + net/sunrpc/svc_xprt.c | 34 ++-- + net/sunrpc/svcsock.c | 8 +- + net/sunrpc/xprtrdma/svc_rdma.c | 4 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 33 ++-- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 38 ++-- + 31 files changed, 721 insertions(+), 515 deletions(-) +Merging orangefs/for-next (8e9ba5c48ea6 Orangefs: documentation updates) +$ git merge orangefs/for-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/orangefs.txt | 137 +++++++++++++++++++++++++++------ + fs/orangefs/devorangefs-req.c | 55 +++++++------ + fs/orangefs/file.c | 125 +++++++++++------------------- + fs/orangefs/inode.c | 4 +- + fs/orangefs/orangefs-bufmap.c | 4 +- + fs/orangefs/orangefs-debug.h | 6 -- + fs/orangefs/orangefs-kernel.h | 80 ------------------- + fs/orangefs/protocol.h | 45 ----------- + 8 files changed, 190 insertions(+), 266 deletions(-) +Merging overlayfs/overlayfs-next (3e277162a768 ovl: update documentation w.r.t "xino" feature) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.txt | 39 +++++-- + fs/exportfs/expfs.c | 9 ++ + fs/overlayfs/Kconfig | 17 +++ + fs/overlayfs/copy_up.c | 6 +- + fs/overlayfs/export.c | 75 +++++++------- + fs/overlayfs/inode.c | 176 +++++++++++++++++++++----------- + fs/overlayfs/namei.c | 67 ++++++++---- + fs/overlayfs/overlayfs.h | 19 +++- + fs/overlayfs/ovl_entry.h | 21 +++- + fs/overlayfs/readdir.c | 45 ++++++-- + fs/overlayfs/super.c | 157 ++++++++++++++++++++++++---- + fs/overlayfs/util.c | 39 ++++++- + 12 files changed, 503 insertions(+), 167 deletions(-) +Merging ubifs/linux-next (b5094b7f135b ubi: Reject MLC NAND) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/block.c | 2 +- + drivers/mtd/ubi/build.c | 11 +++++++++++ + drivers/mtd/ubi/fastmap-wl.c | 1 - + fs/ubifs/find.c | 2 +- + fs/ubifs/lprops.c | 4 +--- + fs/ubifs/scan.c | 1 - + fs/ubifs/super.c | 14 ++++++++++---- + 7 files changed, 24 insertions(+), 11 deletions(-) +Merging xfs/for-next (dc1baa715bbf xfs: do not log/recover swapext extent owner changes for deleted inodes) +$ git merge xfs/for-next +Already up to date. +Merging file-locks/locks-next (86f84779d8e9 Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (fd70f4425f9b Merge branches 'work.dcache', 'old.dcache', 'work.misc', 'work.thaw', 'misc.compat' and 'misc.sparc' into for-next) +$ git merge vfs/for-next +Resolved 'arch/sparc/kernel/sys_sparc32.c' using previous resolution. +Resolved 'fs/internal.h' using previous resolution. +Resolved 'fs/open.c' using previous resolution. +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/open.c +CONFLICT (content): Merge conflict in fs/open.c +Auto-merging fs/nfs/nfs4xdr.c +Auto-merging fs/namei.c +Auto-merging fs/internal.h +CONFLICT (content): Merge conflict in fs/internal.h +Auto-merging fs/ext4/inode.c +Auto-merging fs/ceph/dir.c +Auto-merging fs/buffer.c +CONFLICT (modify/delete): drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c left in tree. +CONFLICT (modify/delete): drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c left in tree. +Auto-merging drivers/media/pci/saa7134/saa7134-video.c +Auto-merging arch/sparc/kernel/sys_sparc_64.c +Auto-merging arch/sparc/kernel/sys_sparc_32.c +Auto-merging arch/sparc/kernel/sys_sparc32.c +CONFLICT (content): Merge conflict in arch/sparc/kernel/sys_sparc32.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c +drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c: needs merge +drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c: needs merge +rm 'drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c' +rm 'drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c' +$ git commit -v -a +[master 1ee517188057] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/entry.S | 1 - + arch/alpha/kernel/pci-noop.c | 15 ++--- + arch/alpha/kernel/pci.c | 5 +- + arch/arc/kernel/troubleshoot.c | 1 - + arch/sparc/kernel/entry.S | 15 ----- + arch/sparc/kernel/sys32.S | 38 ----------- + arch/sparc/kernel/sys_sparc32.c | 89 ++++++++++--------------- + arch/sparc/kernel/sys_sparc_32.c | 31 +++++---- + arch/sparc/kernel/sys_sparc_64.c | 18 +++-- + arch/sparc/kernel/syscalls.S | 9 --- + arch/sparc/kernel/systbls.h | 53 ++++++++------- + arch/sparc/kernel/systbls_32.S | 2 +- + arch/sparc/kernel/systbls_64.S | 24 +++---- + drivers/media/i2c/saa6588.c | 4 +- + drivers/media/pci/bt8xx/bttv-driver.c | 4 +- + drivers/media/pci/saa7134/saa7134-video.c | 4 +- + fs/buffer.c | 25 +------ + fs/ceph/dir.c | 1 - + fs/ext4/inode.c | 4 +- + fs/fs-writeback.c | 9 +-- + fs/gfs2/super.c | 2 +- + fs/gfs2/xattr.c | 8 +-- + fs/internal.h | 1 - + fs/namei.c | 9 +-- + fs/nfs/nfs4xdr.c | 1 - + fs/ntfs/mft.c | 4 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/open.c | 44 +++++-------- + fs/orangefs/acl.c | 1 - + fs/super.c | 105 ++++++++++++++++++++++-------- + fs/ubifs/file.c | 2 +- + fs/xfs/xfs_aops.c | 2 +- + include/linux/fs.h | 11 +++- + include/media/i2c/saa6588.h | 1 + + kernel/exec_domain.c | 1 - + security/loadpin/loadpin.c | 1 - + 36 files changed, 239 insertions(+), 308 deletions(-) +$ git am -3 ../patches/0001-Revert-buffer.c-call-thaw_super-during-emergency-tha.patch +Applying: Revert "buffer.c: call thaw_super during emergency thaw" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/buffer.c +M fs/super.c +M include/linux/fs.h +$ git add -A . +$ git commit -v -a --amend +[master 0403d345cbec] Merge remote-tracking branch 'vfs/for-next' + Date: Fri Apr 6 11:08:58 2018 +1000 +Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) +$ git merge vfs-miklos/next +Already up to date. +Merging printk/for-next (23545acc2a0e Merge branch 'for-4.17' into for-next) +$ git merge printk/for-next +Auto-merging lib/Makefile +Auto-merging kernel/printk/printk.c +Merge made by the 'recursive' strategy. + include/linux/printk.h | 7 ++++-- + kernel/printk/printk.c | 59 +------------------------------------------------ + lib/Makefile | 3 ++- + lib/dump_stack.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 68 insertions(+), 61 deletions(-) +Merging pci/next (7432acf31525 Merge branch 'lorenzo/pci/xilinx') +$ git merge pci/next +Resolved 'drivers/bus/Makefile' using previous resolution. +Resolved 'drivers/net/ethernet/mellanox/mlx5/core/en_main.c' using previous resolution. +Resolved 'drivers/pci/quirks.c' using previous resolution. +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +Removing include/linux/pcieport_if.h +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/pci.h +Auto-merging include/asm-generic/io.h +Auto-merging drivers/pci/syscall.c +Auto-merging drivers/pci/setup-res.c +Auto-merging drivers/pci/quirks.c +CONFLICT (content): Merge conflict in drivers/pci/quirks.c +Auto-merging drivers/pci/proc.c +Auto-merging drivers/pci/probe.c +Removing drivers/pci/pcie/portdrv_bus.c +Auto-merging drivers/pci/pcie/dpc.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/pci-sysfs.c +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/pci/dwc/pcie-designware-host.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/main.c +Auto-merging drivers/net/ethernet/intel/fm10k/fm10k_pci.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/bus/Makefile +CONFLICT (content): Merge conflict in drivers/bus/Makefile +Auto-merging drivers/bus/Kconfig +Auto-merging drivers/acpi/scan.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fc1c21287a29] Merge remote-tracking branch 'pci/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 19 +- + .../arm/hisilicon/hisilicon-low-pin-count.txt | 33 ++ + .../bindings/pci/hisilicon-histb-pcie.txt | 1 + + .../devicetree/bindings/pci/mediatek-pcie.txt | 11 +- + .../devicetree/bindings/pci/qcom,pcie.txt | 4 + + Documentation/devicetree/bindings/pci/rcar-pci.txt | 6 +- + MAINTAINERS | 7 + + arch/ia64/pci/pci.c | 4 +- + arch/powerpc/include/asm/pci.h | 9 +- + arch/powerpc/kernel/pci-common.c | 106 +--- + arch/sparc/kernel/pci.c | 6 +- + arch/sparc/kernel/pci_common.c | 54 +- + arch/sparc/kernel/pci_impl.h | 4 + + arch/xtensa/include/asm/pci.h | 7 +- + arch/xtensa/kernel/pci.c | 94 +--- + drivers/acpi/pci_root.c | 21 +- + drivers/acpi/scan.c | 33 +- + drivers/bus/Kconfig | 8 + + drivers/bus/Makefile | 2 + + drivers/bus/hisi_lpc.c | 615 +++++++++++++++++++++ + drivers/gpu/drm/i915/i915_drv.c | 5 +- + drivers/misc/pci_endpoint_test.c | 12 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 87 +-- + drivers/net/ethernet/mellanox/mlx4/main.c | 81 +-- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 32 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 + + drivers/of/address.c | 96 +++- + drivers/pci/Makefile | 69 +-- + drivers/pci/access.c | 380 +------------ + drivers/pci/ats.c | 10 +- + drivers/pci/bus.c | 2 - + drivers/pci/cadence/pcie-cadence-ep.c | 15 +- + drivers/pci/dwc/Kconfig | 1 + + drivers/pci/dwc/pci-exynos.c | 18 - + drivers/pci/dwc/pci-imx6.c | 18 - + drivers/pci/dwc/pci-keystone-dw.c | 91 +-- + drivers/pci/dwc/pci-keystone.c | 1 + + drivers/pci/dwc/pci-keystone.h | 4 +- + drivers/pci/dwc/pci-layerscape.c | 3 +- + drivers/pci/dwc/pcie-artpec6.c | 18 - + drivers/pci/dwc/pcie-designware-ep.c | 36 +- + drivers/pci/dwc/pcie-designware-host.c | 396 +++++++------ + drivers/pci/dwc/pcie-designware-plat.c | 16 - + drivers/pci/dwc/pcie-designware.h | 30 +- + drivers/pci/dwc/pcie-histb.c | 43 +- + drivers/pci/dwc/pcie-kirin.c | 3 +- + drivers/pci/dwc/pcie-qcom.c | 91 ++- + drivers/pci/endpoint/functions/pci-epf-test.c | 28 +- + drivers/pci/endpoint/pci-epc-core.c | 32 +- + drivers/pci/endpoint/pci-epf-core.c | 56 +- + drivers/pci/host-bridge.c | 2 +- + drivers/pci/host/Kconfig | 2 +- + drivers/pci/host/pci-ftpci100.c | 4 +- + drivers/pci/host/pci-hyperv.c | 112 +++- + drivers/pci/host/pci-rcar-gen2.c | 1 - + drivers/pci/host/pci-tegra.c | 354 +++++++++--- + drivers/pci/host/pci-v3-semi.c | 2 +- + drivers/pci/host/pci-xgene-msi.c | 2 +- + drivers/pci/host/pcie-altera.c | 2 +- + drivers/pci/host/pcie-iproc-bcma.c | 3 +- + drivers/pci/host/pcie-iproc.c | 19 +- + drivers/pci/host/pcie-iproc.h | 4 - + drivers/pci/host/pcie-rcar.c | 2 +- + drivers/pci/host/pcie-xilinx-nwl.c | 4 +- + drivers/pci/hotplug/acpiphp_glue.c | 23 +- + drivers/pci/hotplug/cpqphp_ctrl.c | 12 +- + drivers/pci/hotplug/pciehp.h | 3 +- + drivers/pci/iov.c | 50 +- + drivers/pci/mmap.c | 2 +- + drivers/pci/msi.c | 3 +- + drivers/pci/pci-acpi.c | 3 +- + drivers/pci/pci-driver.c | 96 +++- + drivers/pci/pci-label.c | 5 +- + drivers/pci/pci-stub.c | 3 +- + drivers/pci/pci-sysfs.c | 111 +--- + drivers/pci/pci.c | 377 +++++++++---- + drivers/pci/pci.h | 45 +- + drivers/pci/pcie/Makefile | 19 +- + drivers/pci/pcie/aer/aer_inject.c | 4 +- + drivers/pci/pcie/aer/aerdrv.c | 10 +- + drivers/pci/pcie/aer/aerdrv.h | 4 +- + drivers/pci/pcie/aer/aerdrv_acpi.c | 1 - + drivers/pci/pcie/aer/aerdrv_core.c | 11 +- + drivers/pci/pcie/aer/aerdrv_errprint.c | 3 - + drivers/pci/pcie/aer/ecrc.c | 8 +- + drivers/pci/pcie/aspm.c | 23 +- + drivers/pci/pcie/{pcie-dpc.c => dpc.c} | 3 +- + drivers/pci/pcie/pme.c | 1 - + drivers/pci/pcie/portdrv.h | 87 ++- + drivers/pci/pcie/portdrv_acpi.c | 5 +- + drivers/pci/pcie/portdrv_bus.c | 56 -- + drivers/pci/pcie/portdrv_core.c | 84 ++- + drivers/pci/pcie/portdrv_pci.c | 61 +- + drivers/pci/probe.c | 75 ++- + drivers/pci/proc.c | 4 +- + drivers/pci/quirks.c | 178 +----- + drivers/pci/rom.c | 4 +- + drivers/pci/search.c | 8 +- + drivers/pci/setup-bus.c | 6 +- + drivers/pci/setup-irq.c | 4 +- + drivers/pci/setup-res.c | 10 +- + drivers/pci/slot.c | 2 +- + drivers/pci/syscall.c | 9 +- + drivers/pci/vpd.c | 576 ++++++++++++++++++- + drivers/pci/xen-pcifront.c | 4 +- + drivers/rapidio/devices/tsi721.c | 5 +- + include/acpi/acpi_bus.h | 2 +- + include/asm-generic/io.h | 4 +- + include/linux/logic_pio.h | 123 +++++ + include/linux/pci-epc.h | 11 +- + include/linux/pci-epf.h | 2 + + include/linux/pci.h | 94 ++-- + include/linux/pci_ids.h | 1 + + include/linux/pcieport_if.h | 71 --- + include/uapi/linux/pci_regs.h | 7 +- + lib/Kconfig | 16 + + lib/Makefile | 2 + + lib/logic_pio.c | 280 ++++++++++ + 118 files changed, 3481 insertions(+), 2365 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/hisilicon/hisilicon-low-pin-count.txt + create mode 100644 drivers/bus/hisi_lpc.c + rename drivers/pci/pcie/{pcie-dpc.c => dpc.c} (99%) + delete mode 100644 drivers/pci/pcie/portdrv_bus.c + create mode 100644 include/linux/logic_pio.h + delete mode 100644 include/linux/pcieport_if.h + create mode 100644 lib/logic_pio.c +$ git am -3 ../patches/0001-PCI-cxgb4-morge-fix-up-for-move-of-quirk_chelsio_ext.patch +Applying: PCI/cxgb4: morge fix up for move of quirk_chelsio_extend_vpd() +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/pci/vpd.c +$ git add -A . +$ git commit -v -a --amend +[master 737d0ab64290] Merge remote-tracking branch 'pci/next' + Date: Fri Apr 6 11:31:36 2018 +1000 +Merging pstore/for-next/pstore (58eb5b670747 pstore: fix crypto dependencies) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + fs/pstore/Kconfig | 101 +++++++++--- + fs/pstore/inode.c | 2 + + fs/pstore/internal.h | 3 + + fs/pstore/platform.c | 372 +++++++++++++++------------------------------ + fs/pstore/ram.c | 2 +- + fs/pstore/ram_core.c | 29 +++- + include/linux/pstore_ram.h | 1 + + 7 files changed, 226 insertions(+), 284 deletions(-) +Merging hid/for-next (e221c81efb0c Merge branch 'for-4.17/google-hammer' into for-next) +$ git merge hid/for-next +Recorded preimage for 'drivers/hid/hid-multitouch.c' +Auto-merging drivers/hid/hid-multitouch.c +CONFLICT (content): Merge conflict in drivers/hid/hid-multitouch.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/hid/hid-multitouch.c'. +[master 4e9a505e9570] Merge remote-tracking branch 'hid/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging i2c/i2c/for-next (af43a5785853 Merge branch 'i2c/for-4.17' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging drivers/i2c/busses/Makefile +Auto-merging drivers/i2c/busses/Kconfig +CONFLICT (modify/delete): arch/blackfin/mach-bf561/boards/acvilon.c deleted in HEAD and modified in i2c/i2c/for-next. Version i2c/i2c/for-next of arch/blackfin/mach-bf561/boards/acvilon.c left in tree. +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/blackfin/mach-bf561/boards/acvilon.c +arch/blackfin/mach-bf561/boards/acvilon.c: needs merge +rm 'arch/blackfin/mach-bf561/boards/acvilon.c' +$ git commit -v -a +[master 00aca3b7174f] Merge remote-tracking branch 'i2c/i2c/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/eeprom/at24.txt | 4 + + Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 2 + + .../devicetree/bindings/i2c/i2c-sh_mobile.txt | 1 + + .../devicetree/bindings/i2c/i2c-synquacer.txt | 29 + + MAINTAINERS | 9 +- + arch/sh/boards/board-sh7785lcr.c | 11 +- + drivers/i2c/busses/Kconfig | 10 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-designware-master.c | 2 +- + drivers/i2c/busses/i2c-exynos5.c | 63 +- + drivers/i2c/busses/i2c-imx.c | 36 +- + drivers/i2c/busses/i2c-mv64xxx.c | 8 +- + drivers/i2c/busses/i2c-pca-platform.c | 34 +- + drivers/i2c/busses/i2c-piix4.c | 61 +- + drivers/i2c/busses/i2c-qup.c | 1481 ++++++++++++-------- + drivers/i2c/busses/i2c-rcar.c | 4 +- + drivers/i2c/busses/i2c-scmi.c | 35 +- + drivers/i2c/busses/i2c-stm32f4.c | 2 +- + drivers/i2c/busses/i2c-synquacer.c | 667 +++++++++ + drivers/i2c/busses/i2c-xiic.c | 8 +- + drivers/i2c/busses/i2c-xlp9xx.c | 78 +- + drivers/i2c/i2c-core-base.c | 58 +- + drivers/i2c/i2c-core-of.c | 30 +- + drivers/i2c/i2c-core-smbus.c | 16 +- + drivers/i2c/i2c-core.h | 1 - + drivers/i2c/muxes/i2c-mux-pca954x.c | 55 +- + include/linux/i2c-pca-platform.h | 3 - + include/linux/i2c.h | 30 + + 28 files changed, 1969 insertions(+), 770 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-synquacer.txt + create mode 100644 drivers/i2c/busses/i2c-synquacer.c +Merging dmi/master (eb693e35e850 firmware: dmi_scan: add DMI_OEM_STRING support to dmi_matches) +$ git merge dmi/master +Auto-merging drivers/firmware/dmi_scan.c +Merge made by the 'recursive' strategy. + drivers/firmware/dmi_scan.c | 10 +++++++++- + include/linux/mod_devicetable.h | 1 + + 2 files changed, 10 insertions(+), 1 deletion(-) +Merging hwmon-staging/hwmon-next (e3a2d2be510e hwmon: (via-cputemp) support new centaur CPUs) +$ git merge hwmon-staging/hwmon-next +Auto-merging drivers/hwmon/Kconfig +Merge made by the 'recursive' strategy. + Documentation/hwmon/adm1275 | 20 ++- + Documentation/hwmon/lm92 | 6 +- + Documentation/hwmon/nct6775 | 56 ++++--- + Documentation/hwmon/sht21 | 6 +- + Documentation/hwmon/sht3x | 2 +- + drivers/hwmon/Kconfig | 5 +- + drivers/hwmon/g762.c | 53 ++----- + drivers/hwmon/lm92.c | 63 +------- + drivers/hwmon/nct6775.c | 231 ++++++++++++++++++---------- + drivers/hwmon/pmbus/Kconfig | 4 +- + drivers/hwmon/pmbus/adm1275.c | 71 ++++++++- + drivers/hwmon/pmbus/max8688.c | 2 +- + drivers/hwmon/pmbus/ucd9000.c | 350 +++++++++++++++++++++++++++++++++++++++++- + drivers/hwmon/sht21.c | 3 +- + drivers/hwmon/via-cputemp.c | 31 ++-- + 15 files changed, 662 insertions(+), 241 deletions(-) +Merging jc_docs/docs-next (86afad7d87f5 Documentation/process: update FUSE project website) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (7c9b845e79ea video: fbdev: s3c-fb: remove dead platform code for Exynos and S5PV210 platforms) +$ git merge fbdev/fbdev-for-next +Resolved 'drivers/video/console/Kconfig' using previous resolution. +Auto-merging drivers/video/fbdev/stifb.c +Auto-merging drivers/video/fbdev/Kconfig +Auto-merging drivers/video/console/Kconfig +CONFLICT (content): Merge conflict in drivers/video/console/Kconfig +Auto-merging drivers/video/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1cfc79801fef] Merge remote-tracking branch 'fbdev/fbdev-for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/video/Kconfig | 3 - + drivers/video/console/sticore.c | 4 +- + drivers/video/fbdev/Kconfig | 8 +- + drivers/video/fbdev/amba-clcd.c | 3 +- + drivers/video/fbdev/atmel_lcdfb.c | 31 +-- + drivers/video/fbdev/aty/aty128fb.c | 2 +- + drivers/video/fbdev/aty/mach64_ct.c | 2 +- + drivers/video/fbdev/aty/radeon_base.c | 21 ++ + drivers/video/fbdev/au1100fb.c | 9 +- + drivers/video/fbdev/fsl-diu-fb.c | 6 +- + drivers/video/fbdev/matrox/matroxfb_crtc2.c | 5 +- + drivers/video/fbdev/offb.c | 2 + + drivers/video/fbdev/s3c-fb.c | 168 +------------- + drivers/video/fbdev/sis/init.h | 76 ------- + drivers/video/fbdev/sis/init301.c | 326 ++++++++++++++++++++++++++++ + drivers/video/fbdev/sis/init301.h | 320 --------------------------- + drivers/video/fbdev/sis/sis.h | 131 +++++++++++ + drivers/video/fbdev/sis/sis_main.c | 51 +++++ + drivers/video/fbdev/sis/sis_main.h | 117 ---------- + drivers/video/fbdev/smscufx.c | 59 ++--- + drivers/video/fbdev/ssd1307fb.c | 3 +- + drivers/video/fbdev/stifb.c | 6 +- + drivers/video/fbdev/udlfb.c | 39 ++-- + drivers/video/fbdev/vermilion/vermilion.c | 2 +- + drivers/video/fbdev/via/via_aux_sii164.c | 2 +- + drivers/video/fbdev/via/via_aux_vt1631.c | 2 +- + drivers/video/fbdev/via/via_aux_vt1632.c | 2 +- + drivers/video/fbdev/via/via_aux_vt1636.c | 2 +- + drivers/video/of_display_timing.c | 20 -- + include/video/of_display_timing.h | 5 - + 30 files changed, 609 insertions(+), 818 deletions(-) +Merging pm/linux-next (4606b87beeff Merge branch 'acpi-pm' into linux-next) +$ git merge pm/linux-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging cpupower/cpupower (7928b2cbe55b Linux 4.16-rc1) +$ git merge cpupower/cpupower +Already up to date. +Merging idle/next (8a5776a5f498 Linux 4.14-rc4) +$ git merge idle/next +Already up to date. +Merging opp/opp/linux-next (4a823c0be80f opp: cpu: Replace GFP_ATOMIC with GFP_KERNEL in dev_pm_opp_init_cpufreq_table) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/next (f8837aac36cd Merge branches 'thermal-core' and 'thermal-soc' into next) +$ git merge thermal/next +Removing drivers/thermal/samsung/exynos_tmu.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/exynos-thermal.txt | 23 +- + .../devicetree/bindings/thermal/imx-thermal.txt | 9 +- + .../bindings/thermal/mediatek-thermal.txt | 1 + + .../devicetree/bindings/thermal/thermal.txt | 16 +- + Documentation/thermal/sysfs-api.txt | 31 +++ + drivers/thermal/Kconfig | 7 + + drivers/thermal/imx_thermal.c | 301 ++++++++++++++++----- + drivers/thermal/mtk_thermal.c | 35 +++ + drivers/thermal/samsung/exynos_tmu.c | 268 +++++++++--------- + drivers/thermal/samsung/exynos_tmu.h | 75 ----- + drivers/thermal/thermal_core.c | 3 +- + drivers/thermal/thermal_core.h | 10 + + drivers/thermal/thermal_helpers.c | 5 +- + drivers/thermal/thermal_sysfs.c | 225 +++++++++++++++ + include/linux/thermal.h | 1 + + 15 files changed, 706 insertions(+), 304 deletions(-) + delete mode 100644 drivers/thermal/samsung/exynos_tmu.h +Merging thermal-soc/next (2db48884bb51 dt-bindings: thermal: Remove "cooling-{min|max}-level" properties) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers) +$ git merge ieee1394/for-next +Already up to date. +Merging dlm/next (9250e523592a dlm: remove dlm_send_rcom_lookup_dump) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (2d93fc856959 IB/mlx5: Add ability to hash by IPSEC_SPI when creating a TIR) +$ git merge rdma/for-next +Resolved 'drivers/infiniband/core/ucma.c' using previous resolution. +Recorded preimage for 'drivers/infiniband/hw/mlx5/main.c' +Auto-merging include/uapi/rdma/i40iw-abi.h +Auto-merging include/rdma/ib_verbs.h +Auto-merging include/rdma/ib_addr.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/mlx5/device.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/main.c +Auto-merging drivers/infiniband/hw/usnic/usnic_transport.c +Auto-merging drivers/infiniband/hw/usnic/usnic_ib_main.c +Auto-merging drivers/infiniband/hw/qedr/verbs.c +Auto-merging drivers/infiniband/hw/qedr/main.c +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Auto-merging drivers/infiniband/hw/mlx5/mr.c +Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h +Auto-merging drivers/infiniband/hw/mlx5/main.c +CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c +Auto-merging drivers/infiniband/hw/cxgb4/device.c +Removing drivers/infiniband/hw/cxgb3/cxio_dbg.c +Auto-merging drivers/infiniband/core/ucma.c +CONFLICT (content): Merge conflict in drivers/infiniband/core/ucma.c +Auto-merging drivers/infiniband/core/device.c +Auto-merging drivers/infiniband/core/cma.c +Auto-merging drivers/infiniband/core/addr.c +Auto-merging MAINTAINERS +Auto-merging .mailmap +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/infiniband/hw/mlx5/main.c'. +[master 5291ad9e9372] Merge remote-tracking branch 'rdma/for-next' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 2 + + MAINTAINERS | 1 + + drivers/infiniband/Kconfig | 11 +- + drivers/infiniband/core/Makefile | 3 +- + drivers/infiniband/core/addr.c | 13 +- + drivers/infiniband/core/cache.c | 533 +++++++++++---------- + drivers/infiniband/core/cm.c | 67 ++- + drivers/infiniband/core/cma.c | 160 +++---- + drivers/infiniband/core/cma_priv.h | 97 ++++ + drivers/infiniband/core/core_priv.h | 11 + + drivers/infiniband/core/device.c | 18 +- + drivers/infiniband/core/iwpm_util.c | 5 +- + drivers/infiniband/core/multicast.c | 26 +- + drivers/infiniband/core/nldev.c | 364 ++++++++++++-- + drivers/infiniband/core/rdma_core.c | 13 +- + drivers/infiniband/core/restrack.c | 121 +++-- + drivers/infiniband/core/sa_query.c | 202 ++++---- + drivers/infiniband/core/sysfs.c | 53 +- + drivers/infiniband/core/ucm.c | 18 +- + drivers/infiniband/core/ucma.c | 40 +- + drivers/infiniband/core/uverbs.h | 40 ++ + drivers/infiniband/core/uverbs_cmd.c | 273 +++++++---- + drivers/infiniband/core/uverbs_ioctl.c | 60 ++- + drivers/infiniband/core/uverbs_ioctl_merge.c | 2 +- + drivers/infiniband/core/uverbs_main.c | 218 ++++----- + drivers/infiniband/core/uverbs_std_types.c | 323 ++++--------- + drivers/infiniband/core/uverbs_std_types_cq.c | 210 ++++++++ + .../infiniband/core/uverbs_std_types_flow_action.c | 435 +++++++++++++++++ + drivers/infiniband/core/verbs.c | 81 ++-- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 20 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 6 +- + drivers/infiniband/hw/bnxt_re/main.c | 2 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 2 +- + drivers/infiniband/hw/cxgb3/Kconfig | 9 - + drivers/infiniband/hw/cxgb3/Makefile | 2 - + drivers/infiniband/hw/cxgb3/cxio_dbg.c | 206 -------- + drivers/infiniband/hw/cxgb3/cxio_hal.h | 9 - + drivers/infiniband/hw/cxgb3/iwch_cq.c | 6 - + drivers/infiniband/hw/cxgb3/iwch_provider.c | 5 +- + drivers/infiniband/hw/cxgb4/device.c | 24 +- + drivers/infiniband/hw/cxgb4/mem.c | 3 + + drivers/infiniband/hw/cxgb4/provider.c | 24 +- + drivers/infiniband/hw/hfi1/driver.c | 1 + + drivers/infiniband/hw/hfi1/hfi.h | 1 - + drivers/infiniband/hw/hfi1/qp.c | 1 - + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 4 +- + drivers/infiniband/hw/hfi1/verbs.c | 2 +- + drivers/infiniband/hw/hns/Makefile | 2 +- + drivers/infiniband/hw/hns/hns_roce_ah.c | 8 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 54 ++- + drivers/infiniband/hw/hns/hns_roce_db.c | 180 +++++++ + drivers/infiniband/hw/hns/hns_roce_device.h | 59 ++- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 8 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 80 ++-- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 3 + + drivers/infiniband/hw/hns/hns_roce_main.c | 41 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_pd.c | 5 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 70 ++- + drivers/infiniband/hw/i40iw/i40iw.h | 11 +- + drivers/infiniband/hw/i40iw/i40iw_cm.c | 129 +++-- + drivers/infiniband/hw/i40iw/i40iw_cm.h | 5 +- + drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 56 ++- + drivers/infiniband/hw/i40iw/i40iw_d.h | 5 +- + drivers/infiniband/hw/i40iw/i40iw_hw.c | 35 ++ + drivers/infiniband/hw/i40iw/i40iw_main.c | 2 - + drivers/infiniband/hw/i40iw/i40iw_puda.c | 8 +- + drivers/infiniband/hw/i40iw/i40iw_type.h | 11 + + drivers/infiniband/hw/i40iw/i40iw_utils.c | 10 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 57 ++- + drivers/infiniband/hw/mlx4/ah.c | 10 +- + drivers/infiniband/hw/mlx4/main.c | 102 ++-- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 19 +- + drivers/infiniband/hw/mlx4/mr.c | 3 + + drivers/infiniband/hw/mlx4/qp.c | 27 +- + drivers/infiniband/hw/mlx5/ah.c | 12 + + drivers/infiniband/hw/mlx5/main.c | 430 +++++++++++++++-- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 27 +- + drivers/infiniband/hw/mlx5/mr.c | 170 ++++--- + drivers/infiniband/hw/mlx5/qp.c | 156 ++++-- + drivers/infiniband/hw/mthca/mthca_provider.c | 1 + + drivers/infiniband/hw/nes/nes_verbs.c | 1 + + drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 8 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 22 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 4 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 34 -- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 12 - + drivers/infiniband/hw/qedr/main.c | 9 +- + drivers/infiniband/hw/qedr/qedr_roce_cm.c | 16 +- + drivers/infiniband/hw/qedr/verbs.c | 131 ++--- + drivers/infiniband/hw/qedr/verbs.h | 6 - + drivers/infiniband/hw/qib/qib.h | 3 - + drivers/infiniband/hw/qib/qib_diag.c | 2 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 8 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 10 + + drivers/infiniband/hw/qib/qib_init.c | 4 +- + drivers/infiniband/hw/qib/qib_sdma.c | 24 - + drivers/infiniband/hw/qib/qib_verbs.c | 2 +- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 1 + + drivers/infiniband/hw/usnic/usnic_transport.c | 4 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 32 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 2 +- + drivers/infiniband/sw/rdmavt/vt.c | 5 +- + drivers/infiniband/sw/rdmavt/vt.h | 1 - + drivers/infiniband/sw/rxe/rxe.c | 4 +- + drivers/infiniband/sw/rxe/rxe.h | 6 +- + drivers/infiniband/sw/rxe/rxe_av.c | 5 +- + drivers/infiniband/sw/rxe/rxe_cq.c | 15 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 20 +- + drivers/infiniband/sw/rxe/rxe_net.c | 56 ++- + drivers/infiniband/sw/rxe/rxe_qp.c | 35 +- + drivers/infiniband/sw/rxe/rxe_queue.c | 24 +- + drivers/infiniband/sw/rxe/rxe_queue.h | 5 +- + drivers/infiniband/sw/rxe/rxe_recv.c | 16 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 15 +- + drivers/infiniband/sw/rxe/rxe_srq.c | 44 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 90 ++-- + drivers/infiniband/sw/rxe/rxe_verbs.h | 2 - + drivers/infiniband/ulp/ipoib/ipoib.h | 5 - + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 2 +- + drivers/infiniband/ulp/srp/ib_srp.c | 181 ++++--- + drivers/infiniband/ulp/srpt/ib_srpt.c | 396 ++++++++++++--- + drivers/infiniband/ulp/srpt/ib_srpt.h | 8 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 1 + + drivers/net/ethernet/mellanox/mlx4/main.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 19 +- + drivers/net/ethernet/mellanox/mlx5/core/rl.c | 63 ++- + include/linux/mlx4/device.h | 4 - + include/linux/mlx5/device.h | 4 +- + include/linux/mlx5/driver.h | 15 +- + include/linux/mlx5/fs_helpers.h | 8 + + include/linux/mlx5/mlx5_ifc.h | 18 +- + include/rdma/ib_addr.h | 9 - + include/rdma/ib_cache.h | 29 -- + include/rdma/ib_sa.h | 13 + + include/rdma/ib_verbs.h | 182 +++++-- + include/rdma/rdma_cm.h | 44 +- + include/rdma/rdma_vt.h | 2 +- + include/rdma/restrack.h | 26 +- + include/rdma/uverbs_ioctl.h | 141 +++++- + include/rdma/uverbs_named_ioctl.h | 90 ++++ + include/rdma/uverbs_std_types.h | 34 +- + include/uapi/rdma/bnxt_re-abi.h | 21 +- + include/uapi/rdma/cxgb3-abi.h | 17 +- + include/uapi/rdma/cxgb4-abi.h | 29 +- + include/uapi/rdma/hfi/hfi1_ioctl.h | 32 +- + include/uapi/rdma/hfi/hfi1_user.h | 10 +- + include/uapi/rdma/hns-abi.h | 22 +- + .../uapi/rdma/i40iw-abi.h | 16 +- + include/uapi/rdma/ib_user_cm.h | 48 +- + include/uapi/rdma/ib_user_ioctl_cmds.h | 103 ++++ + include/uapi/rdma/ib_user_ioctl_verbs.h | 96 ++-- + include/uapi/rdma/ib_user_mad.h | 4 +- + include/uapi/rdma/ib_user_verbs.h | 194 ++++---- + include/uapi/rdma/mlx4-abi.h | 52 +- + include/uapi/rdma/mlx5-abi.h | 71 ++- + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 44 ++ + include/uapi/rdma/mlx5_user_ioctl_verbs.h | 43 ++ + include/uapi/rdma/mthca-abi.h | 10 +- + include/uapi/rdma/nes-abi.h | 6 +- + include/uapi/rdma/ocrdma-abi.h | 36 +- + include/uapi/rdma/qedr-abi.h | 20 +- + include/uapi/rdma/rdma_netlink.h | 51 ++ + include/uapi/rdma/rdma_user_cm.h | 49 +- + include/uapi/rdma/rdma_user_ioctl.h | 38 +- + include/uapi/rdma/rdma_user_ioctl_cmds.h | 99 ++++ + include/uapi/rdma/rdma_user_rxe.h | 58 ++- + include/uapi/rdma/vmw_pvrdma-abi.h | 49 +- + 168 files changed, 5841 insertions(+), 2875 deletions(-) + create mode 100644 drivers/infiniband/core/cma_priv.h + create mode 100644 drivers/infiniband/core/uverbs_std_types_cq.c + create mode 100644 drivers/infiniband/core/uverbs_std_types_flow_action.c + delete mode 100644 drivers/infiniband/hw/cxgb3/cxio_dbg.c + create mode 100644 drivers/infiniband/hw/hns/hns_roce_db.c + create mode 100644 include/rdma/uverbs_named_ioctl.h + rename drivers/infiniband/hw/i40iw/i40iw_ucontext.h => include/uapi/rdma/i40iw-abi.h (90%) + create mode 100644 include/uapi/rdma/ib_user_ioctl_cmds.h + create mode 100644 include/uapi/rdma/mlx5_user_ioctl_cmds.h + create mode 100644 include/uapi/rdma/mlx5_user_ioctl_verbs.h + create mode 100644 include/uapi/rdma/rdma_user_ioctl_cmds.h +Merging net-next/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge net-next/master +Already up to date. +Merging bpf-next/master (4608f064532c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (415a13296a1a xfrm_policy: use true and false for boolean values) +$ git merge ipsec-next/master +Already up to date. +Merging netfilter-next/master (159f02977b2f Merge branch 'net-mvneta-improve-suspend-resume') +$ git merge netfilter-next/master +Already up to date. +Merging nfc-next/master (4d63adfe12dd NFC: Add NFC_CMD_DEACTIVATE_TARGET support) +$ git merge nfc-next/master +Already up to date. +Merging ipvs-next/master (a910d20aa007 netfilter: ipvs: Fix space before '[' error.) +$ git merge ipvs-next/master +Auto-merging net/netfilter/ipvs/ip_vs_proto_tcp.c +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_proto_tcp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging wireless-drivers-next/master (14c99949a339 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (1c663c629bb8 Bluetooth: hci_bcm: Remove irq-active-low DMI quirk for the Thinkpad 8) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/hci_bcm.c | 33 ++++++++++++++++++--------------- + 1 file changed, 18 insertions(+), 15 deletions(-) +Merging mac80211-next/master (159f02977b2f Merge branch 'net-mvneta-improve-suspend-resume') +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (06dd3dfeea60 Merge tag 'char-misc-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/master (87a73eb5b56f mtd: jedec_probe: Fix crash in jedec_read_mfr()) +$ git merge mtd/master +Already up to date. +Merging l2-mtd/mtd/next (b756816dad0a mtd: ftl: Use DIV_ROUND_UP()) +$ git merge l2-mtd/mtd/next +Auto-merging drivers/mtd/mtdchar.c +Removing drivers/mtd/maps/bfin-async-flash.c +Auto-merging drivers/mtd/chips/jedec_probe.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/mtd-physmap.txt | 7 + + MAINTAINERS | 2 - + drivers/mtd/chips/cfi_cmdset_0001.c | 16 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 26 +-- + drivers/mtd/chips/cfi_cmdset_0020.c | 3 - + drivers/mtd/chips/jedec_probe.c | 32 ++++ + drivers/mtd/chips/map_ram.c | 2 - + drivers/mtd/devices/bcm47xxsflash.c | 12 +- + drivers/mtd/devices/block2mtd.c | 9 +- + drivers/mtd/devices/docg3.c | 16 +- + drivers/mtd/devices/lart.c | 6 - + drivers/mtd/devices/mtd_dataflash.c | 4 - + drivers/mtd/devices/mtdram.c | 3 +- + drivers/mtd/devices/phram.c | 7 - + drivers/mtd/devices/pmc551.c | 2 - + drivers/mtd/devices/powernv_flash.c | 12 +- + drivers/mtd/devices/slram.c | 7 +- + drivers/mtd/devices/spear_smi.c | 3 - + drivers/mtd/devices/sst25l.c | 3 - + drivers/mtd/devices/st_spi_fsm.c | 7 +- + drivers/mtd/ftl.c | 56 ++---- + drivers/mtd/inftlmount.c | 8 +- + drivers/mtd/lpddr/lpddr2_nvm.c | 10 +- + drivers/mtd/lpddr/lpddr_cmds.c | 2 - + drivers/mtd/maps/Kconfig | 10 -- + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/bfin-async-flash.c | 196 --------------------- + drivers/mtd/maps/physmap_of_core.c | 6 + + drivers/mtd/mtdblock.c | 21 --- + drivers/mtd/mtdchar.c | 34 +--- + drivers/mtd/mtdconcat.c | 48 +---- + drivers/mtd/mtdcore.c | 94 ++++------ + drivers/mtd/mtdoops.c | 20 --- + drivers/mtd/mtdpart.c | 139 ++++++++++++--- + drivers/mtd/mtdswap.c | 34 ---- + drivers/mtd/nand/nand_base.c | 17 +- + drivers/mtd/nand/nand_bbt.c | 1 - + drivers/mtd/nftlmount.c | 8 +- + drivers/mtd/ofpart.c | 18 +- + drivers/mtd/onenand/onenand_base.c | 17 -- + drivers/mtd/rfd_ftl.c | 93 +++------- + drivers/mtd/sm_ftl.c | 19 -- + drivers/mtd/sm_ftl.h | 4 - + drivers/mtd/spi-nor/spi-nor.c | 3 - + drivers/mtd/tests/mtd_test.c | 5 - + drivers/mtd/tests/pagetest.c | 10 +- + drivers/mtd/tests/speedtest.c | 7 - + drivers/mtd/ubi/gluebi.c | 3 - + drivers/mtd/ubi/io.c | 36 ---- + drivers/net/ethernet/sfc/falcon/mtd.c | 11 +- + drivers/net/ethernet/sfc/mtd.c | 11 +- + drivers/staging/goldfish/goldfish_nand.c | 3 - + fs/jffs2/erase.c | 37 +--- + include/linux/mtd/mtd.h | 19 +- + include/linux/mtd/partitions.h | 1 + + 55 files changed, 291 insertions(+), 890 deletions(-) + delete mode 100644 drivers/mtd/maps/bfin-async-flash.c +Merging nand/nand/next (097ccca726ff mtd: nand: Fix some function description mismatches in core.c) +$ git merge nand/nand/next +Resolved 'drivers/mtd/nand/Kconfig' using previous resolution. +Auto-merging drivers/staging/mt29f_spinand/mt29f_spinand.c +Auto-merging drivers/mtd/sm_ftl.c +Auto-merging drivers/mtd/nand/raw/vf610_nfc.c +Auto-merging drivers/mtd/nand/raw/tango_nand.c +Auto-merging drivers/mtd/nand/raw/sunxi_nand.c +Auto-merging drivers/mtd/nand/raw/socrates_nand.c +Auto-merging drivers/mtd/nand/raw/sm_common.c +Auto-merging drivers/mtd/nand/raw/sharpsl.c +Auto-merging drivers/mtd/nand/raw/sh_flctl.c +Auto-merging drivers/mtd/nand/raw/s3c2410.c +Auto-merging drivers/mtd/nand/raw/r852.h +Auto-merging drivers/mtd/nand/raw/r852.c +Auto-merging drivers/mtd/nand/raw/qcom_nandc.c +Auto-merging drivers/mtd/nand/raw/orion_nand.c +Auto-merging drivers/mtd/nand/raw/omap2.c +Auto-merging drivers/mtd/nand/raw/nandsim.c +Auto-merging drivers/mtd/nand/raw/nand_toshiba.c +Auto-merging drivers/mtd/nand/raw/nand_timings.c +Auto-merging drivers/mtd/nand/raw/nand_micron.c +Auto-merging drivers/mtd/nand/raw/nand_macronix.c +Auto-merging drivers/mtd/nand/raw/nand_ecc.c +Auto-merging drivers/mtd/nand/raw/nand_bch.c +Auto-merging drivers/mtd/nand/raw/nand_base.c +Auto-merging drivers/mtd/nand/raw/mxc_nand.c +Auto-merging drivers/mtd/nand/raw/mpc5121_nfc.c +Auto-merging drivers/mtd/nand/raw/marvell_nand.c +Auto-merging drivers/mtd/nand/raw/hisi504_nand.c +Auto-merging drivers/mtd/nand/raw/gpmi-nand/gpmi-regs.h +Auto-merging drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h +Auto-merging drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +Auto-merging drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c +Auto-merging drivers/mtd/nand/raw/gpio.c +Auto-merging drivers/mtd/nand/raw/fsmc_nand.c +Auto-merging drivers/mtd/nand/raw/fsl_ifc_nand.c +Auto-merging drivers/mtd/nand/raw/fsl_elbc_nand.c +Auto-merging drivers/mtd/nand/raw/docg4.c +Auto-merging drivers/mtd/nand/raw/diskonchip.c +Auto-merging drivers/mtd/nand/raw/denali.c +Auto-merging drivers/mtd/nand/raw/davinci_nand.c +Auto-merging drivers/mtd/nand/raw/cs553x_nand.c +Auto-merging drivers/mtd/nand/raw/cmx270_nand.c +Auto-merging drivers/mtd/nand/raw/cafe_nand.c +Auto-merging drivers/mtd/nand/raw/brcmnand/brcmnand.c +Auto-merging drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c +Auto-merging drivers/mtd/nand/raw/au1550nd.c +Auto-merging drivers/mtd/nand/raw/atmel/pmecc.h +Auto-merging drivers/mtd/nand/raw/atmel/pmecc.c +Auto-merging drivers/mtd/nand/raw/atmel/nand-controller.c +Auto-merging drivers/mtd/nand/raw/ams-delta.c +Auto-merging drivers/mtd/nand/onenand/onenand_bbt.c +Auto-merging drivers/mtd/nand/onenand/onenand_base.c +Auto-merging drivers/mtd/nand/onenand/omap2.c +Auto-merging drivers/mtd/nand/onenand/generic.c +Removing drivers/mtd/nand/bf5xx_nand.c +Auto-merging drivers/mtd/nand/Kconfig +CONFLICT (content): Merge conflict in drivers/mtd/nand/Kconfig +CONFLICT (modify/delete): arch/cris/arch-v32/drivers/mach-fs/nandflash.c deleted in HEAD and modified in nand/nand/next. Version nand/nand/next of arch/cris/arch-v32/drivers/mach-fs/nandflash.c left in tree. +CONFLICT (modify/delete): arch/cris/arch-v32/drivers/mach-a3/nandflash.c deleted in HEAD and modified in nand/nand/next. Version nand/nand/next of arch/cris/arch-v32/drivers/mach-a3/nandflash.c left in tree. +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-api/gpio/drivers-on-gpio.rst +Auto-merging .mailmap +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/cris/arch-v32/drivers/mach-a3/nandflash.c arch/cris/arch-v32/drivers/mach-fs/nandflash.c +arch/cris/arch-v32/drivers/mach-a3/nandflash.c: needs merge +arch/cris/arch-v32/drivers/mach-fs/nandflash.c: needs merge +rm 'arch/cris/arch-v32/drivers/mach-a3/nandflash.c' +rm 'arch/cris/arch-v32/drivers/mach-fs/nandflash.c' +$ git commit -v -a +[master 3baeb18f151a] Merge remote-tracking branch 'nand/nand/next' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 7 +- + Documentation/arm/Samsung-S3C24XX/S3C2412.txt | 2 +- + .../devicetree/bindings/mtd/marvell-nand.txt | 5 +- + .../devicetree/bindings/mtd/sunxi-nand.txt | 4 +- + Documentation/driver-api/gpio/drivers-on-gpio.rst | 4 +- + Documentation/driver-api/mtdnand.rst | 8 +- + MAINTAINERS | 34 +- + drivers/mtd/Kconfig | 2 - + drivers/mtd/Makefile | 2 +- + drivers/mtd/nand/Kconfig | 569 +------------- + drivers/mtd/nand/Makefile | 71 +- + drivers/mtd/nand/bbt.c | 130 ++++ + drivers/mtd/nand/bf5xx_nand.c | 862 --------------------- + drivers/mtd/nand/core.c | 244 ++++++ + drivers/mtd/{ => nand}/onenand/Kconfig | 0 + drivers/mtd/{ => nand}/onenand/Makefile | 0 + drivers/mtd/{ => nand}/onenand/generic.c | 2 - + drivers/mtd/{ => nand}/onenand/omap2.c | 2 - + drivers/mtd/{ => nand}/onenand/onenand_base.c | 2 - + drivers/mtd/{ => nand}/onenand/onenand_bbt.c | 2 - + drivers/mtd/{ => nand}/onenand/samsung.c | 0 + drivers/mtd/{ => nand}/onenand/samsung.h | 0 + drivers/mtd/nand/raw/Kconfig | 537 +++++++++++++ + drivers/mtd/nand/raw/Makefile | 66 ++ + drivers/mtd/nand/{ => raw}/ams-delta.c | 13 +- + drivers/mtd/nand/{ => raw}/atmel/Makefile | 0 + drivers/mtd/nand/{ => raw}/atmel/nand-controller.c | 4 +- + drivers/mtd/nand/{ => raw}/atmel/pmecc.c | 4 +- + drivers/mtd/nand/{ => raw}/atmel/pmecc.h | 4 +- + drivers/mtd/nand/{ => raw}/au1550nd.c | 2 - + drivers/mtd/nand/{ => raw}/bcm47xxnflash/Makefile | 0 + .../nand/{ => raw}/bcm47xxnflash/bcm47xxnflash.h | 0 + drivers/mtd/nand/{ => raw}/bcm47xxnflash/main.c | 0 + .../mtd/nand/{ => raw}/bcm47xxnflash/ops_bcm4706.c | 4 +- + drivers/mtd/nand/{ => raw}/brcmnand/Makefile | 0 + .../mtd/nand/{ => raw}/brcmnand/bcm63138_nand.c | 0 + drivers/mtd/nand/{ => raw}/brcmnand/bcm6368_nand.c | 0 + drivers/mtd/nand/{ => raw}/brcmnand/brcmnand.c | 6 +- + drivers/mtd/nand/{ => raw}/brcmnand/brcmnand.h | 0 + drivers/mtd/nand/{ => raw}/brcmnand/brcmstb_nand.c | 0 + drivers/mtd/nand/{ => raw}/brcmnand/iproc_nand.c | 0 + drivers/mtd/nand/{ => raw}/cafe_nand.c | 14 +- + drivers/mtd/nand/{ => raw}/cmx270_nand.c | 4 +- + drivers/mtd/nand/{ => raw}/cs553x_nand.c | 11 +- + drivers/mtd/nand/{ => raw}/davinci_nand.c | 5 +- + drivers/mtd/nand/{ => raw}/denali.c | 4 +- + drivers/mtd/nand/{ => raw}/denali.h | 0 + drivers/mtd/nand/{ => raw}/denali_dt.c | 0 + drivers/mtd/nand/{ => raw}/denali_pci.c | 0 + drivers/mtd/nand/{ => raw}/diskonchip.c | 78 +- + drivers/mtd/nand/{ => raw}/docg4.c | 4 +- + drivers/mtd/nand/{ => raw}/fsl_elbc_nand.c | 8 +- + drivers/mtd/nand/{ => raw}/fsl_ifc_nand.c | 6 +- + drivers/mtd/nand/{ => raw}/fsl_upm.c | 0 + drivers/mtd/nand/{ => raw}/fsmc_nand.c | 252 +++--- + drivers/mtd/nand/{ => raw}/gpio.c | 2 - + drivers/mtd/nand/{ => raw}/gpmi-nand/Makefile | 0 + drivers/mtd/nand/{ => raw}/gpmi-nand/bch-regs.h | 0 + drivers/mtd/nand/{ => raw}/gpmi-nand/gpmi-lib.c | 793 +++---------------- + drivers/mtd/nand/{ => raw}/gpmi-nand/gpmi-nand.c | 82 +- + drivers/mtd/nand/{ => raw}/gpmi-nand/gpmi-nand.h | 131 +--- + drivers/mtd/nand/{ => raw}/gpmi-nand/gpmi-regs.h | 5 + + drivers/mtd/nand/{ => raw}/hisi504_nand.c | 4 +- + drivers/mtd/nand/{ => raw}/jz4740_nand.c | 0 + drivers/mtd/nand/{ => raw}/jz4780_bch.c | 0 + drivers/mtd/nand/{ => raw}/jz4780_bch.h | 0 + drivers/mtd/nand/{ => raw}/jz4780_nand.c | 0 + drivers/mtd/nand/{ => raw}/lpc32xx_mlc.c | 0 + drivers/mtd/nand/{ => raw}/lpc32xx_slc.c | 0 + drivers/mtd/nand/{ => raw}/marvell_nand.c | 89 ++- + drivers/mtd/nand/{ => raw}/mpc5121_nfc.c | 9 +- + drivers/mtd/nand/{ => raw}/mtk_ecc.c | 0 + drivers/mtd/nand/{ => raw}/mtk_ecc.h | 0 + drivers/mtd/nand/{ => raw}/mtk_nand.c | 0 + drivers/mtd/nand/{ => raw}/mxc_nand.c | 544 +++++++------ + drivers/mtd/nand/{ => raw}/nand_amd.c | 0 + drivers/mtd/nand/{ => raw}/nand_base.c | 318 +++++--- + drivers/mtd/nand/{ => raw}/nand_bbt.c | 0 + drivers/mtd/nand/{ => raw}/nand_bch.c | 12 +- + drivers/mtd/nand/{ => raw}/nand_ecc.c | 22 - + drivers/mtd/nand/{ => raw}/nand_hynix.c | 0 + drivers/mtd/nand/{ => raw}/nand_ids.c | 0 + drivers/mtd/nand/{ => raw}/nand_macronix.c | 13 + + drivers/mtd/nand/{ => raw}/nand_micron.c | 41 +- + drivers/mtd/nand/{ => raw}/nand_samsung.c | 0 + drivers/mtd/nand/{ => raw}/nand_timings.c | 12 +- + drivers/mtd/nand/{ => raw}/nand_toshiba.c | 26 + + drivers/mtd/nand/{ => raw}/nandsim.c | 15 +- + drivers/mtd/nand/{ => raw}/ndfc.c | 0 + drivers/mtd/nand/{ => raw}/nuc900_nand.c | 0 + drivers/mtd/nand/{ => raw}/omap2.c | 5 +- + drivers/mtd/nand/{ => raw}/omap_elm.c | 0 + drivers/mtd/nand/{ => raw}/orion_nand.c | 2 - + drivers/mtd/nand/{ => raw}/oxnas_nand.c | 0 + drivers/mtd/nand/{ => raw}/pasemi_nand.c | 0 + drivers/mtd/nand/{ => raw}/plat_nand.c | 0 + drivers/mtd/nand/{ => raw}/qcom_nandc.c | 4 +- + drivers/mtd/nand/{ => raw}/r852.c | 5 +- + drivers/mtd/nand/{ => raw}/r852.h | 9 +- + drivers/mtd/nand/{ => raw}/s3c2410.c | 27 +- + drivers/mtd/nand/{ => raw}/sh_flctl.c | 10 +- + drivers/mtd/nand/{ => raw}/sharpsl.c | 2 - + drivers/mtd/nand/{ => raw}/sm_common.c | 5 +- + drivers/mtd/nand/{ => raw}/sm_common.h | 0 + drivers/mtd/nand/{ => raw}/socrates_nand.c | 2 - + drivers/mtd/nand/{ => raw}/sunxi_nand.c | 155 +--- + drivers/mtd/nand/{ => raw}/tango_nand.c | 4 +- + drivers/mtd/nand/{ => raw}/tmio_nand.c | 0 + drivers/mtd/nand/{ => raw}/txx9ndfmc.c | 0 + drivers/mtd/nand/{ => raw}/vf610_nfc.c | 677 +++++++++------- + drivers/mtd/nand/{ => raw}/xway_nand.c | 0 + drivers/mtd/sm_ftl.c | 2 +- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 4 +- + include/linux/mtd/bbm.h | 2 - + include/linux/mtd/nand.h | 731 +++++++++++++++++ + include/linux/mtd/nand_ecc.h | 2 - + include/linux/mtd/ndfc.h | 2 - + include/linux/mtd/rawnand.h | 106 +-- + 118 files changed, 3371 insertions(+), 3481 deletions(-) + create mode 100644 drivers/mtd/nand/bbt.c + delete mode 100644 drivers/mtd/nand/bf5xx_nand.c + create mode 100644 drivers/mtd/nand/core.c + rename drivers/mtd/{ => nand}/onenand/Kconfig (100%) + rename drivers/mtd/{ => nand}/onenand/Makefile (100%) + rename drivers/mtd/{ => nand}/onenand/generic.c (98%) + rename drivers/mtd/{ => nand}/onenand/omap2.c (99%) + rename drivers/mtd/{ => nand}/onenand/onenand_base.c (99%) + rename drivers/mtd/{ => nand}/onenand/onenand_bbt.c (99%) + rename drivers/mtd/{ => nand}/onenand/samsung.c (100%) + rename drivers/mtd/{ => nand}/onenand/samsung.h (100%) + create mode 100644 drivers/mtd/nand/raw/Kconfig + create mode 100644 drivers/mtd/nand/raw/Makefile + rename drivers/mtd/nand/{ => raw}/ams-delta.c (95%) + rename drivers/mtd/nand/{ => raw}/atmel/Makefile (100%) + rename drivers/mtd/nand/{ => raw}/atmel/nand-controller.c (99%) + rename drivers/mtd/nand/{ => raw}/atmel/pmecc.c (99%) + rename drivers/mtd/nand/{ => raw}/atmel/pmecc.h (94%) + rename drivers/mtd/nand/{ => raw}/au1550nd.c (99%) + rename drivers/mtd/nand/{ => raw}/bcm47xxnflash/Makefile (100%) + rename drivers/mtd/nand/{ => raw}/bcm47xxnflash/bcm47xxnflash.h (100%) + rename drivers/mtd/nand/{ => raw}/bcm47xxnflash/main.c (100%) + rename drivers/mtd/nand/{ => raw}/bcm47xxnflash/ops_bcm4706.c (98%) + rename drivers/mtd/nand/{ => raw}/brcmnand/Makefile (100%) + rename drivers/mtd/nand/{ => raw}/brcmnand/bcm63138_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/brcmnand/bcm6368_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/brcmnand/brcmnand.c (99%) + rename drivers/mtd/nand/{ => raw}/brcmnand/brcmnand.h (100%) + rename drivers/mtd/nand/{ => raw}/brcmnand/brcmstb_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/brcmnand/iproc_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/cafe_nand.c (98%) + rename drivers/mtd/nand/{ => raw}/cmx270_nand.c (98%) + rename drivers/mtd/nand/{ => raw}/cs553x_nand.c (95%) + rename drivers/mtd/nand/{ => raw}/davinci_nand.c (99%) + rename drivers/mtd/nand/{ => raw}/denali.c (99%) + rename drivers/mtd/nand/{ => raw}/denali.h (100%) + rename drivers/mtd/nand/{ => raw}/denali_dt.c (100%) + rename drivers/mtd/nand/{ => raw}/denali_pci.c (100%) + rename drivers/mtd/nand/{ => raw}/diskonchip.c (95%) + rename drivers/mtd/nand/{ => raw}/docg4.c (99%) + rename drivers/mtd/nand/{ => raw}/fsl_elbc_nand.c (99%) + rename drivers/mtd/nand/{ => raw}/fsl_ifc_nand.c (99%) + rename drivers/mtd/nand/{ => raw}/fsl_upm.c (100%) + rename drivers/mtd/nand/{ => raw}/fsmc_nand.c (86%) + rename drivers/mtd/nand/{ => raw}/gpio.c (99%) + rename drivers/mtd/nand/{ => raw}/gpmi-nand/Makefile (100%) + rename drivers/mtd/nand/{ => raw}/gpmi-nand/bch-regs.h (100%) + rename drivers/mtd/nand/{ => raw}/gpmi-nand/gpmi-lib.c (51%) + rename drivers/mtd/nand/{ => raw}/gpmi-nand/gpmi-nand.c (98%) + rename drivers/mtd/nand/{ => raw}/gpmi-nand/gpmi-nand.h (57%) + rename drivers/mtd/nand/{ => raw}/gpmi-nand/gpmi-regs.h (97%) + rename drivers/mtd/nand/{ => raw}/hisi504_nand.c (99%) + rename drivers/mtd/nand/{ => raw}/jz4740_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/jz4780_bch.c (100%) + rename drivers/mtd/nand/{ => raw}/jz4780_bch.h (100%) + rename drivers/mtd/nand/{ => raw}/jz4780_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/lpc32xx_mlc.c (100%) + rename drivers/mtd/nand/{ => raw}/lpc32xx_slc.c (100%) + rename drivers/mtd/nand/{ => raw}/marvell_nand.c (97%) + rename drivers/mtd/nand/{ => raw}/mpc5121_nfc.c (98%) + rename drivers/mtd/nand/{ => raw}/mtk_ecc.c (100%) + rename drivers/mtd/nand/{ => raw}/mtk_ecc.h (100%) + rename drivers/mtd/nand/{ => raw}/mtk_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/mxc_nand.c (87%) + rename drivers/mtd/nand/{ => raw}/nand_amd.c (100%) + rename drivers/mtd/nand/{ => raw}/nand_base.c (96%) + rename drivers/mtd/nand/{ => raw}/nand_bbt.c (100%) + rename drivers/mtd/nand/{ => raw}/nand_bch.c (95%) + rename drivers/mtd/nand/{ => raw}/nand_ecc.c (95%) + rename drivers/mtd/nand/{ => raw}/nand_hynix.c (100%) + rename drivers/mtd/nand/{ => raw}/nand_ids.c (100%) + rename drivers/mtd/nand/{ => raw}/nand_macronix.c (64%) + rename drivers/mtd/nand/{ => raw}/nand_micron.c (88%) + rename drivers/mtd/nand/{ => raw}/nand_samsung.c (100%) + rename drivers/mtd/nand/{ => raw}/nand_timings.c (95%) + rename drivers/mtd/nand/{ => raw}/nand_toshiba.c (71%) + rename drivers/mtd/nand/{ => raw}/nandsim.c (99%) + rename drivers/mtd/nand/{ => raw}/ndfc.c (100%) + rename drivers/mtd/nand/{ => raw}/nuc900_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/omap2.c (99%) + rename drivers/mtd/nand/{ => raw}/omap_elm.c (100%) + rename drivers/mtd/nand/{ => raw}/orion_nand.c (99%) + rename drivers/mtd/nand/{ => raw}/oxnas_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/pasemi_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/plat_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/qcom_nandc.c (99%) + rename drivers/mtd/nand/{ => raw}/r852.c (99%) + rename drivers/mtd/nand/{ => raw}/r852.h (95%) + rename drivers/mtd/nand/{ => raw}/s3c2410.c (98%) + rename drivers/mtd/nand/{ => raw}/sh_flctl.c (99%) + rename drivers/mtd/nand/{ => raw}/sharpsl.c (99%) + rename drivers/mtd/nand/{ => raw}/sm_common.c (98%) + rename drivers/mtd/nand/{ => raw}/sm_common.h (100%) + rename drivers/mtd/nand/{ => raw}/socrates_nand.c (99%) + rename drivers/mtd/nand/{ => raw}/sunxi_nand.c (94%) + rename drivers/mtd/nand/{ => raw}/tango_nand.c (99%) + rename drivers/mtd/nand/{ => raw}/tmio_nand.c (100%) + rename drivers/mtd/nand/{ => raw}/txx9ndfmc.c (100%) + rename drivers/mtd/nand/{ => raw}/vf610_nfc.c (54%) + rename drivers/mtd/nand/{ => raw}/xway_nand.c (100%) + create mode 100644 include/linux/mtd/nand.h +$ git am -3 ../patches/0001-mtd-nand-fix-up-for-raw-Kconfig-move.patch +Applying: mtd: nand: fix up for raw Kconfig move +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/mtd/nand/raw/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master ab9af30c4075] Merge remote-tracking branch 'nand/nand/next' + Date: Fri Apr 6 12:25:24 2018 +1000 +Merging spi-nor/spi-nor/next (e8de85d5a107 dt-bindings: fsl-quadspi: Add the example of two SPI NOR) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/fsl-quadspi.txt | 24 ++++++++++++++++++++++ + drivers/mtd/spi-nor/fsl-quadspi.c | 19 ++++++++++++++++- + 2 files changed, 42 insertions(+), 1 deletion(-) +Merging crypto/master (f444ec106407 crypto: ccree - remove unused enums) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (694f54f680f7 Merge branch 'drm-misc-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge drm/drm-next +Already up to date. +Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) +$ git merge drm-panel/drm/panel/for-next +Already up to date. +Merging drm-intel/for-linux-next (38057aa1639b drm/i915/execlists: Clear user-active flag on preemption completion) +$ git merge drm-intel/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 + + drivers/gpu/drm/i915/gvt/display.c | 10 +++++++ + drivers/gpu/drm/i915/gvt/dmabuf.c | 1 + + drivers/gpu/drm/i915/gvt/fb_decoder.c | 27 ++++++------------ + drivers/gpu/drm/i915/gvt/gtt.c | 52 ++++++++++++++++++++++++++++++----- + drivers/gpu/drm/i915/gvt/gtt.h | 2 +- + drivers/gpu/drm/i915/gvt/handlers.c | 1 + + drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +- + drivers/gpu/drm/i915/intel_lrc.c | 9 ++++++ + 9 files changed, 78 insertions(+), 27 deletions(-) +Merging drm-tegra/drm/tegra/for-next (27e92f1f1600 drm/tegra: prime: Implement ->{begin,end}_cpu_access()) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (41613a1a7df2 drm/omap: fix crash if there's no video PLL) +$ git merge drm-misc/for-linux-next +Auto-merging sound/pci/hda/hda_intel.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/omapdrm/dss/dpi.c | 15 ++++++++------- + sound/pci/hda/hda_intel.c | 4 +--- + 2 files changed, 9 insertions(+), 10 deletions(-) +Merging drm-msm/msm-next (288e5c8898c4 drm/msm: fix building without debugfs) +$ git merge drm-msm/msm-next +Already up to date. +Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (6e810eb508f4 drm: mali-dp: Add YUV->RGB conversion support for video layers) +$ git merge mali-dp/for-upstream/mali-dp +Already up to date. +Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next) +$ git merge sunxi-drm/sunxi-drm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (28e228073b07 drm/imx: Remove last traces of struct imx_drm_crtc) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/imx-drm.h | 1 - + drivers/gpu/drm/imx/ipuv3-crtc.c | 1 - + 2 files changed, 2 deletions(-) +Merging etnaviv/etnaviv/next (4ed75c3e5255 drm/etnaviv: bump HW job limit to 4) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging kconfig/for-next (bebc6082da0a Linux 4.14) +$ git merge kconfig/for-next +Already up to date. +Merging regmap/for-next (2889312616ae Merge remote-tracking branches 'regmap/topic/debugfs' and 'regmap/topic/mmio-clk' into regmap-next) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (a820ccbe21e8 ALSA: pcm: Fix UAF at PCM release via PCM timer access) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (445bb423f6a3 Merge remote-tracking branch 'asoc/topic/zx_aud96p22' into asoc-next) +$ git merge sound-asoc/for-next +Already up to date. +Merging modules/modules-next (3f553b308bb0 module: propagate error in modules_open()) +$ git merge modules/modules-next +Already up to date. +Merging input/next (04bb1719c4de Input: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad) +$ git merge input/next +Already up to date. +Merging block/for-next (667eea5d591b Merge branch 'for-4.17/block' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. +Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) +$ git merge lightnvm/for-next +Already up to date. +Merging device-mapper/for-next (5bd5e8d891c1 dm: remove fmode_t argument from .prepare_ioctl hook) +$ git merge device-mapper/for-next +Auto-merging include/linux/dm-bufio.h +Auto-merging include/linux/device-mapper.h +Auto-merging drivers/md/dm.c +Auto-merging drivers/md/dm-table.c +Merge made by the 'recursive' strategy. + Documentation/device-mapper/verity.txt | 11 + + drivers/md/dm-bufio.c | 279 +++++++++++--------------- + drivers/md/dm-cache-target.c | 3 +- + drivers/md/dm-crypt.c | 69 ++++++- + drivers/md/dm-era-target.c | 3 +- + drivers/md/dm-flakey.c | 3 +- + drivers/md/dm-integrity.c | 5 +- + drivers/md/dm-ioctl.c | 2 +- + drivers/md/dm-linear.c | 4 +- + drivers/md/dm-log-writes.c | 17 +- + drivers/md/dm-mpath.c | 8 +- + drivers/md/dm-raid.c | 33 ++- + drivers/md/dm-snap-persistent.c | 2 +- + drivers/md/dm-stripe.c | 12 +- + drivers/md/dm-switch.c | 7 +- + drivers/md/dm-table.c | 31 +++ + drivers/md/dm-target.c | 2 - + drivers/md/dm-thin.c | 3 +- + drivers/md/dm-unstripe.c | 37 ++-- + drivers/md/dm-verity-target.c | 71 ++++++- + drivers/md/dm-verity.h | 3 +- + drivers/md/dm-zoned-target.c | 3 +- + drivers/md/dm.c | 145 +++++++------ + drivers/md/persistent-data/dm-block-manager.c | 2 +- + include/linux/device-mapper.h | 12 +- + {drivers/md => include/linux}/dm-bufio.h | 4 +- + include/uapi/linux/dm-ioctl.h | 4 +- + 27 files changed, 465 insertions(+), 310 deletions(-) + rename {drivers/md => include/linux}/dm-bufio.h (98%) +$ git am -3 ../patches/0001-dm-merge-fix-for-queue_flag_set_unlocked-to-blk_queu.patch +Applying: dm: merge fix for queue_flag_set_unlocked to blk_queue_flag_set API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/md/dm-table.c +$ git add -A . +$ git commit -v -a --amend +[master 2797d6f02d7c] Merge remote-tracking branch 'device-mapper/for-next' + Date: Fri Apr 6 12:32:10 2018 +1000 +Merging mmc/next (fc167daff581 mmc: tmio: Fix error handling when issuing CMD23) +$ git merge mmc/next +Auto-merging drivers/mmc/core/block.c +Merge made by the 'recursive' strategy. + drivers/mmc/core/block.c | 1 + + drivers/mmc/host/jz4740_mmc.c | 2 +- + drivers/mmc/host/tmio_mmc_core.c | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) +Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_main.c +Auto-merging include/linux/timekeeping.h +Merge made by the 'recursive' strategy. + drivers/misc/kgdbts.c | 8 +++- + include/linux/timekeeping.h | 1 + + kernel/debug/kdb/kdb_bp.c | 4 +- + kernel/debug/kdb/kdb_main.c | 89 +++++++++++++++++--------------------- + kernel/debug/kdb/kdb_support.c | 4 +- + kernel/time/timekeeping_internal.h | 2 - + 6 files changed, 51 insertions(+), 57 deletions(-) +Merging md/for-next (3de59bb9d551 md/raid1: fix NULL pointer dereference) +$ git merge md/for-next +Already up to date. +Merging mfd/for-mfd-next (b45bf45f1b82 mfd: arizona: Update reset pin to use GPIOD) +$ git merge mfd/for-mfd-next +Removing include/linux/mfd/syscon/exynos5-pmu.h +Removing include/linux/mfd/syscon/exynos4-pmu.h +Removing drivers/mfd/cros_ec_acpi_gpe.c +Merge made by the 'recursive' strategy. + drivers/mfd/Makefile | 1 - + drivers/mfd/ab8500-debugfs.c | 3 +- + drivers/mfd/abx500-core.c | 25 ++++---- + drivers/mfd/arizona-core.c | 53 ++++++++++------ + drivers/mfd/axp20x.c | 13 +++- + drivers/mfd/cros_ec.c | 15 +---- + drivers/mfd/cros_ec_acpi_gpe.c | 103 ------------------------------- + drivers/mfd/htc-i2cpld.c | 4 +- + drivers/mfd/janz-cmodio.c | 4 +- + drivers/mfd/jz4740-adc.c | 4 +- + drivers/mfd/max8997.c | 4 +- + drivers/mfd/omap-usb-tll.c | 60 ++++++++---------- + drivers/mfd/pcf50633-core.c | 7 ++- + drivers/mfd/rave-sp.c | 107 +++++++++++++++++++++++++++++++-- + drivers/mfd/rc5t583.c | 6 +- + drivers/mfd/si476x-i2c.c | 6 +- + drivers/mfd/sm501.c | 32 ++++------ + drivers/mfd/smsc-ece1099.c | 7 +-- + drivers/mfd/sprd-sc27xx-spi.c | 3 + + drivers/mfd/syscon.c | 2 + + drivers/mfd/ti_am335x_tscadc.c | 5 +- + drivers/mfd/tps65090.c | 4 +- + drivers/mfd/tps6586x.c | 4 +- + drivers/mfd/tps65910.c | 18 +++--- + drivers/mfd/tps68470.c | 10 +-- + drivers/mfd/tps80031.c | 4 +- + drivers/mfd/twl6030-irq.c | 4 +- + drivers/mfd/viperboard.c | 4 +- + include/linux/mfd/arizona/pdata.h | 3 +- + include/linux/mfd/cros_ec.h | 18 ------ + include/linux/mfd/syscon/exynos4-pmu.h | 21 ------- + include/linux/mfd/syscon/exynos5-pmu.h | 19 ------ + include/linux/mfd/tps65218.h | 4 +- + include/linux/mfd/tps68470.h | 17 +----- + 34 files changed, 243 insertions(+), 351 deletions(-) + delete mode 100644 drivers/mfd/cros_ec_acpi_gpe.c + delete mode 100644 include/linux/mfd/syscon/exynos4-pmu.h + delete mode 100644 include/linux/mfd/syscon/exynos5-pmu.h +Merging backlight/for-backlight-next (ea388d6cffd4 pwm-backlight: Add support for PWM delays proprieties.) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + .../bindings/leds/backlight/pwm-backlight.txt | 6 ++ + .../leds/backlight/zii,rave-sp-backlight.txt | 23 ++++++ + drivers/video/backlight/Kconfig | 6 ++ + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/pwm_bl.c | 28 ++++++-- + drivers/video/backlight/rave-sp-backlight.c | 82 ++++++++++++++++++++++ + include/linux/mfd/rave-sp.h | 1 + + include/linux/pwm_backlight.h | 2 + + 8 files changed, 145 insertions(+), 4 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/backlight/zii,rave-sp-backlight.txt + create mode 100644 drivers/video/backlight/rave-sp-backlight.c +Merging battery/for-next (fd73a3e61888 power: reset: at91-reset: Switch from the pr_*() to the dev_*() logging functions) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (36fd679f45a2 Merge remote-tracking branches 'regulator/topic/88pg86x', 'regulator/topic/dt', 'regulator/topic/formatting' and 'regulator/topic/gpio' into regulator-next) +$ git merge regulator/for-next +Already up to date. +Merging security/next-testing (3f3122c1b84c Fixup after manual conflict merge, for testing only.) +$ git merge security/next-testing +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging kernel/signal.c +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/fs.h +Auto-merging fs/fuse/inode.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/ima_policy | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 8 +- + drivers/char/tpm/tpm-interface.c | 158 +++++++-- + drivers/char/tpm/tpm.h | 32 +- + drivers/char/tpm/tpm2-cmd.c | 62 ++-- + drivers/char/tpm/tpm_crb.c | 113 ++++-- + drivers/char/tpm/tpm_tis_core.c | 4 +- + drivers/usb/core/devio.c | 10 +- + fs/exec.c | 6 +- + fs/fuse/inode.c | 3 + + include/linux/fs.h | 2 + + include/linux/lsm_hooks.h | 439 ++++++++++++------------ + include/linux/sched/signal.h | 2 +- + include/linux/security.h | 5 +- + include/linux/tpm.h | 2 +- + kernel/signal.c | 6 +- + scripts/gcc-plugins/randomize_layout_plugin.c | 4 +- + security/apparmor/lsm.c | 17 +- + security/integrity/evm/evm.h | 2 - + security/integrity/evm/evm_crypto.c | 3 + + security/integrity/evm/evm_main.c | 12 +- + security/integrity/iint.c | 2 + + security/integrity/ima/Kconfig | 1 + + security/integrity/ima/ima.h | 9 +- + security/integrity/ima/ima_api.c | 25 +- + security/integrity/ima/ima_appraise.c | 65 +++- + security/integrity/ima/ima_crypto.c | 2 + + security/integrity/ima/ima_main.c | 69 +++- + security/integrity/ima/ima_policy.c | 32 +- + security/integrity/ima/ima_template_lib.c | 11 +- + security/integrity/integrity.h | 11 +- + security/security.c | 33 +- + security/selinux/hooks.c | 13 +- + security/smack/smack_lsm.c | 32 +- + 34 files changed, 744 insertions(+), 453 deletions(-) +Merging apparmor/apparmor-next (588558eb6d0e apparmor: fix memory leak on buffer on error exit path) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/task.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/include/cred.h +Auto-merging security/apparmor/apparmorfs.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +- + security/apparmor/.gitignore | 1 + + security/apparmor/Makefile | 45 ++- + security/apparmor/apparmorfs.c | 203 ++++++---- + security/apparmor/capability.c | 2 +- + security/apparmor/domain.c | 355 +++++++++++++----- + security/apparmor/file.c | 32 +- + security/apparmor/include/apparmor.h | 3 +- + security/apparmor/include/audit.h | 19 +- + security/apparmor/include/{context.h => cred.h} | 63 +--- + security/apparmor/include/label.h | 28 ++ + security/apparmor/include/match.h | 28 ++ + security/apparmor/include/net.h | 106 ++++++ + security/apparmor/include/perms.h | 5 +- + security/apparmor/include/policy.h | 23 +- + security/apparmor/include/policy_unpack.h | 2 +- + security/apparmor/include/sig_names.h | 5 +- + security/apparmor/include/task.h | 94 +++++ + security/apparmor/ipc.c | 52 +-- + security/apparmor/label.c | 42 ++- + security/apparmor/lib.c | 5 +- + security/apparmor/lsm.c | 467 ++++++++++++++++++++++-- + security/apparmor/match.c | 423 +++++++++++++++++---- + security/apparmor/mount.c | 2 +- + security/apparmor/net.c | 187 ++++++++++ + security/apparmor/nulldfa.in | 108 +++++- + security/apparmor/policy.c | 11 +- + security/apparmor/policy_ns.c | 2 +- + security/apparmor/policy_unpack.c | 70 +++- + security/apparmor/procattr.c | 2 +- + security/apparmor/resource.c | 2 +- + security/apparmor/stacksplitdfa.in | 114 ++++++ + security/apparmor/{context.c => task.c} | 139 +++---- + 33 files changed, 2119 insertions(+), 525 deletions(-) + rename security/apparmor/include/{context.h => cred.h} (70%) + create mode 100644 security/apparmor/include/net.h + create mode 100644 security/apparmor/include/task.h + create mode 100644 security/apparmor/net.c + create mode 100644 security/apparmor/stacksplitdfa.in + rename security/apparmor/{context.c => task.c} (53%) +Merging integrity/next-integrity (ab60368ab6a4 ima: Fallback to the builtin hash algorithm) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting) +$ git merge keys/keys-next +Already up to date. +Merging selinux/next (6b6bc6205d98 selinux: wrap AVC state) +$ git merge selinux/next +Resolved 'include/linux/lsm_hooks.h' using previous resolution. +Resolved 'net/sctp/socket.c' using previous resolution. +Resolved 'security/selinux/hooks.c' using previous resolution. +Auto-merging security/selinux/hooks.c +CONFLICT (content): Merge conflict in security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging net/sctp/socket.c +CONFLICT (content): Merge conflict in net/sctp/socket.c +Auto-merging net/sctp/sm_statefuns.c +Auto-merging net/sctp/sm_make_chunk.c +Auto-merging net/sctp/protocol.c +Auto-merging net/sctp/output.c +Auto-merging net/sctp/ipv6.c +Auto-merging net/sctp/chunk.c +Auto-merging include/uapi/linux/sctp.h +Auto-merging include/net/sctp/structs.h +Auto-merging include/net/sctp/sctp.h +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +CONFLICT (content): Merge conflict in include/linux/lsm_hooks.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 37228d465373] Merge remote-tracking branch 'selinux/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/security/LSM-sctp.rst | 175 +++++ + Documentation/security/SELinux-sctp.rst | 158 +++++ + include/linux/lsm_hooks.h | 36 + + include/linux/security.h | 25 + + include/net/sctp/sctp.h | 4 +- + include/net/sctp/structs.h | 12 + + include/uapi/linux/sctp.h | 1 + + net/netlabel/netlabel_unlabeled.c | 10 + + net/sctp/chunk.c | 10 +- + net/sctp/ipv6.c | 45 +- + net/sctp/output.c | 34 +- + net/sctp/protocol.c | 43 ++ + net/sctp/sm_make_chunk.c | 12 + + net/sctp/sm_statefuns.c | 18 + + net/sctp/socket.c | 70 +- + security/security.c | 22 + + security/selinux/avc.c | 282 ++++---- + security/selinux/hooks.c | 922 +++++++++++++++++++------- + security/selinux/ibpkey.c | 3 +- + security/selinux/include/avc.h | 38 +- + security/selinux/include/avc_ss.h | 9 +- + security/selinux/include/classmap.h | 2 +- + security/selinux/include/conditional.h | 11 +- + security/selinux/include/netlabel.h | 22 +- + security/selinux/include/objsec.h | 6 +- + security/selinux/include/security.h | 231 +++++-- + security/selinux/netif.c | 2 +- + security/selinux/netlabel.c | 148 ++++- + security/selinux/netnode.c | 4 +- + security/selinux/netport.c | 2 +- + security/selinux/selinuxfs.c | 493 ++++++++------ + security/selinux/ss/avtab.c | 9 +- + security/selinux/ss/avtab.h | 3 - + security/selinux/ss/ebitmap.c | 7 +- + security/selinux/ss/ebitmap.h | 3 - + security/selinux/ss/hashtab.c | 8 +- + security/selinux/ss/hashtab.h | 4 - + security/selinux/ss/mls.c | 72 +- + security/selinux/ss/mls.h | 38 +- + security/selinux/ss/services.c | 1100 ++++++++++++++++++------------- + security/selinux/ss/services.h | 24 +- + security/selinux/ss/status.c | 47 +- + security/selinux/xfrm.c | 23 +- + 43 files changed, 2936 insertions(+), 1252 deletions(-) + create mode 100644 Documentation/security/LSM-sctp.rst + create mode 100644 Documentation/security/SELinux-sctp.rst +Merging tpmdd/next (2be8ffed093b tpm: fix intermittent failure with self tests) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (1991a55dc87e Merge branch 'v4.17-rc1') +$ git merge watchdog/master +Auto-merging drivers/watchdog/Makefile +Auto-merging drivers/watchdog/Kconfig +Auto-merging Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/watchdog/fsl-imx-wdt.txt | 2 + + .../devicetree/bindings/watchdog/meson-wdt.txt | 4 + + .../devicetree/bindings/watchdog/mtk-wdt.txt | 4 + + .../bindings/watchdog/nuvoton,npcm-wdt.txt | 28 ++ + .../devicetree/bindings/watchdog/sirfsoc_wdt.txt | 4 + + .../devicetree/bindings/watchdog/sunxi-wdt.txt | 4 + + drivers/watchdog/Kconfig | 12 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/ar7_wdt.c | 14 +- + drivers/watchdog/asm9260_wdt.c | 8 +- + drivers/watchdog/aspeed_wdt.c | 13 +- + drivers/watchdog/at91rm9200_wdt.c | 5 +- + drivers/watchdog/at91sam9_wdt.c | 5 +- + drivers/watchdog/at91sam9_wdt.h | 5 +- + drivers/watchdog/bcm2835_wdt.c | 5 +- + drivers/watchdog/bcm47xx_wdt.c | 5 +- + drivers/watchdog/bcm63xx_wdt.c | 5 +- + drivers/watchdog/bcm7038_wdt.c | 12 +- + drivers/watchdog/bcm_kona_wdt.c | 9 +- + drivers/watchdog/cadence_wdt.c | 5 +- + drivers/watchdog/coh901327_wdt.c | 18 +- + drivers/watchdog/da9052_wdt.c | 6 +- + drivers/watchdog/da9055_wdt.c | 6 +- + drivers/watchdog/da9062_wdt.c | 10 +- + drivers/watchdog/da9063_wdt.c | 5 +- + drivers/watchdog/davinci_wdt.c | 15 +- + drivers/watchdog/digicolor_wdt.c | 5 +- + drivers/watchdog/dw_wdt.c | 32 ++- + drivers/watchdog/ebc-c384_wdt.c | 1 + + drivers/watchdog/f71808e_wdt.c | 2 +- + drivers/watchdog/gpio_wdt.c | 4 +- + drivers/watchdog/hpwdt.c | 312 ++++++++------------- + drivers/watchdog/imx2_wdt.c | 8 +- + drivers/watchdog/lpc18xx_wdt.c | 2 +- + drivers/watchdog/mei_wdt.c | 12 +- + drivers/watchdog/mena21_wdt.c | 4 +- + drivers/watchdog/meson_gxbb_wdt.c | 50 +--- + drivers/watchdog/meson_wdt.c | 2 +- + drivers/watchdog/mtk_wdt.c | 13 +- + drivers/watchdog/mtx-1_wdt.c | 11 +- + drivers/watchdog/npcm_wdt.c | 254 +++++++++++++++++ + drivers/watchdog/of_xilinx_wdt.c | 8 +- + drivers/watchdog/omap_wdt.c | 4 +- + drivers/watchdog/pnx4008_wdt.c | 2 +- + drivers/watchdog/renesas_wdt.c | 87 +++++- + drivers/watchdog/sama5d4_wdt.c | 6 +- + drivers/watchdog/sirfsoc_wdt.c | 2 +- + drivers/watchdog/sprd_wdt.c | 4 +- + drivers/watchdog/st_lpc_wdt.c | 6 +- + drivers/watchdog/sunxi_wdt.c | 2 +- + drivers/watchdog/tangox_wdt.c | 6 +- + drivers/watchdog/tegra_wdt.c | 10 +- + drivers/watchdog/uniphier_wdt.c | 15 +- + drivers/watchdog/wm831x_wdt.c | 5 +- + drivers/watchdog/wm8350_wdt.c | 5 +- + 55 files changed, 628 insertions(+), 456 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/nuvoton,npcm-wdt.txt + create mode 100644 drivers/watchdog/npcm_wdt.c +Merging iommu/next (d4f96fd5c249 Merge branches 'x86/amd', 'x86/vt-d', 'arm/rockchip', 'arm/omap', 'arm/mediatek', 'arm/exynos', 'arm/renesas', 'arm/smmu' and 'core' into next) +$ git merge iommu/next +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging drivers/iommu/amd_iommu.c +Auto-merging drivers/acpi/arm64/iort.c +Merge made by the 'recursive' strategy. + .../bindings/iommu/renesas,ipmmu-vmsa.txt | 5 +- + .../devicetree/bindings/iommu/rockchip,iommu.txt | 7 + + drivers/acpi/arm64/iort.c | 111 +++- + drivers/iommu/amd_iommu.c | 320 ++++++----- + drivers/iommu/amd_iommu_init.c | 2 +- + drivers/iommu/amd_iommu_types.h | 6 +- + drivers/iommu/arm-smmu-v3.c | 542 +++++++++---------- + drivers/iommu/dma-iommu.c | 8 +- + drivers/iommu/dmar.c | 2 +- + drivers/iommu/exynos-iommu.c | 13 +- + drivers/iommu/intel-iommu.c | 6 +- + drivers/iommu/intel-svm.c | 17 +- + drivers/iommu/io-pgtable-arm-v7s.c | 21 +- + drivers/iommu/io-pgtable-arm.c | 91 ++-- + drivers/iommu/io-pgtable.h | 4 +- + drivers/iommu/iommu.c | 6 +- + drivers/iommu/mtk_iommu.c | 15 +- + drivers/iommu/mtk_iommu.h | 1 + + drivers/iommu/mtk_iommu_v1.c | 54 +- + drivers/iommu/omap-iommu.c | 2 +- + drivers/iommu/rockchip-iommu.c | 592 +++++++++++---------- + drivers/irqchip/irq-gic-v3-its.c | 3 +- + include/linux/acpi_iort.h | 7 +- + include/linux/intel-iommu.h | 12 +- + include/linux/iommu.h | 14 +- + 25 files changed, 1008 insertions(+), 853 deletions(-) +Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) +$ git merge dwmw2-iommu/master +Already up to date. +Merging vfio/next (da9147140fe3 MAINTAINERS: vfio/platform: Update sub-maintainer) +$ git merge vfio/next +Auto-merging drivers/vfio/pci/vfio_pci.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/vfio/pci/vfio_pci.c | 35 +++++++ + drivers/vfio/pci/vfio_pci_private.h | 19 ++++ + drivers/vfio/pci/vfio_pci_rdwr.c | 184 ++++++++++++++++++++++++++++++++---- + drivers/vfio/vfio_iommu_type1.c | 151 +++++++++++++++++++++++++---- + include/uapi/linux/vfio.h | 27 ++++++ + samples/vfio-mdev/mtty.c | 2 +- + 7 files changed, 377 insertions(+), 43 deletions(-) +Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) +$ git merge trivial/for-next +Already up to date. +Merging audit/next (ea841bafda3f audit: add refused symlink to audit_names) +$ git merge audit/next +Auto-merging kernel/audit.c +Auto-merging fs/namei.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 14 +-- + MAINTAINERS | 1 - + fs/namei.c | 5 +- + include/linux/audit.h | 6 +- + kernel/audit.c | 108 +++++++++++++++++------- + kernel/audit.h | 3 +- + kernel/audit_tree.c | 8 +- + kernel/auditfilter.c | 5 +- + kernel/auditsc.c | 22 +++-- + 9 files changed, 106 insertions(+), 66 deletions(-) +Merging devicetree/for-next (827473268ee4 of: unittest: fix an error code in of_unittest_apply_overlay()) +$ git merge devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (41c0e939d70d mailbox: Add support for Hi3660 mailbox) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + .../bindings/mailbox/hisilicon,hi3660-mailbox.txt | 51 ++++ + drivers/mailbox/Kconfig | 10 +- + drivers/mailbox/Makefile | 2 + + drivers/mailbox/bcm-flexrm-mailbox.c | 3 +- + drivers/mailbox/hi3660-mailbox.c | 312 +++++++++++++++++++++ + 5 files changed, 375 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mailbox/hisilicon,hi3660-mailbox.txt + create mode 100644 drivers/mailbox/hi3660-mailbox.c +Merging spi/for-next (0930437e8f9d Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/sprd' and 'spi/topic/tegra20-slink' into spi-next) +$ git merge spi/for-next +Already up to date. +Merging tip/auto-latest (f78e5d05f9f1 Merge branch 'efi/urgent') +$ git merge tip/auto-latest +Resolved 'drivers/irqchip/Makefile' using previous resolution. +Auto-merging drivers/irqchip/Makefile +CONFLICT (content): Merge conflict in drivers/irqchip/Makefile +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master cf984fab3e54] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + .../bindings/timer/nuvoton,npcm7xx-timer.txt | 21 ++ + .../devicetree/bindings/timer/nxp,tpm-timer.txt | 2 +- + Documentation/x86/x86_64/mm.txt | 2 +- + arch/x86/include/asm/tlbflush.h | 7 +- + arch/x86/kernel/cpu/cpuid-deps.c | 2 +- + drivers/clocksource/Kconfig | 8 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/timer-imx-tpm.c | 43 ++++- + drivers/clocksource/timer-npcm7xx.c | 215 +++++++++++++++++++++ + kernel/sched/cpufreq_schedutil.c | 3 +- + tools/arch/x86/include/asm/cpufeatures.h | 2 + + tools/include/tools/config.h | 34 ++++ + tools/perf/Documentation/perf-report.txt | 1 + + tools/perf/Documentation/perf-trace.txt | 3 + + tools/perf/Documentation/perf-version.txt | 24 +++ + tools/perf/Makefile.config | 8 +- + tools/perf/builtin-trace.c | 11 +- + tools/perf/builtin-version.c | 82 +++++++- + tools/perf/perf.c | 6 + + tools/perf/perf.h | 1 + + tools/perf/ui/browser.c | 8 +- + tools/perf/ui/browser.h | 2 + + tools/perf/ui/browsers/annotate.c | 31 ++- + tools/perf/ui/browsers/hists.c | 125 +++--------- + tools/perf/util/annotate.c | 48 ++++- + tools/perf/util/annotate.h | 12 ++ + tools/perf/util/dwarf-aux.c | 2 +- + tools/perf/util/hist.c | 81 ++++++++ + tools/perf/util/hist.h | 7 + + tools/perf/util/map.h | 4 + + tools/perf/util/sort.c | 41 ++++ + tools/perf/util/sort.h | 1 + + 32 files changed, 706 insertions(+), 132 deletions(-) + create mode 100644 Documentation/devicetree/bindings/timer/nuvoton,npcm7xx-timer.txt + create mode 100644 drivers/clocksource/timer-npcm7xx.c + create mode 100644 tools/include/tools/config.h + create mode 100644 tools/perf/Documentation/perf-version.txt +$ git am -3 ../patches/0001-perf-core-merge-fix-for-drivers-bus-Split-Arm-CCI-dr.patch +Applying: perf/core: merge fix for "drivers/bus: Split Arm CCI driver" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/perf/arm-cci.c +$ git add -A . +$ git commit -v -a --amend +[master b3aa2b817fe7] Merge remote-tracking branch 'tip/auto-latest' + Date: Fri Apr 6 13:17:21 2018 +1000 +$ git am -3 ../patches/0001-perf-core-another-merge-fix-for-drivers-bus-Split-Ar.patch +Applying: perf/core: another merge fix for "drivers/bus: Split Arm CCI driver" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/perf/arm-cci.c +$ git add -A . +$ git commit -v -a --amend +[master 31965d33818b] Merge remote-tracking branch 'tip/auto-latest' + Date: Fri Apr 6 13:17:21 2018 +1000 +Merging clockevents/clockevents/next (0136c741ff40 clocksource/drivers/imx-tpm: Add different counter width support) +$ git merge clockevents/clockevents/next +Already up to date. +Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp) +$ git merge edac/linux_next +Already up to date. +Merging edac-amd/for-next (6fd052665274 EDAC, sb_edac: Remove variable length array usage) +$ git merge edac-amd/for-next +Already up to date. +Merging irqchip/irq/irqchip-next (aa08192a254d irqchip/gic: Take lock when updating irq type) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (80765597bc58 tracing: Rewrite filter logic to be simpler and faster) +$ git merge ftrace/for-next +Resolved 'Documentation/trace/events.rst' using previous resolution. +Auto-merging kernel/trace/trace.c +Auto-merging include/linux/trace_events.h +CONFLICT (modify/delete): Documentation/trace/ftrace.txt deleted in HEAD and modified in ftrace/for-next. Version ftrace/for-next of Documentation/trace/ftrace.txt left in tree. +Auto-merging Documentation/trace/events.rst +CONFLICT (content): Merge conflict in Documentation/trace/events.rst +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/trace/ftrace.txt +Documentation/trace/ftrace.txt: needs merge +rm 'Documentation/trace/ftrace.txt' +$ git commit -v -a +[master 9f95b7ce1a24] Merge remote-tracking branch 'ftrace/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/trace/events.rst | 1548 +------ + Documentation/trace/histogram.txt | 1995 ++++++++ + include/linux/ring_buffer.h | 17 +- + include/linux/trace_events.h | 14 +- + kernel/trace/Kconfig | 5 +- + kernel/trace/ring_buffer.c | 172 +- + kernel/trace/trace.c | 97 +- + kernel/trace/trace.h | 33 +- + kernel/trace/trace_events_filter.c | 2487 +++++----- + kernel/trace/trace_events_hist.c | 4770 ++++++++++++++++++-- + kernel/trace/trace_events_trigger.c | 53 +- + kernel/trace/tracing_map.c | 232 +- + kernel/trace/tracing_map.h | 18 +- + tools/testing/selftests/ftrace/test.d/functions | 7 + + .../inter-event/trigger-extended-error-support.tc | 39 + + .../inter-event/trigger-field-variable-support.tc | 54 + + .../trigger-inter-event-combined-hist.tc | 58 + + .../inter-event/trigger-onmatch-action-hist.tc | 50 + + .../trigger-onmatch-onmax-action-hist.tc | 50 + + .../inter-event/trigger-onmax-action-hist.tc | 48 + + .../trigger-synthetic-event-createremove.tc | 54 + + 21 files changed, 8324 insertions(+), 3477 deletions(-) + create mode 100644 Documentation/trace/histogram.txt + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-extended-error-support.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc +$ git am -3 ../patches/0001-trace-doc-merge-fix-for-rst-conversion-of-ftrace.txt.patch +Applying: trace doc: merge fix for rst conversion of ftrace.txt +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/trace/ftrace.rst +$ git add -A . +$ git commit -v -a --amend +[master e6ad7041bed7] Merge remote-tracking branch 'ftrace/for-next' + Date: Fri Apr 6 13:19:31 2018 +1000 +Merging rcu/rcu/next (338c46403f16 Merge branches 'fixes.2018.02.23a', 'srcu.2018.02.20a' and 'torture.2018.02.20a' into HEAD) +$ git merge rcu/rcu/next +Already up to date. +Merging kvm/linux-next (27aa8962817a Merge tag 'kvm-ppc-next-4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc) +$ git merge kvm/linux-next +Resolved 'arch/arm64/kernel/cpufeature.c' using previous resolution. +Resolved 'arch/x86/kernel/kvm.c' using previous resolution. +Resolved 'arch/x86/kvm/vmx.c' using previous resolution. +Resolved 'drivers/video/Kconfig' using previous resolution. +Resolved 'drivers/video/console/Kconfig' using previous resolution. +Removing virt/kvm/arm/hyp/vgic-v2-sr.c +Auto-merging tools/include/uapi/linux/kvm.h +Auto-merging include/linux/hyperv.h +Auto-merging drivers/video/console/Kconfig +CONFLICT (content): Merge conflict in drivers/video/console/Kconfig +Auto-merging drivers/video/Kconfig +CONFLICT (content): Merge conflict in drivers/video/Kconfig +Auto-merging drivers/hv/hyperv_vmbus.h +Auto-merging drivers/hv/hv.c +Auto-merging arch/x86/kvm/vmx.c +CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Auto-merging arch/x86/kernel/kvm.c +CONFLICT (content): Merge conflict in arch/x86/kernel/kvm.c +Auto-merging arch/x86/kernel/cpu/mshyperv.c +Auto-merging arch/x86/include/asm/mshyperv.h +Auto-merging arch/x86/include/asm/hyperv-tlfs.h +Auto-merging arch/s390/include/asm/mmu_context.h +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kvm/book3s_64_mmu_radix.c +Auto-merging arch/powerpc/include/asm/kvm_ppc.h +Auto-merging arch/powerpc/include/asm/kvm_host.h +Auto-merging arch/arm64/kernel/cpufeature.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/kernel/cpu_errata.c +Auto-merging arch/arm64/kernel/Makefile +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/include/asm/cpucaps.h +Auto-merging arch/arm64/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2cead9a04994] Merge remote-tracking branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 3 + + Documentation/arm64/memory.txt | 9 +- + Documentation/virtual/kvm/00-INDEX | 10 +- + Documentation/virtual/kvm/api.txt | 135 ++- + Documentation/virtual/kvm/cpuid.txt | 15 +- + MAINTAINERS | 2 +- + arch/arm/include/asm/kvm_asm.h | 5 +- + arch/arm/include/asm/kvm_emulate.h | 21 +- + arch/arm/include/asm/kvm_host.h | 6 +- + arch/arm/include/asm/kvm_hyp.h | 4 + + arch/arm/include/asm/kvm_mmu.h | 16 +- + arch/arm/include/uapi/asm/kvm.h | 9 + + arch/arm/kvm/coproc.c | 61 ++ + arch/arm/kvm/emulate.c | 4 +- + arch/arm/kvm/hyp/Makefile | 1 - + arch/arm/kvm/hyp/switch.c | 16 +- + arch/arm64/Kconfig | 16 + + arch/arm64/include/asm/alternative.h | 41 +- + arch/arm64/include/asm/cpucaps.h | 2 +- + arch/arm64/include/asm/insn.h | 16 + + arch/arm64/include/asm/kvm_arm.h | 6 +- + arch/arm64/include/asm/kvm_asm.h | 19 +- + arch/arm64/include/asm/kvm_emulate.h | 78 +- + arch/arm64/include/asm/kvm_host.h | 53 +- + arch/arm64/include/asm/kvm_hyp.h | 29 +- + arch/arm64/include/asm/kvm_mmu.h | 165 +++- + arch/arm64/include/asm/mmu.h | 8 +- + arch/arm64/include/asm/sysreg.h | 6 + + arch/arm64/kernel/Makefile | 4 +- + arch/arm64/kernel/alternative.c | 43 +- + arch/arm64/kernel/asm-offsets.c | 1 + + arch/arm64/kernel/bpi.S | 67 +- + arch/arm64/kernel/cpu_errata.c | 25 +- + arch/arm64/kernel/cpufeature.c | 19 - + arch/arm64/kernel/head.S | 7 + + arch/arm64/kernel/insn.c | 190 +++- + arch/arm64/kvm/Kconfig | 3 + + arch/arm64/kvm/Makefile | 2 +- + arch/arm64/kvm/debug.c | 29 +- + arch/arm64/kvm/hyp-init.S | 1 - + arch/arm64/kvm/hyp/Makefile | 2 +- + arch/arm64/kvm/hyp/debug-sr.c | 88 +- + arch/arm64/kvm/hyp/entry.S | 6 +- + arch/arm64/kvm/hyp/hyp-entry.S | 86 +- + arch/arm64/kvm/hyp/switch.c | 382 +++++--- + arch/arm64/kvm/hyp/sysreg-sr.c | 172 +++- + arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c | 78 ++ + arch/arm64/kvm/inject_fault.c | 24 +- + arch/arm64/kvm/regmap.c | 67 +- + arch/arm64/kvm/sys_regs.c | 199 +++- + arch/arm64/kvm/sys_regs.h | 4 +- + arch/arm64/kvm/sys_regs_generic_v8.c | 4 +- + arch/arm64/kvm/va_layout.c | 227 +++++ + arch/mips/include/asm/kvm_para.h | 5 + + arch/powerpc/include/asm/kvm_host.h | 1 - + arch/powerpc/include/asm/kvm_para.h | 5 + + arch/powerpc/include/asm/kvm_ppc.h | 1 - + arch/powerpc/kvm/book3s.c | 6 - + arch/powerpc/kvm/book3s.h | 1 - + arch/powerpc/kvm/book3s_64_mmu_hv.c | 9 - + arch/powerpc/kvm/book3s_64_mmu_radix.c | 333 ++++--- + arch/powerpc/kvm/book3s_64_vio_hv.c | 2 +- + arch/powerpc/kvm/book3s_hv.c | 1 - + arch/powerpc/kvm/book3s_pr.c | 10 - + arch/powerpc/kvm/e500_mmu_host.c | 2 +- + arch/powerpc/kvm/trace_pr.h | 15 - + arch/s390/include/asm/kvm_host.h | 28 +- + arch/s390/include/asm/kvm_para.h | 5 + + arch/s390/include/asm/mmu.h | 4 +- + arch/s390/include/asm/mmu_context.h | 2 +- + arch/s390/kvm/gaccess.c | 9 +- + arch/s390/kvm/intercept.c | 17 +- + arch/s390/kvm/interrupt.c | 26 +- + arch/s390/kvm/kvm-s390.c | 102 +- + arch/s390/kvm/kvm-s390.h | 2 - + arch/s390/kvm/priv.c | 4 +- + arch/s390/tools/gen_facilities.c | 20 + + arch/x86/hyperv/hv_init.c | 45 +- + .../{uapi/asm/hyperv.h => asm/hyperv-tlfs.h} | 299 +++++- + arch/x86/include/asm/kvm_host.h | 54 +- + arch/x86/include/asm/kvm_para.h | 6 + + arch/x86/include/asm/mshyperv.h | 94 +- + arch/x86/include/asm/msr-index.h | 14 + + arch/x86/include/asm/processor.h | 10 + + arch/x86/include/asm/svm.h | 3 +- + arch/x86/include/uapi/asm/kvm.h | 19 +- + arch/x86/include/uapi/asm/kvm_para.h | 9 +- + arch/x86/kernel/cpu/common.c | 3 +- + arch/x86/kernel/cpu/mshyperv.c | 22 +- + arch/x86/kernel/kvm.c | 18 + + arch/x86/kernel/process_64.c | 14 + + arch/x86/kvm/cpuid.c | 7 +- + arch/x86/kvm/emulate.c | 19 + + arch/x86/kvm/hyperv.c | 192 +++- + arch/x86/kvm/hyperv.h | 4 + + arch/x86/kvm/irq.c | 26 +- + arch/x86/kvm/kvm_cache_regs.h | 7 +- + arch/x86/kvm/lapic.c | 10 +- + arch/x86/kvm/lapic.h | 2 +- + arch/x86/kvm/paging_tmpl.h | 11 +- + arch/x86/kvm/pmu.c | 37 + + arch/x86/kvm/pmu.h | 6 + + arch/x86/kvm/pmu_amd.c | 142 ++- + arch/x86/kvm/svm.c | 303 ++++-- + arch/x86/kvm/vmx.c | 1036 ++++++++++++++------ + arch/x86/kvm/vmx_evmcs.h | 324 ++++++ + arch/x86/kvm/x86.c | 345 +++++-- + arch/x86/kvm/x86.h | 84 +- + drivers/hv/connection.c | 1 - + drivers/hv/hv.c | 1 - + drivers/hv/hyperv_vmbus.h | 1 + + drivers/hv/vmbus_drv.c | 1 - + include/asm-generic/kvm_para.h | 5 + + include/kvm/arm_vgic.h | 14 +- + include/linux/hyperv.h | 1 - + include/linux/kvm_para.h | 5 + + include/uapi/linux/kvm.h | 23 +- + tools/include/uapi/linux/kvm.h | 2 +- + tools/kvm/kvm_stat/kvm_stat | 11 +- + virt/kvm/arm/aarch32.c | 2 +- + virt/kvm/arm/arch_timer.c | 10 +- + virt/kvm/arm/arm.c | 48 +- + virt/kvm/arm/hyp/timer-sr.c | 44 +- + virt/kvm/arm/hyp/vgic-v2-sr.c | 159 --- + virt/kvm/arm/hyp/vgic-v3-sr.c | 247 +++-- + virt/kvm/arm/mmu.c | 176 +++- + virt/kvm/arm/pmu.c | 36 +- + virt/kvm/arm/vgic/vgic-init.c | 17 - + virt/kvm/arm/vgic/vgic-its.c | 15 +- + virt/kvm/arm/vgic/vgic-v2.c | 152 ++- + virt/kvm/arm/vgic/vgic-v3.c | 66 +- + virt/kvm/arm/vgic/vgic.c | 33 + + virt/kvm/arm/vgic/vgic.h | 3 + + virt/kvm/kvm_main.c | 36 +- + 134 files changed, 5432 insertions(+), 1938 deletions(-) + create mode 100644 arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c + create mode 100644 arch/arm64/kvm/va_layout.c + rename arch/x86/include/{uapi/asm/hyperv.h => asm/hyperv-tlfs.h} (64%) + create mode 100644 arch/x86/kvm/vmx_evmcs.h + delete mode 100644 virt/kvm/arm/hyp/vgic-v2-sr.c +Merging kvm-arm/next (dc6ed61d2f82 arm64: Add temporary ERRATA_MIDR_ALL_VERSIONS compatibility macro) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) +$ git merge kvm-mips/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (31c8b0d0694a KVM: PPC: Book3S HV: Use __gfn_to_pfn_memslot() in page fault handler) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (ccc40c53c07b KVM: s390: provide counters for all interrupt injects/delivery) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (c37a3c947758 xen/acpi: off by one in read_acpi_id()) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + arch/x86/xen/enlighten_pv.c | 8 ++++---- + drivers/acpi/processor_perflib.c | 11 +++++------ + drivers/xen/xen-acpi-processor.c | 30 +++++++++++++++++++++++++++--- + drivers/xen/xenbus/xenbus_dev_frontend.c | 16 ++++++++++++---- + drivers/xen/xenbus/xenbus_xs.c | 4 +++- + include/acpi/processor.h | 2 ++ + 6 files changed, 53 insertions(+), 18 deletions(-) +Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods) +$ git merge percpu/for-next +Already up to date. +Merging workqueues/for-next (1aa3798360db Merge branch 'for-4.17' into for-next) +$ git merge workqueues/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (7129707ec235 platform/x86: Fix dell driver init order) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/wmi.c +Auto-merging drivers/platform/x86/Kconfig +Merge made by the 'recursive' strategy. + drivers/platform/x86/Kconfig | 2 + + drivers/platform/x86/fujitsu-laptop.c | 180 +++++++-------- + drivers/platform/x86/gpd-pocket-fan.c | 4 +- + drivers/platform/x86/intel_turbo_max_3.c | 3 - + drivers/platform/x86/silead_dmi.c | 9 + + drivers/platform/x86/topstar-laptop.c | 363 ++++++++++++++++++++++++------- + drivers/platform/x86/wmi.c | 23 +- + 7 files changed, 399 insertions(+), 185 deletions(-) +Merging chrome-platform/for-next (3b7cedb42420 platform/chrome: cros_ec_lpc: Add support for Google devices using custom coreboot firmware) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/cros_ec_lpc.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) +Merging hsi/for-next (e3d7fbab062b HSI: hsi_char: Delete an error message for a failed memory allocation in hsc_probe()) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (92d7ec1d71e3 leds: Fix wrong dmi_match on PC Engines APU LEDs) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (c6185e285c5c ipmi/parisc: Add IPMI chassis poweroff for certain HP PA-RISC and IA-64 servers) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (1fe56e0cafd7 drivers: base: remove check for callback in coredump_store()) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (5267c5e09c25 Revert "USB: serial: ftdi_sio: add Id for Physik Instrumente E-870") +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (aaeab02ddcc8 usb/gadget: Add an EP dispose() callback for EP lifetime tracking) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (79a0b33165d8 USB: serial: ftdi_sio: add Id for Physik Instrumente E-870) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (ce4c1b820c52 usb: chipidea: imx: Fix ULPI on imx53) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. +Merging phy-next/next (e7f4da4c44fe phy: tegra: xusb: Uncomment register write) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (4f794097797f serial: expose buf_overrun count through proc interface) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (06dd3dfeea60 Merge tag 'char-misc-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (eb7768e774d1 Merge branch 'ib-extcon-drm-dt-v4.17' into extcon-next) +$ git merge extcon/extcon-next +Already up to date. +Merging staging/staging-next (df34df483a97 Merge tag 'staging-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) +$ git merge staging/staging-next +Already up to date. +Merging mux/for-next (fa934c06c0f4 mux: add mux_control_get_optional() API) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-model/devres.txt | 1 + + drivers/mux/core.c | 104 +++++++++++++++++++++++++++------- + include/linux/mux/consumer.h | 4 ++ + 3 files changed, 89 insertions(+), 20 deletions(-) +Merging slave-dma/next (df0517c76e89 Merge branch 'topic/stm' into next) +$ git merge slave-dma/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/mtk-hsdma.txt | 33 + + .../devicetree/bindings/dma/qcom_bam_dma.txt | 4 + + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 2 + + .../devicetree/bindings/dma/renesas,usb-dmac.txt | 1 + + .../devicetree/bindings/dma/snps,dw-axi-dmac.txt | 41 + + .../devicetree/bindings/dma/stm32-dma.txt | 6 +- + MAINTAINERS | 15 + + drivers/dma/Kconfig | 12 + + drivers/dma/Makefile | 2 + + drivers/dma/at_xdmac.c | 4 +- + drivers/dma/dmatest.c | 16 +- + drivers/dma/dw-axi-dmac/Makefile | 1 + + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 1008 +++++++++++++++++++ + drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 334 +++++++ + drivers/dma/edma.c | 6 + + drivers/dma/imx-sdma.c | 21 + + drivers/dma/mediatek/Kconfig | 13 + + drivers/dma/mediatek/Makefile | 1 + + drivers/dma/mediatek/mtk-hsdma.c | 1056 ++++++++++++++++++++ + drivers/dma/pl330.c | 6 +- + drivers/dma/qcom/bam_dma.c | 59 +- + drivers/dma/sh/rcar-dmac.c | 13 +- + drivers/dma/stm32-dma.c | 287 +++++- + include/linux/dmaengine.h | 4 + + 24 files changed, 2871 insertions(+), 74 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/mtk-hsdma.txt + create mode 100644 Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.txt + create mode 100644 drivers/dma/dw-axi-dmac/Makefile + create mode 100644 drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c + create mode 100644 drivers/dma/dw-axi-dmac/dw-axi-dmac.h + create mode 100644 drivers/dma/mediatek/Kconfig + create mode 100644 drivers/dma/mediatek/Makefile + create mode 100644 drivers/dma/mediatek/mtk-hsdma.c +Merging cgroup/for-next (d1897c9538ed cgroup: fix rule checking for threaded mode switching) +$ git merge cgroup/for-next +Already up to date. +Merging scsi/for-next (2e1f44f6ad80 Merge branch 'fixes' into misc) +$ git merge scsi/for-next +Already up to date. +$ git am -3 ../patches/0001-scsi-qla2xxx-merge-fix-in-qla_gs.c.patch +Applying: scsi: qla2xxx: merge fix in qla_gs.c +Using index info to reconstruct a base tree... +M drivers/scsi/qla2xxx/qla_gs.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging scsi-mkp/for-next (e5ad16982403 scsi: fnic: fix spelling mistake: "abord" -> "abort") +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/ufs/ufshcd.c +Merge made by the 'recursive' strategy. + drivers/scsi/fnic/fnic_trace.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 40 ++++++++++++++++++++++++++++++++++++++++ + include/scsi/scsi_dbg.h | 2 -- + include/trace/events/ufs.h | 27 +++++++++++++++++++++++++++ + 4 files changed, 68 insertions(+), 3 deletions(-) +Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) +$ git merge target-updates/for-next +Already up to date. +Merging target-bva/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge target-bva/for-next +Already up to date. +Merging libata/for-next (d64c228ea181 Merge branch 'for-4.17' into for-next) +$ git merge libata/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging vhost/linux-next (dc32bb678e10 vhost: add vsock compat ioctl) +$ git merge vhost/linux-next +Auto-merging drivers/vhost/vsock.c +Auto-merging drivers/vhost/vhost.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/firmware/qemu_fw_cfg.c | 291 +++++++++++++++++++++++++++++++-------- + drivers/vhost/vhost.c | 2 +- + drivers/vhost/vhost.h | 4 +- + drivers/vhost/vsock.c | 11 ++ + include/uapi/linux/qemu_fw_cfg.h | 97 +++++++++++++ + kernel/crash_core.c | 1 + + tools/virtio/ringtest/ptr_ring.c | 5 + + 8 files changed, 348 insertions(+), 64 deletions(-) + create mode 100644 include/uapi/linux/qemu_fw_cfg.h +Merging rpmsg/for-next (1e2832764f26 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Resolved 'samples/Makefile' using previous resolution. +Auto-merging samples/Makefile +CONFLICT (content): Merge conflict in samples/Makefile +Auto-merging samples/Kconfig +Auto-merging drivers/soc/qcom/Kconfig +Auto-merging drivers/gpu/drm/msm/adreno/a5xx_gpu.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7e9e7bd71c79] Merge remote-tracking branch 'rpmsg/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 4 +- + drivers/media/platform/qcom/venus/firmware.c | 2 +- + drivers/remoteproc/Kconfig | 19 + + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/imx_rproc.c | 23 +- + drivers/remoteproc/qcom_adsp_pil.c | 20 +- + drivers/remoteproc/qcom_common.c | 50 ++- + drivers/remoteproc/qcom_common.h | 23 + + drivers/remoteproc/qcom_q6v5_pil.c | 9 +- + drivers/remoteproc/qcom_sysmon.c | 579 +++++++++++++++++++++++++ + drivers/remoteproc/qcom_wcnss.c | 11 +- + drivers/remoteproc/remoteproc_core.c | 152 ++++++- + drivers/remoteproc/remoteproc_internal.h | 7 +- + drivers/rpmsg/qcom_glink_native.c | 18 +- + drivers/rpmsg/qcom_glink_smem.c | 3 +- + drivers/rpmsg/qcom_smd.c | 51 ++- + drivers/rpmsg/rpmsg_core.c | 2 +- + drivers/soc/qcom/Kconfig | 2 +- + drivers/soc/qcom/mdt_loader.c | 7 +- + include/linux/remoteproc.h | 27 +- + include/linux/soc/qcom/mdt_loader.h | 3 +- + samples/Kconfig | 10 + + samples/Makefile | 2 +- + samples/qmi/Makefile | 1 + + samples/qmi/qmi_sample_client.c | 622 +++++++++++++++++++++++++++ + 25 files changed, 1570 insertions(+), 78 deletions(-) + create mode 100644 drivers/remoteproc/qcom_sysmon.c + create mode 100644 samples/qmi/Makefile + create mode 100644 samples/qmi/qmi_sample_client.c +Merging gpio/for-next (348f3cde84ab gpio: Add Spreadtrum PMIC EIC driver support) +$ git merge gpio/for-next +Already up to date. +Merging pinctrl/for-next (4fc97ef94bbf pinctrl: uniphier: add UART hardware flow control pin-mux settings) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-samsung/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (6873842235d6 pwm: rcar: Add suspend/resume support) +$ git merge pwm/for-next +Auto-merging drivers/pwm/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/ingenic,jz47xx-pwm.txt | 25 ++++++++++ + .../devicetree/bindings/pwm/pwm-stm32-lp.txt | 3 ++ + .../devicetree/bindings/pwm/pwm-sun4i.txt | 2 + + .../devicetree/bindings/pwm/renesas,pwm-rcar.txt | 11 ++-- + .../devicetree/bindings/pwm/renesas,tpu-pwm.txt | 10 ++-- + drivers/pwm/Kconfig | 6 +-- + drivers/pwm/pwm-atmel-tcb.c | 1 - + drivers/pwm/pwm-imx.c | 3 +- + drivers/pwm/pwm-jz4740.c | 41 ++++++++++++++- + drivers/pwm/pwm-mediatek.c | 36 +++++++++++--- + drivers/pwm/pwm-puv3.c | 4 +- + drivers/pwm/pwm-rcar.c | 58 +++++++++++++++++++--- + drivers/pwm/pwm-stm32-lp.c | 5 +- + drivers/pwm/pwm-stm32.c | 22 ++++++-- + drivers/pwm/pwm-sun4i.c | 38 +++++--------- + drivers/pwm/sysfs.c | 3 +- + 16 files changed, 205 insertions(+), 63 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/ingenic,jz47xx-pwm.txt +Merging userns/for-next (4be33329d46f m68k: Verify the offsets in struct siginfo never change.) +$ git merge userns/for-next +Auto-merging include/uapi/asm-generic/siginfo.h +Auto-merging include/linux/compat.h +Merge made by the 'recursive' strategy. + arch/m68k/kernel/signal.c | 62 ++++++++++++++++++++++++++++++++++++++ + include/linux/compat.h | 6 ++-- + include/uapi/asm-generic/siginfo.h | 7 +++-- + 3 files changed, 71 insertions(+), 4 deletions(-) +Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (9e66317d3c92 Linux 4.14-rc3) +$ git merge random/dev +Already up to date. +Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) +$ git merge aio/master +Already up to date. +Merging kselftest/next (6aa69043d9f3 selftests/intel_pstate: Fix build rule for x86) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 11 +- + tools/testing/selftests/android/ion/.gitignore | 1 + + tools/testing/selftests/android/ion/Makefile | 5 +- + tools/testing/selftests/android/ion/config | 1 + + tools/testing/selftests/android/ion/ionmap_test.c | 136 ++++++++++++++++++++++ + tools/testing/selftests/android/ion/ionutils.c | 6 - + tools/testing/selftests/futex/Makefile | 4 + + tools/testing/selftests/intel_pstate/Makefile | 5 +- + tools/testing/selftests/kselftest.h | 3 +- + tools/testing/selftests/kselftest_harness.h | 26 ++++- + tools/testing/selftests/lib.mk | 1 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 15 ++- + 12 files changed, 200 insertions(+), 14 deletions(-) + create mode 100644 tools/testing/selftests/android/ion/ionmap_test.c +Merging y2038/y2038 (ce380619fab9 Merge tag 'please-pull-ia64_misc' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux) +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (d13f5d84ca27 Merge branch 'for-4.16/signal-sysfs-force-v2' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (7e7408725e0d coresight: use put_device() instead of kfree()) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging rtc/rtc-next (1485991c0246 rtc: snvs: Fix usage of snvs_rtc_enable) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-cmos.c +Auto-merging drivers/rtc/rtc-ab-b5ze-s3.c +Auto-merging drivers/rtc/Makefile +Auto-merging drivers/rtc/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-rtc | 16 +- + .../devicetree/bindings/rtc/isil,isl12026.txt | 28 ++ + MAINTAINERS | 2 +- + drivers/char/rtc.c | 83 ---- + drivers/rtc/Kconfig | 13 +- + drivers/rtc/Makefile | 1 + + drivers/rtc/class.c | 77 +++- + drivers/rtc/hctosys.c | 5 + + drivers/rtc/interface.c | 107 +++++ + drivers/rtc/nvmem.c | 29 +- + drivers/rtc/rtc-88pm80x.c | 4 +- + drivers/rtc/rtc-88pm860x.c | 4 +- + drivers/rtc/rtc-ab-b5ze-s3.c | 4 +- + drivers/rtc/rtc-ab3100.c | 2 +- + drivers/rtc/rtc-ab8500.c | 57 +-- + drivers/rtc/rtc-abx80x.c | 6 +- + drivers/rtc/rtc-ac100.c | 26 +- + drivers/rtc/rtc-at91sam9.c | 1 + + drivers/rtc/rtc-au1xxx.c | 2 +- + drivers/rtc/rtc-bq32k.c | 8 +- + drivers/rtc/rtc-brcmstb-waketimer.c | 3 + + drivers/rtc/rtc-cmos.c | 87 ++-- + drivers/rtc/rtc-coh901331.c | 2 +- + drivers/rtc/rtc-core.h | 8 - + drivers/rtc/rtc-cpcap.c | 2 +- + drivers/rtc/rtc-cros-ec.c | 8 +- + drivers/rtc/rtc-da9052.c | 3 +- + drivers/rtc/rtc-da9055.c | 2 +- + drivers/rtc/rtc-da9063.c | 2 +- + drivers/rtc/rtc-ds1216.c | 2 +- + drivers/rtc/rtc-ds1286.c | 2 +- + drivers/rtc/rtc-ds1302.c | 7 +- + drivers/rtc/rtc-ds1305.c | 24 +- + drivers/rtc/rtc-ds1307.c | 32 +- + drivers/rtc/rtc-ds1343.c | 185 ++------ + drivers/rtc/rtc-ds1347.c | 2 +- + drivers/rtc/rtc-ds1390.c | 2 +- + drivers/rtc/rtc-ds1511.c | 26 +- + drivers/rtc/rtc-ds1553.c | 78 ++-- + drivers/rtc/rtc-ds1685.c | 2 +- + drivers/rtc/rtc-ds1742.c | 75 ++- + drivers/rtc/rtc-ds2404.c | 2 +- + drivers/rtc/rtc-ds3232.c | 2 +- + drivers/rtc/rtc-efi.c | 2 +- + drivers/rtc/rtc-fm3130.c | 3 +- + drivers/rtc/rtc-goldfish.c | 2 + + drivers/rtc/rtc-isl12022.c | 20 +- + drivers/rtc/rtc-isl12026.c | 501 +++++++++++++++++++++ + drivers/rtc/rtc-isl1208.c | 47 +- + drivers/rtc/rtc-jz4740.c | 2 +- + drivers/rtc/rtc-lib.c | 8 +- + drivers/rtc/rtc-lpc24xx.c | 2 +- + drivers/rtc/rtc-lpc32xx.c | 2 +- + drivers/rtc/rtc-ls1x.c | 2 +- + drivers/rtc/rtc-m41t80.c | 42 +- + drivers/rtc/rtc-m41t93.c | 2 +- + drivers/rtc/rtc-m41t94.c | 3 +- + drivers/rtc/rtc-m48t35.c | 2 +- + drivers/rtc/rtc-m48t59.c | 61 ++- + drivers/rtc/rtc-m48t86.c | 25 +- + drivers/rtc/rtc-max6900.c | 19 +- + drivers/rtc/rtc-max6902.c | 2 +- + drivers/rtc/rtc-max6916.c | 2 +- + drivers/rtc/rtc-max77686.c | 4 +- + drivers/rtc/rtc-max8997.c | 2 +- + drivers/rtc/rtc-max8998.c | 2 +- + drivers/rtc/rtc-mc13xxx.c | 2 +- + drivers/rtc/rtc-mcp795.c | 4 +- + drivers/rtc/rtc-mpc5121.c | 2 +- + drivers/rtc/rtc-mrst.c | 4 +- + drivers/rtc/rtc-msm6242.c | 2 +- + drivers/rtc/rtc-mt7622.c | 3 +- + drivers/rtc/rtc-mv.c | 14 +- + drivers/rtc/rtc-mxc_v2.c | 2 +- + drivers/rtc/rtc-nuc900.c | 14 +- + drivers/rtc/rtc-omap.c | 6 +- + drivers/rtc/rtc-pcap.c | 2 +- + drivers/rtc/rtc-pcf2123.c | 2 +- + drivers/rtc/rtc-pcf2127.c | 2 +- + drivers/rtc/rtc-pcf50633.c | 2 +- + drivers/rtc/rtc-pcf85063.c | 20 +- + drivers/rtc/rtc-pcf8523.c | 2 +- + drivers/rtc/rtc-pcf85363.c | 205 ++++++++- + drivers/rtc/rtc-pic32.c | 2 +- + drivers/rtc/rtc-pm8xxx.c | 55 ++- + drivers/rtc/rtc-ps3.c | 2 +- + drivers/rtc/rtc-r7301.c | 2 +- + drivers/rtc/rtc-r9701.c | 2 +- + drivers/rtc/rtc-rk808.c | 25 +- + drivers/rtc/rtc-rp5c01.c | 67 ++- + drivers/rtc/rtc-rs5c348.c | 5 - + drivers/rtc/rtc-rs5c372.c | 24 +- + drivers/rtc/rtc-rv8803.c | 33 +- + drivers/rtc/rtc-rx4581.c | 6 +- + drivers/rtc/rtc-rx6110.c | 2 +- + drivers/rtc/rtc-rx8010.c | 2 +- + drivers/rtc/rtc-rx8025.c | 2 +- + drivers/rtc/rtc-rx8581.c | 6 +- + drivers/rtc/rtc-s35390a.c | 38 +- + drivers/rtc/rtc-s3c.c | 2 +- + drivers/rtc/rtc-s5m.c | 27 +- + drivers/rtc/rtc-sc27xx.c | 2 +- + drivers/rtc/rtc-sh.c | 2 +- + drivers/rtc/rtc-sirfsoc.c | 18 - + drivers/rtc/rtc-snvs.c | 15 +- + drivers/rtc/rtc-spear.c | 12 +- + drivers/rtc/rtc-st-lpc.c | 16 - + drivers/rtc/rtc-starfire.c | 2 +- + drivers/rtc/rtc-stk17ta8.c | 74 ++- + drivers/rtc/rtc-sun6i.c | 2 +- + drivers/rtc/rtc-sunxi.c | 2 +- + drivers/rtc/rtc-sysfs.c | 12 + + drivers/rtc/rtc-tegra.c | 4 - + drivers/rtc/rtc-tps6586x.c | 2 +- + drivers/rtc/rtc-tx4939.c | 95 ++-- + drivers/rtc/rtc-wm831x.c | 2 +- + drivers/rtc/rtc-xgene.c | 2 +- + drivers/rtc/rtc-zynqmp.c | 2 +- + drivers/rtc/systohc.c | 2 +- + include/linux/mfd/samsung/rtc.h | 11 - + include/linux/rtc.h | 29 +- + include/trace/events/rtc.h | 206 +++++++++ + 122 files changed, 1809 insertions(+), 1083 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/isil,isl12026.txt + create mode 100644 drivers/rtc/rtc-isl12026.c + create mode 100644 include/trace/events/rtc.h +Merging nvdimm/libnvdimm-for-next (bb37fbce88f0 Merge branch 'for-4.17/dax' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/block_dev.c +Auto-merging drivers/nvdimm/pmem.c +Auto-merging drivers/nvdimm/nd.h +Auto-merging drivers/md/dm.c +Auto-merging drivers/md/dm-stripe.c +Auto-merging drivers/md/dm-log-writes.c +Auto-merging drivers/md/dm-linear.c +Auto-merging drivers/acpi/nfit/core.c +Merge made by the 'recursive' strategy. + drivers/acpi/nfit/core.c | 156 +++++++++++++++--------------- + drivers/acpi/nfit/mce.c | 5 +- + drivers/acpi/nfit/nfit.h | 5 +- + drivers/dax/Kconfig | 5 +- + drivers/dax/device.c | 38 ++++---- + drivers/dax/pmem.c | 18 +--- + drivers/dax/super.c | 15 ++- + drivers/md/Kconfig | 2 +- + drivers/md/dm-linear.c | 6 ++ + drivers/md/dm-log-writes.c | 95 ++++++++++--------- + drivers/md/dm-stripe.c | 6 ++ + drivers/md/dm.c | 10 +- + drivers/nvdimm/Kconfig | 2 +- + drivers/nvdimm/btt_devs.c | 21 ++--- + drivers/nvdimm/bus.c | 13 ++- + drivers/nvdimm/claim.c | 2 +- + drivers/nvdimm/core.c | 6 +- + drivers/nvdimm/dax_devs.c | 5 +- + drivers/nvdimm/dimm_devs.c | 7 +- + drivers/nvdimm/label.c | 85 +++++++++-------- + drivers/nvdimm/label.h | 2 +- + drivers/nvdimm/namespace_devs.c | 38 ++++---- + drivers/nvdimm/nd.h | 1 - + drivers/nvdimm/pfn_devs.c | 25 +++-- + drivers/nvdimm/pmem.c | 14 +-- + drivers/nvdimm/region_devs.c | 8 ++ + drivers/s390/block/Kconfig | 2 +- + fs/block_dev.c | 5 - + fs/dax.c | 146 ++++++++++++++++++---------- + fs/ext2/ext2.h | 1 + + fs/ext2/inode.c | 46 +++++---- + fs/ext2/namei.c | 18 +--- + fs/ext4/inode.c | 42 ++++++--- + fs/libfs.c | 39 ++++++++ + fs/xfs/xfs_aops.c | 34 +++---- + fs/xfs/xfs_aops.h | 1 + + fs/xfs/xfs_iops.c | 5 +- + include/linux/dax.h | 42 +++++++-- + include/linux/fs.h | 4 + + include/linux/libnvdimm.h | 1 + + include/linux/nd.h | 6 ++ + tools/testing/nvdimm/test/nfit.c | 199 ++++++++++++++++++++++++--------------- + 42 files changed, 688 insertions(+), 493 deletions(-) +Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too) +$ git merge idr/idr-4.11 +Already up to date. +Merging at24/at24/for-next (84e10623c0b9 dt-bindings: at24: add Renesas R1EX24128) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (53c3677c56c7 ntb: intel: change references of skx to gen3) +$ git merge ntb/ntb-next +Auto-merging drivers/ntb/hw/intel/ntb_hw_gen1.c +Merge made by the 'recursive' strategy. + drivers/ntb/hw/intel/Makefile | 1 + + .../ntb/hw/intel/{ntb_hw_intel.c => ntb_hw_gen1.c} | 713 ++------------------- + drivers/ntb/hw/intel/ntb_hw_gen1.h | 182 ++++++ + drivers/ntb/hw/intel/ntb_hw_gen3.c | 597 +++++++++++++++++ + drivers/ntb/hw/intel/ntb_hw_gen3.h | 110 ++++ + drivers/ntb/hw/intel/ntb_hw_intel.h | 203 ++---- + 6 files changed, 997 insertions(+), 809 deletions(-) + rename drivers/ntb/hw/intel/{ntb_hw_intel.c => ntb_hw_gen1.c} (74%) + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen1.h + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen3.c + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen3.h +Merging kspp/for-next/kspp (0adb32858b0b Linux 4.16) +$ git merge kspp/for-next/kspp +Already up to date. +Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) +$ git merge init_task/init_task +Already up to date. +Merging akpm-current/current (f3edcb47a8f6 ipc/shm.c: shm_split(): remove unneeded test for NULL shm_file_data.vm_ops) +$ git merge --no-ff akpm-current/current +Resolved 'drivers/block/zram/zram_drv.h' using previous resolution. +Auto-merging tools/testing/selftests/Makefile +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging security/apparmor/lsm.c +Auto-merging mm/memblock.c +Auto-merging mm/backing-dev.c +Auto-merging lib/Makefile +Auto-merging kernel/params.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/sched/signal.h +Auto-merging include/linux/memblock.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/backing-dev.h +Auto-merging fs/ocfs2/dlmglue.c +Auto-merging fs/exec.c +Auto-merging fs/direct-io.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/tree-checker.c +Auto-merging fs/block_dev.c +Auto-merging drivers/of/unittest.c +Auto-merging drivers/iommu/mtk_iommu_v1.c +Auto-merging drivers/iommu/exynos-iommu.c +Auto-merging drivers/dax/device.c +Auto-merging drivers/block/zram/zram_drv.h +CONFLICT (content): Merge conflict in drivers/block/zram/zram_drv.h +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging arch/sparc/kernel/sys_sparc_64.c +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging arch/powerpc/include/asm/hugetlb.h +Auto-merging arch/arm/boot/compressed/misc.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging .gitignore +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7fe49def0616] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .clang-format | 429 +++++++++++++++ + .gitignore | 1 + + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/admin-guide/kernel-parameters.txt | 54 +- + Documentation/cgroup-v2.txt | 74 +++ + Documentation/process/4.Coding.rst | 8 + + Documentation/process/clang-format.rst | 185 +++++++ + Documentation/process/coding-style.rst | 8 + + Documentation/sysctl/kernel.txt | 54 +- + Documentation/sysctl/vm.txt | 5 +- + .../trace/postprocess/trace-vmscan-postprocess.pl | 4 +- + Documentation/vm/hmm.txt | 360 ++++++------- + MAINTAINERS | 3 +- + arch/arc/mm/cache.c | 2 +- + arch/arm/boot/compressed/misc.c | 9 +- + arch/arm/include/asm/page.h | 2 + + arch/arm/mm/copypage-v4mc.c | 2 +- + arch/arm/mm/copypage-v6.c | 2 +- + arch/arm/mm/copypage-xscale.c | 2 +- + arch/arm/mm/dma-mapping.c | 16 +- + arch/arm/mm/fault-armv.c | 2 +- + arch/arm/mm/flush.c | 6 +- + arch/arm/mm/mmap.c | 14 +- + arch/arm64/mm/mmap.c | 14 +- + arch/mips/boot/compressed/decompress.c | 9 +- + arch/mips/mm/cache.c | 2 +- + arch/mips/mm/mmap.c | 14 +- + arch/nios2/mm/cacheflush.c | 4 +- + arch/parisc/kernel/cache.c | 5 +- + arch/parisc/kernel/sys_parisc.c | 16 +- + arch/powerpc/include/asm/hugetlb.h | 6 - + arch/powerpc/mm/hugetlbpage.c | 5 +- + arch/powerpc/mm/mmap.c | 28 +- + arch/powerpc/mm/mmu_context_iommu.c | 5 +- + arch/powerpc/sysdev/dart_iommu.c | 1 + + arch/powerpc/sysdev/msi_bitmap.c | 1 + + arch/s390/kernel/nmi.c | 2 +- + arch/s390/kernel/smp.c | 1 - + arch/s390/mm/mmap.c | 15 +- + arch/sh/boot/compressed/misc.c | 9 +- + arch/sh/mm/cache-sh4.c | 2 +- + arch/sh/mm/cache-sh7705.c | 2 +- + arch/sparc/kernel/irq_64.c | 1 - + arch/sparc/kernel/smp_64.c | 8 +- + arch/sparc/kernel/sys_sparc_64.c | 4 +- + arch/sparc/mm/init_64.c | 6 +- + arch/sparc/mm/tlb.c | 2 +- + arch/unicore32/mm/flush.c | 2 +- + arch/unicore32/mm/mmu.c | 2 +- + arch/x86/kernel/pci-dma.c | 1 - + arch/x86/mm/init_64.c | 33 +- + arch/x86/mm/mmap.c | 18 +- + arch/xtensa/mm/cache.c | 2 +- + block/genhd.c | 2 +- + drivers/base/memory.c | 47 +- + drivers/base/node.c | 24 +- + drivers/block/zram/zram_drv.c | 9 +- + drivers/block/zram/zram_drv.h | 16 - + drivers/dax/device.c | 10 + + drivers/input/touchscreen/cyttsp4_core.c | 2 +- + drivers/iommu/exynos-iommu.c | 1 + + drivers/iommu/mtk_iommu_v1.c | 1 - + drivers/net/ethernet/ti/cpsw.c | 1 + + drivers/net/wireless/realtek/rtlwifi/pci.c | 1 - + .../wireless/realtek/rtlwifi/rtl8192c/fw_common.c | 1 - + drivers/of/unittest.c | 2 +- + drivers/rapidio/rio-scan.c | 6 +- + drivers/staging/rtl8188eu/hal/fw.c | 2 +- + drivers/staging/rtlwifi/pci.c | 1 - + drivers/virtio/virtio_ring.c | 1 - + fs/9p/v9fs.c | 7 + + fs/9p/vfs_inode.c | 26 +- + fs/9p/vfs_super.c | 2 +- + fs/Kconfig | 3 + + fs/autofs4/waitq.c | 29 +- + fs/binfmt_aout.c | 1 + + fs/binfmt_elf.c | 1 + + fs/binfmt_elf_fdpic.c | 1 + + fs/binfmt_flat.c | 1 + + fs/block_dev.c | 6 +- + fs/btrfs/tree-checker.c | 3 +- + fs/buffer.c | 2 +- + fs/dcache.c | 42 +- + fs/direct-io.c | 9 +- + fs/exec.c | 28 +- + fs/exofs/ore.c | 84 +-- + fs/exofs/ore_raid.c | 73 ++- + fs/exofs/super.c | 23 +- + fs/fcntl.c | 2 +- + fs/hugetlbfs/inode.c | 10 +- + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/aops.c | 4 +- + fs/ocfs2/aops.h | 2 +- + fs/ocfs2/cluster/heartbeat.c | 11 +- + fs/ocfs2/dir.c | 2 +- + fs/ocfs2/dlm/dlmast.c | 2 - + fs/ocfs2/dlm/dlmcommon.h | 4 +- + fs/ocfs2/dlm/dlmdomain.c | 29 +- + fs/ocfs2/dlm/dlmdomain.h | 25 +- + fs/ocfs2/dlm/dlmlock.c | 3 +- + fs/ocfs2/dlm/dlmmaster.c | 25 +- + fs/ocfs2/dlm/dlmrecovery.c | 41 +- + fs/ocfs2/dlmglue.c | 23 +- + fs/ocfs2/file.c | 16 +- + fs/ocfs2/filecheck.c | 358 +++++-------- + fs/ocfs2/filecheck.h | 29 +- + fs/ocfs2/inode.c | 8 +- + fs/ocfs2/journal.c | 51 +- + fs/ocfs2/namei.c | 6 +- + fs/ocfs2/ocfs2.h | 8 + + fs/ocfs2/ocfs2_trace.h | 6 +- + fs/ocfs2/refcounttree.c | 10 +- + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + fs/ocfs2/suballoc.c | 53 +- + fs/ocfs2/super.c | 49 +- + fs/ocfs2/uptodate.c | 3 +- + fs/ocfs2/xattr.c | 2 +- + fs/proc/array.c | 39 +- + fs/proc/base.c | 21 +- + fs/proc/cmdline.c | 3 +- + fs/proc/generic.c | 109 ++-- + fs/proc/inode.c | 67 ++- + fs/proc/internal.h | 22 +- + fs/proc/meminfo.c | 15 +- + fs/proc/proc_net.c | 9 +- + fs/proc/proc_sysctl.c | 14 +- + fs/proc/root.c | 21 +- + fs/proc/task_mmu.c | 153 +++--- + fs/reiserfs/journal.c | 2 +- + fs/seq_file.c | 134 +++-- + include/linux/backing-dev.h | 2 +- + include/linux/binfmts.h | 3 + + include/linux/cgroup-defs.h | 5 + + include/linux/compiler-clang.h | 3 - + include/linux/compiler-gcc.h | 12 +- + include/linux/fault-inject.h | 5 +- + include/linux/hmm.h | 222 ++++---- + include/linux/hugetlb.h | 27 +- + include/linux/kasan.h | 4 +- + include/linux/kernel.h | 26 +- + include/linux/list_lru.h | 3 +- + include/linux/memblock.h | 10 - + include/linux/memcontrol.h | 71 ++- + include/linux/memfd.h | 16 + + include/linux/memory.h | 3 +- + include/linux/memory_hotplug.h | 56 +- + include/linux/migrate.h | 9 +- + include/linux/mm.h | 57 +- + include/linux/mm_types.h | 2 + + include/linux/mmdebug.h | 8 +- + include/linux/mmzone.h | 11 +- + include/linux/node.h | 4 +- + include/linux/oom.h | 12 +- + include/linux/page-flags.h | 22 +- + include/linux/page-isolation.h | 3 +- + include/linux/page_ref.h | 3 +- + include/linux/sched/mm.h | 6 +- + include/linux/sched/signal.h | 3 + + include/linux/seq_file.h | 6 + + include/linux/shmem_fs.h | 13 - + include/linux/shrinker.h | 2 +- + include/linux/slab.h | 20 +- + include/linux/slab_def.h | 4 +- + include/linux/slub_def.h | 28 +- + include/linux/swap.h | 51 +- + include/linux/thread_info.h | 6 +- + include/linux/utsname.h | 6 + + include/linux/vmstat.h | 11 + + include/linux/zsmalloc.h | 2 + + include/net/sock.h | 4 +- + include/trace/events/migrate.h | 2 +- + include/trace/events/vmscan.h | 41 +- + include/uapi/linux/msg.h | 1 + + include/uapi/linux/prctl.h | 4 + + include/uapi/linux/sem.h | 1 + + include/uapi/linux/shm.h | 5 +- + init/do_mounts_rd.c | 4 +- + init/main.c | 3 + + ipc/msg.c | 17 +- + ipc/sem.c | 17 +- + ipc/shm.c | 25 +- + ipc/util.c | 1 + + kernel/cgroup/cgroup.c | 13 +- + kernel/cred.c | 1 + + kernel/exit.c | 4 + + kernel/fork.c | 7 +- + kernel/panic.c | 63 +-- + kernel/params.c | 4 +- + kernel/sched/core.c | 1 + + kernel/sys.c | 11 + + kernel/sysctl.c | 24 +- + kernel/ucount.c | 1 + + kernel/utsname.c | 20 +- + lib/Kconfig.debug | 48 +- + lib/Kconfig.ubsan | 7 + + lib/Makefile | 3 + + lib/bitmap.c | 2 +- + lib/list_debug.c | 14 +- + lib/reed_solomon/decode_rs.c | 7 +- + lib/reed_solomon/reed_solomon.c | 5 +- + lib/test_bitmap.c | 14 +- + lib/test_firmware.c | 1 + + lib/test_kasan.c | 8 + + lib/test_ubsan.c | 144 ++++++ + lib/vsprintf.c | 22 +- + mm/Makefile | 5 +- + mm/backing-dev.c | 67 ++- + mm/cma.c | 89 +++- + mm/compaction.c | 16 +- + mm/failslab.c | 2 +- + mm/gup.c | 4 +- + mm/hmm.c | 573 +++++++++++++-------- + mm/huge_memory.c | 47 +- + mm/hugetlb.c | 27 +- + mm/internal.h | 5 +- + mm/kasan/kasan.c | 72 ++- + mm/khugepaged.c | 18 +- + mm/kmemleak.c | 12 +- + mm/ksm.c | 43 +- + mm/list_lru.c | 74 ++- + mm/memblock.c | 43 +- + mm/memcontrol.c | 297 ++++++++++- + mm/memfd.c | 342 ++++++++++++ + mm/memory-failure.c | 18 +- + mm/memory.c | 37 +- + mm/memory_hotplug.c | 55 +- + mm/mempolicy.c | 40 +- + mm/migrate.c | 369 ++++++------- + mm/mincore.c | 12 +- + mm/mmap.c | 14 +- + mm/mprotect.c | 9 + + mm/nommu.c | 12 - + mm/oom_kill.c | 222 +++++--- + mm/page_alloc.c | 501 ++++++++++++------ + mm/page_idle.c | 12 +- + mm/page_isolation.c | 21 +- + mm/page_owner.c | 6 +- + mm/page_poison.c | 2 +- + mm/pagewalk.c | 3 + + mm/percpu-stats.c | 13 +- + mm/rmap.c | 1 + + mm/shmem.c | 328 +----------- + mm/slab.c | 18 +- + mm/slab.h | 27 +- + mm/slab_common.c | 96 ++-- + mm/slub.c | 207 ++++---- + mm/sparse-vmemmap.c | 1 - + mm/sparse.c | 37 +- + mm/swap.c | 1 - + mm/swap_slots.c | 4 - + mm/swap_state.c | 160 ++++-- + mm/swapfile.c | 158 ++++-- + mm/util.c | 19 +- + mm/vmscan.c | 236 +++++---- + mm/vmstat.c | 1 + + mm/z3fold.c | 44 +- + mm/zsmalloc.c | 58 ++- + net/9p/client.c | 11 +- + net/core/sysctl_net_core.c | 1 - + net/ipv4/proc.c | 8 +- + net/ipv4/route.c | 1 - + net/ipv6/proc.c | 10 +- + scripts/checkpatch.pl | 177 ++++--- + scripts/faddr2line | 12 +- + security/apparmor/lsm.c | 2 +- + security/keys/big_key.c | 1 + + security/selinux/hooks.c | 4 + + security/smack/smack_lsm.c | 3 + + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/proc/.gitignore | 8 + + tools/testing/selftests/proc/Makefile | 13 + + tools/testing/selftests/proc/config | 1 + + tools/testing/selftests/proc/proc-loadavg-001.c | 83 +++ + .../selftests/proc/proc-self-map-files-001.c | 82 +++ + .../selftests/proc/proc-self-map-files-002.c | 85 +++ + tools/testing/selftests/proc/proc-self-syscall.c | 45 ++ + tools/testing/selftests/proc/proc-self-wchan.c | 25 + + tools/testing/selftests/proc/proc-uptime-001.c | 45 ++ + tools/testing/selftests/proc/proc-uptime-002.c | 79 +++ + tools/testing/selftests/proc/proc-uptime.h | 74 +++ + tools/testing/selftests/proc/read.c | 147 ++++++ + 282 files changed, 6651 insertions(+), 3391 deletions(-) + create mode 100644 .clang-format + create mode 100644 Documentation/process/clang-format.rst + create mode 100644 include/linux/memfd.h + create mode 100644 lib/test_ubsan.c + create mode 100644 mm/memfd.c + create mode 100644 tools/testing/selftests/proc/.gitignore + create mode 100644 tools/testing/selftests/proc/Makefile + create mode 100644 tools/testing/selftests/proc/config + create mode 100644 tools/testing/selftests/proc/proc-loadavg-001.c + create mode 100644 tools/testing/selftests/proc/proc-self-map-files-001.c + create mode 100644 tools/testing/selftests/proc/proc-self-map-files-002.c + create mode 100644 tools/testing/selftests/proc/proc-self-syscall.c + create mode 100644 tools/testing/selftests/proc/proc-self-wchan.c + create mode 100644 tools/testing/selftests/proc/proc-uptime-001.c + create mode 100644 tools/testing/selftests/proc/proc-uptime-002.c + create mode 100644 tools/testing/selftests/proc/proc-uptime.h + create mode 100644 tools/testing/selftests/proc/read.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: include/linux/kfifo.h: fix comment +Applying: fs/dcache.c: add cond_resched() in shrink_dentry_list() +Applying: MAINTAINERS: update bouncing aacraid@adaptec.com addresses +Applying: kexec_file: make use of purgatory optional +Applying: kexec_file-make-an-use-of-purgatory-optional-fix +Applying: kexec_file,x86,powerpc: factor out kexec_file_ops functions +Applying: x86: kexec_file: purge system-ram walking from prepare_elf64_headers() +Applying: x86: kexec_file: remove X86_64 dependency from prepare_elf64_headers() +Applying: x86: kexec_file: lift CRASH_MAX_RANGES limit on crash_mem buffer +Applying: x86: kexec_file: clean up prepare_elf64_headers() +Applying: kexec_file, x86: move re-factored code to generic side +Applying: include/linux/kexec.h: silence compile warnings +Applying: kernel/kexec_file.c: remove checks in kexec_purgatory_load +Applying: kernel/kexec_file.c: make purgatory_info->ehdr const +Applying: kernel/kexec_file.c: search symbols in read-only kexec_purgatory +Applying: kernel/kexec_file.c: use read-only sections in arch_kexec_apply_relocations* +Applying: kernel/kexec_file.c: split up __kexec_load_puragory +Applying: kernel/kexec_file.c: remove unneeded for-loop in kexec_purgatory_setup_sechdrs +Applying: kernel/kexec_file.c: remove unneeded variables in kexec_purgatory_setup_sechdrs +Applying: kernel/kexec_file.c: remove mis-use of sh_offset field during purgatory load +Applying: kernel/kexec_file.c: allow archs to set purgatory load address +Applying: kernel/kexec_file.c: move purgatories sha256 to common code +Applying: kernel/kexec_file.c: add walk_system_ram_res_rev() +Applying: kernel/kexec_file.c: load kernel at top of system RAM if required +Applying: mm: introduce MAP_FIXED_NOREPLACE +Applying: fs, elf: drop MAP_FIXED usage from elf_map +Applying: elf: enforce MAP_FIXED on overlaying elf segments +Applying: xen, mm: allow deferred page initialization for xen pv domains +Applying: linux/const.h: prefix include guard of uapi/linux/const.h with _UAPI +Applying: linux/const.h: move UL() macro to include/linux/const.h +Applying: linux/const.h: refactor _BITUL and _BITULL a bit +Applying: mm: memcg: remote memcg charging for kmem allocations +Applying: mm: memcg: remote memcg charging for kmem allocations fix +Applying: fs: fsnotify: account fsnotify metadata to kmemcg +Applying: fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix +Applying: radix tree: use GFP_ZONEMASK bits of gfp_t for flags +Applying: mac80211_hwsim: use DEFINE_IDA +Applying: arm64: turn flush_dcache_mmap_lock into a no-op +Applying: unicore32: turn flush_dcache_mmap_lock into a no-op +Applying: export __set_page_dirty +Applying: fscache: use appropriate radix tree accessors +Applying: xarray: add the xa_lock to the radix_tree_root +Applying: page cache: use xa_lock +Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow +Applying: sparc64: NG4 memset 32 bits overflow +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + b70ec1bebc5f...97f45c3487f9 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (97f45c3487f9 sparc64: NG4 memset 32 bits overflow) +$ git merge --no-ff akpm/master +Auto-merging lib/sha256.c +Auto-merging include/linux/sha256.h +Merge made by the 'recursive' strategy. + Documentation/cgroup-v1/memory.txt | 2 +- + Documentation/vm/page_migration | 14 +- + MAINTAINERS | 4 +- + arch/alpha/include/uapi/asm/mman.h | 1 + + arch/arm/include/asm/cacheflush.h | 6 +- + arch/arm/include/asm/memory.h | 6 - + arch/arm64/include/asm/cacheflush.h | 6 +- + arch/arm64/include/asm/memory.h | 6 - + arch/mips/include/uapi/asm/mman.h | 1 + + arch/nios2/include/asm/cacheflush.h | 6 +- + arch/parisc/include/asm/cacheflush.h | 6 +- + arch/parisc/include/uapi/asm/mman.h | 1 + + arch/powerpc/Kconfig | 3 + + arch/powerpc/include/asm/kexec.h | 2 +- + arch/powerpc/kernel/kexec_elf_64.c | 11 +- + arch/powerpc/kernel/machine_kexec_file_64.c | 39 +- + arch/sparc/lib/NG4memset.S | 26 +- + arch/unicore32/include/asm/cacheflush.h | 6 +- + arch/unicore32/include/asm/memory.h | 6 - + arch/x86/Kconfig | 3 + + arch/x86/include/asm/kexec-bzimage64.h | 2 +- + arch/x86/include/asm/x86_init.h | 2 + + arch/x86/kernel/crash.c | 334 +++---------- + arch/x86/kernel/kexec-bzimage64.c | 10 +- + arch/x86/kernel/machine_kexec_64.c | 111 ++--- + arch/x86/kernel/x86_init.c | 1 + + arch/x86/mm/init_32.c | 1 + + arch/x86/mm/init_64.c | 1 + + arch/x86/purgatory/Makefile | 3 + + arch/x86/purgatory/purgatory.c | 2 +- + arch/x86/purgatory/string.c | 12 + + arch/x86/xen/mmu_pv.c | 38 +- + arch/xtensa/include/uapi/asm/mman.h | 1 + + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/net/wireless/mac80211_hwsim.c | 2 +- + drivers/staging/lustre/lustre/llite/glimpse.c | 2 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 8 +- + fs/afs/write.c | 9 +- + fs/binfmt_elf.c | 22 +- + fs/btrfs/compression.c | 2 +- + fs/btrfs/extent_io.c | 16 +- + fs/buffer.c | 16 +- + fs/cifs/file.c | 9 +- + fs/dax.c | 124 +++-- + fs/dcache.c | 5 +- + fs/f2fs/data.c | 6 +- + fs/f2fs/dir.c | 6 +- + fs/f2fs/gc.c | 2 +- + fs/f2fs/inline.c | 6 +- + fs/f2fs/node.c | 8 +- + fs/fs-writeback.c | 22 +- + fs/fscache/cookie.c | 2 +- + fs/fscache/object.c | 2 +- + fs/inode.c | 11 +- + fs/nilfs2/btnode.c | 20 +- + fs/nilfs2/page.c | 22 +- + fs/notify/dnotify/dnotify.c | 5 +- + fs/notify/fanotify/fanotify.c | 6 +- + fs/notify/fanotify/fanotify_user.c | 5 +- + fs/notify/group.c | 4 + + fs/notify/inotify/inotify_fsnotify.c | 2 +- + fs/notify/inotify/inotify_user.c | 5 +- + fs/xfs/xfs_aops.c | 15 +- + include/linux/backing-dev.h | 14 +- + include/linux/const.h | 9 + + include/linux/fs.h | 8 +- + include/linux/fsnotify_backend.h | 12 +- + include/linux/idr.h | 22 +- + include/linux/ioport.h | 3 + + include/linux/kexec.h | 81 ++-- + include/linux/kfifo.h | 8 +- + include/linux/memcontrol.h | 7 + + include/linux/mm.h | 3 +- + include/linux/pagemap.h | 4 +- + include/linux/radix-tree.h | 14 +- + include/linux/sched.h | 3 + + include/linux/sched/mm.h | 24 + + {arch/x86/purgatory => include/linux}/sha256.h | 11 +- + include/linux/slab.h | 59 +++ + include/linux/xarray.h | 24 + + include/uapi/asm-generic/mman-common.h | 3 + + include/uapi/linux/const.h | 13 +- + kernel/fork.c | 3 + + kernel/kexec_file.c | 621 ++++++++++++++++-------- + kernel/pid.c | 2 +- + kernel/resource.c | 63 +++ + lib/radix-tree.c | 3 +- + {arch/x86/purgatory => lib}/sha256.c | 4 +- + mm/filemap.c | 84 ++-- + mm/huge_memory.c | 10 +- + mm/khugepaged.c | 49 +- + mm/memcontrol.c | 29 +- + mm/memfd.c | 18 +- + mm/migrate.c | 32 +- + mm/mmap.c | 11 + + mm/page-writeback.c | 43 +- + mm/page_alloc.c | 4 - + mm/readahead.c | 2 +- + mm/rmap.c | 4 +- + mm/shmem.c | 42 +- + mm/swap_state.c | 17 +- + mm/truncate.c | 22 +- + mm/vmscan.c | 12 +- + mm/workingset.c | 22 +- + tools/include/linux/spinlock.h | 1 + + tools/testing/radix-tree/linux/gfp.h | 1 + + 106 files changed, 1329 insertions(+), 1133 deletions(-) + create mode 100644 include/linux/const.h + rename {arch/x86/purgatory => include/linux}/sha256.h (62%) + create mode 100644 include/linux/xarray.h + rename {arch/x86/purgatory => lib}/sha256.c (99%) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..6ffac557af4d --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 4.16-rc4 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..21bffba37495 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20180406 |