diff options
| -rw-r--r-- | Next/SHA1s | 263 | ||||
| -rw-r--r-- | Next/Trees | 265 | ||||
| -rw-r--r-- | Next/merge.log | 20803 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 21334 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..22195ca8e2c0 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,263 @@ +Name SHA1 +---- ---- +origin 3215b9d57a2c75c4305a3956ca303d7004485200 +fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +kbuild-current 0f0e8de334c54c38818a4a5390a39aa09deff5bf +arc-current 661e50bc853209e41a5c14a290ca4decc43cbfd1 +arm-current 091f02483df7b56615b524491f404e574c5e0668 +arm64-fixes e21da1c992007594d391e7b301779cf30f438691 +m68k-current 2334b1ac1235934fc196f2d25bae7f348d3bf42e +metag-fixes b884a190afcecdbef34ca508ea5ee88bb7c77861 +powerpc-fixes e4b79900222b8cccd4da4a7a89581f0e1b764ed2 +sparc 9c548bb5823dfcf7a16c6e65976d84d9581208c9 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 3d27484eba9572ded0117acab7d2728e8916d58f +bpf 87e0d4f0f37fb0c8c4aeeac46fff5e957738df79 +ipsec f8a554b4aa9686bb2c12f6bae516e58783289a03 +netfilter 467697d289e7e6e1b15910d99096c0da08c56d5b +ipvs f7fb77fc12352d15180dc3c08ffba10573d5167d +wireless-drivers 9b9322db5c5a1917a66c71fe47c3848a9a31227e +mac80211 60b01bcce97191f473fa869df2713143936d6ef4 +rdma-fixes e8980d67d6017c8eee8f9c35f782c4bd68e004c9 +sound-current a8d7bde23e7130686b76624b099f3e22dd38aef7 +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 4c41aa24baa4ed338241d05494f2c595c885af8f +char-misc.current 655296c8bbeffcf020558c4455305d597a73bde1 +input-current 3993a16309c7efc93dee772a9279a34bc88cdcb5 +crypto-current c927b080c67e3e97193c81fc1d27f4251bf4e036 +ide 8e44e6600caa7b96a5b71ae36c8829db753c2d70 +vfio-fixes 563b5cbe334e9503ab2b234e279d500fc4f76018 +kselftest-fixes ba004a2955f759946d8c98ca1a9c8d09818b1223 +backlight-fixes 8ff5cbc6e3c5c2855245c014f3ba572ddfc5ab0f +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +mfd-fixes 107b7d9fa94c4692d9104243f0e793e2a4e1366e +v4l-dvb-fixes 2c27476e398bfd9fa2572ff80a0de16f0becc900 +reset-fixes f450f28e70a2378d9d6ded0932fe480055888cfa +mips-fixes 06a3f0c9f2725f5d7c63c4203839373c9bd00c28 +kvm-fixes 52be7a467e4b45b0d8d3b700729fc65a9b8ebc94 +kvms390-fixes f07afa0462b76a5b9c4f3a43d5ac24fdb86a90c2 +drm-intel-fixes 3a088dd1b72dc0fc2e7ee1fca76e26290c5261a0 +drm-misc-fixes b24791fe00f8b089d5b10cb7bcc4e1ae88b4831b +syscalls e858ec1663a0074617879c626fafa1c24ef890d6 +kbuild c8e8b3bf125d76e120d23af8ec9cb151ac657383 +leaks 9f84a0f7f1a613335a9aaf0abd5858906752bf93 +efi-lock-down 89bcd5b02f125335f74289c5f4ae03e9b893ab7f +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping 1f674e16f9ce6eb20ee2e81ae7514737376874de +asm-generic b53bc17eb1e8a9802d0b73071bbb585d37a508c5 +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +arm-perf 44300aed5d28e61aae124c401170ac94c98d2127 +arm-soc e83e3b9ac6f3edf41c9e0777985bfb1d2183feee +actions 61862a89e6acb61e1193c3ad6d4eeab966c470ed +alpine a1144b2b1ec47f50951a83eb2bd847c74415b567 +amlogic 5f1dd1796c7c58214aa0bff37730d5984b292bec +aspeed 6534b2d0de3693b8508375c2f01951d6eb5c69be +at91 dc39260ac7823873f60305a3dc05aafc97790e60 +bcm2835 cf172af3be59ccd818960064b30722582a4c7fb5 +imx-mxs dee23d344a736bc1cb5857aba90ac74254d87017 +keystone dacf3785016797379dc4bc4ec05f87d746adcaee +mvebu a1110f3c567f9f378d206f42e6720adf30dbe208 +omap 03e545376c13304103f02f9255de7ec613a49653 +reset a2d34cbe8004773cea571eb8313c48b5b4fe11df +qcom 186d88395e05eb087d730ff7f8fc6b7f4dbd8d90 +realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9 +renesas 58eb42a95b247359a3ce4badb69c732561781854 +rockchip bba558b5d864d89bc479a8afd0a30305a9b9822f +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk 0bc590a59ce6682d9792d7b59fb5f5283e2052a8 +sunxi 2d567752a056453f9767d0d26d1cc54aa38624a6 +tegra cb1845fc9f80784111ce204b5d6d85b27389ad40 +arm64 af4a81b9cd847441e047f99c2a2bc113ba96b0cd +clk 8b229cb16695e58482347339da523b87a8087596 +clk-samsung 182c084da5d1e4d7c02d913de154cf5167521580 +c6x 9d440f7a282433338207c4ffb13cafaccaa27818 +m68k 51fd62769d415d343efd993d124f5551cfe5fcba +m68knommu 661e50bc853209e41a5c14a290ca4decc43cbfd1 +metag 8d06c3302635f0ab426937f2bb10e9b9c34087e4 +microblaze 70f6283a372bef685fd64564646a3b49a55be1ea +mips ea4d340cbea470247b19ee696e31f102bc64466a +mips-james b2ed33a895676738dfad11cedcba1e3a0a8b6203 +nds32 6fc61ee69433e7e0433cabd36f78bb5fb3b26524 +nios2 e0691ebb33c12084ef11b6b59228c004e19f59c8 +openrisc 0fedb7653af7a8cac606c3eff213ac92693035b9 +parisc-hd 5464408e6bc40a618b0ed88979d1bb9c7c612b73 +powerpc 78e5dfea84dc15d69940831b3981b3014d17222e +fsl c095ff93f901c1620b28dce4d813dd548bc5236b +risc-v c698ca5278934c0ae32297a8725ced2e27585d7f +s390 bcbd41da3b0a8a3e0f8457bb545a32f5ca3c81f5 +sparc-next 257a1aac7a9ae82db9c84a263a883c6f17789fea +sh 6e2fbfdd585f46128ce8879738bca09719a65138 +uml 584bfe635481d9b2b7f181b05a84d6cfdce79ee7 +xtensa ae6063c83634cbef7f73ec8a3ab7a6adf5294716 +fscrypt 0b1dfa4cc6c60052b2c30ead316fa84c46d3c43c +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 7c9a09f56a91c4ee5636703d3a95c72710917718 +btrfs-kdave b23ea5fe1f19460603259f9cdbab97400ac9a61d +ceph 1c789249578895bb14ab62b4327306439b754857 +cifs c5473a5bb132b11dac508d46fc04a6b92fe9714b +configfs 6ace4f6bbcfde70278a33c11443ecda3ed0ec1b6 +ecryptfs 4670269faba728683f7250319a65390946c028e3 +ext3 a9cee1764b6fa97f2b4cd0210b1a125fef2e7169 +ext4 5dc397113d195a004899ee672c5a8a19809495ba +f2fs 81f5af16f39aa9b57207a35fb3e0765b059731a8 +fuse 5ba24197b94d4070d8c2a17fa4944a55cc39ef03 +jfs 86313903430d08739e391ad51b4865dc3a2bf522 +nfs 3215b9d57a2c75c4305a3956ca303d7004485200 +nfs-anna 27f00231589292d59443558da7ea64ed8a48723e +nfsd aacbc447c42b747bfbc096993723cc73314c9696 +orangefs 74e938c22705c7b80d4422e84eea927fc78e60a8 +overlayfs 36cd95dfa1ed76b59e2dcaafaa89c5479cec32b5 +ubifs 7f29ae9f977bcdc3654e68bc36d170223c52fd48 +xfs df79b81b2e6a801c134c3e06c647715a316b4a92 +file-locks 8bad6f17391418bcef3b84bcc4b5aa46d5d785d6 +vfs 98a972e278415c122da8c12d8700373e0d486915 +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +iversion 581e400ff935d34d95811258586128bf11baef15 +printk 3d172f44ffab8d9f8496f672787ad2ed3f251b46 +pci eda9c9dd19d11528bf27ef283ca414003ec98968 +pstore 58eb5b6707477ff458db3ee522aac317da719e2a +hid b576182794e8b3f9fbfaf7b70c5ae5e2ef6b3c2f +i2c dc07174fd3d89b3ef518a9c993023d29dd59d804 +dmi eb693e35e850d915fae2c63dc5cef6751b466fa6 +hwmon-staging 72816cb06e7153c22aed8776949f558b635aa2c0 +jc_docs aebb47d4e7a9c5a4f456aa0b2e1f7d612d1c78ba +v4l-dvb 238f694e1b7f8297f1256c57e41f69c39576c9b4 +v4l-dvb-next a1dfb4c48cc1e64eeb7800a27c66a6f7e88d075a +fbdev 2c81ee0a28c085582a84f3822e8a22e028a909d0 +pm 94dee79363a351985124b27347e2d53e1a6b0183 +cpupower 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f +opp 4a823c0be80fa996234ebb41c80d40458b1bec1e +thermal 0f1a0183eae6bbb0527af322224cb930a7b38805 +thermal-soc d0ecbbbe518e1b256fcda1770ec06a5a1a058567 +ieee1394 188775181bc05f29372b305ef96485840e351fde +dlm 9250e523592a8ced3ecd14abe29fbb1e036bd7eb +swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a +rdma 185899ee8d00460a305e07ed2df178dbf7455227 +net-next 454bfe97837a3e3a5a15b768f8293f228e0f2f06 +bpf-next 78262f4575c29f185947fe58952cd1beabc74f82 +ipsec-next 415a13296a1a49639cabf9d2fe92267810caa47a +netfilter-next 78d9f4d49bbecd101b4e5faf19f8f70719fee2ca +nfc-next 4d63adfe12dd9cb61ed8badb4d798955399048c2 +ipvs-next a910d20aa007b94cf1799df59341f5e27ca60e6f +wireless-drivers-next 28bf8312a983a7873997bf3faf4c2b4e62e4abc0 +bluetooth 243fc8da65187a2f176b6e228dbbe0d608a3e548 +mac80211-next 13cf6dec93e021ebd297619ea1926aea31b6430b +gfs2 ee6ed857c8058177614b21a0efbf27e02c4e2a77 +mtd 6de564939e14327148e31ddcf769e34105176447 +l2-mtd 5741a164ff6fb5abbea8548ad0f3846bad2b9aec +nand b1206122069aadabe1a8c50789277a978aaa4df7 +spi-nor 5c6038af2ed820bffe843c95376fdb676e4e1f7c +crypto 1a3713c7cd8c903264065a79c9b29517eec5152e +drm 78230c46ec0a91dd4256c9e54934b3c7095a7ee3 +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel 8c5cb3c1c5701df8b8bcefb151547148378841e5 +drm-tegra 27e92f1f1600c214bf649daddb9b88b68330a8d1 +drm-misc 1c7095d2836baafd84e596dd34ba1a1293a4faa9 +drm-msm 288e5c8898c488298c39ff4bbf58928d30fbf99f +hdlcd f73e8b82531573a198a4d0e5bff0d3256cbbd1d8 +mali-dp 6e810eb508f4b937bc2a718bd4e5cd74cca55500 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm 4a3928c6f8a53fa1aed28ccba227742486e8ddcb +etnaviv fc0775da8e60d38c234c1e2c13470cc7c2198018 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap 2889312616aecf1a1153be0fab19206a6b1f768f +sound 9a2fe9b801f585baccf8352d82839dcd54b300cf +sound-asoc 3c0239e01a18cddcd6d71f79cdb8b11013fbcf22 +modules 3f553b308bb004eb730da8e00a28150c157c7724 +input 68106869e8026f95795f677c544639109b5bcf2f +block 927fc3c30ffaa68f3812eafdc9d7988cb21da624 +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper 83260a18a9dea5d1d0690366763254052d04d4ce +mmc c42e8e054d95890448494f4897837ea32aa69be2 +kgdb 2cf2f0d5b91fd1b06a6ae260462fc7945ea84add +md 3de59bb9d551428cbdc76a9ea57883f82e350b4d +mfd e2be8c26c80a63534a73683d0b0993cbd5948317 +backlight ba11349b2a5748551b17b7709e7a4d17420354fb +battery fd73a3e618889877d32e338622a363d04d9be709 +regulator 4a95adc00584168c701bc659a4d698d1c582c1d6 +security 6837ef4d4a99478ef96380f7ceccedb4307d6f14 +apparmor e540c3c901934e23e5eaa9adec8aba1af317220c +integrity 638872e2ad9e43ee6707995c91d89c9bcbaeddc5 +keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 +selinux 6b6bc6205d98796361962ee282a063f18ba8dc57 +tpmdd ea8d6a89c3807d990404beefba426de263381f3e +watchdog 2e8ebed6ede01f187f8a06bbae3e3b3325bda36c +iommu 5388d81be69cc111c50203f34235dc1c75654834 +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio 46ed90f157f42d956ffed17c003f089a59b76e3e +trivial 1972d6c0c86dd8620ff9f2811ce875135ffb5405 +audit ea841bafda3f7f9aa8b06a09f0f3e41c207af84f +devicetree 827473268ee492b30b576ef156ab524a2b9f3520 +mailbox 41c0e939d70ddb6860e340e7532df8984783f867 +spi 357982f0ad1dc46539a59481f8f324763c79612b +tip a1b85ae11ccf6b86e2108251e02fa00f0a19b773 +clockevents 135643b1d63ddfdd8d2d44baf345ca1bd354d191 +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 6fd052665274b4e7570491ba272f2dbb09cbbcd5 +irqchip 66569052fe5328729ff696c1ec17913907d00b5f +ftrace 80765597bc587feae8dbc8ce97a0f32e12a6e625 +rcu 08c5ee9132655d957daef41dc264b694dff817e3 +kvm 4956aa3b8b59e336b77f1df0ac7ce1a94c0265f2 +kvm-arm f9f5dc19509bbef6f5e675346f1a7d7b846bdb12 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +kvms390 ccc40c53c07ba22cfe711cd625f9f0c77f272ae6 +xen-tip 4d0f1ce6955913c490263359eadd392574cf9fe3 +percpu b3a5d111994450909158929560906f2c1c6c1d85 +workqueues 1aa3798360db38d3131ac011b50c397a7cdb754e +drivers-x86 cc69c88fbeb915447b87e5179378d899d1f61554 +chrome-platform 3b7cedb4242034595cd268046f3cf2e6eb68e989 +hsi e3d7fbab062b877b96c09ffb43733502cdc1bd0a +leds 92d7ec1d71e351f11ba503369eb78225510cfcc7 +ipmi bc48fa1b9d3b04106055b27078da824cd209865a +driver-core 995e8695f65db7a8b465b5c27887b32e8e5bb66e +usb e3cb7bde9a6a8bfdee5917facf00afb98fee1821 +usb-gadget 7642d8386ac71af0666c425264c4d7380269f62c +usb-serial 9b284d8e648b9a6a297409d2adb34bcebf695818 +usb-chipidea-next ce4c1b820c5269437ce2e7831f638159b3b83269 +phy-next e7f4da4c44fe74e1c9277bac9b12ea1ef4eb70db +tty 4958134df54c2c84e9c22ea042761d439164d26e +char-misc 6f005302a23fa4ea611612899cd18de76e7821b9 +extcon eb7768e774d12eac1189984a62925bc3bb386e13 +staging d59578da2bb8d69266351a399c377fc4bf4265b7 +mux fa934c06c0f40443566e7cb0d46eac6da65dce48 +slave-dma 65eac86c001a213e52fdb60cb921be7281ea59aa +cgroup d1897c9538edafd4ae6bbd03cc075962ddde2c21 +scsi 435458e411807afd6a71e01b0fdfca34ab179e13 +scsi-mkp ad448378825f5746c5fa37718724bc8f4e7b6945 +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +libata d09c02fa64a5f1a85c31eb957362d8a77ceb9a10 +vhost 54939f252f9795916d8ffcb564be4387da7a3b2c +rpmsg 6366ff79e09f1a5582407299697a6b75d82371db +gpio 95260c17b27e4bdacf85022e629fb701b42cc190 +pinctrl dfb1c1da3da783b78540baba37a22adb7ec07bdf +pinctrl-samsung 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +pwm bccaa3f917c90917a758020dfbdd9027290a7c4e +userns dd206bec9a446884805370b1c16c1d7a97036777 +ktest f7c6401ff84ab8ffffc281a29aa0a787f7eb346e +random 9e66317d3c92ddaab330c125dfe9d06eee268aff +aio 2a8a98673c13cb2a61a6476153acf8344adfa992 +kselftest 6c3b6d50839151c5d8a077610b5d8c3dc1e7e7b3 +y2038 8bad56707b0bcf1aa5190e70c036ed36dc154b5c +livepatching d13f5d84ca2774e76f8461a383c222cbc75adad5 +coresight c24ae3b69146fd9c9c7da641e56eec34d268e723 +rtc 2b1ee1cca25acf028e20a2883e54df883131ca35 +nvdimm 4a07628cc017a5cfbb0484601dc6be2965e142a3 +idr f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371 +at24 84e10623c0b9c81557918804f309d66aec86a233 +ntb 53c3677c56c76f90cacd3a1063272fc6d6bc8f76 +kspp 2d00fcb32f71904a789d285c1ae335d5f42a38d2 +init_task e1e871aff3ded26348c631b1370e257d401cd22d +akpm-current 2623866b3006623e3169fb276799955d1ba99bea +akpm c5a3856bbe37adab9d7a522f0e42315e5fe25aac diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..6564ef5adaa4 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,265 @@ +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 +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +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 +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.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 https://github.com/andestech/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 +iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-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..394c3be1ba67 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,20803 @@ +$ date -R +Thu, 22 Mar 2018 07:51:00 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 1b5f3ba415fe Merge branch 'for-4.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup +Merging origin/master (3215b9d57a2c Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux) +$ git merge origin/master +Updating 1b5f3ba415fe..3215b9d57a2c +Fast-forward + arch/x86/include/asm/vmx.h | 1 + + arch/x86/kvm/vmx.c | 9 ++++- + drivers/clk/bcm/clk-bcm2835.c | 12 ++++--- + drivers/clk/clk-aspeed.c | 28 +++++++++------ + drivers/clk/clk.c | 46 ++++++++++++++---------- + drivers/clk/hisilicon/clk-hi3660-stub.c | 2 ++ + drivers/clk/imx/clk-imx51-imx53.c | 20 +++++++++-- + drivers/clk/qcom/apcs-msm8916.c | 5 ++- + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 6 ++-- + drivers/clk/ti/clk-33xx.c | 2 +- + drivers/clk/ti/clk-43xx.c | 2 +- + drivers/clk/ti/clkctrl.c | 2 ++ + drivers/infiniband/core/cma.c | 15 +++++--- + drivers/infiniband/core/ucma.c | 36 +++++++++++++------ + drivers/infiniband/hw/bnxt_re/bnxt_re.h | 4 +-- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 2 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 4 +-- + drivers/infiniband/hw/mlx5/main.c | 21 ++++++----- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 3 +- + drivers/infiniband/hw/mlx5/mr.c | 12 ++++--- + drivers/infiniband/hw/mlx5/qp.c | 23 ++++++++---- + drivers/infiniband/hw/mlx5/srq.c | 15 ++++---- + drivers/scsi/libsas/sas_scsi_host.c | 33 +++++++---------- + drivers/scsi/qla2xxx/qla_init.c | 1 - + fs/nfsd/nfs4state.c | 62 ++++++++++++++++++++++---------- + include/linux/mlx5/driver.h | 4 +-- + include/rdma/ib_verbs.h | 4 --- + 27 files changed, 236 insertions(+), 138 deletions(-) +Merging fixes/master (7928b2cbe55b Linux 4.16-rc1) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (0f0e8de334c5 kbuild: set no-integrated-as before incl. arch Makefile) +$ git merge kbuild-current/fixes +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 4 ++-- + scripts/adjust_autoksyms.sh | 7 +++++++ + 2 files changed, 9 insertions(+), 2 deletions(-) +Merging arc-current/for-curr (661e50bc8532 Linux 4.16-rc4) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (091f02483df7 ARM: net: bpf: clarify tail_call index) +$ 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 (2334b1ac1235 MAINTAINERS: Add NuBus subsystem entry) +$ git merge m68k-current/for-linus +Already up to date. +Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) +$ git merge metag-fixes/fixes +Already up to date. +Merging powerpc-fixes/fixes (e4b79900222b powerpc/64s: Fix NULL AT_BASE_PLATFORM when using DT CPU features) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/dt_cpu_ftrs.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging sparc/master (9c548bb5823d sparc64: Oracle DAX driver depends on SPARC64) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + drivers/sbus/char/Kconfig | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (3d27484eba95 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) +$ git merge net/master +Auto-merging Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/dsa/marvell.txt | 48 +++--- + .../devicetree/bindings/net/renesas,ravb.txt | 6 +- + Documentation/networking/segmentation-offloads.txt | 18 ++- + Makefile | 9 ++ + arch/x86/net/bpf_jit_comp.c | 3 +- + drivers/bluetooth/btusb.c | 8 +- + drivers/bluetooth/hci_bcm.c | 13 +- + drivers/net/can/cc770/cc770.c | 100 +++++++----- + drivers/net/can/cc770/cc770.h | 2 + + drivers/net/can/ifi_canfd/ifi_canfd.c | 75 +++++---- + drivers/net/can/m_can/m_can.c | 7 +- + drivers/net/can/peak_canfd/peak_canfd.c | 25 +-- + drivers/net/can/peak_canfd/peak_pciefd_main.c | 8 +- + drivers/net/dsa/b53/b53_common.c | 4 +- + drivers/net/ethernet/8390/Kconfig | 2 +- + drivers/net/ethernet/arc/emac_rockchip.c | 6 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 33 ++-- + drivers/net/ethernet/broadcom/bcmsysport.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 180 +++++++++++---------- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 33 ++-- + drivers/net/ethernet/broadcom/tg3.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 3 +- + drivers/net/ethernet/cortina/gemini.c | 1 + + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 8 +- + drivers/net/ethernet/freescale/fec_main.c | 2 + + drivers/net/ethernet/freescale/fman/fman_dtsec.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 +- + drivers/net/ethernet/intel/e1000e/defines.h | 21 ++- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 42 +++-- + drivers/net/ethernet/intel/e1000e/mac.c | 25 ++- + drivers/net/ethernet/intel/e1000e/netdev.c | 37 ++--- + .../mellanox/mlxsw/core_acl_flex_actions.c | 11 ++ + .../mellanox/mlxsw/core_acl_flex_actions.h | 1 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 28 +++- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 4 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 5 + + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 12 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 2 +- + drivers/net/ethernet/natsemi/Kconfig | 6 +- + drivers/net/ethernet/natsemi/Makefile | 2 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 5 +- + drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 17 +- + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 1 + + drivers/net/ethernet/qlogic/qede/qede_main.c | 4 +- + drivers/net/ethernet/qualcomm/emac/emac-mac.c | 23 +-- + drivers/net/ethernet/smsc/smsc911x.c | 4 +- + drivers/net/ethernet/socionext/sni_ave.c | 2 +- + drivers/net/ethernet/sun/sunvnet.c | 2 +- + drivers/net/ethernet/ti/cpsw.c | 3 +- + drivers/net/hyperv/hyperv_net.h | 1 + + drivers/net/hyperv/netvsc_drv.c | 15 +- + drivers/net/hyperv/rndis_filter.c | 12 +- + drivers/net/macvlan.c | 2 +- + drivers/net/phy/bcm-phy-lib.c | 4 +- + drivers/net/phy/marvell.c | 4 +- + drivers/net/phy/micrel.c | 4 +- + drivers/net/phy/phy.c | 145 +++++++++-------- + drivers/net/phy/phy_device.c | 15 +- + drivers/net/team/team.c | 4 +- + drivers/net/tun.c | 3 +- + drivers/net/usb/usbnet.c | 10 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 16 +- + drivers/net/vmxnet3/vmxnet3_int.h | 7 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 10 ++ + .../wireless/broadcom/brcm80211/brcmfmac/fwil.c | 3 + + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 24 ++- + drivers/net/wireless/intel/iwlwifi/Kconfig | 1 - + .../net/wireless/intel/iwlwifi/fw/api/time-event.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 13 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 3 + + drivers/net/wireless/intel/iwlwifi/fw/debugfs.h | 18 +++ + drivers/net/wireless/intel/iwlwifi/fw/init.c | 12 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 7 + + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 8 + + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 49 ++++-- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 + + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 28 +++- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 39 ++--- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 33 ++-- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 13 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 3 +- + drivers/soc/fsl/qbman/qman.c | 28 +--- + drivers/vhost/net.c | 8 +- + fs/sysfs/symlink.c | 1 + + include/linux/cgroup-defs.h | 4 +- + include/linux/if_tun.h | 4 + + include/linux/if_vlan.h | 66 ++++++-- + include/linux/net.h | 1 + + include/linux/netfilter/x_tables.h | 2 + + include/linux/phy.h | 1 - + include/linux/rhashtable.h | 4 +- + include/linux/skbuff.h | 22 +++ + include/linux/u64_stats_sync.h | 22 +++ + include/net/ip.h | 11 +- + include/net/ip6_route.h | 3 + + include/net/ip_fib.h | 1 + + include/net/route.h | 6 +- + include/net/sch_generic.h | 19 +++ + include/net/sock.h | 1 + + include/uapi/linux/if_ether.h | 1 + + kernel/bpf/syscall.c | 2 +- + kernel/fail_function.c | 10 ++ + kernel/trace/bpf_trace.c | 68 ++++---- + lib/rhashtable.c | 4 +- + lib/test_bpf.c | 2 +- + lib/test_rhashtable.c | 134 +++++++++++++++ + net/8021q/vlan_core.c | 4 +- + net/bluetooth/smp.c | 8 +- + net/bridge/netfilter/ebt_among.c | 34 ++++ + net/bridge/netfilter/ebtables.c | 6 +- + net/core/dev.c | 22 ++- + net/core/dev_ioctl.c | 7 +- + net/core/devlink.c | 16 +- + net/core/filter.c | 60 ++++--- + net/core/skbuff.c | 11 +- + net/core/sock.c | 21 +++ + net/core/sock_diag.c | 12 +- + net/dccp/proto.c | 5 + + net/dsa/legacy.c | 2 +- + net/ieee802154/6lowpan/core.c | 12 +- + net/ipv4/inet_diag.c | 3 +- + net/ipv4/inet_fragment.c | 3 + + net/ipv4/ip_sockglue.c | 6 +- + net/ipv4/route.c | 47 ++++-- + net/ipv4/tcp.c | 1 + + net/ipv4/tcp_timer.c | 1 + + net/ipv4/xfrm4_mode_tunnel.c | 3 +- + net/ipv4/xfrm4_policy.c | 5 +- + net/ipv6/datagram.c | 21 ++- + net/ipv6/ip6_gre.c | 8 +- + net/ipv6/ndisc.c | 3 +- + net/ipv6/route.c | 75 +++++---- + net/ipv6/xfrm6_mode_tunnel.c | 3 +- + net/ipv6/xfrm6_policy.c | 5 + + net/iucv/af_iucv.c | 4 +- + net/kcm/kcmsock.c | 33 ++-- + net/l2tp/l2tp_core.c | 46 +++--- + net/l2tp/l2tp_core.h | 3 - + net/netfilter/nf_tables_api.c | 1 + + net/netfilter/nft_set_hash.c | 2 +- + net/netfilter/x_tables.c | 30 ++++ + net/netfilter/xt_hashlimit.c | 16 +- + net/netfilter/xt_recent.c | 6 +- + net/netlink/genetlink.c | 2 +- + net/openvswitch/meter.c | 12 +- + net/sched/act_csum.c | 5 +- + net/sched/act_sample.c | 3 +- + net/sched/act_skbmod.c | 3 +- + net/sched/act_tunnel_key.c | 10 +- + net/sched/act_vlan.c | 3 +- + net/sched/sch_generic.c | 22 +-- + net/sched/sch_netem.c | 2 +- + net/sctp/input.c | 8 +- + net/sctp/inqueue.c | 2 +- + net/sctp/offload.c | 2 +- + net/smc/af_smc.c | 4 - + net/smc/smc_close.c | 25 +-- + net/socket.c | 5 + + net/xfrm/xfrm_ipcomp.c | 2 +- + net/xfrm/xfrm_policy.c | 13 +- + net/xfrm/xfrm_replay.c | 2 +- + net/xfrm/xfrm_state.c | 5 + + net/xfrm/xfrm_user.c | 21 +-- + tools/bpf/bpftool/common.c | 4 + + 175 files changed, 1670 insertions(+), 865 deletions(-) +Merging bpf/master (87e0d4f0f37f kbuild: disable clang's default use of -fmerge-all-constants) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (f8a554b4aa96 vti6: Fix dev->max_mtu setting) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv4/ip_tunnel.c | 8 +++++++- + net/ipv4/ip_vti.c | 2 -- + net/ipv6/ip6_vti.c | 36 +++++++++++++++++++++++------------- + net/xfrm/xfrm_output.c | 5 +++-- + 4 files changed, 33 insertions(+), 18 deletions(-) +Merging netfilter/master (467697d289e7 netfilter: nf_tables: add missing netlink attrs to policies) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + net/netfilter/nf_tables_api.c | 72 +++++++++++++++++++++++++++++++++++++++++-- + net/netfilter/nft_set_hash.c | 2 +- + 2 files changed, 71 insertions(+), 3 deletions(-) +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 (9b9322db5c5a brcmfmac: Fix check for ISO3166 code) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 5 ++ + .../wireless/broadcom/brcm80211/brcmfmac/common.h | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 57 +++++++++++++++++ + drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 62 ++++++++++++++++++ + drivers/net/wireless/intel/iwlwifi/fw/file.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 5 ++ + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 4 ++ + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 9 ++- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 3 + + drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 21 ++++-- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 74 ++++++++++------------ + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 15 +++-- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 10 ++- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 38 +++++------ + 15 files changed, 225 insertions(+), 82 deletions(-) +Merging mac80211/master (60b01bcce971 ath9k_htc: use non-QoS NDP for AP probing) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 1 + + drivers/net/wireless/mac80211_hwsim.c | 1 + + include/net/mac80211.h | 4 ++++ + net/mac80211/debugfs.c | 1 + + net/mac80211/mlme.c | 3 ++- + 5 files changed, 9 insertions(+), 1 deletion(-) +Merging rdma-fixes/for-rc (e8980d67d601 RDMA/ucma: Ensure that CM_ID exists prior to access it) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (a8d7bde23e71 ALSA: hda - Force polling mode on CFL for fixing codec communication) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + include/uapi/linux/usb/audio.h | 4 ++-- + sound/pci/hda/hda_intel.c | 5 +++++ + sound/pci/hda/patch_realtek.c | 6 +++++- + 3 files changed, 12 insertions(+), 3 deletions(-) +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. + drivers/usb/serial/cp210x.c | 1 + + drivers/usb/serial/ftdi_sio.c | 2 ++ + drivers/usb/serial/ftdi_sio_ids.h | 9 +++++++++ + 3 files changed, 12 insertions(+) +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 (4c41aa24baa4 staging: ncpfs: memory corruption in ncp_read_kernel()) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + .../bindings/iio/adc/sigma-delta-modulator.txt | 4 +-- + drivers/iio/accel/st_accel_core.c | 7 +++- + drivers/iio/adc/meson_saradc.c | 4 ++- + drivers/iio/adc/stm32-dfsdm-adc.c | 39 ++++++++++++---------- + drivers/iio/adc/stm32-dfsdm-core.c | 12 +++++-- + drivers/iio/chemical/ccs811.c | 3 ++ + drivers/iio/pressure/st_pressure_core.c | 2 +- + drivers/staging/ncpfs/ncplib_kernel.c | 4 +++ + 8 files changed, 50 insertions(+), 25 deletions(-) +Merging char-misc.current/char-misc-linus (655296c8bbef Drivers: hv: vmbus: Fix ring buffer signaling) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/hv/ring_buffer.c | 52 ++++++++++++++++++++++++++++++++---------------- + 1 file changed, 35 insertions(+), 17 deletions(-) +Merging input-current/for-linus (3993a16309c7 Input: silead - add Chuwi Hi8 support) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/joystick/analog.c | 2 +- + drivers/input/keyboard/stmpe-keypad.c | 16 ++++++++++++---- + drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ + drivers/input/touchscreen/silead.c | 1 + + 4 files changed, 21 insertions(+), 5 deletions(-) +Merging crypto-current/master (c927b080c67e crypto: s5p-sss - Fix kernel Oops in AES-ECB mode) +$ 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 (563b5cbe334e iommu/arm-smmu-v3: Cope with duplicated Stream IDs) +$ 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 (2c27476e398b media: dvb: fix a Kconfig typo) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/Kconfig | 2 +- + drivers/media/platform/tegra-cec/tegra_cec.c | 17 +++++++---------- + include/uapi/linux/lirc.h | 1 - + 3 files changed, 8 insertions(+), 12 deletions(-) +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 (06a3f0c9f272 MIPS: BMIPS: Do not mask IPIs during suspend) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging kvm-fixes/master (52be7a467e4b Merge tag 'kvm-ppc-fixes-4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-master) +$ 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 (3a088dd1b72d drm/i915: Specify which engines to reset following semaphore/event lockups) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/intel_ddi.c | 7 ++----- + drivers/gpu/drm/i915/intel_hangcheck.c | 4 ++-- + 2 files changed, 4 insertions(+), 7 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (b24791fe00f8 drm: Reject getfb for multi-plane framebuffers) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_framebuffer.c | 7 +++++++ + drivers/gpu/drm/sun4i/sun4i_drv.c | 3 +-- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 6 ++++-- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 5 +++-- + 4 files changed, 15 insertions(+), 6 deletions(-) +Merging syscalls/syscalls-next (e858ec1663a0 Merge branch 'syscalls-net-next') +$ git merge syscalls/syscalls-next +Auto-merging net/socket.c +Auto-merging fs/namei.c +Merge made by the 'recursive' strategy. + Documentation/process/adding-syscalls.rst | 14 -- + arch/alpha/kernel/osf_sys.c | 2 +- + arch/arm/kernel/sys_arm.c | 2 +- + arch/arm64/kernel/sys.c | 2 +- + arch/ia64/kernel/sys_ia64.c | 4 +- + arch/m68k/kernel/sys_m68k.c | 2 +- + arch/microblaze/kernel/sys_microblaze.c | 6 +- + arch/mips/kernel/linux32.c | 10 +- + arch/mips/kernel/syscall.c | 6 +- + arch/parisc/kernel/sys_parisc.c | 14 +- + arch/powerpc/kernel/sys_ppc32.c | 8 +- + arch/powerpc/kernel/syscalls.c | 6 +- + arch/riscv/kernel/sys_riscv.c | 4 +- + arch/s390/kernel/compat_linux.c | 23 +-- + arch/s390/kernel/sys_s390.c | 2 +- + arch/sh/kernel/sys_sh.c | 4 +- + arch/sh/kernel/sys_sh32.c | 8 +- + arch/sparc/kernel/sys_sparc32.c | 14 +- + arch/sparc/kernel/sys_sparc_32.c | 6 +- + arch/sparc/kernel/sys_sparc_64.c | 2 +- + arch/um/kernel/syscall.c | 2 +- + arch/x86/ia32/sys_ia32.c | 22 +-- + arch/x86/include/asm/syscalls.h | 1 + + arch/x86/kernel/ioport.c | 7 +- + arch/x86/kernel/sys_x86_64.c | 2 +- + arch/xtensa/kernel/syscall.c | 2 +- + drivers/base/devtmpfs.c | 11 +- + drivers/tty/vt/vt_ioctl.c | 6 +- + fs/autofs4/dev-ioctl.c | 2 +- + fs/binfmt_misc.c | 2 +- + fs/eventfd.c | 9 +- + fs/eventpoll.c | 23 ++- + fs/file.c | 17 ++- + fs/hostfs/hostfs.h | 2 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hostfs/hostfs_user.c | 2 +- + fs/internal.h | 14 ++ + fs/namei.c | 61 ++++++-- + fs/namespace.c | 19 ++- + fs/open.c | 68 +++++++-- + fs/pipe.c | 9 +- + fs/read_write.c | 9 +- + fs/signalfd.c | 14 +- + fs/stat.c | 12 +- + fs/sync.c | 12 +- + fs/utimes.c | 13 +- + include/linux/futex.h | 13 +- + include/linux/socket.h | 37 ++++- + include/linux/syscalls.h | 146 ++++++++++++++++++- + init/do_mounts.c | 16 +- + init/do_mounts.h | 4 +- + init/do_mounts_initrd.c | 38 ++--- + init/do_mounts_md.c | 14 +- + init/do_mounts_rd.c | 18 +-- + init/initramfs.c | 48 +++--- + init/main.c | 9 +- + init/noinitramfs.c | 6 +- + kernel/exit.c | 2 +- + kernel/fork.c | 11 +- + kernel/pid_namespace.c | 6 +- + kernel/signal.c | 15 +- + kernel/sys.c | 9 +- + kernel/uid16.c | 6 +- + kernel/umh.c | 4 +- + mm/fadvise.c | 10 +- + mm/mmap.c | 17 ++- + mm/nommu.c | 17 ++- + net/compat.c | 136 ++++++++++++----- + net/socket.c | 234 ++++++++++++++++++++---------- + 69 files changed, 906 insertions(+), 392 deletions(-) +Merging kbuild/for-next (c8e8b3bf125d Merge branches 'kbuild' and 'kconfig' into for-next) +$ git merge kbuild/for-next +Auto-merging Makefile +Merge made by the 'recursive' strategy. + .gitignore | 1 + + Documentation/kbuild/kbuild.txt | 4 - + Documentation/kbuild/kconfig.txt | 2 +- + Documentation/kbuild/makefiles.txt | 28 +- + Documentation/networking/i40e.txt | 2 +- + Documentation/process/changes.rst | 2 +- + Makefile | 95 ++++--- + arch/Kconfig | 6 - + arch/arm/boot/deflate_xip_data.sh | 2 +- + arch/blackfin/kernel/bfin_ksyms.c | 2 +- + arch/powerpc/boot/wrapper | 2 +- + arch/powerpc/kernel/Makefile | 2 +- + drivers/s390/Makefile | 2 +- + lib/Kconfig.debug | 4 +- + scripts/Kbuild.include | 6 +- + scripts/Makefile.build | 52 ++-- + scripts/Makefile.lib | 33 +-- + scripts/adjust_autoksyms.sh | 9 +- + scripts/basic/fixdep.c | 8 +- + scripts/clang-version.sh | 33 +++ + scripts/file-size.sh | 4 + + scripts/gen_initramfs_list.sh | 2 +- + scripts/headers_install.sh | 10 +- + scripts/kconfig/Makefile | 31 ++- + scripts/kconfig/conf.c | 41 +-- + scripts/kconfig/expr.c | 86 ++---- + scripts/kconfig/expr.h | 4 +- + scripts/kconfig/menu.c | 12 +- + scripts/kconfig/nconf.h | 4 +- + scripts/kconfig/symbol.c | 40 ++- + scripts/kconfig/tests/auto_submenu/Kconfig | 50 ++++ + scripts/kconfig/tests/auto_submenu/__init__.py | 12 + + scripts/kconfig/tests/auto_submenu/expected_stdout | 10 + + scripts/kconfig/tests/choice/Kconfig | 54 ++++ + scripts/kconfig/tests/choice/__init__.py | 40 +++ + .../kconfig/tests/choice/alldef_expected_config | 5 + + .../kconfig/tests/choice/allmod_expected_config | 9 + + scripts/kconfig/tests/choice/allno_expected_config | 5 + + .../kconfig/tests/choice/allyes_expected_config | 9 + + .../kconfig/tests/choice/oldask0_expected_stdout | 10 + + scripts/kconfig/tests/choice/oldask1_config | 2 + + .../kconfig/tests/choice/oldask1_expected_stdout | 15 ++ + .../kconfig/tests/choice_value_with_m_dep/Kconfig | 19 ++ + .../tests/choice_value_with_m_dep/__init__.py | 15 ++ + .../kconfig/tests/choice_value_with_m_dep/config | 2 + + .../tests/choice_value_with_m_dep/expected_config | 3 + + .../tests/choice_value_with_m_dep/expected_stdout | 4 + + scripts/kconfig/tests/conftest.py | 291 +++++++++++++++++++++ + scripts/kconfig/tests/err_recursive_inc/Kconfig | 1 + + scripts/kconfig/tests/err_recursive_inc/Kconfig2 | 1 + + scripts/kconfig/tests/err_recursive_inc/Kconfig3 | 1 + + .../kconfig/tests/err_recursive_inc/__init__.py | 10 + + .../tests/err_recursive_inc/expected_stderr | 5 + + scripts/kconfig/tests/inter_choice/Kconfig | 23 ++ + scripts/kconfig/tests/inter_choice/__init__.py | 14 + + scripts/kconfig/tests/inter_choice/defconfig | 1 + + scripts/kconfig/tests/inter_choice/expected_config | 4 + + scripts/kconfig/tests/new_choice_with_dep/Kconfig | 37 +++ + .../kconfig/tests/new_choice_with_dep/__init__.py | 14 + + scripts/kconfig/tests/new_choice_with_dep/config | 3 + + .../tests/new_choice_with_dep/expected_stdout | 10 + + .../kconfig/tests/no_write_if_dep_unmet/Kconfig | 14 + + .../tests/no_write_if_dep_unmet/__init__.py | 19 ++ + scripts/kconfig/tests/no_write_if_dep_unmet/config | 1 + + .../tests/no_write_if_dep_unmet/expected_config | 5 + + scripts/kconfig/tests/pytest.ini | 7 + + scripts/kconfig/tests/rand_nested_choice/Kconfig | 33 +++ + .../kconfig/tests/rand_nested_choice/__init__.py | 16 ++ + .../tests/rand_nested_choice/expected_stdout0 | 2 + + .../tests/rand_nested_choice/expected_stdout1 | 4 + + .../tests/rand_nested_choice/expected_stdout2 | 5 + + scripts/kconfig/tests/warn_recursive_dep/Kconfig | 62 +++++ + .../kconfig/tests/warn_recursive_dep/__init__.py | 9 + + .../tests/warn_recursive_dep/expected_stderr | 30 +++ + scripts/link-vmlinux.sh | 103 +++----- + scripts/namespace.pl | 2 +- + usr/initramfs_data.S | 2 +- + 77 files changed, 1191 insertions(+), 331 deletions(-) + create mode 100755 scripts/clang-version.sh + create mode 100755 scripts/file-size.sh + create mode 100644 scripts/kconfig/tests/auto_submenu/Kconfig + create mode 100644 scripts/kconfig/tests/auto_submenu/__init__.py + create mode 100644 scripts/kconfig/tests/auto_submenu/expected_stdout + create mode 100644 scripts/kconfig/tests/choice/Kconfig + create mode 100644 scripts/kconfig/tests/choice/__init__.py + create mode 100644 scripts/kconfig/tests/choice/alldef_expected_config + create mode 100644 scripts/kconfig/tests/choice/allmod_expected_config + create mode 100644 scripts/kconfig/tests/choice/allno_expected_config + create mode 100644 scripts/kconfig/tests/choice/allyes_expected_config + create mode 100644 scripts/kconfig/tests/choice/oldask0_expected_stdout + create mode 100644 scripts/kconfig/tests/choice/oldask1_config + create mode 100644 scripts/kconfig/tests/choice/oldask1_expected_stdout + create mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/Kconfig + create mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/__init__.py + create mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/config + create mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/expected_config + create mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/expected_stdout + create mode 100644 scripts/kconfig/tests/conftest.py + create mode 100644 scripts/kconfig/tests/err_recursive_inc/Kconfig + create mode 100644 scripts/kconfig/tests/err_recursive_inc/Kconfig2 + create mode 100644 scripts/kconfig/tests/err_recursive_inc/Kconfig3 + create mode 100644 scripts/kconfig/tests/err_recursive_inc/__init__.py + create mode 100644 scripts/kconfig/tests/err_recursive_inc/expected_stderr + create mode 100644 scripts/kconfig/tests/inter_choice/Kconfig + create mode 100644 scripts/kconfig/tests/inter_choice/__init__.py + create mode 100644 scripts/kconfig/tests/inter_choice/defconfig + create mode 100644 scripts/kconfig/tests/inter_choice/expected_config + create mode 100644 scripts/kconfig/tests/new_choice_with_dep/Kconfig + create mode 100644 scripts/kconfig/tests/new_choice_with_dep/__init__.py + create mode 100644 scripts/kconfig/tests/new_choice_with_dep/config + create mode 100644 scripts/kconfig/tests/new_choice_with_dep/expected_stdout + create mode 100644 scripts/kconfig/tests/no_write_if_dep_unmet/Kconfig + create mode 100644 scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py + create mode 100644 scripts/kconfig/tests/no_write_if_dep_unmet/config + create mode 100644 scripts/kconfig/tests/no_write_if_dep_unmet/expected_config + create mode 100644 scripts/kconfig/tests/pytest.ini + create mode 100644 scripts/kconfig/tests/rand_nested_choice/Kconfig + create mode 100644 scripts/kconfig/tests/rand_nested_choice/__init__.py + create mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout0 + create mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout1 + create mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout2 + create mode 100644 scripts/kconfig/tests/warn_recursive_dep/Kconfig + create mode 100644 scripts/kconfig/tests/warn_recursive_dep/__init__.py + create mode 100644 scripts/kconfig/tests/warn_recursive_dep/expected_stderr +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/events/core.c +Auto-merging kernel/bpf/syscall.c +Auto-merging drivers/tty/serial/serial_core.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/ioport.c +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + 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/scsi/eata.c | 5 +- + 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 +++++++++++++++++++++++++++++++++ + 47 files changed, 557 insertions(+), 81 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 +Merge made by the 'recursive' strategy. + include/linux/dma-mapping.h | 19 ++++++++++++++----- + include/linux/dmapool.h | 30 +++++++++++++++++++++++------- + include/linux/usb/gadget.h | 12 ++++++++++++ + include/scsi/scsi_cmnd.h | 5 +++++ + 4 files changed, 54 insertions(+), 12 deletions(-) +Merging asm-generic/master (b53bc17eb1e8 staging: iio: remove iio-trig-bfin-timer driver) +$ git merge asm-generic/master +Removing tools/arch/tile/include/uapi/asm/mman.h +Removing tools/arch/tile/include/uapi/asm/bitsperlong.h +Removing tools/arch/tile/include/asm/barrier.h +Removing tools/arch/score/include/uapi/asm/mman.h +Removing tools/arch/score/include/uapi/asm/bitsperlong.h +Removing tools/arch/mn10300/include/uapi/asm/mman.h +Removing tools/arch/mn10300/include/uapi/asm/bitsperlong.h +Removing tools/arch/m32r/include/uapi/asm/mman.h +Removing tools/arch/m32r/include/uapi/asm/bitsperlong.h +Removing tools/arch/frv/include/uapi/asm/mman.h +Removing tools/arch/frv/include/uapi/asm/bitsperlong.h +Removing samples/blackfin/gptimers-example.c +Removing samples/blackfin/Makefile +Auto-merging mm/percpu.c +Auto-merging mm/page_alloc.c +Auto-merging mm/nommu.c +Removing lib/raid6/tilegx.uc +Auto-merging lib/Kconfig.debug +Auto-merging kernel/module.c +Auto-merging include/uapi/asm-generic/siginfo.h +Removing include/media/blackfin/ppi.h +Removing include/media/blackfin/bfin_capture.h +Removing include/linux/usb/tilegx.h +Removing include/linux/platform_data/pinctrl-adi2.h +Removing include/linux/platform_data/bfin_rotary.h +Removing include/linux/irqchip/metag.h +Removing include/linux/irqchip/metag-ext.h +Removing include/linux/bfin_mac.h +Removing include/clocksource/metag_generic.h +Removing drivers/watchdog/bfin_wdt.c +Removing drivers/video/logo/logo_m32r_clut224.ppm +Removing drivers/video/logo/logo_blackfin_vga16.ppm +Removing drivers/video/logo/logo_blackfin_clut224.ppm +Removing drivers/video/fbdev/bfin_adv7393fb.h +Removing drivers/video/fbdev/bfin_adv7393fb.c +Removing drivers/video/fbdev/bfin-t350mcqb-fb.c +Removing drivers/video/fbdev/bfin-lq035q1-fb.c +Removing drivers/video/fbdev/bf54x-lq043fb.c +Removing drivers/video/fbdev/bf537-lq035.c +Auto-merging drivers/usb/musb/musb_core.c +Removing drivers/usb/musb/blackfin.h +Removing drivers/usb/musb/blackfin.c +Removing drivers/usb/host/ohci-tilegx.c +Auto-merging drivers/usb/host/ohci-hcd.c +Removing drivers/usb/host/ehci-tilegx.c +Removing drivers/tty/serial/tilegx.c +Removing drivers/tty/serial/m32r_sio_reg.h +Removing drivers/tty/serial/m32r_sio.c +Removing drivers/tty/serial/etraxfs-uart.c +Removing drivers/tty/serial/crisv10.h +Removing drivers/tty/serial/crisv10.c +Removing drivers/tty/serial/bfin_uart.c +Removing drivers/tty/serial/bfin_sport_uart.h +Removing drivers/tty/serial/bfin_sport_uart.c +Removing drivers/tty/metag_da.c +Removing drivers/tty/hvc/hvc_tile.c +Removing drivers/tty/hvc/hvc_bfin_jtag.c +Removing drivers/tty/bfin_jtag_comm.c +Removing drivers/staging/iio/trigger/iio-trig-bfin-timer.h +Removing drivers/staging/iio/trigger/iio-trig-bfin-timer.c +Removing drivers/staging/iio/trigger/Makefile +Removing drivers/staging/iio/trigger/Kconfig +Removing drivers/spi/spi-bfin5xx.c +Removing drivers/spi/spi-bfin-sport.c +Removing drivers/spi/spi-adi-v3.c +Removing drivers/rtc/rtc-tile.c +Removing drivers/rtc/rtc-bfin.c +Removing drivers/pwm/pwm-bfin.c +Removing drivers/pinctrl/pinctrl-adi2.h +Removing drivers/pinctrl/pinctrl-adi2.c +Removing drivers/pinctrl/pinctrl-adi2-bf60x.c +Removing drivers/pinctrl/pinctrl-adi2-bf54x.c +Removing drivers/pcmcia/m32r_pcc.h +Removing drivers/pcmcia/m32r_pcc.c +Removing drivers/pcmcia/m32r_cfc.h +Removing drivers/pcmcia/m32r_cfc.c +Removing drivers/pcmcia/bfin_cf_pcmcia.c +Auto-merging drivers/pci/quirks.c +Removing drivers/net/ethernet/tile/tilepro.c +Removing drivers/net/ethernet/tile/tilegx.c +Removing drivers/net/ethernet/tile/Makefile +Removing drivers/net/ethernet/tile/Kconfig +Removing drivers/net/ethernet/adi/bfin_mac.h +Removing drivers/net/ethernet/adi/bfin_mac.c +Removing drivers/net/ethernet/adi/Makefile +Removing drivers/net/ethernet/adi/Kconfig +Auto-merging drivers/net/ethernet/8390/Kconfig +Removing drivers/net/cris/eth_v10.c +Removing drivers/net/cris/Makefile +Removing drivers/net/can/bfin_can.c +Removing drivers/mmc/host/bfin_sdh.c +Removing drivers/media/platform/blackfin/ppi.c +Removing drivers/media/platform/blackfin/bfin_capture.c +Removing drivers/media/platform/blackfin/Makefile +Removing drivers/media/platform/blackfin/Kconfig +Removing drivers/media/platform/arv.c +Removing drivers/irqchip/irq-metag.c +Removing drivers/irqchip/irq-metag-ext.c +Removing drivers/input/misc/bfin_rotary.c +Removing drivers/input/keyboard/bf54x-keys.c +Auto-merging drivers/input/joystick/analog.c +CONFLICT (content): Merge conflict in drivers/input/joystick/analog.c +Removing drivers/i2c/busses/i2c-bfin-twi.c +Removing drivers/gpio/gpio-etraxfs.c +Removing drivers/edac/tile_edac.c +Removing drivers/crypto/bfin_crc.h +Removing drivers/crypto/bfin_crc.c +Removing drivers/cpufreq/cris-etraxfs-cpufreq.c +Removing drivers/cpufreq/cris-artpec3-cpufreq.c +Removing drivers/cpufreq/blackfin-cpufreq.c +Removing drivers/clocksource/metag_generic.c +Auto-merging drivers/clocksource/Kconfig +Removing drivers/char/tile-srom.c +Removing drivers/char/ds1302.c +Removing drivers/char/bfin-otp.c +Removing drivers/ata/pata_bf54x.c +Removing arch/tile/mm/pgtable.c +Removing arch/tile/mm/mmap.c +Removing arch/tile/mm/migrate_64.S +Removing arch/tile/mm/migrate_32.S +Removing arch/tile/mm/migrate.h +Removing arch/tile/mm/init.c +Removing arch/tile/mm/hugetlbpage.c +Removing arch/tile/mm/homecache.c +Removing arch/tile/mm/highmem.c +Removing arch/tile/mm/fault.c +Removing arch/tile/mm/extable.c +Removing arch/tile/mm/elf.c +Removing arch/tile/mm/Makefile +Removing arch/tile/lib/usercopy_64.S +Removing arch/tile/lib/usercopy_32.S +Removing arch/tile/lib/uaccess.c +Removing arch/tile/lib/strnlen_64.c +Removing arch/tile/lib/strnlen_32.c +Removing arch/tile/lib/strlen_64.c +Removing arch/tile/lib/strlen_32.c +Removing arch/tile/lib/string-endian.h +Removing arch/tile/lib/strchr_64.c +Removing arch/tile/lib/strchr_32.c +Removing arch/tile/lib/spinlock_common.h +Removing arch/tile/lib/spinlock_64.c +Removing arch/tile/lib/spinlock_32.c +Removing arch/tile/lib/memset_64.c +Removing arch/tile/lib/memset_32.c +Removing arch/tile/lib/memmove.c +Removing arch/tile/lib/memcpy_user_64.c +Removing arch/tile/lib/memcpy_64.c +Removing arch/tile/lib/memcpy_32.S +Removing arch/tile/lib/memchr_64.c +Removing arch/tile/lib/memchr_32.c +Removing arch/tile/lib/exports.c +Removing arch/tile/lib/delay.c +Removing arch/tile/lib/cpumask.c +Removing arch/tile/lib/checksum.c +Removing arch/tile/lib/cacheflush.c +Removing arch/tile/lib/atomic_asm_32.S +Removing arch/tile/lib/atomic_32.c +Removing arch/tile/lib/Makefile +Removing arch/tile/kvm/Kconfig +Removing arch/tile/kernel/vmlinux.lds.S +Removing arch/tile/kernel/vdso/vrt_sigreturn.S +Removing arch/tile/kernel/vdso/vgettimeofday.c +Removing arch/tile/kernel/vdso/vdso32.S +Removing arch/tile/kernel/vdso/vdso.lds.S +Removing arch/tile/kernel/vdso/vdso.S +Removing arch/tile/kernel/vdso/Makefile +Removing arch/tile/kernel/vdso.c +Removing arch/tile/kernel/usb.c +Removing arch/tile/kernel/unaligned.c +Removing arch/tile/kernel/traps.c +Removing arch/tile/kernel/tlb.c +Removing arch/tile/kernel/time.c +Removing arch/tile/kernel/tile-desc_64.c +Removing arch/tile/kernel/tile-desc_32.c +Removing arch/tile/kernel/sysfs.c +Removing arch/tile/kernel/sys.c +Removing arch/tile/kernel/stack.c +Removing arch/tile/kernel/smpboot.c +Removing arch/tile/kernel/smp.c +Removing arch/tile/kernel/single_step.c +Removing arch/tile/kernel/signal.c +Removing arch/tile/kernel/setup.c +Removing arch/tile/kernel/relocate_kernel_64.S +Removing arch/tile/kernel/relocate_kernel_32.S +Removing arch/tile/kernel/regs_64.S +Removing arch/tile/kernel/regs_32.S +Removing arch/tile/kernel/reboot.c +Removing arch/tile/kernel/ptrace.c +Removing arch/tile/kernel/process.c +Removing arch/tile/kernel/proc.c +Removing arch/tile/kernel/pmc.c +Removing arch/tile/kernel/perf_event.c +Removing arch/tile/kernel/pci_gx.c +Removing arch/tile/kernel/pci.c +Removing arch/tile/kernel/pci-dma.c +Removing arch/tile/kernel/module.c +Removing arch/tile/kernel/messaging.c +Removing arch/tile/kernel/mcount_64.S +Removing arch/tile/kernel/machine_kexec.c +Removing arch/tile/kernel/kprobes.c +Removing arch/tile/kernel/kgdb.c +Removing arch/tile/kernel/jump_label.c +Removing arch/tile/kernel/irq.c +Removing arch/tile/kernel/intvec_64.S +Removing arch/tile/kernel/intvec_32.S +Removing arch/tile/kernel/hvglue_trace.c +Removing arch/tile/kernel/hvglue.S +Removing arch/tile/kernel/head_64.S +Removing arch/tile/kernel/head_32.S +Removing arch/tile/kernel/hardwall.c +Removing arch/tile/kernel/ftrace.c +Removing arch/tile/kernel/entry.S +Removing arch/tile/kernel/early_printk.c +Removing arch/tile/kernel/compat_signal.c +Removing arch/tile/kernel/compat.c +Removing arch/tile/kernel/backtrace.c +Removing arch/tile/kernel/asm-offsets.c +Removing arch/tile/kernel/Makefile +Removing arch/tile/include/uapi/asm/unistd.h +Removing arch/tile/include/uapi/asm/swab.h +Removing arch/tile/include/uapi/asm/stat.h +Removing arch/tile/include/uapi/asm/signal.h +Removing arch/tile/include/uapi/asm/siginfo.h +Removing arch/tile/include/uapi/asm/sigcontext.h +Removing arch/tile/include/uapi/asm/setup.h +Removing arch/tile/include/uapi/asm/ptrace.h +Removing arch/tile/include/uapi/asm/mman.h +Removing arch/tile/include/uapi/asm/kvm_para.h +Removing arch/tile/include/uapi/asm/hardwall.h +Removing arch/tile/include/uapi/asm/cachectl.h +Removing arch/tile/include/uapi/asm/byteorder.h +Removing arch/tile/include/uapi/asm/bitsperlong.h +Removing arch/tile/include/uapi/asm/auxvec.h +Removing arch/tile/include/uapi/asm/Kbuild +Removing arch/tile/include/uapi/arch/spr_def_64.h +Removing arch/tile/include/uapi/arch/spr_def_32.h +Removing arch/tile/include/uapi/arch/spr_def.h +Removing arch/tile/include/uapi/arch/sim_def.h +Removing arch/tile/include/uapi/arch/sim.h +Removing arch/tile/include/uapi/arch/opcode_tilepro.h +Removing arch/tile/include/uapi/arch/opcode_tilegx.h +Removing arch/tile/include/uapi/arch/opcode.h +Removing arch/tile/include/uapi/arch/intreg.h +Removing arch/tile/include/uapi/arch/interrupts_64.h +Removing arch/tile/include/uapi/arch/interrupts_32.h +Removing arch/tile/include/uapi/arch/interrupts.h +Removing arch/tile/include/uapi/arch/icache.h +Removing arch/tile/include/uapi/arch/chip_tilepro.h +Removing arch/tile/include/uapi/arch/chip_tilegx.h +Removing arch/tile/include/uapi/arch/chip.h +Removing arch/tile/include/uapi/arch/abi.h +Removing arch/tile/include/hv/syscall_public.h +Removing arch/tile/include/hv/netio_intf.h +Removing arch/tile/include/hv/netio_errors.h +Removing arch/tile/include/hv/iorpc.h +Removing arch/tile/include/hv/hypervisor.h +Removing arch/tile/include/hv/drv_xgbe_intf.h +Removing arch/tile/include/hv/drv_xgbe_impl.h +Removing arch/tile/include/hv/drv_usb_host_intf.h +Removing arch/tile/include/hv/drv_uart_intf.h +Removing arch/tile/include/hv/drv_trio_intf.h +Removing arch/tile/include/hv/drv_srom_intf.h +Removing arch/tile/include/hv/drv_pcie_rc_intf.h +Removing arch/tile/include/hv/drv_mshim_intf.h +Removing arch/tile/include/hv/drv_mpipe_intf.h +Removing arch/tile/include/gxio/usb_host.h +Removing arch/tile/include/gxio/uart.h +Removing arch/tile/include/gxio/trio.h +Removing arch/tile/include/gxio/mpipe.h +Removing arch/tile/include/gxio/kiorpc.h +Removing arch/tile/include/gxio/iorpc_usb_host.h +Removing arch/tile/include/gxio/iorpc_uart.h +Removing arch/tile/include/gxio/iorpc_trio.h +Removing arch/tile/include/gxio/iorpc_mpipe_info.h +Removing arch/tile/include/gxio/iorpc_mpipe.h +Removing arch/tile/include/gxio/iorpc_globals.h +Removing arch/tile/include/gxio/dma_queue.h +Removing arch/tile/include/gxio/common.h +Removing arch/tile/include/asm/word-at-a-time.h +Removing arch/tile/include/asm/vga.h +Removing arch/tile/include/asm/vdso.h +Removing arch/tile/include/asm/user.h +Removing arch/tile/include/asm/unistd.h +Removing arch/tile/include/asm/unaligned.h +Removing arch/tile/include/asm/uaccess.h +Removing arch/tile/include/asm/traps.h +Removing arch/tile/include/asm/topology.h +Removing arch/tile/include/asm/tlbflush.h +Removing arch/tile/include/asm/tlb.h +Removing arch/tile/include/asm/timex.h +Removing arch/tile/include/asm/tile-desc_64.h +Removing arch/tile/include/asm/tile-desc_32.h +Removing arch/tile/include/asm/tile-desc.h +Removing arch/tile/include/asm/thread_info.h +Removing arch/tile/include/asm/syscalls.h +Removing arch/tile/include/asm/syscall.h +Removing arch/tile/include/asm/switch_to.h +Removing arch/tile/include/asm/string.h +Removing arch/tile/include/asm/stack.h +Removing arch/tile/include/asm/spinlock_types.h +Removing arch/tile/include/asm/spinlock_64.h +Removing arch/tile/include/asm/spinlock_32.h +Removing arch/tile/include/asm/spinlock.h +Removing arch/tile/include/asm/smp.h +Removing arch/tile/include/asm/signal.h +Removing arch/tile/include/asm/sigframe.h +Removing arch/tile/include/asm/setup.h +Removing arch/tile/include/asm/sections.h +Removing arch/tile/include/asm/ptrace.h +Removing arch/tile/include/asm/processor.h +Removing arch/tile/include/asm/pmc.h +Removing arch/tile/include/asm/pgtable_64.h +Removing arch/tile/include/asm/pgtable_32.h +Removing arch/tile/include/asm/pgtable.h +Removing arch/tile/include/asm/pgalloc.h +Removing arch/tile/include/asm/perf_event.h +Removing arch/tile/include/asm/percpu.h +Removing arch/tile/include/asm/pci.h +Removing arch/tile/include/asm/page.h +Removing arch/tile/include/asm/module.h +Removing arch/tile/include/asm/mmzone.h +Removing arch/tile/include/asm/mmu_context.h +Removing arch/tile/include/asm/mmu.h +Removing arch/tile/include/asm/linkage.h +Removing arch/tile/include/asm/kprobes.h +Removing arch/tile/include/asm/kmap_types.h +Removing arch/tile/include/asm/kgdb.h +Removing arch/tile/include/asm/kexec.h +Removing arch/tile/include/asm/kdebug.h +Removing arch/tile/include/asm/jump_label.h +Removing arch/tile/include/asm/irqflags.h +Removing arch/tile/include/asm/irq_work.h +Removing arch/tile/include/asm/irq.h +Removing arch/tile/include/asm/io.h +Removing arch/tile/include/asm/insn.h +Removing arch/tile/include/asm/ide.h +Removing arch/tile/include/asm/hv_driver.h +Removing arch/tile/include/asm/hugetlb.h +Removing arch/tile/include/asm/homecache.h +Removing arch/tile/include/asm/highmem.h +Removing arch/tile/include/asm/hardwall.h +Removing arch/tile/include/asm/hardirq.h +Removing arch/tile/include/asm/futex.h +Removing arch/tile/include/asm/ftrace.h +Removing arch/tile/include/asm/fixmap.h +Removing arch/tile/include/asm/elf.h +Removing arch/tile/include/asm/dma.h +Removing arch/tile/include/asm/dma-mapping.h +Removing arch/tile/include/asm/div64.h +Removing arch/tile/include/asm/device.h +Removing arch/tile/include/asm/delay.h +Removing arch/tile/include/asm/current.h +Removing arch/tile/include/asm/compat.h +Removing arch/tile/include/asm/cmpxchg.h +Removing arch/tile/include/asm/checksum.h +Removing arch/tile/include/asm/cacheflush.h +Removing arch/tile/include/asm/cache.h +Removing arch/tile/include/asm/bitops_64.h +Removing arch/tile/include/asm/bitops_32.h +Removing arch/tile/include/asm/bitops.h +Removing arch/tile/include/asm/barrier.h +Removing arch/tile/include/asm/backtrace.h +Removing arch/tile/include/asm/atomic_64.h +Removing arch/tile/include/asm/atomic_32.h +Removing arch/tile/include/asm/atomic.h +Removing arch/tile/include/asm/asm-offsets.h +Removing arch/tile/include/asm/Kbuild +Removing arch/tile/include/arch/usb_host_def.h +Removing arch/tile/include/arch/usb_host.h +Removing arch/tile/include/arch/uart_def.h +Removing arch/tile/include/arch/uart.h +Removing arch/tile/include/arch/trio_shm_def.h +Removing arch/tile/include/arch/trio_shm.h +Removing arch/tile/include/arch/trio_pcie_rc_def.h +Removing arch/tile/include/arch/trio_pcie_rc.h +Removing arch/tile/include/arch/trio_pcie_intfc_def.h +Removing arch/tile/include/arch/trio_pcie_intfc.h +Removing arch/tile/include/arch/trio_def.h +Removing arch/tile/include/arch/trio_constants.h +Removing arch/tile/include/arch/trio.h +Removing arch/tile/include/arch/spr_def.h +Removing arch/tile/include/arch/mpipe_shm_def.h +Removing arch/tile/include/arch/mpipe_shm.h +Removing arch/tile/include/arch/mpipe_def.h +Removing arch/tile/include/arch/mpipe_constants.h +Removing arch/tile/include/arch/mpipe.h +Removing arch/tile/gxio/usb_host.c +Removing arch/tile/gxio/uart.c +Removing arch/tile/gxio/trio.c +Removing arch/tile/gxio/mpipe.c +Removing arch/tile/gxio/kiorpc.c +Removing arch/tile/gxio/iorpc_usb_host.c +Removing arch/tile/gxio/iorpc_uart.c +Removing arch/tile/gxio/iorpc_trio.c +Removing arch/tile/gxio/iorpc_mpipe_info.c +Removing arch/tile/gxio/iorpc_mpipe.c +Removing arch/tile/gxio/iorpc_globals.c +Removing arch/tile/gxio/dma_queue.c +Removing arch/tile/gxio/Makefile +Removing arch/tile/gxio/Kconfig +Removing arch/tile/configs/tilepro_defconfig +Removing arch/tile/configs/tilegx_defconfig +Removing arch/tile/Makefile +Removing arch/tile/Kconfig.debug +Removing arch/tile/Kconfig +Removing arch/tile/Kbuild +Removing arch/score/mm/tlb-score.c +Removing arch/score/mm/tlb-miss.S +Removing arch/score/mm/pgtable.c +Removing arch/score/mm/init.c +Removing arch/score/mm/fault.c +Removing arch/score/mm/extable.c +Removing arch/score/mm/cache.c +Removing arch/score/mm/Makefile +Removing arch/score/lib/ucmpdi2.c +Removing arch/score/lib/string.S +Removing arch/score/lib/lshrdi3.c +Removing arch/score/lib/libgcc.h +Removing arch/score/lib/cmpdi2.c +Removing arch/score/lib/checksum_copy.c +Removing arch/score/lib/checksum.S +Removing arch/score/lib/ashrdi3.c +Removing arch/score/lib/ashldi3.c +Removing arch/score/lib/Makefile +Removing arch/score/kernel/vmlinux.lds.S +Removing arch/score/kernel/traps.c +Removing arch/score/kernel/time.c +Removing arch/score/kernel/sys_score.c +Removing arch/score/kernel/sys_call_table.c +Removing arch/score/kernel/signal.c +Removing arch/score/kernel/setup.c +Removing arch/score/kernel/ptrace.c +Removing arch/score/kernel/process.c +Removing arch/score/kernel/module.c +Removing arch/score/kernel/irq.c +Removing arch/score/kernel/head.S +Removing arch/score/kernel/entry.S +Removing arch/score/kernel/asm-offsets.c +Removing arch/score/kernel/Makefile +Removing arch/score/include/uapi/asm/unistd.h +Removing arch/score/include/uapi/asm/types.h +Removing arch/score/include/uapi/asm/termios.h +Removing arch/score/include/uapi/asm/termbits.h +Removing arch/score/include/uapi/asm/swab.h +Removing arch/score/include/uapi/asm/statfs.h +Removing arch/score/include/uapi/asm/stat.h +Removing arch/score/include/uapi/asm/sockios.h +Removing arch/score/include/uapi/asm/socket.h +Removing arch/score/include/uapi/asm/signal.h +Removing arch/score/include/uapi/asm/sigcontext.h +Removing arch/score/include/uapi/asm/shmbuf.h +Removing arch/score/include/uapi/asm/setup.h +Removing arch/score/include/uapi/asm/sembuf.h +Removing arch/score/include/uapi/asm/resource.h +Removing arch/score/include/uapi/asm/ptrace.h +Removing arch/score/include/uapi/asm/posix_types.h +Removing arch/score/include/uapi/asm/param.h +Removing arch/score/include/uapi/asm/msgbuf.h +Removing arch/score/include/uapi/asm/mman.h +Removing arch/score/include/uapi/asm/kvm_para.h +Removing arch/score/include/uapi/asm/ipcbuf.h +Removing arch/score/include/uapi/asm/ioctls.h +Removing arch/score/include/uapi/asm/ioctl.h +Removing arch/score/include/uapi/asm/fcntl.h +Removing arch/score/include/uapi/asm/errno.h +Removing arch/score/include/uapi/asm/byteorder.h +Removing arch/score/include/uapi/asm/bitsperlong.h +Removing arch/score/include/uapi/asm/auxvec.h +Removing arch/score/include/uapi/asm/Kbuild +Removing arch/score/include/asm/user.h +Removing arch/score/include/asm/unaligned.h +Removing arch/score/include/asm/ucontext.h +Removing arch/score/include/asm/uaccess.h +Removing arch/score/include/asm/topology.h +Removing arch/score/include/asm/tlbflush.h +Removing arch/score/include/asm/tlb.h +Removing arch/score/include/asm/timex.h +Removing arch/score/include/asm/thread_info.h +Removing arch/score/include/asm/syscalls.h +Removing arch/score/include/asm/switch_to.h +Removing arch/score/include/asm/string.h +Removing arch/score/include/asm/shmparam.h +Removing arch/score/include/asm/setup.h +Removing arch/score/include/asm/segment.h +Removing arch/score/include/asm/scoreregs.h +Removing arch/score/include/asm/ptrace.h +Removing arch/score/include/asm/processor.h +Removing arch/score/include/asm/pgtable.h +Removing arch/score/include/asm/pgtable-bits.h +Removing arch/score/include/asm/pgalloc.h +Removing arch/score/include/asm/percpu.h +Removing arch/score/include/asm/pci.h +Removing arch/score/include/asm/page.h +Removing arch/score/include/asm/module.h +Removing arch/score/include/asm/mmu_context.h +Removing arch/score/include/asm/mmu.h +Removing arch/score/include/asm/local64.h +Removing arch/score/include/asm/local.h +Removing arch/score/include/asm/linkage.h +Removing arch/score/include/asm/kmap_types.h +Removing arch/score/include/asm/kdebug.h +Removing arch/score/include/asm/irqflags.h +Removing arch/score/include/asm/irq_regs.h +Removing arch/score/include/asm/irq.h +Removing arch/score/include/asm/io.h +Removing arch/score/include/asm/hw_irq.h +Removing arch/score/include/asm/hardirq.h +Removing arch/score/include/asm/futex.h +Removing arch/score/include/asm/ftrace.h +Removing arch/score/include/asm/fixmap.h +Removing arch/score/include/asm/exec.h +Removing arch/score/include/asm/emergency-restart.h +Removing arch/score/include/asm/elf.h +Removing arch/score/include/asm/dma.h +Removing arch/score/include/asm/div64.h +Removing arch/score/include/asm/device.h +Removing arch/score/include/asm/delay.h +Removing arch/score/include/asm/cmpxchg.h +Removing arch/score/include/asm/checksum.h +Removing arch/score/include/asm/cacheflush.h +Removing arch/score/include/asm/cache.h +Removing arch/score/include/asm/bugs.h +Removing arch/score/include/asm/bug.h +Removing arch/score/include/asm/bitops.h +Removing arch/score/include/asm/atomic.h +Removing arch/score/include/asm/asmmacro.h +Removing arch/score/include/asm/asm-offsets.h +Removing arch/score/include/asm/Kbuild +Removing arch/score/configs/spct6600_defconfig +Removing arch/score/boot/Makefile +Removing arch/score/Makefile +Removing arch/score/Kconfig.debug +Removing arch/score/Kconfig +Removing arch/mn10300/unit-asb2364/unit-init.c +Removing arch/mn10300/unit-asb2364/smsc911x.c +Removing arch/mn10300/unit-asb2364/leds.c +Removing arch/mn10300/unit-asb2364/irq-fpga.c +Removing arch/mn10300/unit-asb2364/include/unit/timex.h +Removing arch/mn10300/unit-asb2364/include/unit/smsc911x.h +Removing arch/mn10300/unit-asb2364/include/unit/serial.h +Removing arch/mn10300/unit-asb2364/include/unit/leds.h +Removing arch/mn10300/unit-asb2364/include/unit/irq.h +Removing arch/mn10300/unit-asb2364/include/unit/fpga-regs.h +Removing arch/mn10300/unit-asb2364/include/unit/clock.h +Removing arch/mn10300/unit-asb2364/Makefile +Removing arch/mn10300/unit-asb2305/unit-init.c +Removing arch/mn10300/unit-asb2305/pci.c +Removing arch/mn10300/unit-asb2305/pci-irq.c +Removing arch/mn10300/unit-asb2305/pci-asb2305.h +Removing arch/mn10300/unit-asb2305/pci-asb2305.c +Removing arch/mn10300/unit-asb2305/leds.c +Removing arch/mn10300/unit-asb2305/include/unit/timex.h +Removing arch/mn10300/unit-asb2305/include/unit/serial.h +Removing arch/mn10300/unit-asb2305/include/unit/leds.h +Removing arch/mn10300/unit-asb2305/include/unit/clock.h +Removing arch/mn10300/unit-asb2305/Makefile +Removing arch/mn10300/unit-asb2303/unit-init.c +Removing arch/mn10300/unit-asb2303/smc91111.c +Removing arch/mn10300/unit-asb2303/leds.c +Removing arch/mn10300/unit-asb2303/include/unit/timex.h +Removing arch/mn10300/unit-asb2303/include/unit/smc91111.h +Removing arch/mn10300/unit-asb2303/include/unit/serial.h +Removing arch/mn10300/unit-asb2303/include/unit/leds.h +Removing arch/mn10300/unit-asb2303/include/unit/clock.h +Removing arch/mn10300/unit-asb2303/flash.c +Removing arch/mn10300/unit-asb2303/Makefile +Removing arch/mn10300/proc-mn2ws0050/proc-init.c +Removing arch/mn10300/proc-mn2ws0050/include/proc/smp-regs.h +Removing arch/mn10300/proc-mn2ws0050/include/proc/proc.h +Removing arch/mn10300/proc-mn2ws0050/include/proc/nand-regs.h +Removing arch/mn10300/proc-mn2ws0050/include/proc/irq.h +Removing arch/mn10300/proc-mn2ws0050/include/proc/intctl-regs.h +Removing arch/mn10300/proc-mn2ws0050/include/proc/dmactl-regs.h +Removing arch/mn10300/proc-mn2ws0050/include/proc/clock.h +Removing arch/mn10300/proc-mn2ws0050/include/proc/cache.h +Removing arch/mn10300/proc-mn2ws0050/Makefile +Removing arch/mn10300/proc-mn103e010/proc-init.c +Removing arch/mn10300/proc-mn103e010/include/proc/proc.h +Removing arch/mn10300/proc-mn103e010/include/proc/irq.h +Removing arch/mn10300/proc-mn103e010/include/proc/intctl-regs.h +Removing arch/mn10300/proc-mn103e010/include/proc/dmactl-regs.h +Removing arch/mn10300/proc-mn103e010/include/proc/clock.h +Removing arch/mn10300/proc-mn103e010/include/proc/cache.h +Removing arch/mn10300/proc-mn103e010/Makefile +Removing arch/mn10300/oprofile/op_model_null.c +Removing arch/mn10300/oprofile/Makefile +Removing arch/mn10300/mm/tlb-smp.c +Removing arch/mn10300/mm/tlb-mn10300.S +Removing arch/mn10300/mm/pgtable.c +Removing arch/mn10300/mm/mmu-context.c +Removing arch/mn10300/mm/misalignment.c +Removing arch/mn10300/mm/init.c +Removing arch/mn10300/mm/fault.c +Removing arch/mn10300/mm/extable.c +Removing arch/mn10300/mm/dma-alloc.c +Removing arch/mn10300/mm/cache.inc +Removing arch/mn10300/mm/cache.c +Removing arch/mn10300/mm/cache-smp.h +Removing arch/mn10300/mm/cache-smp.c +Removing arch/mn10300/mm/cache-smp-inv.c +Removing arch/mn10300/mm/cache-smp-flush.c +Removing arch/mn10300/mm/cache-inv-icache.c +Removing arch/mn10300/mm/cache-inv-by-tag.S +Removing arch/mn10300/mm/cache-inv-by-reg.S +Removing arch/mn10300/mm/cache-flush-icache.c +Removing arch/mn10300/mm/cache-flush-by-tag.S +Removing arch/mn10300/mm/cache-flush-by-reg.S +Removing arch/mn10300/mm/cache-disabled.c +Removing arch/mn10300/mm/cache-dbg-inv.S +Removing arch/mn10300/mm/cache-dbg-inv-by-tag.S +Removing arch/mn10300/mm/cache-dbg-inv-by-reg.S +Removing arch/mn10300/mm/cache-dbg-flush-by-tag.S +Removing arch/mn10300/mm/cache-dbg-flush-by-reg.S +Removing arch/mn10300/mm/Makefile +Removing arch/mn10300/mm/Kconfig.cache +Removing arch/mn10300/lib/usercopy.c +Removing arch/mn10300/lib/negdi2.c +Removing arch/mn10300/lib/memset.S +Removing arch/mn10300/lib/memmove.S +Removing arch/mn10300/lib/memcpy.S +Removing arch/mn10300/lib/lshrdi3.c +Removing arch/mn10300/lib/internal.h +Removing arch/mn10300/lib/do_csum.S +Removing arch/mn10300/lib/delay.c +Removing arch/mn10300/lib/checksum.c +Removing arch/mn10300/lib/bitops.c +Removing arch/mn10300/lib/ashrdi3.c +Removing arch/mn10300/lib/__ucmpdi2.S +Removing arch/mn10300/lib/__lshrdi3.S +Removing arch/mn10300/lib/__ashrdi3.S +Removing arch/mn10300/lib/__ashldi3.S +Removing arch/mn10300/lib/Makefile +Removing arch/mn10300/kernel/vmlinux.lds.S +Removing arch/mn10300/kernel/traps.c +Removing arch/mn10300/kernel/time.c +Removing arch/mn10300/kernel/sys_mn10300.c +Removing arch/mn10300/kernel/switch_to.S +Removing arch/mn10300/kernel/smp.c +Removing arch/mn10300/kernel/smp-low.S +Removing arch/mn10300/kernel/signal.c +Removing arch/mn10300/kernel/sigframe.h +Removing arch/mn10300/kernel/setup.c +Removing arch/mn10300/kernel/rtc.c +Removing arch/mn10300/kernel/ptrace.c +Removing arch/mn10300/kernel/profile.c +Removing arch/mn10300/kernel/profile-low.S +Removing arch/mn10300/kernel/process.c +Removing arch/mn10300/kernel/module.c +Removing arch/mn10300/kernel/mn10300_ksyms.c +Removing arch/mn10300/kernel/mn10300-watchdog.c +Removing arch/mn10300/kernel/mn10300-watchdog-low.S +Removing arch/mn10300/kernel/mn10300-serial.h +Removing arch/mn10300/kernel/mn10300-serial.c +Removing arch/mn10300/kernel/mn10300-serial-low.S +Removing arch/mn10300/kernel/mn10300-debug.c +Removing arch/mn10300/kernel/kprobes.c +Removing arch/mn10300/kernel/kgdb.c +Removing arch/mn10300/kernel/irq.c +Removing arch/mn10300/kernel/io.c +Removing arch/mn10300/kernel/internal.h +Removing arch/mn10300/kernel/head.S +Removing arch/mn10300/kernel/gdb-stub.c +Removing arch/mn10300/kernel/gdb-low.S +Removing arch/mn10300/kernel/gdb-io-ttysm.c +Removing arch/mn10300/kernel/gdb-io-ttysm-low.S +Removing arch/mn10300/kernel/gdb-io-serial.c +Removing arch/mn10300/kernel/gdb-io-serial-low.S +Removing arch/mn10300/kernel/fpu.c +Removing arch/mn10300/kernel/fpu-nofpu.c +Removing arch/mn10300/kernel/fpu-nofpu-low.S +Removing arch/mn10300/kernel/fpu-low.S +Removing arch/mn10300/kernel/entry.S +Removing arch/mn10300/kernel/csrc-mn10300.c +Removing arch/mn10300/kernel/cevt-mn10300.c +Removing arch/mn10300/kernel/asm-offsets.c +Removing arch/mn10300/kernel/Makefile +Removing arch/mn10300/include/uapi/asm/unistd.h +Removing arch/mn10300/include/uapi/asm/types.h +Removing arch/mn10300/include/uapi/asm/termios.h +Removing arch/mn10300/include/uapi/asm/termbits.h +Removing arch/mn10300/include/uapi/asm/swab.h +Removing arch/mn10300/include/uapi/asm/statfs.h +Removing arch/mn10300/include/uapi/asm/stat.h +Removing arch/mn10300/include/uapi/asm/sockios.h +Removing arch/mn10300/include/uapi/asm/socket.h +Removing arch/mn10300/include/uapi/asm/signal.h +Removing arch/mn10300/include/uapi/asm/sigcontext.h +Removing arch/mn10300/include/uapi/asm/shmbuf.h +Removing arch/mn10300/include/uapi/asm/setup.h +Removing arch/mn10300/include/uapi/asm/sembuf.h +Removing arch/mn10300/include/uapi/asm/resource.h +Removing arch/mn10300/include/uapi/asm/ptrace.h +Removing arch/mn10300/include/uapi/asm/posix_types.h +Removing arch/mn10300/include/uapi/asm/param.h +Removing arch/mn10300/include/uapi/asm/msgbuf.h +Removing arch/mn10300/include/uapi/asm/mman.h +Removing arch/mn10300/include/uapi/asm/kvm_para.h +Removing arch/mn10300/include/uapi/asm/ipcbuf.h +Removing arch/mn10300/include/uapi/asm/ioctls.h +Removing arch/mn10300/include/uapi/asm/ioctl.h +Removing arch/mn10300/include/uapi/asm/fcntl.h +Removing arch/mn10300/include/uapi/asm/errno.h +Removing arch/mn10300/include/uapi/asm/byteorder.h +Removing arch/mn10300/include/uapi/asm/bitsperlong.h +Removing arch/mn10300/include/uapi/asm/auxvec.h +Removing arch/mn10300/include/uapi/asm/Kbuild +Removing arch/mn10300/include/asm/xor.h +Removing arch/mn10300/include/asm/vga.h +Removing arch/mn10300/include/asm/user.h +Removing arch/mn10300/include/asm/unistd.h +Removing arch/mn10300/include/asm/unaligned.h +Removing arch/mn10300/include/asm/ucontext.h +Removing arch/mn10300/include/asm/uaccess.h +Removing arch/mn10300/include/asm/types.h +Removing arch/mn10300/include/asm/topology.h +Removing arch/mn10300/include/asm/tlbflush.h +Removing arch/mn10300/include/asm/tlb.h +Removing arch/mn10300/include/asm/timex.h +Removing arch/mn10300/include/asm/timer-regs.h +Removing arch/mn10300/include/asm/thread_info.h +Removing arch/mn10300/include/asm/termios.h +Removing arch/mn10300/include/asm/syscall.h +Removing arch/mn10300/include/asm/switch_to.h +Removing arch/mn10300/include/asm/string.h +Removing arch/mn10300/include/asm/spinlock_types.h +Removing arch/mn10300/include/asm/spinlock.h +Removing arch/mn10300/include/asm/smsc911x.h +Removing arch/mn10300/include/asm/smp.h +Removing arch/mn10300/include/asm/signal.h +Removing arch/mn10300/include/asm/shmparam.h +Removing arch/mn10300/include/asm/setup.h +Removing arch/mn10300/include/asm/serial.h +Removing arch/mn10300/include/asm/serial-regs.h +Removing arch/mn10300/include/asm/rwlock.h +Removing arch/mn10300/include/asm/rtc.h +Removing arch/mn10300/include/asm/rtc-regs.h +Removing arch/mn10300/include/asm/reset-regs.h +Removing arch/mn10300/include/asm/ptrace.h +Removing arch/mn10300/include/asm/processor.h +Removing arch/mn10300/include/asm/pio-regs.h +Removing arch/mn10300/include/asm/pgtable.h +Removing arch/mn10300/include/asm/pgalloc.h +Removing arch/mn10300/include/asm/percpu.h +Removing arch/mn10300/include/asm/pci.h +Removing arch/mn10300/include/asm/page_offset.h +Removing arch/mn10300/include/asm/page.h +Removing arch/mn10300/include/asm/nmi.h +Removing arch/mn10300/include/asm/module.h +Removing arch/mn10300/include/asm/mmu_context.h +Removing arch/mn10300/include/asm/mmu.h +Removing arch/mn10300/include/asm/mc146818rtc.h +Removing arch/mn10300/include/asm/local64.h +Removing arch/mn10300/include/asm/local.h +Removing arch/mn10300/include/asm/linkage.h +Removing arch/mn10300/include/asm/kprobes.h +Removing arch/mn10300/include/asm/kmap_types.h +Removing arch/mn10300/include/asm/kgdb.h +Removing arch/mn10300/include/asm/kdebug.h +Removing arch/mn10300/include/asm/irqflags.h +Removing arch/mn10300/include/asm/irq_regs.h +Removing arch/mn10300/include/asm/irq.h +Removing arch/mn10300/include/asm/io.h +Removing arch/mn10300/include/asm/intctl-regs.h +Removing arch/mn10300/include/asm/hw_irq.h +Removing arch/mn10300/include/asm/highmem.h +Removing arch/mn10300/include/asm/hardirq.h +Removing arch/mn10300/include/asm/gdb-stub.h +Removing arch/mn10300/include/asm/futex.h +Removing arch/mn10300/include/asm/ftrace.h +Removing arch/mn10300/include/asm/frame.inc +Removing arch/mn10300/include/asm/fpu.h +Removing arch/mn10300/include/asm/exceptions.h +Removing arch/mn10300/include/asm/emergency-restart.h +Removing arch/mn10300/include/asm/elf.h +Removing arch/mn10300/include/asm/dmactl-regs.h +Removing arch/mn10300/include/asm/dma.h +Removing arch/mn10300/include/asm/dma-mapping.h +Removing arch/mn10300/include/asm/div64.h +Removing arch/mn10300/include/asm/delay.h +Removing arch/mn10300/include/asm/debugger.h +Removing arch/mn10300/include/asm/current.h +Removing arch/mn10300/include/asm/cpu-regs.h +Removing arch/mn10300/include/asm/cmpxchg.h +Removing arch/mn10300/include/asm/checksum.h +Removing arch/mn10300/include/asm/cacheflush.h +Removing arch/mn10300/include/asm/cache.h +Removing arch/mn10300/include/asm/busctl-regs.h +Removing arch/mn10300/include/asm/bugs.h +Removing arch/mn10300/include/asm/bug.h +Removing arch/mn10300/include/asm/bitops.h +Removing arch/mn10300/include/asm/atomic.h +Removing arch/mn10300/include/asm/asm-offsets.h +Removing arch/mn10300/include/asm/Kbuild +Removing arch/mn10300/configs/asb2364_defconfig +Removing arch/mn10300/configs/asb2303_defconfig +Removing arch/mn10300/boot/tools/build.c +Removing arch/mn10300/boot/install.sh +Removing arch/mn10300/boot/compressed/vmlinux.lds +Removing arch/mn10300/boot/compressed/misc.h +Removing arch/mn10300/boot/compressed/misc.c +Removing arch/mn10300/boot/compressed/head.S +Removing arch/mn10300/boot/compressed/Makefile +Removing arch/mn10300/boot/Makefile +Removing arch/mn10300/boot/.gitignore +Removing arch/mn10300/Makefile +Removing arch/mn10300/Kconfig.debug +Removing arch/mn10300/Kconfig +Removing arch/metag/tbx/tbitimer.S +Removing arch/metag/tbx/tbistring.c +Removing arch/metag/tbx/tbisoft.S +Removing arch/metag/tbx/tbiroot.S +Removing arch/metag/tbx/tbipcx.S +Removing arch/metag/tbx/tbilogf.S +Removing arch/metag/tbx/tbidspram.S +Removing arch/metag/tbx/tbidefr.S +Removing arch/metag/tbx/tbictxfpu.S +Removing arch/metag/tbx/tbictx.S +Removing arch/metag/tbx/tbicore.S +Removing arch/metag/tbx/Makefile +Removing arch/metag/oprofile/common.c +Removing arch/metag/oprofile/backtrace.h +Removing arch/metag/oprofile/backtrace.c +Removing arch/metag/oprofile/Makefile +Removing arch/metag/mm/numa.c +Removing arch/metag/mm/mmu-meta2.c +Removing arch/metag/mm/mmu-meta1.c +Removing arch/metag/mm/maccess.c +Removing arch/metag/mm/l2cache.c +Removing arch/metag/mm/ioremap.c +Removing arch/metag/mm/init.c +Removing arch/metag/mm/hugetlbpage.c +Removing arch/metag/mm/highmem.c +Removing arch/metag/mm/fault.c +Removing arch/metag/mm/extable.c +Removing arch/metag/mm/cache.c +Removing arch/metag/mm/Makefile +Removing arch/metag/mm/Kconfig +Removing arch/metag/lib/usercopy.c +Removing arch/metag/lib/ucmpdi2.S +Removing arch/metag/lib/muldi3.S +Removing arch/metag/lib/modsi3.S +Removing arch/metag/lib/memset.S +Removing arch/metag/lib/memmove.S +Removing arch/metag/lib/memcpy.S +Removing arch/metag/lib/lshrdi3.S +Removing arch/metag/lib/ip_fast_csum.S +Removing arch/metag/lib/divsi3.S +Removing arch/metag/lib/div64.S +Removing arch/metag/lib/delay.c +Removing arch/metag/lib/copy_page.S +Removing arch/metag/lib/cmpdi2.S +Removing arch/metag/lib/clear_page.S +Removing arch/metag/lib/checksum.c +Removing arch/metag/lib/ashrdi3.S +Removing arch/metag/lib/ashldi3.S +Removing arch/metag/lib/Makefile +Removing arch/metag/kernel/vmlinux.lds.S +Removing arch/metag/kernel/user_gateway.S +Removing arch/metag/kernel/traps.c +Removing arch/metag/kernel/topology.c +Removing arch/metag/kernel/time.c +Removing arch/metag/kernel/tcm.c +Removing arch/metag/kernel/tbiunexp.S +Removing arch/metag/kernel/sys_metag.c +Removing arch/metag/kernel/stacktrace.c +Removing arch/metag/kernel/smp.c +Removing arch/metag/kernel/signal.c +Removing arch/metag/kernel/setup.c +Removing arch/metag/kernel/ptrace.c +Removing arch/metag/kernel/process.c +Removing arch/metag/kernel/perf_callchain.c +Removing arch/metag/kernel/perf/perf_event.h +Removing arch/metag/kernel/perf/perf_event.c +Removing arch/metag/kernel/perf/Makefile +Removing arch/metag/kernel/module.c +Removing arch/metag/kernel/metag_ksyms.c +Removing arch/metag/kernel/machines.c +Removing arch/metag/kernel/kick.c +Removing arch/metag/kernel/irq.c +Removing arch/metag/kernel/head.S +Removing arch/metag/kernel/ftrace_stub.S +Removing arch/metag/kernel/ftrace.c +Removing arch/metag/kernel/dma.c +Removing arch/metag/kernel/devtree.c +Removing arch/metag/kernel/da.c +Removing arch/metag/kernel/core_reg.c +Removing arch/metag/kernel/clock.c +Removing arch/metag/kernel/cachepart.c +Removing arch/metag/kernel/asm-offsets.c +Removing arch/metag/kernel/Makefile +Removing arch/metag/kernel/.gitignore +Removing arch/metag/include/uapi/asm/unistd.h +Removing arch/metag/include/uapi/asm/swab.h +Removing arch/metag/include/uapi/asm/siginfo.h +Removing arch/metag/include/uapi/asm/sigcontext.h +Removing arch/metag/include/uapi/asm/ptrace.h +Removing arch/metag/include/uapi/asm/ech.h +Removing arch/metag/include/uapi/asm/byteorder.h +Removing arch/metag/include/uapi/asm/Kbuild +Removing arch/metag/include/asm/user_gateway.h +Removing arch/metag/include/asm/unistd.h +Removing arch/metag/include/asm/uaccess.h +Removing arch/metag/include/asm/traps.h +Removing arch/metag/include/asm/topology.h +Removing arch/metag/include/asm/tlbflush.h +Removing arch/metag/include/asm/tlb.h +Removing arch/metag/include/asm/thread_info.h +Removing arch/metag/include/asm/tcm.h +Removing arch/metag/include/asm/tbx.h +Removing arch/metag/include/asm/syscalls.h +Removing arch/metag/include/asm/syscall.h +Removing arch/metag/include/asm/switch.h +Removing arch/metag/include/asm/string.h +Removing arch/metag/include/asm/stacktrace.h +Removing arch/metag/include/asm/spinlock_types.h +Removing arch/metag/include/asm/spinlock_lock1.h +Removing arch/metag/include/asm/spinlock_lnkget.h +Removing arch/metag/include/asm/spinlock.h +Removing arch/metag/include/asm/sparsemem.h +Removing arch/metag/include/asm/smp.h +Removing arch/metag/include/asm/setup.h +Removing arch/metag/include/asm/ptrace.h +Removing arch/metag/include/asm/processor.h +Removing arch/metag/include/asm/pgtable.h +Removing arch/metag/include/asm/pgtable-bits.h +Removing arch/metag/include/asm/pgalloc.h +Removing arch/metag/include/asm/perf_event.h +Removing arch/metag/include/asm/page.h +Removing arch/metag/include/asm/module.h +Removing arch/metag/include/asm/mmzone.h +Removing arch/metag/include/asm/mmu_context.h +Removing arch/metag/include/asm/mmu.h +Removing arch/metag/include/asm/mman.h +Removing arch/metag/include/asm/metag_regs.h +Removing arch/metag/include/asm/metag_mem.h +Removing arch/metag/include/asm/metag_isa.h +Removing arch/metag/include/asm/mach/arch.h +Removing arch/metag/include/asm/linkage.h +Removing arch/metag/include/asm/l2cache.h +Removing arch/metag/include/asm/irqflags.h +Removing arch/metag/include/asm/irq.h +Removing arch/metag/include/asm/io.h +Removing arch/metag/include/asm/hwthread.h +Removing arch/metag/include/asm/hugetlb.h +Removing arch/metag/include/asm/highmem.h +Removing arch/metag/include/asm/global_lock.h +Removing arch/metag/include/asm/ftrace.h +Removing arch/metag/include/asm/fixmap.h +Removing arch/metag/include/asm/elf.h +Removing arch/metag/include/asm/dma-mapping.h +Removing arch/metag/include/asm/div64.h +Removing arch/metag/include/asm/delay.h +Removing arch/metag/include/asm/da.h +Removing arch/metag/include/asm/cpu.h +Removing arch/metag/include/asm/core_reg.h +Removing arch/metag/include/asm/cmpxchg_lock1.h +Removing arch/metag/include/asm/cmpxchg_lnkget.h +Removing arch/metag/include/asm/cmpxchg_irq.h +Removing arch/metag/include/asm/cmpxchg.h +Removing arch/metag/include/asm/clock.h +Removing arch/metag/include/asm/checksum.h +Removing arch/metag/include/asm/cachepart.h +Removing arch/metag/include/asm/cacheflush.h +Removing arch/metag/include/asm/cache.h +Removing arch/metag/include/asm/bug.h +Removing arch/metag/include/asm/bitops.h +Removing arch/metag/include/asm/barrier.h +Removing arch/metag/include/asm/atomic_lock1.h +Removing arch/metag/include/asm/atomic_lnkget.h +Removing arch/metag/include/asm/atomic.h +Removing arch/metag/include/asm/Kbuild +Removing arch/metag/configs/tz1090_defconfig +Removing arch/metag/configs/meta2_smp_defconfig +Removing arch/metag/configs/meta2_defconfig +Removing arch/metag/configs/meta1_defconfig +Removing arch/metag/boot/dts/tz1090_generic.dts +Removing arch/metag/boot/dts/tz1090.dtsi +Removing arch/metag/boot/dts/skeleton.dtsi +Removing arch/metag/boot/dts/skeleton.dts +Removing arch/metag/boot/dts/Makefile +Removing arch/metag/boot/Makefile +Removing arch/metag/boot/.gitignore +Removing arch/metag/Makefile +Removing arch/metag/Kconfig.soc +Removing arch/metag/Kconfig.debug +Removing arch/metag/Kconfig +Removing arch/m32r/platforms/usrv/setup.c +Removing arch/m32r/platforms/usrv/io.c +Removing arch/m32r/platforms/usrv/Makefile +Removing arch/m32r/platforms/opsput/setup.c +Removing arch/m32r/platforms/opsput/io.c +Removing arch/m32r/platforms/opsput/dot.gdbinit +Removing arch/m32r/platforms/opsput/Makefile +Removing arch/m32r/platforms/oaks32r/setup.c +Removing arch/m32r/platforms/oaks32r/io.c +Removing arch/m32r/platforms/oaks32r/dot.gdbinit.nommu +Removing arch/m32r/platforms/oaks32r/Makefile +Removing arch/m32r/platforms/mappi3/setup.c +Removing arch/m32r/platforms/mappi3/io.c +Removing arch/m32r/platforms/mappi3/dot.gdbinit +Removing arch/m32r/platforms/mappi3/Makefile +Removing arch/m32r/platforms/mappi2/setup.c +Removing arch/m32r/platforms/mappi2/io.c +Removing arch/m32r/platforms/mappi2/dot.gdbinit.vdec2 +Removing arch/m32r/platforms/mappi2/Makefile +Removing arch/m32r/platforms/mappi/setup.c +Removing arch/m32r/platforms/mappi/io.c +Removing arch/m32r/platforms/mappi/dot.gdbinit.smp +Removing arch/m32r/platforms/mappi/dot.gdbinit.nommu +Removing arch/m32r/platforms/mappi/dot.gdbinit +Removing arch/m32r/platforms/mappi/Makefile +Removing arch/m32r/platforms/m32700ut/setup.c +Removing arch/m32r/platforms/m32700ut/io.c +Removing arch/m32r/platforms/m32700ut/dot.gdbinit_400MHz_32MB +Removing arch/m32r/platforms/m32700ut/dot.gdbinit_300MHz_32MB +Removing arch/m32r/platforms/m32700ut/dot.gdbinit_200MHz_16MB +Removing arch/m32r/platforms/m32700ut/Makefile +Removing arch/m32r/platforms/m32104ut/setup.c +Removing arch/m32r/platforms/m32104ut/io.c +Removing arch/m32r/platforms/m32104ut/Makefile +Removing arch/m32r/platforms/Makefile +Removing arch/m32r/oprofile/init.c +Removing arch/m32r/oprofile/Makefile +Removing arch/m32r/mm/page.S +Removing arch/m32r/mm/mmu.S +Removing arch/m32r/mm/ioremap.c +Removing arch/m32r/mm/ioremap-nommu.c +Removing arch/m32r/mm/init.c +Removing arch/m32r/mm/fault.c +Removing arch/m32r/mm/fault-nommu.c +Removing arch/m32r/mm/extable.c +Removing arch/m32r/mm/discontig.c +Removing arch/m32r/mm/cache.c +Removing arch/m32r/mm/Makefile +Removing arch/m32r/lib/usercopy.c +Removing arch/m32r/lib/ucmpdi2.c +Removing arch/m32r/lib/strlen.S +Removing arch/m32r/lib/memset.S +Removing arch/m32r/lib/memcpy.S +Removing arch/m32r/lib/libgcc.h +Removing arch/m32r/lib/delay.c +Removing arch/m32r/lib/csum_partial_copy.c +Removing arch/m32r/lib/checksum.S +Removing arch/m32r/lib/ashxdi3.S +Removing arch/m32r/lib/Makefile +Removing arch/m32r/kernel/vmlinux.lds.S +Removing arch/m32r/kernel/traps.c +Removing arch/m32r/kernel/time.c +Removing arch/m32r/kernel/syscall_table.S +Removing arch/m32r/kernel/sys_m32r.c +Removing arch/m32r/kernel/smpboot.c +Removing arch/m32r/kernel/smp.c +Removing arch/m32r/kernel/signal.c +Removing arch/m32r/kernel/setup.c +Removing arch/m32r/kernel/ptrace.c +Removing arch/m32r/kernel/process.c +Removing arch/m32r/kernel/module.c +Removing arch/m32r/kernel/m32r_ksyms.c +Removing arch/m32r/kernel/irq.c +Removing arch/m32r/kernel/head.S +Removing arch/m32r/kernel/entry.S +Removing arch/m32r/kernel/asm-offsets.c +Removing arch/m32r/kernel/align.c +Removing arch/m32r/kernel/Makefile +Removing arch/m32r/kernel/.gitignore +Removing arch/m32r/include/uapi/asm/unistd.h +Removing arch/m32r/include/uapi/asm/types.h +Removing arch/m32r/include/uapi/asm/termios.h +Removing arch/m32r/include/uapi/asm/termbits.h +Removing arch/m32r/include/uapi/asm/swab.h +Removing arch/m32r/include/uapi/asm/statfs.h +Removing arch/m32r/include/uapi/asm/stat.h +Removing arch/m32r/include/uapi/asm/sockios.h +Removing arch/m32r/include/uapi/asm/socket.h +Removing arch/m32r/include/uapi/asm/signal.h +Removing arch/m32r/include/uapi/asm/sigcontext.h +Removing arch/m32r/include/uapi/asm/shmbuf.h +Removing arch/m32r/include/uapi/asm/setup.h +Removing arch/m32r/include/uapi/asm/sembuf.h +Removing arch/m32r/include/uapi/asm/resource.h +Removing arch/m32r/include/uapi/asm/ptrace.h +Removing arch/m32r/include/uapi/asm/posix_types.h +Removing arch/m32r/include/uapi/asm/param.h +Removing arch/m32r/include/uapi/asm/msgbuf.h +Removing arch/m32r/include/uapi/asm/mman.h +Removing arch/m32r/include/uapi/asm/ipcbuf.h +Removing arch/m32r/include/uapi/asm/ioctls.h +Removing arch/m32r/include/uapi/asm/ioctl.h +Removing arch/m32r/include/uapi/asm/fcntl.h +Removing arch/m32r/include/uapi/asm/errno.h +Removing arch/m32r/include/uapi/asm/byteorder.h +Removing arch/m32r/include/uapi/asm/bitsperlong.h +Removing arch/m32r/include/uapi/asm/auxvec.h +Removing arch/m32r/include/uapi/asm/Kbuild +Removing arch/m32r/include/asm/xor.h +Removing arch/m32r/include/asm/vga.h +Removing arch/m32r/include/asm/user.h +Removing arch/m32r/include/asm/unistd.h +Removing arch/m32r/include/asm/unaligned.h +Removing arch/m32r/include/asm/ucontext.h +Removing arch/m32r/include/asm/uaccess.h +Removing arch/m32r/include/asm/types.h +Removing arch/m32r/include/asm/topology.h +Removing arch/m32r/include/asm/tlbflush.h +Removing arch/m32r/include/asm/tlb.h +Removing arch/m32r/include/asm/timex.h +Removing arch/m32r/include/asm/thread_info.h +Removing arch/m32r/include/asm/termios.h +Removing arch/m32r/include/asm/syscall.h +Removing arch/m32r/include/asm/switch_to.h +Removing arch/m32r/include/asm/string.h +Removing arch/m32r/include/asm/spinlock_types.h +Removing arch/m32r/include/asm/spinlock.h +Removing arch/m32r/include/asm/smp.h +Removing arch/m32r/include/asm/signal.h +Removing arch/m32r/include/asm/shmparam.h +Removing arch/m32r/include/asm/setup.h +Removing arch/m32r/include/asm/serial.h +Removing arch/m32r/include/asm/segment.h +Removing arch/m32r/include/asm/s1d13806.h +Removing arch/m32r/include/asm/rtc.h +Removing arch/m32r/include/asm/ptrace.h +Removing arch/m32r/include/asm/processor.h +Removing arch/m32r/include/asm/pgtable.h +Removing arch/m32r/include/asm/pgtable-2level.h +Removing arch/m32r/include/asm/pgalloc.h +Removing arch/m32r/include/asm/percpu.h +Removing arch/m32r/include/asm/pci.h +Removing arch/m32r/include/asm/page.h +Removing arch/m32r/include/asm/opsput/opsput_pld.h +Removing arch/m32r/include/asm/opsput/opsput_lcd.h +Removing arch/m32r/include/asm/opsput/opsput_lan.h +Removing arch/m32r/include/asm/mmzone.h +Removing arch/m32r/include/asm/mmu_context.h +Removing arch/m32r/include/asm/mmu.h +Removing arch/m32r/include/asm/mc146818rtc.h +Removing arch/m32r/include/asm/mappi3/mappi3_pld.h +Removing arch/m32r/include/asm/mappi2/mappi2_pld.h +Removing arch/m32r/include/asm/m32r_mp_fpga.h +Removing arch/m32r/include/asm/m32r.h +Removing arch/m32r/include/asm/m32700ut/m32700ut_pld.h +Removing arch/m32r/include/asm/m32700ut/m32700ut_lcd.h +Removing arch/m32r/include/asm/m32700ut/m32700ut_lan.h +Removing arch/m32r/include/asm/m32104ut/m32104ut_pld.h +Removing arch/m32r/include/asm/m32102.h +Removing arch/m32r/include/asm/local64.h +Removing arch/m32r/include/asm/local.h +Removing arch/m32r/include/asm/linkage.h +Removing arch/m32r/include/asm/kmap_types.h +Removing arch/m32r/include/asm/kdebug.h +Removing arch/m32r/include/asm/irqflags.h +Removing arch/m32r/include/asm/irq_regs.h +Removing arch/m32r/include/asm/irq.h +Removing arch/m32r/include/asm/io.h +Removing arch/m32r/include/asm/hw_irq.h +Removing arch/m32r/include/asm/hardirq.h +Removing arch/m32r/include/asm/futex.h +Removing arch/m32r/include/asm/ftrace.h +Removing arch/m32r/include/asm/flat.h +Removing arch/m32r/include/asm/fb.h +Removing arch/m32r/include/asm/emergency-restart.h +Removing arch/m32r/include/asm/elf.h +Removing arch/m32r/include/asm/dma.h +Removing arch/m32r/include/asm/div64.h +Removing arch/m32r/include/asm/device.h +Removing arch/m32r/include/asm/delay.h +Removing arch/m32r/include/asm/dcache_clear.h +Removing arch/m32r/include/asm/cmpxchg.h +Removing arch/m32r/include/asm/checksum.h +Removing arch/m32r/include/asm/cacheflush.h +Removing arch/m32r/include/asm/cachectl.h +Removing arch/m32r/include/asm/cache.h +Removing arch/m32r/include/asm/bugs.h +Removing arch/m32r/include/asm/bug.h +Removing arch/m32r/include/asm/bitops.h +Removing arch/m32r/include/asm/barrier.h +Removing arch/m32r/include/asm/atomic.h +Removing arch/m32r/include/asm/assembler.h +Removing arch/m32r/include/asm/asm-offsets.h +Removing arch/m32r/include/asm/addrspace.h +Removing arch/m32r/include/asm/Kbuild +Removing arch/m32r/configs/usrv_defconfig +Removing arch/m32r/configs/opsput_defconfig +Removing arch/m32r/configs/oaks32r_defconfig +Removing arch/m32r/configs/mappi3.smp_defconfig +Removing arch/m32r/configs/mappi2.vdec2_defconfig +Removing arch/m32r/configs/mappi2.opsp_defconfig +Removing arch/m32r/configs/mappi.up_defconfig +Removing arch/m32r/configs/mappi.smp_defconfig +Removing arch/m32r/configs/mappi.nommu_defconfig +Removing arch/m32r/configs/m32700ut.up_defconfig +Removing arch/m32r/configs/m32700ut.smp_defconfig +Removing arch/m32r/configs/m32104ut_defconfig +Removing arch/m32r/boot/setup.S +Removing arch/m32r/boot/compressed/vmlinux.scr +Removing arch/m32r/boot/compressed/vmlinux.lds.S +Removing arch/m32r/boot/compressed/misc.c +Removing arch/m32r/boot/compressed/m32r_sio.c +Removing arch/m32r/boot/compressed/install.sh +Removing arch/m32r/boot/compressed/head.S +Removing arch/m32r/boot/compressed/boot.h +Removing arch/m32r/boot/compressed/Makefile +Removing arch/m32r/boot/Makefile +Removing arch/m32r/Makefile +Removing arch/m32r/Kconfig.debug +Removing arch/m32r/Kconfig +Removing arch/frv/mm/tlb-miss.S +Removing arch/frv/mm/tlb-flush.S +Removing arch/frv/mm/pgalloc.c +Removing arch/frv/mm/mmu-context.c +Removing arch/frv/mm/kmap.c +Removing arch/frv/mm/init.c +Removing arch/frv/mm/highmem.c +Removing arch/frv/mm/fault.c +Removing arch/frv/mm/extable.c +Removing arch/frv/mm/elf-fdpic.c +Removing arch/frv/mm/dma-alloc.c +Removing arch/frv/mm/cache-page.c +Removing arch/frv/mm/Makefile +Removing arch/frv/mb93090-mb00/pci-vdk.c +Removing arch/frv/mb93090-mb00/pci-irq.c +Removing arch/frv/mb93090-mb00/pci-frv.h +Removing arch/frv/mb93090-mb00/pci-frv.c +Removing arch/frv/mb93090-mb00/pci-dma.c +Removing arch/frv/mb93090-mb00/pci-dma-nommu.c +Removing arch/frv/mb93090-mb00/flash.c +Removing arch/frv/mb93090-mb00/Makefile +Removing arch/frv/lib/outsl_sw.S +Removing arch/frv/lib/outsl_ns.S +Removing arch/frv/lib/memset.S +Removing arch/frv/lib/memcpy.S +Removing arch/frv/lib/insl_sw.S +Removing arch/frv/lib/insl_ns.S +Removing arch/frv/lib/checksum.c +Removing arch/frv/lib/cache.S +Removing arch/frv/lib/atomic64-ops.S +Removing arch/frv/lib/atomic-ops.S +Removing arch/frv/lib/atomic-lib.c +Removing arch/frv/lib/__ucmpdi2.S +Removing arch/frv/lib/__negdi2.S +Removing arch/frv/lib/__muldi3.S +Removing arch/frv/lib/__lshrdi3.S +Removing arch/frv/lib/__ashrdi3.S +Removing arch/frv/lib/__ashldi3.S +Removing arch/frv/lib/Makefile +Removing arch/frv/kernel/vmlinux.lds.S +Removing arch/frv/kernel/uaccess.c +Removing arch/frv/kernel/traps.c +Removing arch/frv/kernel/time.c +Removing arch/frv/kernel/sysctl.c +Removing arch/frv/kernel/sys_frv.c +Removing arch/frv/kernel/switch_to.S +Removing arch/frv/kernel/sleep.S +Removing arch/frv/kernel/signal.c +Removing arch/frv/kernel/setup.c +Removing arch/frv/kernel/ptrace.c +Removing arch/frv/kernel/process.c +Removing arch/frv/kernel/pm.c +Removing arch/frv/kernel/pm-mb93093.c +Removing arch/frv/kernel/module.c +Removing arch/frv/kernel/local64.h +Removing arch/frv/kernel/local.h +Removing arch/frv/kernel/irq.c +Removing arch/frv/kernel/irq-mb93493.c +Removing arch/frv/kernel/irq-mb93093.c +Removing arch/frv/kernel/irq-mb93091.c +Removing arch/frv/kernel/head.inc +Removing arch/frv/kernel/head.S +Removing arch/frv/kernel/head-uc-fr555.S +Removing arch/frv/kernel/head-uc-fr451.S +Removing arch/frv/kernel/head-uc-fr401.S +Removing arch/frv/kernel/head-mmu-fr451.S +Removing arch/frv/kernel/gdb-stub.c +Removing arch/frv/kernel/gdb-io.h +Removing arch/frv/kernel/gdb-io.c +Removing arch/frv/kernel/futex.c +Removing arch/frv/kernel/frv_ksyms.c +Removing arch/frv/kernel/entry.S +Removing arch/frv/kernel/entry-table.S +Removing arch/frv/kernel/dma.c +Removing arch/frv/kernel/debug-stub.c +Removing arch/frv/kernel/cmode.S +Removing arch/frv/kernel/break.S +Removing arch/frv/kernel/asm-offsets.c +Removing arch/frv/kernel/Makefile +Removing arch/frv/kernel/.gitignore +Removing arch/frv/include/uapi/asm/unistd.h +Removing arch/frv/include/uapi/asm/types.h +Removing arch/frv/include/uapi/asm/termios.h +Removing arch/frv/include/uapi/asm/termbits.h +Removing arch/frv/include/uapi/asm/swab.h +Removing arch/frv/include/uapi/asm/statfs.h +Removing arch/frv/include/uapi/asm/stat.h +Removing arch/frv/include/uapi/asm/sockios.h +Removing arch/frv/include/uapi/asm/socket.h +Removing arch/frv/include/uapi/asm/signal.h +Removing arch/frv/include/uapi/asm/sigcontext.h +Removing arch/frv/include/uapi/asm/shmbuf.h +Removing arch/frv/include/uapi/asm/setup.h +Removing arch/frv/include/uapi/asm/sembuf.h +Removing arch/frv/include/uapi/asm/resource.h +Removing arch/frv/include/uapi/asm/registers.h +Removing arch/frv/include/uapi/asm/ptrace.h +Removing arch/frv/include/uapi/asm/posix_types.h +Removing arch/frv/include/uapi/asm/poll.h +Removing arch/frv/include/uapi/asm/param.h +Removing arch/frv/include/uapi/asm/msgbuf.h +Removing arch/frv/include/uapi/asm/mman.h +Removing arch/frv/include/uapi/asm/kvm_para.h +Removing arch/frv/include/uapi/asm/ipcbuf.h +Removing arch/frv/include/uapi/asm/ioctls.h +Removing arch/frv/include/uapi/asm/ioctl.h +Removing arch/frv/include/uapi/asm/fcntl.h +Removing arch/frv/include/uapi/asm/errno.h +Removing arch/frv/include/uapi/asm/byteorder.h +Removing arch/frv/include/uapi/asm/bitsperlong.h +Removing arch/frv/include/uapi/asm/auxvec.h +Removing arch/frv/include/uapi/asm/Kbuild +Removing arch/frv/include/asm/xor.h +Removing arch/frv/include/asm/virtconvert.h +Removing arch/frv/include/asm/vga.h +Removing arch/frv/include/asm/user.h +Removing arch/frv/include/asm/unistd.h +Removing arch/frv/include/asm/unaligned.h +Removing arch/frv/include/asm/ucontext.h +Removing arch/frv/include/asm/uaccess.h +Removing arch/frv/include/asm/types.h +Removing arch/frv/include/asm/topology.h +Removing arch/frv/include/asm/tlbflush.h +Removing arch/frv/include/asm/tlb.h +Removing arch/frv/include/asm/timex.h +Removing arch/frv/include/asm/timer-regs.h +Removing arch/frv/include/asm/thread_info.h +Removing arch/frv/include/asm/termios.h +Removing arch/frv/include/asm/syscall.h +Removing arch/frv/include/asm/switch_to.h +Removing arch/frv/include/asm/string.h +Removing arch/frv/include/asm/spr-regs.h +Removing arch/frv/include/asm/spinlock.h +Removing arch/frv/include/asm/smp.h +Removing arch/frv/include/asm/signal.h +Removing arch/frv/include/asm/shmparam.h +Removing arch/frv/include/asm/setup.h +Removing arch/frv/include/asm/serial.h +Removing arch/frv/include/asm/serial-regs.h +Removing arch/frv/include/asm/segment.h +Removing arch/frv/include/asm/sections.h +Removing arch/frv/include/asm/ptrace.h +Removing arch/frv/include/asm/processor.h +Removing arch/frv/include/asm/pgtable.h +Removing arch/frv/include/asm/pgalloc.h +Removing arch/frv/include/asm/perf_event.h +Removing arch/frv/include/asm/percpu.h +Removing arch/frv/include/asm/pci.h +Removing arch/frv/include/asm/page.h +Removing arch/frv/include/asm/module.h +Removing arch/frv/include/asm/mmu_context.h +Removing arch/frv/include/asm/mmu.h +Removing arch/frv/include/asm/mem-layout.h +Removing arch/frv/include/asm/mb93493-regs.h +Removing arch/frv/include/asm/mb93493-irqs.h +Removing arch/frv/include/asm/mb93093-fpga-irqs.h +Removing arch/frv/include/asm/mb93091-fpga-irqs.h +Removing arch/frv/include/asm/mb86943a.h +Removing arch/frv/include/asm/mb-regs.h +Removing arch/frv/include/asm/math-emu.h +Removing arch/frv/include/asm/local64.h +Removing arch/frv/include/asm/local.h +Removing arch/frv/include/asm/linkage.h +Removing arch/frv/include/asm/kmap_types.h +Removing arch/frv/include/asm/kdebug.h +Removing arch/frv/include/asm/irqflags.h +Removing arch/frv/include/asm/irq_regs.h +Removing arch/frv/include/asm/irq.h +Removing arch/frv/include/asm/irc-regs.h +Removing arch/frv/include/asm/io.h +Removing arch/frv/include/asm/hw_irq.h +Removing arch/frv/include/asm/highmem.h +Removing arch/frv/include/asm/hardirq.h +Removing arch/frv/include/asm/gpio-regs.h +Removing arch/frv/include/asm/gdb-stub.h +Removing arch/frv/include/asm/futex.h +Removing arch/frv/include/asm/ftrace.h +Removing arch/frv/include/asm/fpu.h +Removing arch/frv/include/asm/emergency-restart.h +Removing arch/frv/include/asm/elf.h +Removing arch/frv/include/asm/dma.h +Removing arch/frv/include/asm/dma-mapping.h +Removing arch/frv/include/asm/dm9000.h +Removing arch/frv/include/asm/div64.h +Removing arch/frv/include/asm/delay.h +Removing arch/frv/include/asm/current.h +Removing arch/frv/include/asm/cpu-irqs.h +Removing arch/frv/include/asm/cmpxchg.h +Removing arch/frv/include/asm/checksum.h +Removing arch/frv/include/asm/cacheflush.h +Removing arch/frv/include/asm/cache.h +Removing arch/frv/include/asm/busctl-regs.h +Removing arch/frv/include/asm/bugs.h +Removing arch/frv/include/asm/bug.h +Removing arch/frv/include/asm/bitops.h +Removing arch/frv/include/asm/barrier.h +Removing arch/frv/include/asm/ax88796.h +Removing arch/frv/include/asm/atomic_defs.h +Removing arch/frv/include/asm/atomic.h +Removing arch/frv/include/asm/asm-offsets.h +Removing arch/frv/include/asm/Kbuild +Removing arch/frv/defconfig +Removing arch/frv/boot/Makefile +Removing arch/frv/Makefile +Removing arch/frv/Kconfig.debug +Removing arch/frv/Kconfig +Removing arch/cris/mm/tlb.c +Removing arch/cris/mm/ioremap.c +Removing arch/cris/mm/init.c +Removing arch/cris/mm/fault.c +Removing arch/cris/mm/Makefile +Removing arch/cris/kernel/vmlinux.lds.S +Removing arch/cris/kernel/traps.c +Removing arch/cris/kernel/time.c +Removing arch/cris/kernel/sys_cris.c +Removing arch/cris/kernel/stacktrace.c +Removing arch/cris/kernel/setup.c +Removing arch/cris/kernel/ptrace.c +Removing arch/cris/kernel/profile.c +Removing arch/cris/kernel/process.c +Removing arch/cris/kernel/module.c +Removing arch/cris/kernel/irq.c +Removing arch/cris/kernel/crisksyms.c +Removing arch/cris/kernel/asm-offsets.c +Removing arch/cris/kernel/Makefile +Removing arch/cris/include/uapi/asm/unistd.h +Removing arch/cris/include/uapi/asm/termios.h +Removing arch/cris/include/uapi/asm/termbits.h +Removing arch/cris/include/uapi/asm/sync_serial.h +Removing arch/cris/include/uapi/asm/swab.h +Removing arch/cris/include/uapi/asm/stat.h +Removing arch/cris/include/uapi/asm/signal.h +Removing arch/cris/include/uapi/asm/sigcontext.h +Removing arch/cris/include/uapi/asm/setup.h +Removing arch/cris/include/uapi/asm/rs485.h +Removing arch/cris/include/uapi/asm/ptrace_v32.h +Removing arch/cris/include/uapi/asm/ptrace_v10.h +Removing arch/cris/include/uapi/asm/ptrace.h +Removing arch/cris/include/uapi/asm/posix_types.h +Removing arch/cris/include/uapi/asm/param.h +Removing arch/cris/include/uapi/asm/ioctls.h +Removing arch/cris/include/uapi/asm/etraxgpio.h +Removing arch/cris/include/uapi/asm/ethernet.h +Removing arch/cris/include/uapi/asm/elf_v32.h +Removing arch/cris/include/uapi/asm/elf_v10.h +Removing arch/cris/include/uapi/asm/elf.h +Removing arch/cris/include/uapi/asm/byteorder.h +Removing arch/cris/include/uapi/asm/Kbuild +Removing arch/cris/include/uapi/arch-v32/arch/user.h +Removing arch/cris/include/uapi/arch-v32/arch/cryptocop.h +Removing arch/cris/include/uapi/arch-v10/arch/user.h +Removing arch/cris/include/uapi/arch-v10/arch/svinto.h +Removing arch/cris/include/uapi/arch-v10/arch/sv_addr_ag.h +Removing arch/cris/include/uapi/arch-v10/arch/sv_addr.agh +Removing arch/cris/include/asm/user.h +Removing arch/cris/include/asm/unistd.h +Removing arch/cris/include/asm/unaligned.h +Removing arch/cris/include/asm/ucontext.h +Removing arch/cris/include/asm/uaccess.h +Removing arch/cris/include/asm/tlbflush.h +Removing arch/cris/include/asm/tlb.h +Removing arch/cris/include/asm/timex.h +Removing arch/cris/include/asm/thread_info.h +Removing arch/cris/include/asm/termios.h +Removing arch/cris/include/asm/switch_to.h +Removing arch/cris/include/asm/swab.h +Removing arch/cris/include/asm/string.h +Removing arch/cris/include/asm/stacktrace.h +Removing arch/cris/include/asm/signal.h +Removing arch/cris/include/asm/shmparam.h +Removing arch/cris/include/asm/serial.h +Removing arch/cris/include/asm/segment.h +Removing arch/cris/include/asm/ptrace.h +Removing arch/cris/include/asm/processor.h +Removing arch/cris/include/asm/pgtable.h +Removing arch/cris/include/asm/pgalloc.h +Removing arch/cris/include/asm/pci.h +Removing arch/cris/include/asm/page.h +Removing arch/cris/include/asm/mmu_context.h +Removing arch/cris/include/asm/mmu.h +Removing arch/cris/include/asm/irqflags.h +Removing arch/cris/include/asm/irq.h +Removing arch/cris/include/asm/io.h +Removing arch/cris/include/asm/hw_irq.h +Removing arch/cris/include/asm/ftrace.h +Removing arch/cris/include/asm/fb.h +Removing arch/cris/include/asm/fasttimer.h +Removing arch/cris/include/asm/etraxi2c.h +Removing arch/cris/include/asm/eshlibld.h +Removing arch/cris/include/asm/dma.h +Removing arch/cris/include/asm/delay.h +Removing arch/cris/include/asm/checksum.h +Removing arch/cris/include/asm/cacheflush.h +Removing arch/cris/include/asm/cache.h +Removing arch/cris/include/asm/bugs.h +Removing arch/cris/include/asm/bug.h +Removing arch/cris/include/asm/bitops.h +Removing arch/cris/include/asm/axisflashmap.h +Removing arch/cris/include/asm/asm-offsets.h +Removing arch/cris/include/asm/Kbuild +Removing arch/cris/include/arch-v32/mach-fs/mach/startup.inc +Removing arch/cris/include/arch-v32/mach-fs/mach/pinmux.h +Removing arch/cris/include/arch-v32/mach-fs/mach/memmap.h +Removing arch/cris/include/arch-v32/mach-fs/mach/hwregs/timer_defs.h +Removing arch/cris/include/arch-v32/mach-fs/mach/hwregs/strmux_defs.h +Removing arch/cris/include/arch-v32/mach-fs/mach/hwregs/reg_map.h +Removing arch/cris/include/arch-v32/mach-fs/mach/hwregs/pinmux_defs.h +Removing arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_defs.h +Removing arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_bp_defs.h +Removing arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect_defs.h +Removing arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect.h +Removing arch/cris/include/arch-v32/mach-fs/mach/hwregs/gio_defs.h +Removing arch/cris/include/arch-v32/mach-fs/mach/hwregs/config_defs.h +Removing arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_slave_defs.h +Removing arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_dma_defs.h +Removing arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_core_defs.h +Removing arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/timer_defs_asm.h +Removing arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/reg_map_asm.h +Removing arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/pinmux_defs_asm.h +Removing arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/gio_defs_asm.h +Removing arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/config_defs_asm.h +Removing arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/bif_core_defs_asm.h +Removing arch/cris/include/arch-v32/mach-fs/mach/dma.h +Removing arch/cris/include/arch-v32/mach-fs/mach/arbiter.h +Removing arch/cris/include/arch-v32/mach-a3/mach/startup.inc +Removing arch/cris/include/arch-v32/mach-a3/mach/pinmux.h +Removing arch/cris/include/arch-v32/mach-a3/mach/memmap.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/timer_defs.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/strmux_defs.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/reg_map.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/pio_defs.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/pinmux_defs.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_foo_defs.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_bar_defs.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/l2cache_defs.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_version_defs.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_spu_defs.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_mpu_defs.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cpu_defs.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cfg_defs.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_out_defs.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_in_defs.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_reg_space.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_version_defs_asm.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_spu_defs_asm.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_mpu_defs_asm.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cpu_defs_asm.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cfg_defs_asm.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_out_defs_asm.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_in_defs_asm.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_reg_space_asm.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect_defs.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/gio_defs.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/ddr2_defs.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/clkgen_defs.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/timer_defs_asm.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/reg_map_asm.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pio_defs_asm.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pinmux_defs_asm.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/gio_defs_asm.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/ddr2_defs_asm.h +Removing arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/clkgen_defs_asm.h +Removing arch/cris/include/arch-v32/mach-a3/mach/dma.h +Removing arch/cris/include/arch-v32/mach-a3/mach/arbiter.h +Removing arch/cris/include/arch-v32/arch/unistd.h +Removing arch/cris/include/arch-v32/arch/uaccess.h +Removing arch/cris/include/arch-v32/arch/tlb.h +Removing arch/cris/include/arch-v32/arch/timex.h +Removing arch/cris/include/arch-v32/arch/thread_info.h +Removing arch/cris/include/arch-v32/arch/system.h +Removing arch/cris/include/arch-v32/arch/swab.h +Removing arch/cris/include/arch-v32/arch/processor.h +Removing arch/cris/include/arch-v32/arch/pgtable.h +Removing arch/cris/include/arch-v32/arch/page.h +Removing arch/cris/include/arch-v32/arch/offset.h +Removing arch/cris/include/arch-v32/arch/mmu.h +Removing arch/cris/include/arch-v32/arch/memmap.h +Removing arch/cris/include/arch-v32/arch/irqflags.h +Removing arch/cris/include/arch-v32/arch/irq.h +Removing arch/cris/include/arch-v32/arch/intmem.h +Removing arch/cris/include/arch-v32/arch/hwregs/supp_reg.h +Removing arch/cris/include/arch-v32/arch/hwregs/strcop_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/strcop.h +Removing arch/cris/include/arch-v32/arch/hwregs/sser_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/ser_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/rt_trace_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/reg_rdwr.h +Removing arch/cris/include/arch-v32/arch/hwregs/marb_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/marb_bp_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/irq_nmi_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_version_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_trigger_grp_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_timer_grp_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_spu_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_mpu_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cpu_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cfg_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_spu_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_out_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_in_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_out_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_in_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_reg_space.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_macros.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_extra_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_extra_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_out_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_in_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/iop_crc_par_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_version_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_trigger_grp_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_timer_grp_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_spu_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_mpu_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cpu_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cfg_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_spu_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_out_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_in_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_out_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_in_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_reg_space_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_mpu_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_out_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_in_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_crc_par_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/iop/Makefile +Removing arch/cris/include/arch-v32/arch/hwregs/extmem_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/eth_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/dma_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/dma.h +Removing arch/cris/include/arch-v32/arch/hwregs/cpu_vect.h +Removing arch/cris/include/arch-v32/arch/hwregs/config_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/bif_slave_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/bif_dma_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/bif_core_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/ata_defs.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/timer_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/strmux_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/strcop_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/sser_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/ser_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/rt_trace_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/mmu_supp_reg.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/mmu_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/marb_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/irq_nmi_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/gio_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/eth_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/dma_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/cris_supp_reg.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/cris_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/cpu_vect.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/config_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/bif_slave_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/bif_dma_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/bif_core_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/asm/ata_defs_asm.h +Removing arch/cris/include/arch-v32/arch/hwregs/Makefile +Removing arch/cris/include/arch-v32/arch/dma.h +Removing arch/cris/include/arch-v32/arch/delay.h +Removing arch/cris/include/arch-v32/arch/cryptocop.h +Removing arch/cris/include/arch-v32/arch/checksum.h +Removing arch/cris/include/arch-v32/arch/cache.h +Removing arch/cris/include/arch-v32/arch/bug.h +Removing arch/cris/include/arch-v32/arch/bitops.h +Removing arch/cris/include/arch-v10/arch/unistd.h +Removing arch/cris/include/arch-v10/arch/uaccess.h +Removing arch/cris/include/arch-v10/arch/tlb.h +Removing arch/cris/include/arch-v10/arch/timex.h +Removing arch/cris/include/arch-v10/arch/thread_info.h +Removing arch/cris/include/arch-v10/arch/system.h +Removing arch/cris/include/arch-v10/arch/swab.h +Removing arch/cris/include/arch-v10/arch/processor.h +Removing arch/cris/include/arch-v10/arch/pgtable.h +Removing arch/cris/include/arch-v10/arch/page.h +Removing arch/cris/include/arch-v10/arch/offset.h +Removing arch/cris/include/arch-v10/arch/mmu.h +Removing arch/cris/include/arch-v10/arch/memmap.h +Removing arch/cris/include/arch-v10/arch/irqflags.h +Removing arch/cris/include/arch-v10/arch/irq.h +Removing arch/cris/include/arch-v10/arch/io_interface_mux.h +Removing arch/cris/include/arch-v10/arch/io.h +Removing arch/cris/include/arch-v10/arch/dma.h +Removing arch/cris/include/arch-v10/arch/delay.h +Removing arch/cris/include/arch-v10/arch/checksum.h +Removing arch/cris/include/arch-v10/arch/cache.h +Removing arch/cris/include/arch-v10/arch/bug.h +Removing arch/cris/include/arch-v10/arch/bitops.h +Removing arch/cris/configs/etraxfs_defconfig +Removing arch/cris/configs/etrax-100lx_v2_defconfig +Removing arch/cris/configs/etrax-100lx_defconfig +Removing arch/cris/configs/dev88_defconfig +Removing arch/cris/configs/artpec_3_defconfig +Removing arch/cris/boot/tools/build.c +Removing arch/cris/boot/rescue/testrescue.S +Removing arch/cris/boot/rescue/rescue_v32.lds +Removing arch/cris/boot/rescue/rescue_v10.lds +Removing arch/cris/boot/rescue/kimagerescue.S +Removing arch/cris/boot/rescue/head_v32.S +Removing arch/cris/boot/rescue/head_v10.S +Removing arch/cris/boot/rescue/Makefile +Removing arch/cris/boot/dts/p1343.dts +Removing arch/cris/boot/dts/etraxfs.dtsi +Removing arch/cris/boot/dts/dev88.dts +Removing arch/cris/boot/dts/artpec3.dtsi +Removing arch/cris/boot/dts/Makefile +Removing arch/cris/boot/compressed/misc.c +Removing arch/cris/boot/compressed/head_v32.S +Removing arch/cris/boot/compressed/head_v10.S +Removing arch/cris/boot/compressed/decompress_v32.lds +Removing arch/cris/boot/compressed/decompress_v10.lds +Removing arch/cris/boot/compressed/README +Removing arch/cris/boot/compressed/Makefile +Removing arch/cris/boot/Makefile +Removing arch/cris/boot/.gitignore +Removing arch/cris/arch-v32/output_arch.ld +Removing arch/cris/arch-v32/mm/tlb.c +Removing arch/cris/arch-v32/mm/mmu.S +Removing arch/cris/arch-v32/mm/l2cache.c +Removing arch/cris/arch-v32/mm/intmem.c +Removing arch/cris/arch-v32/mm/init.c +Removing arch/cris/arch-v32/mm/Makefile +Removing arch/cris/arch-v32/mach-fs/pinmux.c +Removing arch/cris/arch-v32/mach-fs/hw_settings.S +Removing arch/cris/arch-v32/mach-fs/dram_init.S +Removing arch/cris/arch-v32/mach-fs/dma.c +Removing arch/cris/arch-v32/mach-fs/arbiter.c +Removing arch/cris/arch-v32/mach-fs/Makefile +Removing arch/cris/arch-v32/mach-fs/Kconfig +Removing arch/cris/arch-v32/mach-a3/pinmux.c +Removing arch/cris/arch-v32/mach-a3/hw_settings.S +Removing arch/cris/arch-v32/mach-a3/dram_init.S +Removing arch/cris/arch-v32/mach-a3/dma.c +Removing arch/cris/arch-v32/mach-a3/arbiter.c +Removing arch/cris/arch-v32/mach-a3/Makefile +Removing arch/cris/arch-v32/mach-a3/Kconfig +Removing arch/cris/arch-v32/lib/usercopy.c +Removing arch/cris/arch-v32/lib/string.c +Removing arch/cris/arch-v32/lib/strcmp.S +Removing arch/cris/arch-v32/lib/memset.c +Removing arch/cris/arch-v32/lib/delay.c +Removing arch/cris/arch-v32/lib/csumcpfruser.S +Removing arch/cris/arch-v32/lib/checksumcopy.S +Removing arch/cris/arch-v32/lib/checksum.S +Removing arch/cris/arch-v32/lib/Makefile +Removing arch/cris/arch-v32/kernel/traps.c +Removing arch/cris/arch-v32/kernel/time.c +Removing arch/cris/arch-v32/kernel/signal.c +Removing arch/cris/arch-v32/kernel/setup.c +Removing arch/cris/arch-v32/kernel/ptrace.c +Removing arch/cris/arch-v32/kernel/process.c +Removing arch/cris/arch-v32/kernel/kgdb_asm.S +Removing arch/cris/arch-v32/kernel/kgdb.c +Removing arch/cris/arch-v32/kernel/irq.c +Removing arch/cris/arch-v32/kernel/head.S +Removing arch/cris/arch-v32/kernel/fasttimer.c +Removing arch/cris/arch-v32/kernel/entry.S +Removing arch/cris/arch-v32/kernel/debugport.c +Removing arch/cris/arch-v32/kernel/crisksyms.c +Removing arch/cris/arch-v32/kernel/cacheflush.S +Removing arch/cris/arch-v32/kernel/cache.c +Removing arch/cris/arch-v32/kernel/Makefile +Removing arch/cris/arch-v32/drivers/sync_serial.c +Removing arch/cris/arch-v32/drivers/pci/bios.c +Removing arch/cris/arch-v32/drivers/pci/Makefile +Removing arch/cris/arch-v32/drivers/mach-fs/nandflash.c +Removing arch/cris/arch-v32/drivers/mach-fs/Makefile +Removing arch/cris/arch-v32/drivers/mach-a3/nandflash.c +Removing arch/cris/arch-v32/drivers/mach-a3/Makefile +Removing arch/cris/arch-v32/drivers/iop_fw_load.c +Removing arch/cris/arch-v32/drivers/cryptocop.c +Removing arch/cris/arch-v32/drivers/axisflashmap.c +Removing arch/cris/arch-v32/drivers/Makefile +Removing arch/cris/arch-v32/drivers/Kconfig +Removing arch/cris/arch-v32/Kconfig +Removing arch/cris/arch-v10/output_arch.ld +Removing arch/cris/arch-v10/mm/tlb.c +Removing arch/cris/arch-v10/mm/init.c +Removing arch/cris/arch-v10/mm/fault.c +Removing arch/cris/arch-v10/mm/Makefile +Removing arch/cris/arch-v10/lib/usercopy.c +Removing arch/cris/arch-v10/lib/string.c +Removing arch/cris/arch-v10/lib/memset.c +Removing arch/cris/arch-v10/lib/hw_settings.S +Removing arch/cris/arch-v10/lib/dram_init.S +Removing arch/cris/arch-v10/lib/csumcpfruser.S +Removing arch/cris/arch-v10/lib/checksumcopy.S +Removing arch/cris/arch-v10/lib/checksum.S +Removing arch/cris/arch-v10/lib/Makefile +Removing arch/cris/arch-v10/kernel/traps.c +Removing arch/cris/arch-v10/kernel/time.c +Removing arch/cris/arch-v10/kernel/signal.c +Removing arch/cris/arch-v10/kernel/shadows.c +Removing arch/cris/arch-v10/kernel/setup.c +Removing arch/cris/arch-v10/kernel/ptrace.c +Removing arch/cris/arch-v10/kernel/process.c +Removing arch/cris/arch-v10/kernel/kgdb.c +Removing arch/cris/arch-v10/kernel/irq.c +Removing arch/cris/arch-v10/kernel/io_interface_mux.c +Removing arch/cris/arch-v10/kernel/head.S +Removing arch/cris/arch-v10/kernel/fasttimer.c +Removing arch/cris/arch-v10/kernel/entry.S +Removing arch/cris/arch-v10/kernel/dma.c +Removing arch/cris/arch-v10/kernel/debugport.c +Removing arch/cris/arch-v10/kernel/crisksyms.c +Removing arch/cris/arch-v10/kernel/Makefile +Removing arch/cris/arch-v10/drivers/sync_serial.c +Removing arch/cris/arch-v10/drivers/i2c.h +Removing arch/cris/arch-v10/drivers/i2c.c +Removing arch/cris/arch-v10/drivers/gpio.c +Removing arch/cris/arch-v10/drivers/eeprom.c +Removing arch/cris/arch-v10/drivers/axisflashmap.c +Removing arch/cris/arch-v10/drivers/Makefile +Removing arch/cris/arch-v10/drivers/Kconfig +Removing arch/cris/arch-v10/README.mm +Removing arch/cris/arch-v10/Kconfig +Removing arch/cris/Makefile +Removing arch/cris/Kconfig.debug +Removing arch/cris/Kconfig +Removing arch/blackfin/oprofile/bfin_oprofile.c +Removing arch/blackfin/oprofile/Makefile +Removing arch/blackfin/mm/sram-alloc.c +Removing arch/blackfin/mm/maccess.c +Removing arch/blackfin/mm/isram-driver.c +Removing arch/blackfin/mm/init.c +Removing arch/blackfin/mm/blackfin_sram.h +Removing arch/blackfin/mm/Makefile +Removing arch/blackfin/mach-common/smp.c +Removing arch/blackfin/mach-common/scb-init.c +Removing arch/blackfin/mach-common/pm.c +Removing arch/blackfin/mach-common/ints-priority.c +Removing arch/blackfin/mach-common/interrupt.S +Removing arch/blackfin/mach-common/head.S +Removing arch/blackfin/mach-common/entry.S +Removing arch/blackfin/mach-common/dpmc_modes.S +Removing arch/blackfin/mach-common/dpmc.c +Removing arch/blackfin/mach-common/clocks-init.c +Removing arch/blackfin/mach-common/clock.h +Removing arch/blackfin/mach-common/cache.S +Removing arch/blackfin/mach-common/cache-c.c +Removing arch/blackfin/mach-common/arch_checks.c +Removing arch/blackfin/mach-common/Makefile +Removing arch/blackfin/mach-bf609/scb.c +Removing arch/blackfin/mach-bf609/pm.c +Removing arch/blackfin/mach-bf609/ints-priority.c +Removing arch/blackfin/mach-bf609/include/mach/portmux.h +Removing arch/blackfin/mach-bf609/include/mach/pm.h +Removing arch/blackfin/mach-bf609/include/mach/pll.h +Removing arch/blackfin/mach-bf609/include/mach/mem_map.h +Removing arch/blackfin/mach-bf609/include/mach/irq.h +Removing arch/blackfin/mach-bf609/include/mach/gpio.h +Removing arch/blackfin/mach-bf609/include/mach/dma.h +Removing arch/blackfin/mach-bf609/include/mach/defBF60x_base.h +Removing arch/blackfin/mach-bf609/include/mach/defBF609.h +Removing arch/blackfin/mach-bf609/include/mach/cdefBF60x_base.h +Removing arch/blackfin/mach-bf609/include/mach/cdefBF609.h +Removing arch/blackfin/mach-bf609/include/mach/blackfin.h +Removing arch/blackfin/mach-bf609/include/mach/bfin_serial.h +Removing arch/blackfin/mach-bf609/include/mach/bf609.h +Removing arch/blackfin/mach-bf609/include/mach/anomaly.h +Removing arch/blackfin/mach-bf609/dpm.S +Removing arch/blackfin/mach-bf609/dma.c +Removing arch/blackfin/mach-bf609/clock.c +Removing arch/blackfin/mach-bf609/boards/ezkit.c +Removing arch/blackfin/mach-bf609/boards/Makefile +Removing arch/blackfin/mach-bf609/boards/Kconfig +Removing arch/blackfin/mach-bf609/Makefile +Removing arch/blackfin/mach-bf609/Kconfig +Removing arch/blackfin/mach-bf561/smp.c +Removing arch/blackfin/mach-bf561/secondary.S +Removing arch/blackfin/mach-bf561/ints-priority.c +Removing arch/blackfin/mach-bf561/include/mach/smp.h +Removing arch/blackfin/mach-bf561/include/mach/portmux.h +Removing arch/blackfin/mach-bf561/include/mach/pll.h +Removing arch/blackfin/mach-bf561/include/mach/mem_map.h +Removing arch/blackfin/mach-bf561/include/mach/irq.h +Removing arch/blackfin/mach-bf561/include/mach/gpio.h +Removing arch/blackfin/mach-bf561/include/mach/dma.h +Removing arch/blackfin/mach-bf561/include/mach/defBF561.h +Removing arch/blackfin/mach-bf561/include/mach/cdefBF561.h +Removing arch/blackfin/mach-bf561/include/mach/blackfin.h +Removing arch/blackfin/mach-bf561/include/mach/bfin_serial.h +Removing arch/blackfin/mach-bf561/include/mach/bf561.h +Removing arch/blackfin/mach-bf561/include/mach/anomaly.h +Removing arch/blackfin/mach-bf561/hotplug.c +Removing arch/blackfin/mach-bf561/dma.c +Removing arch/blackfin/mach-bf561/coreb.c +Removing arch/blackfin/mach-bf561/boards/tepla.c +Removing arch/blackfin/mach-bf561/boards/ezkit.c +Removing arch/blackfin/mach-bf561/boards/cm_bf561.c +Removing arch/blackfin/mach-bf561/boards/acvilon.c +Removing arch/blackfin/mach-bf561/boards/Makefile +Removing arch/blackfin/mach-bf561/boards/Kconfig +Removing arch/blackfin/mach-bf561/atomic.S +Removing arch/blackfin/mach-bf561/Makefile +Removing arch/blackfin/mach-bf561/Kconfig +Removing arch/blackfin/mach-bf548/ints-priority.c +Removing arch/blackfin/mach-bf548/include/mach/portmux.h +Removing arch/blackfin/mach-bf548/include/mach/pll.h +Removing arch/blackfin/mach-bf548/include/mach/mem_map.h +Removing arch/blackfin/mach-bf548/include/mach/irq.h +Removing arch/blackfin/mach-bf548/include/mach/gpio.h +Removing arch/blackfin/mach-bf548/include/mach/dma.h +Removing arch/blackfin/mach-bf548/include/mach/defBF54x_base.h +Removing arch/blackfin/mach-bf548/include/mach/defBF549.h +Removing arch/blackfin/mach-bf548/include/mach/defBF548.h +Removing arch/blackfin/mach-bf548/include/mach/defBF547.h +Removing arch/blackfin/mach-bf548/include/mach/defBF544.h +Removing arch/blackfin/mach-bf548/include/mach/defBF542.h +Removing arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h +Removing arch/blackfin/mach-bf548/include/mach/cdefBF549.h +Removing arch/blackfin/mach-bf548/include/mach/cdefBF548.h +Removing arch/blackfin/mach-bf548/include/mach/cdefBF547.h +Removing arch/blackfin/mach-bf548/include/mach/cdefBF544.h +Removing arch/blackfin/mach-bf548/include/mach/cdefBF542.h +Removing arch/blackfin/mach-bf548/include/mach/blackfin.h +Removing arch/blackfin/mach-bf548/include/mach/bfin_serial.h +Removing arch/blackfin/mach-bf548/include/mach/bf54x_keys.h +Removing arch/blackfin/mach-bf548/include/mach/bf54x-lq043.h +Removing arch/blackfin/mach-bf548/include/mach/bf548.h +Removing arch/blackfin/mach-bf548/include/mach/anomaly.h +Removing arch/blackfin/mach-bf548/dma.c +Removing arch/blackfin/mach-bf548/boards/ezkit.c +Removing arch/blackfin/mach-bf548/boards/cm_bf548.c +Removing arch/blackfin/mach-bf548/boards/Makefile +Removing arch/blackfin/mach-bf548/boards/Kconfig +Removing arch/blackfin/mach-bf548/Makefile +Removing arch/blackfin/mach-bf548/Kconfig +Removing arch/blackfin/mach-bf538/ints-priority.c +Removing arch/blackfin/mach-bf538/include/mach/portmux.h +Removing arch/blackfin/mach-bf538/include/mach/pll.h +Removing arch/blackfin/mach-bf538/include/mach/mem_map.h +Removing arch/blackfin/mach-bf538/include/mach/irq.h +Removing arch/blackfin/mach-bf538/include/mach/gpio.h +Removing arch/blackfin/mach-bf538/include/mach/dma.h +Removing arch/blackfin/mach-bf538/include/mach/defBF539.h +Removing arch/blackfin/mach-bf538/include/mach/defBF538.h +Removing arch/blackfin/mach-bf538/include/mach/cdefBF539.h +Removing arch/blackfin/mach-bf538/include/mach/cdefBF538.h +Removing arch/blackfin/mach-bf538/include/mach/blackfin.h +Removing arch/blackfin/mach-bf538/include/mach/bfin_serial.h +Removing arch/blackfin/mach-bf538/include/mach/bf538.h +Removing arch/blackfin/mach-bf538/include/mach/anomaly.h +Removing arch/blackfin/mach-bf538/ext-gpio.c +Removing arch/blackfin/mach-bf538/dma.c +Removing arch/blackfin/mach-bf538/boards/ezkit.c +Removing arch/blackfin/mach-bf538/boards/Makefile +Removing arch/blackfin/mach-bf538/boards/Kconfig +Removing arch/blackfin/mach-bf538/Makefile +Removing arch/blackfin/mach-bf538/Kconfig +Removing arch/blackfin/mach-bf537/ints-priority.c +Removing arch/blackfin/mach-bf537/include/mach/portmux.h +Removing arch/blackfin/mach-bf537/include/mach/pll.h +Removing arch/blackfin/mach-bf537/include/mach/mem_map.h +Removing arch/blackfin/mach-bf537/include/mach/irq.h +Removing arch/blackfin/mach-bf537/include/mach/gpio.h +Removing arch/blackfin/mach-bf537/include/mach/dma.h +Removing arch/blackfin/mach-bf537/include/mach/defBF537.h +Removing arch/blackfin/mach-bf537/include/mach/defBF534.h +Removing arch/blackfin/mach-bf537/include/mach/cdefBF537.h +Removing arch/blackfin/mach-bf537/include/mach/cdefBF534.h +Removing arch/blackfin/mach-bf537/include/mach/blackfin.h +Removing arch/blackfin/mach-bf537/include/mach/bfin_serial.h +Removing arch/blackfin/mach-bf537/include/mach/bf537.h +Removing arch/blackfin/mach-bf537/include/mach/anomaly.h +Removing arch/blackfin/mach-bf537/dma.c +Removing arch/blackfin/mach-bf537/boards/tcm_bf537.c +Removing arch/blackfin/mach-bf537/boards/stamp.c +Removing arch/blackfin/mach-bf537/boards/pnav10.c +Removing arch/blackfin/mach-bf537/boards/minotaur.c +Removing arch/blackfin/mach-bf537/boards/dnp5370.c +Removing arch/blackfin/mach-bf537/boards/cm_bf537u.c +Removing arch/blackfin/mach-bf537/boards/cm_bf537e.c +Removing arch/blackfin/mach-bf537/boards/Makefile +Removing arch/blackfin/mach-bf537/boards/Kconfig +Removing arch/blackfin/mach-bf537/Makefile +Removing arch/blackfin/mach-bf537/Kconfig +Removing arch/blackfin/mach-bf533/ints-priority.c +Removing arch/blackfin/mach-bf533/include/mach/portmux.h +Removing arch/blackfin/mach-bf533/include/mach/pll.h +Removing arch/blackfin/mach-bf533/include/mach/mem_map.h +Removing arch/blackfin/mach-bf533/include/mach/irq.h +Removing arch/blackfin/mach-bf533/include/mach/gpio.h +Removing arch/blackfin/mach-bf533/include/mach/dma.h +Removing arch/blackfin/mach-bf533/include/mach/defBF532.h +Removing arch/blackfin/mach-bf533/include/mach/cdefBF532.h +Removing arch/blackfin/mach-bf533/include/mach/blackfin.h +Removing arch/blackfin/mach-bf533/include/mach/bfin_serial.h +Removing arch/blackfin/mach-bf533/include/mach/bf533.h +Removing arch/blackfin/mach-bf533/include/mach/anomaly.h +Removing arch/blackfin/mach-bf533/dma.c +Removing arch/blackfin/mach-bf533/boards/stamp.c +Removing arch/blackfin/mach-bf533/boards/ip0x.c +Removing arch/blackfin/mach-bf533/boards/ezkit.c +Removing arch/blackfin/mach-bf533/boards/cm_bf533.c +Removing arch/blackfin/mach-bf533/boards/blackstamp.c +Removing arch/blackfin/mach-bf533/boards/Makefile +Removing arch/blackfin/mach-bf533/boards/Kconfig +Removing arch/blackfin/mach-bf533/boards/H8606.c +Removing arch/blackfin/mach-bf533/Makefile +Removing arch/blackfin/mach-bf533/Kconfig +Removing arch/blackfin/mach-bf527/ints-priority.c +Removing arch/blackfin/mach-bf527/include/mach/portmux.h +Removing arch/blackfin/mach-bf527/include/mach/pll.h +Removing arch/blackfin/mach-bf527/include/mach/mem_map.h +Removing arch/blackfin/mach-bf527/include/mach/irq.h +Removing arch/blackfin/mach-bf527/include/mach/gpio.h +Removing arch/blackfin/mach-bf527/include/mach/dma.h +Removing arch/blackfin/mach-bf527/include/mach/defBF527.h +Removing arch/blackfin/mach-bf527/include/mach/defBF525.h +Removing arch/blackfin/mach-bf527/include/mach/defBF522.h +Removing arch/blackfin/mach-bf527/include/mach/cdefBF527.h +Removing arch/blackfin/mach-bf527/include/mach/cdefBF525.h +Removing arch/blackfin/mach-bf527/include/mach/cdefBF522.h +Removing arch/blackfin/mach-bf527/include/mach/blackfin.h +Removing arch/blackfin/mach-bf527/include/mach/bfin_serial.h +Removing arch/blackfin/mach-bf527/include/mach/bf527.h +Removing arch/blackfin/mach-bf527/include/mach/anomaly.h +Removing arch/blackfin/mach-bf527/dma.c +Removing arch/blackfin/mach-bf527/boards/tll6527m.c +Removing arch/blackfin/mach-bf527/boards/ezkit.c +Removing arch/blackfin/mach-bf527/boards/ezbrd.c +Removing arch/blackfin/mach-bf527/boards/cm_bf527.c +Removing arch/blackfin/mach-bf527/boards/ad7160eval.c +Removing arch/blackfin/mach-bf527/boards/Makefile +Removing arch/blackfin/mach-bf527/boards/Kconfig +Removing arch/blackfin/mach-bf527/Makefile +Removing arch/blackfin/mach-bf527/Kconfig +Removing arch/blackfin/mach-bf518/ints-priority.c +Removing arch/blackfin/mach-bf518/include/mach/portmux.h +Removing arch/blackfin/mach-bf518/include/mach/pll.h +Removing arch/blackfin/mach-bf518/include/mach/mem_map.h +Removing arch/blackfin/mach-bf518/include/mach/irq.h +Removing arch/blackfin/mach-bf518/include/mach/gpio.h +Removing arch/blackfin/mach-bf518/include/mach/dma.h +Removing arch/blackfin/mach-bf518/include/mach/defBF518.h +Removing arch/blackfin/mach-bf518/include/mach/defBF516.h +Removing arch/blackfin/mach-bf518/include/mach/defBF514.h +Removing arch/blackfin/mach-bf518/include/mach/defBF512.h +Removing arch/blackfin/mach-bf518/include/mach/cdefBF518.h +Removing arch/blackfin/mach-bf518/include/mach/cdefBF516.h +Removing arch/blackfin/mach-bf518/include/mach/cdefBF514.h +Removing arch/blackfin/mach-bf518/include/mach/cdefBF512.h +Removing arch/blackfin/mach-bf518/include/mach/blackfin.h +Removing arch/blackfin/mach-bf518/include/mach/bfin_serial.h +Removing arch/blackfin/mach-bf518/include/mach/bf518.h +Removing arch/blackfin/mach-bf518/include/mach/anomaly.h +Removing arch/blackfin/mach-bf518/dma.c +Removing arch/blackfin/mach-bf518/boards/tcm-bf518.c +Removing arch/blackfin/mach-bf518/boards/ezbrd.c +Removing arch/blackfin/mach-bf518/boards/Makefile +Removing arch/blackfin/mach-bf518/boards/Kconfig +Removing arch/blackfin/mach-bf518/Makefile +Removing arch/blackfin/mach-bf518/Kconfig +Removing arch/blackfin/lib/umulsi3_highpart.S +Removing arch/blackfin/lib/umodsi3.S +Removing arch/blackfin/lib/udivsi3.S +Removing arch/blackfin/lib/strncpy.S +Removing arch/blackfin/lib/strncmp.S +Removing arch/blackfin/lib/strcpy.S +Removing arch/blackfin/lib/strcmp.S +Removing arch/blackfin/lib/smulsi3_highpart.S +Removing arch/blackfin/lib/outs.S +Removing arch/blackfin/lib/muldi3.S +Removing arch/blackfin/lib/modsi3.S +Removing arch/blackfin/lib/memset.S +Removing arch/blackfin/lib/memmove.S +Removing arch/blackfin/lib/memcpy.S +Removing arch/blackfin/lib/memcmp.S +Removing arch/blackfin/lib/memchr.S +Removing arch/blackfin/lib/lshrdi3.c +Removing arch/blackfin/lib/ins.S +Removing arch/blackfin/lib/gcclib.h +Removing arch/blackfin/lib/divsi3.S +Removing arch/blackfin/lib/ashrdi3.c +Removing arch/blackfin/lib/ashldi3.c +Removing arch/blackfin/lib/Makefile +Removing arch/blackfin/kernel/vmlinux.lds.S +Removing arch/blackfin/kernel/traps.c +Removing arch/blackfin/kernel/trace.c +Removing arch/blackfin/kernel/time.c +Removing arch/blackfin/kernel/time-ts.c +Removing arch/blackfin/kernel/sys_bfin.c +Removing arch/blackfin/kernel/stacktrace.c +Removing arch/blackfin/kernel/signal.c +Removing arch/blackfin/kernel/shadow_console.c +Removing arch/blackfin/kernel/setup.c +Removing arch/blackfin/kernel/reboot.c +Removing arch/blackfin/kernel/ptrace.c +Removing arch/blackfin/kernel/pseudodbg.c +Removing arch/blackfin/kernel/process.c +Removing arch/blackfin/kernel/perf_event.c +Removing arch/blackfin/kernel/nmi.c +Removing arch/blackfin/kernel/module.c +Removing arch/blackfin/kernel/kgdb_test.c +Removing arch/blackfin/kernel/kgdb.c +Removing arch/blackfin/kernel/irqchip.c +Removing arch/blackfin/kernel/ipipe.c +Removing arch/blackfin/kernel/gptimers.c +Removing arch/blackfin/kernel/ftrace.c +Removing arch/blackfin/kernel/ftrace-entry.S +Removing arch/blackfin/kernel/flat.c +Removing arch/blackfin/kernel/fixed_code.S +Removing arch/blackfin/kernel/exception.c +Removing arch/blackfin/kernel/entry.S +Removing arch/blackfin/kernel/early_printk.c +Removing arch/blackfin/kernel/dumpstack.c +Removing arch/blackfin/kernel/dma-mapping.c +Removing arch/blackfin/kernel/debug-mmrs.c +Removing arch/blackfin/kernel/cplbinfo.c +Removing arch/blackfin/kernel/cplb-nompu/cplbmgr.c +Removing arch/blackfin/kernel/cplb-nompu/cplbinit.c +Removing arch/blackfin/kernel/cplb-nompu/Makefile +Removing arch/blackfin/kernel/cplb-mpu/cplbmgr.c +Removing arch/blackfin/kernel/cplb-mpu/cplbinit.c +Removing arch/blackfin/kernel/cplb-mpu/Makefile +CONFLICT (modify/delete): arch/blackfin/kernel/bfin_ksyms.c deleted in asm-generic/master and modified in HEAD. Version HEAD of arch/blackfin/kernel/bfin_ksyms.c left in tree. +Removing arch/blackfin/kernel/bfin_gpio.c +Removing arch/blackfin/kernel/bfin_dma.c +Removing arch/blackfin/kernel/asm-offsets.c +Removing arch/blackfin/kernel/Makefile +Removing arch/blackfin/kernel/.gitignore +Removing arch/blackfin/include/uapi/asm/unistd.h +Removing arch/blackfin/include/uapi/asm/swab.h +Removing arch/blackfin/include/uapi/asm/stat.h +Removing arch/blackfin/include/uapi/asm/signal.h +Removing arch/blackfin/include/uapi/asm/siginfo.h +Removing arch/blackfin/include/uapi/asm/sigcontext.h +Removing arch/blackfin/include/uapi/asm/ptrace.h +Removing arch/blackfin/include/uapi/asm/posix_types.h +Removing arch/blackfin/include/uapi/asm/poll.h +Removing arch/blackfin/include/uapi/asm/ioctls.h +Removing arch/blackfin/include/uapi/asm/fixed_code.h +Removing arch/blackfin/include/uapi/asm/fcntl.h +Removing arch/blackfin/include/uapi/asm/cachectl.h +Removing arch/blackfin/include/uapi/asm/byteorder.h +Removing arch/blackfin/include/uapi/asm/bfin_sport.h +Removing arch/blackfin/include/uapi/asm/Kbuild +Removing arch/blackfin/include/mach-common/ports-j.h +Removing arch/blackfin/include/mach-common/ports-i.h +Removing arch/blackfin/include/mach-common/ports-h.h +Removing arch/blackfin/include/mach-common/ports-g.h +Removing arch/blackfin/include/mach-common/ports-f.h +Removing arch/blackfin/include/mach-common/ports-e.h +Removing arch/blackfin/include/mach-common/ports-d.h +Removing arch/blackfin/include/mach-common/ports-c.h +Removing arch/blackfin/include/mach-common/ports-b.h +Removing arch/blackfin/include/mach-common/ports-a.h +Removing arch/blackfin/include/mach-common/pll.h +Removing arch/blackfin/include/mach-common/irq.h +Removing arch/blackfin/include/asm/vga.h +Removing arch/blackfin/include/asm/unistd.h +Removing arch/blackfin/include/asm/uaccess.h +Removing arch/blackfin/include/asm/traps.h +Removing arch/blackfin/include/asm/trace.h +Removing arch/blackfin/include/asm/tlbflush.h +Removing arch/blackfin/include/asm/tlb.h +Removing arch/blackfin/include/asm/timex.h +Removing arch/blackfin/include/asm/time.h +Removing arch/blackfin/include/asm/thread_info.h +Removing arch/blackfin/include/asm/syscall.h +Removing arch/blackfin/include/asm/switch_to.h +Removing arch/blackfin/include/asm/string.h +Removing arch/blackfin/include/asm/spinlock_types.h +Removing arch/blackfin/include/asm/spinlock.h +Removing arch/blackfin/include/asm/smp.h +Removing arch/blackfin/include/asm/segment.h +Removing arch/blackfin/include/asm/sections.h +Removing arch/blackfin/include/asm/scb.h +Removing arch/blackfin/include/asm/rwlock.h +Removing arch/blackfin/include/asm/reboot.h +Removing arch/blackfin/include/asm/ptrace.h +Removing arch/blackfin/include/asm/pseudo_instructionsResolved 'drivers/input/joystick/analog.c' using previous resolution. +.h +Removing arch/blackfin/include/asm/processor.h +Removing arch/blackfin/include/asm/portmux.h +Removing arch/blackfin/include/asm/pm.h +Removing arch/blackfin/include/asm/pgtable.h +Removing arch/blackfin/include/asm/perf_event.h +Removing arch/blackfin/include/asm/pda.h +Removing arch/blackfin/include/asm/pci.h +Removing arch/blackfin/include/asm/page_offset.h +Removing arch/blackfin/include/asm/page.h +Removing arch/blackfin/include/asm/nmi.h +Removing arch/blackfin/include/asm/nand.h +Removing arch/blackfin/include/asm/module.h +Removing arch/blackfin/include/asm/mmu_context.h +Removing arch/blackfin/include/asm/mmu.h +Removing arch/blackfin/include/asm/mem_map.h +Removing arch/blackfin/include/asm/mem_init.h +Removing arch/blackfin/include/asm/linkage.h +Removing arch/blackfin/include/asm/l1layout.h +Removing arch/blackfin/include/asm/kgdb.h +Removing arch/blackfin/include/asm/irqflags.h +Removing arch/blackfin/include/asm/irq_handler.h +Removing arch/blackfin/include/asm/irq.h +Removing arch/blackfin/include/asm/ipipe_base.h +Removing arch/blackfin/include/asm/ipipe.h +Removing arch/blackfin/include/asm/io.h +Removing arch/blackfin/include/asm/hardirq.h +Removing arch/blackfin/include/asm/gptimers.h +Removing arch/blackfin/include/asm/gpio.h +Removing arch/blackfin/include/asm/ftrace.h +Removing arch/blackfin/include/asm/flat.h +Removing arch/blackfin/include/asm/fixed_code.h +Removing arch/blackfin/include/asm/exec.h +Removing arch/blackfin/include/asm/entry.h +Removing arch/blackfin/include/asm/elf.h +Removing arch/blackfin/include/asm/early_printk.h +Removing arch/blackfin/include/asm/dpmc.h +Removing arch/blackfin/include/asm/dma.h +Removing arch/blackfin/include/asm/dma-mapping.h +Removing arch/blackfin/include/asm/delay.h +Removing arch/blackfin/include/asm/def_LPBlackfin.h +Removing arch/blackfin/include/asm/cpu.h +Removing arch/blackfin/include/asm/cplbinit.h +Removing arch/blackfin/include/asm/cplb.h +Removing arch/blackfin/include/asm/context.S +Removing arch/blackfin/include/asm/cmpxchg.h +Removing arch/blackfin/include/asm/clocks.h +Removing arch/blackfin/include/asm/checksum.h +Removing arch/blackfin/include/asm/cdef_LPBlackfin.h +Removing arch/blackfin/include/asm/cacheflush.h +Removing arch/blackfin/include/asm/cache.h +Removing arch/blackfin/include/asm/bug.h +Removing arch/blackfin/include/asm/blackfin.h +Removing arch/blackfin/include/asm/bitops.h +Removing arch/blackfin/include/asm/bfrom.h +Removing arch/blackfin/include/asm/bfin_watchdog.h +Removing arch/blackfin/include/asm/bfin_twi.h +Removing arch/blackfin/include/asm/bfin_sport3.h +Removing arch/blackfin/include/asm/bfin_sport.h +Removing arch/blackfin/include/asm/bfin_simple_timer.h +Removing arch/blackfin/include/asm/bfin_serial.h +Removing arch/blackfin/include/asm/bfin_sdh.h +Removing arch/blackfin/include/asm/bfin_ppi.h +Removing arch/blackfin/include/asm/bfin_pfmon.h +Removing arch/blackfin/include/asm/bfin_dma.h +Removing arch/blackfin/include/asm/bfin_can.h +Removing arch/blackfin/include/asm/bfin5xx_spi.h +Removing arch/blackfin/include/asm/bfin-lq035q1.h +Removing arch/blackfin/include/asm/bfin-global.h +Removing arch/blackfin/include/asm/barrier.h +Removing arch/blackfin/include/asm/atomic.h +Removing arch/blackfin/include/asm/asm-offsets.h +Removing arch/blackfin/include/asm/Kbuild +Removing arch/blackfin/configs/TCM-BF537_defconfig +Removing arch/blackfin/configs/TCM-BF518_defconfig +Removing arch/blackfin/configs/SRV1_defconfig +Removing arch/blackfin/configs/PNAV-10_defconfig +Removing arch/blackfin/configs/IP0X_defconfig +Removing arch/blackfin/configs/H8606_defconfig +Removing arch/blackfin/configs/DNP5370_defconfig +Removing arch/blackfin/configs/CM-BF561_defconfig +Removing arch/blackfin/configs/CM-BF548_defconfig +Removing arch/blackfin/configs/CM-BF537U_defconfig +Removing arch/blackfin/configs/CM-BF537E_defconfig +Removing arch/blackfin/configs/CM-BF533_defconfig +Removing arch/blackfin/configs/CM-BF527_defconfig +Removing arch/blackfin/configs/BlackStamp_defconfig +Removing arch/blackfin/configs/BF609-EZKIT_defconfig +Removing arch/blackfin/configs/BF561-EZKIT_defconfig +Removing arch/blackfin/configs/BF561-EZKIT-SMP_defconfig +Removing arch/blackfin/configs/BF561-ACVILON_defconfig +Removing arch/blackfin/configs/BF548-EZKIT_defconfig +Removing arch/blackfin/configs/BF538-EZKIT_defconfig +Removing arch/blackfin/configs/BF537-STAMP_defconfig +Removing arch/blackfin/configs/BF533-STAMP_defconfig +Removing arch/blackfin/configs/BF533-EZKIT_defconfig +Removing arch/blackfin/configs/BF527-TLL6527M_defconfig +Removing arch/blackfin/configs/BF527-EZKIT_defconfig +Removing arch/blackfin/configs/BF527-EZKIT-V2_defconfig +Removing arch/blackfin/configs/BF527-AD7160-EVAL_defconfig +Removing arch/blackfin/configs/BF526-EZBRD_defconfig +Removing arch/blackfin/configs/BF518F-EZBRD_defconfig +Removing arch/blackfin/boot/install.sh +Removing arch/blackfin/boot/Makefile +Removing arch/blackfin/boot/.gitignore +Removing arch/blackfin/Makefile +Removing arch/blackfin/Kconfig.debug +Removing arch/blackfin/Kconfig +Removing arch/blackfin/Clear_BSD.txt +Auto-merging Makefile +Auto-merging MAINTAINERS +Removing Documentation/mn10300/compartmentalisation.txt +Removing Documentation/mn10300/ABI.txt +Removing Documentation/metag/kernel-ABI.txt +Removing Documentation/metag/00-INDEX +Removing Documentation/frv/mmu-layout.txt +Removing Documentation/frv/kernel-ABI.txt +Removing Documentation/frv/gdbstub.txt +Removing Documentation/frv/gdbinit +Removing Documentation/frv/features.txt +Removing Documentation/frv/configuring.txt +Removing Documentation/frv/clock.txt +Removing Documentation/frv/booting.txt +Removing Documentation/frv/atomic-ops.txt +Removing Documentation/frv/README.txt +Removing Documentation/devicetree/bindings/serial/axis,etraxfs-uart.txt +Removing Documentation/devicetree/bindings/metag/meta.txt +Removing Documentation/devicetree/bindings/interrupt-controller/axis,crisv32-intc.txt +Removing Documentation/devicetree/bindings/gpio/gpio-etraxfs.txt +Removing Documentation/devicetree/bindings/cris/boards.txt +Removing Documentation/devicetree/bindings/cris/axis.txt +Removing Documentation/cris/README +Removing Documentation/blackfin/bfin-spi-notes.txt +Removing Documentation/blackfin/bfin-gpio-notes.txt +Removing Documentation/blackfin/00-INDEX +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/blackfin/kernel/bfin_ksyms.c +arch/blackfin/kernel/bfin_ksyms.c: needs merge +rm 'arch/blackfin/kernel/bfin_ksyms.c' +$ git commit -v -a +[master 6962779ea3ae] Merge remote-tracking branch 'asm-generic/master' +$ git diff -M --stat --summary HEAD^.. + CREDITS | 5 + + Documentation/00-INDEX | 10 - + Documentation/admin-guide/README.rst | 4 +- + Documentation/admin-guide/kernel-parameters.rst | 1 - + Documentation/admin-guide/kernel-parameters.txt | 6 +- + Documentation/blackfin/00-INDEX | 6 - + Documentation/blackfin/bfin-gpio-notes.txt | 71 - + Documentation/blackfin/bfin-spi-notes.txt | 16 - + Documentation/cris/README | 195 - + Documentation/dev-tools/kmemleak.rst | 2 +- + Documentation/devicetree/bindings/cris/axis.txt | 9 - + Documentation/devicetree/bindings/cris/boards.txt | 8 - + .../devicetree/bindings/gpio/gpio-etraxfs.txt | 22 - + .../interrupt-controller/axis,crisv32-intc.txt | 23 - + Documentation/devicetree/bindings/metag/meta.txt | 30 - + .../bindings/serial/axis,etraxfs-uart.txt | 22 - + .../driver-api/usb/writing_musb_glue_layer.rst | 3 - + .../features/core/BPF-JIT/arch-support.txt | 8 - + .../core/generic-idle-thread/arch-support.txt | 8 - + .../features/core/jump-labels/arch-support.txt | 8 - + .../features/core/tracehook/arch-support.txt | 8 - + .../features/debug/KASAN/arch-support.txt | 8 - + .../debug/gcov-profile-all/arch-support.txt | 8 - + Documentation/features/debug/kgdb/arch-support.txt | 8 - + .../debug/kprobes-on-ftrace/arch-support.txt | 8 - + .../features/debug/kprobes/arch-support.txt | 8 - + .../features/debug/kretprobes/arch-support.txt | 8 - + .../features/debug/optprobes/arch-support.txt | 8 - + .../features/debug/stackprotector/arch-support.txt | 8 - + .../features/debug/uprobes/arch-support.txt | 8 - + .../debug/user-ret-profiler/arch-support.txt | 8 - + .../features/io/dma-api-debug/arch-support.txt | 8 - + .../features/io/dma-contiguous/arch-support.txt | 8 - + .../features/io/sg-chain/arch-support.txt | 8 - + .../features/lib/strncasecmp/arch-support.txt | 8 - + .../locking/cmpxchg-local/arch-support.txt | 8 - + .../features/locking/lockdep/arch-support.txt | 8 - + .../locking/queued-rwlocks/arch-support.txt | 8 - + .../locking/queued-spinlocks/arch-support.txt | 8 - + .../locking/rwsem-optimized/arch-support.txt | 8 - + .../features/perf/kprobes-event/arch-support.txt | 8 - + .../features/perf/perf-regs/arch-support.txt | 8 - + .../features/perf/perf-stackdump/arch-support.txt | 8 - + .../sched/membarrier-sync-core/arch-support.txt | 8 - + .../features/sched/numa-balancing/arch-support.txt | 8 - + .../seccomp/seccomp-filter/arch-support.txt | 8 - + .../time/arch-tick-broadcast/arch-support.txt | 8 - + .../features/time/clockevents/arch-support.txt | 8 - + .../time/context-tracking/arch-support.txt | 8 - + .../features/time/irq-time-acct/arch-support.txt | 8 - + .../time/modern-timekeeping/arch-support.txt | 8 - + .../features/time/virt-cpuacct/arch-support.txt | 8 - + .../features/vm/ELF-ASLR/arch-support.txt | 8 - + .../features/vm/PG_uncached/arch-support.txt | 8 - + Documentation/features/vm/THP/arch-support.txt | 8 - + Documentation/features/vm/TLB/arch-support.txt | 8 - + .../features/vm/huge-vmap/arch-support.txt | 8 - + .../features/vm/ioremap_prot/arch-support.txt | 8 - + .../features/vm/numa-memblock/arch-support.txt | 8 - + .../features/vm/pte_special/arch-support.txt | 8 - + Documentation/frv/README.txt | 51 - + Documentation/frv/atomic-ops.txt | 134 - + Documentation/frv/booting.txt | 182 - + Documentation/frv/clock.txt | 65 - + Documentation/frv/configuring.txt | 125 - + Documentation/frv/features.txt | 310 - + Documentation/frv/gdbinit | 102 - + Documentation/frv/gdbstub.txt | 130 - + Documentation/frv/kernel-ABI.txt | 262 - + Documentation/frv/mmu-layout.txt | 306 - + Documentation/ioctl/ioctl-number.txt | 1 - + Documentation/metag/00-INDEX | 4 - + Documentation/metag/kernel-ABI.txt | 256 - + Documentation/mn10300/ABI.txt | 149 - + Documentation/mn10300/compartmentalisation.txt | 60 - + Documentation/watchdog/watchdog-parameters.txt | 5 - + MAINTAINERS | 107 - + Makefile | 8 - + arch/blackfin/Clear_BSD.txt | 33 - + arch/blackfin/Kconfig | 1463 ---- + arch/blackfin/Kconfig.debug | 258 - + arch/blackfin/Makefile | 168 - + arch/blackfin/boot/.gitignore | 3 - + arch/blackfin/boot/Makefile | 71 - + arch/blackfin/boot/install.sh | 57 - + arch/blackfin/configs/BF518F-EZBRD_defconfig | 121 - + arch/blackfin/configs/BF526-EZBRD_defconfig | 158 - + arch/blackfin/configs/BF527-AD7160-EVAL_defconfig | 104 - + arch/blackfin/configs/BF527-EZKIT-V2_defconfig | 188 - + arch/blackfin/configs/BF527-EZKIT_defconfig | 181 - + arch/blackfin/configs/BF527-TLL6527M_defconfig | 178 - + arch/blackfin/configs/BF533-EZKIT_defconfig | 114 - + arch/blackfin/configs/BF533-STAMP_defconfig | 124 - + arch/blackfin/configs/BF537-STAMP_defconfig | 136 - + arch/blackfin/configs/BF538-EZKIT_defconfig | 133 - + arch/blackfin/configs/BF548-EZKIT_defconfig | 207 - + arch/blackfin/configs/BF561-ACVILON_defconfig | 149 - + arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 112 - + arch/blackfin/configs/BF561-EZKIT_defconfig | 114 - + arch/blackfin/configs/BF609-EZKIT_defconfig | 154 - + arch/blackfin/configs/BlackStamp_defconfig | 108 - + arch/blackfin/configs/CM-BF527_defconfig | 129 - + arch/blackfin/configs/CM-BF533_defconfig | 76 - + arch/blackfin/configs/CM-BF537E_defconfig | 107 - + arch/blackfin/configs/CM-BF537U_defconfig | 96 - + arch/blackfin/configs/CM-BF548_defconfig | 170 - + arch/blackfin/configs/CM-BF561_defconfig | 104 - + arch/blackfin/configs/DNP5370_defconfig | 118 - + arch/blackfin/configs/H8606_defconfig | 87 - + arch/blackfin/configs/IP0X_defconfig | 91 - + arch/blackfin/configs/PNAV-10_defconfig | 111 - + arch/blackfin/configs/SRV1_defconfig | 88 - + arch/blackfin/configs/TCM-BF518_defconfig | 131 - + arch/blackfin/configs/TCM-BF537_defconfig | 95 - + arch/blackfin/include/asm/Kbuild | 28 - + arch/blackfin/include/asm/asm-offsets.h | 1 - + arch/blackfin/include/asm/atomic.h | 47 - + arch/blackfin/include/asm/barrier.h | 86 - + arch/blackfin/include/asm/bfin-global.h | 95 - + arch/blackfin/include/asm/bfin-lq035q1.h | 40 - + arch/blackfin/include/asm/bfin5xx_spi.h | 86 - + arch/blackfin/include/asm/bfin_can.h | 728 -- + arch/blackfin/include/asm/bfin_dma.h | 165 - + arch/blackfin/include/asm/bfin_pfmon.h | 44 - + arch/blackfin/include/asm/bfin_ppi.h | 181 - + arch/blackfin/include/asm/bfin_sdh.h | 161 - + arch/blackfin/include/asm/bfin_serial.h | 429 -- + arch/blackfin/include/asm/bfin_simple_timer.h | 27 - + arch/blackfin/include/asm/bfin_sport.h | 71 - + arch/blackfin/include/asm/bfin_sport3.h | 107 - + arch/blackfin/include/asm/bfin_twi.h | 214 - + arch/blackfin/include/asm/bfin_watchdog.h | 30 - + arch/blackfin/include/asm/bfrom.h | 90 - + arch/blackfin/include/asm/bitops.h | 140 - + arch/blackfin/include/asm/blackfin.h | 88 - + arch/blackfin/include/asm/bug.h | 73 - + arch/blackfin/include/asm/cache.h | 70 - + arch/blackfin/include/asm/cacheflush.h | 118 - + arch/blackfin/include/asm/cdef_LPBlackfin.h | 309 - + arch/blackfin/include/asm/checksum.h | 44 - + arch/blackfin/include/asm/clocks.h | 74 - + arch/blackfin/include/asm/cmpxchg.h | 132 - + arch/blackfin/include/asm/context.S | 407 -- + arch/blackfin/include/asm/cplb.h | 153 - + arch/blackfin/include/asm/cplbinit.h | 66 - + arch/blackfin/include/asm/cpu.h | 24 - + arch/blackfin/include/asm/def_LPBlackfin.h | 697 -- + arch/blackfin/include/asm/delay.h | 51 - + arch/blackfin/include/asm/dma-mapping.h | 46 - + arch/blackfin/include/asm/dma.h | 349 - + arch/blackfin/include/asm/dpmc.h | 794 --- + arch/blackfin/include/asm/early_printk.h | 36 - + arch/blackfin/include/asm/elf.h | 135 - + arch/blackfin/include/asm/entry.h | 178 - + arch/blackfin/include/asm/exec.h | 1 - + arch/blackfin/include/asm/fixed_code.h | 30 - + arch/blackfin/include/asm/flat.h | 62 - + arch/blackfin/include/asm/ftrace.h | 73 - + arch/blackfin/include/asm/gpio.h | 234 - + arch/blackfin/include/asm/gptimers.h | 337 - + arch/blackfin/include/asm/hardirq.h | 17 - + arch/blackfin/include/asm/io.h | 49 - + arch/blackfin/include/asm/ipipe.h | 209 - + arch/blackfin/include/asm/ipipe_base.h | 75 - + arch/blackfin/include/asm/irq.h | 41 - + arch/blackfin/include/asm/irq_handler.h | 66 - + arch/blackfin/include/asm/irqflags.h | 289 - + arch/blackfin/include/asm/kgdb.h | 169 - + arch/blackfin/include/asm/l1layout.h | 37 - + arch/blackfin/include/asm/linkage.h | 13 - + arch/blackfin/include/asm/mem_init.h | 500 -- + arch/blackfin/include/asm/mem_map.h | 84 - + arch/blackfin/include/asm/mmu.h | 36 - + arch/blackfin/include/asm/mmu_context.h | 218 - + arch/blackfin/include/asm/module.h | 22 - + arch/blackfin/include/asm/nand.h | 40 - + arch/blackfin/include/asm/nmi.h | 14 - + arch/blackfin/include/asm/page.h | 22 - + arch/blackfin/include/asm/page_offset.h | 11 - + arch/blackfin/include/asm/pci.h | 13 - + arch/blackfin/include/asm/pda.h | 73 - + arch/blackfin/include/asm/perf_event.h | 1 - + arch/blackfin/include/asm/pgtable.h | 104 - + arch/blackfin/include/asm/pm.h | 31 - + arch/blackfin/include/asm/portmux.h | 1204 ---- + arch/blackfin/include/asm/processor.h | 145 - + arch/blackfin/include/asm/pseudo_instructions.h | 18 - + arch/blackfin/include/asm/ptrace.h | 42 - + arch/blackfin/include/asm/reboot.h | 20 - + arch/blackfin/include/asm/rwlock.h | 7 - + arch/blackfin/include/asm/scb.h | 21 - + arch/blackfin/include/asm/sections.h | 67 - + arch/blackfin/include/asm/segment.h | 13 - + arch/blackfin/include/asm/smp.h | 54 - + arch/blackfin/include/asm/spinlock.h | 81 - + arch/blackfin/include/asm/spinlock_types.h | 28 - + arch/blackfin/include/asm/string.h | 38 - + arch/blackfin/include/asm/switch_to.h | 39 - + arch/blackfin/include/asm/syscall.h | 96 - + arch/blackfin/include/asm/thread_info.h | 98 - + arch/blackfin/include/asm/time.h | 46 - + arch/blackfin/include/asm/timex.h | 23 - + arch/blackfin/include/asm/tlb.h | 22 - + arch/blackfin/include/asm/tlbflush.h | 2 - + arch/blackfin/include/asm/trace.h | 106 - + arch/blackfin/include/asm/traps.h | 131 - + arch/blackfin/include/asm/uaccess.h | 234 - + arch/blackfin/include/asm/unistd.h | 22 - + arch/blackfin/include/asm/vga.h | 1 - + arch/blackfin/include/mach-common/irq.h | 58 - + arch/blackfin/include/mach-common/pll.h | 86 - + arch/blackfin/include/mach-common/ports-a.h | 26 - + arch/blackfin/include/mach-common/ports-b.h | 26 - + arch/blackfin/include/mach-common/ports-c.h | 26 - + arch/blackfin/include/mach-common/ports-d.h | 26 - + arch/blackfin/include/mach-common/ports-e.h | 26 - + arch/blackfin/include/mach-common/ports-f.h | 26 - + arch/blackfin/include/mach-common/ports-g.h | 26 - + arch/blackfin/include/mach-common/ports-h.h | 26 - + arch/blackfin/include/mach-common/ports-i.h | 26 - + arch/blackfin/include/mach-common/ports-j.h | 26 - + arch/blackfin/include/uapi/asm/Kbuild | 25 - + arch/blackfin/include/uapi/asm/bfin_sport.h | 137 - + arch/blackfin/include/uapi/asm/byteorder.h | 7 - + arch/blackfin/include/uapi/asm/cachectl.h | 21 - + arch/blackfin/include/uapi/asm/fcntl.h | 18 - + arch/blackfin/include/uapi/asm/fixed_code.h | 39 - + arch/blackfin/include/uapi/asm/ioctls.h | 8 - + arch/blackfin/include/uapi/asm/poll.h | 17 - + arch/blackfin/include/uapi/asm/posix_types.h | 31 - + arch/blackfin/include/uapi/asm/ptrace.h | 171 - + arch/blackfin/include/uapi/asm/sigcontext.h | 62 - + arch/blackfin/include/uapi/asm/siginfo.h | 16 - + arch/blackfin/include/uapi/asm/signal.h | 8 - + arch/blackfin/include/uapi/asm/stat.h | 70 - + arch/blackfin/include/uapi/asm/swab.h | 51 - + arch/blackfin/include/uapi/asm/unistd.h | 448 -- + arch/blackfin/kernel/.gitignore | 1 - + arch/blackfin/kernel/Makefile | 44 - + arch/blackfin/kernel/asm-offsets.c | 164 - + arch/blackfin/kernel/bfin_dma.c | 612 -- + arch/blackfin/kernel/bfin_gpio.c | 1208 ---- + arch/blackfin/kernel/bfin_ksyms.c | 126 - + arch/blackfin/kernel/cplb-mpu/Makefile | 10 - + arch/blackfin/kernel/cplb-mpu/cplbinit.c | 102 - + arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 379 - + arch/blackfin/kernel/cplb-nompu/Makefile | 11 - + arch/blackfin/kernel/cplb-nompu/cplbinit.c | 212 - + arch/blackfin/kernel/cplb-nompu/cplbmgr.c | 227 - + arch/blackfin/kernel/cplbinfo.c | 180 - + arch/blackfin/kernel/debug-mmrs.c | 1891 ----- + arch/blackfin/kernel/dma-mapping.c | 172 - + arch/blackfin/kernel/dumpstack.c | 177 - + arch/blackfin/kernel/early_printk.c | 271 - + arch/blackfin/kernel/entry.S | 59 - + arch/blackfin/kernel/exception.c | 45 - + arch/blackfin/kernel/fixed_code.S | 155 - + arch/blackfin/kernel/flat.c | 84 - + arch/blackfin/kernel/ftrace-entry.S | 207 - + arch/blackfin/kernel/ftrace.c | 125 - + arch/blackfin/kernel/gptimers.c | 383 - + arch/blackfin/kernel/ipipe.c | 397 -- + arch/blackfin/kernel/irqchip.c | 132 - + arch/blackfin/kernel/kgdb.c | 473 -- + arch/blackfin/kernel/kgdb_test.c | 114 - + arch/blackfin/kernel/module.c | 292 - + arch/blackfin/kernel/nmi.c | 287 - + arch/blackfin/kernel/perf_event.c | 482 -- + arch/blackfin/kernel/process.c | 438 -- + arch/blackfin/kernel/pseudodbg.c | 191 - + arch/blackfin/kernel/ptrace.c | 413 -- + arch/blackfin/kernel/reboot.c | 115 - + arch/blackfin/kernel/setup.c | 1468 ---- + arch/blackfin/kernel/shadow_console.c | 111 - + arch/blackfin/kernel/signal.c | 287 - + arch/blackfin/kernel/stacktrace.c | 54 - + arch/blackfin/kernel/sys_bfin.c | 88 - + arch/blackfin/kernel/time-ts.c | 400 -- + arch/blackfin/kernel/time.c | 160 - + arch/blackfin/kernel/trace.c | 988 --- + arch/blackfin/kernel/traps.c | 585 -- + arch/blackfin/kernel/vmlinux.lds.S | 271 - + arch/blackfin/lib/Makefile | 12 - + arch/blackfin/lib/ashldi3.c | 35 - + arch/blackfin/lib/ashrdi3.c | 36 - + arch/blackfin/lib/divsi3.S | 199 - + arch/blackfin/lib/gcclib.h | 24 - + arch/blackfin/lib/ins.S | 118 - + arch/blackfin/lib/lshrdi3.c | 35 - + arch/blackfin/lib/memchr.S | 47 - + arch/blackfin/lib/memcmp.S | 92 - + arch/blackfin/lib/memcpy.S | 124 - + arch/blackfin/lib/memmove.S | 93 - + arch/blackfin/lib/memset.S | 87 - + arch/blackfin/lib/modsi3.S | 57 - + arch/blackfin/lib/muldi3.S | 74 - + arch/blackfin/lib/outs.S | 68 - + arch/blackfin/lib/smulsi3_highpart.S | 38 - + arch/blackfin/lib/strcmp.S | 43 - + arch/blackfin/lib/strcpy.S | 35 - + arch/blackfin/lib/strncmp.S | 52 - + arch/blackfin/lib/strncpy.S | 85 - + arch/blackfin/lib/udivsi3.S | 277 - + arch/blackfin/lib/umodsi3.S | 49 - + arch/blackfin/lib/umulsi3_highpart.S | 31 - + arch/blackfin/mach-bf518/Kconfig | 320 - + arch/blackfin/mach-bf518/Makefile | 5 - + arch/blackfin/mach-bf518/boards/Kconfig | 18 - + arch/blackfin/mach-bf518/boards/Makefile | 6 - + arch/blackfin/mach-bf518/boards/ezbrd.c | 794 --- + arch/blackfin/mach-bf518/boards/tcm-bf518.c | 739 -- + arch/blackfin/mach-bf518/dma.c | 98 - + arch/blackfin/mach-bf518/include/mach/anomaly.h | 170 - + arch/blackfin/mach-bf518/include/mach/bf518.h | 214 - + .../blackfin/mach-bf518/include/mach/bfin_serial.h | 14 - + arch/blackfin/mach-bf518/include/mach/blackfin.h | 43 - + arch/blackfin/mach-bf518/include/mach/cdefBF512.h | 1043 --- + arch/blackfin/mach-bf518/include/mach/cdefBF514.h | 80 - + arch/blackfin/mach-bf518/include/mach/cdefBF516.h | 178 - + arch/blackfin/mach-bf518/include/mach/cdefBF518.h | 56 - + arch/blackfin/mach-bf518/include/mach/defBF512.h | 1304 ---- + arch/blackfin/mach-bf518/include/mach/defBF514.h | 48 - + arch/blackfin/mach-bf518/include/mach/defBF516.h | 392 -- + arch/blackfin/mach-bf518/include/mach/defBF518.h | 67 - + arch/blackfin/mach-bf518/include/mach/dma.h | 33 - + arch/blackfin/mach-bf518/include/mach/gpio.h | 62 - + arch/blackfin/mach-bf518/include/mach/irq.h | 205 - + arch/blackfin/mach-bf518/include/mach/mem_map.h | 70 - + arch/blackfin/mach-bf518/include/mach/pll.h | 1 - + arch/blackfin/mach-bf518/include/mach/portmux.h | 223 - + arch/blackfin/mach-bf518/ints-priority.c | 78 - + arch/blackfin/mach-bf527/Kconfig | 325 - + arch/blackfin/mach-bf527/Makefile | 5 - + arch/blackfin/mach-bf527/boards/Kconfig | 38 - + arch/blackfin/mach-bf527/boards/Makefile | 11 - + arch/blackfin/mach-bf527/boards/ad7160eval.c | 868 --- + arch/blackfin/mach-bf527/boards/cm_bf527.c | 992 --- + arch/blackfin/mach-bf527/boards/ezbrd.c | 891 --- + arch/blackfin/mach-bf527/boards/ezkit.c | 1335 ---- + arch/blackfin/mach-bf527/boards/tll6527m.c | 946 --- + arch/blackfin/mach-bf527/dma.c | 98 - + arch/blackfin/mach-bf527/include/mach/anomaly.h | 290 - + arch/blackfin/mach-bf527/include/mach/bf527.h | 237 - + .../blackfin/mach-bf527/include/mach/bfin_serial.h | 14 - + arch/blackfin/mach-bf527/include/mach/blackfin.h | 37 - + arch/blackfin/mach-bf527/include/mach/cdefBF522.h | 1095 --- + arch/blackfin/mach-bf527/include/mach/cdefBF525.h | 421 -- + arch/blackfin/mach-bf527/include/mach/cdefBF527.h | 178 - + arch/blackfin/mach-bf527/include/mach/defBF522.h | 1309 ---- + arch/blackfin/mach-bf527/include/mach/defBF525.h | 678 -- + arch/blackfin/mach-bf527/include/mach/defBF527.h | 391 -- + arch/blackfin/mach-bf527/include/mach/dma.h | 38 - + arch/blackfin/mach-bf527/include/mach/gpio.h | 69 - + arch/blackfin/mach-bf527/include/mach/irq.h | 204 - + arch/blackfin/mach-bf527/include/mach/mem_map.h | 70 - + arch/blackfin/mach-bf527/include/mach/pll.h | 1 - + arch/blackfin/mach-bf527/include/mach/portmux.h | 220 - + arch/blackfin/mach-bf527/ints-priority.c | 79 - + arch/blackfin/mach-bf533/Kconfig | 96 - + arch/blackfin/mach-bf533/Makefile | 5 - + arch/blackfin/mach-bf533/boards/H8606.c | 452 -- + arch/blackfin/mach-bf533/boards/Kconfig | 42 - + arch/blackfin/mach-bf533/boards/Makefile | 11 - + arch/blackfin/mach-bf533/boards/blackstamp.c | 523 -- + arch/blackfin/mach-bf533/boards/cm_bf533.c | 582 -- + arch/blackfin/mach-bf533/boards/ezkit.c | 551 -- + arch/blackfin/mach-bf533/boards/ip0x.c | 319 - + arch/blackfin/mach-bf533/boards/stamp.c | 919 --- + arch/blackfin/mach-bf533/dma.c | 78 - + arch/blackfin/mach-bf533/include/mach/anomaly.h | 383 - + arch/blackfin/mach-bf533/include/mach/bf533.h | 138 - + .../blackfin/mach-bf533/include/mach/bfin_serial.h | 14 - + arch/blackfin/mach-bf533/include/mach/blackfin.h | 23 - + arch/blackfin/mach-bf533/include/mach/cdefBF532.h | 682 -- + arch/blackfin/mach-bf533/include/mach/defBF532.h | 831 --- + arch/blackfin/mach-bf533/include/mach/dma.h | 26 - + arch/blackfin/mach-bf533/include/mach/gpio.h | 33 - + arch/blackfin/mach-bf533/include/mach/irq.h | 92 - + arch/blackfin/mach-bf533/include/mach/mem_map.h | 139 - + arch/blackfin/mach-bf533/include/mach/pll.h | 1 - + arch/blackfin/mach-bf533/include/mach/portmux.h | 71 - + arch/blackfin/mach-bf533/ints-priority.c | 44 - + arch/blackfin/mach-bf537/Kconfig | 118 - + arch/blackfin/mach-bf537/Makefile | 5 - + arch/blackfin/mach-bf537/boards/Kconfig | 49 - + arch/blackfin/mach-bf537/boards/Makefile | 12 - + arch/blackfin/mach-bf537/boards/cm_bf537e.c | 945 --- + arch/blackfin/mach-bf537/boards/cm_bf537u.c | 802 --- + arch/blackfin/mach-bf537/boards/dnp5370.c | 413 -- + arch/blackfin/mach-bf537/boards/minotaur.c | 585 -- + arch/blackfin/mach-bf537/boards/pnav10.c | 538 -- + arch/blackfin/mach-bf537/boards/stamp.c | 3019 -------- + arch/blackfin/mach-bf537/boards/tcm_bf537.c | 792 --- + arch/blackfin/mach-bf537/dma.c | 98 - + arch/blackfin/mach-bf537/include/mach/anomaly.h | 241 - + arch/blackfin/mach-bf537/include/mach/bf537.h | 108 - + .../blackfin/mach-bf537/include/mach/bfin_serial.h | 14 - + arch/blackfin/mach-bf537/include/mach/blackfin.h | 33 - + arch/blackfin/mach-bf537/include/mach/cdefBF534.h | 1736 ----- + arch/blackfin/mach-bf537/include/mach/cdefBF537.h | 178 - + arch/blackfin/mach-bf537/include/mach/defBF534.h | 1470 ---- + arch/blackfin/mach-bf537/include/mach/defBF537.h | 377 - + arch/blackfin/mach-bf537/include/mach/dma.h | 31 - + arch/blackfin/mach-bf537/include/mach/gpio.h | 69 - + arch/blackfin/mach-bf537/include/mach/irq.h | 184 - + arch/blackfin/mach-bf537/include/mach/mem_map.h | 147 - + arch/blackfin/mach-bf537/include/mach/pll.h | 1 - + arch/blackfin/mach-bf537/include/mach/portmux.h | 152 - + arch/blackfin/mach-bf537/ints-priority.c | 214 - + arch/blackfin/mach-bf538/Kconfig | 166 - + arch/blackfin/mach-bf538/Makefile | 6 - + arch/blackfin/mach-bf538/boards/Kconfig | 13 - + arch/blackfin/mach-bf538/boards/Makefile | 5 - + arch/blackfin/mach-bf538/boards/ezkit.c | 987 --- + arch/blackfin/mach-bf538/dma.c | 141 - + arch/blackfin/mach-bf538/ext-gpio.c | 158 - + arch/blackfin/mach-bf538/include/mach/anomaly.h | 215 - + arch/blackfin/mach-bf538/include/mach/bf538.h | 103 - + .../blackfin/mach-bf538/include/mach/bfin_serial.h | 14 - + arch/blackfin/mach-bf538/include/mach/blackfin.h | 33 - + arch/blackfin/mach-bf538/include/mach/cdefBF538.h | 1960 ------ + arch/blackfin/mach-bf538/include/mach/cdefBF539.h | 240 - + arch/blackfin/mach-bf538/include/mach/defBF538.h | 1749 ----- + arch/blackfin/mach-bf538/include/mach/defBF539.h | 152 - + arch/blackfin/mach-bf538/include/mach/dma.h | 41 - + arch/blackfin/mach-bf538/include/mach/gpio.h | 81 - + arch/blackfin/mach-bf538/include/mach/irq.h | 148 - + arch/blackfin/mach-bf538/include/mach/mem_map.h | 74 - + arch/blackfin/mach-bf538/include/mach/pll.h | 1 - + arch/blackfin/mach-bf538/include/mach/portmux.h | 114 - + arch/blackfin/mach-bf538/ints-priority.c | 73 - + arch/blackfin/mach-bf548/Kconfig | 383 - + arch/blackfin/mach-bf548/Makefile | 5 - + arch/blackfin/mach-bf548/boards/Kconfig | 19 - + arch/blackfin/mach-bf548/boards/Makefile | 6 - + arch/blackfin/mach-bf548/boards/cm_bf548.c | 1268 ---- + arch/blackfin/mach-bf548/boards/ezkit.c | 2199 ------ + arch/blackfin/mach-bf548/dma.c | 139 - + arch/blackfin/mach-bf548/include/mach/anomaly.h | 301 - + arch/blackfin/mach-bf548/include/mach/bf548.h | 105 - + .../blackfin/mach-bf548/include/mach/bf54x-lq043.h | 36 - + arch/blackfin/mach-bf548/include/mach/bf54x_keys.h | 23 - + .../blackfin/mach-bf548/include/mach/bfin_serial.h | 16 - + arch/blackfin/mach-bf548/include/mach/blackfin.h | 49 - + arch/blackfin/mach-bf548/include/mach/cdefBF542.h | 554 -- + arch/blackfin/mach-bf548/include/mach/cdefBF544.h | 913 --- + arch/blackfin/mach-bf548/include/mach/cdefBF547.h | 796 --- + arch/blackfin/mach-bf548/include/mach/cdefBF548.h | 761 -- + arch/blackfin/mach-bf548/include/mach/cdefBF549.h | 302 - + .../mach-bf548/include/mach/cdefBF54x_base.h | 2633 ------- + arch/blackfin/mach-bf548/include/mach/defBF542.h | 763 -- + arch/blackfin/mach-bf548/include/mach/defBF544.h | 630 -- + arch/blackfin/mach-bf548/include/mach/defBF547.h | 1034 --- + arch/blackfin/mach-bf548/include/mach/defBF548.h | 399 -- + arch/blackfin/mach-bf548/include/mach/defBF549.h | 186 - + .../mach-bf548/include/mach/defBF54x_base.h | 2294 ------ + arch/blackfin/mach-bf548/include/mach/dma.h | 72 - + arch/blackfin/mach-bf548/include/mach/gpio.h | 210 - + arch/blackfin/mach-bf548/include/mach/irq.h | 454 -- + arch/blackfin/mach-bf548/include/mach/mem_map.h | 84 - + arch/blackfin/mach-bf548/include/mach/pll.h | 1 - + arch/blackfin/mach-bf548/include/mach/portmux.h | 318 - + arch/blackfin/mach-bf548/ints-priority.c | 116 - + arch/blackfin/mach-bf561/Kconfig | 213 - + arch/blackfin/mach-bf561/Makefile | 9 - + arch/blackfin/mach-bf561/atomic.S | 945 --- + arch/blackfin/mach-bf561/boards/Kconfig | 30 - + arch/blackfin/mach-bf561/boards/Makefile | 8 - + arch/blackfin/mach-bf561/boards/acvilon.c | 543 -- + arch/blackfin/mach-bf561/boards/cm_bf561.c | 556 -- + arch/blackfin/mach-bf561/boards/ezkit.c | 688 -- + arch/blackfin/mach-bf561/boards/tepla.c | 162 - + arch/blackfin/mach-bf561/coreb.c | 64 - + arch/blackfin/mach-bf561/dma.c | 114 - + arch/blackfin/mach-bf561/hotplug.c | 40 - + arch/blackfin/mach-bf561/include/mach/anomaly.h | 353 - + arch/blackfin/mach-bf561/include/mach/bf561.h | 200 - + .../blackfin/mach-bf561/include/mach/bfin_serial.h | 14 - + arch/blackfin/mach-bf561/include/mach/blackfin.h | 41 - + arch/blackfin/mach-bf561/include/mach/cdefBF561.h | 1460 ---- + arch/blackfin/mach-bf561/include/mach/defBF561.h | 1402 ---- + arch/blackfin/mach-bf561/include/mach/dma.h | 39 - + arch/blackfin/mach-bf561/include/mach/gpio.h | 67 - + arch/blackfin/mach-bf561/include/mach/irq.h | 236 - + arch/blackfin/mach-bf561/include/mach/mem_map.h | 219 - + arch/blackfin/mach-bf561/include/mach/pll.h | 56 - + arch/blackfin/mach-bf561/include/mach/portmux.h | 97 - + arch/blackfin/mach-bf561/include/mach/smp.h | 32 - + arch/blackfin/mach-bf561/ints-priority.c | 87 - + arch/blackfin/mach-bf561/secondary.S | 192 - + arch/blackfin/mach-bf561/smp.c | 172 - + arch/blackfin/mach-bf609/Kconfig | 1684 ----- + arch/blackfin/mach-bf609/Makefile | 7 - + arch/blackfin/mach-bf609/boards/Kconfig | 13 - + arch/blackfin/mach-bf609/boards/Makefile | 5 - + arch/blackfin/mach-bf609/boards/ezkit.c | 2191 ------ + arch/blackfin/mach-bf609/clock.c | 409 -- + arch/blackfin/mach-bf609/dma.c | 202 - + arch/blackfin/mach-bf609/dpm.S | 158 - + arch/blackfin/mach-bf609/include/mach/anomaly.h | 137 - + arch/blackfin/mach-bf609/include/mach/bf609.h | 93 - + .../blackfin/mach-bf609/include/mach/bfin_serial.h | 17 - + arch/blackfin/mach-bf609/include/mach/blackfin.h | 25 - + arch/blackfin/mach-bf609/include/mach/cdefBF609.h | 15 - + .../mach-bf609/include/mach/cdefBF60x_base.h | 3254 --------- + arch/blackfin/mach-bf609/include/mach/defBF609.h | 286 - + .../mach-bf609/include/mach/defBF60x_base.h | 3596 ---------- + arch/blackfin/mach-bf609/include/mach/dma.h | 116 - + arch/blackfin/mach-bf609/include/mach/gpio.h | 165 - + arch/blackfin/mach-bf609/include/mach/irq.h | 319 - + arch/blackfin/mach-bf609/include/mach/mem_map.h | 86 - + arch/blackfin/mach-bf609/include/mach/pll.h | 1 - + arch/blackfin/mach-bf609/include/mach/pm.h | 25 - + arch/blackfin/mach-bf609/include/mach/portmux.h | 349 - + arch/blackfin/mach-bf609/ints-priority.c | 156 - + arch/blackfin/mach-bf609/pm.c | 361 - + arch/blackfin/mach-bf609/scb.c | 363 - + arch/blackfin/mach-common/Makefile | 17 - + arch/blackfin/mach-common/arch_checks.c | 66 - + arch/blackfin/mach-common/cache-c.c | 85 - + arch/blackfin/mach-common/cache.S | 124 - + arch/blackfin/mach-common/clock.h | 28 - + arch/blackfin/mach-common/clocks-init.c | 121 - + arch/blackfin/mach-common/dpmc.c | 164 - + arch/blackfin/mach-common/dpmc_modes.S | 320 - + arch/blackfin/mach-common/entry.S | 1711 ----- + arch/blackfin/mach-common/head.S | 229 - + arch/blackfin/mach-common/interrupt.S | 326 - + arch/blackfin/mach-common/ints-priority.c | 1366 ---- + arch/blackfin/mach-common/pm.c | 301 - + arch/blackfin/mach-common/scb-init.c | 52 - + arch/blackfin/mach-common/smp.c | 432 -- + arch/blackfin/mm/Makefile | 5 - + arch/blackfin/mm/blackfin_sram.h | 14 - + arch/blackfin/mm/init.c | 122 - + arch/blackfin/mm/isram-driver.c | 411 -- + arch/blackfin/mm/maccess.c | 97 - + arch/blackfin/mm/sram-alloc.c | 899 --- + arch/blackfin/oprofile/Makefile | 14 - + arch/blackfin/oprofile/bfin_oprofile.c | 18 - + arch/cris/Kconfig | 595 -- + arch/cris/Kconfig.debug | 41 - + arch/cris/Makefile | 104 - + arch/cris/arch-v10/Kconfig | 399 -- + arch/cris/arch-v10/README.mm | 244 - + arch/cris/arch-v10/drivers/Kconfig | 561 -- + arch/cris/arch-v10/drivers/Makefile | 11 - + arch/cris/arch-v10/drivers/axisflashmap.c | 413 -- + arch/cris/arch-v10/drivers/eeprom.c | 852 --- + arch/cris/arch-v10/drivers/gpio.c | 857 --- + arch/cris/arch-v10/drivers/i2c.c | 699 -- + arch/cris/arch-v10/drivers/i2c.h | 18 - + arch/cris/arch-v10/drivers/sync_serial.c | 1463 ---- + arch/cris/arch-v10/kernel/Makefile | 18 - + arch/cris/arch-v10/kernel/crisksyms.c | 17 - + arch/cris/arch-v10/kernel/debugport.c | 560 -- + arch/cris/arch-v10/kernel/dma.c | 288 - + arch/cris/arch-v10/kernel/entry.S | 978 --- + arch/cris/arch-v10/kernel/fasttimer.c | 835 --- + arch/cris/arch-v10/kernel/head.S | 620 -- + arch/cris/arch-v10/kernel/io_interface_mux.c | 1183 ---- + arch/cris/arch-v10/kernel/irq.c | 236 - + arch/cris/arch-v10/kernel/kgdb.c | 1128 --- + arch/cris/arch-v10/kernel/process.c | 180 - + arch/cris/arch-v10/kernel/ptrace.c | 204 - + arch/cris/arch-v10/kernel/setup.c | 107 - + arch/cris/arch-v10/kernel/shadows.c | 37 - + arch/cris/arch-v10/kernel/signal.c | 440 -- + arch/cris/arch-v10/kernel/time.c | 268 - + arch/cris/arch-v10/kernel/traps.c | 134 - + arch/cris/arch-v10/lib/Makefile | 6 - + arch/cris/arch-v10/lib/checksum.S | 119 - + arch/cris/arch-v10/lib/checksumcopy.S | 127 - + arch/cris/arch-v10/lib/csumcpfruser.S | 65 - + arch/cris/arch-v10/lib/dram_init.S | 147 - + arch/cris/arch-v10/lib/hw_settings.S | 61 - + arch/cris/arch-v10/lib/memset.c | 259 - + arch/cris/arch-v10/lib/string.c | 236 - + arch/cris/arch-v10/lib/usercopy.c | 511 -- + arch/cris/arch-v10/mm/Makefile | 6 - + arch/cris/arch-v10/mm/fault.c | 96 - + arch/cris/arch-v10/mm/init.c | 256 - + arch/cris/arch-v10/mm/tlb.c | 179 - + arch/cris/arch-v10/output_arch.ld | 2 - + arch/cris/arch-v32/Kconfig | 211 - + arch/cris/arch-v32/drivers/Kconfig | 263 - + arch/cris/arch-v32/drivers/Makefile | 12 - + arch/cris/arch-v32/drivers/axisflashmap.c | 592 -- + arch/cris/arch-v32/drivers/cryptocop.c | 3522 ---------- + arch/cris/arch-v32/drivers/iop_fw_load.c | 230 - + arch/cris/arch-v32/drivers/mach-a3/Makefile | 5 - + arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 177 - + arch/cris/arch-v32/drivers/mach-fs/Makefile | 5 - + arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 171 - + arch/cris/arch-v32/drivers/pci/Makefile | 5 - + arch/cris/arch-v32/drivers/pci/bios.c | 74 - + arch/cris/arch-v32/drivers/sync_serial.c | 1715 ----- + arch/cris/arch-v32/kernel/Makefile | 18 - + arch/cris/arch-v32/kernel/cache.c | 34 - + arch/cris/arch-v32/kernel/cacheflush.S | 100 - + arch/cris/arch-v32/kernel/crisksyms.c | 26 - + arch/cris/arch-v32/kernel/debugport.c | 232 - + arch/cris/arch-v32/kernel/entry.S | 909 --- + arch/cris/arch-v32/kernel/fasttimer.c | 793 --- + arch/cris/arch-v32/kernel/head.S | 439 -- + arch/cris/arch-v32/kernel/irq.c | 520 -- + arch/cris/arch-v32/kernel/kgdb.c | 1593 ----- + arch/cris/arch-v32/kernel/kgdb_asm.S | 552 -- + arch/cris/arch-v32/kernel/process.c | 180 - + arch/cris/arch-v32/kernel/ptrace.c | 492 -- + arch/cris/arch-v32/kernel/setup.c | 163 - + arch/cris/arch-v32/kernel/signal.c | 541 -- + arch/cris/arch-v32/kernel/time.c | 345 - + arch/cris/arch-v32/kernel/traps.c | 196 - + arch/cris/arch-v32/lib/Makefile | 7 - + arch/cris/arch-v32/lib/checksum.S | 89 - + arch/cris/arch-v32/lib/checksumcopy.S | 95 - + arch/cris/arch-v32/lib/csumcpfruser.S | 70 - + arch/cris/arch-v32/lib/delay.c | 29 - + arch/cris/arch-v32/lib/memset.c | 259 - + arch/cris/arch-v32/lib/strcmp.S | 21 - + arch/cris/arch-v32/lib/string.c | 236 - + arch/cris/arch-v32/lib/usercopy.c | 458 -- + arch/cris/arch-v32/mach-a3/Kconfig | 111 - + arch/cris/arch-v32/mach-a3/Makefile | 8 - + arch/cris/arch-v32/mach-a3/arbiter.c | 635 -- + arch/cris/arch-v32/mach-a3/dma.c | 184 - + arch/cris/arch-v32/mach-a3/dram_init.S | 119 - + arch/cris/arch-v32/mach-a3/hw_settings.S | 54 - + arch/cris/arch-v32/mach-a3/pinmux.c | 389 -- + arch/cris/arch-v32/mach-fs/Kconfig | 198 - + arch/cris/arch-v32/mach-fs/Makefile | 8 - + arch/cris/arch-v32/mach-fs/arbiter.c | 405 -- + arch/cris/arch-v32/mach-fs/dma.c | 229 - + arch/cris/arch-v32/mach-fs/dram_init.S | 117 - + arch/cris/arch-v32/mach-fs/hw_settings.S | 71 - + arch/cris/arch-v32/mach-fs/pinmux.c | 328 - + arch/cris/arch-v32/mm/Makefile | 4 - + arch/cris/arch-v32/mm/init.c | 163 - + arch/cris/arch-v32/mm/intmem.c | 157 - + arch/cris/arch-v32/mm/l2cache.c | 30 - + arch/cris/arch-v32/mm/mmu.S | 211 - + arch/cris/arch-v32/mm/tlb.c | 209 - + arch/cris/arch-v32/output_arch.ld | 2 - + arch/cris/boot/.gitignore | 2 - + arch/cris/boot/Makefile | 25 - + arch/cris/boot/compressed/Makefile | 36 - + arch/cris/boot/compressed/README | 24 - + arch/cris/boot/compressed/decompress_v10.lds | 31 - + arch/cris/boot/compressed/decompress_v32.lds | 31 - + arch/cris/boot/compressed/head_v10.S | 127 - + arch/cris/boot/compressed/head_v32.S | 146 - + arch/cris/boot/compressed/misc.c | 377 - + arch/cris/boot/dts/Makefile | 5 - + arch/cris/boot/dts/artpec3.dtsi | 47 - + arch/cris/boot/dts/dev88.dts | 68 - + arch/cris/boot/dts/etraxfs.dtsi | 47 - + arch/cris/boot/dts/p1343.dts | 77 - + arch/cris/boot/rescue/Makefile | 53 - + arch/cris/boot/rescue/head_v10.S | 358 - + arch/cris/boot/rescue/head_v32.S | 27 - + arch/cris/boot/rescue/kimagerescue.S | 142 - + arch/cris/boot/rescue/rescue_v10.lds | 21 - + arch/cris/boot/rescue/rescue_v32.lds | 44 - + arch/cris/boot/rescue/testrescue.S | 25 - + arch/cris/boot/tools/build.c | 288 - + arch/cris/configs/artpec_3_defconfig | 40 - + arch/cris/configs/dev88_defconfig | 48 - + arch/cris/configs/etrax-100lx_defconfig | 23 - + arch/cris/configs/etrax-100lx_v2_defconfig | 42 - + arch/cris/configs/etraxfs_defconfig | 40 - + arch/cris/include/arch-v10/arch/bitops.h | 74 - + arch/cris/include/arch-v10/arch/bug.h | 74 - + arch/cris/include/arch-v10/arch/cache.h | 9 - + arch/cris/include/arch-v10/arch/checksum.h | 30 - + arch/cris/include/arch-v10/arch/delay.h | 21 - + arch/cris/include/arch-v10/arch/dma.h | 75 - + arch/cris/include/arch-v10/arch/io.h | 173 - + arch/cris/include/arch-v10/arch/io_interface_mux.h | 76 - + arch/cris/include/arch-v10/arch/irq.h | 162 - + arch/cris/include/arch-v10/arch/irqflags.h | 46 - + arch/cris/include/arch-v10/arch/memmap.h | 23 - + arch/cris/include/arch-v10/arch/mmu.h | 108 - + arch/cris/include/arch-v10/arch/offset.h | 34 - + arch/cris/include/arch-v10/arch/page.h | 31 - + arch/cris/include/arch-v10/arch/pgtable.h | 18 - + arch/cris/include/arch-v10/arch/processor.h | 70 - + arch/cris/include/arch-v10/arch/swab.h | 31 - + arch/cris/include/arch-v10/arch/system.h | 40 - + arch/cris/include/arch-v10/arch/thread_info.h | 13 - + arch/cris/include/arch-v10/arch/timex.h | 31 - + arch/cris/include/arch-v10/arch/tlb.h | 14 - + arch/cris/include/arch-v10/arch/uaccess.h | 651 -- + arch/cris/include/arch-v10/arch/unistd.h | 149 - + arch/cris/include/arch-v32/arch/bitops.h | 65 - + arch/cris/include/arch-v32/arch/bug.h | 41 - + arch/cris/include/arch-v32/arch/cache.h | 22 - + arch/cris/include/arch-v32/arch/checksum.h | 30 - + arch/cris/include/arch-v32/arch/cryptocop.h | 159 - + arch/cris/include/arch-v32/arch/delay.h | 29 - + arch/cris/include/arch-v32/arch/dma.h | 1 - + arch/cris/include/arch-v32/arch/hwregs/Makefile | 187 - + .../arch-v32/arch/hwregs/asm/ata_defs_asm.h | 223 - + .../arch-v32/arch/hwregs/asm/bif_core_defs_asm.h | 320 - + .../arch-v32/arch/hwregs/asm/bif_dma_defs_asm.h | 496 -- + .../arch-v32/arch/hwregs/asm/bif_slave_defs_asm.h | 250 - + .../arch-v32/arch/hwregs/asm/config_defs_asm.h | 132 - + .../include/arch-v32/arch/hwregs/asm/cpu_vect.h | 41 - + .../arch-v32/arch/hwregs/asm/cris_defs_asm.h | 115 - + .../arch-v32/arch/hwregs/asm/cris_supp_reg.h | 11 - + .../arch-v32/arch/hwregs/asm/dma_defs_asm.h | 369 - + .../arch-v32/arch/hwregs/asm/eth_defs_asm.h | 499 -- + .../arch-v32/arch/hwregs/asm/gio_defs_asm.h | 277 - + .../include/arch-v32/arch/hwregs/asm/intr_vect.h | 39 - + .../arch-v32/arch/hwregs/asm/intr_vect_defs_asm.h | 356 - + .../arch-v32/arch/hwregs/asm/irq_nmi_defs_asm.h | 70 - + .../arch-v32/arch/hwregs/asm/marb_defs_asm.h | 580 -- + .../arch-v32/arch/hwregs/asm/mmu_defs_asm.h | 213 - + .../arch-v32/arch/hwregs/asm/mmu_supp_reg.h | 8 - + .../arch-v32/arch/hwregs/asm/rt_trace_defs_asm.h | 143 - + .../arch-v32/arch/hwregs/asm/ser_defs_asm.h | 360 - + .../arch-v32/arch/hwregs/asm/sser_defs_asm.h | 463 -- + .../arch-v32/arch/hwregs/asm/strcop_defs_asm.h | 85 - + .../arch-v32/arch/hwregs/asm/strmux_defs_asm.h | 101 - + .../arch-v32/arch/hwregs/asm/timer_defs_asm.h | 230 - + arch/cris/include/arch-v32/arch/hwregs/ata_defs.h | 223 - + .../include/arch-v32/arch/hwregs/bif_core_defs.h | 285 - + .../include/arch-v32/arch/hwregs/bif_dma_defs.h | 474 -- + .../include/arch-v32/arch/hwregs/bif_slave_defs.h | 250 - + .../include/arch-v32/arch/hwregs/config_defs.h | 143 - + arch/cris/include/arch-v32/arch/hwregs/cpu_vect.h | 42 - + arch/cris/include/arch-v32/arch/hwregs/dma.h | 128 - + arch/cris/include/arch-v32/arch/hwregs/dma_defs.h | 437 -- + arch/cris/include/arch-v32/arch/hwregs/eth_defs.h | 379 - + .../include/arch-v32/arch/hwregs/extmem_defs.h | 370 - + .../cris/include/arch-v32/arch/hwregs/iop/Makefile | 147 - + .../arch/hwregs/iop/asm/iop_crc_par_defs_asm.h | 172 - + .../arch/hwregs/iop/asm/iop_dmc_in_defs_asm.h | 322 - + .../arch/hwregs/iop/asm/iop_dmc_out_defs_asm.h | 350 - + .../arch/hwregs/iop/asm/iop_fifo_in_defs_asm.h | 235 - + .../hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h | 156 - + .../arch/hwregs/iop/asm/iop_fifo_out_defs_asm.h | 255 - + .../hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h | 159 - + .../arch/hwregs/iop/asm/iop_mpu_defs_asm.h | 178 - + .../arch/hwregs/iop/asm/iop_reg_space_asm.h | 45 - + .../arch/hwregs/iop/asm/iop_sap_in_defs_asm.h | 183 - + .../arch/hwregs/iop/asm/iop_sap_out_defs_asm.h | 347 - + .../arch/hwregs/iop/asm/iop_scrc_in_defs_asm.h | 112 - + .../arch/hwregs/iop/asm/iop_scrc_out_defs_asm.h | 106 - + .../arch/hwregs/iop/asm/iop_spu_defs_asm.h | 574 -- + .../arch/hwregs/iop/asm/iop_sw_cfg_defs_asm.h | 1053 --- + .../arch/hwregs/iop/asm/iop_sw_cpu_defs_asm.h | 1759 ----- + .../arch/hwregs/iop/asm/iop_sw_mpu_defs_asm.h | 1777 ----- + .../arch/hwregs/iop/asm/iop_sw_spu_defs_asm.h | 692 -- + .../arch/hwregs/iop/asm/iop_timer_grp_defs_asm.h | 238 - + .../arch/hwregs/iop/asm/iop_trigger_grp_defs_asm.h | 158 - + .../arch/hwregs/iop/asm/iop_version_defs_asm.h | 65 - + .../arch-v32/arch/hwregs/iop/iop_crc_par_defs.h | 233 - + .../arch-v32/arch/hwregs/iop/iop_dmc_in_defs.h | 326 - + .../arch-v32/arch/hwregs/iop/iop_dmc_out_defs.h | 327 - + .../arch-v32/arch/hwregs/iop/iop_fifo_in_defs.h | 256 - + .../arch/hwregs/iop/iop_fifo_in_extra_defs.h | 165 - + .../arch-v32/arch/hwregs/iop/iop_fifo_out_defs.h | 279 - + .../arch/hwregs/iop/iop_fifo_out_extra_defs.h | 165 - + .../arch-v32/arch/hwregs/iop/iop_mpu_defs.h | 191 - + .../arch-v32/arch/hwregs/iop/iop_mpu_macros.h | 765 -- + .../arch-v32/arch/hwregs/iop/iop_reg_space.h | 45 - + .../arch-v32/arch/hwregs/iop/iop_sap_in_defs.h | 180 - + .../arch-v32/arch/hwregs/iop/iop_sap_out_defs.h | 307 - + .../arch-v32/arch/hwregs/iop/iop_scrc_in_defs.h | 161 - + .../arch-v32/arch/hwregs/iop/iop_scrc_out_defs.h | 147 - + .../arch-v32/arch/hwregs/iop/iop_spu_defs.h | 454 -- + .../arch-v32/arch/hwregs/iop/iop_sw_cfg_defs.h | 1043 --- + .../arch-v32/arch/hwregs/iop/iop_sw_cpu_defs.h | 854 --- + .../arch-v32/arch/hwregs/iop/iop_sw_mpu_defs.h | 894 --- + .../arch-v32/arch/hwregs/iop/iop_sw_spu_defs.h | 553 -- + .../arch-v32/arch/hwregs/iop/iop_timer_grp_defs.h | 250 - + .../arch/hwregs/iop/iop_trigger_grp_defs.h | 171 - + .../arch-v32/arch/hwregs/iop/iop_version_defs.h | 100 - + .../include/arch-v32/arch/hwregs/irq_nmi_defs.h | 105 - + .../include/arch-v32/arch/hwregs/marb_bp_defs.h | 206 - + arch/cris/include/arch-v32/arch/hwregs/marb_defs.h | 476 -- + arch/cris/include/arch-v32/arch/hwregs/reg_rdwr.h | 18 - + .../include/arch-v32/arch/hwregs/rt_trace_defs.h | 174 - + arch/cris/include/arch-v32/arch/hwregs/ser_defs.h | 309 - + arch/cris/include/arch-v32/arch/hwregs/sser_defs.h | 332 - + arch/cris/include/arch-v32/arch/hwregs/strcop.h | 58 - + .../include/arch-v32/arch/hwregs/strcop_defs.h | 110 - + arch/cris/include/arch-v32/arch/hwregs/supp_reg.h | 79 - + arch/cris/include/arch-v32/arch/intmem.h | 10 - + arch/cris/include/arch-v32/arch/irq.h | 125 - + arch/cris/include/arch-v32/arch/irqflags.h | 47 - + arch/cris/include/arch-v32/arch/memmap.h | 1 - + arch/cris/include/arch-v32/arch/mmu.h | 111 - + arch/cris/include/arch-v32/arch/offset.h | 36 - + arch/cris/include/arch-v32/arch/page.h | 23 - + arch/cris/include/arch-v32/arch/pgtable.h | 18 - + arch/cris/include/arch-v32/arch/processor.h | 54 - + arch/cris/include/arch-v32/arch/swab.h | 25 - + arch/cris/include/arch-v32/arch/system.h | 38 - + arch/cris/include/arch-v32/arch/thread_info.h | 14 - + arch/cris/include/arch-v32/arch/timex.h | 32 - + arch/cris/include/arch-v32/arch/tlb.h | 15 - + arch/cris/include/arch-v32/arch/uaccess.h | 730 -- + arch/cris/include/arch-v32/arch/unistd.h | 156 - + arch/cris/include/arch-v32/mach-a3/mach/arbiter.h | 35 - + arch/cris/include/arch-v32/mach-a3/mach/dma.h | 59 - + .../mach-a3/mach/hwregs/asm/clkgen_defs_asm.h | 165 - + .../mach-a3/mach/hwregs/asm/ddr2_defs_asm.h | 267 - + .../mach-a3/mach/hwregs/asm/gio_defs_asm.h | 850 --- + .../mach-a3/mach/hwregs/asm/pinmux_defs_asm.h | 573 -- + .../mach-a3/mach/hwregs/asm/pio_defs_asm.h | 338 - + .../arch-v32/mach-a3/mach/hwregs/asm/reg_map_asm.h | 100 - + .../mach-a3/mach/hwregs/asm/timer_defs_asm.h | 229 - + .../arch-v32/mach-a3/mach/hwregs/clkgen_defs.h | 160 - + .../arch-v32/mach-a3/mach/hwregs/ddr2_defs.h | 282 - + .../arch-v32/mach-a3/mach/hwregs/gio_defs.h | 838 --- + .../arch-v32/mach-a3/mach/hwregs/intr_vect.h | 47 - + .../arch-v32/mach-a3/mach/hwregs/intr_vect_defs.h | 342 - + .../mach/hwregs/iop/asm/iop_reg_space_asm.h | 32 - + .../mach/hwregs/iop/asm/iop_sap_in_defs_asm.h | 110 - + .../mach/hwregs/iop/asm/iop_sap_out_defs_asm.h | 277 - + .../mach/hwregs/iop/asm/iop_sw_cfg_defs_asm.h | 740 -- + .../mach/hwregs/iop/asm/iop_sw_cpu_defs_asm.h | 951 --- + .../mach/hwregs/iop/asm/iop_sw_mpu_defs_asm.h | 1087 --- + .../mach/hwregs/iop/asm/iop_sw_spu_defs_asm.h | 524 -- + .../mach/hwregs/iop/asm/iop_version_defs_asm.h | 62 - + .../mach-a3/mach/hwregs/iop/iop_reg_space.h | 32 - + .../mach-a3/mach/hwregs/iop/iop_sap_in_defs.h | 142 - + .../mach-a3/mach/hwregs/iop/iop_sap_out_defs.h | 232 - + .../mach-a3/mach/hwregs/iop/iop_sw_cfg_defs.h | 726 -- + .../mach-a3/mach/hwregs/iop/iop_sw_cpu_defs.h | 523 -- + .../mach-a3/mach/hwregs/iop/iop_sw_mpu_defs.h | 649 -- + .../mach-a3/mach/hwregs/iop/iop_sw_spu_defs.h | 442 -- + .../mach-a3/mach/hwregs/iop/iop_version_defs.h | 97 - + .../arch-v32/mach-a3/mach/hwregs/l2cache_defs.h | 143 - + .../arch-v32/mach-a3/mach/hwregs/marb_bar_defs.h | 483 -- + .../arch-v32/mach-a3/mach/hwregs/marb_foo_defs.h | 627 -- + .../arch-v32/mach-a3/mach/hwregs/pinmux_defs.h | 313 - + .../arch-v32/mach-a3/mach/hwregs/pio_defs.h | 372 - + .../include/arch-v32/mach-a3/mach/hwregs/reg_map.h | 104 - + .../arch-v32/mach-a3/mach/hwregs/strmux_defs.h | 121 - + .../arch-v32/mach-a3/mach/hwregs/timer_defs.h | 266 - + arch/cris/include/arch-v32/mach-a3/mach/memmap.h | 11 - + arch/cris/include/arch-v32/mach-a3/mach/pinmux.h | 46 - + .../cris/include/arch-v32/mach-a3/mach/startup.inc | 84 - + arch/cris/include/arch-v32/mach-fs/mach/arbiter.h | 29 - + arch/cris/include/arch-v32/mach-fs/mach/dma.h | 80 - + .../mach-fs/mach/hwregs/asm/bif_core_defs_asm.h | 320 - + .../mach-fs/mach/hwregs/asm/config_defs_asm.h | 132 - + .../mach-fs/mach/hwregs/asm/gio_defs_asm.h | 277 - + .../mach-fs/mach/hwregs/asm/pinmux_defs_asm.h | 633 -- + .../arch-v32/mach-fs/mach/hwregs/asm/reg_map_asm.h | 97 - + .../mach-fs/mach/hwregs/asm/timer_defs_asm.h | 230 - + .../arch-v32/mach-fs/mach/hwregs/bif_core_defs.h | 285 - + .../arch-v32/mach-fs/mach/hwregs/bif_dma_defs.h | 474 -- + .../arch-v32/mach-fs/mach/hwregs/bif_slave_defs.h | 250 - + .../arch-v32/mach-fs/mach/hwregs/config_defs.h | 143 - + .../arch-v32/mach-fs/mach/hwregs/gio_defs.h | 296 - + .../arch-v32/mach-fs/mach/hwregs/intr_vect.h | 42 - + .../arch-v32/mach-fs/mach/hwregs/intr_vect_defs.h | 229 - + .../arch-v32/mach-fs/mach/hwregs/marb_bp_defs.h | 206 - + .../arch-v32/mach-fs/mach/hwregs/marb_defs.h | 476 -- + .../arch-v32/mach-fs/mach/hwregs/pinmux_defs.h | 358 - + .../include/arch-v32/mach-fs/mach/hwregs/reg_map.h | 105 - + .../arch-v32/mach-fs/mach/hwregs/strmux_defs.h | 128 - + .../arch-v32/mach-fs/mach/hwregs/timer_defs.h | 267 - + arch/cris/include/arch-v32/mach-fs/mach/memmap.h | 25 - + arch/cris/include/arch-v32/mach-fs/mach/pinmux.h | 37 - + .../cris/include/arch-v32/mach-fs/mach/startup.inc | 76 - + arch/cris/include/asm/Kbuild | 31 - + arch/cris/include/asm/asm-offsets.h | 1 - + arch/cris/include/asm/axisflashmap.h | 62 - + arch/cris/include/asm/bitops.h | 51 - + arch/cris/include/asm/bug.h | 5 - + arch/cris/include/asm/bugs.h | 21 - + arch/cris/include/asm/cache.h | 7 - + arch/cris/include/asm/cacheflush.h | 33 - + arch/cris/include/asm/checksum.h | 83 - + arch/cris/include/asm/delay.h | 28 - + arch/cris/include/asm/dma.h | 22 - + arch/cris/include/asm/eshlibld.h | 113 - + arch/cris/include/asm/etraxi2c.h | 37 - + arch/cris/include/asm/fasttimer.h | 48 - + arch/cris/include/asm/fb.h | 13 - + arch/cris/include/asm/ftrace.h | 1 - + arch/cris/include/asm/hw_irq.h | 5 - + arch/cris/include/asm/io.h | 26 - + arch/cris/include/asm/irq.h | 14 - + arch/cris/include/asm/irqflags.h | 1 - + arch/cris/include/asm/mmu.h | 11 - + arch/cris/include/asm/mmu_context.h | 35 - + arch/cris/include/asm/page.h | 74 - + arch/cris/include/asm/pci.h | 44 - + arch/cris/include/asm/pgalloc.h | 64 - + arch/cris/include/asm/pgtable.h | 297 - + arch/cris/include/asm/processor.h | 59 - + arch/cris/include/asm/ptrace.h | 15 - + arch/cris/include/asm/segment.h | 9 - + arch/cris/include/asm/serial.h | 10 - + arch/cris/include/asm/shmparam.h | 9 - + arch/cris/include/asm/signal.h | 24 - + arch/cris/include/asm/stacktrace.h | 9 - + arch/cris/include/asm/string.h | 21 - + arch/cris/include/asm/swab.h | 8 - + arch/cris/include/asm/switch_to.h | 13 - + arch/cris/include/asm/termios.h | 52 - + arch/cris/include/asm/thread_info.h | 91 - + arch/cris/include/asm/timex.h | 25 - + arch/cris/include/asm/tlb.h | 20 - + arch/cris/include/asm/tlbflush.h | 42 - + arch/cris/include/asm/uaccess.h | 361 - + arch/cris/include/asm/ucontext.h | 13 - + arch/cris/include/asm/unaligned.h | 14 - + arch/cris/include/asm/unistd.h | 37 - + arch/cris/include/asm/user.h | 53 - + arch/cris/include/uapi/arch-v10/arch/sv_addr.agh | 7306 -------------------- + arch/cris/include/uapi/arch-v10/arch/sv_addr_ag.h | 140 - + arch/cris/include/uapi/arch-v10/arch/svinto.h | 65 - + arch/cris/include/uapi/arch-v10/arch/user.h | 47 - + arch/cris/include/uapi/arch-v32/arch/cryptocop.h | 123 - + arch/cris/include/uapi/arch-v32/arch/user.h | 42 - + arch/cris/include/uapi/asm/Kbuild | 22 - + arch/cris/include/uapi/asm/byteorder.h | 9 - + arch/cris/include/uapi/asm/elf.h | 91 - + arch/cris/include/uapi/asm/elf_v10.h | 85 - + arch/cris/include/uapi/asm/elf_v32.h | 77 - + arch/cris/include/uapi/asm/ethernet.h | 22 - + arch/cris/include/uapi/asm/etraxgpio.h | 83 - + arch/cris/include/uapi/asm/ioctls.h | 12 - + arch/cris/include/uapi/asm/param.h | 11 - + arch/cris/include/uapi/asm/posix_types.h | 31 - + arch/cris/include/uapi/asm/ptrace.h | 6 - + arch/cris/include/uapi/asm/ptrace_v10.h | 119 - + arch/cris/include/uapi/asm/ptrace_v32.h | 119 - + arch/cris/include/uapi/asm/rs485.h | 19 - + arch/cris/include/uapi/asm/setup.h | 7 - + arch/cris/include/uapi/asm/sigcontext.h | 25 - + arch/cris/include/uapi/asm/signal.h | 117 - + arch/cris/include/uapi/asm/stat.h | 82 - + arch/cris/include/uapi/asm/swab.h | 3 - + arch/cris/include/uapi/asm/sync_serial.h | 133 - + arch/cris/include/uapi/asm/termbits.h | 236 - + arch/cris/include/uapi/asm/termios.h | 46 - + arch/cris/include/uapi/asm/unistd.h | 369 - + arch/cris/kernel/Makefile | 17 - + arch/cris/kernel/asm-offsets.c | 60 - + arch/cris/kernel/crisksyms.c | 69 - + arch/cris/kernel/irq.c | 72 - + arch/cris/kernel/module.c | 82 - + arch/cris/kernel/process.c | 81 - + arch/cris/kernel/profile.c | 87 - + arch/cris/kernel/ptrace.c | 68 - + arch/cris/kernel/setup.c | 214 - + arch/cris/kernel/stacktrace.c | 76 - + arch/cris/kernel/sys_cris.c | 36 - + arch/cris/kernel/time.c | 73 - + arch/cris/kernel/traps.c | 241 - + arch/cris/kernel/vmlinux.lds.S | 138 - + arch/cris/mm/Makefile | 6 - + arch/cris/mm/fault.c | 390 -- + arch/cris/mm/init.c | 69 - + arch/cris/mm/ioremap.c | 90 - + arch/cris/mm/tlb.c | 117 - + arch/frv/Kconfig | 386 -- + arch/frv/Kconfig.debug | 49 - + arch/frv/Makefile | 90 - + arch/frv/boot/Makefile | 76 - + arch/frv/defconfig | 39 - + arch/frv/include/asm/Kbuild | 12 - + arch/frv/include/asm/asm-offsets.h | 1 - + arch/frv/include/asm/atomic.h | 224 - + arch/frv/include/asm/atomic_defs.h | 175 - + arch/frv/include/asm/ax88796.h | 22 - + arch/frv/include/asm/barrier.h | 23 - + arch/frv/include/asm/bitops.h | 325 - + arch/frv/include/asm/bug.h | 56 - + arch/frv/include/asm/bugs.h | 14 - + arch/frv/include/asm/busctl-regs.h | 41 - + arch/frv/include/asm/cache.h | 23 - + arch/frv/include/asm/cacheflush.h | 105 - + arch/frv/include/asm/checksum.h | 180 - + arch/frv/include/asm/cmpxchg.h | 171 - + arch/frv/include/asm/cpu-irqs.h | 81 - + arch/frv/include/asm/current.h | 30 - + arch/frv/include/asm/delay.h | 50 - + arch/frv/include/asm/div64.h | 1 - + arch/frv/include/asm/dm9000.h | 37 - + arch/frv/include/asm/dma-mapping.h | 18 - + arch/frv/include/asm/dma.h | 125 - + arch/frv/include/asm/elf.h | 140 - + arch/frv/include/asm/emergency-restart.h | 6 - + arch/frv/include/asm/fpu.h | 12 - + arch/frv/include/asm/ftrace.h | 1 - + arch/frv/include/asm/futex.h | 22 - + arch/frv/include/asm/gdb-stub.h | 146 - + arch/frv/include/asm/gpio-regs.h | 116 - + arch/frv/include/asm/hardirq.h | 26 - + arch/frv/include/asm/highmem.h | 149 - + arch/frv/include/asm/hw_irq.h | 16 - + arch/frv/include/asm/io.h | 414 -- + arch/frv/include/asm/irc-regs.h | 53 - + arch/frv/include/asm/irq.h | 30 - + arch/frv/include/asm/irq_regs.h | 27 - + arch/frv/include/asm/irqflags.h | 158 - + arch/frv/include/asm/kdebug.h | 1 - + arch/frv/include/asm/kmap_types.h | 8 - + arch/frv/include/asm/linkage.h | 7 - + arch/frv/include/asm/local.h | 7 - + arch/frv/include/asm/local64.h | 1 - + arch/frv/include/asm/math-emu.h | 302 - + arch/frv/include/asm/mb-regs.h | 200 - + arch/frv/include/asm/mb86943a.h | 42 - + arch/frv/include/asm/mb93091-fpga-irqs.h | 42 - + arch/frv/include/asm/mb93093-fpga-irqs.h | 29 - + arch/frv/include/asm/mb93493-irqs.h | 50 - + arch/frv/include/asm/mb93493-regs.h | 281 - + arch/frv/include/asm/mem-layout.h | 86 - + arch/frv/include/asm/mmu.h | 41 - + arch/frv/include/asm/mmu_context.h | 50 - + arch/frv/include/asm/module.h | 22 - + arch/frv/include/asm/page.h | 74 - + arch/frv/include/asm/pci.h | 40 - + arch/frv/include/asm/percpu.h | 7 - + arch/frv/include/asm/perf_event.h | 15 - + arch/frv/include/asm/pgalloc.h | 69 - + arch/frv/include/asm/pgtable.h | 528 -- + arch/frv/include/asm/processor.h | 110 - + arch/frv/include/asm/ptrace.h | 41 - + arch/frv/include/asm/sections.h | 40 - + arch/frv/include/asm/segment.h | 44 - + arch/frv/include/asm/serial-regs.h | 44 - + arch/frv/include/asm/serial.h | 14 - + arch/frv/include/asm/setup.h | 26 - + arch/frv/include/asm/shmparam.h | 8 - + arch/frv/include/asm/signal.h | 7 - + arch/frv/include/asm/smp.h | 10 - + arch/frv/include/asm/spinlock.h | 17 - + arch/frv/include/asm/spr-regs.h | 416 -- + arch/frv/include/asm/string.h | 50 - + arch/frv/include/asm/switch_to.h | 35 - + arch/frv/include/asm/syscall.h | 123 - + arch/frv/include/asm/termios.h | 15 - + arch/frv/include/asm/thread_info.h | 116 - + arch/frv/include/asm/timer-regs.h | 106 - + arch/frv/include/asm/timex.h | 27 - + arch/frv/include/asm/tlb.h | 28 - + arch/frv/include/asm/tlbflush.h | 73 - + arch/frv/include/asm/topology.h | 13 - + arch/frv/include/asm/types.h | 22 - + arch/frv/include/asm/uaccess.h | 285 - + arch/frv/include/asm/ucontext.h | 13 - + arch/frv/include/asm/unaligned.h | 22 - + arch/frv/include/asm/unistd.h | 34 - + arch/frv/include/asm/user.h | 80 - + arch/frv/include/asm/vga.h | 17 - + arch/frv/include/asm/virtconvert.h | 41 - + arch/frv/include/asm/xor.h | 1 - + arch/frv/include/uapi/asm/Kbuild | 5 - + arch/frv/include/uapi/asm/auxvec.h | 4 - + arch/frv/include/uapi/asm/bitsperlong.h | 2 - + arch/frv/include/uapi/asm/byteorder.h | 7 - + arch/frv/include/uapi/asm/errno.h | 8 - + arch/frv/include/uapi/asm/fcntl.h | 2 - + arch/frv/include/uapi/asm/ioctl.h | 2 - + arch/frv/include/uapi/asm/ioctls.h | 11 - + arch/frv/include/uapi/asm/ipcbuf.h | 2 - + arch/frv/include/uapi/asm/kvm_para.h | 2 - + arch/frv/include/uapi/asm/mman.h | 2 - + arch/frv/include/uapi/asm/msgbuf.h | 33 - + arch/frv/include/uapi/asm/param.h | 9 - + arch/frv/include/uapi/asm/poll.h | 11 - + arch/frv/include/uapi/asm/posix_types.h | 27 - + arch/frv/include/uapi/asm/ptrace.h | 61 - + arch/frv/include/uapi/asm/registers.h | 233 - + arch/frv/include/uapi/asm/resource.h | 8 - + arch/frv/include/uapi/asm/sembuf.h | 27 - + arch/frv/include/uapi/asm/setup.h | 19 - + arch/frv/include/uapi/asm/shmbuf.h | 44 - + arch/frv/include/uapi/asm/sigcontext.h | 27 - + arch/frv/include/uapi/asm/signal.h | 37 - + arch/frv/include/uapi/asm/socket.h | 109 - + arch/frv/include/uapi/asm/sockios.h | 15 - + arch/frv/include/uapi/asm/stat.h | 101 - + arch/frv/include/uapi/asm/statfs.h | 8 - + arch/frv/include/uapi/asm/swab.h | 11 - + arch/frv/include/uapi/asm/termbits.h | 204 - + arch/frv/include/uapi/asm/termios.h | 47 - + arch/frv/include/uapi/asm/types.h | 12 - + arch/frv/include/uapi/asm/unistd.h | 349 - + arch/frv/kernel/.gitignore | 1 - + arch/frv/kernel/Makefile | 24 - + arch/frv/kernel/asm-offsets.c | 96 - + arch/frv/kernel/break.S | 792 --- + arch/frv/kernel/cmode.S | 189 - + arch/frv/kernel/debug-stub.c | 258 - + arch/frv/kernel/dma.c | 463 -- + arch/frv/kernel/entry-table.S | 329 - + arch/frv/kernel/entry.S | 1519 ---- + arch/frv/kernel/frv_ksyms.c | 109 - + arch/frv/kernel/futex.c | 223 - + arch/frv/kernel/gdb-io.c | 215 - + arch/frv/kernel/gdb-io.h | 55 - + arch/frv/kernel/gdb-stub.c | 2149 ------ + arch/frv/kernel/head-mmu-fr451.S | 374 - + arch/frv/kernel/head-uc-fr401.S | 311 - + arch/frv/kernel/head-uc-fr451.S | 174 - + arch/frv/kernel/head-uc-fr555.S | 347 - + arch/frv/kernel/head.S | 638 -- + arch/frv/kernel/head.inc | 50 - + arch/frv/kernel/irq-mb93091.c | 157 - + arch/frv/kernel/irq-mb93093.c | 129 - + arch/frv/kernel/irq-mb93493.c | 147 - + arch/frv/kernel/irq.c | 159 - + arch/frv/kernel/local.h | 59 - + arch/frv/kernel/local64.h | 1 - + arch/frv/kernel/module.c | 27 - + arch/frv/kernel/pm-mb93093.c | 65 - + arch/frv/kernel/pm.c | 352 - + arch/frv/kernel/process.c | 275 - + arch/frv/kernel/ptrace.c | 377 - + arch/frv/kernel/setup.c | 1178 ---- + arch/frv/kernel/signal.c | 426 -- + arch/frv/kernel/sleep.S | 373 - + arch/frv/kernel/switch_to.S | 489 -- + arch/frv/kernel/sys_frv.c | 44 - + arch/frv/kernel/sysctl.c | 221 - + arch/frv/kernel/time.c | 122 - + arch/frv/kernel/traps.c | 642 -- + arch/frv/kernel/uaccess.c | 100 - + arch/frv/kernel/vmlinux.lds.S | 136 - + arch/frv/lib/Makefile | 8 - + arch/frv/lib/__ashldi3.S | 40 - + arch/frv/lib/__ashrdi3.S | 41 - + arch/frv/lib/__lshrdi3.S | 40 - + arch/frv/lib/__muldi3.S | 32 - + arch/frv/lib/__negdi2.S | 28 - + arch/frv/lib/__ucmpdi2.S | 45 - + arch/frv/lib/atomic-lib.c | 8 - + arch/frv/lib/atomic-ops.S | 62 - + arch/frv/lib/atomic64-ops.S | 68 - + arch/frv/lib/cache.S | 98 - + arch/frv/lib/checksum.c | 166 - + arch/frv/lib/insl_ns.S | 52 - + arch/frv/lib/insl_sw.S | 40 - + arch/frv/lib/memcpy.S | 135 - + arch/frv/lib/memset.S | 182 - + arch/frv/lib/outsl_ns.S | 59 - + arch/frv/lib/outsl_sw.S | 45 - + arch/frv/mb93090-mb00/Makefile | 16 - + arch/frv/mb93090-mb00/flash.c | 90 - + arch/frv/mb93090-mb00/pci-dma-nommu.c | 176 - + arch/frv/mb93090-mb00/pci-dma.c | 118 - + arch/frv/mb93090-mb00/pci-frv.c | 193 - + arch/frv/mb93090-mb00/pci-frv.h | 33 - + arch/frv/mb93090-mb00/pci-irq.c | 62 - + arch/frv/mb93090-mb00/pci-vdk.c | 419 -- + arch/frv/mm/Makefile | 9 - + arch/frv/mm/cache-page.c | 71 - + arch/frv/mm/dma-alloc.c | 183 - + arch/frv/mm/elf-fdpic.c | 114 - + arch/frv/mm/extable.c | 49 - + arch/frv/mm/fault.c | 328 - + arch/frv/mm/highmem.c | 86 - + arch/frv/mm/init.c | 144 - + arch/frv/mm/kmap.c | 51 - + arch/frv/mm/mmu-context.c | 210 - + arch/frv/mm/pgalloc.c | 157 - + arch/frv/mm/tlb-flush.S | 184 - + arch/frv/mm/tlb-miss.S | 629 -- + arch/m32r/Kconfig | 419 -- + arch/m32r/Kconfig.debug | 22 - + arch/m32r/Makefile | 63 - + arch/m32r/boot/Makefile | 19 - + arch/m32r/boot/compressed/Makefile | 51 - + arch/m32r/boot/compressed/boot.h | 60 - + arch/m32r/boot/compressed/head.S | 177 - + arch/m32r/boot/compressed/install.sh | 57 - + arch/m32r/boot/compressed/m32r_sio.c | 77 - + arch/m32r/boot/compressed/misc.c | 93 - + arch/m32r/boot/compressed/vmlinux.lds.S | 31 - + arch/m32r/boot/compressed/vmlinux.scr | 9 - + arch/m32r/boot/setup.S | 185 - + arch/m32r/configs/m32104ut_defconfig | 144 - + arch/m32r/configs/m32700ut.smp_defconfig | 85 - + arch/m32r/configs/m32700ut.up_defconfig | 84 - + arch/m32r/configs/mappi.nommu_defconfig | 46 - + arch/m32r/configs/mappi.smp_defconfig | 62 - + arch/m32r/configs/mappi.up_defconfig | 60 - + arch/m32r/configs/mappi2.opsp_defconfig | 65 - + arch/m32r/configs/mappi2.vdec2_defconfig | 64 - + arch/m32r/configs/mappi3.smp_defconfig | 62 - + arch/m32r/configs/oaks32r_defconfig | 43 - + arch/m32r/configs/opsput_defconfig | 63 - + arch/m32r/configs/usrv_defconfig | 78 - + arch/m32r/include/asm/Kbuild | 13 - + arch/m32r/include/asm/addrspace.h | 57 - + arch/m32r/include/asm/asm-offsets.h | 1 - + arch/m32r/include/asm/assembler.h | 231 - + arch/m32r/include/asm/atomic.h | 275 - + arch/m32r/include/asm/barrier.h | 16 - + arch/m32r/include/asm/bitops.h | 274 - + arch/m32r/include/asm/bug.h | 5 - + arch/m32r/include/asm/bugs.h | 20 - + arch/m32r/include/asm/cache.h | 9 - + arch/m32r/include/asm/cachectl.h | 27 - + arch/m32r/include/asm/cacheflush.h | 73 - + arch/m32r/include/asm/checksum.h | 202 - + arch/m32r/include/asm/cmpxchg.h | 225 - + arch/m32r/include/asm/dcache_clear.h | 29 - + arch/m32r/include/asm/delay.h | 1 - + arch/m32r/include/asm/device.h | 10 - + arch/m32r/include/asm/div64.h | 1 - + arch/m32r/include/asm/dma.h | 13 - + arch/m32r/include/asm/elf.h | 132 - + arch/m32r/include/asm/emergency-restart.h | 7 - + arch/m32r/include/asm/fb.h | 20 - + arch/m32r/include/asm/flat.h | 143 - + arch/m32r/include/asm/ftrace.h | 1 - + arch/m32r/include/asm/futex.h | 6 - + arch/m32r/include/asm/hardirq.h | 10 - + arch/m32r/include/asm/hw_irq.h | 4 - + arch/m32r/include/asm/io.h | 225 - + arch/m32r/include/asm/irq.h | 91 - + arch/m32r/include/asm/irq_regs.h | 1 - + arch/m32r/include/asm/irqflags.h | 104 - + arch/m32r/include/asm/kdebug.h | 1 - + arch/m32r/include/asm/kmap_types.h | 13 - + arch/m32r/include/asm/linkage.h | 8 - + arch/m32r/include/asm/local.h | 341 - + arch/m32r/include/asm/local64.h | 1 - + arch/m32r/include/asm/m32102.h | 315 - + arch/m32r/include/asm/m32104ut/m32104ut_pld.h | 161 - + arch/m32r/include/asm/m32700ut/m32700ut_lan.h | 103 - + arch/m32r/include/asm/m32700ut/m32700ut_lcd.h | 55 - + arch/m32r/include/asm/m32700ut/m32700ut_pld.h | 259 - + arch/m32r/include/asm/m32r.h | 161 - + arch/m32r/include/asm/m32r_mp_fpga.h | 314 - + arch/m32r/include/asm/mappi2/mappi2_pld.h | 150 - + arch/m32r/include/asm/mappi3/mappi3_pld.h | 142 - + arch/m32r/include/asm/mc146818rtc.h | 30 - + arch/m32r/include/asm/mmu.h | 22 - + arch/m32r/include/asm/mmu_context.h | 167 - + arch/m32r/include/asm/mmzone.h | 54 - + arch/m32r/include/asm/opsput/opsput_lan.h | 52 - + arch/m32r/include/asm/opsput/opsput_lcd.h | 55 - + arch/m32r/include/asm/opsput/opsput_pld.h | 255 - + arch/m32r/include/asm/page.h | 90 - + arch/m32r/include/asm/pci.h | 7 - + arch/m32r/include/asm/percpu.h | 7 - + arch/m32r/include/asm/pgalloc.h | 82 - + arch/m32r/include/asm/pgtable-2level.h | 76 - + arch/m32r/include/asm/pgtable.h | 348 - + arch/m32r/include/asm/processor.h | 127 - + arch/m32r/include/asm/ptrace.h | 44 - + arch/m32r/include/asm/rtc.h | 66 - + arch/m32r/include/asm/s1d13806.h | 200 - + arch/m32r/include/asm/segment.h | 11 - + arch/m32r/include/asm/serial.h | 10 - + arch/m32r/include/asm/setup.h | 32 - + arch/m32r/include/asm/shmparam.h | 7 - + arch/m32r/include/asm/signal.h | 25 - + arch/m32r/include/asm/smp.h | 113 - + arch/m32r/include/asm/spinlock.h | 308 - + arch/m32r/include/asm/spinlock_types.h | 24 - + arch/m32r/include/asm/string.h | 14 - + arch/m32r/include/asm/switch_to.h | 51 - + arch/m32r/include/asm/syscall.h | 9 - + arch/m32r/include/asm/termios.h | 52 - + arch/m32r/include/asm/thread_info.h | 126 - + arch/m32r/include/asm/timex.h | 28 - + arch/m32r/include/asm/tlb.h | 21 - + arch/m32r/include/asm/tlbflush.h | 98 - + arch/m32r/include/asm/topology.h | 7 - + arch/m32r/include/asm/types.h | 13 - + arch/m32r/include/asm/uaccess.h | 515 -- + arch/m32r/include/asm/ucontext.h | 13 - + arch/m32r/include/asm/unaligned.h | 19 - + arch/m32r/include/asm/unistd.h | 51 - + arch/m32r/include/asm/user.h | 53 - + arch/m32r/include/asm/vga.h | 21 - + arch/m32r/include/asm/xor.h | 7 - + arch/m32r/include/uapi/asm/Kbuild | 7 - + arch/m32r/include/uapi/asm/auxvec.h | 4 - + arch/m32r/include/uapi/asm/bitsperlong.h | 2 - + arch/m32r/include/uapi/asm/byteorder.h | 11 - + arch/m32r/include/uapi/asm/errno.h | 7 - + arch/m32r/include/uapi/asm/fcntl.h | 2 - + arch/m32r/include/uapi/asm/ioctl.h | 2 - + arch/m32r/include/uapi/asm/ioctls.h | 7 - + arch/m32r/include/uapi/asm/ipcbuf.h | 2 - + arch/m32r/include/uapi/asm/mman.h | 1 - + arch/m32r/include/uapi/asm/msgbuf.h | 32 - + arch/m32r/include/uapi/asm/param.h | 8 - + arch/m32r/include/uapi/asm/posix_types.h | 26 - + arch/m32r/include/uapi/asm/ptrace.h | 118 - + arch/m32r/include/uapi/asm/resource.h | 7 - + arch/m32r/include/uapi/asm/sembuf.h | 26 - + arch/m32r/include/uapi/asm/setup.h | 12 - + arch/m32r/include/uapi/asm/shmbuf.h | 43 - + arch/m32r/include/uapi/asm/sigcontext.h | 40 - + arch/m32r/include/uapi/asm/signal.h | 118 - + arch/m32r/include/uapi/asm/socket.h | 108 - + arch/m32r/include/uapi/asm/sockios.h | 14 - + arch/m32r/include/uapi/asm/stat.h | 88 - + arch/m32r/include/uapi/asm/statfs.h | 7 - + arch/m32r/include/uapi/asm/swab.h | 11 - + arch/m32r/include/uapi/asm/termbits.h | 201 - + arch/m32r/include/uapi/asm/termios.h | 44 - + arch/m32r/include/uapi/asm/types.h | 1 - + arch/m32r/include/uapi/asm/unistd.h | 336 - + arch/m32r/kernel/.gitignore | 1 - + arch/m32r/kernel/Makefile | 12 - + arch/m32r/kernel/align.c | 585 -- + arch/m32r/kernel/asm-offsets.c | 15 - + arch/m32r/kernel/entry.S | 553 -- + arch/m32r/kernel/head.S | 284 - + arch/m32r/kernel/irq.c | 44 - + arch/m32r/kernel/m32r_ksyms.c | 89 - + arch/m32r/kernel/module.c | 203 - + arch/m32r/kernel/process.c | 154 - + arch/m32r/kernel/ptrace.c | 708 -- + arch/m32r/kernel/setup.c | 424 -- + arch/m32r/kernel/signal.c | 336 - + arch/m32r/kernel/smp.c | 836 --- + arch/m32r/kernel/smpboot.c | 627 -- + arch/m32r/kernel/sys_m32r.c | 91 - + arch/m32r/kernel/syscall_table.S | 328 - + arch/m32r/kernel/time.c | 199 - + arch/m32r/kernel/traps.c | 324 - + arch/m32r/kernel/vmlinux.lds.S | 79 - + arch/m32r/lib/Makefile | 7 - + arch/m32r/lib/ashxdi3.S | 294 - + arch/m32r/lib/checksum.S | 320 - + arch/m32r/lib/csum_partial_copy.c | 59 - + arch/m32r/lib/delay.c | 130 - + arch/m32r/lib/libgcc.h | 24 - + arch/m32r/lib/memcpy.S | 93 - + arch/m32r/lib/memset.S | 179 - + arch/m32r/lib/strlen.S | 118 - + arch/m32r/lib/ucmpdi2.c | 18 - + arch/m32r/lib/usercopy.c | 362 - + arch/m32r/mm/Makefile | 13 - + arch/m32r/mm/cache.c | 89 - + arch/m32r/mm/discontig.c | 163 - + arch/m32r/mm/extable.c | 20 - + arch/m32r/mm/fault-nommu.c | 134 - + arch/m32r/mm/fault.c | 550 -- + arch/m32r/mm/init.c | 152 - + arch/m32r/mm/ioremap-nommu.c | 52 - + arch/m32r/mm/ioremap.c | 111 - + arch/m32r/mm/mmu.S | 355 - + arch/m32r/mm/page.S | 82 - + arch/m32r/oprofile/Makefile | 10 - + arch/m32r/oprofile/init.c | 22 - + arch/m32r/platforms/Makefile | 10 - + arch/m32r/platforms/m32104ut/Makefile | 1 - + arch/m32r/platforms/m32104ut/io.c | 298 - + arch/m32r/platforms/m32104ut/setup.c | 139 - + arch/m32r/platforms/m32700ut/Makefile | 1 - + .../platforms/m32700ut/dot.gdbinit_200MHz_16MB | 249 - + .../platforms/m32700ut/dot.gdbinit_300MHz_32MB | 249 - + .../platforms/m32700ut/dot.gdbinit_400MHz_32MB | 249 - + arch/m32r/platforms/m32700ut/io.c | 395 -- + arch/m32r/platforms/m32700ut/setup.c | 451 -- + arch/m32r/platforms/mappi/Makefile | 1 - + arch/m32r/platforms/mappi/dot.gdbinit | 242 - + arch/m32r/platforms/mappi/dot.gdbinit.nommu | 245 - + arch/m32r/platforms/mappi/dot.gdbinit.smp | 344 - + arch/m32r/platforms/mappi/io.c | 326 - + arch/m32r/platforms/mappi/setup.c | 175 - + arch/m32r/platforms/mappi2/Makefile | 1 - + arch/m32r/platforms/mappi2/dot.gdbinit.vdec2 | 233 - + arch/m32r/platforms/mappi2/io.c | 384 - + arch/m32r/platforms/mappi2/setup.c | 172 - + arch/m32r/platforms/mappi3/Makefile | 1 - + arch/m32r/platforms/mappi3/dot.gdbinit | 224 - + arch/m32r/platforms/mappi3/io.c | 406 -- + arch/m32r/platforms/mappi3/setup.c | 221 - + arch/m32r/platforms/oaks32r/Makefile | 1 - + arch/m32r/platforms/oaks32r/dot.gdbinit.nommu | 154 - + arch/m32r/platforms/oaks32r/io.c | 229 - + arch/m32r/platforms/oaks32r/setup.c | 114 - + arch/m32r/platforms/opsput/Makefile | 1 - + arch/m32r/platforms/opsput/dot.gdbinit | 218 - + arch/m32r/platforms/opsput/io.c | 395 -- + arch/m32r/platforms/opsput/setup.c | 448 -- + arch/m32r/platforms/usrv/Makefile | 1 - + arch/m32r/platforms/usrv/io.c | 225 - + arch/m32r/platforms/usrv/setup.c | 213 - + arch/metag/Kconfig | 287 - + arch/metag/Kconfig.debug | 34 - + arch/metag/Kconfig.soc | 69 - + arch/metag/Makefile | 89 - + arch/metag/boot/.gitignore | 3 - + arch/metag/boot/Makefile | 68 - + arch/metag/boot/dts/Makefile | 16 - + arch/metag/boot/dts/skeleton.dts | 10 - + arch/metag/boot/dts/skeleton.dtsi | 15 - + arch/metag/boot/dts/tz1090.dtsi | 108 - + arch/metag/boot/dts/tz1090_generic.dts | 10 - + arch/metag/configs/meta1_defconfig | 39 - + arch/metag/configs/meta2_defconfig | 40 - + arch/metag/configs/meta2_smp_defconfig | 41 - + arch/metag/configs/tz1090_defconfig | 42 - + arch/metag/include/asm/Kbuild | 33 - + arch/metag/include/asm/atomic.h | 49 - + arch/metag/include/asm/atomic_lnkget.h | 204 - + arch/metag/include/asm/atomic_lock1.h | 157 - + arch/metag/include/asm/barrier.h | 85 - + arch/metag/include/asm/bitops.h | 127 - + arch/metag/include/asm/bug.h | 13 - + arch/metag/include/asm/cache.h | 24 - + arch/metag/include/asm/cacheflush.h | 251 - + arch/metag/include/asm/cachepart.h | 43 - + arch/metag/include/asm/checksum.h | 93 - + arch/metag/include/asm/clock.h | 59 - + arch/metag/include/asm/cmpxchg.h | 64 - + arch/metag/include/asm/cmpxchg_irq.h | 43 - + arch/metag/include/asm/cmpxchg_lnkget.h | 87 - + arch/metag/include/asm/cmpxchg_lock1.h | 49 - + arch/metag/include/asm/core_reg.h | 36 - + arch/metag/include/asm/cpu.h | 15 - + arch/metag/include/asm/da.h | 44 - + arch/metag/include/asm/delay.h | 30 - + arch/metag/include/asm/div64.h | 13 - + arch/metag/include/asm/dma-mapping.h | 12 - + arch/metag/include/asm/elf.h | 126 - + arch/metag/include/asm/fixmap.h | 69 - + arch/metag/include/asm/ftrace.h | 24 - + arch/metag/include/asm/global_lock.h | 101 - + arch/metag/include/asm/highmem.h | 62 - + arch/metag/include/asm/hugetlb.h | 75 - + arch/metag/include/asm/hwthread.h | 41 - + arch/metag/include/asm/io.h | 170 - + arch/metag/include/asm/irq.h | 38 - + arch/metag/include/asm/irqflags.h | 94 - + arch/metag/include/asm/l2cache.h | 259 - + arch/metag/include/asm/linkage.h | 8 - + arch/metag/include/asm/mach/arch.h | 86 - + arch/metag/include/asm/metag_isa.h | 81 - + arch/metag/include/asm/metag_mem.h | 1109 --- + arch/metag/include/asm/metag_regs.h | 1184 ---- + arch/metag/include/asm/mman.h | 12 - + arch/metag/include/asm/mmu.h | 78 - + arch/metag/include/asm/mmu_context.h | 115 - + arch/metag/include/asm/mmzone.h | 43 - + arch/metag/include/asm/module.h | 38 - + arch/metag/include/asm/page.h | 129 - + arch/metag/include/asm/perf_event.h | 4 - + arch/metag/include/asm/pgalloc.h | 83 - + arch/metag/include/asm/pgtable-bits.h | 105 - + arch/metag/include/asm/pgtable.h | 270 - + arch/metag/include/asm/processor.h | 201 - + arch/metag/include/asm/ptrace.h | 61 - + arch/metag/include/asm/setup.h | 10 - + arch/metag/include/asm/smp.h | 28 - + arch/metag/include/asm/sparsemem.h | 14 - + arch/metag/include/asm/spinlock.h | 19 - + arch/metag/include/asm/spinlock_lnkget.h | 213 - + arch/metag/include/asm/spinlock_lock1.h | 165 - + arch/metag/include/asm/spinlock_types.h | 21 - + arch/metag/include/asm/stacktrace.h | 21 - + arch/metag/include/asm/string.h | 14 - + arch/metag/include/asm/switch.h | 21 - + arch/metag/include/asm/syscall.h | 104 - + arch/metag/include/asm/syscalls.h | 40 - + arch/metag/include/asm/tbx.h | 1420 ---- + arch/metag/include/asm/tcm.h | 31 - + arch/metag/include/asm/thread_info.h | 141 - + arch/metag/include/asm/tlb.h | 37 - + arch/metag/include/asm/tlbflush.h | 78 - + arch/metag/include/asm/topology.h | 28 - + arch/metag/include/asm/traps.h | 48 - + arch/metag/include/asm/uaccess.h | 213 - + arch/metag/include/asm/unistd.h | 12 - + arch/metag/include/asm/user_gateway.h | 45 - + arch/metag/include/uapi/asm/Kbuild | 31 - + arch/metag/include/uapi/asm/byteorder.h | 2 - + arch/metag/include/uapi/asm/ech.h | 16 - + arch/metag/include/uapi/asm/ptrace.h | 114 - + arch/metag/include/uapi/asm/sigcontext.h | 32 - + arch/metag/include/uapi/asm/siginfo.h | 16 - + arch/metag/include/uapi/asm/swab.h | 27 - + arch/metag/include/uapi/asm/unistd.h | 24 - + arch/metag/kernel/.gitignore | 1 - + arch/metag/kernel/Makefile | 40 - + arch/metag/kernel/asm-offsets.c | 15 - + arch/metag/kernel/cachepart.c | 132 - + arch/metag/kernel/clock.c | 110 - + arch/metag/kernel/core_reg.c | 118 - + arch/metag/kernel/da.c | 25 - + arch/metag/kernel/devtree.c | 57 - + arch/metag/kernel/dma.c | 588 -- + arch/metag/kernel/ftrace.c | 121 - + arch/metag/kernel/ftrace_stub.S | 62 - + arch/metag/kernel/head.S | 66 - + arch/metag/kernel/irq.c | 293 - + arch/metag/kernel/kick.c | 110 - + arch/metag/kernel/machines.c | 21 - + arch/metag/kernel/metag_ksyms.c | 55 - + arch/metag/kernel/module.c | 284 - + arch/metag/kernel/perf/Makefile | 3 - + arch/metag/kernel/perf/perf_event.c | 879 --- + arch/metag/kernel/perf/perf_event.h | 106 - + arch/metag/kernel/perf_callchain.c | 97 - + arch/metag/kernel/process.c | 448 -- + arch/metag/kernel/ptrace.c | 427 -- + arch/metag/kernel/setup.c | 622 -- + arch/metag/kernel/signal.c | 336 - + arch/metag/kernel/smp.c | 668 -- + arch/metag/kernel/stacktrace.c | 187 - + arch/metag/kernel/sys_metag.c | 181 - + arch/metag/kernel/tbiunexp.S | 23 - + arch/metag/kernel/tcm.c | 152 - + arch/metag/kernel/time.c | 26 - + arch/metag/kernel/topology.c | 78 - + arch/metag/kernel/traps.c | 992 --- + arch/metag/kernel/user_gateway.S | 98 - + arch/metag/kernel/vmlinux.lds.S | 74 - + arch/metag/lib/Makefile | 23 - + arch/metag/lib/ashldi3.S | 34 - + arch/metag/lib/ashrdi3.S | 34 - + arch/metag/lib/checksum.c | 167 - + arch/metag/lib/clear_page.S | 18 - + arch/metag/lib/cmpdi2.S | 33 - + arch/metag/lib/copy_page.S | 21 - + arch/metag/lib/delay.c | 57 - + arch/metag/lib/div64.S | 109 - + arch/metag/lib/divsi3.S | 101 - + arch/metag/lib/ip_fast_csum.S | 33 - + arch/metag/lib/lshrdi3.S | 34 - + arch/metag/lib/memcpy.S | 186 - + arch/metag/lib/memmove.S | 346 - + arch/metag/lib/memset.S | 87 - + arch/metag/lib/modsi3.S | 39 - + arch/metag/lib/muldi3.S | 45 - + arch/metag/lib/ucmpdi2.S | 28 - + arch/metag/lib/usercopy.c | 1257 ---- + arch/metag/mm/Kconfig | 147 - + arch/metag/mm/Makefile | 20 - + arch/metag/mm/cache.c | 521 -- + arch/metag/mm/extable.c | 15 - + arch/metag/mm/fault.c | 247 - + arch/metag/mm/highmem.c | 122 - + arch/metag/mm/hugetlbpage.c | 251 - + arch/metag/mm/init.c | 408 -- + arch/metag/mm/ioremap.c | 90 - + arch/metag/mm/l2cache.c | 193 - + arch/metag/mm/maccess.c | 69 - + arch/metag/mm/mmu-meta1.c | 157 - + arch/metag/mm/mmu-meta2.c | 208 - + arch/metag/mm/numa.c | 82 - + arch/metag/oprofile/Makefile | 18 - + arch/metag/oprofile/backtrace.c | 63 - + arch/metag/oprofile/backtrace.h | 7 - + arch/metag/oprofile/common.c | 66 - + arch/metag/tbx/Makefile | 22 - + arch/metag/tbx/tbicore.S | 136 - + arch/metag/tbx/tbictx.S | 366 - + arch/metag/tbx/tbictxfpu.S | 190 - + arch/metag/tbx/tbidefr.S | 175 - + arch/metag/tbx/tbidspram.S | 161 - + arch/metag/tbx/tbilogf.S | 48 - + arch/metag/tbx/tbipcx.S | 451 -- + arch/metag/tbx/tbiroot.S | 87 - + arch/metag/tbx/tbisoft.S | 237 - + arch/metag/tbx/tbistring.c | 114 - + arch/metag/tbx/tbitimer.S | 207 - + arch/mn10300/Kconfig | 499 -- + arch/mn10300/Kconfig.debug | 156 - + arch/mn10300/Makefile | 99 - + arch/mn10300/boot/.gitignore | 1 - + arch/mn10300/boot/Makefile | 28 - + arch/mn10300/boot/compressed/Makefile | 22 - + arch/mn10300/boot/compressed/head.S | 151 - + arch/mn10300/boot/compressed/misc.c | 393 -- + arch/mn10300/boot/compressed/misc.h | 18 - + arch/mn10300/boot/compressed/vmlinux.lds | 9 - + arch/mn10300/boot/install.sh | 67 - + arch/mn10300/boot/tools/build.c | 191 - + arch/mn10300/configs/asb2303_defconfig | 67 - + arch/mn10300/configs/asb2364_defconfig | 87 - + arch/mn10300/include/asm/Kbuild | 13 - + arch/mn10300/include/asm/asm-offsets.h | 1 - + arch/mn10300/include/asm/atomic.h | 161 - + arch/mn10300/include/asm/bitops.h | 232 - + arch/mn10300/include/asm/bug.h | 37 - + arch/mn10300/include/asm/bugs.h | 20 - + arch/mn10300/include/asm/busctl-regs.h | 151 - + arch/mn10300/include/asm/cache.h | 60 - + arch/mn10300/include/asm/cacheflush.h | 164 - + arch/mn10300/include/asm/checksum.h | 79 - + arch/mn10300/include/asm/cmpxchg.h | 115 - + arch/mn10300/include/asm/cpu-regs.h | 353 - + arch/mn10300/include/asm/current.h | 37 - + arch/mn10300/include/asm/debugger.h | 43 - + arch/mn10300/include/asm/delay.h | 19 - + arch/mn10300/include/asm/div64.h | 115 - + arch/mn10300/include/asm/dma-mapping.h | 21 - + arch/mn10300/include/asm/dma.h | 117 - + arch/mn10300/include/asm/dmactl-regs.h | 16 - + arch/mn10300/include/asm/elf.h | 153 - + arch/mn10300/include/asm/emergency-restart.h | 1 - + arch/mn10300/include/asm/exceptions.h | 121 - + arch/mn10300/include/asm/fpu.h | 132 - + arch/mn10300/include/asm/frame.inc | 97 - + arch/mn10300/include/asm/ftrace.h | 1 - + arch/mn10300/include/asm/futex.h | 1 - + arch/mn10300/include/asm/gdb-stub.h | 182 - + arch/mn10300/include/asm/hardirq.h | 49 - + arch/mn10300/include/asm/highmem.h | 131 - + arch/mn10300/include/asm/hw_irq.h | 14 - + arch/mn10300/include/asm/intctl-regs.h | 71 - + arch/mn10300/include/asm/io.h | 325 - + arch/mn10300/include/asm/irq.h | 40 - + arch/mn10300/include/asm/irq_regs.h | 28 - + arch/mn10300/include/asm/irqflags.h | 215 - + arch/mn10300/include/asm/kdebug.h | 22 - + arch/mn10300/include/asm/kgdb.h | 81 - + arch/mn10300/include/asm/kmap_types.h | 7 - + arch/mn10300/include/asm/kprobes.h | 55 - + arch/mn10300/include/asm/linkage.h | 20 - + arch/mn10300/include/asm/local.h | 1 - + arch/mn10300/include/asm/local64.h | 1 - + arch/mn10300/include/asm/mc146818rtc.h | 1 - + arch/mn10300/include/asm/mmu.h | 20 - + arch/mn10300/include/asm/mmu_context.h | 163 - + arch/mn10300/include/asm/module.h | 22 - + arch/mn10300/include/asm/nmi.h | 16 - + arch/mn10300/include/asm/page.h | 130 - + arch/mn10300/include/asm/page_offset.h | 12 - + arch/mn10300/include/asm/pci.h | 84 - + arch/mn10300/include/asm/percpu.h | 1 - + arch/mn10300/include/asm/pgalloc.h | 56 - + arch/mn10300/include/asm/pgtable.h | 494 -- + arch/mn10300/include/asm/pio-regs.h | 233 - + arch/mn10300/include/asm/processor.h | 171 - + arch/mn10300/include/asm/ptrace.h | 26 - + arch/mn10300/include/asm/reset-regs.h | 60 - + arch/mn10300/include/asm/rtc-regs.h | 86 - + arch/mn10300/include/asm/rtc.h | 28 - + arch/mn10300/include/asm/rwlock.h | 125 - + arch/mn10300/include/asm/serial-regs.h | 191 - + arch/mn10300/include/asm/serial.h | 36 - + arch/mn10300/include/asm/setup.h | 18 - + arch/mn10300/include/asm/shmparam.h | 7 - + arch/mn10300/include/asm/signal.h | 33 - + arch/mn10300/include/asm/smp.h | 109 - + arch/mn10300/include/asm/smsc911x.h | 1 - + arch/mn10300/include/asm/spinlock.h | 180 - + arch/mn10300/include/asm/spinlock_types.h | 21 - + arch/mn10300/include/asm/string.h | 32 - + arch/mn10300/include/asm/switch_to.h | 49 - + arch/mn10300/include/asm/syscall.h | 117 - + arch/mn10300/include/asm/termios.h | 14 - + arch/mn10300/include/asm/thread_info.h | 160 - + arch/mn10300/include/asm/timer-regs.h | 452 -- + arch/mn10300/include/asm/timex.h | 34 - + arch/mn10300/include/asm/tlb.h | 34 - + arch/mn10300/include/asm/tlbflush.h | 154 - + arch/mn10300/include/asm/topology.h | 1 - + arch/mn10300/include/asm/types.h | 22 - + arch/mn10300/include/asm/uaccess.h | 297 - + arch/mn10300/include/asm/ucontext.h | 22 - + arch/mn10300/include/asm/unaligned.h | 20 - + arch/mn10300/include/asm/unistd.h | 47 - + arch/mn10300/include/asm/user.h | 53 - + arch/mn10300/include/asm/vga.h | 17 - + arch/mn10300/include/asm/xor.h | 1 - + arch/mn10300/include/uapi/asm/Kbuild | 6 - + arch/mn10300/include/uapi/asm/auxvec.h | 4 - + arch/mn10300/include/uapi/asm/bitsperlong.h | 2 - + arch/mn10300/include/uapi/asm/byteorder.h | 7 - + arch/mn10300/include/uapi/asm/errno.h | 2 - + arch/mn10300/include/uapi/asm/fcntl.h | 2 - + arch/mn10300/include/uapi/asm/ioctl.h | 2 - + arch/mn10300/include/uapi/asm/ioctls.h | 7 - + arch/mn10300/include/uapi/asm/ipcbuf.h | 2 - + arch/mn10300/include/uapi/asm/kvm_para.h | 2 - + arch/mn10300/include/uapi/asm/mman.h | 7 - + arch/mn10300/include/uapi/asm/msgbuf.h | 32 - + arch/mn10300/include/uapi/asm/param.h | 19 - + arch/mn10300/include/uapi/asm/posix_types.h | 46 - + arch/mn10300/include/uapi/asm/ptrace.h | 85 - + arch/mn10300/include/uapi/asm/resource.h | 2 - + arch/mn10300/include/uapi/asm/sembuf.h | 26 - + arch/mn10300/include/uapi/asm/setup.h | 5 - + arch/mn10300/include/uapi/asm/shmbuf.h | 43 - + arch/mn10300/include/uapi/asm/sigcontext.h | 53 - + arch/mn10300/include/uapi/asm/signal.h | 126 - + arch/mn10300/include/uapi/asm/socket.h | 108 - + arch/mn10300/include/uapi/asm/sockios.h | 14 - + arch/mn10300/include/uapi/asm/stat.h | 79 - + arch/mn10300/include/uapi/asm/statfs.h | 1 - + arch/mn10300/include/uapi/asm/swab.h | 43 - + arch/mn10300/include/uapi/asm/termbits.h | 202 - + arch/mn10300/include/uapi/asm/termios.h | 84 - + arch/mn10300/include/uapi/asm/types.h | 12 - + arch/mn10300/include/uapi/asm/unistd.h | 355 - + arch/mn10300/kernel/Makefile | 29 - + arch/mn10300/kernel/asm-offsets.c | 108 - + arch/mn10300/kernel/cevt-mn10300.c | 137 - + arch/mn10300/kernel/csrc-mn10300.c | 34 - + arch/mn10300/kernel/entry.S | 772 --- + arch/mn10300/kernel/fpu-low.S | 258 - + arch/mn10300/kernel/fpu-nofpu-low.S | 39 - + arch/mn10300/kernel/fpu-nofpu.c | 31 - + arch/mn10300/kernel/fpu.c | 177 - + arch/mn10300/kernel/gdb-io-serial-low.S | 91 - + arch/mn10300/kernel/gdb-io-serial.c | 174 - + arch/mn10300/kernel/gdb-io-ttysm-low.S | 93 - + arch/mn10300/kernel/gdb-io-ttysm.c | 303 - + arch/mn10300/kernel/gdb-low.S | 115 - + arch/mn10300/kernel/gdb-stub.c | 1924 ------ + arch/mn10300/kernel/head.S | 442 -- + arch/mn10300/kernel/internal.h | 40 - + arch/mn10300/kernel/io.c | 30 - + arch/mn10300/kernel/irq.c | 356 - + arch/mn10300/kernel/kgdb.c | 502 -- + arch/mn10300/kernel/kprobes.c | 656 -- + arch/mn10300/kernel/mn10300-debug.c | 58 - + arch/mn10300/kernel/mn10300-serial-low.S | 194 - + arch/mn10300/kernel/mn10300-serial.c | 1790 ----- + arch/mn10300/kernel/mn10300-serial.h | 130 - + arch/mn10300/kernel/mn10300-watchdog-low.S | 66 - + arch/mn10300/kernel/mn10300-watchdog.c | 205 - + arch/mn10300/kernel/mn10300_ksyms.c | 39 - + arch/mn10300/kernel/module.c | 156 - + arch/mn10300/kernel/process.c | 175 - + arch/mn10300/kernel/profile-low.S | 72 - + arch/mn10300/kernel/profile.c | 51 - + arch/mn10300/kernel/ptrace.c | 386 -- + arch/mn10300/kernel/rtc.c | 46 - + arch/mn10300/kernel/setup.c | 283 - + arch/mn10300/kernel/sigframe.h | 33 - + arch/mn10300/kernel/signal.c | 431 -- + arch/mn10300/kernel/smp-low.S | 97 - + arch/mn10300/kernel/smp.c | 1186 ---- + arch/mn10300/kernel/switch_to.S | 179 - + arch/mn10300/kernel/sys_mn10300.c | 33 - + arch/mn10300/kernel/time.c | 125 - + arch/mn10300/kernel/traps.c | 615 -- + arch/mn10300/kernel/vmlinux.lds.S | 94 - + arch/mn10300/lib/Makefile | 7 - + arch/mn10300/lib/__ashldi3.S | 51 - + arch/mn10300/lib/__ashrdi3.S | 52 - + arch/mn10300/lib/__lshrdi3.S | 52 - + arch/mn10300/lib/__ucmpdi2.S | 43 - + arch/mn10300/lib/ashrdi3.c | 61 - + arch/mn10300/lib/bitops.c | 50 - + arch/mn10300/lib/checksum.c | 100 - + arch/mn10300/lib/delay.c | 51 - + arch/mn10300/lib/do_csum.S | 157 - + arch/mn10300/lib/internal.h | 15 - + arch/mn10300/lib/lshrdi3.c | 60 - + arch/mn10300/lib/memcpy.S | 135 - + arch/mn10300/lib/memmove.S | 160 - + arch/mn10300/lib/memset.S | 121 - + arch/mn10300/lib/negdi2.c | 57 - + arch/mn10300/lib/usercopy.c | 142 - + arch/mn10300/mm/Kconfig.cache | 148 - + arch/mn10300/mm/Makefile | 32 - + arch/mn10300/mm/cache-dbg-flush-by-reg.S | 160 - + arch/mn10300/mm/cache-dbg-flush-by-tag.S | 114 - + arch/mn10300/mm/cache-dbg-inv-by-reg.S | 69 - + arch/mn10300/mm/cache-dbg-inv-by-tag.S | 120 - + arch/mn10300/mm/cache-dbg-inv.S | 47 - + arch/mn10300/mm/cache-disabled.c | 21 - + arch/mn10300/mm/cache-flush-by-reg.S | 308 - + arch/mn10300/mm/cache-flush-by-tag.S | 250 - + arch/mn10300/mm/cache-flush-icache.c | 155 - + arch/mn10300/mm/cache-inv-by-reg.S | 350 - + arch/mn10300/mm/cache-inv-by-tag.S | 276 - + arch/mn10300/mm/cache-inv-icache.c | 129 - + arch/mn10300/mm/cache-smp-flush.c | 156 - + arch/mn10300/mm/cache-smp-inv.c | 153 - + arch/mn10300/mm/cache-smp.c | 105 - + arch/mn10300/mm/cache-smp.h | 69 - + arch/mn10300/mm/cache.c | 54 - + arch/mn10300/mm/cache.inc | 133 - + arch/mn10300/mm/dma-alloc.c | 128 - + arch/mn10300/mm/extable.c | 26 - + arch/mn10300/mm/fault.c | 414 -- + arch/mn10300/mm/init.c | 136 - + arch/mn10300/mm/misalignment.c | 966 --- + arch/mn10300/mm/mmu-context.c | 62 - + arch/mn10300/mm/pgtable.c | 174 - + arch/mn10300/mm/tlb-mn10300.S | 220 - + arch/mn10300/mm/tlb-smp.c | 213 - + arch/mn10300/oprofile/Makefile | 14 - + arch/mn10300/oprofile/op_model_null.c | 22 - + arch/mn10300/proc-mn103e010/Makefile | 5 - + arch/mn10300/proc-mn103e010/include/proc/cache.h | 43 - + arch/mn10300/proc-mn103e010/include/proc/clock.h | 16 - + .../proc-mn103e010/include/proc/dmactl-regs.h | 102 - + .../proc-mn103e010/include/proc/intctl-regs.h | 30 - + arch/mn10300/proc-mn103e010/include/proc/irq.h | 34 - + arch/mn10300/proc-mn103e010/include/proc/proc.h | 18 - + arch/mn10300/proc-mn103e010/proc-init.c | 115 - + arch/mn10300/proc-mn2ws0050/Makefile | 5 - + arch/mn10300/proc-mn2ws0050/include/proc/cache.h | 49 - + arch/mn10300/proc-mn2ws0050/include/proc/clock.h | 20 - + .../proc-mn2ws0050/include/proc/dmactl-regs.h | 103 - + .../proc-mn2ws0050/include/proc/intctl-regs.h | 30 - + arch/mn10300/proc-mn2ws0050/include/proc/irq.h | 49 - + .../proc-mn2ws0050/include/proc/nand-regs.h | 120 - + arch/mn10300/proc-mn2ws0050/include/proc/proc.h | 18 - + .../mn10300/proc-mn2ws0050/include/proc/smp-regs.h | 51 - + arch/mn10300/proc-mn2ws0050/proc-init.c | 134 - + arch/mn10300/unit-asb2303/Makefile | 6 - + arch/mn10300/unit-asb2303/flash.c | 99 - + arch/mn10300/unit-asb2303/include/unit/clock.h | 24 - + arch/mn10300/unit-asb2303/include/unit/leds.h | 43 - + arch/mn10300/unit-asb2303/include/unit/serial.h | 141 - + arch/mn10300/unit-asb2303/include/unit/smc91111.h | 50 - + arch/mn10300/unit-asb2303/include/unit/timex.h | 146 - + arch/mn10300/unit-asb2303/leds.c | 52 - + arch/mn10300/unit-asb2303/smc91111.c | 53 - + arch/mn10300/unit-asb2303/unit-init.c | 68 - + arch/mn10300/unit-asb2305/Makefile | 8 - + arch/mn10300/unit-asb2305/include/unit/clock.h | 24 - + arch/mn10300/unit-asb2305/include/unit/leds.h | 51 - + arch/mn10300/unit-asb2305/include/unit/serial.h | 125 - + arch/mn10300/unit-asb2305/include/unit/timex.h | 146 - + arch/mn10300/unit-asb2305/leds.c | 124 - + arch/mn10300/unit-asb2305/pci-asb2305.c | 212 - + arch/mn10300/unit-asb2305/pci-asb2305.h | 65 - + arch/mn10300/unit-asb2305/pci-irq.c | 46 - + arch/mn10300/unit-asb2305/pci.c | 505 -- + arch/mn10300/unit-asb2305/unit-init.c | 63 - + arch/mn10300/unit-asb2364/Makefile | 12 - + arch/mn10300/unit-asb2364/include/unit/clock.h | 29 - + arch/mn10300/unit-asb2364/include/unit/fpga-regs.h | 53 - + arch/mn10300/unit-asb2364/include/unit/irq.h | 35 - + arch/mn10300/unit-asb2364/include/unit/leds.h | 54 - + arch/mn10300/unit-asb2364/include/unit/serial.h | 151 - + arch/mn10300/unit-asb2364/include/unit/smsc911x.h | 171 - + arch/mn10300/unit-asb2364/include/unit/timex.h | 155 - + arch/mn10300/unit-asb2364/irq-fpga.c | 108 - + arch/mn10300/unit-asb2364/leds.c | 98 - + arch/mn10300/unit-asb2364/smsc911x.c | 58 - + arch/mn10300/unit-asb2364/unit-init.c | 132 - + arch/score/Kconfig | 108 - + arch/score/Kconfig.debug | 29 - + arch/score/Makefile | 44 - + arch/score/boot/Makefile | 15 - + arch/score/configs/spct6600_defconfig | 84 - + arch/score/include/asm/Kbuild | 13 - + arch/score/include/asm/asm-offsets.h | 1 - + arch/score/include/asm/asmmacro.h | 162 - + arch/score/include/asm/atomic.h | 8 - + arch/score/include/asm/bitops.h | 11 - + arch/score/include/asm/bug.h | 18 - + arch/score/include/asm/bugs.h | 7 - + arch/score/include/asm/cache.h | 8 - + arch/score/include/asm/cacheflush.h | 49 - + arch/score/include/asm/checksum.h | 244 - + arch/score/include/asm/cmpxchg.h | 48 - + arch/score/include/asm/delay.h | 29 - + arch/score/include/asm/device.h | 7 - + arch/score/include/asm/div64.h | 7 - + arch/score/include/asm/dma.h | 9 - + arch/score/include/asm/elf.h | 98 - + arch/score/include/asm/emergency-restart.h | 7 - + arch/score/include/asm/exec.h | 7 - + arch/score/include/asm/fixmap.h | 83 - + arch/score/include/asm/ftrace.h | 4 - + arch/score/include/asm/futex.h | 7 - + arch/score/include/asm/hardirq.h | 7 - + arch/score/include/asm/hw_irq.h | 4 - + arch/score/include/asm/io.h | 9 - + arch/score/include/asm/irq.h | 26 - + arch/score/include/asm/irq_regs.h | 12 - + arch/score/include/asm/irqflags.h | 121 - + arch/score/include/asm/kdebug.h | 7 - + arch/score/include/asm/kmap_types.h | 7 - + arch/score/include/asm/linkage.h | 8 - + arch/score/include/asm/local.h | 7 - + arch/score/include/asm/local64.h | 1 - + arch/score/include/asm/mmu.h | 7 - + arch/score/include/asm/mmu_context.h | 116 - + arch/score/include/asm/module.h | 36 - + arch/score/include/asm/page.h | 94 - + arch/score/include/asm/pci.h | 4 - + arch/score/include/asm/percpu.h | 7 - + arch/score/include/asm/pgalloc.h | 86 - + arch/score/include/asm/pgtable-bits.h | 25 - + arch/score/include/asm/pgtable.h | 270 - + arch/score/include/asm/processor.h | 104 - + arch/score/include/asm/ptrace.h | 26 - + arch/score/include/asm/scoreregs.h | 52 - + arch/score/include/asm/segment.h | 22 - + arch/score/include/asm/setup.h | 37 - + arch/score/include/asm/shmparam.h | 7 - + arch/score/include/asm/string.h | 9 - + arch/score/include/asm/switch_to.h | 12 - + arch/score/include/asm/syscalls.h | 9 - + arch/score/include/asm/thread_info.h | 90 - + arch/score/include/asm/timex.h | 9 - + arch/score/include/asm/tlb.h | 18 - + arch/score/include/asm/tlbflush.h | 143 - + arch/score/include/asm/topology.h | 7 - + arch/score/include/asm/uaccess.h | 373 - + arch/score/include/asm/ucontext.h | 1 - + arch/score/include/asm/unaligned.h | 7 - + arch/score/include/asm/user.h | 22 - + arch/score/include/uapi/asm/Kbuild | 6 - + arch/score/include/uapi/asm/auxvec.h | 4 - + arch/score/include/uapi/asm/bitsperlong.h | 7 - + arch/score/include/uapi/asm/byteorder.h | 7 - + arch/score/include/uapi/asm/errno.h | 7 - + arch/score/include/uapi/asm/fcntl.h | 7 - + arch/score/include/uapi/asm/ioctl.h | 7 - + arch/score/include/uapi/asm/ioctls.h | 7 - + arch/score/include/uapi/asm/ipcbuf.h | 7 - + arch/score/include/uapi/asm/kvm_para.h | 2 - + arch/score/include/uapi/asm/mman.h | 7 - + arch/score/include/uapi/asm/msgbuf.h | 7 - + arch/score/include/uapi/asm/param.h | 7 - + arch/score/include/uapi/asm/posix_types.h | 7 - + arch/score/include/uapi/asm/ptrace.h | 66 - + arch/score/include/uapi/asm/resource.h | 7 - + arch/score/include/uapi/asm/sembuf.h | 7 - + arch/score/include/uapi/asm/setup.h | 10 - + arch/score/include/uapi/asm/shmbuf.h | 7 - + arch/score/include/uapi/asm/sigcontext.h | 23 - + arch/score/include/uapi/asm/signal.h | 7 - + arch/score/include/uapi/asm/socket.h | 7 - + arch/score/include/uapi/asm/sockios.h | 7 - + arch/score/include/uapi/asm/stat.h | 7 - + arch/score/include/uapi/asm/statfs.h | 7 - + arch/score/include/uapi/asm/swab.h | 7 - + arch/score/include/uapi/asm/termbits.h | 7 - + arch/score/include/uapi/asm/termios.h | 7 - + arch/score/include/uapi/asm/types.h | 7 - + arch/score/include/uapi/asm/unistd.h | 13 - + arch/score/kernel/Makefile | 12 - + arch/score/kernel/asm-offsets.c | 214 - + arch/score/kernel/entry.S | 493 -- + arch/score/kernel/head.S | 70 - + arch/score/kernel/irq.c | 111 - + arch/score/kernel/module.c | 132 - + arch/score/kernel/process.c | 118 - + arch/score/kernel/ptrace.c | 386 -- + arch/score/kernel/setup.c | 160 - + arch/score/kernel/signal.c | 308 - + arch/score/kernel/sys_call_table.c | 13 - + arch/score/kernel/sys_score.c | 50 - + arch/score/kernel/time.c | 90 - + arch/score/kernel/traps.c | 346 - + arch/score/kernel/vmlinux.lds.S | 91 - + arch/score/lib/Makefile | 8 - + arch/score/lib/ashldi3.c | 46 - + arch/score/lib/ashrdi3.c | 48 - + arch/score/lib/checksum.S | 255 - + arch/score/lib/checksum_copy.c | 53 - + arch/score/lib/cmpdi2.c | 44 - + arch/score/lib/libgcc.h | 37 - + arch/score/lib/lshrdi3.c | 47 - + arch/score/lib/string.S | 156 - + arch/score/lib/ucmpdi2.c | 38 - + arch/score/mm/Makefile | 6 - + arch/score/mm/cache.c | 281 - + arch/score/mm/extable.c | 40 - + arch/score/mm/fault.c | 237 - + arch/score/mm/init.c | 109 - + arch/score/mm/pgtable.c | 52 - + arch/score/mm/tlb-miss.S | 199 - + arch/score/mm/tlb-score.c | 251 - + arch/tile/Kbuild | 3 - + arch/tile/Kconfig | 481 -- + arch/tile/Kconfig.debug | 26 - + arch/tile/Makefile | 77 - + arch/tile/configs/tilegx_defconfig | 411 -- + arch/tile/configs/tilepro_defconfig | 524 -- + arch/tile/gxio/Kconfig | 34 - + arch/tile/gxio/Makefile | 11 - + arch/tile/gxio/dma_queue.c | 176 - + arch/tile/gxio/iorpc_globals.c | 89 - + arch/tile/gxio/iorpc_mpipe.c | 593 -- + arch/tile/gxio/iorpc_mpipe_info.c | 102 - + arch/tile/gxio/iorpc_trio.c | 350 - + arch/tile/gxio/iorpc_uart.c | 77 - + arch/tile/gxio/iorpc_usb_host.c | 99 - + arch/tile/gxio/kiorpc.c | 61 - + arch/tile/gxio/mpipe.c | 584 -- + arch/tile/gxio/trio.c | 49 - + arch/tile/gxio/uart.c | 87 - + arch/tile/gxio/usb_host.c | 91 - + arch/tile/include/arch/mpipe.h | 371 - + arch/tile/include/arch/mpipe_constants.h | 42 - + arch/tile/include/arch/mpipe_def.h | 39 - + arch/tile/include/arch/mpipe_shm.h | 521 -- + arch/tile/include/arch/mpipe_shm_def.h | 23 - + arch/tile/include/arch/spr_def.h | 109 - + arch/tile/include/arch/trio.h | 111 - + arch/tile/include/arch/trio_constants.h | 36 - + arch/tile/include/arch/trio_def.h | 41 - + arch/tile/include/arch/trio_pcie_intfc.h | 229 - + arch/tile/include/arch/trio_pcie_intfc_def.h | 32 - + arch/tile/include/arch/trio_pcie_rc.h | 156 - + arch/tile/include/arch/trio_pcie_rc_def.h | 24 - + arch/tile/include/arch/trio_shm.h | 125 - + arch/tile/include/arch/trio_shm_def.h | 19 - + arch/tile/include/arch/uart.h | 300 - + arch/tile/include/arch/uart_def.h | 120 - + arch/tile/include/arch/usb_host.h | 26 - + arch/tile/include/arch/usb_host_def.h | 19 - + arch/tile/include/asm/Kbuild | 18 - + arch/tile/include/asm/asm-offsets.h | 1 - + arch/tile/include/asm/atomic.h | 210 - + arch/tile/include/asm/atomic_32.h | 297 - + arch/tile/include/asm/atomic_64.h | 200 - + arch/tile/include/asm/backtrace.h | 162 - + arch/tile/include/asm/barrier.h | 100 - + arch/tile/include/asm/bitops.h | 94 - + arch/tile/include/asm/bitops_32.h | 126 - + arch/tile/include/asm/bitops_64.h | 95 - + arch/tile/include/asm/cache.h | 64 - + arch/tile/include/asm/cacheflush.h | 160 - + arch/tile/include/asm/checksum.h | 42 - + arch/tile/include/asm/cmpxchg.h | 132 - + arch/tile/include/asm/compat.h | 233 - + arch/tile/include/asm/current.h | 31 - + arch/tile/include/asm/delay.h | 34 - + arch/tile/include/asm/device.h | 33 - + arch/tile/include/asm/div64.h | 17 - + arch/tile/include/asm/dma-mapping.h | 50 - + arch/tile/include/asm/dma.h | 25 - + arch/tile/include/asm/elf.h | 182 - + arch/tile/include/asm/fixmap.h | 87 - + arch/tile/include/asm/ftrace.h | 42 - + arch/tile/include/asm/futex.h | 166 - + arch/tile/include/asm/hardirq.h | 45 - + arch/tile/include/asm/hardwall.h | 30 - + arch/tile/include/asm/highmem.h | 71 - + arch/tile/include/asm/homecache.h | 123 - + arch/tile/include/asm/hugetlb.h | 122 - + arch/tile/include/asm/hv_driver.h | 60 - + arch/tile/include/asm/ide.h | 25 - + arch/tile/include/asm/insn.h | 59 - + arch/tile/include/asm/io.h | 509 -- + arch/tile/include/asm/irq.h | 87 - + arch/tile/include/asm/irq_work.h | 15 - + arch/tile/include/asm/irqflags.h | 311 - + arch/tile/include/asm/jump_label.h | 58 - + arch/tile/include/asm/kdebug.h | 28 - + arch/tile/include/asm/kexec.h | 65 - + arch/tile/include/asm/kgdb.h | 71 - + arch/tile/include/asm/kmap_types.h | 28 - + arch/tile/include/asm/kprobes.h | 83 - + arch/tile/include/asm/linkage.h | 51 - + arch/tile/include/asm/mmu.h | 32 - + arch/tile/include/asm/mmu_context.h | 137 - + arch/tile/include/asm/mmzone.h | 70 - + arch/tile/include/asm/module.h | 40 - + arch/tile/include/asm/page.h | 345 - + arch/tile/include/asm/pci.h | 229 - + arch/tile/include/asm/percpu.h | 52 - + arch/tile/include/asm/perf_event.h | 22 - + arch/tile/include/asm/pgalloc.h | 164 - + arch/tile/include/asm/pgtable.h | 518 -- + arch/tile/include/asm/pgtable_32.h | 122 - + arch/tile/include/asm/pgtable_64.h | 172 - + arch/tile/include/asm/pmc.h | 64 - + arch/tile/include/asm/processor.h | 368 - + arch/tile/include/asm/ptrace.h | 97 - + arch/tile/include/asm/sections.h | 44 - + arch/tile/include/asm/setup.h | 57 - + arch/tile/include/asm/sigframe.h | 33 - + arch/tile/include/asm/signal.h | 29 - + arch/tile/include/asm/smp.h | 139 - + arch/tile/include/asm/spinlock.h | 24 - + arch/tile/include/asm/spinlock_32.h | 109 - + arch/tile/include/asm/spinlock_64.h | 138 - + arch/tile/include/asm/spinlock_types.h | 60 - + arch/tile/include/asm/stack.h | 73 - + arch/tile/include/asm/string.h | 34 - + arch/tile/include/asm/switch_to.h | 77 - + arch/tile/include/asm/syscall.h | 111 - + arch/tile/include/asm/syscalls.h | 70 - + arch/tile/include/asm/thread_info.h | 167 - + arch/tile/include/asm/tile-desc.h | 19 - + arch/tile/include/asm/tile-desc_32.h | 553 -- + arch/tile/include/asm/tile-desc_64.h | 483 -- + arch/tile/include/asm/timex.h | 52 - + arch/tile/include/asm/tlb.h | 25 - + arch/tile/include/asm/tlbflush.h | 123 - + arch/tile/include/asm/topology.h | 52 - + arch/tile/include/asm/traps.h | 93 - + arch/tile/include/asm/uaccess.h | 411 -- + arch/tile/include/asm/unaligned.h | 43 - + arch/tile/include/asm/unistd.h | 20 - + arch/tile/include/asm/user.h | 21 - + arch/tile/include/asm/vdso.h | 55 - + arch/tile/include/asm/vga.h | 39 - + arch/tile/include/asm/word-at-a-time.h | 43 - + arch/tile/include/gxio/common.h | 40 - + arch/tile/include/gxio/dma_queue.h | 161 - + arch/tile/include/gxio/iorpc_globals.h | 38 - + arch/tile/include/gxio/iorpc_mpipe.h | 144 - + arch/tile/include/gxio/iorpc_mpipe_info.h | 50 - + arch/tile/include/gxio/iorpc_trio.h | 104 - + arch/tile/include/gxio/iorpc_uart.h | 40 - + arch/tile/include/gxio/iorpc_usb_host.h | 46 - + arch/tile/include/gxio/kiorpc.h | 29 - + arch/tile/include/gxio/mpipe.h | 1871 ----- + arch/tile/include/gxio/trio.h | 298 - + arch/tile/include/gxio/uart.h | 105 - + arch/tile/include/gxio/usb_host.h | 87 - + arch/tile/include/hv/drv_mpipe_intf.h | 605 -- + arch/tile/include/hv/drv_mshim_intf.h | 50 - + arch/tile/include/hv/drv_pcie_rc_intf.h | 38 - + arch/tile/include/hv/drv_srom_intf.h | 41 - + arch/tile/include/hv/drv_trio_intf.h | 199 - + arch/tile/include/hv/drv_uart_intf.h | 33 - + arch/tile/include/hv/drv_usb_host_intf.h | 39 - + arch/tile/include/hv/drv_xgbe_impl.h | 300 - + arch/tile/include/hv/drv_xgbe_intf.h | 615 -- + arch/tile/include/hv/hypervisor.h | 2656 ------- + arch/tile/include/hv/iorpc.h | 714 -- + arch/tile/include/hv/netio_errors.h | 122 - + arch/tile/include/hv/netio_intf.h | 2975 -------- + arch/tile/include/hv/syscall_public.h | 42 - + arch/tile/include/uapi/arch/abi.h | 101 - + arch/tile/include/uapi/arch/chip.h | 22 - + arch/tile/include/uapi/arch/chip_tilegx.h | 259 - + arch/tile/include/uapi/arch/chip_tilepro.h | 259 - + arch/tile/include/uapi/arch/icache.h | 94 - + arch/tile/include/uapi/arch/interrupts.h | 20 - + arch/tile/include/uapi/arch/interrupts_32.h | 310 - + arch/tile/include/uapi/arch/interrupts_64.h | 279 - + arch/tile/include/uapi/arch/intreg.h | 71 - + arch/tile/include/uapi/arch/opcode.h | 22 - + arch/tile/include/uapi/arch/opcode_tilegx.h | 1407 ---- + arch/tile/include/uapi/arch/opcode_tilepro.h | 1473 ---- + arch/tile/include/uapi/arch/sim.h | 644 -- + arch/tile/include/uapi/arch/sim_def.h | 506 -- + arch/tile/include/uapi/arch/spr_def.h | 27 - + arch/tile/include/uapi/arch/spr_def_32.h | 256 - + arch/tile/include/uapi/arch/spr_def_64.h | 217 - + arch/tile/include/uapi/asm/Kbuild | 24 - + arch/tile/include/uapi/asm/auxvec.h | 24 - + arch/tile/include/uapi/asm/bitsperlong.h | 27 - + arch/tile/include/uapi/asm/byteorder.h | 20 - + arch/tile/include/uapi/asm/cachectl.h | 43 - + arch/tile/include/uapi/asm/hardwall.h | 52 - + arch/tile/include/uapi/asm/kvm_para.h | 2 - + arch/tile/include/uapi/asm/mman.h | 43 - + arch/tile/include/uapi/asm/ptrace.h | 99 - + arch/tile/include/uapi/asm/setup.h | 22 - + arch/tile/include/uapi/asm/sigcontext.h | 44 - + arch/tile/include/uapi/asm/siginfo.h | 27 - + arch/tile/include/uapi/asm/signal.h | 28 - + arch/tile/include/uapi/asm/stat.h | 5 - + arch/tile/include/uapi/asm/swab.h | 24 - + arch/tile/include/uapi/asm/unistd.h | 38 - + arch/tile/kernel/Makefile | 38 - + arch/tile/kernel/asm-offsets.c | 84 - + arch/tile/kernel/backtrace.c | 683 -- + arch/tile/kernel/compat.c | 117 - + arch/tile/kernel/compat_signal.c | 172 - + arch/tile/kernel/early_printk.c | 75 - + arch/tile/kernel/entry.S | 64 - + arch/tile/kernel/ftrace.c | 239 - + arch/tile/kernel/hardwall.c | 1096 --- + arch/tile/kernel/head_32.S | 183 - + arch/tile/kernel/head_64.S | 279 - + arch/tile/kernel/hvglue.S | 76 - + arch/tile/kernel/hvglue_trace.c | 270 - + arch/tile/kernel/intvec_32.S | 1906 ----- + arch/tile/kernel/intvec_64.S | 1564 ----- + arch/tile/kernel/irq.c | 280 - + arch/tile/kernel/jump_label.c | 62 - + arch/tile/kernel/kgdb.c | 497 -- + arch/tile/kernel/kprobes.c | 527 -- + arch/tile/kernel/machine_kexec.c | 298 - + arch/tile/kernel/mcount_64.S | 211 - + arch/tile/kernel/messaging.c | 115 - + arch/tile/kernel/module.c | 231 - + arch/tile/kernel/pci-dma.c | 607 -- + arch/tile/kernel/pci.c | 592 -- + arch/tile/kernel/pci_gx.c | 1592 ----- + arch/tile/kernel/perf_event.c | 1005 --- + arch/tile/kernel/pmc.c | 118 - + arch/tile/kernel/proc.c | 160 - + arch/tile/kernel/process.c | 659 -- + arch/tile/kernel/ptrace.c | 316 - + arch/tile/kernel/reboot.c | 51 - + arch/tile/kernel/regs_32.S | 145 - + arch/tile/kernel/regs_64.S | 145 - + arch/tile/kernel/relocate_kernel_32.S | 269 - + arch/tile/kernel/relocate_kernel_64.S | 263 - + arch/tile/kernel/setup.c | 1743 ----- + arch/tile/kernel/signal.c | 411 -- + arch/tile/kernel/single_step.c | 786 --- + arch/tile/kernel/smp.c | 287 - + arch/tile/kernel/smpboot.c | 269 - + arch/tile/kernel/stack.c | 539 -- + arch/tile/kernel/sys.c | 130 - + arch/tile/kernel/sysfs.c | 266 - + arch/tile/kernel/tile-desc_32.c | 2605 ------- + arch/tile/kernel/tile-desc_64.c | 2218 ------ + arch/tile/kernel/time.c | 306 - + arch/tile/kernel/tlb.c | 104 - + arch/tile/kernel/traps.c | 421 -- + arch/tile/kernel/unaligned.c | 1603 ----- + arch/tile/kernel/usb.c | 71 - + arch/tile/kernel/vdso.c | 197 - + arch/tile/kernel/vdso/Makefile | 117 - + arch/tile/kernel/vdso/vdso.S | 28 - + arch/tile/kernel/vdso/vdso.lds.S | 89 - + arch/tile/kernel/vdso/vdso32.S | 28 - + arch/tile/kernel/vdso/vgettimeofday.c | 198 - + arch/tile/kernel/vdso/vrt_sigreturn.S | 30 - + arch/tile/kernel/vmlinux.lds.S | 105 - + arch/tile/kvm/Kconfig | 39 - + arch/tile/lib/Makefile | 19 - + arch/tile/lib/atomic_32.c | 206 - + arch/tile/lib/atomic_asm_32.S | 205 - + arch/tile/lib/cacheflush.c | 167 - + arch/tile/lib/checksum.c | 89 - + arch/tile/lib/cpumask.c | 54 - + arch/tile/lib/delay.c | 45 - + arch/tile/lib/exports.c | 94 - + arch/tile/lib/memchr_32.c | 71 - + arch/tile/lib/memchr_64.c | 69 - + arch/tile/lib/memcpy_32.S | 544 -- + arch/tile/lib/memcpy_64.c | 367 - + arch/tile/lib/memcpy_user_64.c | 85 - + arch/tile/lib/memmove.c | 63 - + arch/tile/lib/memset_32.c | 143 - + arch/tile/lib/memset_64.c | 142 - + arch/tile/lib/spinlock_32.c | 251 - + arch/tile/lib/spinlock_64.c | 97 - + arch/tile/lib/spinlock_common.h | 64 - + arch/tile/lib/strchr_32.c | 64 - + arch/tile/lib/strchr_64.c | 62 - + arch/tile/lib/string-endian.h | 44 - + arch/tile/lib/strlen_32.c | 36 - + arch/tile/lib/strlen_64.c | 35 - + arch/tile/lib/strnlen_32.c | 47 - + arch/tile/lib/strnlen_64.c | 48 - + arch/tile/lib/uaccess.c | 24 - + arch/tile/lib/usercopy_32.S | 89 - + arch/tile/lib/usercopy_64.S | 89 - + arch/tile/mm/Makefile | 9 - + arch/tile/mm/elf.c | 165 - + arch/tile/mm/extable.c | 30 - + arch/tile/mm/fault.c | 924 --- + arch/tile/mm/highmem.c | 277 - + arch/tile/mm/homecache.c | 428 -- + arch/tile/mm/hugetlbpage.c | 348 - + arch/tile/mm/init.c | 956 --- + arch/tile/mm/migrate.h | 56 - + arch/tile/mm/migrate_32.S | 192 - + arch/tile/mm/migrate_64.S | 167 - + arch/tile/mm/mmap.c | 93 - + arch/tile/mm/pgtable.c | 550 -- + block/bounce.c | 2 +- + crypto/sha3_generic.c | 2 +- + crypto/testmgr.c | 6 - + crypto/testmgr.h | 88 - + drivers/ata/Kconfig | 9 - + drivers/ata/Makefile | 1 - + drivers/ata/pata_bf54x.c | 1703 ----- + drivers/char/Kconfig | 48 - + drivers/char/Makefile | 3 - + drivers/char/bfin-otp.c | 237 - + drivers/char/ds1302.c | 357 - + drivers/char/tile-srom.c | 475 -- + drivers/clocksource/Kconfig | 5 - + drivers/clocksource/Makefile | 1 - + drivers/clocksource/metag_generic.c | 161 - + drivers/cpufreq/Makefile | 3 - + drivers/cpufreq/blackfin-cpufreq.c | 217 - + drivers/cpufreq/cris-artpec3-cpufreq.c | 93 - + drivers/cpufreq/cris-etraxfs-cpufreq.c | 92 - + drivers/crypto/Kconfig | 7 - + drivers/crypto/Makefile | 1 - + drivers/crypto/bfin_crc.c | 743 -- + drivers/crypto/bfin_crc.h | 124 - + drivers/edac/Kconfig | 8 - + drivers/edac/Makefile | 2 - + drivers/edac/tile_edac.c | 265 - + drivers/gpio/Kconfig | 9 - + drivers/gpio/Makefile | 1 - + drivers/gpio/gpio-etraxfs.c | 475 -- + drivers/i2c/busses/Kconfig | 20 +- + drivers/i2c/busses/Makefile | 1 - + drivers/i2c/busses/i2c-bfin-twi.c | 737 -- + drivers/ide/Kconfig | 2 +- + drivers/ide/ide-generic.c | 12 +- + drivers/input/joystick/analog.c | 2 +- + drivers/input/keyboard/Kconfig | 9 - + drivers/input/keyboard/Makefile | 1 - + drivers/input/keyboard/bf54x-keys.c | 396 -- + drivers/input/misc/Kconfig | 9 - + drivers/input/misc/Makefile | 1 - + drivers/input/misc/bfin_rotary.c | 294 - + drivers/irqchip/Makefile | 2 - + drivers/irqchip/irq-metag-ext.c | 871 --- + drivers/irqchip/irq-metag.c | 343 - + drivers/isdn/hisax/Kconfig | 10 +- + drivers/media/platform/Kconfig | 22 - + drivers/media/platform/Makefile | 4 - + drivers/media/platform/arv.c | 884 --- + drivers/media/platform/blackfin/Kconfig | 16 - + drivers/media/platform/blackfin/Makefile | 2 - + drivers/media/platform/blackfin/bfin_capture.c | 989 --- + drivers/media/platform/blackfin/ppi.c | 361 - + drivers/media/rc/img-ir/Kconfig | 2 +- + drivers/misc/echo/echo.c | 73 - + drivers/misc/echo/fir.h | 50 - + drivers/mmc/host/Kconfig | 19 - + drivers/mmc/host/Makefile | 1 - + drivers/mmc/host/bfin_sdh.c | 679 -- + drivers/net/Makefile | 1 - + drivers/net/can/Kconfig | 9 - + drivers/net/can/Makefile | 1 - + drivers/net/can/bfin_can.c | 784 --- + drivers/net/cris/Makefile | 1 - + drivers/net/cris/eth_v10.c | 1742 ----- + drivers/net/ethernet/8390/Kconfig | 3 +- + drivers/net/ethernet/8390/ne.c | 23 +- + drivers/net/ethernet/Kconfig | 2 - + drivers/net/ethernet/Makefile | 2 - + drivers/net/ethernet/adi/Kconfig | 66 - + drivers/net/ethernet/adi/Makefile | 5 - + drivers/net/ethernet/adi/bfin_mac.c | 1881 ----- + drivers/net/ethernet/adi/bfin_mac.h | 104 - + drivers/net/ethernet/davicom/Kconfig | 2 +- + drivers/net/ethernet/smsc/Kconfig | 10 +- + drivers/net/ethernet/smsc/smc91x.h | 26 - + drivers/net/ethernet/tile/Kconfig | 18 - + drivers/net/ethernet/tile/Makefile | 11 - + drivers/net/ethernet/tile/tilegx.c | 2279 ------ + drivers/net/ethernet/tile/tilepro.c | 2397 ------- + drivers/net/wireless/cisco/Kconfig | 2 +- + drivers/pci/quirks.c | 19 - + drivers/pcmcia/Kconfig | 26 - + drivers/pcmcia/Makefile | 3 - + drivers/pcmcia/bfin_cf_pcmcia.c | 316 - + drivers/pcmcia/m32r_cfc.c | 786 --- + drivers/pcmcia/m32r_cfc.h | 88 - + drivers/pcmcia/m32r_pcc.c | 763 -- + drivers/pcmcia/m32r_pcc.h | 66 - + drivers/pinctrl/Kconfig | 19 - + drivers/pinctrl/Makefile | 3 - + drivers/pinctrl/pinctrl-adi2-bf54x.c | 588 -- + drivers/pinctrl/pinctrl-adi2-bf60x.c | 517 -- + drivers/pinctrl/pinctrl-adi2.c | 1114 --- + drivers/pinctrl/pinctrl-adi2.h | 75 - + drivers/pwm/Kconfig | 11 +- + drivers/pwm/Makefile | 1 - + drivers/pwm/pwm-bfin.c | 157 - + drivers/rtc/Kconfig | 19 +- + drivers/rtc/Makefile | 2 - + drivers/rtc/rtc-bfin.c | 448 -- + drivers/rtc/rtc-cmos.c | 2 +- + drivers/rtc/rtc-tile.c | 146 - + drivers/spi/Kconfig | 23 +- + drivers/spi/Makefile | 3 - + drivers/spi/spi-adi-v3.c | 984 --- + drivers/spi/spi-bfin-sport.c | 919 --- + drivers/spi/spi-bfin5xx.c | 1462 ---- + drivers/staging/iio/Kconfig | 1 - + drivers/staging/iio/Makefile | 1 - + drivers/staging/iio/trigger/Kconfig | 19 - + drivers/staging/iio/trigger/Makefile | 5 - + drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 292 - + drivers/staging/iio/trigger/iio-trig-bfin-timer.h | 25 - + drivers/staging/speakup/Kconfig | 2 +- + drivers/tty/Kconfig | 26 - + drivers/tty/Makefile | 2 - + drivers/tty/bfin_jtag_comm.c | 353 - + drivers/tty/hvc/Kconfig | 9 - + drivers/tty/hvc/Makefile | 2 - + drivers/tty/hvc/hvc_bfin_jtag.c | 104 - + drivers/tty/hvc/hvc_tile.c | 196 - + drivers/tty/metag_da.c | 665 -- + drivers/tty/serial/Kconfig | 198 - + drivers/tty/serial/Makefile | 6 - + drivers/tty/serial/bfin_sport_uart.c | 937 --- + drivers/tty/serial/bfin_sport_uart.h | 86 - + drivers/tty/serial/bfin_uart.c | 1551 ----- + drivers/tty/serial/crisv10.c | 4248 ------------ + drivers/tty/serial/crisv10.h | 133 - + drivers/tty/serial/etraxfs-uart.c | 960 --- + drivers/tty/serial/m32r_sio.c | 1053 --- + drivers/tty/serial/m32r_sio_reg.h | 150 - + drivers/tty/serial/tilegx.c | 689 -- + drivers/usb/gadget/function/f_uac1_legacy.c | 2 - + drivers/usb/gadget/function/u_uac1_legacy.c | 2 - + drivers/usb/gadget/function/u_uac1_legacy.h | 2 - + drivers/usb/gadget/legacy/audio.c | 2 - + drivers/usb/host/Kconfig | 1 + + drivers/usb/host/ehci-hcd.c | 5 - + drivers/usb/host/ehci-tilegx.c | 207 - + drivers/usb/host/isp1362.h | 46 - + drivers/usb/host/ohci-hcd.c | 18 - + drivers/usb/host/ohci-tilegx.c | 196 - + drivers/usb/musb/Kconfig | 14 +- + drivers/usb/musb/Makefile | 1 - + drivers/usb/musb/blackfin.c | 623 -- + drivers/usb/musb/blackfin.h | 81 - + drivers/usb/musb/musb_core.c | 7 +- + drivers/usb/musb/musb_core.h | 43 - + drivers/usb/musb/musb_debugfs.c | 2 - + drivers/usb/musb/musb_dma.h | 11 - + drivers/usb/musb/musb_gadget.c | 56 +- + drivers/usb/musb/musb_host.c | 12 +- + drivers/usb/musb/musb_regs.h | 182 - + drivers/usb/musb/musbhsdma.c | 5 - + drivers/usb/musb/musbhsdma.h | 64 - + drivers/video/console/Kconfig | 3 +- + drivers/video/fbdev/Kconfig | 103 - + drivers/video/fbdev/Makefile | 5 - + drivers/video/fbdev/bf537-lq035.c | 891 --- + drivers/video/fbdev/bf54x-lq043fb.c | 764 -- + drivers/video/fbdev/bfin-lq035q1-fb.c | 864 --- + drivers/video/fbdev/bfin-t350mcqb-fb.c | 669 -- + drivers/video/fbdev/bfin_adv7393fb.c | 828 --- + drivers/video/fbdev/bfin_adv7393fb.h | 319 - + drivers/video/fbdev/s1d13xxxfb.c | 10 - + drivers/video/logo/Kconfig | 15 - + drivers/video/logo/Makefile | 3 - + drivers/video/logo/logo.c | 12 - + drivers/video/logo/logo_blackfin_clut224.ppm | 1127 --- + drivers/video/logo/logo_blackfin_vga16.ppm | 1127 --- + drivers/video/logo/logo_m32r_clut224.ppm | 1292 ---- + drivers/watchdog/Kconfig | 21 +- + drivers/watchdog/Makefile | 9 - + drivers/watchdog/bfin_wdt.c | 476 -- + fs/Kconfig.binfmt | 5 +- + fs/minix/Kconfig | 2 +- + fs/proc/base.c | 9 - + include/asm-generic/atomic.h | 2 - + include/asm-generic/barrier.h | 2 +- + include/asm-generic/exec.h | 2 +- + include/asm-generic/io.h | 2 +- + include/asm-generic/pci_iomap.h | 2 +- + include/asm-generic/switch_to.h | 2 +- + include/clocksource/metag_generic.h | 21 - + include/linux/bfin_mac.h | 30 - + include/linux/bootmem.h | 9 - + include/linux/cpuhotplug.h | 3 - + include/linux/fb.h | 3 +- + include/linux/ide.h | 7 +- + include/linux/irqchip/metag-ext.h | 34 - + include/linux/irqchip/metag.h | 25 - + include/linux/linux_logo.h | 3 - + include/linux/mm.h | 2 - + include/linux/platform_data/bfin_rotary.h | 117 - + include/linux/platform_data/pinctrl-adi2.h | 40 - + include/linux/raid/pq.h | 1 - + include/linux/usb/musb.h | 7 - + include/linux/usb/tilegx.h | 35 - + include/media/blackfin/bfin_capture.h | 39 - + include/media/blackfin/ppi.h | 94 - + include/trace/events/mmflags.h | 2 +- + include/uapi/asm-generic/siginfo.h | 56 +- + include/uapi/asm-generic/unistd.h | 163 - + include/uapi/linux/elf.h | 3 - + init/Kconfig | 5 +- + kernel/module.c | 4 - + lib/Kconfig.debug | 13 +- + lib/raid6/Makefile | 6 - + lib/raid6/algos.c | 3 - + lib/raid6/test/Makefile | 7 - + lib/raid6/tilegx.uc | 87 - + lib/test_user_copy.c | 3 - + mm/Kconfig | 14 +- + mm/nommu.c | 20 - + mm/page_alloc.c | 5 +- + mm/percpu.c | 4 - + mm/sparse.c | 15 - + samples/Kconfig | 6 - + samples/Makefile | 2 +- + samples/blackfin/Makefile | 1 - + samples/blackfin/gptimers-example.c | 91 - + samples/kprobes/kprobe_example.c | 8 - + scripts/checkpatch.pl | 26 - + scripts/checkstack.pl | 7 - + scripts/mod/modpost.c | 7 +- + scripts/recordmcount.c | 20 - + scripts/recordmcount.pl | 8 - + tools/arch/frv/include/uapi/asm/bitsperlong.h | 2 - + tools/arch/frv/include/uapi/asm/mman.h | 7 - + tools/arch/m32r/include/uapi/asm/bitsperlong.h | 2 - + tools/arch/m32r/include/uapi/asm/mman.h | 7 - + tools/arch/mn10300/include/uapi/asm/bitsperlong.h | 1 - + tools/arch/mn10300/include/uapi/asm/mman.h | 7 - + tools/arch/score/include/uapi/asm/bitsperlong.h | 7 - + tools/arch/score/include/uapi/asm/mman.h | 7 - + tools/arch/tile/include/asm/barrier.h | 16 - + tools/arch/tile/include/uapi/asm/bitsperlong.h | 27 - + tools/arch/tile/include/uapi/asm/mman.h | 16 - + tools/include/asm-generic/barrier.h | 2 +- + tools/perf/perf-sys.h | 4 - + tools/scripts/Makefile.arch | 11 +- + tools/testing/ktest/examples/crosstests.conf | 31 +- + tools/testing/ktest/ktest.pl | 2 - + 2504 files changed, 93 insertions(+), 468635 deletions(-) + delete mode 100644 Documentation/blackfin/00-INDEX + delete mode 100644 Documentation/blackfin/bfin-gpio-notes.txt + delete mode 100644 Documentation/blackfin/bfin-spi-notes.txt + delete mode 100644 Documentation/cris/README + delete mode 100644 Documentation/devicetree/bindings/cris/axis.txt + delete mode 100644 Documentation/devicetree/bindings/cris/boards.txt + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-etraxfs.txt + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/axis,crisv32-intc.txt + delete mode 100644 Documentation/devicetree/bindings/metag/meta.txt + delete mode 100644 Documentation/devicetree/bindings/serial/axis,etraxfs-uart.txt + delete mode 100644 Documentation/frv/README.txt + delete mode 100644 Documentation/frv/atomic-ops.txt + delete mode 100644 Documentation/frv/booting.txt + delete mode 100644 Documentation/frv/clock.txt + delete mode 100644 Documentation/frv/configuring.txt + delete mode 100644 Documentation/frv/features.txt + delete mode 100644 Documentation/frv/gdbinit + delete mode 100644 Documentation/frv/gdbstub.txt + delete mode 100644 Documentation/frv/kernel-ABI.txt + delete mode 100644 Documentation/frv/mmu-layout.txt + delete mode 100644 Documentation/metag/00-INDEX + delete mode 100644 Documentation/metag/kernel-ABI.txt + delete mode 100644 Documentation/mn10300/ABI.txt + delete mode 100644 Documentation/mn10300/compartmentalisation.txt + delete mode 100644 arch/blackfin/Clear_BSD.txt + delete mode 100644 arch/blackfin/Kconfig + delete mode 100644 arch/blackfin/Kconfig.debug + delete mode 100644 arch/blackfin/Makefile + delete mode 100644 arch/blackfin/boot/.gitignore + delete mode 100644 arch/blackfin/boot/Makefile + delete mode 100644 arch/blackfin/boot/install.sh + delete mode 100644 arch/blackfin/configs/BF518F-EZBRD_defconfig + delete mode 100644 arch/blackfin/configs/BF526-EZBRD_defconfig + delete mode 100644 arch/blackfin/configs/BF527-AD7160-EVAL_defconfig + delete mode 100644 arch/blackfin/configs/BF527-EZKIT-V2_defconfig + delete mode 100644 arch/blackfin/configs/BF527-EZKIT_defconfig + delete mode 100644 arch/blackfin/configs/BF527-TLL6527M_defconfig + delete mode 100644 arch/blackfin/configs/BF533-EZKIT_defconfig + delete mode 100644 arch/blackfin/configs/BF533-STAMP_defconfig + delete mode 100644 arch/blackfin/configs/BF537-STAMP_defconfig + delete mode 100644 arch/blackfin/configs/BF538-EZKIT_defconfig + delete mode 100644 arch/blackfin/configs/BF548-EZKIT_defconfig + delete mode 100644 arch/blackfin/configs/BF561-ACVILON_defconfig + delete mode 100644 arch/blackfin/configs/BF561-EZKIT-SMP_defconfig + delete mode 100644 arch/blackfin/configs/BF561-EZKIT_defconfig + delete mode 100644 arch/blackfin/configs/BF609-EZKIT_defconfig + delete mode 100644 arch/blackfin/configs/BlackStamp_defconfig + delete mode 100644 arch/blackfin/configs/CM-BF527_defconfig + delete mode 100644 arch/blackfin/configs/CM-BF533_defconfig + delete mode 100644 arch/blackfin/configs/CM-BF537E_defconfig + delete mode 100644 arch/blackfin/configs/CM-BF537U_defconfig + delete mode 100644 arch/blackfin/configs/CM-BF548_defconfig + delete mode 100644 arch/blackfin/configs/CM-BF561_defconfig + delete mode 100644 arch/blackfin/configs/DNP5370_defconfig + delete mode 100644 arch/blackfin/configs/H8606_defconfig + delete mode 100644 arch/blackfin/configs/IP0X_defconfig + delete mode 100644 arch/blackfin/configs/PNAV-10_defconfig + delete mode 100644 arch/blackfin/configs/SRV1_defconfig + delete mode 100644 arch/blackfin/configs/TCM-BF518_defconfig + delete mode 100644 arch/blackfin/configs/TCM-BF537_defconfig + delete mode 100644 arch/blackfin/include/asm/Kbuild + delete mode 100644 arch/blackfin/include/asm/asm-offsets.h + delete mode 100644 arch/blackfin/include/asm/atomic.h + delete mode 100644 arch/blackfin/include/asm/barrier.h + delete mode 100644 arch/blackfin/include/asm/bfin-global.h + delete mode 100644 arch/blackfin/include/asm/bfin-lq035q1.h + delete mode 100644 arch/blackfin/include/asm/bfin5xx_spi.h + delete mode 100644 arch/blackfin/include/asm/bfin_can.h + delete mode 100644 arch/blackfin/include/asm/bfin_dma.h + delete mode 100644 arch/blackfin/include/asm/bfin_pfmon.h + delete mode 100644 arch/blackfin/include/asm/bfin_ppi.h + delete mode 100644 arch/blackfin/include/asm/bfin_sdh.h + delete mode 100644 arch/blackfin/include/asm/bfin_serial.h + delete mode 100644 arch/blackfin/include/asm/bfin_simple_timer.h + delete mode 100644 arch/blackfin/include/asm/bfin_sport.h + delete mode 100644 arch/blackfin/include/asm/bfin_sport3.h + delete mode 100644 arch/blackfin/include/asm/bfin_twi.h + delete mode 100644 arch/blackfin/include/asm/bfin_watchdog.h + delete mode 100644 arch/blackfin/include/asm/bfrom.h + delete mode 100644 arch/blackfin/include/asm/bitops.h + delete mode 100644 arch/blackfin/include/asm/blackfin.h + delete mode 100644 arch/blackfin/include/asm/bug.h + delete mode 100644 arch/blackfin/include/asm/cache.h + delete mode 100644 arch/blackfin/include/asm/cacheflush.h + delete mode 100644 arch/blackfin/include/asm/cdef_LPBlackfin.h + delete mode 100644 arch/blackfin/include/asm/checksum.h + delete mode 100644 arch/blackfin/include/asm/clocks.h + delete mode 100644 arch/blackfin/include/asm/cmpxchg.h + delete mode 100644 arch/blackfin/include/asm/context.S + delete mode 100644 arch/blackfin/include/asm/cplb.h + delete mode 100644 arch/blackfin/include/asm/cplbinit.h + delete mode 100644 arch/blackfin/include/asm/cpu.h + delete mode 100644 arch/blackfin/include/asm/def_LPBlackfin.h + delete mode 100644 arch/blackfin/include/asm/delay.h + delete mode 100644 arch/blackfin/include/asm/dma-mapping.h + delete mode 100644 arch/blackfin/include/asm/dma.h + delete mode 100644 arch/blackfin/include/asm/dpmc.h + delete mode 100644 arch/blackfin/include/asm/early_printk.h + delete mode 100644 arch/blackfin/include/asm/elf.h + delete mode 100644 arch/blackfin/include/asm/entry.h + delete mode 100644 arch/blackfin/include/asm/exec.h + delete mode 100644 arch/blackfin/include/asm/fixed_code.h + delete mode 100644 arch/blackfin/include/asm/flat.h + delete mode 100644 arch/blackfin/include/asm/ftrace.h + delete mode 100644 arch/blackfin/include/asm/gpio.h + delete mode 100644 arch/blackfin/include/asm/gptimers.h + delete mode 100644 arch/blackfin/include/asm/hardirq.h + delete mode 100644 arch/blackfin/include/asm/io.h + delete mode 100644 arch/blackfin/include/asm/ipipe.h + delete mode 100644 arch/blackfin/include/asm/ipipe_base.h + delete mode 100644 arch/blackfin/include/asm/irq.h + delete mode 100644 arch/blackfin/include/asm/irq_handler.h + delete mode 100644 arch/blackfin/include/asm/irqflags.h + delete mode 100644 arch/blackfin/include/asm/kgdb.h + delete mode 100644 arch/blackfin/include/asm/l1layout.h + delete mode 100644 arch/blackfin/include/asm/linkage.h + delete mode 100644 arch/blackfin/include/asm/mem_init.h + delete mode 100644 arch/blackfin/include/asm/mem_map.h + delete mode 100644 arch/blackfin/include/asm/mmu.h + delete mode 100644 arch/blackfin/include/asm/mmu_context.h + delete mode 100644 arch/blackfin/include/asm/module.h + delete mode 100644 arch/blackfin/include/asm/nand.h + delete mode 100644 arch/blackfin/include/asm/nmi.h + delete mode 100644 arch/blackfin/include/asm/page.h + delete mode 100644 arch/blackfin/include/asm/page_offset.h + delete mode 100644 arch/blackfin/include/asm/pci.h + delete mode 100644 arch/blackfin/include/asm/pda.h + delete mode 100644 arch/blackfin/include/asm/perf_event.h + delete mode 100644 arch/blackfin/include/asm/pgtable.h + delete mode 100644 arch/blackfin/include/asm/pm.h + delete mode 100644 arch/blackfin/include/asm/portmux.h + delete mode 100644 arch/blackfin/include/asm/processor.h + delete mode 100644 arch/blackfin/include/asm/pseudo_instructions.h + delete mode 100644 arch/blackfin/include/asm/ptrace.h + delete mode 100644 arch/blackfin/include/asm/reboot.h + delete mode 100644 arch/blackfin/include/asm/rwlock.h + delete mode 100644 arch/blackfin/include/asm/scb.h + delete mode 100644 arch/blackfin/include/asm/sections.h + delete mode 100644 arch/blackfin/include/asm/segment.h + delete mode 100644 arch/blackfin/include/asm/smp.h + delete mode 100644 arch/blackfin/include/asm/spinlock.h + delete mode 100644 arch/blackfin/include/asm/spinlock_types.h + delete mode 100644 arch/blackfin/include/asm/string.h + delete mode 100644 arch/blackfin/include/asm/switch_to.h + delete mode 100644 arch/blackfin/include/asm/syscall.h + delete mode 100644 arch/blackfin/include/asm/thread_info.h + delete mode 100644 arch/blackfin/include/asm/time.h + delete mode 100644 arch/blackfin/include/asm/timex.h + delete mode 100644 arch/blackfin/include/asm/tlb.h + delete mode 100644 arch/blackfin/include/asm/tlbflush.h + delete mode 100644 arch/blackfin/include/asm/trace.h + delete mode 100644 arch/blackfin/include/asm/traps.h + delete mode 100644 arch/blackfin/include/asm/uaccess.h + delete mode 100644 arch/blackfin/include/asm/unistd.h + delete mode 100644 arch/blackfin/include/asm/vga.h + delete mode 100644 arch/blackfin/include/mach-common/irq.h + delete mode 100644 arch/blackfin/include/mach-common/pll.h + delete mode 100644 arch/blackfin/include/mach-common/ports-a.h + delete mode 100644 arch/blackfin/include/mach-common/ports-b.h + delete mode 100644 arch/blackfin/include/mach-common/ports-c.h + delete mode 100644 arch/blackfin/include/mach-common/ports-d.h + delete mode 100644 arch/blackfin/include/mach-common/ports-e.h + delete mode 100644 arch/blackfin/include/mach-common/ports-f.h + delete mode 100644 arch/blackfin/include/mach-common/ports-g.h + delete mode 100644 arch/blackfin/include/mach-common/ports-h.h + delete mode 100644 arch/blackfin/include/mach-common/ports-i.h + delete mode 100644 arch/blackfin/include/mach-common/ports-j.h + delete mode 100644 arch/blackfin/include/uapi/asm/Kbuild + delete mode 100644 arch/blackfin/include/uapi/asm/bfin_sport.h + delete mode 100644 arch/blackfin/include/uapi/asm/byteorder.h + delete mode 100644 arch/blackfin/include/uapi/asm/cachectl.h + delete mode 100644 arch/blackfin/include/uapi/asm/fcntl.h + delete mode 100644 arch/blackfin/include/uapi/asm/fixed_code.h + delete mode 100644 arch/blackfin/include/uapi/asm/ioctls.h + delete mode 100644 arch/blackfin/include/uapi/asm/poll.h + delete mode 100644 arch/blackfin/include/uapi/asm/posix_types.h + delete mode 100644 arch/blackfin/include/uapi/asm/ptrace.h + delete mode 100644 arch/blackfin/include/uapi/asm/sigcontext.h + delete mode 100644 arch/blackfin/include/uapi/asm/siginfo.h + delete mode 100644 arch/blackfin/include/uapi/asm/signal.h + delete mode 100644 arch/blackfin/include/uapi/asm/stat.h + delete mode 100644 arch/blackfin/include/uapi/asm/swab.h + delete mode 100644 arch/blackfin/include/uapi/asm/unistd.h + delete mode 100644 arch/blackfin/kernel/.gitignore + delete mode 100644 arch/blackfin/kernel/Makefile + delete mode 100644 arch/blackfin/kernel/asm-offsets.c + delete mode 100644 arch/blackfin/kernel/bfin_dma.c + delete mode 100644 arch/blackfin/kernel/bfin_gpio.c + delete mode 100644 arch/blackfin/kernel/bfin_ksyms.c + delete mode 100644 arch/blackfin/kernel/cplb-mpu/Makefile + delete mode 100644 arch/blackfin/kernel/cplb-mpu/cplbinit.c + delete mode 100644 arch/blackfin/kernel/cplb-mpu/cplbmgr.c + delete mode 100644 arch/blackfin/kernel/cplb-nompu/Makefile + delete mode 100644 arch/blackfin/kernel/cplb-nompu/cplbinit.c + delete mode 100644 arch/blackfin/kernel/cplb-nompu/cplbmgr.c + delete mode 100644 arch/blackfin/kernel/cplbinfo.c + delete mode 100644 arch/blackfin/kernel/debug-mmrs.c + delete mode 100644 arch/blackfin/kernel/dma-mapping.c + delete mode 100644 arch/blackfin/kernel/dumpstack.c + delete mode 100644 arch/blackfin/kernel/early_printk.c + delete mode 100644 arch/blackfin/kernel/entry.S + delete mode 100644 arch/blackfin/kernel/exception.c + delete mode 100644 arch/blackfin/kernel/fixed_code.S + delete mode 100644 arch/blackfin/kernel/flat.c + delete mode 100644 arch/blackfin/kernel/ftrace-entry.S + delete mode 100644 arch/blackfin/kernel/ftrace.c + delete mode 100644 arch/blackfin/kernel/gptimers.c + delete mode 100644 arch/blackfin/kernel/ipipe.c + delete mode 100644 arch/blackfin/kernel/irqchip.c + delete mode 100644 arch/blackfin/kernel/kgdb.c + delete mode 100644 arch/blackfin/kernel/kgdb_test.c + delete mode 100644 arch/blackfin/kernel/module.c + delete mode 100644 arch/blackfin/kernel/nmi.c + delete mode 100644 arch/blackfin/kernel/perf_event.c + delete mode 100644 arch/blackfin/kernel/process.c + delete mode 100644 arch/blackfin/kernel/pseudodbg.c + delete mode 100644 arch/blackfin/kernel/ptrace.c + delete mode 100644 arch/blackfin/kernel/reboot.c + delete mode 100644 arch/blackfin/kernel/setup.c + delete mode 100644 arch/blackfin/kernel/shadow_console.c + delete mode 100644 arch/blackfin/kernel/signal.c + delete mode 100644 arch/blackfin/kernel/stacktrace.c + delete mode 100644 arch/blackfin/kernel/sys_bfin.c + delete mode 100644 arch/blackfin/kernel/time-ts.c + delete mode 100644 arch/blackfin/kernel/time.c + delete mode 100644 arch/blackfin/kernel/trace.c + delete mode 100644 arch/blackfin/kernel/traps.c + delete mode 100644 arch/blackfin/kernel/vmlinux.lds.S + delete mode 100644 arch/blackfin/lib/Makefile + delete mode 100644 arch/blackfin/lib/ashldi3.c + delete mode 100644 arch/blackfin/lib/ashrdi3.c + delete mode 100644 arch/blackfin/lib/divsi3.S + delete mode 100644 arch/blackfin/lib/gcclib.h + delete mode 100644 arch/blackfin/lib/ins.S + delete mode 100644 arch/blackfin/lib/lshrdi3.c + delete mode 100644 arch/blackfin/lib/memchr.S + delete mode 100644 arch/blackfin/lib/memcmp.S + delete mode 100644 arch/blackfin/lib/memcpy.S + delete mode 100644 arch/blackfin/lib/memmove.S + delete mode 100644 arch/blackfin/lib/memset.S + delete mode 100644 arch/blackfin/lib/modsi3.S + delete mode 100644 arch/blackfin/lib/muldi3.S + delete mode 100644 arch/blackfin/lib/outs.S + delete mode 100644 arch/blackfin/lib/smulsi3_highpart.S + delete mode 100644 arch/blackfin/lib/strcmp.S + delete mode 100644 arch/blackfin/lib/strcpy.S + delete mode 100644 arch/blackfin/lib/strncmp.S + delete mode 100644 arch/blackfin/lib/strncpy.S + delete mode 100644 arch/blackfin/lib/udivsi3.S + delete mode 100644 arch/blackfin/lib/umodsi3.S + delete mode 100644 arch/blackfin/lib/umulsi3_highpart.S + delete mode 100644 arch/blackfin/mach-bf518/Kconfig + delete mode 100644 arch/blackfin/mach-bf518/Makefile + delete mode 100644 arch/blackfin/mach-bf518/boards/Kconfig + delete mode 100644 arch/blackfin/mach-bf518/boards/Makefile + delete mode 100644 arch/blackfin/mach-bf518/boards/ezbrd.c + delete mode 100644 arch/blackfin/mach-bf518/boards/tcm-bf518.c + delete mode 100644 arch/blackfin/mach-bf518/dma.c + delete mode 100644 arch/blackfin/mach-bf518/include/mach/anomaly.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/bf518.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/bfin_serial.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/blackfin.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/cdefBF512.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/cdefBF514.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/cdefBF516.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/cdefBF518.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/defBF512.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/defBF514.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/defBF516.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/defBF518.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/dma.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/gpio.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/irq.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/mem_map.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/pll.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/portmux.h + delete mode 100644 arch/blackfin/mach-bf518/ints-priority.c + delete mode 100644 arch/blackfin/mach-bf527/Kconfig + delete mode 100644 arch/blackfin/mach-bf527/Makefile + delete mode 100644 arch/blackfin/mach-bf527/boards/Kconfig + delete mode 100644 arch/blackfin/mach-bf527/boards/Makefile + delete mode 100644 arch/blackfin/mach-bf527/boards/ad7160eval.c + delete mode 100644 arch/blackfin/mach-bf527/boards/cm_bf527.c + delete mode 100644 arch/blackfin/mach-bf527/boards/ezbrd.c + delete mode 100644 arch/blackfin/mach-bf527/boards/ezkit.c + delete mode 100644 arch/blackfin/mach-bf527/boards/tll6527m.c + delete mode 100644 arch/blackfin/mach-bf527/dma.c + delete mode 100644 arch/blackfin/mach-bf527/include/mach/anomaly.h + delete mode 100644 arch/blackfin/mach-bf527/include/mach/bf527.h + delete mode 100644 arch/blackfin/mach-bf527/include/mach/bfin_serial.h + delete mode 100644 arch/blackfin/mach-bf527/include/mach/blackfin.h + delete mode 100644 arch/blackfin/mach-bf527/include/mach/cdefBF522.h + delete mode 100644 arch/blackfin/mach-bf527/include/mach/cdefBF525.h + delete mode 100644 arch/blackfin/mach-bf527/include/mach/cdefBF527.h + delete mode 100644 arch/blackfin/mach-bf527/include/mach/defBF522.h + delete mode 100644 arch/blackfin/mach-bf527/include/mach/defBF525.h + delete mode 100644 arch/blackfin/mach-bf527/include/mach/defBF527.h + delete mode 100644 arch/blackfin/mach-bf527/include/mach/dma.h + delete mode 100644 arch/blackfin/mach-bf527/include/mach/gpio.h + delete mode 100644 arch/blackfin/mach-bf527/include/mach/irq.h + delete mode 100644 arch/blackfin/mach-bf527/include/mach/mem_map.h + delete mode 100644 arch/blackfin/mach-bf527/include/mach/pll.h + delete mode 100644 arch/blackfin/mach-bf527/include/mach/portmux.h + delete mode 100644 arch/blackfin/mach-bf527/ints-priority.c + delete mode 100644 arch/blackfin/mach-bf533/Kconfig + delete mode 100644 arch/blackfin/mach-bf533/Makefile + delete mode 100644 arch/blackfin/mach-bf533/boards/H8606.c + delete mode 100644 arch/blackfin/mach-bf533/boards/Kconfig + delete mode 100644 arch/blackfin/mach-bf533/boards/Makefile + delete mode 100644 arch/blackfin/mach-bf533/boards/blackstamp.c + delete mode 100644 arch/blackfin/mach-bf533/boards/cm_bf533.c + delete mode 100644 arch/blackfin/mach-bf533/boards/ezkit.c + delete mode 100644 arch/blackfin/mach-bf533/boards/ip0x.c + delete mode 100644 arch/blackfin/mach-bf533/boards/stamp.c + delete mode 100644 arch/blackfin/mach-bf533/dma.c + delete mode 100644 arch/blackfin/mach-bf533/include/mach/anomaly.h + delete mode 100644 arch/blackfin/mach-bf533/include/mach/bf533.h + delete mode 100644 arch/blackfin/mach-bf533/include/mach/bfin_serial.h + delete mode 100644 arch/blackfin/mach-bf533/include/mach/blackfin.h + delete mode 100644 arch/blackfin/mach-bf533/include/mach/cdefBF532.h + delete mode 100644 arch/blackfin/mach-bf533/include/mach/defBF532.h + delete mode 100644 arch/blackfin/mach-bf533/include/mach/dma.h + delete mode 100644 arch/blackfin/mach-bf533/include/mach/gpio.h + delete mode 100644 arch/blackfin/mach-bf533/include/mach/irq.h + delete mode 100644 arch/blackfin/mach-bf533/include/mach/mem_map.h + delete mode 100644 arch/blackfin/mach-bf533/include/mach/pll.h + delete mode 100644 arch/blackfin/mach-bf533/include/mach/portmux.h + delete mode 100644 arch/blackfin/mach-bf533/ints-priority.c + delete mode 100644 arch/blackfin/mach-bf537/Kconfig + delete mode 100644 arch/blackfin/mach-bf537/Makefile + delete mode 100644 arch/blackfin/mach-bf537/boards/Kconfig + delete mode 100644 arch/blackfin/mach-bf537/boards/Makefile + delete mode 100644 arch/blackfin/mach-bf537/boards/cm_bf537e.c + delete mode 100644 arch/blackfin/mach-bf537/boards/cm_bf537u.c + delete mode 100644 arch/blackfin/mach-bf537/boards/dnp5370.c + delete mode 100644 arch/blackfin/mach-bf537/boards/minotaur.c + delete mode 100644 arch/blackfin/mach-bf537/boards/pnav10.c + delete mode 100644 arch/blackfin/mach-bf537/boards/stamp.c + delete mode 100644 arch/blackfin/mach-bf537/boards/tcm_bf537.c + delete mode 100644 arch/blackfin/mach-bf537/dma.c + delete mode 100644 arch/blackfin/mach-bf537/include/mach/anomaly.h + delete mode 100644 arch/blackfin/mach-bf537/include/mach/bf537.h + delete mode 100644 arch/blackfin/mach-bf537/include/mach/bfin_serial.h + delete mode 100644 arch/blackfin/mach-bf537/include/mach/blackfin.h + delete mode 100644 arch/blackfin/mach-bf537/include/mach/cdefBF534.h + delete mode 100644 arch/blackfin/mach-bf537/include/mach/cdefBF537.h + delete mode 100644 arch/blackfin/mach-bf537/include/mach/defBF534.h + delete mode 100644 arch/blackfin/mach-bf537/include/mach/defBF537.h + delete mode 100644 arch/blackfin/mach-bf537/include/mach/dma.h + delete mode 100644 arch/blackfin/mach-bf537/include/mach/gpio.h + delete mode 100644 arch/blackfin/mach-bf537/include/mach/irq.h + delete mode 100644 arch/blackfin/mach-bf537/include/mach/mem_map.h + delete mode 100644 arch/blackfin/mach-bf537/include/mach/pll.h + delete mode 100644 arch/blackfin/mach-bf537/include/mach/portmux.h + delete mode 100644 arch/blackfin/mach-bf537/ints-priority.c + delete mode 100644 arch/blackfin/mach-bf538/Kconfig + delete mode 100644 arch/blackfin/mach-bf538/Makefile + delete mode 100644 arch/blackfin/mach-bf538/boards/Kconfig + delete mode 100644 arch/blackfin/mach-bf538/boards/Makefile + delete mode 100644 arch/blackfin/mach-bf538/boards/ezkit.c + delete mode 100644 arch/blackfin/mach-bf538/dma.c + delete mode 100644 arch/blackfin/mach-bf538/ext-gpio.c + delete mode 100644 arch/blackfin/mach-bf538/include/mach/anomaly.h + delete mode 100644 arch/blackfin/mach-bf538/include/mach/bf538.h + delete mode 100644 arch/blackfin/mach-bf538/include/mach/bfin_serial.h + delete mode 100644 arch/blackfin/mach-bf538/include/mach/blackfin.h + delete mode 100644 arch/blackfin/mach-bf538/include/mach/cdefBF538.h + delete mode 100644 arch/blackfin/mach-bf538/include/mach/cdefBF539.h + delete mode 100644 arch/blackfin/mach-bf538/include/mach/defBF538.h + delete mode 100644 arch/blackfin/mach-bf538/include/mach/defBF539.h + delete mode 100644 arch/blackfin/mach-bf538/include/mach/dma.h + delete mode 100644 arch/blackfin/mach-bf538/include/mach/gpio.h + delete mode 100644 arch/blackfin/mach-bf538/include/mach/irq.h + delete mode 100644 arch/blackfin/mach-bf538/include/mach/mem_map.h + delete mode 100644 arch/blackfin/mach-bf538/include/mach/pll.h + delete mode 100644 arch/blackfin/mach-bf538/include/mach/portmux.h + delete mode 100644 arch/blackfin/mach-bf538/ints-priority.c + delete mode 100644 arch/blackfin/mach-bf548/Kconfig + delete mode 100644 arch/blackfin/mach-bf548/Makefile + delete mode 100644 arch/blackfin/mach-bf548/boards/Kconfig + delete mode 100644 arch/blackfin/mach-bf548/boards/Makefile + delete mode 100644 arch/blackfin/mach-bf548/boards/cm_bf548.c + delete mode 100644 arch/blackfin/mach-bf548/boards/ezkit.c + delete mode 100644 arch/blackfin/mach-bf548/dma.c + delete mode 100644 arch/blackfin/mach-bf548/include/mach/anomaly.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/bf548.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/bf54x-lq043.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/bf54x_keys.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/bfin_serial.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/blackfin.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/cdefBF542.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/cdefBF544.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/cdefBF547.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/cdefBF548.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/cdefBF549.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/defBF542.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/defBF544.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/defBF547.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/defBF548.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/defBF549.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/defBF54x_base.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/dma.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/gpio.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/irq.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/mem_map.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/pll.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/portmux.h + delete mode 100644 arch/blackfin/mach-bf548/ints-priority.c + delete mode 100644 arch/blackfin/mach-bf561/Kconfig + delete mode 100644 arch/blackfin/mach-bf561/Makefile + delete mode 100644 arch/blackfin/mach-bf561/atomic.S + delete mode 100644 arch/blackfin/mach-bf561/boards/Kconfig + delete mode 100644 arch/blackfin/mach-bf561/boards/Makefile + delete mode 100644 arch/blackfin/mach-bf561/boards/acvilon.c + delete mode 100644 arch/blackfin/mach-bf561/boards/cm_bf561.c + delete mode 100644 arch/blackfin/mach-bf561/boards/ezkit.c + delete mode 100644 arch/blackfin/mach-bf561/boards/tepla.c + delete mode 100644 arch/blackfin/mach-bf561/coreb.c + delete mode 100644 arch/blackfin/mach-bf561/dma.c + delete mode 100644 arch/blackfin/mach-bf561/hotplug.c + delete mode 100644 arch/blackfin/mach-bf561/include/mach/anomaly.h + delete mode 100644 arch/blackfin/mach-bf561/include/mach/bf561.h + delete mode 100644 arch/blackfin/mach-bf561/include/mach/bfin_serial.h + delete mode 100644 arch/blackfin/mach-bf561/include/mach/blackfin.h + delete mode 100644 arch/blackfin/mach-bf561/include/mach/cdefBF561.h + delete mode 100644 arch/blackfin/mach-bf561/include/mach/defBF561.h + delete mode 100644 arch/blackfin/mach-bf561/include/mach/dma.h + delete mode 100644 arch/blackfin/mach-bf561/include/mach/gpio.h + delete mode 100644 arch/blackfin/mach-bf561/include/mach/irq.h + delete mode 100644 arch/blackfin/mach-bf561/include/mach/mem_map.h + delete mode 100644 arch/blackfin/mach-bf561/include/mach/pll.h + delete mode 100644 arch/blackfin/mach-bf561/include/mach/portmux.h + delete mode 100644 arch/blackfin/mach-bf561/include/mach/smp.h + delete mode 100644 arch/blackfin/mach-bf561/ints-priority.c + delete mode 100644 arch/blackfin/mach-bf561/secondary.S + delete mode 100644 arch/blackfin/mach-bf561/smp.c + delete mode 100644 arch/blackfin/mach-bf609/Kconfig + delete mode 100644 arch/blackfin/mach-bf609/Makefile + delete mode 100644 arch/blackfin/mach-bf609/boards/Kconfig + delete mode 100644 arch/blackfin/mach-bf609/boards/Makefile + delete mode 100644 arch/blackfin/mach-bf609/boards/ezkit.c + delete mode 100644 arch/blackfin/mach-bf609/clock.c + delete mode 100644 arch/blackfin/mach-bf609/dma.c + delete mode 100644 arch/blackfin/mach-bf609/dpm.S + delete mode 100644 arch/blackfin/mach-bf609/include/mach/anomaly.h + delete mode 100644 arch/blackfin/mach-bf609/include/mach/bf609.h + delete mode 100644 arch/blackfin/mach-bf609/include/mach/bfin_serial.h + delete mode 100644 arch/blackfin/mach-bf609/include/mach/blackfin.h + delete mode 100644 arch/blackfin/mach-bf609/include/mach/cdefBF609.h + delete mode 100644 arch/blackfin/mach-bf609/include/mach/cdefBF60x_base.h + delete mode 100644 arch/blackfin/mach-bf609/include/mach/defBF609.h + delete mode 100644 arch/blackfin/mach-bf609/include/mach/defBF60x_base.h + delete mode 100644 arch/blackfin/mach-bf609/include/mach/dma.h + delete mode 100644 arch/blackfin/mach-bf609/include/mach/gpio.h + delete mode 100644 arch/blackfin/mach-bf609/include/mach/irq.h + delete mode 100644 arch/blackfin/mach-bf609/include/mach/mem_map.h + delete mode 100644 arch/blackfin/mach-bf609/include/mach/pll.h + delete mode 100644 arch/blackfin/mach-bf609/include/mach/pm.h + delete mode 100644 arch/blackfin/mach-bf609/include/mach/portmux.h + delete mode 100644 arch/blackfin/mach-bf609/ints-priority.c + delete mode 100644 arch/blackfin/mach-bf609/pm.c + delete mode 100644 arch/blackfin/mach-bf609/scb.c + delete mode 100644 arch/blackfin/mach-common/Makefile + delete mode 100644 arch/blackfin/mach-common/arch_checks.c + delete mode 100644 arch/blackfin/mach-common/cache-c.c + delete mode 100644 arch/blackfin/mach-common/cache.S + delete mode 100644 arch/blackfin/mach-common/clock.h + delete mode 100644 arch/blackfin/mach-common/clocks-init.c + delete mode 100644 arch/blackfin/mach-common/dpmc.c + delete mode 100644 arch/blackfin/mach-common/dpmc_modes.S + delete mode 100644 arch/blackfin/mach-common/entry.S + delete mode 100644 arch/blackfin/mach-common/head.S + delete mode 100644 arch/blackfin/mach-common/interrupt.S + delete mode 100644 arch/blackfin/mach-common/ints-priority.c + delete mode 100644 arch/blackfin/mach-common/pm.c + delete mode 100644 arch/blackfin/mach-common/scb-init.c + delete mode 100644 arch/blackfin/mach-common/smp.c + delete mode 100644 arch/blackfin/mm/Makefile + delete mode 100644 arch/blackfin/mm/blackfin_sram.h + delete mode 100644 arch/blackfin/mm/init.c + delete mode 100644 arch/blackfin/mm/isram-driver.c + delete mode 100644 arch/blackfin/mm/maccess.c + delete mode 100644 arch/blackfin/mm/sram-alloc.c + delete mode 100644 arch/blackfin/oprofile/Makefile + delete mode 100644 arch/blackfin/oprofile/bfin_oprofile.c + delete mode 100644 arch/cris/Kconfig + delete mode 100644 arch/cris/Kconfig.debug + delete mode 100644 arch/cris/Makefile + delete mode 100644 arch/cris/arch-v10/Kconfig + delete mode 100644 arch/cris/arch-v10/README.mm + delete mode 100644 arch/cris/arch-v10/drivers/Kconfig + delete mode 100644 arch/cris/arch-v10/drivers/Makefile + delete mode 100644 arch/cris/arch-v10/drivers/axisflashmap.c + delete mode 100644 arch/cris/arch-v10/drivers/eeprom.c + delete mode 100644 arch/cris/arch-v10/drivers/gpio.c + delete mode 100644 arch/cris/arch-v10/drivers/i2c.c + delete mode 100644 arch/cris/arch-v10/drivers/i2c.h + delete mode 100644 arch/cris/arch-v10/drivers/sync_serial.c + delete mode 100644 arch/cris/arch-v10/kernel/Makefile + delete mode 100644 arch/cris/arch-v10/kernel/crisksyms.c + delete mode 100644 arch/cris/arch-v10/kernel/debugport.c + delete mode 100644 arch/cris/arch-v10/kernel/dma.c + delete mode 100644 arch/cris/arch-v10/kernel/entry.S + delete mode 100644 arch/cris/arch-v10/kernel/fasttimer.c + delete mode 100644 arch/cris/arch-v10/kernel/head.S + delete mode 100644 arch/cris/arch-v10/kernel/io_interface_mux.c + delete mode 100644 arch/cris/arch-v10/kernel/irq.c + delete mode 100644 arch/cris/arch-v10/kernel/kgdb.c + delete mode 100644 arch/cris/arch-v10/kernel/process.c + delete mode 100644 arch/cris/arch-v10/kernel/ptrace.c + delete mode 100644 arch/cris/arch-v10/kernel/setup.c + delete mode 100644 arch/cris/arch-v10/kernel/shadows.c + delete mode 100644 arch/cris/arch-v10/kernel/signal.c + delete mode 100644 arch/cris/arch-v10/kernel/time.c + delete mode 100644 arch/cris/arch-v10/kernel/traps.c + delete mode 100644 arch/cris/arch-v10/lib/Makefile + delete mode 100644 arch/cris/arch-v10/lib/checksum.S + delete mode 100644 arch/cris/arch-v10/lib/checksumcopy.S + delete mode 100644 arch/cris/arch-v10/lib/csumcpfruser.S + delete mode 100644 arch/cris/arch-v10/lib/dram_init.S + delete mode 100644 arch/cris/arch-v10/lib/hw_settings.S + delete mode 100644 arch/cris/arch-v10/lib/memset.c + delete mode 100644 arch/cris/arch-v10/lib/string.c + delete mode 100644 arch/cris/arch-v10/lib/usercopy.c + delete mode 100644 arch/cris/arch-v10/mm/Makefile + delete mode 100644 arch/cris/arch-v10/mm/fault.c + delete mode 100644 arch/cris/arch-v10/mm/init.c + delete mode 100644 arch/cris/arch-v10/mm/tlb.c + delete mode 100644 arch/cris/arch-v10/output_arch.ld + delete mode 100644 arch/cris/arch-v32/Kconfig + delete mode 100644 arch/cris/arch-v32/drivers/Kconfig + delete mode 100644 arch/cris/arch-v32/drivers/Makefile + delete mode 100644 arch/cris/arch-v32/drivers/axisflashmap.c + delete mode 100644 arch/cris/arch-v32/drivers/cryptocop.c + delete mode 100644 arch/cris/arch-v32/drivers/iop_fw_load.c + delete mode 100644 arch/cris/arch-v32/drivers/mach-a3/Makefile + delete mode 100644 arch/cris/arch-v32/drivers/mach-a3/nandflash.c + delete mode 100644 arch/cris/arch-v32/drivers/mach-fs/Makefile + delete mode 100644 arch/cris/arch-v32/drivers/mach-fs/nandflash.c + delete mode 100644 arch/cris/arch-v32/drivers/pci/Makefile + delete mode 100644 arch/cris/arch-v32/drivers/pci/bios.c + delete mode 100644 arch/cris/arch-v32/drivers/sync_serial.c + delete mode 100644 arch/cris/arch-v32/kernel/Makefile + delete mode 100644 arch/cris/arch-v32/kernel/cache.c + delete mode 100644 arch/cris/arch-v32/kernel/cacheflush.S + delete mode 100644 arch/cris/arch-v32/kernel/crisksyms.c + delete mode 100644 arch/cris/arch-v32/kernel/debugport.c + delete mode 100644 arch/cris/arch-v32/kernel/entry.S + delete mode 100644 arch/cris/arch-v32/kernel/fasttimer.c + delete mode 100644 arch/cris/arch-v32/kernel/head.S + delete mode 100644 arch/cris/arch-v32/kernel/irq.c + delete mode 100644 arch/cris/arch-v32/kernel/kgdb.c + delete mode 100644 arch/cris/arch-v32/kernel/kgdb_asm.S + delete mode 100644 arch/cris/arch-v32/kernel/process.c + delete mode 100644 arch/cris/arch-v32/kernel/ptrace.c + delete mode 100644 arch/cris/arch-v32/kernel/setup.c + delete mode 100644 arch/cris/arch-v32/kernel/signal.c + delete mode 100644 arch/cris/arch-v32/kernel/time.c + delete mode 100644 arch/cris/arch-v32/kernel/traps.c + delete mode 100644 arch/cris/arch-v32/lib/Makefile + delete mode 100644 arch/cris/arch-v32/lib/checksum.S + delete mode 100644 arch/cris/arch-v32/lib/checksumcopy.S + delete mode 100644 arch/cris/arch-v32/lib/csumcpfruser.S + delete mode 100644 arch/cris/arch-v32/lib/delay.c + delete mode 100644 arch/cris/arch-v32/lib/memset.c + delete mode 100644 arch/cris/arch-v32/lib/strcmp.S + delete mode 100644 arch/cris/arch-v32/lib/string.c + delete mode 100644 arch/cris/arch-v32/lib/usercopy.c + delete mode 100644 arch/cris/arch-v32/mach-a3/Kconfig + delete mode 100644 arch/cris/arch-v32/mach-a3/Makefile + delete mode 100644 arch/cris/arch-v32/mach-a3/arbiter.c + delete mode 100644 arch/cris/arch-v32/mach-a3/dma.c + delete mode 100644 arch/cris/arch-v32/mach-a3/dram_init.S + delete mode 100644 arch/cris/arch-v32/mach-a3/hw_settings.S + delete mode 100644 arch/cris/arch-v32/mach-a3/pinmux.c + delete mode 100644 arch/cris/arch-v32/mach-fs/Kconfig + delete mode 100644 arch/cris/arch-v32/mach-fs/Makefile + delete mode 100644 arch/cris/arch-v32/mach-fs/arbiter.c + delete mode 100644 arch/cris/arch-v32/mach-fs/dma.c + delete mode 100644 arch/cris/arch-v32/mach-fs/dram_init.S + delete mode 100644 arch/cris/arch-v32/mach-fs/hw_settings.S + delete mode 100644 arch/cris/arch-v32/mach-fs/pinmux.c + delete mode 100644 arch/cris/arch-v32/mm/Makefile + delete mode 100644 arch/cris/arch-v32/mm/init.c + delete mode 100644 arch/cris/arch-v32/mm/intmem.c + delete mode 100644 arch/cris/arch-v32/mm/l2cache.c + delete mode 100644 arch/cris/arch-v32/mm/mmu.S + delete mode 100644 arch/cris/arch-v32/mm/tlb.c + delete mode 100644 arch/cris/arch-v32/output_arch.ld + delete mode 100644 arch/cris/boot/.gitignore + delete mode 100644 arch/cris/boot/Makefile + delete mode 100644 arch/cris/boot/compressed/Makefile + delete mode 100644 arch/cris/boot/compressed/README + delete mode 100644 arch/cris/boot/compressed/decompress_v10.lds + delete mode 100644 arch/cris/boot/compressed/decompress_v32.lds + delete mode 100644 arch/cris/boot/compressed/head_v10.S + delete mode 100644 arch/cris/boot/compressed/head_v32.S + delete mode 100644 arch/cris/boot/compressed/misc.c + delete mode 100644 arch/cris/boot/dts/Makefile + delete mode 100644 arch/cris/boot/dts/artpec3.dtsi + delete mode 100644 arch/cris/boot/dts/dev88.dts + delete mode 100644 arch/cris/boot/dts/etraxfs.dtsi + delete mode 100644 arch/cris/boot/dts/p1343.dts + delete mode 100644 arch/cris/boot/rescue/Makefile + delete mode 100644 arch/cris/boot/rescue/head_v10.S + delete mode 100644 arch/cris/boot/rescue/head_v32.S + delete mode 100644 arch/cris/boot/rescue/kimagerescue.S + delete mode 100644 arch/cris/boot/rescue/rescue_v10.lds + delete mode 100644 arch/cris/boot/rescue/rescue_v32.lds + delete mode 100644 arch/cris/boot/rescue/testrescue.S + delete mode 100644 arch/cris/boot/tools/build.c + delete mode 100644 arch/cris/configs/artpec_3_defconfig + delete mode 100644 arch/cris/configs/dev88_defconfig + delete mode 100644 arch/cris/configs/etrax-100lx_defconfig + delete mode 100644 arch/cris/configs/etrax-100lx_v2_defconfig + delete mode 100644 arch/cris/configs/etraxfs_defconfig + delete mode 100644 arch/cris/include/arch-v10/arch/bitops.h + delete mode 100644 arch/cris/include/arch-v10/arch/bug.h + delete mode 100644 arch/cris/include/arch-v10/arch/cache.h + delete mode 100644 arch/cris/include/arch-v10/arch/checksum.h + delete mode 100644 arch/cris/include/arch-v10/arch/delay.h + delete mode 100644 arch/cris/include/arch-v10/arch/dma.h + delete mode 100644 arch/cris/include/arch-v10/arch/io.h + delete mode 100644 arch/cris/include/arch-v10/arch/io_interface_mux.h + delete mode 100644 arch/cris/include/arch-v10/arch/irq.h + delete mode 100644 arch/cris/include/arch-v10/arch/irqflags.h + delete mode 100644 arch/cris/include/arch-v10/arch/memmap.h + delete mode 100644 arch/cris/include/arch-v10/arch/mmu.h + delete mode 100644 arch/cris/include/arch-v10/arch/offset.h + delete mode 100644 arch/cris/include/arch-v10/arch/page.h + delete mode 100644 arch/cris/include/arch-v10/arch/pgtable.h + delete mode 100644 arch/cris/include/arch-v10/arch/processor.h + delete mode 100644 arch/cris/include/arch-v10/arch/swab.h + delete mode 100644 arch/cris/include/arch-v10/arch/system.h + delete mode 100644 arch/cris/include/arch-v10/arch/thread_info.h + delete mode 100644 arch/cris/include/arch-v10/arch/timex.h + delete mode 100644 arch/cris/include/arch-v10/arch/tlb.h + delete mode 100644 arch/cris/include/arch-v10/arch/uaccess.h + delete mode 100644 arch/cris/include/arch-v10/arch/unistd.h + delete mode 100644 arch/cris/include/arch-v32/arch/bitops.h + delete mode 100644 arch/cris/include/arch-v32/arch/bug.h + delete mode 100644 arch/cris/include/arch-v32/arch/cache.h + delete mode 100644 arch/cris/include/arch-v32/arch/checksum.h + delete mode 100644 arch/cris/include/arch-v32/arch/cryptocop.h + delete mode 100644 arch/cris/include/arch-v32/arch/delay.h + delete mode 100644 arch/cris/include/arch-v32/arch/dma.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/Makefile + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/ata_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/bif_core_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/bif_dma_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/bif_slave_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/config_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/cpu_vect.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/cris_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/cris_supp_reg.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/dma_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/eth_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/gio_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/irq_nmi_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/marb_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/mmu_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/mmu_supp_reg.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/rt_trace_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/ser_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/sser_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/strcop_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/strmux_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/asm/timer_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/ata_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/bif_core_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/bif_dma_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/bif_slave_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/config_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/cpu_vect.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/dma.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/dma_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/eth_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/extmem_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/Makefile + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_crc_par_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_in_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_out_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_mpu_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_reg_space_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_in_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_out_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_in_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_out_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_spu_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cfg_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cpu_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_mpu_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_spu_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_timer_grp_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_trigger_grp_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_version_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_crc_par_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_in_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_out_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_extra_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_extra_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_macros.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_reg_space.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_in_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_out_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_in_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_out_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_spu_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cfg_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cpu_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_mpu_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_spu_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_timer_grp_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_trigger_grp_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/iop/iop_version_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/irq_nmi_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/marb_bp_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/marb_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/reg_rdwr.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/rt_trace_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/ser_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/sser_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/strcop.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/strcop_defs.h + delete mode 100644 arch/cris/include/arch-v32/arch/hwregs/supp_reg.h + delete mode 100644 arch/cris/include/arch-v32/arch/intmem.h + delete mode 100644 arch/cris/include/arch-v32/arch/irq.h + delete mode 100644 arch/cris/include/arch-v32/arch/irqflags.h + delete mode 100644 arch/cris/include/arch-v32/arch/memmap.h + delete mode 100644 arch/cris/include/arch-v32/arch/mmu.h + delete mode 100644 arch/cris/include/arch-v32/arch/offset.h + delete mode 100644 arch/cris/include/arch-v32/arch/page.h + delete mode 100644 arch/cris/include/arch-v32/arch/pgtable.h + delete mode 100644 arch/cris/include/arch-v32/arch/processor.h + delete mode 100644 arch/cris/include/arch-v32/arch/swab.h + delete mode 100644 arch/cris/include/arch-v32/arch/system.h + delete mode 100644 arch/cris/include/arch-v32/arch/thread_info.h + delete mode 100644 arch/cris/include/arch-v32/arch/timex.h + delete mode 100644 arch/cris/include/arch-v32/arch/tlb.h + delete mode 100644 arch/cris/include/arch-v32/arch/uaccess.h + delete mode 100644 arch/cris/include/arch-v32/arch/unistd.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/arbiter.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/dma.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/clkgen_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/ddr2_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/gio_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pinmux_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pio_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/reg_map_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/timer_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/clkgen_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/ddr2_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/gio_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_reg_space_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_in_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_out_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cfg_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cpu_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_mpu_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_spu_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_version_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_reg_space.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_in_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_out_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cfg_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cpu_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_mpu_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_spu_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_version_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/l2cache_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_bar_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_foo_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/pinmux_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/pio_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/reg_map.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/strmux_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/hwregs/timer_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/memmap.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/pinmux.h + delete mode 100644 arch/cris/include/arch-v32/mach-a3/mach/startup.inc + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/arbiter.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/dma.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/bif_core_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/config_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/gio_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/pinmux_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/reg_map_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/timer_defs_asm.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_core_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_dma_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_slave_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/hwregs/config_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/hwregs/gio_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_bp_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/hwregs/pinmux_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/hwregs/reg_map.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/hwregs/strmux_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/hwregs/timer_defs.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/memmap.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/pinmux.h + delete mode 100644 arch/cris/include/arch-v32/mach-fs/mach/startup.inc + delete mode 100644 arch/cris/include/asm/Kbuild + delete mode 100644 arch/cris/include/asm/asm-offsets.h + delete mode 100644 arch/cris/include/asm/axisflashmap.h + delete mode 100644 arch/cris/include/asm/bitops.h + delete mode 100644 arch/cris/include/asm/bug.h + delete mode 100644 arch/cris/include/asm/bugs.h + delete mode 100644 arch/cris/include/asm/cache.h + delete mode 100644 arch/cris/include/asm/cacheflush.h + delete mode 100644 arch/cris/include/asm/checksum.h + delete mode 100644 arch/cris/include/asm/delay.h + delete mode 100644 arch/cris/include/asm/dma.h + delete mode 100644 arch/cris/include/asm/eshlibld.h + delete mode 100644 arch/cris/include/asm/etraxi2c.h + delete mode 100644 arch/cris/include/asm/fasttimer.h + delete mode 100644 arch/cris/include/asm/fb.h + delete mode 100644 arch/cris/include/asm/ftrace.h + delete mode 100644 arch/cris/include/asm/hw_irq.h + delete mode 100644 arch/cris/include/asm/io.h + delete mode 100644 arch/cris/include/asm/irq.h + delete mode 100644 arch/cris/include/asm/irqflags.h + delete mode 100644 arch/cris/include/asm/mmu.h + delete mode 100644 arch/cris/include/asm/mmu_context.h + delete mode 100644 arch/cris/include/asm/page.h + delete mode 100644 arch/cris/include/asm/pci.h + delete mode 100644 arch/cris/include/asm/pgalloc.h + delete mode 100644 arch/cris/include/asm/pgtable.h + delete mode 100644 arch/cris/include/asm/processor.h + delete mode 100644 arch/cris/include/asm/ptrace.h + delete mode 100644 arch/cris/include/asm/segment.h + delete mode 100644 arch/cris/include/asm/serial.h + delete mode 100644 arch/cris/include/asm/shmparam.h + delete mode 100644 arch/cris/include/asm/signal.h + delete mode 100644 arch/cris/include/asm/stacktrace.h + delete mode 100644 arch/cris/include/asm/string.h + delete mode 100644 arch/cris/include/asm/swab.h + delete mode 100644 arch/cris/include/asm/switch_to.h + delete mode 100644 arch/cris/include/asm/termios.h + delete mode 100644 arch/cris/include/asm/thread_info.h + delete mode 100644 arch/cris/include/asm/timex.h + delete mode 100644 arch/cris/include/asm/tlb.h + delete mode 100644 arch/cris/include/asm/tlbflush.h + delete mode 100644 arch/cris/include/asm/uaccess.h + delete mode 100644 arch/cris/include/asm/ucontext.h + delete mode 100644 arch/cris/include/asm/unaligned.h + delete mode 100644 arch/cris/include/asm/unistd.h + delete mode 100644 arch/cris/include/asm/user.h + delete mode 100644 arch/cris/include/uapi/arch-v10/arch/sv_addr.agh + delete mode 100644 arch/cris/include/uapi/arch-v10/arch/sv_addr_ag.h + delete mode 100644 arch/cris/include/uapi/arch-v10/arch/svinto.h + delete mode 100644 arch/cris/include/uapi/arch-v10/arch/user.h + delete mode 100644 arch/cris/include/uapi/arch-v32/arch/cryptocop.h + delete mode 100644 arch/cris/include/uapi/arch-v32/arch/user.h + delete mode 100644 arch/cris/include/uapi/asm/Kbuild + delete mode 100644 arch/cris/include/uapi/asm/byteorder.h + delete mode 100644 arch/cris/include/uapi/asm/elf.h + delete mode 100644 arch/cris/include/uapi/asm/elf_v10.h + delete mode 100644 arch/cris/include/uapi/asm/elf_v32.h + delete mode 100644 arch/cris/include/uapi/asm/ethernet.h + delete mode 100644 arch/cris/include/uapi/asm/etraxgpio.h + delete mode 100644 arch/cris/include/uapi/asm/ioctls.h + delete mode 100644 arch/cris/include/uapi/asm/param.h + delete mode 100644 arch/cris/include/uapi/asm/posix_types.h + delete mode 100644 arch/cris/include/uapi/asm/ptrace.h + delete mode 100644 arch/cris/include/uapi/asm/ptrace_v10.h + delete mode 100644 arch/cris/include/uapi/asm/ptrace_v32.h + delete mode 100644 arch/cris/include/uapi/asm/rs485.h + delete mode 100644 arch/cris/include/uapi/asm/setup.h + delete mode 100644 arch/cris/include/uapi/asm/sigcontext.h + delete mode 100644 arch/cris/include/uapi/asm/signal.h + delete mode 100644 arch/cris/include/uapi/asm/stat.h + delete mode 100644 arch/cris/include/uapi/asm/swab.h + delete mode 100644 arch/cris/include/uapi/asm/sync_serial.h + delete mode 100644 arch/cris/include/uapi/asm/termbits.h + delete mode 100644 arch/cris/include/uapi/asm/termios.h + delete mode 100644 arch/cris/include/uapi/asm/unistd.h + delete mode 100644 arch/cris/kernel/Makefile + delete mode 100644 arch/cris/kernel/asm-offsets.c + delete mode 100644 arch/cris/kernel/crisksyms.c + delete mode 100644 arch/cris/kernel/irq.c + delete mode 100644 arch/cris/kernel/module.c + delete mode 100644 arch/cris/kernel/process.c + delete mode 100644 arch/cris/kernel/profile.c + delete mode 100644 arch/cris/kernel/ptrace.c + delete mode 100644 arch/cris/kernel/setup.c + delete mode 100644 arch/cris/kernel/stacktrace.c + delete mode 100644 arch/cris/kernel/sys_cris.c + delete mode 100644 arch/cris/kernel/time.c + delete mode 100644 arch/cris/kernel/traps.c + delete mode 100644 arch/cris/kernel/vmlinux.lds.S + delete mode 100644 arch/cris/mm/Makefile + delete mode 100644 arch/cris/mm/fault.c + delete mode 100644 arch/cris/mm/init.c + delete mode 100644 arch/cris/mm/ioremap.c + delete mode 100644 arch/cris/mm/tlb.c + delete mode 100644 arch/frv/Kconfig + delete mode 100644 arch/frv/Kconfig.debug + delete mode 100644 arch/frv/Makefile + delete mode 100644 arch/frv/boot/Makefile + delete mode 100644 arch/frv/defconfig + delete mode 100644 arch/frv/include/asm/Kbuild + delete mode 100644 arch/frv/include/asm/asm-offsets.h + delete mode 100644 arch/frv/include/asm/atomic.h + delete mode 100644 arch/frv/include/asm/atomic_defs.h + delete mode 100644 arch/frv/include/asm/ax88796.h + delete mode 100644 arch/frv/include/asm/barrier.h + delete mode 100644 arch/frv/include/asm/bitops.h + delete mode 100644 arch/frv/include/asm/bug.h + delete mode 100644 arch/frv/include/asm/bugs.h + delete mode 100644 arch/frv/include/asm/busctl-regs.h + delete mode 100644 arch/frv/include/asm/cache.h + delete mode 100644 arch/frv/include/asm/cacheflush.h + delete mode 100644 arch/frv/include/asm/checksum.h + delete mode 100644 arch/frv/include/asm/cmpxchg.h + delete mode 100644 arch/frv/include/asm/cpu-irqs.h + delete mode 100644 arch/frv/include/asm/current.h + delete mode 100644 arch/frv/include/asm/delay.h + delete mode 100644 arch/frv/include/asm/div64.h + delete mode 100644 arch/frv/include/asm/dm9000.h + delete mode 100644 arch/frv/include/asm/dma-mapping.h + delete mode 100644 arch/frv/include/asm/dma.h + delete mode 100644 arch/frv/include/asm/elf.h + delete mode 100644 arch/frv/include/asm/emergency-restart.h + delete mode 100644 arch/frv/include/asm/fpu.h + delete mode 100644 arch/frv/include/asm/ftrace.h + delete mode 100644 arch/frv/include/asm/futex.h + delete mode 100644 arch/frv/include/asm/gdb-stub.h + delete mode 100644 arch/frv/include/asm/gpio-regs.h + delete mode 100644 arch/frv/include/asm/hardirq.h + delete mode 100644 arch/frv/include/asm/highmem.h + delete mode 100644 arch/frv/include/asm/hw_irq.h + delete mode 100644 arch/frv/include/asm/io.h + delete mode 100644 arch/frv/include/asm/irc-regs.h + delete mode 100644 arch/frv/include/asm/irq.h + delete mode 100644 arch/frv/include/asm/irq_regs.h + delete mode 100644 arch/frv/include/asm/irqflags.h + delete mode 100644 arch/frv/include/asm/kdebug.h + delete mode 100644 arch/frv/include/asm/kmap_types.h + delete mode 100644 arch/frv/include/asm/linkage.h + delete mode 100644 arch/frv/include/asm/local.h + delete mode 100644 arch/frv/include/asm/local64.h + delete mode 100644 arch/frv/include/asm/math-emu.h + delete mode 100644 arch/frv/include/asm/mb-regs.h + delete mode 100644 arch/frv/include/asm/mb86943a.h + delete mode 100644 arch/frv/include/asm/mb93091-fpga-irqs.h + delete mode 100644 arch/frv/include/asm/mb93093-fpga-irqs.h + delete mode 100644 arch/frv/include/asm/mb93493-irqs.h + delete mode 100644 arch/frv/include/asm/mb93493-regs.h + delete mode 100644 arch/frv/include/asm/mem-layout.h + delete mode 100644 arch/frv/include/asm/mmu.h + delete mode 100644 arch/frv/include/asm/mmu_context.h + delete mode 100644 arch/frv/include/asm/module.h + delete mode 100644 arch/frv/include/asm/page.h + delete mode 100644 arch/frv/include/asm/pci.h + delete mode 100644 arch/frv/include/asm/percpu.h + delete mode 100644 arch/frv/include/asm/perf_event.h + delete mode 100644 arch/frv/include/asm/pgalloc.h + delete mode 100644 arch/frv/include/asm/pgtable.h + delete mode 100644 arch/frv/include/asm/processor.h + delete mode 100644 arch/frv/include/asm/ptrace.h + delete mode 100644 arch/frv/include/asm/sections.h + delete mode 100644 arch/frv/include/asm/segment.h + delete mode 100644 arch/frv/include/asm/serial-regs.h + delete mode 100644 arch/frv/include/asm/serial.h + delete mode 100644 arch/frv/include/asm/setup.h + delete mode 100644 arch/frv/include/asm/shmparam.h + delete mode 100644 arch/frv/include/asm/signal.h + delete mode 100644 arch/frv/include/asm/smp.h + delete mode 100644 arch/frv/include/asm/spinlock.h + delete mode 100644 arch/frv/include/asm/spr-regs.h + delete mode 100644 arch/frv/include/asm/string.h + delete mode 100644 arch/frv/include/asm/switch_to.h + delete mode 100644 arch/frv/include/asm/syscall.h + delete mode 100644 arch/frv/include/asm/termios.h + delete mode 100644 arch/frv/include/asm/thread_info.h + delete mode 100644 arch/frv/include/asm/timer-regs.h + delete mode 100644 arch/frv/include/asm/timex.h + delete mode 100644 arch/frv/include/asm/tlb.h + delete mode 100644 arch/frv/include/asm/tlbflush.h + delete mode 100644 arch/frv/include/asm/topology.h + delete mode 100644 arch/frv/include/asm/types.h + delete mode 100644 arch/frv/include/asm/uaccess.h + delete mode 100644 arch/frv/include/asm/ucontext.h + delete mode 100644 arch/frv/include/asm/unaligned.h + delete mode 100644 arch/frv/include/asm/unistd.h + delete mode 100644 arch/frv/include/asm/user.h + delete mode 100644 arch/frv/include/asm/vga.h + delete mode 100644 arch/frv/include/asm/virtconvert.h + delete mode 100644 arch/frv/include/asm/xor.h + delete mode 100644 arch/frv/include/uapi/asm/Kbuild + delete mode 100644 arch/frv/include/uapi/asm/auxvec.h + delete mode 100644 arch/frv/include/uapi/asm/bitsperlong.h + delete mode 100644 arch/frv/include/uapi/asm/byteorder.h + delete mode 100644 arch/frv/include/uapi/asm/errno.h + delete mode 100644 arch/frv/include/uapi/asm/fcntl.h + delete mode 100644 arch/frv/include/uapi/asm/ioctl.h + delete mode 100644 arch/frv/include/uapi/asm/ioctls.h + delete mode 100644 arch/frv/include/uapi/asm/ipcbuf.h + delete mode 100644 arch/frv/include/uapi/asm/kvm_para.h + delete mode 100644 arch/frv/include/uapi/asm/mman.h + delete mode 100644 arch/frv/include/uapi/asm/msgbuf.h + delete mode 100644 arch/frv/include/uapi/asm/param.h + delete mode 100644 arch/frv/include/uapi/asm/poll.h + delete mode 100644 arch/frv/include/uapi/asm/posix_types.h + delete mode 100644 arch/frv/include/uapi/asm/ptrace.h + delete mode 100644 arch/frv/include/uapi/asm/registers.h + delete mode 100644 arch/frv/include/uapi/asm/resource.h + delete mode 100644 arch/frv/include/uapi/asm/sembuf.h + delete mode 100644 arch/frv/include/uapi/asm/setup.h + delete mode 100644 arch/frv/include/uapi/asm/shmbuf.h + delete mode 100644 arch/frv/include/uapi/asm/sigcontext.h + delete mode 100644 arch/frv/include/uapi/asm/signal.h + delete mode 100644 arch/frv/include/uapi/asm/socket.h + delete mode 100644 arch/frv/include/uapi/asm/sockios.h + delete mode 100644 arch/frv/include/uapi/asm/stat.h + delete mode 100644 arch/frv/include/uapi/asm/statfs.h + delete mode 100644 arch/frv/include/uapi/asm/swab.h + delete mode 100644 arch/frv/include/uapi/asm/termbits.h + delete mode 100644 arch/frv/include/uapi/asm/termios.h + delete mode 100644 arch/frv/include/uapi/asm/types.h + delete mode 100644 arch/frv/include/uapi/asm/unistd.h + delete mode 100644 arch/frv/kernel/.gitignore + delete mode 100644 arch/frv/kernel/Makefile + delete mode 100644 arch/frv/kernel/asm-offsets.c + delete mode 100644 arch/frv/kernel/break.S + delete mode 100644 arch/frv/kernel/cmode.S + delete mode 100644 arch/frv/kernel/debug-stub.c + delete mode 100644 arch/frv/kernel/dma.c + delete mode 100644 arch/frv/kernel/entry-table.S + delete mode 100644 arch/frv/kernel/entry.S + delete mode 100644 arch/frv/kernel/frv_ksyms.c + delete mode 100644 arch/frv/kernel/futex.c + delete mode 100644 arch/frv/kernel/gdb-io.c + delete mode 100644 arch/frv/kernel/gdb-io.h + delete mode 100644 arch/frv/kernel/gdb-stub.c + delete mode 100644 arch/frv/kernel/head-mmu-fr451.S + delete mode 100644 arch/frv/kernel/head-uc-fr401.S + delete mode 100644 arch/frv/kernel/head-uc-fr451.S + delete mode 100644 arch/frv/kernel/head-uc-fr555.S + delete mode 100644 arch/frv/kernel/head.S + delete mode 100644 arch/frv/kernel/head.inc + delete mode 100644 arch/frv/kernel/irq-mb93091.c + delete mode 100644 arch/frv/kernel/irq-mb93093.c + delete mode 100644 arch/frv/kernel/irq-mb93493.c + delete mode 100644 arch/frv/kernel/irq.c + delete mode 100644 arch/frv/kernel/local.h + delete mode 100644 arch/frv/kernel/local64.h + delete mode 100644 arch/frv/kernel/module.c + delete mode 100644 arch/frv/kernel/pm-mb93093.c + delete mode 100644 arch/frv/kernel/pm.c + delete mode 100644 arch/frv/kernel/process.c + delete mode 100644 arch/frv/kernel/ptrace.c + delete mode 100644 arch/frv/kernel/setup.c + delete mode 100644 arch/frv/kernel/signal.c + delete mode 100644 arch/frv/kernel/sleep.S + delete mode 100644 arch/frv/kernel/switch_to.S + delete mode 100644 arch/frv/kernel/sys_frv.c + delete mode 100644 arch/frv/kernel/sysctl.c + delete mode 100644 arch/frv/kernel/time.c + delete mode 100644 arch/frv/kernel/traps.c + delete mode 100644 arch/frv/kernel/uaccess.c + delete mode 100644 arch/frv/kernel/vmlinux.lds.S + delete mode 100644 arch/frv/lib/Makefile + delete mode 100644 arch/frv/lib/__ashldi3.S + delete mode 100644 arch/frv/lib/__ashrdi3.S + delete mode 100644 arch/frv/lib/__lshrdi3.S + delete mode 100644 arch/frv/lib/__muldi3.S + delete mode 100644 arch/frv/lib/__negdi2.S + delete mode 100644 arch/frv/lib/__ucmpdi2.S + delete mode 100644 arch/frv/lib/atomic-lib.c + delete mode 100644 arch/frv/lib/atomic-ops.S + delete mode 100644 arch/frv/lib/atomic64-ops.S + delete mode 100644 arch/frv/lib/cache.S + delete mode 100644 arch/frv/lib/checksum.c + delete mode 100644 arch/frv/lib/insl_ns.S + delete mode 100644 arch/frv/lib/insl_sw.S + delete mode 100644 arch/frv/lib/memcpy.S + delete mode 100644 arch/frv/lib/memset.S + delete mode 100644 arch/frv/lib/outsl_ns.S + delete mode 100644 arch/frv/lib/outsl_sw.S + delete mode 100644 arch/frv/mb93090-mb00/Makefile + delete mode 100644 arch/frv/mb93090-mb00/flash.c + delete mode 100644 arch/frv/mb93090-mb00/pci-dma-nommu.c + delete mode 100644 arch/frv/mb93090-mb00/pci-dma.c + delete mode 100644 arch/frv/mb93090-mb00/pci-frv.c + delete mode 100644 arch/frv/mb93090-mb00/pci-frv.h + delete mode 100644 arch/frv/mb93090-mb00/pci-irq.c + delete mode 100644 arch/frv/mb93090-mb00/pci-vdk.c + delete mode 100644 arch/frv/mm/Makefile + delete mode 100644 arch/frv/mm/cache-page.c + delete mode 100644 arch/frv/mm/dma-alloc.c + delete mode 100644 arch/frv/mm/elf-fdpic.c + delete mode 100644 arch/frv/mm/extable.c + delete mode 100644 arch/frv/mm/fault.c + delete mode 100644 arch/frv/mm/highmem.c + delete mode 100644 arch/frv/mm/init.c + delete mode 100644 arch/frv/mm/kmap.c + delete mode 100644 arch/frv/mm/mmu-context.c + delete mode 100644 arch/frv/mm/pgalloc.c + delete mode 100644 arch/frv/mm/tlb-flush.S + delete mode 100644 arch/frv/mm/tlb-miss.S + delete mode 100644 arch/m32r/Kconfig + delete mode 100644 arch/m32r/Kconfig.debug + delete mode 100644 arch/m32r/Makefile + delete mode 100644 arch/m32r/boot/Makefile + delete mode 100644 arch/m32r/boot/compressed/Makefile + delete mode 100644 arch/m32r/boot/compressed/boot.h + delete mode 100644 arch/m32r/boot/compressed/head.S + delete mode 100644 arch/m32r/boot/compressed/install.sh + delete mode 100644 arch/m32r/boot/compressed/m32r_sio.c + delete mode 100644 arch/m32r/boot/compressed/misc.c + delete mode 100644 arch/m32r/boot/compressed/vmlinux.lds.S + delete mode 100644 arch/m32r/boot/compressed/vmlinux.scr + delete mode 100644 arch/m32r/boot/setup.S + delete mode 100644 arch/m32r/configs/m32104ut_defconfig + delete mode 100644 arch/m32r/configs/m32700ut.smp_defconfig + delete mode 100644 arch/m32r/configs/m32700ut.up_defconfig + delete mode 100644 arch/m32r/configs/mappi.nommu_defconfig + delete mode 100644 arch/m32r/configs/mappi.smp_defconfig + delete mode 100644 arch/m32r/configs/mappi.up_defconfig + delete mode 100644 arch/m32r/configs/mappi2.opsp_defconfig + delete mode 100644 arch/m32r/configs/mappi2.vdec2_defconfig + delete mode 100644 arch/m32r/configs/mappi3.smp_defconfig + delete mode 100644 arch/m32r/configs/oaks32r_defconfig + delete mode 100644 arch/m32r/configs/opsput_defconfig + delete mode 100644 arch/m32r/configs/usrv_defconfig + delete mode 100644 arch/m32r/include/asm/Kbuild + delete mode 100644 arch/m32r/include/asm/addrspace.h + delete mode 100644 arch/m32r/include/asm/asm-offsets.h + delete mode 100644 arch/m32r/include/asm/assembler.h + delete mode 100644 arch/m32r/include/asm/atomic.h + delete mode 100644 arch/m32r/include/asm/barrier.h + delete mode 100644 arch/m32r/include/asm/bitops.h + delete mode 100644 arch/m32r/include/asm/bug.h + delete mode 100644 arch/m32r/include/asm/bugs.h + delete mode 100644 arch/m32r/include/asm/cache.h + delete mode 100644 arch/m32r/include/asm/cachectl.h + delete mode 100644 arch/m32r/include/asm/cacheflush.h + delete mode 100644 arch/m32r/include/asm/checksum.h + delete mode 100644 arch/m32r/include/asm/cmpxchg.h + delete mode 100644 arch/m32r/include/asm/dcache_clear.h + delete mode 100644 arch/m32r/include/asm/delay.h + delete mode 100644 arch/m32r/include/asm/device.h + delete mode 100644 arch/m32r/include/asm/div64.h + delete mode 100644 arch/m32r/include/asm/dma.h + delete mode 100644 arch/m32r/include/asm/elf.h + delete mode 100644 arch/m32r/include/asm/emergency-restart.h + delete mode 100644 arch/m32r/include/asm/fb.h + delete mode 100644 arch/m32r/include/asm/flat.h + delete mode 100644 arch/m32r/include/asm/ftrace.h + delete mode 100644 arch/m32r/include/asm/futex.h + delete mode 100644 arch/m32r/include/asm/hardirq.h + delete mode 100644 arch/m32r/include/asm/hw_irq.h + delete mode 100644 arch/m32r/include/asm/io.h + delete mode 100644 arch/m32r/include/asm/irq.h + delete mode 100644 arch/m32r/include/asm/irq_regs.h + delete mode 100644 arch/m32r/include/asm/irqflags.h + delete mode 100644 arch/m32r/include/asm/kdebug.h + delete mode 100644 arch/m32r/include/asm/kmap_types.h + delete mode 100644 arch/m32r/include/asm/linkage.h + delete mode 100644 arch/m32r/include/asm/local.h + delete mode 100644 arch/m32r/include/asm/local64.h + delete mode 100644 arch/m32r/include/asm/m32102.h + delete mode 100644 arch/m32r/include/asm/m32104ut/m32104ut_pld.h + delete mode 100644 arch/m32r/include/asm/m32700ut/m32700ut_lan.h + delete mode 100644 arch/m32r/include/asm/m32700ut/m32700ut_lcd.h + delete mode 100644 arch/m32r/include/asm/m32700ut/m32700ut_pld.h + delete mode 100644 arch/m32r/include/asm/m32r.h + delete mode 100644 arch/m32r/include/asm/m32r_mp_fpga.h + delete mode 100644 arch/m32r/include/asm/mappi2/mappi2_pld.h + delete mode 100644 arch/m32r/include/asm/mappi3/mappi3_pld.h + delete mode 100644 arch/m32r/include/asm/mc146818rtc.h + delete mode 100644 arch/m32r/include/asm/mmu.h + delete mode 100644 arch/m32r/include/asm/mmu_context.h + delete mode 100644 arch/m32r/include/asm/mmzone.h + delete mode 100644 arch/m32r/include/asm/opsput/opsput_lan.h + delete mode 100644 arch/m32r/include/asm/opsput/opsput_lcd.h + delete mode 100644 arch/m32r/include/asm/opsput/opsput_pld.h + delete mode 100644 arch/m32r/include/asm/page.h + delete mode 100644 arch/m32r/include/asm/pci.h + delete mode 100644 arch/m32r/include/asm/percpu.h + delete mode 100644 arch/m32r/include/asm/pgalloc.h + delete mode 100644 arch/m32r/include/asm/pgtable-2level.h + delete mode 100644 arch/m32r/include/asm/pgtable.h + delete mode 100644 arch/m32r/include/asm/processor.h + delete mode 100644 arch/m32r/include/asm/ptrace.h + delete mode 100644 arch/m32r/include/asm/rtc.h + delete mode 100644 arch/m32r/include/asm/s1d13806.h + delete mode 100644 arch/m32r/include/asm/segment.h + delete mode 100644 arch/m32r/include/asm/serial.h + delete mode 100644 arch/m32r/include/asm/setup.h + delete mode 100644 arch/m32r/include/asm/shmparam.h + delete mode 100644 arch/m32r/include/asm/signal.h + delete mode 100644 arch/m32r/include/asm/smp.h + delete mode 100644 arch/m32r/include/asm/spinlock.h + delete mode 100644 arch/m32r/include/asm/spinlock_types.h + delete mode 100644 arch/m32r/include/asm/string.h + delete mode 100644 arch/m32r/include/asm/switch_to.h + delete mode 100644 arch/m32r/include/asm/syscall.h + delete mode 100644 arch/m32r/include/asm/termios.h + delete mode 100644 arch/m32r/include/asm/thread_info.h + delete mode 100644 arch/m32r/include/asm/timex.h + delete mode 100644 arch/m32r/include/asm/tlb.h + delete mode 100644 arch/m32r/include/asm/tlbflush.h + delete mode 100644 arch/m32r/include/asm/topology.h + delete mode 100644 arch/m32r/include/asm/types.h + delete mode 100644 arch/m32r/include/asm/uaccess.h + delete mode 100644 arch/m32r/include/asm/ucontext.h + delete mode 100644 arch/m32r/include/asm/unaligned.h + delete mode 100644 arch/m32r/include/asm/unistd.h + delete mode 100644 arch/m32r/include/asm/user.h + delete mode 100644 arch/m32r/include/asm/vga.h + delete mode 100644 arch/m32r/include/asm/xor.h + delete mode 100644 arch/m32r/include/uapi/asm/Kbuild + delete mode 100644 arch/m32r/include/uapi/asm/auxvec.h + delete mode 100644 arch/m32r/include/uapi/asm/bitsperlong.h + delete mode 100644 arch/m32r/include/uapi/asm/byteorder.h + delete mode 100644 arch/m32r/include/uapi/asm/errno.h + delete mode 100644 arch/m32r/include/uapi/asm/fcntl.h + delete mode 100644 arch/m32r/include/uapi/asm/ioctl.h + delete mode 100644 arch/m32r/include/uapi/asm/ioctls.h + delete mode 100644 arch/m32r/include/uapi/asm/ipcbuf.h + delete mode 100644 arch/m32r/include/uapi/asm/mman.h + delete mode 100644 arch/m32r/include/uapi/asm/msgbuf.h + delete mode 100644 arch/m32r/include/uapi/asm/param.h + delete mode 100644 arch/m32r/include/uapi/asm/posix_types.h + delete mode 100644 arch/m32r/include/uapi/asm/ptrace.h + delete mode 100644 arch/m32r/include/uapi/asm/resource.h + delete mode 100644 arch/m32r/include/uapi/asm/sembuf.h + delete mode 100644 arch/m32r/include/uapi/asm/setup.h + delete mode 100644 arch/m32r/include/uapi/asm/shmbuf.h + delete mode 100644 arch/m32r/include/uapi/asm/sigcontext.h + delete mode 100644 arch/m32r/include/uapi/asm/signal.h + delete mode 100644 arch/m32r/include/uapi/asm/socket.h + delete mode 100644 arch/m32r/include/uapi/asm/sockios.h + delete mode 100644 arch/m32r/include/uapi/asm/stat.h + delete mode 100644 arch/m32r/include/uapi/asm/statfs.h + delete mode 100644 arch/m32r/include/uapi/asm/swab.h + delete mode 100644 arch/m32r/include/uapi/asm/termbits.h + delete mode 100644 arch/m32r/include/uapi/asm/termios.h + delete mode 100644 arch/m32r/include/uapi/asm/types.h + delete mode 100644 arch/m32r/include/uapi/asm/unistd.h + delete mode 100644 arch/m32r/kernel/.gitignore + delete mode 100644 arch/m32r/kernel/Makefile + delete mode 100644 arch/m32r/kernel/align.c + delete mode 100644 arch/m32r/kernel/asm-offsets.c + delete mode 100644 arch/m32r/kernel/entry.S + delete mode 100644 arch/m32r/kernel/head.S + delete mode 100644 arch/m32r/kernel/irq.c + delete mode 100644 arch/m32r/kernel/m32r_ksyms.c + delete mode 100644 arch/m32r/kernel/module.c + delete mode 100644 arch/m32r/kernel/process.c + delete mode 100644 arch/m32r/kernel/ptrace.c + delete mode 100644 arch/m32r/kernel/setup.c + delete mode 100644 arch/m32r/kernel/signal.c + delete mode 100644 arch/m32r/kernel/smp.c + delete mode 100644 arch/m32r/kernel/smpboot.c + delete mode 100644 arch/m32r/kernel/sys_m32r.c + delete mode 100644 arch/m32r/kernel/syscall_table.S + delete mode 100644 arch/m32r/kernel/time.c + delete mode 100644 arch/m32r/kernel/traps.c + delete mode 100644 arch/m32r/kernel/vmlinux.lds.S + delete mode 100644 arch/m32r/lib/Makefile + delete mode 100644 arch/m32r/lib/ashxdi3.S + delete mode 100644 arch/m32r/lib/checksum.S + delete mode 100644 arch/m32r/lib/csum_partial_copy.c + delete mode 100644 arch/m32r/lib/delay.c + delete mode 100644 arch/m32r/lib/libgcc.h + delete mode 100644 arch/m32r/lib/memcpy.S + delete mode 100644 arch/m32r/lib/memset.S + delete mode 100644 arch/m32r/lib/strlen.S + delete mode 100644 arch/m32r/lib/ucmpdi2.c + delete mode 100644 arch/m32r/lib/usercopy.c + delete mode 100644 arch/m32r/mm/Makefile + delete mode 100644 arch/m32r/mm/cache.c + delete mode 100644 arch/m32r/mm/discontig.c + delete mode 100644 arch/m32r/mm/extable.c + delete mode 100644 arch/m32r/mm/fault-nommu.c + delete mode 100644 arch/m32r/mm/fault.c + delete mode 100644 arch/m32r/mm/init.c + delete mode 100644 arch/m32r/mm/ioremap-nommu.c + delete mode 100644 arch/m32r/mm/ioremap.c + delete mode 100644 arch/m32r/mm/mmu.S + delete mode 100644 arch/m32r/mm/page.S + delete mode 100644 arch/m32r/oprofile/Makefile + delete mode 100644 arch/m32r/oprofile/init.c + delete mode 100644 arch/m32r/platforms/Makefile + delete mode 100644 arch/m32r/platforms/m32104ut/Makefile + delete mode 100644 arch/m32r/platforms/m32104ut/io.c + delete mode 100644 arch/m32r/platforms/m32104ut/setup.c + delete mode 100644 arch/m32r/platforms/m32700ut/Makefile + delete mode 100644 arch/m32r/platforms/m32700ut/dot.gdbinit_200MHz_16MB + delete mode 100644 arch/m32r/platforms/m32700ut/dot.gdbinit_300MHz_32MB + delete mode 100644 arch/m32r/platforms/m32700ut/dot.gdbinit_400MHz_32MB + delete mode 100644 arch/m32r/platforms/m32700ut/io.c + delete mode 100644 arch/m32r/platforms/m32700ut/setup.c + delete mode 100644 arch/m32r/platforms/mappi/Makefile + delete mode 100644 arch/m32r/platforms/mappi/dot.gdbinit + delete mode 100644 arch/m32r/platforms/mappi/dot.gdbinit.nommu + delete mode 100644 arch/m32r/platforms/mappi/dot.gdbinit.smp + delete mode 100644 arch/m32r/platforms/mappi/io.c + delete mode 100644 arch/m32r/platforms/mappi/setup.c + delete mode 100644 arch/m32r/platforms/mappi2/Makefile + delete mode 100644 arch/m32r/platforms/mappi2/dot.gdbinit.vdec2 + delete mode 100644 arch/m32r/platforms/mappi2/io.c + delete mode 100644 arch/m32r/platforms/mappi2/setup.c + delete mode 100644 arch/m32r/platforms/mappi3/Makefile + delete mode 100644 arch/m32r/platforms/mappi3/dot.gdbinit + delete mode 100644 arch/m32r/platforms/mappi3/io.c + delete mode 100644 arch/m32r/platforms/mappi3/setup.c + delete mode 100644 arch/m32r/platforms/oaks32r/Makefile + delete mode 100644 arch/m32r/platforms/oaks32r/dot.gdbinit.nommu + delete mode 100644 arch/m32r/platforms/oaks32r/io.c + delete mode 100644 arch/m32r/platforms/oaks32r/setup.c + delete mode 100644 arch/m32r/platforms/opsput/Makefile + delete mode 100644 arch/m32r/platforms/opsput/dot.gdbinit + delete mode 100644 arch/m32r/platforms/opsput/io.c + delete mode 100644 arch/m32r/platforms/opsput/setup.c + delete mode 100644 arch/m32r/platforms/usrv/Makefile + delete mode 100644 arch/m32r/platforms/usrv/io.c + delete mode 100644 arch/m32r/platforms/usrv/setup.c + delete mode 100644 arch/metag/Kconfig + delete mode 100644 arch/metag/Kconfig.debug + delete mode 100644 arch/metag/Kconfig.soc + delete mode 100644 arch/metag/Makefile + delete mode 100644 arch/metag/boot/.gitignore + delete mode 100644 arch/metag/boot/Makefile + delete mode 100644 arch/metag/boot/dts/Makefile + delete mode 100644 arch/metag/boot/dts/skeleton.dts + delete mode 100644 arch/metag/boot/dts/skeleton.dtsi + delete mode 100644 arch/metag/boot/dts/tz1090.dtsi + delete mode 100644 arch/metag/boot/dts/tz1090_generic.dts + delete mode 100644 arch/metag/configs/meta1_defconfig + delete mode 100644 arch/metag/configs/meta2_defconfig + delete mode 100644 arch/metag/configs/meta2_smp_defconfig + delete mode 100644 arch/metag/configs/tz1090_defconfig + delete mode 100644 arch/metag/include/asm/Kbuild + delete mode 100644 arch/metag/include/asm/atomic.h + delete mode 100644 arch/metag/include/asm/atomic_lnkget.h + delete mode 100644 arch/metag/include/asm/atomic_lock1.h + delete mode 100644 arch/metag/include/asm/barrier.h + delete mode 100644 arch/metag/include/asm/bitops.h + delete mode 100644 arch/metag/include/asm/bug.h + delete mode 100644 arch/metag/include/asm/cache.h + delete mode 100644 arch/metag/include/asm/cacheflush.h + delete mode 100644 arch/metag/include/asm/cachepart.h + delete mode 100644 arch/metag/include/asm/checksum.h + delete mode 100644 arch/metag/include/asm/clock.h + delete mode 100644 arch/metag/include/asm/cmpxchg.h + delete mode 100644 arch/metag/include/asm/cmpxchg_irq.h + delete mode 100644 arch/metag/include/asm/cmpxchg_lnkget.h + delete mode 100644 arch/metag/include/asm/cmpxchg_lock1.h + delete mode 100644 arch/metag/include/asm/core_reg.h + delete mode 100644 arch/metag/include/asm/cpu.h + delete mode 100644 arch/metag/include/asm/da.h + delete mode 100644 arch/metag/include/asm/delay.h + delete mode 100644 arch/metag/include/asm/div64.h + delete mode 100644 arch/metag/include/asm/dma-mapping.h + delete mode 100644 arch/metag/include/asm/elf.h + delete mode 100644 arch/metag/include/asm/fixmap.h + delete mode 100644 arch/metag/include/asm/ftrace.h + delete mode 100644 arch/metag/include/asm/global_lock.h + delete mode 100644 arch/metag/include/asm/highmem.h + delete mode 100644 arch/metag/include/asm/hugetlb.h + delete mode 100644 arch/metag/include/asm/hwthread.h + delete mode 100644 arch/metag/include/asm/io.h + delete mode 100644 arch/metag/include/asm/irq.h + delete mode 100644 arch/metag/include/asm/irqflags.h + delete mode 100644 arch/metag/include/asm/l2cache.h + delete mode 100644 arch/metag/include/asm/linkage.h + delete mode 100644 arch/metag/include/asm/mach/arch.h + delete mode 100644 arch/metag/include/asm/metag_isa.h + delete mode 100644 arch/metag/include/asm/metag_mem.h + delete mode 100644 arch/metag/include/asm/metag_regs.h + delete mode 100644 arch/metag/include/asm/mman.h + delete mode 100644 arch/metag/include/asm/mmu.h + delete mode 100644 arch/metag/include/asm/mmu_context.h + delete mode 100644 arch/metag/include/asm/mmzone.h + delete mode 100644 arch/metag/include/asm/module.h + delete mode 100644 arch/metag/include/asm/page.h + delete mode 100644 arch/metag/include/asm/perf_event.h + delete mode 100644 arch/metag/include/asm/pgalloc.h + delete mode 100644 arch/metag/include/asm/pgtable-bits.h + delete mode 100644 arch/metag/include/asm/pgtable.h + delete mode 100644 arch/metag/include/asm/processor.h + delete mode 100644 arch/metag/include/asm/ptrace.h + delete mode 100644 arch/metag/include/asm/setup.h + delete mode 100644 arch/metag/include/asm/smp.h + delete mode 100644 arch/metag/include/asm/sparsemem.h + delete mode 100644 arch/metag/include/asm/spinlock.h + delete mode 100644 arch/metag/include/asm/spinlock_lnkget.h + delete mode 100644 arch/metag/include/asm/spinlock_lock1.h + delete mode 100644 arch/metag/include/asm/spinlock_types.h + delete mode 100644 arch/metag/include/asm/stacktrace.h + delete mode 100644 arch/metag/include/asm/string.h + delete mode 100644 arch/metag/include/asm/switch.h + delete mode 100644 arch/metag/include/asm/syscall.h + delete mode 100644 arch/metag/include/asm/syscalls.h + delete mode 100644 arch/metag/include/asm/tbx.h + delete mode 100644 arch/metag/include/asm/tcm.h + delete mode 100644 arch/metag/include/asm/thread_info.h + delete mode 100644 arch/metag/include/asm/tlb.h + delete mode 100644 arch/metag/include/asm/tlbflush.h + delete mode 100644 arch/metag/include/asm/topology.h + delete mode 100644 arch/metag/include/asm/traps.h + delete mode 100644 arch/metag/include/asm/uaccess.h + delete mode 100644 arch/metag/include/asm/unistd.h + delete mode 100644 arch/metag/include/asm/user_gateway.h + delete mode 100644 arch/metag/include/uapi/asm/Kbuild + delete mode 100644 arch/metag/include/uapi/asm/byteorder.h + delete mode 100644 arch/metag/include/uapi/asm/ech.h + delete mode 100644 arch/metag/include/uapi/asm/ptrace.h + delete mode 100644 arch/metag/include/uapi/asm/sigcontext.h + delete mode 100644 arch/metag/include/uapi/asm/siginfo.h + delete mode 100644 arch/metag/include/uapi/asm/swab.h + delete mode 100644 arch/metag/include/uapi/asm/unistd.h + delete mode 100644 arch/metag/kernel/.gitignore + delete mode 100644 arch/metag/kernel/Makefile + delete mode 100644 arch/metag/kernel/asm-offsets.c + delete mode 100644 arch/metag/kernel/cachepart.c + delete mode 100644 arch/metag/kernel/clock.c + delete mode 100644 arch/metag/kernel/core_reg.c + delete mode 100644 arch/metag/kernel/da.c + delete mode 100644 arch/metag/kernel/devtree.c + delete mode 100644 arch/metag/kernel/dma.c + delete mode 100644 arch/metag/kernel/ftrace.c + delete mode 100644 arch/metag/kernel/ftrace_stub.S + delete mode 100644 arch/metag/kernel/head.S + delete mode 100644 arch/metag/kernel/irq.c + delete mode 100644 arch/metag/kernel/kick.c + delete mode 100644 arch/metag/kernel/machines.c + delete mode 100644 arch/metag/kernel/metag_ksyms.c + delete mode 100644 arch/metag/kernel/module.c + delete mode 100644 arch/metag/kernel/perf/Makefile + delete mode 100644 arch/metag/kernel/perf/perf_event.c + delete mode 100644 arch/metag/kernel/perf/perf_event.h + delete mode 100644 arch/metag/kernel/perf_callchain.c + delete mode 100644 arch/metag/kernel/process.c + delete mode 100644 arch/metag/kernel/ptrace.c + delete mode 100644 arch/metag/kernel/setup.c + delete mode 100644 arch/metag/kernel/signal.c + delete mode 100644 arch/metag/kernel/smp.c + delete mode 100644 arch/metag/kernel/stacktrace.c + delete mode 100644 arch/metag/kernel/sys_metag.c + delete mode 100644 arch/metag/kernel/tbiunexp.S + delete mode 100644 arch/metag/kernel/tcm.c + delete mode 100644 arch/metag/kernel/time.c + delete mode 100644 arch/metag/kernel/topology.c + delete mode 100644 arch/metag/kernel/traps.c + delete mode 100644 arch/metag/kernel/user_gateway.S + delete mode 100644 arch/metag/kernel/vmlinux.lds.S + delete mode 100644 arch/metag/lib/Makefile + delete mode 100644 arch/metag/lib/ashldi3.S + delete mode 100644 arch/metag/lib/ashrdi3.S + delete mode 100644 arch/metag/lib/checksum.c + delete mode 100644 arch/metag/lib/clear_page.S + delete mode 100644 arch/metag/lib/cmpdi2.S + delete mode 100644 arch/metag/lib/copy_page.S + delete mode 100644 arch/metag/lib/delay.c + delete mode 100644 arch/metag/lib/div64.S + delete mode 100644 arch/metag/lib/divsi3.S + delete mode 100644 arch/metag/lib/ip_fast_csum.S + delete mode 100644 arch/metag/lib/lshrdi3.S + delete mode 100644 arch/metag/lib/memcpy.S + delete mode 100644 arch/metag/lib/memmove.S + delete mode 100644 arch/metag/lib/memset.S + delete mode 100644 arch/metag/lib/modsi3.S + delete mode 100644 arch/metag/lib/muldi3.S + delete mode 100644 arch/metag/lib/ucmpdi2.S + delete mode 100644 arch/metag/lib/usercopy.c + delete mode 100644 arch/metag/mm/Kconfig + delete mode 100644 arch/metag/mm/Makefile + delete mode 100644 arch/metag/mm/cache.c + delete mode 100644 arch/metag/mm/extable.c + delete mode 100644 arch/metag/mm/fault.c + delete mode 100644 arch/metag/mm/highmem.c + delete mode 100644 arch/metag/mm/hugetlbpage.c + delete mode 100644 arch/metag/mm/init.c + delete mode 100644 arch/metag/mm/ioremap.c + delete mode 100644 arch/metag/mm/l2cache.c + delete mode 100644 arch/metag/mm/maccess.c + delete mode 100644 arch/metag/mm/mmu-meta1.c + delete mode 100644 arch/metag/mm/mmu-meta2.c + delete mode 100644 arch/metag/mm/numa.c + delete mode 100644 arch/metag/oprofile/Makefile + delete mode 100644 arch/metag/oprofile/backtrace.c + delete mode 100644 arch/metag/oprofile/backtrace.h + delete mode 100644 arch/metag/oprofile/common.c + delete mode 100644 arch/metag/tbx/Makefile + delete mode 100644 arch/metag/tbx/tbicore.S + delete mode 100644 arch/metag/tbx/tbictx.S + delete mode 100644 arch/metag/tbx/tbictxfpu.S + delete mode 100644 arch/metag/tbx/tbidefr.S + delete mode 100644 arch/metag/tbx/tbidspram.S + delete mode 100644 arch/metag/tbx/tbilogf.S + delete mode 100644 arch/metag/tbx/tbipcx.S + delete mode 100644 arch/metag/tbx/tbiroot.S + delete mode 100644 arch/metag/tbx/tbisoft.S + delete mode 100644 arch/metag/tbx/tbistring.c + delete mode 100644 arch/metag/tbx/tbitimer.S + delete mode 100644 arch/mn10300/Kconfig + delete mode 100644 arch/mn10300/Kconfig.debug + delete mode 100644 arch/mn10300/Makefile + delete mode 100644 arch/mn10300/boot/.gitignore + delete mode 100644 arch/mn10300/boot/Makefile + delete mode 100644 arch/mn10300/boot/compressed/Makefile + delete mode 100644 arch/mn10300/boot/compressed/head.S + delete mode 100644 arch/mn10300/boot/compressed/misc.c + delete mode 100644 arch/mn10300/boot/compressed/misc.h + delete mode 100644 arch/mn10300/boot/compressed/vmlinux.lds + delete mode 100644 arch/mn10300/boot/install.sh + delete mode 100644 arch/mn10300/boot/tools/build.c + delete mode 100644 arch/mn10300/configs/asb2303_defconfig + delete mode 100644 arch/mn10300/configs/asb2364_defconfig + delete mode 100644 arch/mn10300/include/asm/Kbuild + delete mode 100644 arch/mn10300/include/asm/asm-offsets.h + delete mode 100644 arch/mn10300/include/asm/atomic.h + delete mode 100644 arch/mn10300/include/asm/bitops.h + delete mode 100644 arch/mn10300/include/asm/bug.h + delete mode 100644 arch/mn10300/include/asm/bugs.h + delete mode 100644 arch/mn10300/include/asm/busctl-regs.h + delete mode 100644 arch/mn10300/include/asm/cache.h + delete mode 100644 arch/mn10300/include/asm/cacheflush.h + delete mode 100644 arch/mn10300/include/asm/checksum.h + delete mode 100644 arch/mn10300/include/asm/cmpxchg.h + delete mode 100644 arch/mn10300/include/asm/cpu-regs.h + delete mode 100644 arch/mn10300/include/asm/current.h + delete mode 100644 arch/mn10300/include/asm/debugger.h + delete mode 100644 arch/mn10300/include/asm/delay.h + delete mode 100644 arch/mn10300/include/asm/div64.h + delete mode 100644 arch/mn10300/include/asm/dma-mapping.h + delete mode 100644 arch/mn10300/include/asm/dma.h + delete mode 100644 arch/mn10300/include/asm/dmactl-regs.h + delete mode 100644 arch/mn10300/include/asm/elf.h + delete mode 100644 arch/mn10300/include/asm/emergency-restart.h + delete mode 100644 arch/mn10300/include/asm/exceptions.h + delete mode 100644 arch/mn10300/include/asm/fpu.h + delete mode 100644 arch/mn10300/include/asm/frame.inc + delete mode 100644 arch/mn10300/include/asm/ftrace.h + delete mode 100644 arch/mn10300/include/asm/futex.h + delete mode 100644 arch/mn10300/include/asm/gdb-stub.h + delete mode 100644 arch/mn10300/include/asm/hardirq.h + delete mode 100644 arch/mn10300/include/asm/highmem.h + delete mode 100644 arch/mn10300/include/asm/hw_irq.h + delete mode 100644 arch/mn10300/include/asm/intctl-regs.h + delete mode 100644 arch/mn10300/include/asm/io.h + delete mode 100644 arch/mn10300/include/asm/irq.h + delete mode 100644 arch/mn10300/include/asm/irq_regs.h + delete mode 100644 arch/mn10300/include/asm/irqflags.h + delete mode 100644 arch/mn10300/include/asm/kdebug.h + delete mode 100644 arch/mn10300/include/asm/kgdb.h + delete mode 100644 arch/mn10300/include/asm/kmap_types.h + delete mode 100644 arch/mn10300/include/asm/kprobes.h + delete mode 100644 arch/mn10300/include/asm/linkage.h + delete mode 100644 arch/mn10300/include/asm/local.h + delete mode 100644 arch/mn10300/include/asm/local64.h + delete mode 100644 arch/mn10300/include/asm/mc146818rtc.h + delete mode 100644 arch/mn10300/include/asm/mmu.h + delete mode 100644 arch/mn10300/include/asm/mmu_context.h + delete mode 100644 arch/mn10300/include/asm/module.h + delete mode 100644 arch/mn10300/include/asm/nmi.h + delete mode 100644 arch/mn10300/include/asm/page.h + delete mode 100644 arch/mn10300/include/asm/page_offset.h + delete mode 100644 arch/mn10300/include/asm/pci.h + delete mode 100644 arch/mn10300/include/asm/percpu.h + delete mode 100644 arch/mn10300/include/asm/pgalloc.h + delete mode 100644 arch/mn10300/include/asm/pgtable.h + delete mode 100644 arch/mn10300/include/asm/pio-regs.h + delete mode 100644 arch/mn10300/include/asm/processor.h + delete mode 100644 arch/mn10300/include/asm/ptrace.h + delete mode 100644 arch/mn10300/include/asm/reset-regs.h + delete mode 100644 arch/mn10300/include/asm/rtc-regs.h + delete mode 100644 arch/mn10300/include/asm/rtc.h + delete mode 100644 arch/mn10300/include/asm/rwlock.h + delete mode 100644 arch/mn10300/include/asm/serial-regs.h + delete mode 100644 arch/mn10300/include/asm/serial.h + delete mode 100644 arch/mn10300/include/asm/setup.h + delete mode 100644 arch/mn10300/include/asm/shmparam.h + delete mode 100644 arch/mn10300/include/asm/signal.h + delete mode 100644 arch/mn10300/include/asm/smp.h + delete mode 100644 arch/mn10300/include/asm/smsc911x.h + delete mode 100644 arch/mn10300/include/asm/spinlock.h + delete mode 100644 arch/mn10300/include/asm/spinlock_types.h + delete mode 100644 arch/mn10300/include/asm/string.h + delete mode 100644 arch/mn10300/include/asm/switch_to.h + delete mode 100644 arch/mn10300/include/asm/syscall.h + delete mode 100644 arch/mn10300/include/asm/termios.h + delete mode 100644 arch/mn10300/include/asm/thread_info.h + delete mode 100644 arch/mn10300/include/asm/timer-regs.h + delete mode 100644 arch/mn10300/include/asm/timex.h + delete mode 100644 arch/mn10300/include/asm/tlb.h + delete mode 100644 arch/mn10300/include/asm/tlbflush.h + delete mode 100644 arch/mn10300/include/asm/topology.h + delete mode 100644 arch/mn10300/include/asm/types.h + delete mode 100644 arch/mn10300/include/asm/uaccess.h + delete mode 100644 arch/mn10300/include/asm/ucontext.h + delete mode 100644 arch/mn10300/include/asm/unaligned.h + delete mode 100644 arch/mn10300/include/asm/unistd.h + delete mode 100644 arch/mn10300/include/asm/user.h + delete mode 100644 arch/mn10300/include/asm/vga.h + delete mode 100644 arch/mn10300/include/asm/xor.h + delete mode 100644 arch/mn10300/include/uapi/asm/Kbuild + delete mode 100644 arch/mn10300/include/uapi/asm/auxvec.h + delete mode 100644 arch/mn10300/include/uapi/asm/bitsperlong.h + delete mode 100644 arch/mn10300/include/uapi/asm/byteorder.h + delete mode 100644 arch/mn10300/include/uapi/asm/errno.h + delete mode 100644 arch/mn10300/include/uapi/asm/fcntl.h + delete mode 100644 arch/mn10300/include/uapi/asm/ioctl.h + delete mode 100644 arch/mn10300/include/uapi/asm/ioctls.h + delete mode 100644 arch/mn10300/include/uapi/asm/ipcbuf.h + delete mode 100644 arch/mn10300/include/uapi/asm/kvm_para.h + delete mode 100644 arch/mn10300/include/uapi/asm/mman.h + delete mode 100644 arch/mn10300/include/uapi/asm/msgbuf.h + delete mode 100644 arch/mn10300/include/uapi/asm/param.h + delete mode 100644 arch/mn10300/include/uapi/asm/posix_types.h + delete mode 100644 arch/mn10300/include/uapi/asm/ptrace.h + delete mode 100644 arch/mn10300/include/uapi/asm/resource.h + delete mode 100644 arch/mn10300/include/uapi/asm/sembuf.h + delete mode 100644 arch/mn10300/include/uapi/asm/setup.h + delete mode 100644 arch/mn10300/include/uapi/asm/shmbuf.h + delete mode 100644 arch/mn10300/include/uapi/asm/sigcontext.h + delete mode 100644 arch/mn10300/include/uapi/asm/signal.h + delete mode 100644 arch/mn10300/include/uapi/asm/socket.h + delete mode 100644 arch/mn10300/include/uapi/asm/sockios.h + delete mode 100644 arch/mn10300/include/uapi/asm/stat.h + delete mode 100644 arch/mn10300/include/uapi/asm/statfs.h + delete mode 100644 arch/mn10300/include/uapi/asm/swab.h + delete mode 100644 arch/mn10300/include/uapi/asm/termbits.h + delete mode 100644 arch/mn10300/include/uapi/asm/termios.h + delete mode 100644 arch/mn10300/include/uapi/asm/types.h + delete mode 100644 arch/mn10300/include/uapi/asm/unistd.h + delete mode 100644 arch/mn10300/kernel/Makefile + delete mode 100644 arch/mn10300/kernel/asm-offsets.c + delete mode 100644 arch/mn10300/kernel/cevt-mn10300.c + delete mode 100644 arch/mn10300/kernel/csrc-mn10300.c + delete mode 100644 arch/mn10300/kernel/entry.S + delete mode 100644 arch/mn10300/kernel/fpu-low.S + delete mode 100644 arch/mn10300/kernel/fpu-nofpu-low.S + delete mode 100644 arch/mn10300/kernel/fpu-nofpu.c + delete mode 100644 arch/mn10300/kernel/fpu.c + delete mode 100644 arch/mn10300/kernel/gdb-io-serial-low.S + delete mode 100644 arch/mn10300/kernel/gdb-io-serial.c + delete mode 100644 arch/mn10300/kernel/gdb-io-ttysm-low.S + delete mode 100644 arch/mn10300/kernel/gdb-io-ttysm.c + delete mode 100644 arch/mn10300/kernel/gdb-low.S + delete mode 100644 arch/mn10300/kernel/gdb-stub.c + delete mode 100644 arch/mn10300/kernel/head.S + delete mode 100644 arch/mn10300/kernel/internal.h + delete mode 100644 arch/mn10300/kernel/io.c + delete mode 100644 arch/mn10300/kernel/irq.c + delete mode 100644 arch/mn10300/kernel/kgdb.c + delete mode 100644 arch/mn10300/kernel/kprobes.c + delete mode 100644 arch/mn10300/kernel/mn10300-debug.c + delete mode 100644 arch/mn10300/kernel/mn10300-serial-low.S + delete mode 100644 arch/mn10300/kernel/mn10300-serial.c + delete mode 100644 arch/mn10300/kernel/mn10300-serial.h + delete mode 100644 arch/mn10300/kernel/mn10300-watchdog-low.S + delete mode 100644 arch/mn10300/kernel/mn10300-watchdog.c + delete mode 100644 arch/mn10300/kernel/mn10300_ksyms.c + delete mode 100644 arch/mn10300/kernel/module.c + delete mode 100644 arch/mn10300/kernel/process.c + delete mode 100644 arch/mn10300/kernel/profile-low.S + delete mode 100644 arch/mn10300/kernel/profile.c + delete mode 100644 arch/mn10300/kernel/ptrace.c + delete mode 100644 arch/mn10300/kernel/rtc.c + delete mode 100644 arch/mn10300/kernel/setup.c + delete mode 100644 arch/mn10300/kernel/sigframe.h + delete mode 100644 arch/mn10300/kernel/signal.c + delete mode 100644 arch/mn10300/kernel/smp-low.S + delete mode 100644 arch/mn10300/kernel/smp.c + delete mode 100644 arch/mn10300/kernel/switch_to.S + delete mode 100644 arch/mn10300/kernel/sys_mn10300.c + delete mode 100644 arch/mn10300/kernel/time.c + delete mode 100644 arch/mn10300/kernel/traps.c + delete mode 100644 arch/mn10300/kernel/vmlinux.lds.S + delete mode 100644 arch/mn10300/lib/Makefile + delete mode 100644 arch/mn10300/lib/__ashldi3.S + delete mode 100644 arch/mn10300/lib/__ashrdi3.S + delete mode 100644 arch/mn10300/lib/__lshrdi3.S + delete mode 100644 arch/mn10300/lib/__ucmpdi2.S + delete mode 100644 arch/mn10300/lib/ashrdi3.c + delete mode 100644 arch/mn10300/lib/bitops.c + delete mode 100644 arch/mn10300/lib/checksum.c + delete mode 100644 arch/mn10300/lib/delay.c + delete mode 100644 arch/mn10300/lib/do_csum.S + delete mode 100644 arch/mn10300/lib/internal.h + delete mode 100644 arch/mn10300/lib/lshrdi3.c + delete mode 100644 arch/mn10300/lib/memcpy.S + delete mode 100644 arch/mn10300/lib/memmove.S + delete mode 100644 arch/mn10300/lib/memset.S + delete mode 100644 arch/mn10300/lib/negdi2.c + delete mode 100644 arch/mn10300/lib/usercopy.c + delete mode 100644 arch/mn10300/mm/Kconfig.cache + delete mode 100644 arch/mn10300/mm/Makefile + delete mode 100644 arch/mn10300/mm/cache-dbg-flush-by-reg.S + delete mode 100644 arch/mn10300/mm/cache-dbg-flush-by-tag.S + delete mode 100644 arch/mn10300/mm/cache-dbg-inv-by-reg.S + delete mode 100644 arch/mn10300/mm/cache-dbg-inv-by-tag.S + delete mode 100644 arch/mn10300/mm/cache-dbg-inv.S + delete mode 100644 arch/mn10300/mm/cache-disabled.c + delete mode 100644 arch/mn10300/mm/cache-flush-by-reg.S + delete mode 100644 arch/mn10300/mm/cache-flush-by-tag.S + delete mode 100644 arch/mn10300/mm/cache-flush-icache.c + delete mode 100644 arch/mn10300/mm/cache-inv-by-reg.S + delete mode 100644 arch/mn10300/mm/cache-inv-by-tag.S + delete mode 100644 arch/mn10300/mm/cache-inv-icache.c + delete mode 100644 arch/mn10300/mm/cache-smp-flush.c + delete mode 100644 arch/mn10300/mm/cache-smp-inv.c + delete mode 100644 arch/mn10300/mm/cache-smp.c + delete mode 100644 arch/mn10300/mm/cache-smp.h + delete mode 100644 arch/mn10300/mm/cache.c + delete mode 100644 arch/mn10300/mm/cache.inc + delete mode 100644 arch/mn10300/mm/dma-alloc.c + delete mode 100644 arch/mn10300/mm/extable.c + delete mode 100644 arch/mn10300/mm/fault.c + delete mode 100644 arch/mn10300/mm/init.c + delete mode 100644 arch/mn10300/mm/misalignment.c + delete mode 100644 arch/mn10300/mm/mmu-context.c + delete mode 100644 arch/mn10300/mm/pgtable.c + delete mode 100644 arch/mn10300/mm/tlb-mn10300.S + delete mode 100644 arch/mn10300/mm/tlb-smp.c + delete mode 100644 arch/mn10300/oprofile/Makefile + delete mode 100644 arch/mn10300/oprofile/op_model_null.c + delete mode 100644 arch/mn10300/proc-mn103e010/Makefile + delete mode 100644 arch/mn10300/proc-mn103e010/include/proc/cache.h + delete mode 100644 arch/mn10300/proc-mn103e010/include/proc/clock.h + delete mode 100644 arch/mn10300/proc-mn103e010/include/proc/dmactl-regs.h + delete mode 100644 arch/mn10300/proc-mn103e010/include/proc/intctl-regs.h + delete mode 100644 arch/mn10300/proc-mn103e010/include/proc/irq.h + delete mode 100644 arch/mn10300/proc-mn103e010/include/proc/proc.h + delete mode 100644 arch/mn10300/proc-mn103e010/proc-init.c + delete mode 100644 arch/mn10300/proc-mn2ws0050/Makefile + delete mode 100644 arch/mn10300/proc-mn2ws0050/include/proc/cache.h + delete mode 100644 arch/mn10300/proc-mn2ws0050/include/proc/clock.h + delete mode 100644 arch/mn10300/proc-mn2ws0050/include/proc/dmactl-regs.h + delete mode 100644 arch/mn10300/proc-mn2ws0050/include/proc/intctl-regs.h + delete mode 100644 arch/mn10300/proc-mn2ws0050/include/proc/irq.h + delete mode 100644 arch/mn10300/proc-mn2ws0050/include/proc/nand-regs.h + delete mode 100644 arch/mn10300/proc-mn2ws0050/include/proc/proc.h + delete mode 100644 arch/mn10300/proc-mn2ws0050/include/proc/smp-regs.h + delete mode 100644 arch/mn10300/proc-mn2ws0050/proc-init.c + delete mode 100644 arch/mn10300/unit-asb2303/Makefile + delete mode 100644 arch/mn10300/unit-asb2303/flash.c + delete mode 100644 arch/mn10300/unit-asb2303/include/unit/clock.h + delete mode 100644 arch/mn10300/unit-asb2303/include/unit/leds.h + delete mode 100644 arch/mn10300/unit-asb2303/include/unit/serial.h + delete mode 100644 arch/mn10300/unit-asb2303/include/unit/smc91111.h + delete mode 100644 arch/mn10300/unit-asb2303/include/unit/timex.h + delete mode 100644 arch/mn10300/unit-asb2303/leds.c + delete mode 100644 arch/mn10300/unit-asb2303/smc91111.c + delete mode 100644 arch/mn10300/unit-asb2303/unit-init.c + delete mode 100644 arch/mn10300/unit-asb2305/Makefile + delete mode 100644 arch/mn10300/unit-asb2305/include/unit/clock.h + delete mode 100644 arch/mn10300/unit-asb2305/include/unit/leds.h + delete mode 100644 arch/mn10300/unit-asb2305/include/unit/serial.h + delete mode 100644 arch/mn10300/unit-asb2305/include/unit/timex.h + delete mode 100644 arch/mn10300/unit-asb2305/leds.c + delete mode 100644 arch/mn10300/unit-asb2305/pci-asb2305.c + delete mode 100644 arch/mn10300/unit-asb2305/pci-asb2305.h + delete mode 100644 arch/mn10300/unit-asb2305/pci-irq.c + delete mode 100644 arch/mn10300/unit-asb2305/pci.c + delete mode 100644 arch/mn10300/unit-asb2305/unit-init.c + delete mode 100644 arch/mn10300/unit-asb2364/Makefile + delete mode 100644 arch/mn10300/unit-asb2364/include/unit/clock.h + delete mode 100644 arch/mn10300/unit-asb2364/include/unit/fpga-regs.h + delete mode 100644 arch/mn10300/unit-asb2364/include/unit/irq.h + delete mode 100644 arch/mn10300/unit-asb2364/include/unit/leds.h + delete mode 100644 arch/mn10300/unit-asb2364/include/unit/serial.h + delete mode 100644 arch/mn10300/unit-asb2364/include/unit/smsc911x.h + delete mode 100644 arch/mn10300/unit-asb2364/include/unit/timex.h + delete mode 100644 arch/mn10300/unit-asb2364/irq-fpga.c + delete mode 100644 arch/mn10300/unit-asb2364/leds.c + delete mode 100644 arch/mn10300/unit-asb2364/smsc911x.c + delete mode 100644 arch/mn10300/unit-asb2364/unit-init.c + delete mode 100644 arch/score/Kconfig + delete mode 100644 arch/score/Kconfig.debug + delete mode 100644 arch/score/Makefile + delete mode 100644 arch/score/boot/Makefile + delete mode 100644 arch/score/configs/spct6600_defconfig + delete mode 100644 arch/score/include/asm/Kbuild + delete mode 100644 arch/score/include/asm/asm-offsets.h + delete mode 100644 arch/score/include/asm/asmmacro.h + delete mode 100644 arch/score/include/asm/atomic.h + delete mode 100644 arch/score/include/asm/bitops.h + delete mode 100644 arch/score/include/asm/bug.h + delete mode 100644 arch/score/include/asm/bugs.h + delete mode 100644 arch/score/include/asm/cache.h + delete mode 100644 arch/score/include/asm/cacheflush.h + delete mode 100644 arch/score/include/asm/checksum.h + delete mode 100644 arch/score/include/asm/cmpxchg.h + delete mode 100644 arch/score/include/asm/delay.h + delete mode 100644 arch/score/include/asm/device.h + delete mode 100644 arch/score/include/asm/div64.h + delete mode 100644 arch/score/include/asm/dma.h + delete mode 100644 arch/score/include/asm/elf.h + delete mode 100644 arch/score/include/asm/emergency-restart.h + delete mode 100644 arch/score/include/asm/exec.h + delete mode 100644 arch/score/include/asm/fixmap.h + delete mode 100644 arch/score/include/asm/ftrace.h + delete mode 100644 arch/score/include/asm/futex.h + delete mode 100644 arch/score/include/asm/hardirq.h + delete mode 100644 arch/score/include/asm/hw_irq.h + delete mode 100644 arch/score/include/asm/io.h + delete mode 100644 arch/score/include/asm/irq.h + delete mode 100644 arch/score/include/asm/irq_regs.h + delete mode 100644 arch/score/include/asm/irqflags.h + delete mode 100644 arch/score/include/asm/kdebug.h + delete mode 100644 arch/score/include/asm/kmap_types.h + delete mode 100644 arch/score/include/asm/linkage.h + delete mode 100644 arch/score/include/asm/local.h + delete mode 100644 arch/score/include/asm/local64.h + delete mode 100644 arch/score/include/asm/mmu.h + delete mode 100644 arch/score/include/asm/mmu_context.h + delete mode 100644 arch/score/include/asm/module.h + delete mode 100644 arch/score/include/asm/page.h + delete mode 100644 arch/score/include/asm/pci.h + delete mode 100644 arch/score/include/asm/percpu.h + delete mode 100644 arch/score/include/asm/pgalloc.h + delete mode 100644 arch/score/include/asm/pgtable-bits.h + delete mode 100644 arch/score/include/asm/pgtable.h + delete mode 100644 arch/score/include/asm/processor.h + delete mode 100644 arch/score/include/asm/ptrace.h + delete mode 100644 arch/score/include/asm/scoreregs.h + delete mode 100644 arch/score/include/asm/segment.h + delete mode 100644 arch/score/include/asm/setup.h + delete mode 100644 arch/score/include/asm/shmparam.h + delete mode 100644 arch/score/include/asm/string.h + delete mode 100644 arch/score/include/asm/switch_to.h + delete mode 100644 arch/score/include/asm/syscalls.h + delete mode 100644 arch/score/include/asm/thread_info.h + delete mode 100644 arch/score/include/asm/timex.h + delete mode 100644 arch/score/include/asm/tlb.h + delete mode 100644 arch/score/include/asm/tlbflush.h + delete mode 100644 arch/score/include/asm/topology.h + delete mode 100644 arch/score/include/asm/uaccess.h + delete mode 100644 arch/score/include/asm/ucontext.h + delete mode 100644 arch/score/include/asm/unaligned.h + delete mode 100644 arch/score/include/asm/user.h + delete mode 100644 arch/score/include/uapi/asm/Kbuild + delete mode 100644 arch/score/include/uapi/asm/auxvec.h + delete mode 100644 arch/score/include/uapi/asm/bitsperlong.h + delete mode 100644 arch/score/include/uapi/asm/byteorder.h + delete mode 100644 arch/score/include/uapi/asm/errno.h + delete mode 100644 arch/score/include/uapi/asm/fcntl.h + delete mode 100644 arch/score/include/uapi/asm/ioctl.h + delete mode 100644 arch/score/include/uapi/asm/ioctls.h + delete mode 100644 arch/score/include/uapi/asm/ipcbuf.h + delete mode 100644 arch/score/include/uapi/asm/kvm_para.h + delete mode 100644 arch/score/include/uapi/asm/mman.h + delete mode 100644 arch/score/include/uapi/asm/msgbuf.h + delete mode 100644 arch/score/include/uapi/asm/param.h + delete mode 100644 arch/score/include/uapi/asm/posix_types.h + delete mode 100644 arch/score/include/uapi/asm/ptrace.h + delete mode 100644 arch/score/include/uapi/asm/resource.h + delete mode 100644 arch/score/include/uapi/asm/sembuf.h + delete mode 100644 arch/score/include/uapi/asm/setup.h + delete mode 100644 arch/score/include/uapi/asm/shmbuf.h + delete mode 100644 arch/score/include/uapi/asm/sigcontext.h + delete mode 100644 arch/score/include/uapi/asm/signal.h + delete mode 100644 arch/score/include/uapi/asm/socket.h + delete mode 100644 arch/score/include/uapi/asm/sockios.h + delete mode 100644 arch/score/include/uapi/asm/stat.h + delete mode 100644 arch/score/include/uapi/asm/statfs.h + delete mode 100644 arch/score/include/uapi/asm/swab.h + delete mode 100644 arch/score/include/uapi/asm/termbits.h + delete mode 100644 arch/score/include/uapi/asm/termios.h + delete mode 100644 arch/score/include/uapi/asm/types.h + delete mode 100644 arch/score/include/uapi/asm/unistd.h + delete mode 100644 arch/score/kernel/Makefile + delete mode 100644 arch/score/kernel/asm-offsets.c + delete mode 100644 arch/score/kernel/entry.S + delete mode 100644 arch/score/kernel/head.S + delete mode 100644 arch/score/kernel/irq.c + delete mode 100644 arch/score/kernel/module.c + delete mode 100644 arch/score/kernel/process.c + delete mode 100644 arch/score/kernel/ptrace.c + delete mode 100644 arch/score/kernel/setup.c + delete mode 100644 arch/score/kernel/signal.c + delete mode 100644 arch/score/kernel/sys_call_table.c + delete mode 100644 arch/score/kernel/sys_score.c + delete mode 100644 arch/score/kernel/time.c + delete mode 100644 arch/score/kernel/traps.c + delete mode 100644 arch/score/kernel/vmlinux.lds.S + delete mode 100644 arch/score/lib/Makefile + delete mode 100644 arch/score/lib/ashldi3.c + delete mode 100644 arch/score/lib/ashrdi3.c + delete mode 100644 arch/score/lib/checksum.S + delete mode 100644 arch/score/lib/checksum_copy.c + delete mode 100644 arch/score/lib/cmpdi2.c + delete mode 100644 arch/score/lib/libgcc.h + delete mode 100644 arch/score/lib/lshrdi3.c + delete mode 100644 arch/score/lib/string.S + delete mode 100644 arch/score/lib/ucmpdi2.c + delete mode 100644 arch/score/mm/Makefile + delete mode 100644 arch/score/mm/cache.c + delete mode 100644 arch/score/mm/extable.c + delete mode 100644 arch/score/mm/fault.c + delete mode 100644 arch/score/mm/init.c + delete mode 100644 arch/score/mm/pgtable.c + delete mode 100644 arch/score/mm/tlb-miss.S + delete mode 100644 arch/score/mm/tlb-score.c + delete mode 100644 arch/tile/Kbuild + delete mode 100644 arch/tile/Kconfig + delete mode 100644 arch/tile/Kconfig.debug + delete mode 100644 arch/tile/Makefile + delete mode 100644 arch/tile/configs/tilegx_defconfig + delete mode 100644 arch/tile/configs/tilepro_defconfig + delete mode 100644 arch/tile/gxio/Kconfig + delete mode 100644 arch/tile/gxio/Makefile + delete mode 100644 arch/tile/gxio/dma_queue.c + delete mode 100644 arch/tile/gxio/iorpc_globals.c + delete mode 100644 arch/tile/gxio/iorpc_mpipe.c + delete mode 100644 arch/tile/gxio/iorpc_mpipe_info.c + delete mode 100644 arch/tile/gxio/iorpc_trio.c + delete mode 100644 arch/tile/gxio/iorpc_uart.c + delete mode 100644 arch/tile/gxio/iorpc_usb_host.c + delete mode 100644 arch/tile/gxio/kiorpc.c + delete mode 100644 arch/tile/gxio/mpipe.c + delete mode 100644 arch/tile/gxio/trio.c + delete mode 100644 arch/tile/gxio/uart.c + delete mode 100644 arch/tile/gxio/usb_host.c + delete mode 100644 arch/tile/include/arch/mpipe.h + delete mode 100644 arch/tile/include/arch/mpipe_constants.h + delete mode 100644 arch/tile/include/arch/mpipe_def.h + delete mode 100644 arch/tile/include/arch/mpipe_shm.h + delete mode 100644 arch/tile/include/arch/mpipe_shm_def.h + delete mode 100644 arch/tile/include/arch/spr_def.h + delete mode 100644 arch/tile/include/arch/trio.h + delete mode 100644 arch/tile/include/arch/trio_constants.h + delete mode 100644 arch/tile/include/arch/trio_def.h + delete mode 100644 arch/tile/include/arch/trio_pcie_intfc.h + delete mode 100644 arch/tile/include/arch/trio_pcie_intfc_def.h + delete mode 100644 arch/tile/include/arch/trio_pcie_rc.h + delete mode 100644 arch/tile/include/arch/trio_pcie_rc_def.h + delete mode 100644 arch/tile/include/arch/trio_shm.h + delete mode 100644 arch/tile/include/arch/trio_shm_def.h + delete mode 100644 arch/tile/include/arch/uart.h + delete mode 100644 arch/tile/include/arch/uart_def.h + delete mode 100644 arch/tile/include/arch/usb_host.h + delete mode 100644 arch/tile/include/arch/usb_host_def.h + delete mode 100644 arch/tile/include/asm/Kbuild + delete mode 100644 arch/tile/include/asm/asm-offsets.h + delete mode 100644 arch/tile/include/asm/atomic.h + delete mode 100644 arch/tile/include/asm/atomic_32.h + delete mode 100644 arch/tile/include/asm/atomic_64.h + delete mode 100644 arch/tile/include/asm/backtrace.h + delete mode 100644 arch/tile/include/asm/barrier.h + delete mode 100644 arch/tile/include/asm/bitops.h + delete mode 100644 arch/tile/include/asm/bitops_32.h + delete mode 100644 arch/tile/include/asm/bitops_64.h + delete mode 100644 arch/tile/include/asm/cache.h + delete mode 100644 arch/tile/include/asm/cacheflush.h + delete mode 100644 arch/tile/include/asm/checksum.h + delete mode 100644 arch/tile/include/asm/cmpxchg.h + delete mode 100644 arch/tile/include/asm/compat.h + delete mode 100644 arch/tile/include/asm/current.h + delete mode 100644 arch/tile/include/asm/delay.h + delete mode 100644 arch/tile/include/asm/device.h + delete mode 100644 arch/tile/include/asm/div64.h + delete mode 100644 arch/tile/include/asm/dma-mapping.h + delete mode 100644 arch/tile/include/asm/dma.h + delete mode 100644 arch/tile/include/asm/elf.h + delete mode 100644 arch/tile/include/asm/fixmap.h + delete mode 100644 arch/tile/include/asm/ftrace.h + delete mode 100644 arch/tile/include/asm/futex.h + delete mode 100644 arch/tile/include/asm/hardirq.h + delete mode 100644 arch/tile/include/asm/hardwall.h + delete mode 100644 arch/tile/include/asm/highmem.h + delete mode 100644 arch/tile/include/asm/homecache.h + delete mode 100644 arch/tile/include/asm/hugetlb.h + delete mode 100644 arch/tile/include/asm/hv_driver.h + delete mode 100644 arch/tile/include/asm/ide.h + delete mode 100644 arch/tile/include/asm/insn.h + delete mode 100644 arch/tile/include/asm/io.h + delete mode 100644 arch/tile/include/asm/irq.h + delete mode 100644 arch/tile/include/asm/irq_work.h + delete mode 100644 arch/tile/include/asm/irqflags.h + delete mode 100644 arch/tile/include/asm/jump_label.h + delete mode 100644 arch/tile/include/asm/kdebug.h + delete mode 100644 arch/tile/include/asm/kexec.h + delete mode 100644 arch/tile/include/asm/kgdb.h + delete mode 100644 arch/tile/include/asm/kmap_types.h + delete mode 100644 arch/tile/include/asm/kprobes.h + delete mode 100644 arch/tile/include/asm/linkage.h + delete mode 100644 arch/tile/include/asm/mmu.h + delete mode 100644 arch/tile/include/asm/mmu_context.h + delete mode 100644 arch/tile/include/asm/mmzone.h + delete mode 100644 arch/tile/include/asm/module.h + delete mode 100644 arch/tile/include/asm/page.h + delete mode 100644 arch/tile/include/asm/pci.h + delete mode 100644 arch/tile/include/asm/percpu.h + delete mode 100644 arch/tile/include/asm/perf_event.h + delete mode 100644 arch/tile/include/asm/pgalloc.h + delete mode 100644 arch/tile/include/asm/pgtable.h + delete mode 100644 arch/tile/include/asm/pgtable_32.h + delete mode 100644 arch/tile/include/asm/pgtable_64.h + delete mode 100644 arch/tile/include/asm/pmc.h + delete mode 100644 arch/tile/include/asm/processor.h + delete mode 100644 arch/tile/include/asm/ptrace.h + delete mode 100644 arch/tile/include/asm/sections.h + delete mode 100644 arch/tile/include/asm/setup.h + delete mode 100644 arch/tile/include/asm/sigframe.h + delete mode 100644 arch/tile/include/asm/signal.h + delete mode 100644 arch/tile/include/asm/smp.h + delete mode 100644 arch/tile/include/asm/spinlock.h + delete mode 100644 arch/tile/include/asm/spinlock_32.h + delete mode 100644 arch/tile/include/asm/spinlock_64.h + delete mode 100644 arch/tile/include/asm/spinlock_types.h + delete mode 100644 arch/tile/include/asm/stack.h + delete mode 100644 arch/tile/include/asm/string.h + delete mode 100644 arch/tile/include/asm/switch_to.h + delete mode 100644 arch/tile/include/asm/syscall.h + delete mode 100644 arch/tile/include/asm/syscalls.h + delete mode 100644 arch/tile/include/asm/thread_info.h + delete mode 100644 arch/tile/include/asm/tile-desc.h + delete mode 100644 arch/tile/include/asm/tile-desc_32.h + delete mode 100644 arch/tile/include/asm/tile-desc_64.h + delete mode 100644 arch/tile/include/asm/timex.h + delete mode 100644 arch/tile/include/asm/tlb.h + delete mode 100644 arch/tile/include/asm/tlbflush.h + delete mode 100644 arch/tile/include/asm/topology.h + delete mode 100644 arch/tile/include/asm/traps.h + delete mode 100644 arch/tile/include/asm/uaccess.h + delete mode 100644 arch/tile/include/asm/unaligned.h + delete mode 100644 arch/tile/include/asm/unistd.h + delete mode 100644 arch/tile/include/asm/user.h + delete mode 100644 arch/tile/include/asm/vdso.h + delete mode 100644 arch/tile/include/asm/vga.h + delete mode 100644 arch/tile/include/asm/word-at-a-time.h + delete mode 100644 arch/tile/include/gxio/common.h + delete mode 100644 arch/tile/include/gxio/dma_queue.h + delete mode 100644 arch/tile/include/gxio/iorpc_globals.h + delete mode 100644 arch/tile/include/gxio/iorpc_mpipe.h + delete mode 100644 arch/tile/include/gxio/iorpc_mpipe_info.h + delete mode 100644 arch/tile/include/gxio/iorpc_trio.h + delete mode 100644 arch/tile/include/gxio/iorpc_uart.h + delete mode 100644 arch/tile/include/gxio/iorpc_usb_host.h + delete mode 100644 arch/tile/include/gxio/kiorpc.h + delete mode 100644 arch/tile/include/gxio/mpipe.h + delete mode 100644 arch/tile/include/gxio/trio.h + delete mode 100644 arch/tile/include/gxio/uart.h + delete mode 100644 arch/tile/include/gxio/usb_host.h + delete mode 100644 arch/tile/include/hv/drv_mpipe_intf.h + delete mode 100644 arch/tile/include/hv/drv_mshim_intf.h + delete mode 100644 arch/tile/include/hv/drv_pcie_rc_intf.h + delete mode 100644 arch/tile/include/hv/drv_srom_intf.h + delete mode 100644 arch/tile/include/hv/drv_trio_intf.h + delete mode 100644 arch/tile/include/hv/drv_uart_intf.h + delete mode 100644 arch/tile/include/hv/drv_usb_host_intf.h + delete mode 100644 arch/tile/include/hv/drv_xgbe_impl.h + delete mode 100644 arch/tile/include/hv/drv_xgbe_intf.h + delete mode 100644 arch/tile/include/hv/hypervisor.h + delete mode 100644 arch/tile/include/hv/iorpc.h + delete mode 100644 arch/tile/include/hv/netio_errors.h + delete mode 100644 arch/tile/include/hv/netio_intf.h + delete mode 100644 arch/tile/include/hv/syscall_public.h + delete mode 100644 arch/tile/include/uapi/arch/abi.h + delete mode 100644 arch/tile/include/uapi/arch/chip.h + delete mode 100644 arch/tile/include/uapi/arch/chip_tilegx.h + delete mode 100644 arch/tile/include/uapi/arch/chip_tilepro.h + delete mode 100644 arch/tile/include/uapi/arch/icache.h + delete mode 100644 arch/tile/include/uapi/arch/interrupts.h + delete mode 100644 arch/tile/include/uapi/arch/interrupts_32.h + delete mode 100644 arch/tile/include/uapi/arch/interrupts_64.h + delete mode 100644 arch/tile/include/uapi/arch/intreg.h + delete mode 100644 arch/tile/include/uapi/arch/opcode.h + delete mode 100644 arch/tile/include/uapi/arch/opcode_tilegx.h + delete mode 100644 arch/tile/include/uapi/arch/opcode_tilepro.h + delete mode 100644 arch/tile/include/uapi/arch/sim.h + delete mode 100644 arch/tile/include/uapi/arch/sim_def.h + delete mode 100644 arch/tile/include/uapi/arch/spr_def.h + delete mode 100644 arch/tile/include/uapi/arch/spr_def_32.h + delete mode 100644 arch/tile/include/uapi/arch/spr_def_64.h + delete mode 100644 arch/tile/include/uapi/asm/Kbuild + delete mode 100644 arch/tile/include/uapi/asm/auxvec.h + delete mode 100644 arch/tile/include/uapi/asm/bitsperlong.h + delete mode 100644 arch/tile/include/uapi/asm/byteorder.h + delete mode 100644 arch/tile/include/uapi/asm/cachectl.h + delete mode 100644 arch/tile/include/uapi/asm/hardwall.h + delete mode 100644 arch/tile/include/uapi/asm/kvm_para.h + delete mode 100644 arch/tile/include/uapi/asm/mman.h + delete mode 100644 arch/tile/include/uapi/asm/ptrace.h + delete mode 100644 arch/tile/include/uapi/asm/setup.h + delete mode 100644 arch/tile/include/uapi/asm/sigcontext.h + delete mode 100644 arch/tile/include/uapi/asm/siginfo.h + delete mode 100644 arch/tile/include/uapi/asm/signal.h + delete mode 100644 arch/tile/include/uapi/asm/stat.h + delete mode 100644 arch/tile/include/uapi/asm/swab.h + delete mode 100644 arch/tile/include/uapi/asm/unistd.h + delete mode 100644 arch/tile/kernel/Makefile + delete mode 100644 arch/tile/kernel/asm-offsets.c + delete mode 100644 arch/tile/kernel/backtrace.c + delete mode 100644 arch/tile/kernel/compat.c + delete mode 100644 arch/tile/kernel/compat_signal.c + delete mode 100644 arch/tile/kernel/early_printk.c + delete mode 100644 arch/tile/kernel/entry.S + delete mode 100644 arch/tile/kernel/ftrace.c + delete mode 100644 arch/tile/kernel/hardwall.c + delete mode 100644 arch/tile/kernel/head_32.S + delete mode 100644 arch/tile/kernel/head_64.S + delete mode 100644 arch/tile/kernel/hvglue.S + delete mode 100644 arch/tile/kernel/hvglue_trace.c + delete mode 100644 arch/tile/kernel/intvec_32.S + delete mode 100644 arch/tile/kernel/intvec_64.S + delete mode 100644 arch/tile/kernel/irq.c + delete mode 100644 arch/tile/kernel/jump_label.c + delete mode 100644 arch/tile/kernel/kgdb.c + delete mode 100644 arch/tile/kernel/kprobes.c + delete mode 100644 arch/tile/kernel/machine_kexec.c + delete mode 100644 arch/tile/kernel/mcount_64.S + delete mode 100644 arch/tile/kernel/messaging.c + delete mode 100644 arch/tile/kernel/module.c + delete mode 100644 arch/tile/kernel/pci-dma.c + delete mode 100644 arch/tile/kernel/pci.c + delete mode 100644 arch/tile/kernel/pci_gx.c + delete mode 100644 arch/tile/kernel/perf_event.c + delete mode 100644 arch/tile/kernel/pmc.c + delete mode 100644 arch/tile/kernel/proc.c + delete mode 100644 arch/tile/kernel/process.c + delete mode 100644 arch/tile/kernel/ptrace.c + delete mode 100644 arch/tile/kernel/reboot.c + delete mode 100644 arch/tile/kernel/regs_32.S + delete mode 100644 arch/tile/kernel/regs_64.S + delete mode 100644 arch/tile/kernel/relocate_kernel_32.S + delete mode 100644 arch/tile/kernel/relocate_kernel_64.S + delete mode 100644 arch/tile/kernel/setup.c + delete mode 100644 arch/tile/kernel/signal.c + delete mode 100644 arch/tile/kernel/single_step.c + delete mode 100644 arch/tile/kernel/smp.c + delete mode 100644 arch/tile/kernel/smpboot.c + delete mode 100644 arch/tile/kernel/stack.c + delete mode 100644 arch/tile/kernel/sys.c + delete mode 100644 arch/tile/kernel/sysfs.c + delete mode 100644 arch/tile/kernel/tile-desc_32.c + delete mode 100644 arch/tile/kernel/tile-desc_64.c + delete mode 100644 arch/tile/kernel/time.c + delete mode 100644 arch/tile/kernel/tlb.c + delete mode 100644 arch/tile/kernel/traps.c + delete mode 100644 arch/tile/kernel/unaligned.c + delete mode 100644 arch/tile/kernel/usb.c + delete mode 100644 arch/tile/kernel/vdso.c + delete mode 100644 arch/tile/kernel/vdso/Makefile + delete mode 100644 arch/tile/kernel/vdso/vdso.S + delete mode 100644 arch/tile/kernel/vdso/vdso.lds.S + delete mode 100644 arch/tile/kernel/vdso/vdso32.S + delete mode 100644 arch/tile/kernel/vdso/vgettimeofday.c + delete mode 100644 arch/tile/kernel/vdso/vrt_sigreturn.S + delete mode 100644 arch/tile/kernel/vmlinux.lds.S + delete mode 100644 arch/tile/kvm/Kconfig + delete mode 100644 arch/tile/lib/Makefile + delete mode 100644 arch/tile/lib/atomic_32.c + delete mode 100644 arch/tile/lib/atomic_asm_32.S + delete mode 100644 arch/tile/lib/cacheflush.c + delete mode 100644 arch/tile/lib/checksum.c + delete mode 100644 arch/tile/lib/cpumask.c + delete mode 100644 arch/tile/lib/delay.c + delete mode 100644 arch/tile/lib/exports.c + delete mode 100644 arch/tile/lib/memchr_32.c + delete mode 100644 arch/tile/lib/memchr_64.c + delete mode 100644 arch/tile/lib/memcpy_32.S + delete mode 100644 arch/tile/lib/memcpy_64.c + delete mode 100644 arch/tile/lib/memcpy_user_64.c + delete mode 100644 arch/tile/lib/memmove.c + delete mode 100644 arch/tile/lib/memset_32.c + delete mode 100644 arch/tile/lib/memset_64.c + delete mode 100644 arch/tile/lib/spinlock_32.c + delete mode 100644 arch/tile/lib/spinlock_64.c + delete mode 100644 arch/tile/lib/spinlock_common.h + delete mode 100644 arch/tile/lib/strchr_32.c + delete mode 100644 arch/tile/lib/strchr_64.c + delete mode 100644 arch/tile/lib/string-endian.h + delete mode 100644 arch/tile/lib/strlen_32.c + delete mode 100644 arch/tile/lib/strlen_64.c + delete mode 100644 arch/tile/lib/strnlen_32.c + delete mode 100644 arch/tile/lib/strnlen_64.c + delete mode 100644 arch/tile/lib/uaccess.c + delete mode 100644 arch/tile/lib/usercopy_32.S + delete mode 100644 arch/tile/lib/usercopy_64.S + delete mode 100644 arch/tile/mm/Makefile + delete mode 100644 arch/tile/mm/elf.c + delete mode 100644 arch/tile/mm/extable.c + delete mode 100644 arch/tile/mm/fault.c + delete mode 100644 arch/tile/mm/highmem.c + delete mode 100644 arch/tile/mm/homecache.c + delete mode 100644 arch/tile/mm/hugetlbpage.c + delete mode 100644 arch/tile/mm/init.c + delete mode 100644 arch/tile/mm/migrate.h + delete mode 100644 arch/tile/mm/migrate_32.S + delete mode 100644 arch/tile/mm/migrate_64.S + delete mode 100644 arch/tile/mm/mmap.c + delete mode 100644 arch/tile/mm/pgtable.c + delete mode 100644 drivers/ata/pata_bf54x.c + delete mode 100644 drivers/char/bfin-otp.c + delete mode 100644 drivers/char/ds1302.c + delete mode 100644 drivers/char/tile-srom.c + delete mode 100644 drivers/clocksource/metag_generic.c + delete mode 100644 drivers/cpufreq/blackfin-cpufreq.c + delete mode 100644 drivers/cpufreq/cris-artpec3-cpufreq.c + delete mode 100644 drivers/cpufreq/cris-etraxfs-cpufreq.c + delete mode 100644 drivers/crypto/bfin_crc.c + delete mode 100644 drivers/crypto/bfin_crc.h + delete mode 100644 drivers/edac/tile_edac.c + delete mode 100644 drivers/gpio/gpio-etraxfs.c + delete mode 100644 drivers/i2c/busses/i2c-bfin-twi.c + delete mode 100644 drivers/input/keyboard/bf54x-keys.c + delete mode 100644 drivers/input/misc/bfin_rotary.c + delete mode 100644 drivers/irqchip/irq-metag-ext.c + delete mode 100644 drivers/irqchip/irq-metag.c + delete mode 100644 drivers/media/platform/arv.c + delete mode 100644 drivers/media/platform/blackfin/Kconfig + delete mode 100644 drivers/media/platform/blackfin/Makefile + delete mode 100644 drivers/media/platform/blackfin/bfin_capture.c + delete mode 100644 drivers/media/platform/blackfin/ppi.c + delete mode 100644 drivers/mmc/host/bfin_sdh.c + delete mode 100644 drivers/net/can/bfin_can.c + delete mode 100644 drivers/net/cris/Makefile + delete mode 100644 drivers/net/cris/eth_v10.c + delete mode 100644 drivers/net/ethernet/adi/Kconfig + delete mode 100644 drivers/net/ethernet/adi/Makefile + delete mode 100644 drivers/net/ethernet/adi/bfin_mac.c + delete mode 100644 drivers/net/ethernet/adi/bfin_mac.h + delete mode 100644 drivers/net/ethernet/tile/Kconfig + delete mode 100644 drivers/net/ethernet/tile/Makefile + delete mode 100644 drivers/net/ethernet/tile/tilegx.c + delete mode 100644 drivers/net/ethernet/tile/tilepro.c + delete mode 100644 drivers/pcmcia/bfin_cf_pcmcia.c + delete mode 100644 drivers/pcmcia/m32r_cfc.c + delete mode 100644 drivers/pcmcia/m32r_cfc.h + delete mode 100644 drivers/pcmcia/m32r_pcc.c + delete mode 100644 drivers/pcmcia/m32r_pcc.h + delete mode 100644 drivers/pinctrl/pinctrl-adi2-bf54x.c + delete mode 100644 drivers/pinctrl/pinctrl-adi2-bf60x.c + delete mode 100644 drivers/pinctrl/pinctrl-adi2.c + delete mode 100644 drivers/pinctrl/pinctrl-adi2.h + delete mode 100644 drivers/pwm/pwm-bfin.c + delete mode 100644 drivers/rtc/rtc-bfin.c + delete mode 100644 drivers/rtc/rtc-tile.c + delete mode 100644 drivers/spi/spi-adi-v3.c + delete mode 100644 drivers/spi/spi-bfin-sport.c + delete mode 100644 drivers/spi/spi-bfin5xx.c + delete mode 100644 drivers/staging/iio/trigger/Kconfig + delete mode 100644 drivers/staging/iio/trigger/Makefile + delete mode 100644 drivers/staging/iio/trigger/iio-trig-bfin-timer.c + delete mode 100644 drivers/staging/iio/trigger/iio-trig-bfin-timer.h + delete mode 100644 drivers/tty/bfin_jtag_comm.c + delete mode 100644 drivers/tty/hvc/hvc_bfin_jtag.c + delete mode 100644 drivers/tty/hvc/hvc_tile.c + delete mode 100644 drivers/tty/metag_da.c + delete mode 100644 drivers/tty/serial/bfin_sport_uart.c + delete mode 100644 drivers/tty/serial/bfin_sport_uart.h + delete mode 100644 drivers/tty/serial/bfin_uart.c + delete mode 100644 drivers/tty/serial/crisv10.c + delete mode 100644 drivers/tty/serial/crisv10.h + delete mode 100644 drivers/tty/serial/etraxfs-uart.c + delete mode 100644 drivers/tty/serial/m32r_sio.c + delete mode 100644 drivers/tty/serial/m32r_sio_reg.h + delete mode 100644 drivers/tty/serial/tilegx.c + delete mode 100644 drivers/usb/host/ehci-tilegx.c + delete mode 100644 drivers/usb/host/ohci-tilegx.c + delete mode 100644 drivers/usb/musb/blackfin.c + delete mode 100644 drivers/usb/musb/blackfin.h + delete mode 100644 drivers/video/fbdev/bf537-lq035.c + delete mode 100644 drivers/video/fbdev/bf54x-lq043fb.c + delete mode 100644 drivers/video/fbdev/bfin-lq035q1-fb.c + delete mode 100644 drivers/video/fbdev/bfin-t350mcqb-fb.c + delete mode 100644 drivers/video/fbdev/bfin_adv7393fb.c + delete mode 100644 drivers/video/fbdev/bfin_adv7393fb.h + delete mode 100644 drivers/video/logo/logo_blackfin_clut224.ppm + delete mode 100644 drivers/video/logo/logo_blackfin_vga16.ppm + delete mode 100644 drivers/video/logo/logo_m32r_clut224.ppm + delete mode 100644 drivers/watchdog/bfin_wdt.c + delete mode 100644 include/clocksource/metag_generic.h + delete mode 100644 include/linux/bfin_mac.h + delete mode 100644 include/linux/irqchip/metag-ext.h + delete mode 100644 include/linux/irqchip/metag.h + delete mode 100644 include/linux/platform_data/bfin_rotary.h + delete mode 100644 include/linux/platform_data/pinctrl-adi2.h + delete mode 100644 include/linux/usb/tilegx.h + delete mode 100644 include/media/blackfin/bfin_capture.h + delete mode 100644 include/media/blackfin/ppi.h + delete mode 100644 lib/raid6/tilegx.uc + delete mode 100644 samples/blackfin/Makefile + delete mode 100644 samples/blackfin/gptimers-example.c + delete mode 100644 tools/arch/frv/include/uapi/asm/bitsperlong.h + delete mode 100644 tools/arch/frv/include/uapi/asm/mman.h + delete mode 100644 tools/arch/m32r/include/uapi/asm/bitsperlong.h + delete mode 100644 tools/arch/m32r/include/uapi/asm/mman.h + delete mode 100644 tools/arch/mn10300/include/uapi/asm/bitsperlong.h + delete mode 100644 tools/arch/mn10300/include/uapi/asm/mman.h + delete mode 100644 tools/arch/score/include/uapi/asm/bitsperlong.h + delete mode 100644 tools/arch/score/include/uapi/asm/mman.h + delete mode 100644 tools/arch/tile/include/asm/barrier.h + delete mode 100644 tools/arch/tile/include/uapi/asm/bitsperlong.h + delete mode 100644 tools/arch/tile/include/uapi/asm/mman.h +Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge arm/for-next +Already up to date. +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. + drivers/perf/arm_spe_pmu.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) +Merging arm-soc/for-next (e83e3b9ac6f3 Merge branch 'next/soc' into for-next) +$ git merge arm-soc/for-next +Auto-merging include/clocksource/timer-ti-dm.h +Removing drivers/mtd/nand/pxa3xx_nand.c +Auto-merging drivers/cpufreq/Makefile +Auto-merging drivers/clocksource/timer-ti-dm.c +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Auto-merging arch/arm/mach-omap1/i2c.h +Removing arch/arm/mach-imx/epit.c +Removing arch/arm/boot/dts/samsung_k3pe0e000b.dtsi +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/mtd/pxa3xx-nand.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 +Merge made by the 'recursive' strategy. + .mailmap | 1 + + 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 + + .../devicetree/bindings/arm/npcm/npcm.txt | 6 + + Documentation/devicetree/bindings/arm/omap/mpu.txt | 16 + + .../devicetree/bindings/arm/samsung/pmu.txt | 6 + + .../bindings/arm/samsung/samsung-boards.txt | 4 + + Documentation/devicetree/bindings/arm/stm32.txt | 1 + + Documentation/devicetree/bindings/arm/xilinx.txt | 56 + + .../devicetree/bindings/crypto/fsl-sec4.txt | 17 + + .../devicetree/bindings/dma/brcm,bcm2835-dma.txt | 4 +- + .../devicetree/bindings/mailbox/mailbox.txt | 28 + + .../bindings/memory-controllers/fsl/ifc.txt | 6 +- + .../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/pinctrl/st,stm32-pinctrl.txt | 1 + + .../devicetree/bindings/sound/brcm,bcm2835-i2s.txt | 9 +- + Documentation/{arm/CCN.txt => perf/arm-ccn.txt} | 0 + MAINTAINERS | 82 +- + arch/arm/Kconfig | 54 +- + arch/arm/Makefile | 1 + + arch/arm/arm-soc-for-next-contents.txt | 155 ++ + arch/arm/boot/dts/Makefile | 30 +- + 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/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/armada-370-netgear-rn102.dts | 2 +- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 2 +- + arch/arm/boot/dts/armada-388-clearfog.dtsi | 7 +- + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 2 +- + 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/at91sam9260ek.dts | 2 +- + arch/arm/boot/dts/at91sam9263ek.dts | 2 +- + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 2 +- + arch/arm/boot/dts/at91sam9rl.dtsi | 3 +- + arch/arm/boot/dts/at91sam9rlek.dts | 3 +- + arch/arm/boot/dts/atlas7-evb.dts | 2 +- + 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/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.dtsi | 10 +- + 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/exynos5422-cpus.dtsi | 16 - + arch/arm/boot/dts/exynos5440.dtsi | 514 ++--- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 5 +- + arch/arm/boot/dts/exynos5800.dtsi | 5 +- + 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 | 2 +- + 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 | 9 +- + 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-pogoplug-series-4.dts | 2 +- + 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/motorola-cpcap-mapphone.dtsi | 13 + + arch/arm/boot/dts/nuvoton-npcm750-evb.dts | 35 + + arch/arm/boot/dts/nuvoton-npcm750.dtsi | 165 ++ + arch/arm/boot/dts/omap3-n9.dts | 7 + + arch/arm/boot/dts/omap3.dtsi | 1 + + arch/arm/boot/dts/omap4-droid4-xt894.dts | 100 +- + arch/arm/boot/dts/omap443x.dtsi | 2 - + arch/arm/boot/dts/omap4460.dtsi | 2 - + arch/arm/boot/dts/omap5.dtsi | 2 - + 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/rk3288.dtsi | 2 + + arch/arm/boot/dts/sama5d34ek.dts | 2 +- + arch/arm/boot/dts/sama5d4.dtsi | 2 +- + arch/arm/boot/dts/samsung_k3pe0e000b.dtsi | 68 - + 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/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 | 54 +- + 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 | 86 +- + 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/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 | 8 + + arch/arm/configs/mxs_defconfig | 14 +- + arch/arm/configs/omap2plus_defconfig | 3 + + 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/stm32_defconfig | 3 + + 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 | 11 +- + 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 | 58 +- + 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-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 | 48 + + arch/arm/mach-npcm/Makefile | 3 + + 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/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 | 387 ++++ + 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-socfpga/pm.c | 1 - + arch/arm/mach-stm32/Kconfig | 46 +- + arch/arm/mach-stm32/board-dt.c | 11 +- + arch/arm/mach-ux500/cpu-db8500.c | 3 + + arch/arm/plat-omap/Kconfig | 6 - + arch/arm/plat-omap/Makefile | 1 - + 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-qds.dts | 6 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 6 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 83 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 6 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 4 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 66 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts | 6 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 4 +- + 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 | 14 +- + 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 | 38 +- + 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 | 81 +- + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 16 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 8 +- + .../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 | 124 +- + .../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 | 135 +- + .../arm64/boot/dts/socionext/uniphier-pxs3-ref.dts | 14 +- + arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 14 +- + 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 | 8 +- + 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 | 202 ++ + drivers/clk/imx/clk-imx7d.c | 3 + + drivers/clocksource/Kconfig | 3 + + drivers/clocksource/Makefile | 1 + + .../dmtimer.c => drivers/clocksource/timer-ti-dm.c | 293 ++- + 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 | 342 ++++ + 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/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 | 10 +- + drivers/reset/reset-meson.c | 22 +- + drivers/reset/reset-simple.c | 2 + + drivers/soc/imx/gpc.c | 1 + + drivers/soc/samsung/exynos-pmu.c | 7 + + 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/mfd/stm32f7-rcc.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/scmi_protocol.h | 277 +++ + include/linux/serial_s3c.h | 17 +- + include/linux/soc/samsung/exynos-pmu.h | 5 +- + include/linux/soc/samsung/exynos-regs-pmu.h | 6 +- + 683 files changed, 28105 insertions(+), 14384 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 + delete mode 100644 Documentation/devicetree/bindings/mtd/pxa3xx-nand.txt + rename Documentation/devicetree/bindings/{arm/ccn.txt => perf/arm-ccn.txt} (100%) + 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-npcm750-evb.dts + create mode 100644 arch/arm/boot/dts/nuvoton-npcm750.dtsi + 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/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/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/soc/ti/pm33xx.c + rename arch/arm/plat-omap/include/plat/dmtimer.h => include/clocksource/timer-ti-dm.h (87%) + 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 (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values) +$ git merge alpine/alpine/for-next +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (5f1dd1796c7c Merge branch 'v4.17/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/meson8.dtsi | 9 + + arch/arm/boot/dts/meson8b-odroidc1.dts | 88 +++++++ + arch/arm/boot/dts/meson8b.dtsi | 59 ++++- + 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 | 3 +- + .../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/configs/defconfig | 1 + + drivers/firmware/meson/meson_sm.c | 25 +- + 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 +- + 45 files changed, 795 insertions(+), 1199 deletions(-) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi +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 (dc39260ac782 Merge branch 'at91-soc' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/abelloni/linux 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 (dee23d344a73 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 (a1110f3c567f Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + 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 | 39 +--------- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 39 +--------- + 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 | 83 ++++------------------ + 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 | 39 +--------- + 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/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-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 +- + .../boot/dts/marvell/armada-3720-espressobin.dts | 3 + + arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 37 +++++++--- + 124 files changed, 169 insertions(+), 2604 deletions(-) +Merging omap/for-next (03e545376c13 Merge branch 'omap-for-v4.17/dt' into for-next) +$ git merge omap/for-next +Resolved 'arch/arm/boot/dts/logicpd-torpedo-som.dtsi' using previous resolution. +Auto-merging arch/arm/configs/multi_v7_defconfig +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 5a0dba100e41] Merge remote-tracking branch 'omap/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/omap/ctrl.txt | 1 + + 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/logicpd-torpedo-som.dtsi | 1 + + arch/arm/boot/dts/omap4-droid4-xt894.dts | 103 ++++++++++++++++++++- + arch/arm/boot/dts/omap5-board-common.dtsi | 4 +- + arch/arm/boot/dts/omap5.dtsi | 22 +++++ + arch/arm/boot/dts/omap54xx-clocks.dtsi | 10 ++ + arch/arm/configs/multi_v7_defconfig | 35 +++++++ + arch/arm/configs/omap2plus_defconfig | 91 ++++++++++-------- + arch/arm/mach-omap2/control.c | 20 +++- + arch/arm/plat-omap/sram.c | 19 ++++ + include/linux/clk/ti.h | 1 + + 14 files changed, 262 insertions(+), 51 deletions(-) +Merging reset/reset/next (a2d34cbe8004 reset: stm32mp1: Enable stm32mp1 reset driver) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/reset/st,stm32mp1-rcc.txt | 6 ++ + drivers/reset/Kconfig | 7 ++ + drivers/reset/Makefile | 1 + + drivers/reset/core.c | 72 ++++++++++++- + drivers/reset/reset-stm32mp1.c | 115 +++++++++++++++++++++ + drivers/reset/reset-uniphier.c | 3 + + include/dt-bindings/reset/stm32mp1-resets.h | 108 +++++++++++++++++++ + include/linux/reset-controller.h | 28 +++++ + 8 files changed, 339 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/reset/st,stm32mp1-rcc.txt + create mode 100644 drivers/reset/reset-stm32mp1.c + create mode 100644 include/dt-bindings/reset/stm32mp1-resets.h +Merging qcom/for-next (186d88395e05 Merge tag 'qcom-arm64-defconfig-for-4.17' into all-for-4.17-final) +$ git merge qcom/for-next +Resolved 'arch/arm64/configs/defconfig' using previous resolution. +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Auto-merging arch/arm64/boot/dts/qcom/msm8996.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2a8f03530478] Merge remote-tracking branch 'qcom/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + Documentation/devicetree/bindings/arm/qcom.txt | 1 + + arch/arm/boot/dts/Makefile | 1 + + 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/arm64/boot/dts/qcom/msm8916.dtsi | 60 +++++++++++++++++++-- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 23 +++++--- + arch/arm64/configs/defconfig | 11 ++++ + drivers/soc/qcom/Kconfig | 1 + + drivers/soc/qcom/rmtfs_mem.c | 34 ++++++++++++ + drivers/soc/qcom/wcnss_ctrl.c | 2 +- + 13 files changed, 215 insertions(+), 12 deletions(-) + create mode 100644 arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts +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 +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 18 +- + .../bindings/power/renesas,rcar-sysc.txt | 2 + + .../devicetree/bindings/reset/renesas,rst.txt | 2 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/emev2-kzm9d.dts | 8 +- + 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/configs/shmobile_defconfig | 9 +- + 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/arm64/Kconfig.platforms | 12 + + 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/configs/defconfig | 6 + + 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 + + include/dt-bindings/power/r8a77965-sysc.h | 30 + + include/dt-bindings/power/r8a77980-sysc.h | 43 + + 57 files changed, 11006 insertions(+), 7449 deletions(-) + create mode 100644 arch/arm/boot/dts/r8a7790-stout.dts + 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 drivers/soc/renesas/r8a77965-sysc.c + create mode 100644 drivers/soc/renesas/r8a77980-sysc.c + create mode 100644 include/dt-bindings/power/r8a77965-sysc.h + create mode 100644 include/dt-bindings/power/r8a77980-sysc.h +Merging rockchip/for-next (bba558b5d864 Merge branch 'v4.17-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/rockchip.txt | 12 + + .../bindings/clock/rockchip,rk3328-cru.txt | 1 + + 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/rk3288.dtsi | 8 +- + arch/arm/mach-rockchip/platsmp.c | 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-firefly.dts | 8 + + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 13 +- + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 75 ++++- + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 32 +++ + .../dts/rockchip/rk3399-sapphire-excavator.dts | 44 ++- + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dts | 12 + + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 75 +++-- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 79 ++++- + drivers/clk/rockchip/clk-mmc-phase.c | 62 +++- + drivers/clk/rockchip/clk-rk3328.c | 67 +++-- + drivers/clk/rockchip/clk-rk3399.c | 1 + + drivers/clk/rockchip/clk.c | 22 +- + drivers/soc/rockchip/grf.c | 28 ++ + drivers/soc/rockchip/pm_domains.c | 95 +++--- + include/dt-bindings/clock/rk3328-cru.h | 1 - + 31 files changed, 1285 insertions(+), 160 deletions(-) + 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 +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 +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4412-midas.dtsi | 2 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 18 ++++++++++++++++++ + arch/arm/boot/dts/exynos5250-snow.dts | 11 +++++++++++ + arch/arm/boot/dts/exynos5250.dtsi | 5 +++++ + arch/arm/boot/dts/exynos5420-peach-pit.dts | 17 +++++++++++++++++ + arch/arm/boot/dts/exynos5800-peach-pi.dts | 17 +++++++++++++++++ + arch/arm/mach-exynos/pm.c | 8 ++------ + 7 files changed, 71 insertions(+), 7 deletions(-) +Merging sunxi/sunxi/for-next (2d567752a056 Merge branch 'sunxi/clk-for-4.17' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/arm/cpus.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + .../devicetree/bindings/arm/sunxi/smp-sram.txt | 44 + + .../devicetree/bindings/clock/sunxi-ccu.txt | 4 + + .../devicetree/bindings/gpu/arm,mali-utgard.txt | 1 + + .../devicetree/bindings/watchdog/sunxi-wdt.txt | 6 +- + MAINTAINERS | 4 +- + arch/arm/boot/dts/Makefile | 3 + + 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/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 | 66 +- + .../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/mach-sunxi/Kconfig | 7 + + arch/arm/mach-sunxi/Makefile | 3 + + arch/arm/mach-sunxi/mc_smp.c | 856 ++++++++++++++ + 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 +++ + 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 ++ + 145 files changed, 5383 insertions(+), 332 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/sunxi/smp-sram.txt + 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/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 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 (cb1845fc9f80 Merge branch for-4.17/clk into for-next) +$ git merge tegra/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/tegra.txt | 16 + + .../bindings/arm/tegra/nvidia,tegra186-pmc.txt | 2 + + .../devicetree/bindings/bus/nvidia,tegra20-gmi.txt | 6 +- + .../bindings/phy/nvidia,tegra20-usb-phy.txt | 4 +- + MAINTAINERS | 3 +- + arch/arm/boot/dts/Makefile | 1 + + 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/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/configs/defconfig | 6 + + 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/firmware/tegra/bpmp.c | 144 +- + drivers/soc/tegra/Kconfig | 10 + + drivers/soc/tegra/pmc.c | 98 +- + include/dt-bindings/clock/tegra194-clock.h | 321 +++ + include/dt-bindings/clock/tegra210-car.h | 2 +- + include/dt-bindings/gpio/tegra194-gpio.h | 61 + + include/dt-bindings/power/tegra194-powergate.h | 35 + + include/dt-bindings/reset/tegra194-reset.h | 152 ++ + include/linux/clk/tegra.h | 1 + + include/soc/tegra/bpmp.h | 4 +- + 48 files changed, 4157 insertions(+), 290 deletions(-) + 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/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 include/dt-bindings/clock/tegra194-clock.h + create mode 100644 include/dt-bindings/gpio/tegra194-gpio.h + create mode 100644 include/dt-bindings/power/tegra194-powergate.h + create mode 100644 include/dt-bindings/reset/tegra194-reset.h +Merging arm64/for-next/core (af4a81b9cd84 arm64: fpsimd: Fix bad si_code for undiagnosed SIGFPE) +$ git merge arm64/for-next/core +Resolved 'include/uapi/asm-generic/siginfo.h' using previous resolution. +Auto-merging scripts/kallsyms.c +Auto-merging kernel/signal.c +Auto-merging include/uapi/asm-generic/siginfo.h +CONFLICT (content): Merge conflict in include/uapi/asm-generic/siginfo.h +Auto-merging arch/arm64/kernel/cpu_errata.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 325e7741cd7b] Merge remote-tracking branch 'arm64/for-next/core' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm64/cpu-feature-registers.txt | 18 +- + Documentation/arm64/elf_hwcaps.txt | 16 ++ + arch/arm64/Kconfig | 19 +-- + arch/arm64/Makefile | 15 +- + arch/arm64/include/asm/assembler.h | 34 +--- + arch/arm64/include/asm/cache.h | 10 +- + arch/arm64/include/asm/cacheflush.h | 3 + + arch/arm64/include/asm/cpucaps.h | 5 +- + arch/arm64/include/asm/cpufeature.h | 4 + + arch/arm64/include/asm/dma-direct.h | 43 +++++ + arch/arm64/include/asm/esr.h | 9 + + arch/arm64/include/asm/module.h | 2 + + arch/arm64/include/asm/pgtable-hwdef.h | 1 + + arch/arm64/include/asm/sysreg.h | 3 + + arch/arm64/include/asm/system_misc.h | 11 -- + arch/arm64/include/asm/traps.h | 8 +- + 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 | 30 +++- + arch/arm64/kernel/cpufeature.c | 60 +++++-- + arch/arm64/kernel/cpuinfo.c | 4 + + arch/arm64/kernel/debug-monitors.c | 3 +- + arch/arm64/kernel/fpsimd.c | 32 ++-- + 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/ptrace.c | 2 +- + arch/arm64/kernel/reloc_test_core.c | 4 +- + arch/arm64/kernel/reloc_test_syms.S | 12 +- + arch/arm64/kernel/signal.c | 7 +- + arch/arm64/kernel/signal32.c | 13 +- + arch/arm64/kernel/sys_compat.c | 21 ++- + arch/arm64/kernel/traps.c | 72 +++++--- + arch/arm64/lib/Makefile | 3 +- + arch/arm64/mm/cache.S | 21 ++- + arch/arm64/mm/dma-mapping.c | 17 ++ + arch/arm64/mm/fault.c | 233 +++++++++++--------------- + arch/arm64/mm/init.c | 3 +- + arch/arm64/mm/proc.S | 9 +- + arch/x86/kernel/signal_compat.c | 2 +- + drivers/acpi/arm64/iort.c | 12 -- + include/asm-generic/vmlinux.lds.h | 1 - + include/linux/sizes.h | 4 + + include/uapi/asm-generic/siginfo.h | 3 +- + kernel/signal.c | 4 - + scripts/kallsyms.c | 1 + + 48 files changed, 617 insertions(+), 374 deletions(-) + create mode 100644 arch/arm64/include/asm/dma-direct.h +Merging clk/clk-next (8b229cb16695 Merge branch 'clk-hisi' into clk-next) +$ git merge clk/clk-next +Auto-merging include/linux/clk/ti.h +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/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 | 26 +- + drivers/clk/Makefile | 6 +- + drivers/clk/clk-divider.c | 58 +- + drivers/clk/clk-gpio.c | 4 +- + drivers/clk/clk-mux.c | 75 +- + 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 | 901 +++++++++ + 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 | 552 +++++ + 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-sh73a0.c | 6 +- + 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 | 11 + + 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 + + 133 files changed, 11846 insertions(+), 3086 deletions(-) + 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-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 + 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 (51fd62769d41 m68k/defconfig: Update defconfigs for v4.16-rc5) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/configs/amiga_defconfig | 12 ++++- + arch/m68k/configs/apollo_defconfig | 12 ++++- + arch/m68k/configs/atari_defconfig | 12 ++++- + arch/m68k/configs/bvme6000_defconfig | 12 ++++- + arch/m68k/configs/hp300_defconfig | 12 ++++- + arch/m68k/configs/mac_defconfig | 12 ++++- + arch/m68k/configs/multi_defconfig | 12 ++++- + arch/m68k/configs/mvme147_defconfig | 12 ++++- + arch/m68k/configs/mvme16x_defconfig | 12 ++++- + arch/m68k/configs/q40_defconfig | 12 ++++- + arch/m68k/configs/sun3_defconfig | 12 ++++- + arch/m68k/configs/sun3x_defconfig | 12 ++++- + arch/m68k/kernel/time.c | 2 +- + arch/m68k/mac/baboon.c | 27 ++++------- + arch/m68k/mac/config.c | 10 ++-- + arch/m68k/mm/init.c | 27 ----------- + drivers/macintosh/via-pmu68k.c | 89 ++++++++++++++++++++++++------------ + drivers/zorro/zorro.c | 12 +++++ + 18 files changed, 220 insertions(+), 91 deletions(-) +Merging m68knommu/for-next (661e50bc8532 Linux 4.16-rc4) +$ git merge m68knommu/for-next +Already up to date. +Merging metag/for-next (8d06c3302635 i2c: img-scb: Drop METAG dependency) +$ git merge metag/for-next +Already up to date. +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 (b2ed33a89567 MIPS: pm-cps: Block system suspend when a JTAG probe is present) +$ git merge mips-james/mips-next +Auto-merging arch/mips/include/asm/mipsregs.h +Auto-merging arch/mips/cavium-octeon/octeon-irq.c +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 4 + + arch/mips/Makefile | 41 +++- + arch/mips/alchemy/board-gpr.c | 2 +- + arch/mips/alchemy/board-mtx1.c | 2 +- + arch/mips/ar7/platform.c | 14 +- + 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/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/crypto/Makefile | 6 + + arch/mips/crypto/crc32-mips.c | 348 ++++++++++++++++++++++++++++++ + arch/mips/include/asm/cpu-features.h | 5 +- + arch/mips/include/asm/isa-rev.h | 24 +++ + 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/mm/init.c | 2 - + arch/mips/net/bpf_jit_asm.S | 9 +- + arch/mips/txx9/rbtx4927/setup.c | 2 +- + arch/mips/vdso/elf.S | 10 +- + crypto/Kconfig | 9 + + drivers/firmware/broadcom/Kconfig | 1 + + drivers/firmware/broadcom/bcm47xx_sprom.c | 18 +- + 44 files changed, 1016 insertions(+), 66 deletions(-) + create mode 100644 arch/mips/crypto/Makefile + create mode 100644 arch/mips/crypto/crc32-mips.c + create mode 100644 arch/mips/include/asm/isa-rev.h +Merging nds32/next (6fc61ee69433 nds32: To use the generic dump_stack()) +$ git merge nds32/next +Auto-merging include/asm-generic/io.h +Auto-merging drivers/video/console/Kconfig +Auto-merging drivers/irqchip/Makefile +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../interrupt-controller/andestech,ativic32.txt | 19 + + .../devicetree/bindings/nds32/andestech-boards | 40 + + Documentation/devicetree/bindings/nds32/atl2c.txt | 28 + + Documentation/devicetree/bindings/nds32/cpus.txt | 38 + + .../bindings/timer/andestech,atcpit100-timer.txt | 33 + + MAINTAINERS | 11 + + arch/nds32/Kconfig | 103 +++ + arch/nds32/Kconfig.cpu | 174 ++++ + arch/nds32/Makefile | 67 ++ + arch/nds32/boot/Makefile | 15 + + arch/nds32/boot/dts/Makefile | 8 + + arch/nds32/boot/dts/ae3xx.dts | 85 ++ + arch/nds32/configs/defconfig | 104 +++ + arch/nds32/include/asm/Kbuild | 55 ++ + arch/nds32/include/asm/assembler.h | 39 + + arch/nds32/include/asm/barrier.h | 15 + + arch/nds32/include/asm/bitfield.h | 963 +++++++++++++++++++++ + arch/nds32/include/asm/cache.h | 12 + + arch/nds32/include/asm/cache_info.h | 13 + + arch/nds32/include/asm/cacheflush.h | 44 + + arch/nds32/include/asm/current.h | 12 + + arch/nds32/include/asm/delay.h | 39 + + arch/nds32/include/asm/dma-mapping.h | 14 + + arch/nds32/include/asm/elf.h | 171 ++++ + arch/nds32/include/asm/fixmap.h | 29 + + arch/nds32/include/asm/futex.h | 103 +++ + arch/nds32/include/asm/highmem.h | 65 ++ + arch/nds32/include/asm/io.h | 83 ++ + arch/nds32/include/asm/irqflags.h | 36 + + arch/nds32/include/asm/l2_cache.h | 137 +++ + arch/nds32/include/asm/linkage.h | 11 + + arch/nds32/include/asm/memory.h | 105 +++ + arch/nds32/include/asm/mmu.h | 12 + + arch/nds32/include/asm/mmu_context.h | 68 ++ + arch/nds32/include/asm/module.h | 11 + + arch/nds32/include/asm/nds32.h | 81 ++ + arch/nds32/include/asm/page.h | 67 ++ + arch/nds32/include/asm/pgalloc.h | 96 ++ + arch/nds32/include/asm/pgtable.h | 409 +++++++++ + arch/nds32/include/asm/proc-fns.h | 44 + + arch/nds32/include/asm/processor.h | 103 +++ + arch/nds32/include/asm/ptrace.h | 77 ++ + arch/nds32/include/asm/shmparam.h | 19 + + arch/nds32/include/asm/string.h | 17 + + arch/nds32/include/asm/swab.h | 35 + + arch/nds32/include/asm/syscall.h | 188 ++++ + arch/nds32/include/asm/syscalls.h | 13 + + arch/nds32/include/asm/thread_info.h | 76 ++ + arch/nds32/include/asm/tlb.h | 28 + + arch/nds32/include/asm/tlbflush.h | 47 + + arch/nds32/include/asm/uaccess.h | 283 ++++++ + arch/nds32/include/asm/unistd.h | 6 + + arch/nds32/include/asm/vdso.h | 24 + + arch/nds32/include/asm/vdso_datapage.h | 36 + + arch/nds32/include/asm/vdso_timer_info.h | 14 + + arch/nds32/include/uapi/asm/Kbuild | 29 + + arch/nds32/include/uapi/asm/auxvec.h | 12 + + arch/nds32/include/uapi/asm/byteorder.h | 13 + + arch/nds32/include/uapi/asm/cachectl.h | 14 + + arch/nds32/include/uapi/asm/param.h | 11 + + arch/nds32/include/uapi/asm/ptrace.h | 25 + + arch/nds32/include/uapi/asm/sigcontext.h | 60 ++ + arch/nds32/include/uapi/asm/unistd.h | 11 + + arch/nds32/kernel/Makefile | 23 + + arch/nds32/kernel/asm-offsets.c | 28 + + arch/nds32/kernel/atl2c.c | 64 ++ + arch/nds32/kernel/cacheinfo.c | 49 ++ + arch/nds32/kernel/devtree.c | 19 + + arch/nds32/kernel/dma.c | 477 ++++++++++ + arch/nds32/kernel/ex-entry.S | 157 ++++ + arch/nds32/kernel/ex-exit.S | 184 ++++ + arch/nds32/kernel/ex-scall.S | 98 +++ + arch/nds32/kernel/head.S | 188 ++++ + arch/nds32/kernel/irq.c | 9 + + arch/nds32/kernel/module.c | 278 ++++++ + arch/nds32/kernel/nds32_ksyms.c | 31 + + arch/nds32/kernel/process.c | 208 +++++ + arch/nds32/kernel/ptrace.c | 119 +++ + arch/nds32/kernel/setup.c | 363 ++++++++ + arch/nds32/kernel/signal.c | 324 +++++++ + arch/nds32/kernel/stacktrace.c | 47 + + arch/nds32/kernel/sys_nds32.c | 50 ++ + arch/nds32/kernel/syscall_table.c | 17 + + arch/nds32/kernel/time.c | 11 + + arch/nds32/kernel/traps.c | 430 +++++++++ + arch/nds32/kernel/vdso.c | 230 +++++ + arch/nds32/kernel/vdso/Makefile | 82 ++ + arch/nds32/kernel/vdso/datapage.S | 21 + + arch/nds32/kernel/vdso/gen_vdso_offsets.sh | 15 + + arch/nds32/kernel/vdso/gettimeofday.c | 270 ++++++ + arch/nds32/kernel/vdso/note.S | 11 + + arch/nds32/kernel/vdso/sigreturn.S | 19 + + arch/nds32/kernel/vdso/vdso.S | 18 + + arch/nds32/kernel/vdso/vdso.lds.S | 75 ++ + arch/nds32/kernel/vmlinux.lds.S | 57 ++ + arch/nds32/lib/Makefile | 3 + + arch/nds32/lib/clear_user.S | 42 + + arch/nds32/lib/copy_from_user.S | 45 + + arch/nds32/lib/copy_page.S | 37 + + arch/nds32/lib/copy_template.S | 69 ++ + arch/nds32/lib/copy_to_user.S | 45 + + arch/nds32/lib/memcpy.S | 30 + + arch/nds32/lib/memmove.S | 70 ++ + arch/nds32/lib/memset.S | 33 + + arch/nds32/lib/memzero.S | 18 + + arch/nds32/mm/Makefile | 7 + + arch/nds32/mm/alignment.c | 576 ++++++++++++ + arch/nds32/mm/cacheflush.c | 322 +++++++ + arch/nds32/mm/extable.c | 16 + + arch/nds32/mm/fault.c | 410 +++++++++ + arch/nds32/mm/highmem.c | 79 ++ + arch/nds32/mm/init.c | 277 ++++++ + arch/nds32/mm/ioremap.c | 62 ++ + arch/nds32/mm/mm-nds32.c | 90 ++ + arch/nds32/mm/mmap.c | 73 ++ + arch/nds32/mm/proc.c | 533 ++++++++++++ + arch/nds32/mm/tlb.c | 50 ++ + arch/nios2/include/asm/io.h | 1 + + arch/openrisc/include/asm/io.h | 3 +- + arch/sparc/include/asm/io_32.h | 5 - + arch/sparc/kernel/ioport.c | 4 +- + arch/xtensa/include/asm/io.h | 1 + + drivers/clocksource/Kconfig | 9 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/timer-atcpit100.c | 266 ++++++ + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-ativic32.c | 107 +++ + drivers/net/ethernet/faraday/Kconfig | 8 +- + drivers/video/console/Kconfig | 2 +- + include/asm-generic/io.h | 18 +- + 130 files changed, 11864 insertions(+), 21 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/andestech,ativic32.txt + create mode 100644 Documentation/devicetree/bindings/nds32/andestech-boards + create mode 100644 Documentation/devicetree/bindings/nds32/atl2c.txt + create mode 100644 Documentation/devicetree/bindings/nds32/cpus.txt + create mode 100644 Documentation/devicetree/bindings/timer/andestech,atcpit100-timer.txt + create mode 100644 arch/nds32/Kconfig + create mode 100644 arch/nds32/Kconfig.cpu + create mode 100644 arch/nds32/Makefile + create mode 100644 arch/nds32/boot/Makefile + create mode 100644 arch/nds32/boot/dts/Makefile + create mode 100644 arch/nds32/boot/dts/ae3xx.dts + create mode 100644 arch/nds32/configs/defconfig + create mode 100644 arch/nds32/include/asm/Kbuild + create mode 100644 arch/nds32/include/asm/assembler.h + create mode 100644 arch/nds32/include/asm/barrier.h + create mode 100644 arch/nds32/include/asm/bitfield.h + create mode 100644 arch/nds32/include/asm/cache.h + create mode 100644 arch/nds32/include/asm/cache_info.h + create mode 100644 arch/nds32/include/asm/cacheflush.h + create mode 100644 arch/nds32/include/asm/current.h + create mode 100644 arch/nds32/include/asm/delay.h + create mode 100644 arch/nds32/include/asm/dma-mapping.h + create mode 100644 arch/nds32/include/asm/elf.h + create mode 100644 arch/nds32/include/asm/fixmap.h + create mode 100644 arch/nds32/include/asm/futex.h + create mode 100644 arch/nds32/include/asm/highmem.h + create mode 100644 arch/nds32/include/asm/io.h + create mode 100644 arch/nds32/include/asm/irqflags.h + create mode 100644 arch/nds32/include/asm/l2_cache.h + create mode 100644 arch/nds32/include/asm/linkage.h + create mode 100644 arch/nds32/include/asm/memory.h + create mode 100644 arch/nds32/include/asm/mmu.h + create mode 100644 arch/nds32/include/asm/mmu_context.h + create mode 100644 arch/nds32/include/asm/module.h + create mode 100644 arch/nds32/include/asm/nds32.h + create mode 100644 arch/nds32/include/asm/page.h + create mode 100644 arch/nds32/include/asm/pgalloc.h + create mode 100644 arch/nds32/include/asm/pgtable.h + create mode 100644 arch/nds32/include/asm/proc-fns.h + create mode 100644 arch/nds32/include/asm/processor.h + create mode 100644 arch/nds32/include/asm/ptrace.h + create mode 100644 arch/nds32/include/asm/shmparam.h + create mode 100644 arch/nds32/include/asm/string.h + create mode 100644 arch/nds32/include/asm/swab.h + create mode 100644 arch/nds32/include/asm/syscall.h + create mode 100644 arch/nds32/include/asm/syscalls.h + create mode 100644 arch/nds32/include/asm/thread_info.h + create mode 100644 arch/nds32/include/asm/tlb.h + create mode 100644 arch/nds32/include/asm/tlbflush.h + create mode 100644 arch/nds32/include/asm/uaccess.h + create mode 100644 arch/nds32/include/asm/unistd.h + create mode 100644 arch/nds32/include/asm/vdso.h + create mode 100644 arch/nds32/include/asm/vdso_datapage.h + create mode 100644 arch/nds32/include/asm/vdso_timer_info.h + create mode 100644 arch/nds32/include/uapi/asm/Kbuild + create mode 100644 arch/nds32/include/uapi/asm/auxvec.h + create mode 100644 arch/nds32/include/uapi/asm/byteorder.h + create mode 100644 arch/nds32/include/uapi/asm/cachectl.h + create mode 100644 arch/nds32/include/uapi/asm/param.h + create mode 100644 arch/nds32/include/uapi/asm/ptrace.h + create mode 100644 arch/nds32/include/uapi/asm/sigcontext.h + create mode 100644 arch/nds32/include/uapi/asm/unistd.h + create mode 100644 arch/nds32/kernel/Makefile + create mode 100644 arch/nds32/kernel/asm-offsets.c + create mode 100644 arch/nds32/kernel/atl2c.c + create mode 100644 arch/nds32/kernel/cacheinfo.c + create mode 100644 arch/nds32/kernel/devtree.c + create mode 100644 arch/nds32/kernel/dma.c + create mode 100644 arch/nds32/kernel/ex-entry.S + create mode 100644 arch/nds32/kernel/ex-exit.S + create mode 100644 arch/nds32/kernel/ex-scall.S + create mode 100644 arch/nds32/kernel/head.S + create mode 100644 arch/nds32/kernel/irq.c + create mode 100644 arch/nds32/kernel/module.c + create mode 100644 arch/nds32/kernel/nds32_ksyms.c + create mode 100644 arch/nds32/kernel/process.c + create mode 100644 arch/nds32/kernel/ptrace.c + create mode 100644 arch/nds32/kernel/setup.c + create mode 100644 arch/nds32/kernel/signal.c + create mode 100644 arch/nds32/kernel/stacktrace.c + create mode 100644 arch/nds32/kernel/sys_nds32.c + create mode 100644 arch/nds32/kernel/syscall_table.c + create mode 100644 arch/nds32/kernel/time.c + create mode 100644 arch/nds32/kernel/traps.c + create mode 100644 arch/nds32/kernel/vdso.c + create mode 100644 arch/nds32/kernel/vdso/Makefile + create mode 100644 arch/nds32/kernel/vdso/datapage.S + create mode 100755 arch/nds32/kernel/vdso/gen_vdso_offsets.sh + create mode 100644 arch/nds32/kernel/vdso/gettimeofday.c + create mode 100644 arch/nds32/kernel/vdso/note.S + create mode 100644 arch/nds32/kernel/vdso/sigreturn.S + create mode 100644 arch/nds32/kernel/vdso/vdso.S + create mode 100644 arch/nds32/kernel/vdso/vdso.lds.S + create mode 100644 arch/nds32/kernel/vmlinux.lds.S + create mode 100644 arch/nds32/lib/Makefile + create mode 100644 arch/nds32/lib/clear_user.S + create mode 100644 arch/nds32/lib/copy_from_user.S + create mode 100644 arch/nds32/lib/copy_page.S + create mode 100644 arch/nds32/lib/copy_template.S + create mode 100644 arch/nds32/lib/copy_to_user.S + create mode 100644 arch/nds32/lib/memcpy.S + create mode 100644 arch/nds32/lib/memmove.S + create mode 100644 arch/nds32/lib/memset.S + create mode 100644 arch/nds32/lib/memzero.S + create mode 100644 arch/nds32/mm/Makefile + create mode 100644 arch/nds32/mm/alignment.c + create mode 100644 arch/nds32/mm/cacheflush.c + create mode 100644 arch/nds32/mm/extable.c + create mode 100644 arch/nds32/mm/fault.c + create mode 100644 arch/nds32/mm/highmem.c + create mode 100644 arch/nds32/mm/init.c + create mode 100644 arch/nds32/mm/ioremap.c + create mode 100644 arch/nds32/mm/mm-nds32.c + create mode 100644 arch/nds32/mm/mmap.c + create mode 100644 arch/nds32/mm/proc.c + create mode 100644 arch/nds32/mm/tlb.c + create mode 100644 drivers/clocksource/timer-atcpit100.c + create mode 100644 drivers/irqchip/irq-ativic32.c +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 (5464408e6bc4 parisc/Kconfig: SMP kernels boot on all machines) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/Kconfig | 6 ++---- + arch/parisc/include/asm/io.h | 12 ++++++------ + arch/parisc/include/uapi/asm/mman.h | 4 +++- + arch/parisc/kernel/drivers.c | 22 +++++++++++----------- + arch/parisc/kernel/hardware.c | 12 ++++++------ + arch/parisc/math-emu/fcnvff.c | 2 +- + drivers/input/serio/gscps2.c | 11 +++++------ + drivers/parisc/led.c | 4 ++-- + drivers/parport/parport_gsc.c | 2 +- + drivers/video/fbdev/stifb.c | 2 +- + 10 files changed, 38 insertions(+), 39 deletions(-) +Merging powerpc/next (78e5dfea84dc powerpc: dts: replace 'linux,stdout-path' with 'stdout-path') +$ git merge powerpc/next +Resolved 'lib/raid6/test/Makefile' using previous resolution. +Auto-merging tools/testing/selftests/powerpc/tm/Makefile +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 +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master af79a4f89050] Merge remote-tracking branch 'powerpc/next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/Makefile | 2 + + 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/xpedite5200_xmon.dts | 2 +- + arch/powerpc/boot/dts/yosemite.dts | 2 +- + arch/powerpc/include/asm/asm-prototypes.h | 12 + + arch/powerpc/include/asm/book3s/64/mmu.h | 21 +- + arch/powerpc/include/asm/book3s/64/slice.h | 27 ++ + arch/powerpc/include/asm/cacheflush.h | 1 - + arch/powerpc/include/asm/epapr_hcalls.h | 22 +- + arch/powerpc/include/asm/hugetlb.h | 8 +- + arch/powerpc/include/asm/hw_breakpoint.h | 2 + + arch/powerpc/include/asm/irq.h | 1 + + arch/powerpc/include/asm/irq_work.h | 1 + + arch/powerpc/include/asm/mmu-8xx.h | 21 + + 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 | 2 + + arch/powerpc/include/asm/paca.h | 2 +- + arch/powerpc/include/asm/page.h | 11 +- + arch/powerpc/include/asm/page_64.h | 59 --- + arch/powerpc/include/asm/plpar_wrappers.h | 24 +- + arch/powerpc/include/asm/pnv-pci.h | 6 + + arch/powerpc/include/asm/ppc-opcode.h | 6 + + arch/powerpc/include/asm/slice.h | 40 ++ + arch/powerpc/include/asm/switch_to.h | 1 - + arch/powerpc/include/asm/thread_info.h | 1 + + arch/powerpc/include/asm/time.h | 2 + + arch/powerpc/include/asm/uaccess.h | 10 +- + arch/powerpc/kernel/misc_64.S | 38 -- + arch/powerpc/kernel/nvram_64.c | 9 +- + arch/powerpc/kernel/paca.c | 3 +- + arch/powerpc/kernel/process.c | 4 +- + arch/powerpc/kernel/prom.c | 4 +- + arch/powerpc/kernel/setup-common.c | 2 + + arch/powerpc/kernel/setup_32.c | 8 +- + arch/powerpc/kernel/signal.h | 5 + + arch/powerpc/kernel/signal_32.c | 4 +- + arch/powerpc/kernel/time.c | 2 +- + arch/powerpc/lib/sstep.c | 4 +- + arch/powerpc/mm/8xx_mmu.c | 2 +- + arch/powerpc/mm/hash_native_64.c | 15 - + arch/powerpc/mm/hash_utils_64.c | 13 +- + arch/powerpc/mm/hugetlbpage.c | 8 +- + arch/powerpc/mm/init_32.c | 2 +- + arch/powerpc/mm/mmu_context_book3s64.c | 9 +- + arch/powerpc/mm/mmu_context_nohash.c | 15 +- + arch/powerpc/mm/slb_low.S | 8 +- + arch/powerpc/mm/slice.c | 444 +++++++++++---------- + arch/powerpc/oprofile/cell/spu_task_sync.c | 2 +- + arch/powerpc/oprofile/cell/vma_map.c | 4 +- + arch/powerpc/platforms/4xx/msi.c | 2 +- + arch/powerpc/platforms/4xx/ocm.c | 2 +- + arch/powerpc/platforms/8xx/m8xx_setup.c | 8 +- + arch/powerpc/platforms/Kconfig.cputype | 1 + + arch/powerpc/platforms/cell/axon_msi.c | 2 +- + 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/powermac/low_i2c.c | 2 +- + arch/powerpc/platforms/powermac/pfunc_core.c | 4 +- + arch/powerpc/platforms/powernv/Makefile | 1 - + arch/powerpc/platforms/powernv/npu-dma.c | 261 +++++++----- + arch/powerpc/platforms/powernv/opal-flash.c | 4 +- + 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-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 | 2 +- + arch/powerpc/platforms/powernv/pci.c | 135 +++++++ + 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/pseries.h | 8 + + arch/powerpc/platforms/pseries/setup.c | 2 +- + arch/powerpc/platforms/pseries/smp.c | 2 +- + arch/powerpc/xmon/xmon.c | 50 ++- + drivers/macintosh/ans-lcd.c | 1 + + drivers/macintosh/rack-meter.c | 2 +- + drivers/macintosh/via-pmu.c | 2 +- + drivers/misc/cxl/cxl.h | 6 +- + drivers/misc/cxl/cxllib.c | 2 +- + 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/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 +++++ + .../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/tm/Makefile | 2 +- + tools/testing/selftests/powerpc/tm/tm-sigreturn.c | 92 +++++ + .../testing/selftests/powerpc/tm/tm-unavailable.c | 24 +- + 147 files changed, 1790 insertions(+), 670 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/slice.h + 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 (c698ca527893 Linux 4.16-rc6) +$ git merge risc-v/for-next +Already up to date. +Merging s390/features (bcbd41da3b0a Merge tag 'vfio-ccw-20180305' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into features) +$ 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 +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b7ef7eda567a] Merge remote-tracking branch 's390/features' +$ git diff -M --stat --summary HEAD^.. + Documentation/s390/vfio-ccw.txt | 79 +++-- + arch/s390/Makefile | 6 +- + 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/cio.h | 2 +- + arch/s390/include/asm/pgalloc.h | 3 + + arch/s390/include/asm/scsw.h | 4 +- + arch/s390/include/uapi/asm/dasd.h | 38 ++- + arch/s390/kernel/early.c | 2 +- + 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 | 25 +- + 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/vfio_ccw_fsm.c | 5 + + drivers/tty/Kconfig | 2 +- + drivers/video/Kconfig | 5 +- + drivers/video/console/Kconfig | 6 +- + 34 files changed, 1244 insertions(+), 207 deletions(-) + create mode 100644 drivers/s390/char/sclp_sd.c +Merging sparc-next/master (257a1aac7a9a sparc: Make auxiliary vectors for ADI available on 32-bit as well) +$ git merge sparc-next/master +Resolved 'arch/x86/kernel/signal_compat.c' using previous resolution. +Auto-merging include/uapi/asm-generic/siginfo.h +Auto-merging include/linux/mm.h +Auto-merging arch/x86/kernel/signal_compat.c +CONFLICT (content): Merge conflict in arch/x86/kernel/signal_compat.c +Auto-merging arch/powerpc/kernel/syscalls.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a2f38d943d42] Merge remote-tracking branch 'sparc-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/sparc/adi.txt | 278 ++++++++++++++++++++++ + arch/powerpc/include/asm/mman.h | 4 +- + arch/powerpc/kernel/syscalls.c | 2 +- + arch/sparc/include/asm/adi.h | 6 + + arch/sparc/include/asm/adi_64.h | 47 ++++ + arch/sparc/include/asm/elf_64.h | 5 + + arch/sparc/include/asm/hypervisor.h | 2 + + arch/sparc/include/asm/mman.h | 84 ++++++- + arch/sparc/include/asm/mmu_64.h | 17 ++ + arch/sparc/include/asm/mmu_context_64.h | 51 ++++ + arch/sparc/include/asm/page_64.h | 6 + + arch/sparc/include/asm/pgtable_64.h | 48 ++++ + arch/sparc/include/asm/thread_info_64.h | 2 +- + arch/sparc/include/asm/trap_block.h | 2 + + arch/sparc/include/asm/ttable.h | 10 + + arch/sparc/include/uapi/asm/asi.h | 5 + + arch/sparc/include/uapi/asm/auxvec.h | 9 +- + arch/sparc/include/uapi/asm/mman.h | 2 + + arch/sparc/include/uapi/asm/pstate.h | 10 + + arch/sparc/kernel/Makefile | 1 + + arch/sparc/kernel/adi_64.c | 397 ++++++++++++++++++++++++++++++++ + arch/sparc/kernel/entry.h | 3 + + arch/sparc/kernel/etrap_64.S | 27 ++- + arch/sparc/kernel/head_64.S | 1 + + arch/sparc/kernel/mdesc.c | 2 + + arch/sparc/kernel/process_64.c | 25 ++ + arch/sparc/kernel/rtrap_64.S | 33 ++- + arch/sparc/kernel/setup_64.c | 2 + + arch/sparc/kernel/sun4v_mcd.S | 18 ++ + arch/sparc/kernel/traps_64.c | 130 ++++++++++- + arch/sparc/kernel/ttable_64.S | 6 +- + arch/sparc/kernel/urtt_fill.S | 7 +- + arch/sparc/kernel/vmlinux.lds.S | 5 + + arch/sparc/mm/gup.c | 37 +++ + arch/sparc/mm/hugetlbpage.c | 14 +- + arch/sparc/mm/init_64.c | 69 ++++++ + arch/sparc/mm/tsb.c | 21 ++ + arch/x86/kernel/signal_compat.c | 2 +- + include/asm-generic/pgtable.h | 36 +++ + include/linux/highmem.h | 4 + + include/linux/mm.h | 9 + + include/linux/mman.h | 2 +- + include/uapi/asm-generic/siginfo.h | 5 +- + mm/ksm.c | 4 + + mm/memory.c | 1 + + mm/mprotect.c | 4 +- + mm/rmap.c | 14 ++ + 47 files changed, 1443 insertions(+), 26 deletions(-) + create mode 100644 Documentation/sparc/adi.txt + create mode 100644 arch/sparc/include/asm/adi.h + create mode 100644 arch/sparc/include/asm/adi_64.h + create mode 100644 arch/sparc/kernel/adi_64.c + create mode 100644 arch/sparc/kernel/sun4v_mcd.S +Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses) +$ git merge sh/for-next +Auto-merging arch/sh/include/asm/futex.h +Merge made by the 'recursive' strategy. + arch/sh/include/asm/futex.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging uml/linux-next (584bfe635481 um: vector: Fix an error handling path in 'vector_parse()') +$ 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 | 1632 ++++++++++++++++++++++++++++++++++ + arch/um/drivers/vector_kern.h | 129 +++ + arch/um/drivers/vector_transports.c | 458 ++++++++++ + arch/um/drivers/vector_user.c | 586 ++++++++++++ + arch/um/drivers/vector_user.h | 99 +++ + 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/irq.c | 202 +++-- + arch/um/os-Linux/signal.c | 2 +- + arch/x86/um/stub_segv.c | 2 +- + 22 files changed, 3385 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/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 c429b55f9c45] Merge remote-tracking branch 'btrfs/next' + Date: Thu Mar 22 10:03:26 2018 +1100 +Merging btrfs-kdave/for-next (b23ea5fe1f19 Merge branch 'for-next-next-v4.17-20180319' into for-next-20180319) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Removing fs/btrfs/hash.h +Removing fs/btrfs/hash.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/check-integrity.c +Merge made by the 'recursive' strategy. + fs/btrfs/Kconfig | 3 +- + fs/btrfs/Makefile | 2 +- + fs/btrfs/acl.c | 6 +- + fs/btrfs/backref.c | 7 +- + fs/btrfs/backref.h | 2 +- + fs/btrfs/btrfs_inode.h | 3 - + fs/btrfs/check-integrity.c | 4 +- + fs/btrfs/compression.c | 23 +- + fs/btrfs/compression.h | 2 +- + fs/btrfs/ctree.c | 234 ++++++++------------ + fs/btrfs/ctree.h | 95 ++++++--- + fs/btrfs/delayed-inode.c | 72 ++++--- + fs/btrfs/delayed-inode.h | 8 +- + fs/btrfs/delayed-ref.c | 2 +- + fs/btrfs/delayed-ref.h | 2 +- + fs/btrfs/dev-replace.c | 32 +-- + fs/btrfs/dev-replace.h | 3 +- + fs/btrfs/dir-item.c | 1 - + fs/btrfs/disk-io.c | 99 ++++----- + fs/btrfs/disk-io.h | 7 +- + fs/btrfs/extent-tree.c | 283 ++++++++++++++----------- + fs/btrfs/extent_io.c | 63 +++--- + fs/btrfs/extent_io.h | 19 +- + fs/btrfs/extent_map.c | 6 +- + fs/btrfs/extent_map.h | 2 +- + fs/btrfs/file.c | 30 ++- + fs/btrfs/free-space-cache.c | 2 +- + fs/btrfs/free-space-tree.c | 4 +- + fs/btrfs/hash.c | 54 ----- + fs/btrfs/hash.h | 43 ---- + fs/btrfs/inode-item.c | 1 - + fs/btrfs/inode-map.c | 4 +- + fs/btrfs/inode.c | 314 ++++++++++++--------------- + fs/btrfs/ioctl.c | 145 ++++--------- + fs/btrfs/locking.c | 2 +- + fs/btrfs/lzo.c | 2 - + fs/btrfs/ordered-data.c | 4 +- + fs/btrfs/ordered-data.h | 6 +- + fs/btrfs/props.c | 10 +- + fs/btrfs/qgroup.c | 433 ++++++++++++++++++++++++++++---------- + fs/btrfs/qgroup.h | 105 ++++++++- + fs/btrfs/raid56.c | 18 +- + fs/btrfs/relocation.c | 13 +- + fs/btrfs/scrub.c | 108 +++++++--- + fs/btrfs/send.c | 35 ++- + fs/btrfs/super.c | 247 +++++++++++----------- + fs/btrfs/sysfs.c | 2 +- + fs/btrfs/tests/btrfs-tests.c | 3 +- + fs/btrfs/tests/extent-map-tests.c | 2 +- + fs/btrfs/transaction.c | 232 ++++++++++---------- + fs/btrfs/transaction.h | 39 +++- + fs/btrfs/tree-checker.c | 151 ++++++------- + fs/btrfs/tree-checker.h | 7 +- + fs/btrfs/tree-defrag.c | 5 +- + fs/btrfs/tree-log.c | 29 ++- + fs/btrfs/tree-log.h | 2 +- + fs/btrfs/uuid-tree.c | 2 +- + fs/btrfs/volumes.c | 122 ++++++----- + fs/btrfs/volumes.h | 31 ++- + fs/btrfs/xattr.c | 12 +- + fs/btrfs/xattr.h | 7 +- + fs/btrfs/zstd.c | 19 +- + include/linux/crc32c.h | 1 + + include/trace/events/btrfs.h | 108 +++++++++- + lib/libcrc32c.c | 6 + + 65 files changed, 1848 insertions(+), 1492 deletions(-) + delete mode 100644 fs/btrfs/hash.c + delete mode 100644 fs/btrfs/hash.h +Merging ceph/master (1c7892495788 ceph: fix potential memory leak in init_caches()) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (c5473a5bb132 fs: cifs: Replace _free_xid call in cifs_root_iget function) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/cifs/README | 29 +++++------ + Documentation/filesystems/cifs/TODO | 25 +++++---- + fs/cifs/Kconfig | 8 +-- + fs/cifs/cifsencrypt.c | 85 +++++------------------------- + fs/cifs/cifsfs.c | 1 + + fs/cifs/cifsglob.h | 7 ++- + fs/cifs/cifsproto.h | 5 ++ + fs/cifs/inode.c | 5 +- + fs/cifs/link.c | 27 +++------- + fs/cifs/misc.c | 54 +++++++++++++++++++ + fs/cifs/smb2misc.c | 64 +++++++++++++++++++++++ + fs/cifs/smb2ops.c | 15 ++++-- + fs/cifs/smb2pdu.c | 38 +++++++++++++- + fs/cifs/smb2pdu.h | 1 + + fs/cifs/smb2proto.h | 5 ++ + fs/cifs/smb2transport.c | 97 +++++++++++++++-------------------- + fs/cifs/smbdirect.c | 4 +- + fs/cifs/smbencrypt.c | 27 +++------- + fs/cifs/transport.c | 17 ++++++ + 19 files changed, 301 insertions(+), 213 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 (4670269faba7 eCryptfs: constify attribute_group structures.) +$ git merge ecryptfs/next +Already up to date. +Merging ext3/for_next (a9cee1764b6f reiserfs: Remove VLA from fs/reiserfs/reiserfs.h) +$ git merge ext3/for_next +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/uapi/linux/inotify.h | 8 ++ + 17 files changed, 240 insertions(+), 178 deletions(-) +Merging ext4/dev (5dc397113d19 ext4: create ext4_kset dynamically) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (81f5af16f39a f2fs: align memory boundary for bitops) +$ 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 | 75 ++++++++ + fs/f2fs/checkpoint.c | 99 +++++++---- + fs/f2fs/data.c | 80 +++++++-- + fs/f2fs/dir.c | 28 +-- + fs/f2fs/extent_cache.c | 5 +- + fs/f2fs/f2fs.h | 160 +++++++++-------- + fs/f2fs/file.c | 76 +++++--- + fs/f2fs/gc.c | 23 ++- + fs/f2fs/inline.c | 3 +- + fs/f2fs/inode.c | 3 +- + fs/f2fs/namei.c | 138 +++++++++++---- + fs/f2fs/node.c | 23 ++- + fs/f2fs/node.h | 4 +- + fs/f2fs/recovery.c | 25 ++- + fs/f2fs/segment.c | 128 ++++++++++++-- + fs/f2fs/segment.h | 2 + + fs/f2fs/super.c | 303 ++++++++++++++++++++++---------- + fs/f2fs/sysfs.c | 66 ++++++- + include/linux/f2fs_fs.h | 20 ++- + 20 files changed, 919 insertions(+), 353 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 (3215b9d57a2c Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (27f002315892 nfs4: wake any lock waiters on successful RECLAIM_COMPLETE) +$ git merge nfs-anna/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/nfs4proc.c | 29 ++-- + include/linux/sunrpc/clnt.h | 7 + + 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/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 | 214 ++++++++++++++--------------- + net/sunrpc/xprtrdma/xprt_rdma.h | 22 ++- + net/sunrpc/xprtsock.c | 8 ++ + 19 files changed, 499 insertions(+), 357 deletions(-) +Merging nfsd/nfsd-next (aacbc447c42b NFS: Fix unstable write completion) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/lockd/svc.c | 4 +- + fs/nfsd/nfs4proc.c | 1 - + fs/nfsd/nfs4state.c | 280 ++++++++++++++----------------- + fs/nfsd/nfs4xdr.c | 4 +- + fs/nfsd/nfsfh.c | 12 +- + fs/nfsd/xdr4.h | 1 - + include/linux/sunrpc/svc_rdma.h | 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/xprtrdma/svc_rdma.c | 4 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 33 ++-- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 28 ++-- + 13 files changed, 193 insertions(+), 218 deletions(-) +Merging orangefs/for-next (74e938c22705 orangefs: reverse sense of is-inode-stale test in d_revalidate) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (36cd95dfa1ed ovl: update Kconfig texts) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/linux-next (7f29ae9f977b ubi: block: Fix locking for idr_alloc/idr_remove) +$ git merge ubifs/linux-next +Already up to date. +Merging xfs/for-next (df79b81b2e6a xfs: minor cleanup for xfs_reflink_end_cow) +$ git merge xfs/for-next +Auto-merging fs/sync.c +Merge made by the 'recursive' strategy. + fs/inode.c | 12 ++- + fs/sync.c | 6 +- + fs/xfs/kmem.c | 6 +- + fs/xfs/kmem.h | 8 +- + fs/xfs/libxfs/xfs_ag_resv.c | 39 ++++---- + fs/xfs/libxfs/xfs_ag_resv.h | 31 ++++++ + fs/xfs/libxfs/xfs_alloc.c | 45 +++++---- + fs/xfs/libxfs/xfs_alloc.h | 2 + + fs/xfs/libxfs/xfs_alloc_btree.c | 8 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 4 +- + fs/xfs/libxfs/xfs_btree.c | 125 ++---------------------- + fs/xfs/libxfs/xfs_btree.h | 19 ---- + fs/xfs/libxfs/xfs_dir2_leaf.c | 3 +- + fs/xfs/libxfs/xfs_dir2_node.c | 5 +- + fs/xfs/libxfs/xfs_format.h | 13 +-- + fs/xfs/libxfs/xfs_ialloc_btree.c | 9 +- + fs/xfs/libxfs/xfs_refcount_btree.c | 5 - + fs/xfs/libxfs/xfs_rmap_btree.c | 12 +-- + fs/xfs/scrub/agheader.c | 6 +- + fs/xfs/scrub/common.c | 2 +- + fs/xfs/xfs_aops.c | 20 ++-- + fs/xfs/xfs_bmap_util.c | 44 +++++---- + fs/xfs/xfs_buf.c | 2 +- + fs/xfs/xfs_buf_item.c | 10 +- + fs/xfs/xfs_dquot.c | 6 +- + fs/xfs/xfs_dquot_item.c | 11 ++- + fs/xfs/xfs_export.c | 2 +- + fs/xfs/xfs_extent_busy.c | 5 +- + fs/xfs/xfs_file.c | 52 ++-------- + fs/xfs/xfs_fsops.c | 2 +- + fs/xfs/xfs_inode.c | 7 +- + fs/xfs/xfs_inode.h | 4 - + fs/xfs/xfs_inode_item.c | 29 +++--- + fs/xfs/xfs_iops.c | 17 +++- + fs/xfs/xfs_log.c | 192 ++++++++++++++----------------------- + fs/xfs/xfs_log.h | 15 +-- + fs/xfs/xfs_log_cil.c | 2 +- + fs/xfs/xfs_log_recover.c | 96 ++++++++----------- + fs/xfs/xfs_mount.c | 2 - + fs/xfs/xfs_mount.h | 12 +-- + fs/xfs/xfs_reflink.c | 25 +++-- + fs/xfs/xfs_super.c | 32 +++++-- + fs/xfs/xfs_trans.c | 32 ++++--- + fs/xfs/xfs_trans_ail.c | 152 ++++++++++++++--------------- + fs/xfs/xfs_trans_buf.c | 4 +- + fs/xfs/xfs_trans_inode.c | 14 +++ + fs/xfs/xfs_trans_priv.h | 42 ++++---- + 47 files changed, 512 insertions(+), 679 deletions(-) +Merging file-locks/locks-next (8bad6f173914 locks: change POSIX lock ownership on execve when files_struct is displaced) +$ git merge file-locks/locks-next +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + fs/exec.c | 4 +++- + fs/locks.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + include/linux/fs.h | 8 ++++++++ + 3 files changed, 71 insertions(+), 1 deletion(-) +Merging vfs/for-next (98a972e27841 Merge branch 'work.thaw' into for-next) +$ git merge vfs/for-next +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/namei.c +Auto-merging fs/debugfs/inode.c +Auto-merging fs/ceph/dir.c +Auto-merging fs/buffer.c +Merge made by the 'recursive' strategy. + arch/arc/kernel/troubleshoot.c | 1 - + drivers/media/i2c/saa6588.c | 4 +- + drivers/media/pci/bt8xx/bttv-driver.c | 4 +- + drivers/media/pci/saa7134/saa7134-video.c | 4 +- + drivers/oprofile/oprofilefs.c | 3 + + .../lustre/lnet/libcfs/linux/linux-curproc.c | 1 - + .../staging/lustre/lnet/libcfs/linux/linux-prim.c | 1 - + drivers/staging/lustre/lustre/llite/dcache.c | 6 +- + fs/Makefile | 2 +- + fs/buffer.c | 25 +- + fs/ceph/dir.c | 1 - + fs/d_path.c | 470 ++++++++++ + fs/dcache.c | 961 +++++---------------- + fs/debugfs/inode.c | 5 +- + fs/namei.c | 43 +- + fs/nfs/nfs4xdr.c | 1 - + fs/ocfs2/dlmglue.c | 2 +- + fs/orangefs/acl.c | 1 - + fs/super.c | 105 ++- + fs/xfs/xfs_aops.c | 2 +- + include/linux/dcache.h | 6 +- + include/linux/fs.h | 8 +- + include/media/i2c/saa6588.h | 1 + + kernel/exec_domain.c | 1 - + security/loadpin/loadpin.c | 1 - + 25 files changed, 829 insertions(+), 830 deletions(-) + create mode 100644 fs/d_path.c +$ 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 dbc0f1b844ee] Merge remote-tracking branch 'vfs/for-next' + Date: Thu Mar 22 10:36:12 2018 +1100 +Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) +$ git merge vfs-miklos/next +Already up to date. +Merging iversion/iversion-next (581e400ff935 Merge tag 'modules-for-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux) +$ git merge iversion/iversion-next +Already up to date. +Merging printk/for-next (3d172f44ffab 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 | 57 ----------------------------------------------- + lib/Makefile | 3 ++- + lib/dump_stack.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 67 insertions(+), 60 deletions(-) +Merging pci/next (eda9c9dd19d1 Merge remote-tracking branch 'lorenzo/pci/xgene' into next) +$ git merge pci/next +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/pci-sysfs.c +Auto-merging drivers/pci/dwc/pcie-designware-host.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging arch/sparc/mm/init_64.c +Merge made by the 'recursive' strategy. + .../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 +- + 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/sparc/mm/init_64.c | 17 + + arch/xtensa/include/asm/pci.h | 7 +- + arch/xtensa/kernel/pci.c | 94 +---- + drivers/gpu/drm/i915/i915_drv.c | 5 +- + 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 | 2 +- + 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-qcom.c | 91 ++--- + drivers/pci/endpoint/pci-epf-core.c | 52 +-- + drivers/pci/host/Kconfig | 1 - + drivers/pci/host/pci-rcar-gen2.c | 1 - + drivers/pci/host/pci-tegra.c | 354 ++++++++++++++---- + drivers/pci/host/pci-xgene-msi.c | 2 +- + drivers/pci/host/pcie-altera.c | 2 +- + drivers/pci/hotplug/cpqphp_ctrl.c | 12 +- + drivers/pci/hotplug/pciehp.h | 3 +- + drivers/pci/pci-driver.c | 36 ++ + drivers/pci/pci-sysfs.c | 3 +- + drivers/pci/pci.c | 90 +++-- + drivers/pci/pcie/aer/aer_inject.c | 4 +- + drivers/pci/pcie/aer/aerdrv.c | 2 +- + drivers/pci/pcie/aer/aerdrv.h | 3 +- + drivers/pci/pcie/aer/ecrc.c | 4 +- + drivers/pci/pcie/aspm.c | 20 +- + drivers/pci/pcie/pcie-dpc.c | 3 +- + drivers/pci/pcie/pme.c | 2 +- + drivers/pci/pcie/portdrv_acpi.c | 2 +- + drivers/pci/pcie/portdrv_bus.c | 2 +- + drivers/pci/pcie/portdrv_core.c | 17 +- + drivers/pci/pcie/portdrv_pci.c | 2 +- + {include/linux => drivers/pci}/pcieport_if.h | 0 + drivers/pci/probe.c | 10 + + drivers/pci/quirks.c | 12 + + drivers/rapidio/devices/tsi721.c | 5 +- + include/linux/pci.h | 50 +-- + include/linux/pci_ids.h | 1 + + 54 files changed, 879 insertions(+), 871 deletions(-) + rename {include/linux => drivers/pci}/pcieport_if.h (100%) +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 (b576182794e8 Merge branch 'for-4.16/upstream-fixes' into for-next) +$ git merge hid/for-next +Auto-merging drivers/hid/uhid.c +Auto-merging drivers/hid/hid-quirks.c +Auto-merging drivers/hid/hid-ids.h +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-driver-hid-logitech-hidpp | 19 + + Documentation/ABI/testing/sysfs-driver-hid-ntrig | 70 ++++ + drivers/hid/Kconfig | 14 +- + drivers/hid/Makefile | 1 + + drivers/hid/hid-asus.c | 4 +- + drivers/hid/hid-core.c | 45 ++- + 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-ids.h | 18 +- + drivers/hid/hid-input.c | 3 +- + drivers/hid/hid-multitouch.c | 7 +- + 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/i2c-hid/i2c-hid.c | 17 +- + drivers/hid/uhid.c | 12 +- + drivers/hid/wacom_sys.c | 4 +- + drivers/hid/wacom_wac.c | 223 ++++++++--- + drivers/hid/wacom_wac.h | 4 +- + include/linux/hid.h | 10 +- + 23 files changed, 953 insertions(+), 175 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-logitech-hidpp + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-ntrig + create mode 100644 drivers/hid/hid-elan.c +Merging i2c/i2c/for-next (dc07174fd3d8 Merge branch 'i2c/for-4.17' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 1 + + .../devicetree/bindings/i2c/i2c-sh_mobile.txt | 1 + + MAINTAINERS | 2 +- + drivers/i2c/busses/i2c-designware-master.c | 2 +- + drivers/i2c/busses/i2c-exynos5.c | 63 +++++++++++++++-- + drivers/i2c/busses/i2c-mv64xxx.c | 8 ++- + drivers/i2c/busses/i2c-piix4.c | 61 ++++++++--------- + drivers/i2c/busses/i2c-scmi.c | 35 +++++----- + drivers/i2c/busses/i2c-stm32f4.c | 2 +- + drivers/i2c/busses/i2c-xiic.c | 8 +-- + drivers/i2c/busses/i2c-xlp9xx.c | 78 ++++++++++++++++++---- + drivers/i2c/i2c-core-base.c | 41 ++++++++++++ + drivers/i2c/i2c-core-of.c | 30 +++------ + drivers/i2c/i2c-core-smbus.c | 16 +++-- + drivers/i2c/muxes/i2c-mux-pca954x.c | 55 +++++++++++++-- + include/linux/i2c.h | 30 +++++++++ + 16 files changed, 325 insertions(+), 108 deletions(-) +Merging dmi/master (eb693e35e850 firmware: dmi_scan: add DMI_OEM_STRING support to dmi_matches) +$ git merge dmi/master +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 (72816cb06e71 hwmon: (ucd9000) Add debugfs attributes to provide mfr_status) +$ git merge hwmon-staging/hwmon-next +Auto-merging drivers/hwmon/Kconfig +Merge made by the 'recursive' strategy. + Documentation/hwmon/nct6775 | 56 ++++--- + Documentation/hwmon/sht21 | 6 +- + Documentation/hwmon/sht3x | 2 +- + drivers/hwmon/Kconfig | 5 +- + drivers/hwmon/g762.c | 53 ++----- + drivers/hwmon/nct6775.c | 221 +++++++++++++++++--------- + drivers/hwmon/pmbus/adm1275.c | 4 +- + drivers/hwmon/pmbus/max8688.c | 2 +- + drivers/hwmon/pmbus/ucd9000.c | 350 +++++++++++++++++++++++++++++++++++++++++- + drivers/hwmon/sht21.c | 3 +- + 10 files changed, 554 insertions(+), 148 deletions(-) +Merging jc_docs/docs-next (aebb47d4e7a9 Input: trackpoint: document sysfs interface) +$ git merge jc_docs/docs-next +Auto-merging Documentation/trace/uprobetracer.rst +Auto-merging Documentation/trace/tracepoints.rst +Auto-merging Documentation/trace/tracepoint-analysis.rst +Auto-merging Documentation/trace/stm.rst +Auto-merging Documentation/trace/mmiotrace.rst +Auto-merging Documentation/trace/kprobetrace.rst +Auto-merging Documentation/trace/intel_th.rst +Auto-merging Documentation/trace/hwlat_detector.rst +Removing Documentation/trace/ftrace.txt +Auto-merging Documentation/trace/ftrace-design.rst +Auto-merging Documentation/trace/events.rst +Auto-merging Documentation/trace/events-power.rst +Removing Documentation/trace/events-nmi.txt +Removing Documentation/trace/events-msr.txt +Auto-merging Documentation/trace/events-kmem.rst +Removing Documentation/ABI/testing/sysfs-class-infiniband +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-class-infiniband | 818 +++++ + Documentation/ABI/testing/sysfs-block-aoe | 45 + + Documentation/ABI/testing/sysfs-block-loop | 50 + + Documentation/ABI/testing/sysfs-bus-nfit | 233 ++ + Documentation/ABI/testing/sysfs-bus-rapidio | 198 ++ + Documentation/ABI/testing/sysfs-bus-rbd | 203 +- + .../ABI/testing/sysfs-class-backlight-adp5520 | 31 + + .../ABI/testing/sysfs-class-backlight-adp8860 | 54 + + .../ABI/testing/sysfs-class-backlight-lm3639 | 11 + + Documentation/ABI/testing/sysfs-class-bsr | 25 + + Documentation/ABI/testing/sysfs-class-infiniband | 16 - + Documentation/ABI/testing/sysfs-class-lcd-s6e63m0 | 27 + + Documentation/ABI/testing/sysfs-class-pktcdvd | 129 +- + Documentation/ABI/testing/sysfs-class-rapidio | 55 + + .../ABI/testing/sysfs-devices-platform-trackpoint | 115 + + Documentation/admin-guide/module-signing.rst | 10 +- + Documentation/admin-guide/security-bugs.rst | 24 +- + Documentation/admin-guide/tainted-kernels.rst | 18 +- + Documentation/dev-tools/sparse.rst | 2 +- + Documentation/doc-guide/kernel-doc.rst | 555 ++-- + Documentation/driver-api/slimbus.rst | 2 +- + Documentation/filesystems/xfs.txt | 2 +- + Documentation/index.rst | 1 + + Documentation/infiniband/sysfs.txt | 129 +- + Documentation/process/5.Posting.rst | 2 +- + Documentation/process/coding-style.rst | 9 + + Documentation/process/howto.rst | 15 - + Documentation/process/kernel-driver-statement.rst | 1 + + Documentation/process/submitting-patches.rst | 9 +- + Documentation/rapidio/sysfs.txt | 161 +- + .../trace/{events-kmem.txt => events-kmem.rst} | 50 +- + Documentation/trace/events-msr.rst | 40 + + Documentation/trace/events-msr.txt | 37 - + Documentation/trace/events-nmi.rst | 45 + + Documentation/trace/events-nmi.txt | 43 - + .../trace/{events-power.txt => events-power.rst} | 52 +- + Documentation/trace/{events.txt => events.rst} | 677 ++-- + .../trace/{ftrace-design.txt => ftrace-design.rst} | 252 +- + Documentation/trace/ftrace-uses.rst | 23 +- + Documentation/trace/ftrace.rst | 3332 ++++++++++++++++++++ + Documentation/trace/ftrace.txt | 3220 ------------------- + .../{hwlat_detector.txt => hwlat_detector.rst} | 26 +- + Documentation/trace/index.rst | 23 + + Documentation/trace/{intel_th.txt => intel_th.rst} | 43 +- + .../trace/{kprobetrace.txt => kprobetrace.rst} | 100 +- + .../trace/{mmiotrace.txt => mmiotrace.rst} | 86 +- + Documentation/trace/{stm.txt => stm.rst} | 23 +- + ...epoint-analysis.txt => tracepoint-analysis.rst} | 41 +- + .../trace/{tracepoints.txt => tracepoints.rst} | 77 +- + .../trace/{uprobetracer.txt => uprobetracer.rst} | 44 +- + Documentation/vm/00-INDEX | 18 + + README | 11 +- + scripts/kernel-doc | 669 ++-- + scripts/split-man.pl | 28 + + 54 files changed, 6840 insertions(+), 5070 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-class-infiniband + create mode 100644 Documentation/ABI/testing/sysfs-block-aoe + create mode 100644 Documentation/ABI/testing/sysfs-block-loop + create mode 100644 Documentation/ABI/testing/sysfs-bus-nfit + create mode 100644 Documentation/ABI/testing/sysfs-bus-rapidio + create mode 100644 Documentation/ABI/testing/sysfs-class-backlight-adp5520 + create mode 100644 Documentation/ABI/testing/sysfs-class-backlight-adp8860 + create mode 100644 Documentation/ABI/testing/sysfs-class-backlight-lm3639 + create mode 100644 Documentation/ABI/testing/sysfs-class-bsr + delete mode 100644 Documentation/ABI/testing/sysfs-class-infiniband + create mode 100644 Documentation/ABI/testing/sysfs-class-lcd-s6e63m0 + create mode 100644 Documentation/ABI/testing/sysfs-class-rapidio + create mode 100644 Documentation/ABI/testing/sysfs-devices-platform-trackpoint + rename Documentation/trace/{events-kmem.txt => events-kmem.rst} (76%) + create mode 100644 Documentation/trace/events-msr.rst + delete mode 100644 Documentation/trace/events-msr.txt + create mode 100644 Documentation/trace/events-nmi.rst + delete mode 100644 Documentation/trace/events-nmi.txt + rename Documentation/trace/{events-power.txt => events-power.rst} (65%) + rename Documentation/trace/{events.txt => events.rst} (82%) + rename Documentation/trace/{ftrace-design.txt => ftrace-design.rst} (74%) + create mode 100644 Documentation/trace/ftrace.rst + delete mode 100644 Documentation/trace/ftrace.txt + rename Documentation/trace/{hwlat_detector.txt => hwlat_detector.rst} (83%) + create mode 100644 Documentation/trace/index.rst + rename Documentation/trace/{intel_th.txt => intel_th.rst} (82%) + rename Documentation/trace/{kprobetrace.txt => kprobetrace.rst} (63%) + rename Documentation/trace/{mmiotrace.txt => mmiotrace.rst} (78%) + rename Documentation/trace/{stm.txt => stm.rst} (91%) + rename Documentation/trace/{tracepoint-analysis.txt => tracepoint-analysis.rst} (93%) + rename Documentation/trace/{tracepoints.txt => tracepoints.rst} (74%) + rename Documentation/trace/{uprobetracer.txt => uprobetracer.rst} (86%) + create mode 100755 scripts/split-man.pl +Merging v4l-dvb/master (238f694e1b7f media: v4l2-common: fix a compilation breakage) +$ git merge v4l-dvb/master +Auto-merging include/uapi/linux/lirc.h +Removing drivers/staging/media/cxd2099/TODO +Removing drivers/staging/media/cxd2099/Makefile +Removing drivers/staging/media/cxd2099/Kconfig +Removing drivers/staging/media/atomisp/pci/atomisp2/include/mmu/sh_mmu.h +Removing drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo_dev.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_exprs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_store_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_ls_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_load_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_wrapper_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/scale/scale_1.0/ia_css_scale_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a_stat_ls/ia_css_s3a_stat_store_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a_stat_ls/ia_css_s3a_stat_ls_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_state.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_state.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_state.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr_state.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr_state.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_state.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_store_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_ls_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_load_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_state.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/stream_buffer_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/socket_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/xmem.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vector_ops.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vector_func.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/stream_buffer.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/osys.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/mpmath.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/ref_vector_func_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/ref_vector_func.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/pipeline_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/osys_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op_count.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op2w_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op2w.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op1w_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op1w.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_config.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp2601_config.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp2600_config.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp2500_config.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp2400_config.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/cpu_mem_support.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/bbb_config.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/bamem.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/xmem_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/resource_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hive_isp_css_hrt_modified.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hive_isp_css_ddr_hrt_modified.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_api_version.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/sp_hrt.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/gp_regs_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/sp_hrt.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/gp_regs_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/sp_hrt.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/gp_regs_defs.h +Removing drivers/staging/media/atomisp/include/linux/vlv2_plat_clock.h +Removing drivers/staging/media/atomisp/i2c/ov8858_btns.h +Removing drivers/staging/media/atomisp/i2c/ov8858.h +Removing drivers/staging/media/atomisp/i2c/ov8858.c +CONFLICT (modify/delete): drivers/media/platform/blackfin/bfin_capture.c deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of drivers/media/platform/blackfin/bfin_capture.c left in tree. +Auto-merging drivers/media/platform/Makefile +Auto-merging drivers/media/platform/Kconfig +Auto-merging drivers/media/pci/saa7134/saa7134-video.c +Removing drivers/media/pci/mantis/mantis_vp3028.h +Removing drivers/media/pci/mantis/mantis_vp3028.c +Removing drivers/media/pci/ivtv/ivtv-alsa-mixer.h +Removing drivers/media/pci/ivtv/ivtv-alsa-mixer.c +Removing drivers/media/pci/cx18/cx18-alsa-mixer.h +Removing drivers/media/pci/cx18/cx18-alsa-mixer.c +Removing drivers/media/dvb-frontends/drx39xyj/bsp_i2c.h +Auto-merging drivers/media/dvb-frontends/cxd2099.h +Auto-merging drivers/media/dvb-frontends/cxd2099.c +Auto-merging drivers/media/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/media/platform/blackfin/bfin_capture.c +drivers/media/platform/blackfin/bfin_capture.c: needs merge +rm 'drivers/media/platform/blackfin/bfin_capture.c' +$ git commit -v -a +[master bafa72e0a4c8] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/media/coda.txt | 5 +- + .../devicetree/bindings/media/i2c/adv7604.txt | 18 +- + .../devicetree/bindings/media/i2c/ov2685.txt | 41 + + .../devicetree/bindings/media/i2c/ov5695.txt | 41 + + .../devicetree/bindings/media/i2c/ov7670.txt | 16 +- + .../devicetree/bindings/media/i2c/ov9650.txt | 36 + + .../devicetree/bindings/media/i2c/tda1997x.txt | 178 + + .../devicetree/bindings/media/renesas,ceu.txt | 81 + + .../devicetree/bindings/media/spi/sony-cxd2880.txt | 14 + + .../devicetree/bindings/media/sunxi-ir.txt | 3 + + .../uapi/mediactl/media-ioc-enum-entities.rst | 19 +- + .../media/uapi/mediactl/media-ioc-enum-links.rst | 18 + + .../media/uapi/mediactl/media-ioc-g-topology.rst | 54 +- + Documentation/media/uapi/mediactl/media-types.rst | 23 +- + Documentation/media/uapi/rc/lirc-dev-intro.rst | 1 - + Documentation/media/uapi/v4l/buffer.rst | 2 +- + Documentation/media/uapi/v4l/func-poll.rst | 8 +- + Documentation/media/uapi/v4l/subdev-formats.rst | 8 +- + Documentation/media/uapi/v4l/vidioc-g-parm.rst | 7 +- + .../media/uapi/v4l/vidioc-prepare-buf.rst | 2 +- + Documentation/media/v4l-drivers/imx.rst | 24 +- + MAINTAINERS | 88 + + arch/sh/boards/mach-ecovec24/setup.c | 338 +- + arch/sh/boards/mach-migor/setup.c | 225 +- + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 4 +- + drivers/input/touchscreen/sur40.c | 178 +- + drivers/media/Kconfig | 1 + + drivers/media/cec/cec-adap.c | 46 +- + drivers/media/cec/cec-api.c | 14 +- + drivers/media/cec/cec-core.c | 14 +- + drivers/media/cec/cec-edid.c | 14 +- + drivers/media/cec/cec-notifier.c | 14 +- + drivers/media/cec/cec-pin-priv.h | 14 +- + drivers/media/cec/cec-pin.c | 14 +- + drivers/media/cec/cec-priv.h | 14 +- + drivers/media/common/siano/smscoreapi.c | 33 +- + drivers/media/common/siano/smscoreapi.h | 2 + + drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c | 14 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 14 +- + drivers/media/common/videobuf2/videobuf2-core.c | 9 + + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 2 +- + drivers/media/dvb-core/dvb_ca_en50221.c | 4 +- + drivers/media/dvb-core/dvbdev.c | 48 + + drivers/media/dvb-frontends/Kconfig | 32 +- + drivers/media/dvb-frontends/Makefile | 2 + + drivers/media/dvb-frontends/af9013.c | 909 ++--- + drivers/media/dvb-frontends/af9013.h | 48 +- + drivers/media/dvb-frontends/af9013_priv.h | 1558 +++++---- + .../cxd2099 => media/dvb-frontends}/cxd2099.c | 209 +- + .../cxd2099 => media/dvb-frontends}/cxd2099.h | 19 +- + drivers/media/dvb-frontends/cxd2880/Kconfig | 8 + + drivers/media/dvb-frontends/cxd2880/Makefile | 18 + + drivers/media/dvb-frontends/cxd2880/cxd2880.h | 29 + + .../media/dvb-frontends/cxd2880/cxd2880_common.c | 21 + + .../media/dvb-frontends/cxd2880/cxd2880_common.h | 19 + + .../dvb-frontends/cxd2880/cxd2880_devio_spi.c | 129 + + .../dvb-frontends/cxd2880/cxd2880_devio_spi.h | 23 + + drivers/media/dvb-frontends/cxd2880/cxd2880_dtv.h | 29 + + drivers/media/dvb-frontends/cxd2880/cxd2880_dvbt.h | 74 + + .../media/dvb-frontends/cxd2880/cxd2880_dvbt2.h | 385 +++ + .../media/dvb-frontends/cxd2880/cxd2880_integ.c | 72 + + .../media/dvb-frontends/cxd2880/cxd2880_integ.h | 27 + + drivers/media/dvb-frontends/cxd2880/cxd2880_io.c | 66 + + drivers/media/dvb-frontends/cxd2880/cxd2880_io.h | 54 + + drivers/media/dvb-frontends/cxd2880/cxd2880_spi.h | 34 + + .../dvb-frontends/cxd2880/cxd2880_spi_device.c | 113 + + .../dvb-frontends/cxd2880/cxd2880_spi_device.h | 26 + + .../media/dvb-frontends/cxd2880/cxd2880_tnrdmd.c | 3519 ++++++++++++++++++++ + .../media/dvb-frontends/cxd2880/cxd2880_tnrdmd.h | 365 ++ + .../cxd2880/cxd2880_tnrdmd_driver_version.h | 12 + + .../dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt.c | 919 +++++ + .../dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt.h | 45 + + .../dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt2.c | 1217 +++++++ + .../dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt2.h | 65 + + .../cxd2880/cxd2880_tnrdmd_dvbt2_mon.c | 1878 +++++++++++ + .../cxd2880/cxd2880_tnrdmd_dvbt2_mon.h | 135 + + .../cxd2880/cxd2880_tnrdmd_dvbt_mon.c | 775 +++++ + .../cxd2880/cxd2880_tnrdmd_dvbt_mon.h | 77 + + .../dvb-frontends/cxd2880/cxd2880_tnrdmd_mon.c | 150 + + .../dvb-frontends/cxd2880/cxd2880_tnrdmd_mon.h | 29 + + drivers/media/dvb-frontends/cxd2880/cxd2880_top.c | 1947 +++++++++++ + drivers/media/dvb-frontends/dib0090.c | 4 +- + drivers/media/dvb-frontends/dib7000p.c | 2 +- + drivers/media/dvb-frontends/dib8000.c | 2 +- + drivers/media/dvb-frontends/dibx000_common.c | 2 +- + drivers/media/dvb-frontends/dibx000_common.h | 2 - + drivers/media/dvb-frontends/drx39xyj/bsp_i2c.h | 139 - + drivers/media/dvb-frontends/lgdt3306a.c | 69 +- + drivers/media/dvb-frontends/mb86a16.c | 8 +- + drivers/media/dvb-frontends/mxl5xx.c | 34 +- + drivers/media/dvb-frontends/rtl2832.c | 4 +- + drivers/media/dvb-frontends/s5h1409.c | 8 +- + drivers/media/dvb-frontends/s5h1409.h | 8 +- + drivers/media/dvb-frontends/s5h1411.c | 8 +- + drivers/media/dvb-frontends/s5h1411.h | 8 +- + drivers/media/dvb-frontends/s5h1432.h | 8 +- + drivers/media/dvb-frontends/si2168.c | 49 +- + drivers/media/dvb-frontends/si2168.h | 4 + + drivers/media/dvb-frontends/si2168_priv.h | 1 + + drivers/media/dvb-frontends/stb0899_reg.h | 8 +- + drivers/media/dvb-frontends/stv0367_priv.h | 1 - + drivers/media/dvb-frontends/stv0900_priv.h | 1 - + drivers/media/dvb-frontends/stv0900_sw.c | 6 +- + drivers/media/dvb-frontends/stv0910.c | 19 +- + drivers/media/dvb-frontends/ves1820.c | 2 +- + drivers/media/i2c/Kconfig | 66 + + drivers/media/i2c/Makefile | 6 + + drivers/media/i2c/ad9389b.c | 14 +- + drivers/media/i2c/adv748x/adv748x-core.c | 187 +- + drivers/media/i2c/adv748x/adv748x-hdmi.c | 3 + + drivers/media/i2c/adv748x/adv748x.h | 14 +- + drivers/media/i2c/adv7511.c | 14 +- + drivers/media/i2c/adv7604.c | 76 +- + drivers/media/i2c/adv7842.c | 15 +- + drivers/media/i2c/cx25840/cx25840-core.c | 28 +- + drivers/media/i2c/max2175.c | 2 +- + drivers/media/i2c/mt9t112.c | 1140 +++++++ + drivers/media/i2c/mt9v011.c | 29 +- + drivers/media/i2c/ov13858.c | 55 +- + drivers/media/i2c/ov2685.c | 846 +++++ + drivers/media/i2c/ov5640.c | 99 +- + drivers/media/i2c/ov5670.c | 33 +- + drivers/media/i2c/ov5695.c | 1399 ++++++++ + drivers/media/i2c/ov6650.c | 33 +- + drivers/media/i2c/ov7670.c | 120 +- + drivers/media/i2c/ov772x.c | 1356 ++++++++ + drivers/media/i2c/ov7740.c | 31 +- + drivers/media/i2c/ov9650.c | 134 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 6 +- + drivers/media/i2c/soc_camera/Kconfig | 12 - + drivers/media/i2c/soc_camera/Makefile | 2 - + drivers/media/i2c/soc_camera/mt9t112.c | 2 +- + drivers/media/i2c/sr030pc30.c | 7 +- + drivers/media/i2c/tc358743.c | 15 +- + drivers/media/i2c/tc358743_regs.h | 15 +- + drivers/media/i2c/tda1997x.c | 2820 ++++++++++++++++ + drivers/media/i2c/tda1997x_regs.h | 641 ++++ + drivers/media/i2c/tvp514x.c | 37 +- + drivers/media/i2c/tw9910.c | 1027 ++++++ + drivers/media/i2c/vs6624.c | 27 +- + drivers/media/media-device.c | 9 +- + drivers/media/media-entity.c | 16 - + drivers/media/pci/cobalt/Makefile | 1 + + drivers/media/pci/cobalt/cobalt-alsa-main.c | 14 +- + drivers/media/pci/cobalt/cobalt-alsa-pcm.c | 14 +- + drivers/media/pci/cobalt/cobalt-alsa-pcm.h | 14 +- + drivers/media/pci/cobalt/cobalt-alsa.h | 14 +- + drivers/media/pci/cobalt/cobalt-cpld.c | 14 +- + drivers/media/pci/cobalt/cobalt-cpld.h | 14 +- + drivers/media/pci/cobalt/cobalt-driver.c | 14 +- + drivers/media/pci/cobalt/cobalt-driver.h | 14 +- + drivers/media/pci/cobalt/cobalt-flash.c | 14 +- + drivers/media/pci/cobalt/cobalt-flash.h | 14 +- + drivers/media/pci/cobalt/cobalt-i2c.c | 14 +- + drivers/media/pci/cobalt/cobalt-i2c.h | 14 +- + drivers/media/pci/cobalt/cobalt-irq.c | 14 +- + drivers/media/pci/cobalt/cobalt-irq.h | 14 +- + drivers/media/pci/cobalt/cobalt-omnitek.c | 14 +- + drivers/media/pci/cobalt/cobalt-omnitek.h | 14 +- + drivers/media/pci/cobalt/cobalt-v4l2.c | 14 +- + drivers/media/pci/cobalt/cobalt-v4l2.h | 14 +- + .../cobalt/m00233_video_measure_memmap_package.h | 14 +- + .../pci/cobalt/m00235_fdma_packer_memmap_package.h | 14 +- + .../media/pci/cobalt/m00389_cvi_memmap_package.h | 14 +- + .../media/pci/cobalt/m00460_evcnt_memmap_package.h | 14 +- + .../pci/cobalt/m00473_freewheel_memmap_package.h | 14 +- + .../m00479_clk_loss_detector_memmap_package.h | 14 +- + .../m00514_syncgen_flow_evcnt_memmap_package.h | 14 +- + drivers/media/pci/cx18/cx18-alsa-main.c | 1 - + drivers/media/pci/cx18/cx18-alsa-mixer.c | 170 - + drivers/media/pci/cx18/cx18-alsa-mixer.h | 18 - + drivers/media/pci/cx18/cx18-dvb.c | 4 +- + drivers/media/pci/cx23885/cx23885-cards.c | 108 +- + drivers/media/pci/cx23885/cx23885-core.c | 26 +- + drivers/media/pci/cx23885/cx23885-dvb.c | 90 +- + drivers/media/pci/cx23885/cx23885-input.c | 3 + + drivers/media/pci/cx23885/cx23885-video.c | 5 +- + drivers/media/pci/cx23885/cx23885.h | 4 + + drivers/media/pci/cx25821/cx25821-core.c | 7 +- + drivers/media/pci/cx88/cx88-cards.c | 2 +- + drivers/media/pci/cx88/cx88-dvb.c | 12 +- + drivers/media/pci/cx88/cx88-input.c | 4 +- + drivers/media/pci/ddbridge/Kconfig | 1 + + drivers/media/pci/ddbridge/Makefile | 3 - + drivers/media/pci/ddbridge/ddbridge-ci.c | 53 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 36 +- + drivers/media/pci/ddbridge/ddbridge.h | 1 + + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 16 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.h | 14 +- + drivers/media/pci/ivtv/ivtv-alsa-main.c | 11 +- + drivers/media/pci/ivtv/ivtv-alsa-mixer.c | 165 - + drivers/media/pci/ivtv/ivtv-alsa-mixer.h | 18 - + drivers/media/pci/mantis/mantis_vp3028.c | 38 - + drivers/media/pci/mantis/mantis_vp3028.h | 33 - + drivers/media/pci/ngene/Kconfig | 7 + + drivers/media/pci/ngene/Makefile | 3 - + drivers/media/pci/ngene/ngene-cards.c | 575 +++- + drivers/media/pci/ngene/ngene-core.c | 117 +- + drivers/media/pci/ngene/ngene-dvb.c | 151 +- + drivers/media/pci/ngene/ngene-i2c.c | 2 +- + drivers/media/pci/ngene/ngene.h | 24 + + drivers/media/pci/saa7134/saa7134-dvb.c | 2 +- + drivers/media/pci/saa7134/saa7134-video.c | 2 +- + drivers/media/pci/saa7164/saa7164-dvb.c | 2 +- + drivers/media/platform/Kconfig | 11 +- + drivers/media/platform/Makefile | 1 + + drivers/media/platform/atmel/atmel-isc.c | 12 +- + drivers/media/platform/atmel/atmel-isi.c | 12 +- + drivers/media/platform/cec-gpio/cec-gpio.c | 14 +- + drivers/media/platform/coda/coda-bit.c | 46 +- + drivers/media/platform/coda/coda-common.c | 44 +- + drivers/media/platform/coda/coda.h | 3 +- + drivers/media/platform/exynos4-is/fimc-is-regs.c | 2 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 12 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 2 + + drivers/media/platform/omap/omap_vout_vrfb.c | 2 +- + drivers/media/platform/qcom/venus/hfi_msgs.c | 4 +- + drivers/media/platform/rcar_drif.c | 3 +- + drivers/media/platform/renesas-ceu.c | 1677 ++++++++++ + drivers/media/platform/rockchip/rga/rga-buf.c | 3 +- + drivers/media/platform/s3c-camif/camif-capture.c | 7 +- + drivers/media/platform/sh_veu.c | 4 +- + drivers/media/platform/soc_camera/soc_camera.c | 10 +- + drivers/media/platform/stm32/stm32-cec.c | 5 +- + drivers/media/platform/stm32/stm32-dcmi.c | 305 +- + drivers/media/platform/via-camera.c | 4 +- + drivers/media/platform/vimc/vimc-common.c | 4 +- + drivers/media/platform/vimc/vimc-debayer.c | 2 +- + drivers/media/platform/vimc/vimc-scaler.c | 2 +- + drivers/media/platform/vimc/vimc-sensor.c | 10 +- + drivers/media/platform/vivid/vivid-cec.c | 25 +- + drivers/media/platform/vivid/vivid-cec.h | 14 +- + drivers/media/platform/vivid/vivid-core.c | 14 +- + drivers/media/platform/vivid/vivid-core.h | 14 +- + drivers/media/platform/vivid/vivid-ctrls.c | 16 +- + drivers/media/platform/vivid/vivid-ctrls.h | 14 +- + drivers/media/platform/vivid/vivid-kthread-cap.c | 14 +- + drivers/media/platform/vivid/vivid-kthread-cap.h | 14 +- + drivers/media/platform/vivid/vivid-kthread-out.c | 14 +- + drivers/media/platform/vivid/vivid-kthread-out.h | 14 +- + drivers/media/platform/vivid/vivid-osd.c | 14 +- + drivers/media/platform/vivid/vivid-osd.h | 14 +- + drivers/media/platform/vivid/vivid-radio-common.c | 14 +- + drivers/media/platform/vivid/vivid-radio-common.h | 14 +- + drivers/media/platform/vivid/vivid-radio-rx.c | 14 +- + drivers/media/platform/vivid/vivid-radio-rx.h | 14 +- + drivers/media/platform/vivid/vivid-radio-tx.c | 14 +- + drivers/media/platform/vivid/vivid-radio-tx.h | 14 +- + drivers/media/platform/vivid/vivid-rds-gen.c | 14 +- + drivers/media/platform/vivid/vivid-rds-gen.h | 14 +- + drivers/media/platform/vivid/vivid-sdr-cap.c | 14 +- + drivers/media/platform/vivid/vivid-sdr-cap.h | 14 +- + drivers/media/platform/vivid/vivid-vbi-cap.c | 14 +- + drivers/media/platform/vivid/vivid-vbi-cap.h | 14 +- + drivers/media/platform/vivid/vivid-vbi-gen.c | 14 +- + drivers/media/platform/vivid/vivid-vbi-gen.h | 14 +- + drivers/media/platform/vivid/vivid-vbi-out.c | 14 +- + drivers/media/platform/vivid/vivid-vbi-out.h | 14 +- + drivers/media/platform/vivid/vivid-vid-cap.c | 19 +- + drivers/media/platform/vivid/vivid-vid-cap.h | 14 +- + drivers/media/platform/vivid/vivid-vid-common.c | 17 +- + drivers/media/platform/vivid/vivid-vid-common.h | 14 +- + drivers/media/platform/vivid/vivid-vid-out.c | 14 +- + drivers/media/platform/vivid/vivid-vid-out.h | 14 +- + drivers/media/platform/vsp1/vsp1_dl.c | 3 +- + drivers/media/platform/vsp1/vsp1_drm.c | 30 +- + drivers/media/platform/vsp1/vsp1_lif.c | 12 + + drivers/media/platform/vsp1/vsp1_regs.h | 8 +- + drivers/media/radio/radio-mr800.c | 2 +- + drivers/media/radio/radio-raremono.c | 14 +- + drivers/media/radio/radio-wl1273.c | 2 +- + drivers/media/radio/si470x/radio-si470x-common.c | 17 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 32 +- + drivers/media/radio/si470x/radio-si470x-usb.c | 2 +- + drivers/media/radio/si470x/radio-si470x.h | 2 + + drivers/media/radio/si4713/radio-usb-si4713.c | 14 +- + drivers/media/rc/Kconfig | 32 +- + drivers/media/rc/Makefile | 2 + + drivers/media/rc/imon.c | 170 +- + drivers/media/rc/imon_raw.c | 199 ++ + drivers/media/rc/ir-hix5hd2.c | 35 +- + drivers/media/rc/ir-imon-decoder.c | 193 ++ + drivers/media/rc/ir-jvc-decoder.c | 14 +- + drivers/media/rc/ir-mce_kbd-decoder.c | 60 +- + drivers/media/rc/ir-nec-decoder.c | 20 +- + drivers/media/rc/ir-rc5-decoder.c | 12 +- + drivers/media/rc/ir-rc6-decoder.c | 26 +- + drivers/media/rc/ir-sanyo-decoder.c | 18 +- + drivers/media/rc/ir-sharp-decoder.c | 17 +- + drivers/media/rc/ir-sony-decoder.c | 14 +- + drivers/media/rc/ir-spi.c | 24 +- + drivers/media/rc/ir-xmp-decoder.c | 29 +- + drivers/media/rc/keymaps/Makefile | 1 + + drivers/media/rc/keymaps/rc-imon-pad.c | 3 +- + drivers/media/rc/keymaps/rc-imon-rsc.c | 81 + + drivers/media/rc/lirc_dev.c | 20 +- + drivers/media/rc/mceusb.c | 160 +- + drivers/media/rc/meson-ir.c | 7 +- + drivers/media/rc/rc-core-priv.h | 18 +- + drivers/media/rc/rc-ir-raw.c | 60 +- + drivers/media/rc/rc-main.c | 100 +- + drivers/media/rc/sunxi-cir.c | 19 +- + drivers/media/spi/Kconfig | 14 + + drivers/media/spi/Makefile | 5 + + drivers/media/spi/cxd2880-spi.c | 670 ++++ + drivers/media/tuners/e4000.c | 16 +- + drivers/media/tuners/fc2580.c | 16 +- + drivers/media/tuners/msi001.c | 19 +- + drivers/media/usb/au0828/Kconfig | 5 +- + drivers/media/usb/au0828/au0828-video.c | 4 +- + drivers/media/usb/cpia2/cpia2_usb.c | 3 - + drivers/media/usb/cx231xx/cx231xx-cards.c | 87 +- + drivers/media/usb/cx231xx/cx231xx-dvb.c | 389 ++- + drivers/media/usb/cx231xx/cx231xx-video.c | 2 +- + drivers/media/usb/cx231xx/cx231xx.h | 3 + + drivers/media/usb/dvb-usb-v2/Kconfig | 1 + + drivers/media/usb/dvb-usb-v2/af9015.c | 985 +++--- + drivers/media/usb/dvb-usb-v2/af9015.h | 20 +- + drivers/media/usb/dvb-usb-v2/dvb_usb.h | 4 + + drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 24 +- + drivers/media/usb/dvb-usb/cxusb.c | 141 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 2 +- + drivers/media/usb/em28xx/em28xx-audio.c | 116 +- + drivers/media/usb/em28xx/em28xx-camera.c | 49 +- + drivers/media/usb/em28xx/em28xx-cards.c | 905 +++-- + drivers/media/usb/em28xx/em28xx-core.c | 231 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 1015 +++--- + drivers/media/usb/em28xx/em28xx-i2c.c | 173 +- + drivers/media/usb/em28xx/em28xx-input.c | 167 +- + drivers/media/usb/em28xx/em28xx-reg.h | 52 +- + drivers/media/usb/em28xx/em28xx-v4l.h | 27 +- + drivers/media/usb/em28xx/em28xx-vbi.c | 39 +- + drivers/media/usb/em28xx/em28xx-video.c | 391 ++- + drivers/media/usb/em28xx/em28xx.h | 396 ++- + drivers/media/usb/go7007/snd-go7007.c | 2 +- + drivers/media/usb/gspca/dtcs033.c | 6 +- + drivers/media/usb/s2255/s2255drv.c | 8 - + drivers/media/usb/siano/smsusb.c | 4 +- + drivers/media/usb/tm6000/tm6000-cards.c | 2 +- + drivers/media/usb/usbtv/usbtv-core.c | 3 + + drivers/media/usb/uvc/uvc_ctrl.c | 114 +- + drivers/media/usb/uvc/uvc_driver.c | 97 +- + drivers/media/usb/uvc/uvc_isight.c | 6 +- + drivers/media/usb/uvc/uvc_status.c | 4 +- + drivers/media/usb/uvc/uvc_v4l2.c | 139 +- + drivers/media/usb/uvc/uvc_video.c | 47 +- + drivers/media/usb/uvc/uvcvideo.h | 320 +- + drivers/media/v4l2-core/tuner-core.c | 15 +- + drivers/media/v4l2-core/v4l2-common.c | 82 +- + drivers/media/v4l2-core/v4l2-dv-timings.c | 156 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 2 +- + drivers/media/v4l2-core/v4l2-mc.c | 12 +- + drivers/media/v4l2-core/v4l2-subdev.c | 50 + + drivers/staging/media/Kconfig | 6 +- + drivers/staging/media/Makefile | 3 +- + drivers/staging/media/atomisp/i2c/Kconfig | 12 - + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 53 - + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 53 - + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 6 - + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 56 - + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 53 - + drivers/staging/media/atomisp/i2c/gc0310.h | 43 - + drivers/staging/media/atomisp/i2c/gc2235.h | 7 +- + drivers/staging/media/atomisp/i2c/ov2680.h | 68 - + drivers/staging/media/atomisp/i2c/ov2722.h | 6 + + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 56 +- + drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 6 + + drivers/staging/media/atomisp/i2c/ov8858.c | 2169 ------------ + drivers/staging/media/atomisp/i2c/ov8858.h | 1474 -------- + drivers/staging/media/atomisp/i2c/ov8858_btns.h | 1276 ------- + .../media/atomisp/include/linux/vlv2_plat_clock.h | 30 - + .../staging/media/atomisp/pci/atomisp2/Makefile | 10 - + .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 11 +- + .../atomisp/pci/atomisp2/atomisp_compat_css20.c | 2 +- + .../media/atomisp/pci/atomisp2/atomisp_file.c | 16 - + .../media/atomisp/pci/atomisp2/atomisp_fops.c | 6 + + .../media/atomisp/pci/atomisp2/atomisp_subdev.c | 12 +- + .../media/atomisp/pci/atomisp2/atomisp_tpg.c | 14 - + .../media/atomisp/pci/atomisp2/atomisp_v4l2.c | 1 - + .../css2400/css_2400_system/hrt/gp_regs_defs.h | 22 - + .../atomisp2/css2400/css_2400_system/hrt/sp_hrt.h | 24 - + .../css_2401_csi2p_system/hrt/gp_regs_defs.h | 22 - + .../css2400/css_2401_csi2p_system/hrt/sp_hrt.h | 24 - + .../css2400/css_2401_system/hrt/gp_regs_defs.h | 22 - + .../atomisp2/css2400/css_2401_system/hrt/sp_hrt.h | 24 - + .../atomisp/pci/atomisp2/css2400/css_api_version.h | 673 ---- + .../host/hive_isp_css_ddr_hrt_modified.h | 148 - + .../host/hive_isp_css_hrt_modified.h | 79 - + .../hive_isp_css_common/input_formatter_global.h | 16 - + .../css2400/hive_isp_css_common/resource_global.h | 35 - + .../css2400/hive_isp_css_common/xmem_global.h | 20 - + .../atomisp2/css2400/hive_isp_css_include/bamem.h | 46 - + .../css2400/hive_isp_css_include/bbb_config.h | 27 - + .../css2400/hive_isp_css_include/cpu_mem_support.h | 59 - + .../hive_isp_css_include/host/isp2400_config.h | 24 - + .../hive_isp_css_include/host/isp2500_config.h | 29 - + .../hive_isp_css_include/host/isp2600_config.h | 34 - + .../hive_isp_css_include/host/isp2601_config.h | 70 - + .../css2400/hive_isp_css_include/host/isp_config.h | 24 - + .../css2400/hive_isp_css_include/host/isp_op1w.h | 844 ----- + .../hive_isp_css_include/host/isp_op1w_types.h | 54 - + .../css2400/hive_isp_css_include/host/isp_op2w.h | 674 ---- + .../hive_isp_css_include/host/isp_op2w_types.h | 49 - + .../hive_isp_css_include/host/isp_op_count.h | 226 -- + .../hive_isp_css_include/host/osys_public.h | 20 - + .../hive_isp_css_include/host/pipeline_public.h | 18 - + .../hive_isp_css_include/host/ref_vector_func.h | 1221 ------- + .../host/ref_vector_func_types.h | 385 --- + .../atomisp2/css2400/hive_isp_css_include/mpmath.h | 329 -- + .../atomisp2/css2400/hive_isp_css_include/osys.h | 47 - + .../css2400/hive_isp_css_include/stream_buffer.h | 47 - + .../css2400/hive_isp_css_include/vector_func.h | 38 - + .../css2400/hive_isp_css_include/vector_ops.h | 31 - + .../atomisp2/css2400/hive_isp_css_include/xmem.h | 46 - + .../css2400/hive_isp_css_shared/socket_global.h | 53 - + .../hive_isp_css_shared/stream_buffer_global.h | 26 - + .../pci/atomisp2/css2400/ia_css_frame_public.h | 29 +- + .../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 113 +- + .../pci/atomisp2/css2400/ia_css_pipe_public.h | 110 +- + .../atomisp/pci/atomisp2/css2400/ia_css_types.h | 64 +- + .../css2400/isp/kernels/aa/aa_2/ia_css_aa2_state.h | 41 - + .../bayer_ls_1.0/ia_css_bayer_load_param.h | 20 - + .../bayer_ls/bayer_ls_1.0/ia_css_bayer_ls_param.h | 42 - + .../bayer_ls_1.0/ia_css_bayer_store_param.h | 21 - + .../css2400/isp/kernels/bnlm/ia_css_bnlm_state.h | 31 - + .../isp/kernels/cnr/cnr_1.0/ia_css_cnr_state.h | 33 - + .../isp/kernels/cnr/cnr_2/ia_css_cnr_state.h | 33 - + .../isp/kernels/dp/dp_1.0/ia_css_dp_state.h | 36 - + .../css2400/isp/kernels/dpc2/ia_css_dpc2_state.h | 30 - + .../isp/kernels/eed1_8/ia_css_eed1_8_state.h | 40 - + .../io_ls/plane_io_ls/ia_css_plane_io_param.h | 22 - + .../io_ls/plane_io_ls/ia_css_plane_io_types.h | 30 - + .../io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h | 22 - + .../io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h | 22 - + .../ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h | 22 - + .../ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h | 30 - + .../yuv420_io_ls/ia_css_yuv420_io_param.h | 22 - + .../yuv420_io_ls/ia_css_yuv420_io_types.h | 22 - + .../isp/kernels/norm/norm_1.0/ia_css_norm_types.h | 21 - + .../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 50 +- + .../kernels/s3a_stat_ls/ia_css_s3a_stat_ls_param.h | 45 - + .../s3a_stat_ls/ia_css_s3a_stat_store_param.h | 21 - + .../kernels/scale/scale_1.0/ia_css_scale_param.h | 20 - + .../kernels/sdis/common/ia_css_sdis_common_types.h | 31 +- + .../isp/kernels/sdis/common/ia_css_sdis_param.h | 22 - + .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 3 +- + .../isp/kernels/sdis/sdis_1.0/ia_css_sdis_param.h | 21 - + .../isp/kernels/sdis/sdis_2/ia_css_sdis_param.h | 21 - + .../xnr/xnr_3.0/ia_css_xnr3_wrapper_param.h | 20 - + .../yuv_ls/yuv_ls_1.0/ia_css_yuv_load_param.h | 20 - + .../yuv_ls/yuv_ls_1.0/ia_css_yuv_ls_param.h | 39 - + .../yuv_ls/yuv_ls_1.0/ia_css_yuv_store_param.h | 21 - + .../css2400/isp/modes/interface/isp_exprs.h | 286 -- + .../runtime/binary/interface/ia_css_binary.h | 88 +- + .../atomisp2/css2400/runtime/binary/src/binary.c | 3 +- + .../css2400/runtime/debug/src/ia_css_debug.c | 8 +- + .../pci/atomisp2/css2400/runtime/frame/src/frame.c | 2 +- + .../isp_param/interface/ia_css_isp_param_types.h | 9 - + .../runtime/pipeline/interface/ia_css_pipeline.h | 24 +- + .../css2400/runtime/pipeline/src/pipeline.c | 7 +- + .../media/atomisp/pci/atomisp2/css2400/sh_css.c | 49 +- + .../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 11 - + .../atomisp/pci/atomisp2/css2400/sh_css_metrics.h | 21 - + .../atomisp/pci/atomisp2/include/hmm/hmm_bo_dev.h | 126 - + .../atomisp/pci/atomisp2/include/mmu/sh_mmu.h | 72 - + .../media/atomisp/pci/atomisp2/mmu/isp_mmu.c | 2 +- + drivers/staging/media/cxd2099/Kconfig | 12 - + drivers/staging/media/cxd2099/Makefile | 4 - + drivers/staging/media/cxd2099/TODO | 12 - + .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 2 +- + drivers/staging/media/imx/Kconfig | 4 +- + drivers/staging/media/imx/imx-ic-prp.c | 1 + + drivers/staging/media/imx/imx-ic-prpencvf.c | 3 +- + drivers/staging/media/imx/imx-media-capture.c | 3 +- + drivers/staging/media/imx/imx-media-csi.c | 9 +- + drivers/staging/media/imx/imx-media-internal-sd.c | 2 +- + drivers/staging/media/imx/imx-media-utils.c | 37 +- + drivers/staging/media/imx/imx-media-vdic.c | 3 +- + drivers/staging/media/imx/imx-media.h | 2 + + drivers/staging/media/imx/imx6-mipi-csi2.c | 25 +- + drivers/staging/media/imx074/Kconfig | 5 + + drivers/staging/media/imx074/Makefile | 1 + + drivers/staging/media/imx074/TODO | 5 + + .../soc_camera => staging/media/imx074}/imx074.c | 0 + drivers/staging/media/mt9t031/Kconfig | 11 + + drivers/staging/media/mt9t031/Makefile | 1 + + drivers/staging/media/mt9t031/TODO | 5 + + .../soc_camera => staging/media/mt9t031}/mt9t031.c | 0 + include/dt-bindings/media/tda1997x.h | 74 + + include/media/cec-notifier.h | 14 +- + include/media/cec-pin.h | 14 +- + include/media/cec.h | 14 +- + include/media/drv-intf/renesas-ceu.h | 26 + + include/media/dvbdev.h | 65 +- + include/media/i2c/ad9389b.h | 14 +- + include/media/i2c/adv7511.h | 14 +- + include/media/i2c/adv7604.h | 15 +- + include/media/i2c/adv7842.h | 15 +- + include/media/i2c/mt9t112.h | 17 +- + include/media/i2c/ov772x.h | 6 +- + include/media/i2c/tc358743.h | 18 +- + include/media/i2c/tda1997x.h | 42 + + include/media/i2c/ths7303.h | 10 +- + include/media/i2c/tw9910.h | 9 + + include/media/i2c/uda1342.h | 15 +- + include/media/rc-core.h | 11 +- + include/media/rc-map.h | 9 +- + include/media/tpg/v4l2-tpg.h | 14 +- + include/media/v4l2-common.h | 60 +- + include/media/v4l2-ctrls.h | 4 +- + include/media/v4l2-dev.h | 6 +- + include/media/v4l2-dv-timings.h | 36 +- + include/media/v4l2-fh.h | 1 + + include/media/v4l2-rect.h | 14 +- + include/media/v4l2-subdev.h | 121 +- + include/media/videobuf2-core.h | 33 +- + include/uapi/linux/cec-funcs.h | 29 - + include/uapi/linux/cec.h | 29 - + include/uapi/linux/lirc.h | 2 + + include/uapi/linux/media.h | 344 +- + include/uapi/linux/v4l2-mediabus.h | 4 +- + 522 files changed, 34035 insertions(+), 20852 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/ov2685.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/ov5695.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/ov9650.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/tda1997x.txt + create mode 100644 Documentation/devicetree/bindings/media/renesas,ceu.txt + create mode 100644 Documentation/devicetree/bindings/media/spi/sony-cxd2880.txt + rename drivers/{staging/media/cxd2099 => media/dvb-frontends}/cxd2099.c (78%) + rename drivers/{staging/media/cxd2099 => media/dvb-frontends}/cxd2099.h (62%) + create mode 100644 drivers/media/dvb-frontends/cxd2880/Kconfig + create mode 100644 drivers/media/dvb-frontends/cxd2880/Makefile + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880.h + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_common.c + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_common.h + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_devio_spi.c + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_devio_spi.h + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_dtv.h + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_dvbt.h + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_dvbt2.h + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_integ.c + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_integ.h + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_io.c + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_io.h + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_spi.h + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_spi_device.c + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_spi_device.h + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd.c + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd.h + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_driver_version.h + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt.c + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt.h + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt2.c + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt2.h + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt2_mon.c + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt2_mon.h + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt_mon.c + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt_mon.h + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_mon.c + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_mon.h + create mode 100644 drivers/media/dvb-frontends/cxd2880/cxd2880_top.c + delete mode 100644 drivers/media/dvb-frontends/drx39xyj/bsp_i2c.h + create mode 100644 drivers/media/i2c/mt9t112.c + create mode 100644 drivers/media/i2c/ov2685.c + create mode 100644 drivers/media/i2c/ov5695.c + create mode 100644 drivers/media/i2c/ov772x.c + create mode 100644 drivers/media/i2c/tda1997x.c + create mode 100644 drivers/media/i2c/tda1997x_regs.h + create mode 100644 drivers/media/i2c/tw9910.c + delete mode 100644 drivers/media/pci/cx18/cx18-alsa-mixer.c + delete mode 100644 drivers/media/pci/cx18/cx18-alsa-mixer.h + delete mode 100644 drivers/media/pci/ivtv/ivtv-alsa-mixer.c + delete mode 100644 drivers/media/pci/ivtv/ivtv-alsa-mixer.h + delete mode 100644 drivers/media/pci/mantis/mantis_vp3028.c + delete mode 100644 drivers/media/pci/mantis/mantis_vp3028.h + create mode 100644 drivers/media/platform/renesas-ceu.c + create mode 100644 drivers/media/rc/imon_raw.c + create mode 100644 drivers/media/rc/ir-imon-decoder.c + create mode 100644 drivers/media/rc/keymaps/rc-imon-rsc.c + create mode 100644 drivers/media/spi/cxd2880-spi.c + delete mode 100644 drivers/staging/media/atomisp/i2c/ov8858.c + delete mode 100644 drivers/staging/media/atomisp/i2c/ov8858.h + delete mode 100644 drivers/staging/media/atomisp/i2c/ov8858_btns.h + delete mode 100644 drivers/staging/media/atomisp/include/linux/vlv2_plat_clock.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/gp_regs_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/sp_hrt.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/gp_regs_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/sp_hrt.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/gp_regs_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/sp_hrt.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_api_version.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hive_isp_css_ddr_hrt_modified.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hive_isp_css_hrt_modified.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/resource_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/xmem_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/bamem.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/bbb_config.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/cpu_mem_support.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp2400_config.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp2500_config.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp2600_config.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp2601_config.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_config.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op1w.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op1w_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op2w.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op2w_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op_count.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/osys_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/pipeline_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/ref_vector_func.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/ref_vector_func_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/mpmath.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/osys.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/stream_buffer.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vector_func.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vector_ops.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/xmem.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/socket_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/stream_buffer_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_state.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_load_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_ls_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_store_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_state.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr_state.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr_state.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_state.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_state.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_state.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a_stat_ls/ia_css_s3a_stat_ls_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a_stat_ls/ia_css_s3a_stat_store_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/scale/scale_1.0/ia_css_scale_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_wrapper_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_load_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_ls_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_store_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_exprs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo_dev.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/mmu/sh_mmu.h + delete mode 100644 drivers/staging/media/cxd2099/Kconfig + delete mode 100644 drivers/staging/media/cxd2099/Makefile + delete mode 100644 drivers/staging/media/cxd2099/TODO + create mode 100644 drivers/staging/media/imx074/Kconfig + create mode 100644 drivers/staging/media/imx074/Makefile + create mode 100644 drivers/staging/media/imx074/TODO + rename drivers/{media/i2c/soc_camera => staging/media/imx074}/imx074.c (100%) + create mode 100644 drivers/staging/media/mt9t031/Kconfig + create mode 100644 drivers/staging/media/mt9t031/Makefile + create mode 100644 drivers/staging/media/mt9t031/TODO + rename drivers/{media/i2c/soc_camera => staging/media/mt9t031}/mt9t031.c (100%) + create mode 100644 include/dt-bindings/media/tda1997x.h + create mode 100644 include/media/drv-intf/renesas-ceu.h + create mode 100644 include/media/i2c/tda1997x.h +Merging v4l-dvb-next/master (a1dfb4c48cc1 media: v4l2-compat-ioctl32.c: refactor compat ioctl32 logic) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (2c81ee0a28c0 video: fbdev: via: remove VLA usage) +$ git merge fbdev/fbdev-for-next +Resolved 'drivers/video/console/Kconfig' using previous resolution. +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 1759e226aead] Merge remote-tracking branch 'fbdev/fbdev-for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/video/Kconfig | 3 - + drivers/video/fbdev/Kconfig | 5 + + drivers/video/fbdev/atmel_lcdfb.c | 31 ++- + drivers/video/fbdev/aty/radeon_base.c | 21 ++ + drivers/video/fbdev/offb.c | 2 + + 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/udlfb.c | 30 +-- + 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 - + 19 files changed, 568 insertions(+), 580 deletions(-) +Merging pm/linux-next (94dee79363a3 Merge branches 'pm-cpuidle', 'powercap' and 'pm-tools' into linux-next) +$ git merge pm/linux-next +Auto-merging tools/power/pm-graph/sleepgraph.py +Auto-merging tools/power/pm-graph/bootgraph.py +Auto-merging drivers/acpi/tables.c +Removing drivers/acpi/battery.h +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-acpi | 37 + + .../devicetree/bindings/cpufreq/cpufreq-dt.txt | 4 - + .../bindings/cpufreq/cpufreq-mediatek.txt | 4 - + arch/arm/boot/dts/mt7623.dtsi | 2 - + arch/x86/kernel/acpi/cstate.c | 12 + + drivers/acpi/Kconfig | 8 +- + drivers/acpi/ac.c | 2 +- + drivers/acpi/acpi_watchdog.c | 4 +- + drivers/acpi/acpica/acapps.h | 38 +- + drivers/acpi/acpica/accommon.h | 38 +- + drivers/acpi/acpica/acconvert.h | 38 +- + drivers/acpi/acpica/acdebug.h | 38 +- + drivers/acpi/acpica/acdispat.h | 38 +- + drivers/acpi/acpica/acevents.h | 56 +- + drivers/acpi/acpica/acglobal.h | 38 +- + drivers/acpi/acpica/achware.h | 38 +- + drivers/acpi/acpica/acinterp.h | 38 +- + drivers/acpi/acpica/aclocal.h | 38 +- + drivers/acpi/acpica/acmacros.h | 42 +- + drivers/acpi/acpica/acnamesp.h | 38 +- + drivers/acpi/acpica/acobject.h | 38 +- + drivers/acpi/acpica/acopcode.h | 52 +- + drivers/acpi/acpica/acparser.h | 38 +- + drivers/acpi/acpica/acpredef.h | 38 +- + drivers/acpi/acpica/acresrc.h | 38 +- + drivers/acpi/acpica/acstruct.h | 38 +- + drivers/acpi/acpica/actables.h | 38 +- + drivers/acpi/acpica/acutils.h | 38 +- + drivers/acpi/acpica/amlcode.h | 58 +- + drivers/acpi/acpica/amlresrc.h | 38 +- + drivers/acpi/acpica/dbcmds.c | 38 +- + drivers/acpi/acpica/dbconvert.c | 38 +- + drivers/acpi/acpica/dbdisply.c | 43 +- + drivers/acpi/acpica/dbexec.c | 38 +- + drivers/acpi/acpica/dbfileio.c | 38 +- + drivers/acpi/acpica/dbhistry.c | 40 +- + drivers/acpi/acpica/dbinput.c | 38 +- + drivers/acpi/acpica/dbmethod.c | 38 +- + drivers/acpi/acpica/dbnames.c | 38 +- + drivers/acpi/acpica/dbobject.c | 38 +- + drivers/acpi/acpica/dbstats.c | 38 +- + drivers/acpi/acpica/dbtest.c | 38 +- + drivers/acpi/acpica/dbutils.c | 38 +- + drivers/acpi/acpica/dbxface.c | 38 +- + drivers/acpi/acpica/dsargs.c | 41 +- + drivers/acpi/acpica/dscontrol.c | 38 +- + drivers/acpi/acpica/dsdebug.c | 38 +- + drivers/acpi/acpica/dsfield.c | 40 +- + drivers/acpi/acpica/dsinit.c | 38 +- + drivers/acpi/acpica/dsmethod.c | 40 +- + drivers/acpi/acpica/dsmthdat.c | 38 +- + drivers/acpi/acpica/dsobject.c | 38 +- + drivers/acpi/acpica/dsopcode.c | 44 +- + drivers/acpi/acpica/dspkginit.c | 204 +- + drivers/acpi/acpica/dsutils.c | 38 +- + drivers/acpi/acpica/dswexec.c | 44 +- + drivers/acpi/acpica/dswload.c | 40 +- + drivers/acpi/acpica/dswload2.c | 38 +- + drivers/acpi/acpica/dswscope.c | 40 +- + drivers/acpi/acpica/dswstate.c | 40 +- + drivers/acpi/acpica/evevent.c | 47 +- + drivers/acpi/acpica/evglock.c | 38 +- + drivers/acpi/acpica/evgpe.c | 282 ++- + drivers/acpi/acpica/evgpeblk.c | 62 +- + drivers/acpi/acpica/evgpeinit.c | 38 +- + drivers/acpi/acpica/evgpeutil.c | 38 +- + drivers/acpi/acpica/evhandler.c | 38 +- + drivers/acpi/acpica/evmisc.c | 38 +- + drivers/acpi/acpica/evregion.c | 40 +- + drivers/acpi/acpica/evrgnini.c | 45 +- + drivers/acpi/acpica/evsci.c | 38 +- + drivers/acpi/acpica/evxface.c | 49 +- + drivers/acpi/acpica/evxfevnt.c | 40 +- + drivers/acpi/acpica/evxfgpe.c | 61 +- + drivers/acpi/acpica/evxfregn.c | 38 +- + drivers/acpi/acpica/exconcat.c | 38 +- + drivers/acpi/acpica/exconfig.c | 38 +- + drivers/acpi/acpica/exconvrt.c | 39 +- + drivers/acpi/acpica/excreate.c | 40 +- + drivers/acpi/acpica/exdebug.c | 45 +- + drivers/acpi/acpica/exdump.c | 38 +- + drivers/acpi/acpica/exfield.c | 38 +- + drivers/acpi/acpica/exfldio.c | 40 +- + drivers/acpi/acpica/exmisc.c | 38 +- + drivers/acpi/acpica/exmutex.c | 40 +- + drivers/acpi/acpica/exnames.c | 45 +- + drivers/acpi/acpica/exoparg1.c | 38 +- + drivers/acpi/acpica/exoparg2.c | 38 +- + drivers/acpi/acpica/exoparg3.c | 38 +- + drivers/acpi/acpica/exoparg6.c | 38 +- + drivers/acpi/acpica/exprep.c | 38 +- + drivers/acpi/acpica/exregion.c | 40 +- + drivers/acpi/acpica/exresnte.c | 38 +- + drivers/acpi/acpica/exresolv.c | 38 +- + drivers/acpi/acpica/exresop.c | 39 +- + drivers/acpi/acpica/exstore.c | 38 +- + drivers/acpi/acpica/exstoren.c | 38 +- + drivers/acpi/acpica/exstorob.c | 38 +- + drivers/acpi/acpica/exsystem.c | 40 +- + drivers/acpi/acpica/extrace.c | 40 +- + drivers/acpi/acpica/exutils.c | 40 +- + drivers/acpi/acpica/hwacpi.c | 38 +- + drivers/acpi/acpica/hwesleep.c | 40 +- + drivers/acpi/acpica/hwgpe.c | 41 +- + drivers/acpi/acpica/hwpci.c | 38 +- + drivers/acpi/acpica/hwregs.c | 38 +- + drivers/acpi/acpica/hwsleep.c | 49 +- + drivers/acpi/acpica/hwtimer.c | 40 +- + drivers/acpi/acpica/hwvalid.c | 38 +- + drivers/acpi/acpica/hwxface.c | 40 +- + drivers/acpi/acpica/hwxfsleep.c | 42 +- + drivers/acpi/acpica/nsaccess.c | 38 +- + drivers/acpi/acpica/nsalloc.c | 38 +- + drivers/acpi/acpica/nsarguments.c | 38 +- + drivers/acpi/acpica/nsconvert.c | 40 +- + drivers/acpi/acpica/nsdump.c | 40 +- + drivers/acpi/acpica/nsdumpdv.c | 43 +- + drivers/acpi/acpica/nseval.c | 68 +- + drivers/acpi/acpica/nsinit.c | 45 +- + drivers/acpi/acpica/nsload.c | 62 +- + drivers/acpi/acpica/nsnames.c | 41 +- + drivers/acpi/acpica/nsobject.c | 38 +- + drivers/acpi/acpica/nsparse.c | 74 +- + drivers/acpi/acpica/nspredef.c | 38 +- + drivers/acpi/acpica/nsprepkg.c | 38 +- + drivers/acpi/acpica/nsrepair.c | 40 +- + drivers/acpi/acpica/nsrepair2.c | 40 +- + drivers/acpi/acpica/nssearch.c | 38 +- + drivers/acpi/acpica/nsutils.c | 40 +- + drivers/acpi/acpica/nswalk.c | 38 +- + drivers/acpi/acpica/nsxfeval.c | 38 +- + drivers/acpi/acpica/nsxfname.c | 59 +- + drivers/acpi/acpica/nsxfobj.c | 38 +- + drivers/acpi/acpica/psargs.c | 44 +- + drivers/acpi/acpica/psloop.c | 66 +- + drivers/acpi/acpica/psobject.c | 48 +- + drivers/acpi/acpica/psopcode.c | 38 +- + drivers/acpi/acpica/psopinfo.c | 38 +- + drivers/acpi/acpica/psparse.c | 40 +- + drivers/acpi/acpica/psscope.c | 40 +- + drivers/acpi/acpica/pstree.c | 39 +- + drivers/acpi/acpica/psutils.c | 40 +- + drivers/acpi/acpica/pswalk.c | 38 +- + drivers/acpi/acpica/psxface.c | 38 +- + drivers/acpi/acpica/rsaddr.c | 38 +- + drivers/acpi/acpica/rscalc.c | 38 +- + drivers/acpi/acpica/rscreate.c | 38 +- + drivers/acpi/acpica/rsdump.c | 38 +- + drivers/acpi/acpica/rsdumpinfo.c | 38 +- + drivers/acpi/acpica/rsinfo.c | 38 +- + drivers/acpi/acpica/rsio.c | 38 +- + drivers/acpi/acpica/rsirq.c | 38 +- + drivers/acpi/acpica/rslist.c | 38 +- + drivers/acpi/acpica/rsmemory.c | 38 +- + drivers/acpi/acpica/rsmisc.c | 38 +- + drivers/acpi/acpica/rsserial.c | 38 +- + drivers/acpi/acpica/rsutils.c | 38 +- + drivers/acpi/acpica/rsxface.c | 38 +- + drivers/acpi/acpica/tbdata.c | 58 +- + drivers/acpi/acpica/tbfadt.c | 40 +- + drivers/acpi/acpica/tbfind.c | 38 +- + drivers/acpi/acpica/tbinstal.c | 44 +- + drivers/acpi/acpica/tbprint.c | 40 +- + drivers/acpi/acpica/tbutils.c | 40 +- + drivers/acpi/acpica/tbxface.c | 40 +- + drivers/acpi/acpica/tbxfload.c | 51 +- + drivers/acpi/acpica/tbxfroot.c | 38 +- + drivers/acpi/acpica/utaddress.c | 38 +- + drivers/acpi/acpica/utalloc.c | 38 +- + drivers/acpi/acpica/utascii.c | 40 +- + drivers/acpi/acpica/utbuffer.c | 38 +- + drivers/acpi/acpica/utcache.c | 45 +- + drivers/acpi/acpica/utcopy.c | 40 +- + drivers/acpi/acpica/utdebug.c | 40 +- + drivers/acpi/acpica/utdecode.c | 40 +- + drivers/acpi/acpica/utdelete.c | 58 +- + drivers/acpi/acpica/uterror.c | 38 +- + drivers/acpi/acpica/uteval.c | 38 +- + drivers/acpi/acpica/utexcep.c | 38 +- + drivers/acpi/acpica/utglobal.c | 38 +- + drivers/acpi/acpica/uthex.c | 40 +- + drivers/acpi/acpica/utids.c | 38 +- + drivers/acpi/acpica/utinit.c | 38 +- + drivers/acpi/acpica/utlock.c | 40 +- + drivers/acpi/acpica/utmath.c | 38 +- + drivers/acpi/acpica/utmisc.c | 38 +- + drivers/acpi/acpica/utmutex.c | 38 +- + drivers/acpi/acpica/utnonansi.c | 38 +- + drivers/acpi/acpica/utobject.c | 40 +- + drivers/acpi/acpica/utosi.c | 40 +- + drivers/acpi/acpica/utownerid.c | 38 +- + drivers/acpi/acpica/utpredef.c | 40 +- + drivers/acpi/acpica/utprint.c | 40 +- + drivers/acpi/acpica/utresdecode.c | 38 +- + drivers/acpi/acpica/utresrc.c | 38 +- + drivers/acpi/acpica/utstate.c | 38 +- + drivers/acpi/acpica/utstring.c | 38 +- + drivers/acpi/acpica/utstrsuppt.c | 38 +- + drivers/acpi/acpica/utstrtoul64.c | 38 +- + drivers/acpi/acpica/uttrack.c | 40 +- + drivers/acpi/acpica/utuuid.c | 38 +- + drivers/acpi/acpica/utxface.c | 40 +- + drivers/acpi/acpica/utxferror.c | 38 +- + drivers/acpi/acpica/utxfinit.c | 86 +- + drivers/acpi/acpica/utxfmutex.c | 38 +- + drivers/acpi/battery.c | 222 ++- + drivers/acpi/battery.h | 11 - + drivers/acpi/bus.c | 6 +- + drivers/acpi/cppc_acpi.c | 27 +- + drivers/acpi/device_pm.c | 11 +- + drivers/acpi/osi.c | 9 + + drivers/acpi/pci_link.c | 4 +- + drivers/acpi/pmic/tps68470_pmic.c | 10 +- + drivers/acpi/sbs.c | 2 +- + drivers/acpi/sleep.c | 21 +- + drivers/acpi/tables.c | 2 +- + drivers/base/core.c | 25 +- + drivers/base/power/power.h | 1 + + drivers/base/power/wakeirq.c | 13 +- + drivers/cpufreq/cpufreq.c | 19 +- + drivers/cpufreq/freq_table.c | 16 +- + drivers/cpufreq/mediatek-cpufreq.c | 2 +- + drivers/cpufreq/powernow-k8.c | 14 +- + drivers/cpufreq/powernv-cpufreq.c | 11 +- + drivers/cpufreq/qoriq-cpufreq.c | 8 +- + drivers/cpufreq/s3c24xx-cpufreq.c | 8 +- + drivers/cpufreq/tegra186-cpufreq.c | 1 + + drivers/cpuidle/cpuidle-arm.c | 1 - + drivers/cpuidle/poll_state.c | 11 +- + drivers/pcmcia/cs.c | 10 +- + drivers/pcmcia/cs_internal.h | 1 + + drivers/platform/x86/Kconfig | 1 + + drivers/platform/x86/thinkpad_acpi.c | 389 +++- + drivers/power/supply/ds2780_battery.c | 5 - + drivers/power/supply/ds2781_battery.c | 5 - + drivers/power/supply/power_supply_core.c | 2 +- + drivers/powercap/intel_rapl.c | 1 + + drivers/watchdog/wdat_wdt.c | 2 +- + include/acpi/acbuffer.h | 38 +- + include/acpi/acconfig.h | 40 +- + include/acpi/acexcep.h | 38 +- + include/acpi/acnames.h | 38 +- + include/acpi/acoutput.h | 38 +- + include/acpi/acpi.h | 38 +- + include/acpi/acpiosxf.h | 38 +- + include/acpi/acpixf.h | 63 +- + include/acpi/acrestyp.h | 38 +- + include/acpi/actbl.h | 38 +- + include/acpi/actbl1.h | 1668 ++++++++-------- + include/acpi/actbl2.h | 1990 +++++++++++--------- + include/acpi/actbl3.h | 1056 +++++------ + include/acpi/actypes.h | 61 +- + include/acpi/acuuid.h | 38 +- + include/acpi/battery.h | 21 + + include/acpi/platform/acenv.h | 38 +- + include/acpi/platform/acenvex.h | 38 +- + include/acpi/platform/acgcc.h | 38 +- + include/acpi/platform/acgccex.h | 38 +- + include/acpi/platform/acintel.h | 38 +- + include/acpi/platform/aclinux.h | 40 +- + include/acpi/platform/aclinuxex.h | 38 +- + include/linux/cpufreq.h | 1 + + include/linux/device.h | 2 + + include/linux/power_supply.h | 2 + + tools/power/acpi/common/cmfsize.c | 38 +- + tools/power/acpi/common/getopt.c | 38 +- + .../acpi/os_specific/service_layers/oslinuxtbl.c | 40 +- + .../acpi/os_specific/service_layers/osunixdir.c | 40 +- + .../acpi/os_specific/service_layers/osunixmap.c | 40 +- + .../acpi/os_specific/service_layers/osunixxf.c | 40 +- + tools/power/acpi/tools/acpidump/acpidump.h | 38 +- + tools/power/acpi/tools/acpidump/apdump.c | 40 +- + tools/power/acpi/tools/acpidump/apfiles.c | 38 +- + tools/power/acpi/tools/acpidump/apmain.c | 38 +- + tools/power/pm-graph/Makefile | 29 +- + tools/power/pm-graph/bootgraph.8 | 18 +- + .../pm-graph/{analyze_boot.py => bootgraph.py} | 219 ++- + tools/power/pm-graph/config/cgskip.txt | 65 + + .../pm-graph/config/custom-timeline-functions.cfg | 205 ++ + tools/power/pm-graph/config/example.cfg | 133 ++ + tools/power/pm-graph/config/freeze-callgraph.cfg | 94 + + tools/power/pm-graph/config/freeze-dev.cfg | 93 + + tools/power/pm-graph/config/freeze.cfg | 93 + + tools/power/pm-graph/config/standby-callgraph.cfg | 94 + + tools/power/pm-graph/config/standby-dev.cfg | 93 + + tools/power/pm-graph/config/standby.cfg | 93 + + tools/power/pm-graph/config/suspend-callgraph.cfg | 98 + + tools/power/pm-graph/config/suspend-dev.cfg | 93 + + tools/power/pm-graph/config/suspend-x2-proc.cfg | 93 + + tools/power/pm-graph/config/suspend.cfg | 93 + + tools/power/pm-graph/sleepgraph.8 | 47 +- + .../pm-graph/{analyze_suspend.py => sleepgraph.py} | 1625 ++++++++++------ + 292 files changed, 6651 insertions(+), 11924 deletions(-) + delete mode 100644 drivers/acpi/battery.h + create mode 100644 include/acpi/battery.h + rename tools/power/pm-graph/{analyze_boot.py => bootgraph.py} (85%) + create mode 100644 tools/power/pm-graph/config/cgskip.txt + create mode 100644 tools/power/pm-graph/config/custom-timeline-functions.cfg + create mode 100644 tools/power/pm-graph/config/example.cfg + create mode 100644 tools/power/pm-graph/config/freeze-callgraph.cfg + create mode 100644 tools/power/pm-graph/config/freeze-dev.cfg + create mode 100644 tools/power/pm-graph/config/freeze.cfg + create mode 100644 tools/power/pm-graph/config/standby-callgraph.cfg + create mode 100644 tools/power/pm-graph/config/standby-dev.cfg + create mode 100644 tools/power/pm-graph/config/standby.cfg + create mode 100644 tools/power/pm-graph/config/suspend-callgraph.cfg + create mode 100644 tools/power/pm-graph/config/suspend-dev.cfg + create mode 100644 tools/power/pm-graph/config/suspend-x2-proc.cfg + create mode 100644 tools/power/pm-graph/config/suspend.cfg + rename tools/power/pm-graph/{analyze_suspend.py => sleepgraph.py} (82%) +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 (0f1a0183eae6 Merge branches 'thermal-core' and 'thermal-soc' into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + Documentation/thermal/sysfs-api.txt | 32 +++++ + drivers/thermal/Kconfig | 7 ++ + drivers/thermal/imx_thermal.c | 6 +- + drivers/thermal/thermal_core.c | 3 +- + drivers/thermal/thermal_core.h | 10 ++ + drivers/thermal/thermal_helpers.c | 5 +- + drivers/thermal/thermal_sysfs.c | 227 ++++++++++++++++++++++++++++++++++++ + include/linux/thermal.h | 1 + + 8 files changed, 286 insertions(+), 5 deletions(-) +Merging thermal-soc/next (d0ecbbbe518e thermal/drivers/hisi: Remove bogus const from function return type) +$ 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 (185899ee8d00 IB/uverbs: Enable ioctl() uAPI by default for new verbs) +$ git merge rdma/for-next +Recorded preimage for 'drivers/infiniband/core/ucma.c' +Auto-merging include/uapi/rdma/i40iw-abi.h +Auto-merging include/rdma/ib_verbs.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.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 MAINTAINERS +Auto-merging .mailmap +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/infiniband/core/ucma.c'. +[master 62684a8e3f1a] 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 | 2 +- + drivers/infiniband/core/addr.c | 1 - + drivers/infiniband/core/cache.c | 36 +- + drivers/infiniband/core/cm.c | 48 +- + drivers/infiniband/core/cma.c | 129 +- + drivers/infiniband/core/cma_priv.h | 83 ++ + drivers/infiniband/core/core_priv.h | 11 + + drivers/infiniband/core/device.c | 3 +- + drivers/infiniband/core/iwpm_util.c | 5 +- + drivers/infiniband/core/multicast.c | 26 +- + drivers/infiniband/core/nldev.c | 333 ++++- + drivers/infiniband/core/rdma_core.c | 13 +- + drivers/infiniband/core/restrack.c | 76 +- + drivers/infiniband/core/sa_query.c | 199 +-- + drivers/infiniband/core/sysfs.c | 1 + + drivers/infiniband/core/ucma.c | 8 +- + drivers/infiniband/core/uverbs.h | 21 + + drivers/infiniband/core/uverbs_cmd.c | 127 +- + drivers/infiniband/core/uverbs_ioctl.c | 33 +- + drivers/infiniband/core/uverbs_ioctl_merge.c | 2 +- + drivers/infiniband/core/uverbs_main.c | 218 ++-- + drivers/infiniband/core/uverbs_std_types.c | 303 ++--- + drivers/infiniband/core/uverbs_std_types_cq.c | 210 ++++ + drivers/infiniband/core/verbs.c | 81 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 5 +- + drivers/infiniband/hw/bnxt_re/main.c | 1 + + 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 | 1 + + drivers/infiniband/hw/cxgb4/mem.c | 3 + + drivers/infiniband/hw/cxgb4/provider.c | 5 +- + 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/verbs.c | 2 +- + drivers/infiniband/hw/hns/Makefile | 2 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 56 +- + 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 | 16 +- + 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_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/main.c | 49 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 19 +- + drivers/infiniband/hw/mlx4/mr.c | 3 + + drivers/infiniband/hw/mlx4/qp.c | 19 +- + drivers/infiniband/hw/mlx5/Makefile | 1 + + drivers/infiniband/hw/mlx5/cq.c | 64 +- + drivers/infiniband/hw/mlx5/ib_rep.c | 192 +++ + drivers/infiniband/hw/mlx5/ib_rep.h | 72 ++ + drivers/infiniband/hw/mlx5/main.c | 444 +++++-- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 46 +- + drivers/infiniband/hw/mlx5/mr.c | 140 +-- + drivers/infiniband/hw/mlx5/qp.c | 142 ++- + drivers/infiniband/hw/mthca/mthca_provider.c | 1 + + drivers/infiniband/hw/nes/nes_verbs.c | 1 + + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 3 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 16 - + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 10 - + drivers/infiniband/hw/qedr/main.c | 1 + + drivers/infiniband/hw/qedr/verbs.c | 4 +- + drivers/infiniband/hw/qib/qib.h | 3 - + 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 | 1 + + 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_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 | 2 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 15 +- + drivers/infiniband/sw/rxe/rxe_srq.c | 44 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 58 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 2 - + 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 + + .../net/ethernet/mellanox/mlx5/core/accel/ipsec.c | 59 +- + .../net/ethernet/mellanox/mlx5/core/accel/ipsec.h | 98 +- + drivers/net/ethernet/mellanox/mlx5/core/alloc.c | 37 +- + drivers/net/ethernet/mellanox/mlx5/core/cq.c | 113 +- + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 8 + + .../mellanox/mlx5/core/diag/fs_tracepoint.c | 3 + + .../mellanox/mlx5/core/diag/fs_tracepoint.h | 4 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 323 +++-- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 24 + + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 39 +- + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 5 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 19 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 11 + + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 92 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 23 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 42 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 104 +- + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.c | 1289 +++++++++++++++++++- + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.h | 76 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 207 +++- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 72 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 140 ++- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 49 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 28 +- + drivers/net/ethernet/mellanox/mlx5/core/rl.c | 63 +- + drivers/net/ethernet/mellanox/mlx5/core/wq.c | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/wq.h | 22 +- + include/linux/mlx4/device.h | 4 - + include/linux/mlx5/accel.h | 144 +++ + include/linux/mlx5/cq.h | 14 +- + include/linux/mlx5/device.h | 4 +- + include/linux/mlx5/driver.h | 109 +- + include/linux/mlx5/eswitch.h | 58 + + include/linux/mlx5/fs.h | 5 + + include/linux/mlx5/fs_helpers.h | 134 ++ + include/linux/mlx5/mlx5_ifc.h | 21 +- + include/linux/mlx5/mlx5_ifc_fpga.h | 92 +- + include/rdma/ib_addr.h | 9 - + include/rdma/ib_cache.h | 29 - + include/rdma/ib_sa.h | 5 + + include/rdma/ib_verbs.h | 40 +- + include/rdma/rdma_cm.h | 18 +- + include/rdma/rdma_vt.h | 2 +- + include/rdma/restrack.h | 24 + + include/rdma/uverbs_ioctl.h | 107 +- + include/rdma/uverbs_named_ioctl.h | 90 ++ + include/rdma/uverbs_std_types.h | 34 +- + include/uapi/rdma/bnxt_re-abi.h | 7 +- + include/uapi/rdma/cxgb4-abi.h | 5 + + include/uapi/rdma/hfi/hfi1_user.h | 6 +- + include/uapi/rdma/hns-abi.h | 16 + + .../uapi/rdma/i40iw-abi.h | 4 +- + include/uapi/rdma/ib_user_ioctl_cmds.h | 83 ++ + include/uapi/rdma/ib_user_ioctl_verbs.h | 53 +- + include/uapi/rdma/ib_user_verbs.h | 5 +- + include/uapi/rdma/mlx4-abi.h | 31 + + include/uapi/rdma/mlx5-abi.h | 19 +- + include/uapi/rdma/ocrdma-abi.h | 2 +- + include/uapi/rdma/rdma_netlink.h | 38 + + include/uapi/rdma/rdma_user_ioctl.h | 38 +- + include/uapi/rdma/rdma_user_ioctl_cmds.h | 93 ++ + include/uapi/rdma/rdma_user_rxe.h | 26 +- + 177 files changed, 6873 insertions(+), 2687 deletions(-) + create mode 100644 drivers/infiniband/core/cma_priv.h + create mode 100644 drivers/infiniband/core/uverbs_std_types_cq.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 drivers/infiniband/hw/mlx5/ib_rep.c + create mode 100644 drivers/infiniband/hw/mlx5/ib_rep.h + create mode 100644 include/linux/mlx5/accel.h + create mode 100644 include/linux/mlx5/eswitch.h + create mode 100644 include/linux/mlx5/fs_helpers.h + create mode 100644 include/rdma/uverbs_named_ioctl.h + rename drivers/infiniband/hw/i40iw/i40iw_ucontext.h => include/uapi/rdma/i40iw-abi.h (98%) + create mode 100644 include/uapi/rdma/ib_user_ioctl_cmds.h + create mode 100644 include/uapi/rdma/rdma_user_ioctl_cmds.h +Merging net-next/master (454bfe97837a Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next) +$ git merge net-next/master +Resolved 'drivers/net/ethernet/mellanox/mlxsw/spectrum.c' using previous resolution. +Resolved 'drivers/net/ethernet/mellanox/mlxsw/spectrum.h' using previous resolution. +Resolved 'drivers/net/phy/phy.c' using previous resolution. +Resolved 'include/linux/socket.h' using previous resolution. +Recorded preimage for 'include/net/mac80211.h' +Resolved 'net/ipv4/xfrm4_policy.c' using previous resolution. +Recorded preimage for 'net/mac80211/debugfs.c' +Auto-merging net/xfrm/xfrm_user.c +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/tipc/topsrv.h +Removing net/tipc/server.c +Auto-merging net/sunrpc/xprtsock.c +Auto-merging net/sunrpc/clnt.c +Auto-merging net/socket.c +Auto-merging net/smc/af_smc.c +Auto-merging net/sctp/diag.c +Auto-merging net/sched/act_vlan.c +Auto-merging net/sched/act_tunnel_key.c +Auto-merging net/sched/act_skbmod.c +Auto-merging net/sched/act_sample.c +Auto-merging net/sched/act_csum.c +Auto-merging net/netlink/genetlink.c +Auto-merging net/netfilter/xt_recent.c +Auto-merging net/netfilter/xt_hashlimit.c +Auto-merging net/netfilter/x_tables.c +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/mac80211/debugfs.c +CONFLICT (content): Merge conflict in net/mac80211/debugfs.c +Auto-merging net/l2tp/l2tp_core.c +Auto-merging net/kcm/kcmsock.c +Auto-merging net/iucv/af_iucv.c +Auto-merging net/ipv6/xfrm6_policy.c +Auto-merging net/ipv6/route.c +Auto-merging net/ipv6/ndisc.c +Auto-merging net/ipv6/ip6_vti.c +Auto-merging net/ipv6/ip6_gre.c +Auto-merging net/ipv6/datagram.c +Auto-merging net/ipv4/xfrm4_policy.c +CONFLICT (content): Merge conflict in net/ipv4/xfrm4_policy.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv4/route.c +Auto-merging net/ipv4/ip_vti.c +Auto-merging net/ipv4/ip_tunnel.c +Auto-merging net/ieee802154/6lowpan/core.c +Auto-merging net/core/sock_diag.c +Auto-merging net/core/sock.c +Auto-merging net/core/skbuff.c +Auto-merging net/core/filter.c +Auto-merging net/core/devlink.c +Auto-merging net/core/dev.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/bpf/syscall.c +Auto-merging include/uapi/linux/if_ether.h +Auto-merging include/net/sock.h +Auto-merging include/net/sch_generic.h +Auto-merging include/net/route.h +Auto-merging include/net/mac80211.h +CONFLICT (content): Merge conflict in include/net/mac80211.h +Auto-merging include/net/ip_fib.h +Auto-merging include/net/ip6_route.h +Auto-merging include/net/ip.h +Auto-merging include/linux/socket.h +CONFLICT (content): Merge conflict in include/linux/socket.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/phy.h +Auto-merging include/linux/net.h +Auto-merging fs/lockd/svc.c +Auto-merging drivers/vhost/net.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/team/team.c +Auto-merging drivers/net/phy/phy_device.c +Auto-merging drivers/net/phy/phy.c +CONFLICT (content): Merge conflict in drivers/net/phy/phy.c +Auto-merging drivers/net/phy/marvell.c +Auto-merging drivers/net/hyperv/rndis_filter.c +Auto-merging drivers/net/ethernet/ti/cpsw.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_iwarp.c +Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c +Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum.h +CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlxsw/spectrum.h +Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlxsw/spectrum.c +Auto-merging drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.h +Auto-merging drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c +Removing drivers/net/ethernet/intel/i40e/i40e_fcoe.h +Removing drivers/net/ethernet/intel/i40e/i40e_fcoe.c +Auto-merging drivers/net/ethernet/freescale/fman/fman_dtsec.c +Auto-merging drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +Auto-merging drivers/net/ethernet/8390/ne.c +Auto-merging drivers/net/dsa/b53/b53_common.c +Auto-merging drivers/infiniband/hw/usnic/usnic_transport.c +Auto-merging drivers/infiniband/core/cma.c +Auto-merging drivers/bluetooth/btusb.c +Auto-merging arch/x86/net/bpf_jit_comp.c +Auto-merging arch/m68k/mac/config.c +Auto-merging arch/arm/boot/dts/armada-370-rd.dts +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/net/dsa/marvell.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/net/mac80211.h'. +Recorded resolution for 'net/mac80211/debugfs.c'. +[master a35202d64c66] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/bpf_devel_QA.txt | 12 + + .../devicetree/bindings/net/dsa/marvell.txt | 11 +- + .../devicetree/bindings/net/ieee802154/mcr20a.txt | 23 + + Documentation/devicetree/bindings/net/macb.txt | 1 + + Documentation/devicetree/bindings/net/sff,sfp.txt | 5 + + .../devicetree/bindings/net/ti,dp83867.txt | 2 + + Documentation/networking/ip-sysctl.txt | 13 +- + Documentation/networking/msg_zerocopy.rst | 5 - + Documentation/networking/packet_mmap.txt | 22 +- + Documentation/sysctl/net.txt | 12 + + MAINTAINERS | 16 + + arch/arm/boot/dts/armada-370-rd.dts | 32 + + arch/m68k/mac/config.c | 4 + + arch/x86/net/bpf_jit_comp.c | 234 +- + drivers/atm/idt77252.c | 12 +- + drivers/bluetooth/ath3k.c | 28 +- + drivers/bluetooth/btmrvl_main.c | 2 +- + drivers/bluetooth/btrtl.c | 119 +- + drivers/bluetooth/btusb.c | 10 + + drivers/bluetooth/hci_ath.c | 4 +- + drivers/bluetooth/hci_ll.c | 2 +- + drivers/infiniband/core/cma.c | 3 +- + drivers/infiniband/hw/cxgb4/device.c | 1 + + drivers/infiniband/hw/usnic/usnic_transport.c | 5 +- + drivers/isdn/mISDN/socket.c | 5 +- + drivers/net/Kconfig | 4 +- + drivers/net/Space.c | 6 - + drivers/net/bonding/bond_main.c | 1 + + drivers/net/dsa/b53/b53_common.c | 2 +- + drivers/net/dsa/b53/b53_priv.h | 2 +- + drivers/net/dsa/dsa_loop.c | 2 +- + drivers/net/dsa/lan9303-core.c | 2 +- + drivers/net/dsa/microchip/ksz_common.c | 2 +- + drivers/net/dsa/mt7530.c | 2 +- + drivers/net/dsa/mv88e6xxx/Kconfig | 10 + + drivers/net/dsa/mv88e6xxx/Makefile | 4 + + drivers/net/dsa/mv88e6xxx/chip.c | 399 ++- + drivers/net/dsa/mv88e6xxx/chip.h | 130 +- + drivers/net/dsa/mv88e6xxx/global2.c | 43 +- + drivers/net/dsa/mv88e6xxx/global2.h | 115 +- + drivers/net/dsa/mv88e6xxx/global2_avb.c | 193 ++ + drivers/net/dsa/mv88e6xxx/global2_scratch.c | 291 ++ + drivers/net/dsa/mv88e6xxx/hwtstamp.c | 576 ++++ + drivers/net/dsa/mv88e6xxx/hwtstamp.h | 172 ++ + drivers/net/dsa/mv88e6xxx/ptp.c | 381 +++ + drivers/net/dsa/mv88e6xxx/ptp.h | 108 + + drivers/net/dsa/mv88e6xxx/serdes.c | 106 +- + drivers/net/dsa/mv88e6xxx/serdes.h | 6 +- + drivers/net/dsa/qca8k.c | 2 +- + drivers/net/ethernet/8390/Makefile | 6 +- + drivers/net/ethernet/8390/ax88796.c | 3 - + drivers/net/ethernet/8390/axnet_cs.c | 2 - + drivers/net/ethernet/8390/etherh.c | 17 - + drivers/net/ethernet/8390/hydra.c | 4 - + drivers/net/ethernet/8390/lib8390.c | 2 + + drivers/net/ethernet/8390/mac8390.c | 171 +- + drivers/net/ethernet/8390/mcf8390.c | 4 - + drivers/net/ethernet/8390/ne.c | 2 +- + drivers/net/ethernet/8390/pcnet_cs.c | 4 - + drivers/net/ethernet/8390/wd.c | 2 +- + drivers/net/ethernet/8390/zorro8390.c | 5 - + drivers/net/ethernet/amd/amd8111e.c | 2 +- + drivers/net/ethernet/apple/macmace.c | 25 +- + .../net/ethernet/aquantia/atlantic/hw_atl/Makefile | 2 + + drivers/net/ethernet/cadence/macb_main.c | 84 +- + drivers/net/ethernet/cavium/liquidio/lio_core.c | 104 +- + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 24 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 70 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 67 +- + .../net/ethernet/cavium/liquidio/liquidio_common.h | 15 +- + drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 83 +- + drivers/net/ethernet/cavium/liquidio/octeon_droq.h | 11 +- + .../net/ethernet/cavium/liquidio/octeon_mailbox.c | 5 +- + .../net/ethernet/cavium/liquidio/octeon_network.h | 20 + + .../net/ethernet/cavium/liquidio/request_manager.c | 5 + + .../ethernet/cavium/liquidio/response_manager.c | 6 +- + drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 8 +- + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 86 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 19 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 10 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 24 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 6 - + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 247 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 3 +- + drivers/net/ethernet/chelsio/cxgb4/sched.h | 4 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 194 +- + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 56 + + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 51 +- + drivers/net/ethernet/cirrus/mac89x0.c | 158 +- + drivers/net/ethernet/cisco/enic/enic.h | 3 +- + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 36 + + drivers/net/ethernet/cisco/enic/enic_main.c | 86 +- + drivers/net/ethernet/cisco/enic/vnic_dev.c | 22 +- + drivers/net/ethernet/cisco/enic/vnic_dev.h | 3 +- + drivers/net/ethernet/cisco/enic/vnic_devcmd.h | 5 + + drivers/net/ethernet/cisco/enic/vnic_nic.h | 1 + + drivers/net/ethernet/emulex/benet/be_cmds.c | 2 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 2 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 65 +- + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 2 +- + drivers/net/ethernet/freescale/fman/fman_dtsec.c | 19 + + drivers/net/ethernet/freescale/fman/fman_dtsec.h | 1 + + drivers/net/ethernet/freescale/fman/fman_memac.c | 32 +- + drivers/net/ethernet/freescale/fman/fman_memac.h | 1 + + drivers/net/ethernet/freescale/fman/fman_tgec.c | 33 +- + drivers/net/ethernet/freescale/fman/fman_tgec.h | 1 + + drivers/net/ethernet/freescale/fman/mac.c | 3 + + drivers/net/ethernet/freescale/fman/mac.h | 2 + + drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 2 + + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 6 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 286 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 10 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 42 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 16 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 344 +-- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 16 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 33 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 76 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 8 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 97 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 5 + + drivers/net/ethernet/ibm/ibmvnic.c | 600 +++-- + drivers/net/ethernet/ibm/ibmvnic.h | 16 +- + drivers/net/ethernet/intel/fm10k/fm10k_common.c | 5 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 10 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 13 +- + drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_tlv.c | 7 +- + drivers/net/ethernet/intel/i40e/i40e.h | 11 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 37 + + drivers/net/ethernet/intel/i40e/i40e_client.c | 16 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 63 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 52 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 111 +- + drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 1571 ----------- + drivers/net/ethernet/intel/i40e/i40e_fcoe.h | 127 - + drivers/net/ethernet/intel/i40e/i40e_main.c | 375 ++- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 4 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 437 ++- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 70 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 5 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 1090 +++++++- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 20 + + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 427 ++- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 67 +- + drivers/net/ethernet/intel/i40evf/i40evf.h | 78 +- + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 52 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 933 ++++++- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 338 ++- + drivers/net/ethernet/intel/igb/igb.h | 1 + + drivers/net/ethernet/intel/igb/igb_main.c | 35 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 5 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 53 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 1 - + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 6 +- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 48 + + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 72 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 825 +++--- + drivers/net/ethernet/marvell/mvpp2.c | 927 +++++-- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 14 + + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 8 +- + drivers/net/ethernet/mellanox/mlx4/en_port.c | 38 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 31 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 + + drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 1 - + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 2 + + drivers/net/ethernet/mellanox/mlxsw/Makefile | 2 +- + .../mellanox/mlxsw/core_acl_flex_actions.c | 19 +- + .../mellanox/mlxsw/core_acl_flex_actions.h | 9 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 9 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 145 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 521 +--- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 45 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 52 +- + .../mellanox/mlxsw/spectrum_acl_flex_actions.c | 34 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 5 - + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 174 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.h | 15 +- + .../net/ethernet/mellanox/mlxsw/spectrum_kvdl.c | 189 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c | 21 +- + .../net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 206 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 46 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 804 ++++++ + .../net/ethernet/mellanox/mlxsw/spectrum_span.h | 104 + + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 16 +- + drivers/net/ethernet/microchip/Kconfig | 10 + + drivers/net/ethernet/microchip/Makefile | 3 + + drivers/net/ethernet/microchip/lan743x_main.c | 2771 +++++++++++++++++++ + drivers/net/ethernet/microchip/lan743x_main.h | 597 +++++ + drivers/net/ethernet/natsemi/jazzsonic.c | 32 +- + drivers/net/ethernet/natsemi/macsonic.c | 244 +- + drivers/net/ethernet/natsemi/sonic.c | 99 +- + drivers/net/ethernet/natsemi/sonic.h | 2 + + drivers/net/ethernet/natsemi/xtsonic.c | 30 +- + drivers/net/ethernet/netronome/nfp/bpf/Makefile | 2 + + drivers/net/ethernet/netronome/nfp/flower/Makefile | 2 + + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 11 +- + drivers/net/ethernet/netronome/nfp/flower/main.h | 1 + + drivers/net/ethernet/netronome/nfp/flower/match.c | 20 + + .../net/ethernet/netronome/nfp/flower/offload.c | 34 + + drivers/net/ethernet/netronome/nfp/nfp_main.c | 1 + + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 280 +- + .../net/ethernet/netronome/nfp/nfpcore/Makefile | 2 + + .../netronome/nfp/nfpcore/nfp6000/Makefile | 2 + + drivers/net/ethernet/netronome/nfp/nic/Makefile | 2 + + drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 2 +- + drivers/net/ethernet/qualcomm/qca_spi.c | 1 - + drivers/net/ethernet/realtek/r8169.c | 1013 +++---- + drivers/net/ethernet/renesas/ravb.h | 1 + + drivers/net/ethernet/renesas/ravb_main.c | 33 +- + drivers/net/ethernet/renesas/sh_eth.c | 37 +- + drivers/net/ethernet/renesas/sh_eth.h | 5 +- + drivers/net/ethernet/sfc/ef10.c | 273 +- + drivers/net/ethernet/sfc/efx.c | 65 +- + drivers/net/ethernet/sfc/efx.h | 12 +- + drivers/net/ethernet/sfc/ethtool.c | 185 +- + drivers/net/ethernet/sfc/falcon/enum.h | 1 - + drivers/net/ethernet/sfc/farch.c | 11 +- + drivers/net/ethernet/sfc/filter.h | 7 +- + drivers/net/ethernet/sfc/mcdi_pcol.h | 2822 ++++++++++++-------- + drivers/net/ethernet/sfc/mcdi_port.c | 150 ++ + drivers/net/ethernet/sfc/net_driver.h | 52 +- + drivers/net/ethernet/sfc/nic.h | 2 - + drivers/net/ethernet/sfc/siena.c | 26 +- + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 208 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 2 + + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 41 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 34 +- + drivers/net/ethernet/ti/cpsw.c | 67 +- + drivers/net/ethernet/ti/davinci_cpdma.c | 2 +- + drivers/net/ethernet/ti/davinci_cpdma.h | 2 + + drivers/net/geneve.c | 1 + + drivers/net/gtp.c | 1 + + drivers/net/hyperv/Makefile | 2 +- + drivers/net/hyperv/netvsc.c | 26 +- + drivers/net/hyperv/netvsc_trace.c | 7 + + drivers/net/hyperv/netvsc_trace.h | 182 ++ + drivers/net/hyperv/rndis_filter.c | 12 +- + drivers/net/ieee802154/Kconfig | 11 + + drivers/net/ieee802154/Makefile | 1 + + drivers/net/ieee802154/mcr20a.c | 1413 ++++++++++ + drivers/net/ieee802154/mcr20a.h | 498 ++++ + drivers/net/ipvlan/ipvlan.h | 7 + + drivers/net/ipvlan/ipvlan_core.c | 103 +- + drivers/net/ipvlan/ipvlan_main.c | 119 +- + drivers/net/loopback.c | 1 + + drivers/net/phy/aquantia.c | 20 +- + drivers/net/phy/bcm7xxx.c | 2 +- + drivers/net/phy/cortina.c | 18 +- + drivers/net/phy/dp83867.c | 19 + + drivers/net/phy/marvell.c | 2 +- + drivers/net/phy/marvell10g.c | 13 +- + drivers/net/phy/mdio-mux-mmioreg.c | 5 +- + drivers/net/phy/phy-c45.c | 28 +- + drivers/net/phy/phy-core.c | 4 +- + drivers/net/phy/phy.c | 22 +- + drivers/net/phy/phy_device.c | 2 +- + drivers/net/phy/phylink.c | 45 +- + drivers/net/phy/sfp-bus.c | 162 +- + drivers/net/phy/sfp.c | 150 +- + drivers/net/phy/teranetics.c | 32 +- + drivers/net/ppp/ppp_generic.c | 1 + + drivers/net/ppp/pppoe.c | 7 +- + drivers/net/ppp/pptp.c | 6 +- + drivers/net/team/team.c | 16 +- + drivers/net/tun.c | 91 +- + drivers/net/usb/ax88179_178a.c | 118 +- + drivers/net/usb/cdc_eem.c | 5 +- + drivers/net/usb/kalmia.c | 14 +- + drivers/net/usb/lg-vl600.c | 6 +- + drivers/net/vrf.c | 13 +- + drivers/net/vxlan.c | 1 + + drivers/net/wimax/i2400m/usb-rx.c | 3 - + drivers/net/wireless/ath/wil6210/cfg80211.c | 3 +- + drivers/net/wireless/mac80211_hwsim.c | 96 +- + drivers/net/wireless/mac80211_hwsim.h | 9 +- + drivers/net/wireless/ti/wl1251/tx.c | 4 +- + drivers/net/xen-netback/rx.c | 2 +- + drivers/s390/net/qeth_core.h | 8 - + drivers/s390/net/qeth_core_main.c | 40 +- + drivers/s390/net/qeth_l2_main.c | 34 +- + drivers/s390/net/qeth_l3.h | 34 +- + drivers/s390/net/qeth_l3_main.c | 419 +-- + drivers/s390/net/qeth_l3_sys.c | 51 +- + drivers/scsi/iscsi_tcp.c | 14 +- + drivers/soc/qcom/qmi_interface.c | 3 +- + drivers/staging/ipx/af_ipx.c | 6 +- + drivers/staging/irda/net/af_irda.c | 8 +- + drivers/staging/lustre/lnet/lnet/lib-socket.c | 7 +- + drivers/target/iscsi/iscsi_target_login.c | 18 +- + drivers/usb/gadget/function/f_eem.c | 1 - + drivers/vhost/net.c | 7 +- + drivers/vhost/vsock.c | 4 +- + fs/dlm/lowcomms.c | 7 +- + fs/lockd/svc.c | 1 + + fs/nfs/inode.c | 1 + + fs/nfs_common/grace.c | 1 + + fs/nsfs.c | 1 + + fs/ocfs2/cluster/tcp.c | 6 +- + fs/proc/proc_net.c | 1 + + include/dt-bindings/net/ti-dp83867.h | 14 + + include/linux/atalk.h | 2 + + include/linux/avf/virtchnl.h | 107 +- + include/linux/bpf-cgroup.h | 2 +- + include/linux/bpf.h | 1 + + include/linux/bpf_types.h | 1 + + include/linux/ethtool.h | 5 + + include/linux/filter.h | 19 +- + include/linux/ieee80211.h | 14 +- + include/linux/mroute.h | 88 +- + include/linux/mroute6.h | 62 +- + include/linux/mroute_base.h | 346 +++ + include/linux/net.h | 8 +- + include/linux/netdevice.h | 50 +- + include/linux/phy.h | 8 + + include/linux/ptp_classify.h | 4 + + include/linux/ptr_ring.h | 7 +- + include/linux/rtnetlink.h | 3 +- + include/linux/sfp.h | 18 +- + include/linux/skbuff.h | 3 + + include/linux/socket.h | 2 + + include/net/Space.h | 2 - + include/net/act_api.h | 19 +- + include/net/addrconf.h | 4 +- + include/net/ax25.h | 2 + + include/net/cfg80211.h | 110 +- + include/net/devlink.h | 4 - + include/net/dsa.h | 22 +- + include/net/dst.h | 1 + + include/net/dst_cache.h | 4 +- + include/net/ethoc.h | 1 - + include/net/fib_rules.h | 45 +- + include/net/flow.h | 18 +- + include/net/gre.h | 3 + + include/net/ieee80211_radiotap.h | 2 + + include/net/inet_common.h | 2 +- + include/net/inet_connection_sock.h | 10 +- + include/net/ip.h | 12 +- + include/net/ip6_fib.h | 29 +- + include/net/ip6_route.h | 15 +- + include/net/ip_fib.h | 31 +- + include/net/ip_tunnels.h | 18 + + include/net/ipv6.h | 23 +- + include/net/lwtunnel.h | 15 + + include/net/mac80211.h | 19 + + include/net/net_namespace.h | 30 +- + include/net/netevent.h | 3 +- + include/net/netns/ipv4.h | 4 + + include/net/netns/ipv6.h | 6 +- + include/net/pkt_cls.h | 8 + + include/net/route.h | 2 - + include/net/sch_generic.h | 2 +- + include/net/sctp/auth.h | 21 +- + include/net/sctp/command.h | 1 + + include/net/sctp/sctp.h | 11 +- + include/net/sctp/sm.h | 3 +- + include/net/sctp/structs.h | 12 +- + include/net/sock.h | 16 +- + include/net/tcp.h | 9 +- + include/net/tcp_states.h | 26 +- + include/net/xfrm.h | 14 +- + include/uapi/linux/batadv_packet.h | 15 +- + include/uapi/linux/batman_adv.h | 2 +- + include/uapi/linux/bpf.h | 48 +- + include/uapi/linux/bpf_perf_event.h | 1 + + include/uapi/linux/ethtool.h | 32 +- + include/uapi/linux/fib_rules.h | 11 +- + include/uapi/linux/if_ether.h | 1 + + include/uapi/linux/if_link.h | 18 + + include/uapi/linux/ncsi.h | 115 + + include/uapi/linux/nl80211.h | 90 +- + include/uapi/linux/pkt_cls.h | 4 +- + include/uapi/linux/rds.h | 8 + + include/uapi/linux/sctp.h | 43 +- + include/uapi/linux/tc_ematch/tc_em_ipt.h | 20 + + include/uapi/linux/tcp.h | 3 + + include/uapi/linux/tipc.h | 102 +- + kernel/audit.c | 1 + + kernel/bpf/inode.c | 3 + + kernel/bpf/sockmap.c | 733 ++++- + kernel/bpf/stackmap.c | 257 +- + kernel/bpf/syscall.c | 14 +- + kernel/bpf/verifier.c | 9 +- + kernel/trace/bpf_trace.c | 20 +- + lib/kobject_uevent.c | 1 + + net/8021q/vlan.c | 1 + + net/appletalk/ddp.c | 5 +- + net/atm/pvc.c | 5 +- + net/atm/svc.c | 5 +- + net/ax25/af_ax25.c | 4 +- + net/batman-adv/Kconfig | 2 +- + net/batman-adv/Makefile | 2 +- + net/batman-adv/bat_algo.c | 2 +- + net/batman-adv/bat_algo.h | 2 +- + net/batman-adv/bat_iv_ogm.c | 2 +- + net/batman-adv/bat_iv_ogm.h | 2 +- + net/batman-adv/bat_v.c | 2 +- + net/batman-adv/bat_v.h | 2 +- + net/batman-adv/bat_v_elp.c | 2 +- + net/batman-adv/bat_v_elp.h | 2 +- + net/batman-adv/bat_v_ogm.c | 2 +- + net/batman-adv/bat_v_ogm.h | 2 +- + net/batman-adv/bitarray.c | 2 +- + net/batman-adv/bitarray.h | 2 +- + net/batman-adv/bridge_loop_avoidance.c | 2 +- + net/batman-adv/bridge_loop_avoidance.h | 2 +- + net/batman-adv/debugfs.c | 2 +- + net/batman-adv/debugfs.h | 2 +- + net/batman-adv/distributed-arp-table.c | 4 +- + net/batman-adv/distributed-arp-table.h | 2 +- + net/batman-adv/fragmentation.c | 2 +- + net/batman-adv/fragmentation.h | 2 +- + net/batman-adv/gateway_client.c | 2 +- + net/batman-adv/gateway_client.h | 2 +- + net/batman-adv/gateway_common.c | 2 +- + net/batman-adv/gateway_common.h | 2 +- + net/batman-adv/hard-interface.c | 2 +- + net/batman-adv/hard-interface.h | 2 +- + net/batman-adv/hash.c | 2 +- + net/batman-adv/hash.h | 2 +- + net/batman-adv/icmp_socket.c | 2 +- + net/batman-adv/icmp_socket.h | 2 +- + net/batman-adv/log.c | 2 +- + net/batman-adv/log.h | 2 +- + net/batman-adv/main.c | 2 +- + net/batman-adv/main.h | 16 +- + net/batman-adv/multicast.c | 2 +- + net/batman-adv/multicast.h | 2 +- + net/batman-adv/netlink.c | 2 +- + net/batman-adv/netlink.h | 2 +- + net/batman-adv/network-coding.c | 2 +- + net/batman-adv/network-coding.h | 2 +- + net/batman-adv/originator.c | 2 +- + net/batman-adv/originator.h | 2 +- + net/batman-adv/routing.c | 2 +- + net/batman-adv/routing.h | 2 +- + net/batman-adv/send.c | 2 +- + net/batman-adv/send.h | 2 +- + net/batman-adv/soft-interface.c | 2 +- + net/batman-adv/soft-interface.h | 2 +- + net/batman-adv/sysfs.c | 2 +- + net/batman-adv/sysfs.h | 2 +- + net/batman-adv/tp_meter.c | 2 +- + net/batman-adv/tp_meter.h | 2 +- + net/batman-adv/translation-table.c | 2 +- + net/batman-adv/translation-table.h | 2 +- + net/batman-adv/tvlv.c | 2 +- + net/batman-adv/tvlv.h | 2 +- + net/batman-adv/types.h | 2 +- + net/bluetooth/hci_request.c | 6 +- + net/bluetooth/hci_sock.c | 4 +- + net/bluetooth/l2cap_sock.c | 5 +- + net/bluetooth/rfcomm/sock.c | 5 +- + net/bluetooth/sco.c | 5 +- + net/bridge/br.c | 1 + + net/bridge/br_netfilter_hooks.c | 1 + + net/bridge/netfilter/ebtable_broute.c | 1 + + net/bridge/netfilter/ebtable_filter.c | 1 + + net/bridge/netfilter/ebtable_nat.c | 1 + + net/bridge/netfilter/nf_log_bridge.c | 1 + + net/caif/caif_dev.c | 1 + + net/can/bcm.c | 1 + + net/can/gw.c | 1 + + net/can/raw.c | 6 +- + net/core/dev.c | 26 +- + net/core/devlink.c | 40 +- + net/core/dst_cache.c | 4 +- + net/core/ethtool.c | 64 +- + net/core/fib_notifier.c | 1 + + net/core/fib_rules.c | 105 +- + net/core/filter.c | 277 +- + net/core/flow_dissector.c | 16 - + net/core/net-procfs.c | 2 + + net/core/net_namespace.c | 138 +- + net/core/pktgen.c | 16 +- + net/core/rtnetlink.c | 11 +- + net/core/skbuff.c | 10 +- + net/core/sock.c | 90 +- + net/core/sock_diag.c | 1 + + net/core/sysctl_net_core.c | 13 + + net/dccp/ipv4.c | 1 + + net/dccp/ipv6.c | 1 + + net/decnet/af_decnet.c | 6 +- + net/dsa/dsa.c | 36 + + net/dsa/master.c | 4 +- + net/dsa/slave.c | 61 +- + net/ieee802154/6lowpan/core.c | 1 + + net/ieee802154/core.c | 1 + + net/ipv4/Kconfig | 5 + + net/ipv4/Makefile | 1 + + net/ipv4/af_inet.c | 7 +- + net/ipv4/arp.c | 1 + + net/ipv4/devinet.c | 1 + + net/ipv4/fib_frontend.c | 1 + + net/ipv4/fib_rules.c | 19 + + net/ipv4/fib_semantics.c | 16 +- + net/ipv4/fib_trie.c | 5 +- + net/ipv4/fou.c | 1 + + net/ipv4/icmp.c | 1 + + net/ipv4/igmp.c | 1 + + net/ipv4/inetpeer.c | 3 +- + net/ipv4/ip_fragment.c | 1 + + net/ipv4/ip_gre.c | 16 +- + net/ipv4/ip_tunnel.c | 54 +- + net/ipv4/ip_vti.c | 1 + + net/ipv4/ipip.c | 1 + + net/ipv4/ipmr.c | 586 ++-- + net/ipv4/ipmr_base.c | 323 +++ + net/ipv4/netfilter/arp_tables.c | 1 + + net/ipv4/netfilter/arptable_filter.c | 1 + + net/ipv4/netfilter/ip_tables.c | 1 + + net/ipv4/netfilter/ipt_CLUSTERIP.c | 1 + + net/ipv4/netfilter/iptable_filter.c | 1 + + net/ipv4/netfilter/iptable_mangle.c | 1 + + net/ipv4/netfilter/iptable_nat.c | 1 + + net/ipv4/netfilter/iptable_raw.c | 1 + + net/ipv4/netfilter/iptable_security.c | 1 + + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 1 + + net/ipv4/netfilter/nf_defrag_ipv4.c | 1 + + net/ipv4/netfilter/nf_log_arp.c | 1 + + net/ipv4/netfilter/nf_log_ipv4.c | 1 + + net/ipv4/ping.c | 1 + + net/ipv4/proc.c | 2 +- + net/ipv4/raw.c | 1 + + net/ipv4/route.c | 91 +- + net/ipv4/sysctl_net_ipv4.c | 35 +- + net/ipv4/tcp.c | 69 +- + net/ipv4/tcp_bbr.c | 38 +- + net/ipv4/tcp_input.c | 7 +- + net/ipv4/tcp_ipv4.c | 28 +- + net/ipv4/tcp_metrics.c | 1 + + net/ipv4/tcp_minisocks.c | 3 +- + net/ipv4/tcp_output.c | 55 +- + net/ipv4/tunnel4.c | 2 +- + net/ipv4/udp.c | 87 +- + net/ipv4/udplite.c | 1 + + net/ipv4/xfrm4_policy.c | 3 +- + net/ipv6/Kconfig | 1 + + net/ipv6/addrconf.c | 63 +- + net/ipv6/addrlabel.c | 1 + + net/ipv6/af_inet6.c | 6 +- + net/ipv6/anycast.c | 12 +- + net/ipv6/datagram.c | 5 +- + net/ipv6/exthdrs_core.c | 1 - + net/ipv6/fib6_rules.c | 36 +- + net/ipv6/icmp.c | 6 +- + net/ipv6/ila/ila_xlat.c | 1 + + net/ipv6/ip6_fib.c | 4 +- + net/ipv6/ip6_flowlabel.c | 1 + + net/ipv6/ip6_gre.c | 26 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/ip6_tunnel.c | 19 +- + net/ipv6/ip6_vti.c | 3 +- + net/ipv6/ip6mr.c | 993 +++---- + net/ipv6/ipv6_sockglue.c | 1 - + net/ipv6/mcast.c | 5 +- + net/ipv6/ndisc.c | 5 +- + net/ipv6/netfilter/ip6_tables.c | 1 + + net/ipv6/netfilter/ip6t_rpfilter.c | 2 +- + net/ipv6/netfilter/ip6table_filter.c | 1 + + net/ipv6/netfilter/ip6table_mangle.c | 1 + + net/ipv6/netfilter/ip6table_nat.c | 1 + + net/ipv6/netfilter/ip6table_raw.c | 1 + + net/ipv6/netfilter/ip6table_security.c | 1 + + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 1 + + net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 1 + + net/ipv6/netfilter/nf_log_ipv6.c | 1 + + net/ipv6/netfilter/nft_fib_ipv6.c | 3 +- + net/ipv6/ping.c | 1 + + net/ipv6/proc.c | 2 +- + net/ipv6/raw.c | 1 + + net/ipv6/reassembly.c | 1 + + net/ipv6/route.c | 301 ++- + net/ipv6/seg6.c | 1 + + net/ipv6/seg6_local.c | 4 +- + net/ipv6/sit.c | 6 +- + net/ipv6/sysctl_net_ipv6.c | 28 + + net/ipv6/tcp_ipv6.c | 14 +- + net/ipv6/udp.c | 52 +- + net/ipv6/udplite.c | 1 + + net/ipv6/xfrm6_policy.c | 1 + + net/ipv6/xfrm6_state.c | 1 - + net/ipv6/xfrm6_tunnel.c | 1 + + net/iucv/af_iucv.c | 5 +- + net/kcm/kcmproc.c | 1 + + net/kcm/kcmsock.c | 2 + + net/key/af_key.c | 1 + + net/l2tp/l2tp_core.c | 1 + + net/l2tp/l2tp_ip.c | 5 +- + net/l2tp/l2tp_ip6.c | 5 +- + net/l2tp/l2tp_ppp.c | 6 +- + net/llc/af_llc.c | 5 +- + net/llc/llc_sap.c | 7 +- + net/mac80211/agg-rx.c | 14 +- + net/mac80211/cfg.c | 1 + + net/mac80211/debugfs.c | 1 + + net/mac80211/debugfs_sta.c | 10 +- + net/mac80211/iface.c | 3 +- + net/mac80211/michael.c | 2 +- + net/mac80211/mlme.c | 18 +- + net/mac80211/rc80211_minstrel_ht.c | 2 +- + net/mac80211/rx.c | 188 +- + net/mac80211/sta_info.c | 6 + + net/mac80211/sta_info.h | 2 + + net/mac80211/status.c | 11 +- + net/mac80211/tx.c | 11 +- + net/mac80211/vht.c | 9 + + net/mac80211/wpa.c | 8 +- + net/mpls/af_mpls.c | 1 + + net/ncsi/Makefile | 2 +- + net/ncsi/internal.h | 3 + + net/ncsi/ncsi-manage.c | 30 +- + net/ncsi/ncsi-netlink.c | 423 +++ + net/ncsi/ncsi-netlink.h | 20 + + net/netfilter/core.c | 1 + + net/netfilter/ipset/ip_set_core.c | 3 +- + net/netfilter/ipvs/ip_vs_core.c | 2 + + net/netfilter/ipvs/ip_vs_ftp.c | 1 + + net/netfilter/ipvs/ip_vs_lblc.c | 1 + + net/netfilter/ipvs/ip_vs_lblcr.c | 1 + + net/netfilter/nf_conntrack_netlink.c | 1 + + net/netfilter/nf_conntrack_proto_gre.c | 1 + + net/netfilter/nf_conntrack_standalone.c | 1 + + net/netfilter/nf_log.c | 1 + + net/netfilter/nf_log_netdev.c | 1 + + net/netfilter/nf_synproxy_core.c | 1 + + net/netfilter/nf_tables_api.c | 1 + + net/netfilter/nfnetlink.c | 1 + + net/netfilter/nfnetlink_acct.c | 1 + + net/netfilter/nfnetlink_cttimeout.c | 1 + + net/netfilter/nfnetlink_log.c | 1 + + net/netfilter/nfnetlink_queue.c | 6 +- + net/netfilter/x_tables.c | 1 + + net/netfilter/xt_hashlimit.c | 1 + + net/netfilter/xt_recent.c | 1 + + net/netlink/af_netlink.c | 7 +- + net/netlink/genetlink.c | 1 + + net/netrom/af_netrom.c | 9 +- + net/nfc/llcp_sock.c | 5 +- + net/openvswitch/datapath.c | 1 + + net/openvswitch/vport.c | 8 +- + net/packet/af_packet.c | 11 +- + net/phonet/pn_dev.c | 1 + + net/phonet/socket.c | 5 +- + net/qrtr/qrtr.c | 5 +- + net/rds/af_rds.c | 14 +- + net/rds/connection.c | 7 +- + net/rds/ib.c | 3 + + net/rds/message.c | 163 +- + net/rds/rds.h | 31 +- + net/rds/recv.c | 42 +- + net/rds/send.c | 54 +- + net/rds/tcp.c | 25 +- + net/rose/af_rose.c | 5 +- + net/rxrpc/recvmsg.c | 2 +- + net/sched/Kconfig | 12 + + net/sched/Makefile | 1 + + net/sched/act_api.c | 192 +- + net/sched/act_bpf.c | 11 +- + net/sched/act_connmark.c | 12 +- + net/sched/act_csum.c | 11 +- + net/sched/act_gact.c | 25 +- + net/sched/act_ife.c | 11 +- + net/sched/act_ipt.c | 22 +- + net/sched/act_mirred.c | 26 +- + net/sched/act_nat.c | 12 +- + net/sched/act_pedit.c | 11 +- + net/sched/act_police.c | 12 +- + net/sched/act_sample.c | 11 +- + net/sched/act_simple.c | 11 +- + net/sched/act_skbedit.c | 11 +- + net/sched/act_skbmod.c | 11 +- + net/sched/act_tunnel_key.c | 11 +- + net/sched/act_vlan.c | 11 +- + net/sched/cls_api.c | 6 +- + net/sched/cls_flower.c | 6 + + net/sched/em_ipt.c | 257 ++ + net/sched/sch_api.c | 8 +- + net/sched/sch_prio.c | 45 +- + net/sctp/Makefile | 2 + + net/sctp/auth.c | 146 +- + net/sctp/chunk.c | 14 + + net/sctp/{sctp_diag.c => diag.c} | 31 + + net/sctp/ipv6.c | 8 +- + net/sctp/objcnt.c | 8 - + net/sctp/output.c | 18 +- + net/sctp/proc.c | 90 +- + net/sctp/protocol.c | 61 +- + net/sctp/sm_make_chunk.c | 33 +- + net/sctp/sm_sideeffect.c | 13 + + net/sctp/sm_statefuns.c | 56 +- + net/sctp/socket.c | 828 +++--- + net/smc/af_smc.c | 211 +- + net/smc/smc.h | 9 +- + net/smc/smc_clc.c | 214 +- + net/smc/smc_clc.h | 22 +- + net/smc/smc_core.c | 100 +- + net/smc/smc_core.h | 16 +- + net/smc/smc_ib.c | 10 +- + net/smc/smc_llc.c | 408 ++- + net/smc/smc_llc.h | 41 +- + net/smc/smc_wr.h | 1 - + net/socket.c | 51 +- + net/sunrpc/clnt.c | 6 +- + net/sunrpc/svcsock.c | 13 +- + net/sunrpc/xprtsock.c | 3 +- + net/sysctl_net.c | 1 + + net/tipc/Makefile | 2 +- + net/tipc/addr.c | 31 - + net/tipc/addr.h | 10 + + net/tipc/bcast.c | 2 +- + net/tipc/bearer.c | 8 +- + net/tipc/core.c | 1 + + net/tipc/core.h | 11 +- + net/tipc/group.c | 2 +- + net/tipc/link.c | 3 +- + net/tipc/msg.c | 2 +- + net/tipc/name_distr.c | 63 +- + net/tipc/name_distr.h | 2 +- + net/tipc/name_table.c | 271 +- + net/tipc/name_table.h | 56 +- + net/tipc/net.c | 2 +- + net/tipc/node.c | 24 + + net/tipc/node.h | 1 + + net/tipc/server.c | 710 ----- + net/tipc/socket.c | 34 +- + net/tipc/subscr.c | 361 +-- + net/tipc/subscr.h | 66 +- + net/tipc/topsrv.c | 703 +++++ + net/tipc/{server.h => topsrv.h} | 57 +- + net/tls/tls_sw.c | 69 +- + net/unix/af_unix.c | 11 +- + net/vmw_vsock/af_vsock.c | 4 +- + net/wireless/core.c | 1 + + net/wireless/nl80211.c | 203 +- + net/wireless/rdev-ops.h | 15 + + net/wireless/trace.h | 23 + + net/wireless/util.c | 5 +- + net/wireless/wext-core.c | 1 + + net/x25/af_x25.c | 4 +- + net/x25/x25_subr.c | 3 +- + net/xfrm/xfrm_policy.c | 1 + + net/xfrm/xfrm_user.c | 1 + + samples/bpf/Makefile | 4 + + samples/bpf/bpf_load.c | 8 +- + samples/bpf/cpustat_kern.c | 281 ++ + samples/bpf/cpustat_user.c | 219 ++ + samples/bpf/tcbpf2_kern.c | 6 +- + samples/bpf/test_cgrp2_sock.sh | 1 + + samples/bpf/test_cgrp2_sock2.sh | 3 + + samples/bpf/test_tunnel_bpf.sh | 5 +- + samples/bpf/trace_event_kern.c | 4 + + samples/bpf/trace_event_user.c | 15 + + samples/bpf/xdp_redirect_user.c | 7 + + samples/sockmap/Makefile | 2 +- + samples/sockmap/sockmap_kern.c | 197 ++ + samples/sockmap/sockmap_test.sh | 450 ++++ + samples/sockmap/sockmap_user.c | 302 ++- + security/selinux/hooks.c | 1 + + security/smack/smack_netfilter.c | 1 + + security/tomoyo/network.c | 5 +- + tools/bpf/Makefile | 78 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 18 +- + tools/bpf/bpftool/Makefile | 6 +- + tools/bpf/bpftool/bash-completion/bpftool | 13 +- + tools/bpf/bpftool/cfg.c | 514 ++++ + tools/bpf/bpftool/cfg.h | 43 + + tools/bpf/bpftool/main.c | 104 +- + tools/bpf/bpftool/prog.c | 305 +-- + tools/bpf/bpftool/xlated_dumper.c | 338 +++ + tools/bpf/bpftool/xlated_dumper.h | 64 + + tools/include/uapi/linux/bpf.h | 47 +- + tools/lib/bpf/libbpf.c | 1 + + tools/testing/selftests/bpf/Makefile | 17 +- + tools/testing/selftests/bpf/bpf_helpers.h | 10 + + tools/testing/selftests/bpf/bpf_rlimit.h | 28 + + tools/testing/selftests/bpf/sockmap_parse_prog.c | 15 +- + tools/testing/selftests/bpf/sockmap_tcp_msg_prog.c | 33 + + tools/testing/selftests/bpf/sockmap_verdict_prog.c | 7 + + tools/testing/selftests/bpf/test_align.c | 6 +- + tools/testing/selftests/bpf/test_dev_cgroup.c | 6 +- + tools/testing/selftests/bpf/test_lpm_map.c | 14 +- + tools/testing/selftests/bpf/test_lru_map.c | 6 +- + tools/testing/selftests/bpf/test_maps.c | 62 +- + tools/testing/selftests/bpf/test_progs.c | 169 +- + .../selftests/bpf/test_stacktrace_build_id.c | 60 + + tools/testing/selftests/bpf/test_tag.c | 4 +- + tools/testing/selftests/bpf/test_tcpbpf_user.c | 2 + + tools/testing/selftests/bpf/test_verifier.c | 304 ++- + tools/testing/selftests/bpf/test_verifier_log.c | 8 +- + tools/testing/selftests/bpf/urandom_read.c | 22 + + tools/testing/selftests/net/Makefile | 2 +- + tools/testing/selftests/net/config | 5 + + tools/testing/selftests/net/fib-onlink-tests.sh | 375 +++ + tools/testing/selftests/net/fib_tests.sh | 664 +++-- + tools/testing/selftests/net/forwarding/.gitignore | 1 + + tools/testing/selftests/net/forwarding/README | 56 + + .../selftests/net/forwarding/bridge_vlan_aware.sh | 88 + + .../net/forwarding/bridge_vlan_unaware.sh | 86 + + tools/testing/selftests/net/forwarding/config | 12 + + .../net/forwarding/forwarding.config.sample | 35 + + tools/testing/selftests/net/forwarding/lib.sh | 577 ++++ + tools/testing/selftests/net/forwarding/router.sh | 125 + + .../selftests/net/forwarding/router_multipath.sh | 376 +++ + .../testing/selftests/net/forwarding/tc_actions.sh | 202 ++ + .../testing/selftests/net/forwarding/tc_chains.sh | 122 + + .../testing/selftests/net/forwarding/tc_common.sh | 25 + + .../testing/selftests/net/forwarding/tc_flower.sh | 196 ++ + .../selftests/net/forwarding/tc_shblocks.sh | 122 + + tools/testing/selftests/net/in_netns.sh | 23 + + tools/testing/selftests/net/msg_zerocopy.c | 131 +- + tools/testing/selftests/net/pmtu.sh | 471 ++++ + tools/testing/selftests/net/psock_fanout.c | 35 +- + tools/testing/selftests/net/rtnetlink.sh | 6 + + tools/testing/selftests/net/run_afpackettests | 4 +- + .../networking/timestamping/txtimestamp.c | 21 +- + tools/testing/selftests/tc-testing/README | 173 +- + tools/testing/selftests/tc-testing/TODO.txt | 25 +- + tools/testing/selftests/tc-testing/TdcPlugin.py | 74 + + .../tc-testing/creating-plugins/AddingPlugins.txt | 104 + + .../creating-testcases/AddingTestCases.txt | 35 +- + .../selftests/tc-testing/plugin-lib/README-PLUGINS | 27 + + .../selftests/tc-testing/plugin-lib/nsPlugin.py | 141 + + .../selftests/tc-testing/plugin-lib/rootPlugin.py | 19 + + .../tc-testing/plugin-lib/valgrindPlugin.py | 142 + + .../selftests/tc-testing/plugins/__init__.py | 0 + .../tc-testing/tc-tests/actions/csum.json | 410 +++ + .../tc-testing/tc-tests/actions/gact.json | 73 +- + .../tc-testing/tc-tests/actions/vlan.json | 410 +++ + tools/testing/selftests/tc-testing/tdc.py | 575 ++-- + tools/testing/selftests/tc-testing/tdc_batch.py | 8 +- + tools/testing/selftests/tc-testing/tdc_helper.py | 15 +- + 839 files changed, 39921 insertions(+), 14390 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/ieee802154/mcr20a.txt + create mode 100644 drivers/net/dsa/mv88e6xxx/global2_avb.c + create mode 100644 drivers/net/dsa/mv88e6xxx/global2_scratch.c + create mode 100644 drivers/net/dsa/mv88e6xxx/hwtstamp.c + create mode 100644 drivers/net/dsa/mv88e6xxx/hwtstamp.h + create mode 100644 drivers/net/dsa/mv88e6xxx/ptp.c + create mode 100644 drivers/net/dsa/mv88e6xxx/ptp.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile + delete mode 100644 drivers/net/ethernet/intel/i40e/i40e_fcoe.c + delete mode 100644 drivers/net/ethernet/intel/i40e/i40e_fcoe.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_span.h + create mode 100644 drivers/net/ethernet/microchip/lan743x_main.c + create mode 100644 drivers/net/ethernet/microchip/lan743x_main.h + create mode 100644 drivers/net/ethernet/netronome/nfp/bpf/Makefile + create mode 100644 drivers/net/ethernet/netronome/nfp/flower/Makefile + create mode 100644 drivers/net/ethernet/netronome/nfp/nfpcore/Makefile + create mode 100644 drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile + create mode 100644 drivers/net/ethernet/netronome/nfp/nic/Makefile + create mode 100644 drivers/net/hyperv/netvsc_trace.c + create mode 100644 drivers/net/hyperv/netvsc_trace.h + create mode 100644 drivers/net/ieee802154/mcr20a.c + create mode 100644 drivers/net/ieee802154/mcr20a.h + create mode 100644 include/linux/mroute_base.h + create mode 100644 include/uapi/linux/ncsi.h + create mode 100644 include/uapi/linux/tc_ematch/tc_em_ipt.h + create mode 100644 net/ipv4/ipmr_base.c + create mode 100644 net/ncsi/ncsi-netlink.c + create mode 100644 net/ncsi/ncsi-netlink.h + create mode 100644 net/sched/em_ipt.c + rename net/sctp/{sctp_diag.c => diag.c} (92%) + delete mode 100644 net/tipc/server.c + create mode 100644 net/tipc/topsrv.c + rename net/tipc/{server.h => topsrv.h} (55%) + create mode 100644 samples/bpf/cpustat_kern.c + create mode 100644 samples/bpf/cpustat_user.c + create mode 100755 samples/sockmap/sockmap_test.sh + create mode 100644 tools/bpf/bpftool/cfg.c + create mode 100644 tools/bpf/bpftool/cfg.h + create mode 100644 tools/bpf/bpftool/xlated_dumper.c + create mode 100644 tools/bpf/bpftool/xlated_dumper.h + create mode 100644 tools/testing/selftests/bpf/bpf_rlimit.h + create mode 100644 tools/testing/selftests/bpf/sockmap_tcp_msg_prog.c + create mode 100644 tools/testing/selftests/bpf/test_stacktrace_build_id.c + create mode 100644 tools/testing/selftests/bpf/urandom_read.c + create mode 100755 tools/testing/selftests/net/fib-onlink-tests.sh + create mode 100644 tools/testing/selftests/net/forwarding/.gitignore + create mode 100644 tools/testing/selftests/net/forwarding/README + create mode 100755 tools/testing/selftests/net/forwarding/bridge_vlan_aware.sh + create mode 100755 tools/testing/selftests/net/forwarding/bridge_vlan_unaware.sh + create mode 100644 tools/testing/selftests/net/forwarding/config + create mode 100644 tools/testing/selftests/net/forwarding/forwarding.config.sample + create mode 100644 tools/testing/selftests/net/forwarding/lib.sh + create mode 100755 tools/testing/selftests/net/forwarding/router.sh + create mode 100755 tools/testing/selftests/net/forwarding/router_multipath.sh + create mode 100755 tools/testing/selftests/net/forwarding/tc_actions.sh + create mode 100755 tools/testing/selftests/net/forwarding/tc_chains.sh + create mode 100644 tools/testing/selftests/net/forwarding/tc_common.sh + create mode 100755 tools/testing/selftests/net/forwarding/tc_flower.sh + create mode 100755 tools/testing/selftests/net/forwarding/tc_shblocks.sh + create mode 100755 tools/testing/selftests/net/in_netns.sh + create mode 100755 tools/testing/selftests/net/pmtu.sh + create mode 100644 tools/testing/selftests/tc-testing/TdcPlugin.py + create mode 100644 tools/testing/selftests/tc-testing/creating-plugins/AddingPlugins.txt + create mode 100644 tools/testing/selftests/tc-testing/plugin-lib/README-PLUGINS + create mode 100644 tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py + create mode 100644 tools/testing/selftests/tc-testing/plugin-lib/rootPlugin.py + create mode 100644 tools/testing/selftests/tc-testing/plugin-lib/valgrindPlugin.py + create mode 100644 tools/testing/selftests/tc-testing/plugins/__init__.py + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/csum.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/vlan.json +$ git am -3 ../patches/0001-mlxsw-merge-fix-for-move-of-SPAN-code.patch +Applying: mlxsw: merge fix for move of SPAN code +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c +M drivers/net/ethernet/mellanox/mlxsw/spectrum_span.h +$ git add -A . +$ git commit -v -a --amend +[master 397ae02005e4] Merge remote-tracking branch 'net-next/master' + Date: Thu Mar 22 11:53:18 2018 +1100 +Merging bpf-next/master (78262f4575c2 bpf, doc: add description wrt native/bpf clang target and pointer size) +$ 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 +Auto-merging net/xfrm/xfrm_policy.c +Merge made by the 'recursive' strategy. + net/ipv4/esp4.c | 2 +- + net/ipv4/esp4_offload.c | 2 ++ + net/ipv6/esp6_offload.c | 2 ++ + net/xfrm/xfrm_input.c | 3 ++- + net/xfrm/xfrm_policy.c | 4 ++-- + 5 files changed, 9 insertions(+), 4 deletions(-) +Merging netfilter-next/master (78d9f4d49bbe netfilter: ebtables: add support for matching IGMP type) +$ git merge netfilter-next/master +Auto-merging net/netfilter/x_tables.c +Auto-merging net/netfilter/nfnetlink_queue.c +Auto-merging net/netfilter/nfnetlink_cttimeout.c +Auto-merging net/netfilter/nfnetlink_acct.c +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/bridge/netfilter/ebtables.c +Auto-merging include/linux/netfilter/x_tables.h +Merge made by the 'recursive' strategy. + include/linux/netfilter/nfnetlink_acct.h | 3 +- + include/linux/netfilter/x_tables.h | 5 +- + include/net/netfilter/nf_conntrack_count.h | 1 - + include/net/netfilter/nf_conntrack_helper.h | 3 +- + include/net/netfilter/xt_rateest.h | 4 +- + include/uapi/linux/netfilter/nf_conntrack_common.h | 1 + + include/uapi/linux/netfilter/nf_tables.h | 12 +- + include/uapi/linux/netfilter/nfnetlink_conntrack.h | 10 ++ + include/uapi/linux/netfilter/xt_connmark.h | 10 ++ + include/uapi/linux/netfilter_bridge/ebt_ip.h | 15 +- + net/bridge/netfilter/ebt_ip.c | 58 +++++-- + net/bridge/netfilter/ebtables.c | 27 +-- + net/ipv4/netfilter/arp_tables.c | 50 +++--- + net/ipv4/netfilter/ip_tables.c | 48 +++--- + net/ipv4/netfilter/ipt_SYNPROXY.c | 8 +- + net/ipv4/netfilter/ipt_ah.c | 2 +- + net/ipv6/netfilter/ip6_tables.c | 50 +++--- + net/ipv6/netfilter/ip6t_SYNPROXY.c | 8 +- + net/netfilter/ipvs/ip_vs_lblc.c | 4 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 4 +- + net/netfilter/nf_conncount.c | 14 +- + net/netfilter/nf_conntrack_acct.c | 6 +- + net/netfilter/nf_conntrack_broadcast.c | 1 - + net/netfilter/nf_conntrack_ecache.c | 6 +- + net/netfilter/nf_conntrack_netbios_ns.c | 5 +- + net/netfilter/nf_conntrack_netlink.c | 87 +++++++++- + net/netfilter/nf_conntrack_snmp.c | 5 +- + net/netfilter/nf_conntrack_timestamp.c | 6 +- + net/netfilter/nf_nat_core.c | 4 +- + net/netfilter/nf_nat_ftp.c | 7 +- + net/netfilter/nf_nat_irc.c | 7 +- + net/netfilter/nf_tables_api.c | 31 ++-- + net/netfilter/nfnetlink_acct.c | 3 +- + net/netfilter/nfnetlink_cthelper.c | 25 ++- + net/netfilter/nfnetlink_cttimeout.c | 26 ++- + net/netfilter/nfnetlink_queue.c | 9 +- + net/netfilter/nft_ct.c | 38 +++++ + net/netfilter/x_tables.c | 187 +++++++++++++++++++-- + net/netfilter/xt_RATEEST.c | 91 +++++++--- + net/netfilter/xt_cluster.c | 10 +- + net/netfilter/xt_connlimit.c | 4 +- + net/netfilter/xt_connmark.c | 77 +++++++-- + net/netfilter/xt_limit.c | 2 +- + net/netfilter/xt_nfacct.c | 2 +- + net/netfilter/xt_rateest.c | 10 +- + net/netfilter/xt_time.c | 13 +- + 46 files changed, 751 insertions(+), 248 deletions(-) +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 (28bf8312a983 mwifiex: get_channel from firmware) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/cisco/Kconfig +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +Merge made by the 'recursive' strategy. + drivers/bcma/Kconfig | 2 +- + drivers/bcma/driver_chipcommon_pmu.c | 2 +- + drivers/bcma/host_pci.c | 1 + + drivers/bluetooth/Kconfig | 12 + + drivers/bluetooth/Makefile | 2 + + drivers/bluetooth/btrsi.c | 188 +++++++++ + drivers/net/wireless/admtek/Kconfig | 4 +- + drivers/net/wireless/ath/Kconfig | 4 +- + drivers/net/wireless/atmel/Kconfig | 4 +- + drivers/net/wireless/broadcom/Kconfig | 4 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 1 - + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 3 + + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 3 - + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 119 +++--- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 20 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 95 +++-- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 35 +- + .../wireless/broadcom/brcm80211/brcmsmac/channel.c | 1 - + drivers/net/wireless/cisco/Kconfig | 4 +- + drivers/net/wireless/intel/Kconfig | 4 +- + drivers/net/wireless/intersil/Kconfig | 4 +- + drivers/net/wireless/marvell/Kconfig | 4 +- + drivers/net/wireless/marvell/mwifiex/11n.c | 30 ++ + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 40 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 3 +- + drivers/net/wireless/marvell/mwifiex/decl.h | 17 + + drivers/net/wireless/marvell/mwifiex/fw.h | 7 + + drivers/net/wireless/marvell/mwifiex/main.c | 24 +- + drivers/net/wireless/marvell/mwifiex/main.h | 29 +- + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 22 ++ + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 19 + + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 56 +-- + drivers/net/wireless/mediatek/Kconfig | 4 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 68 +++- + drivers/net/wireless/mediatek/mt76/mt76.h | 3 + + drivers/net/wireless/mediatek/mt76/mt76x2.h | 1 + + drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c | 12 +- + drivers/net/wireless/mediatek/mt76/mt76x2_init.c | 3 + + drivers/net/wireless/mediatek/mt76/mt76x2_mac.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt76x2_main.c | 36 ++ + drivers/net/wireless/mediatek/mt76/mt76x2_phy.c | 55 ++- + drivers/net/wireless/mediatek/mt76/mt76x2_regs.h | 2 + + drivers/net/wireless/mediatek/mt7601u/eeprom.c | 26 +- + drivers/net/wireless/mediatek/mt7601u/initvals.h | 1 + + drivers/net/wireless/mediatek/mt7601u/mac.c | 26 +- + drivers/net/wireless/mediatek/mt7601u/mac.h | 1 + + drivers/net/wireless/mediatek/mt7601u/main.c | 3 + + drivers/net/wireless/mediatek/mt7601u/mcu.c | 7 +- + drivers/net/wireless/mediatek/mt7601u/mt7601u.h | 3 +- + drivers/net/wireless/mediatek/mt7601u/usb.c | 52 ++- + drivers/net/wireless/quantenna/Kconfig | 4 +- + drivers/net/wireless/quantenna/qtnfmac/bus.h | 3 +- + .../net/wireless/quantenna/qtnfmac/pearl/pcie.c | 418 ++++++++++----------- + .../wireless/quantenna/qtnfmac/pearl/pcie_ipc.h | 1 + + .../quantenna/qtnfmac/pearl/pcie_regs_pearl.h | 1 + + drivers/net/wireless/ralink/Kconfig | 4 +- + drivers/net/wireless/realtek/Kconfig | 4 +- + drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 34 +- + .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 2 +- + .../rtlwifi/btcoexist/halbtc8822bwifionly.c | 55 +++ + .../rtlwifi/btcoexist/halbtc8822bwifionly.h | 25 ++ + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 22 ++ + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.h | 2 + + drivers/net/wireless/realtek/rtlwifi/efuse.c | 13 + + drivers/net/wireless/realtek/rtlwifi/efuse.h | 2 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 1 + + drivers/net/wireless/realtek/rtlwifi/rc.c | 55 ++- + .../net/wireless/realtek/rtlwifi/rtl8192cu/rf.c | 3 - + .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 1 - + .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 1 + + drivers/net/wireless/realtek/rtlwifi/wifi.h | 39 +- + drivers/net/wireless/rsi/Kconfig | 13 +- + drivers/net/wireless/rsi/Makefile | 1 + + drivers/net/wireless/rsi/rsi_91x_coex.c | 179 +++++++++ + drivers/net/wireless/rsi/rsi_91x_core.c | 20 +- + drivers/net/wireless/rsi/rsi_91x_hal.c | 56 ++- + drivers/net/wireless/rsi/rsi_91x_main.c | 129 ++++++- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_sdio.c | 58 ++- + drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 65 +++- + drivers/net/wireless/rsi/rsi_91x_usb.c | 186 ++++++--- + drivers/net/wireless/rsi/rsi_91x_usb_ops.c | 31 +- + drivers/net/wireless/rsi/rsi_coex.h | 37 ++ + drivers/net/wireless/rsi/rsi_common.h | 5 +- + drivers/net/wireless/rsi/rsi_hal.h | 22 ++ + drivers/net/wireless/rsi/rsi_main.h | 21 +- + drivers/net/wireless/rsi/rsi_mgmt.h | 3 + + drivers/net/wireless/rsi/rsi_sdio.h | 8 + + drivers/net/wireless/rsi/rsi_usb.h | 17 +- + drivers/net/wireless/st/Kconfig | 4 +- + drivers/net/wireless/ti/Kconfig | 4 +- + drivers/net/wireless/ti/wl1251/main.c | 102 ++++- + drivers/net/wireless/zydas/Kconfig | 4 +- + drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 1 - + drivers/ssb/Kconfig | 2 +- + drivers/ssb/main.c | 4 +- + include/net/rsi_91x.h | 56 +++ + 98 files changed, 2065 insertions(+), 727 deletions(-) + create mode 100644 drivers/bluetooth/btrsi.c + create mode 100644 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8822bwifionly.c + create mode 100644 drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8822bwifionly.h + create mode 100644 drivers/net/wireless/rsi/rsi_91x_coex.c + create mode 100644 drivers/net/wireless/rsi/rsi_coex.h + create mode 100644 include/net/rsi_91x.h +Merging bluetooth/master (243fc8da6518 Bluetooth: Remove VLA usage in aes_cmac) +$ git merge bluetooth/master +Auto-merging net/bluetooth/smp.c +Auto-merging drivers/bluetooth/hci_bcm.c +Auto-merging drivers/bluetooth/btusb.c +Merge made by the 'recursive' strategy. + drivers/bluetooth/btmrvl_debugfs.c | 31 ------------------------------- + drivers/bluetooth/btmrvl_drv.h | 2 -- + drivers/bluetooth/btmrvl_main.c | 6 ------ + drivers/bluetooth/btmrvl_sdio.c | 22 ++++++++++++++-------- + drivers/bluetooth/btusb.c | 3 +++ + drivers/bluetooth/hci_bcm.c | 10 ++++++++-- + drivers/bluetooth/hci_ll.c | 8 +------- + include/net/bluetooth/mgmt.h | 2 +- + net/bluetooth/smp.c | 17 ++++++++++++----- + 9 files changed, 39 insertions(+), 62 deletions(-) +Merging mac80211-next/master (13cf6dec93e0 cfg80211/nl80211: add DFS offload flag) +$ git merge mac80211-next/master +Auto-merging net/mac80211/mlme.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 10 ++- + include/uapi/linux/nl80211.h | 10 +++ + net/mac80211/mlme.c | 160 ++++++++++++++++++---------------- + net/mac80211/rx.c | 6 +- + net/mac80211/scan.c | 4 +- + net/wireless/mlme.c | 7 +- + net/wireless/nl80211.c | 12 ++- + 7 files changed, 123 insertions(+), 86 deletions(-) +Merging gfs2/for-next (ee6ed857c805 gfs2: gfs2_iomap_end tracepoint: log block address) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 8 ++++---- + fs/gfs2/bmap.c | 15 +++++++++++---- + fs/gfs2/dir.c | 13 ++----------- + fs/gfs2/file.c | 5 +++-- + fs/gfs2/inode.c | 10 +--------- + fs/gfs2/log.c | 2 +- + fs/gfs2/log.h | 1 - + fs/gfs2/quota.h | 2 ++ + fs/gfs2/trace_gfs2.h | 9 +++++++-- + 9 files changed, 31 insertions(+), 34 deletions(-) +Merging mtd/master (6de564939e14 mtdchar: fix usage of mtd_ooblayout_ecc()) +$ git merge mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/mtdchar.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging l2-mtd/mtd/next (5741a164ff6f mtd: maps: remove bfin-async-flash driver) +$ git merge l2-mtd/mtd/next +Auto-merging drivers/mtd/mtdchar.c +Removing drivers/mtd/maps/bfin-async-flash.c +Merge made by the 'recursive' strategy. + 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/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 | 52 ++------ + 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/mtdblock.c | 21 ---- + drivers/mtd/mtdchar.c | 34 +----- + drivers/mtd/mtdconcat.c | 48 +------- + drivers/mtd/mtdcore.c | 79 +++++-------- + drivers/mtd/mtdoops.c | 20 ---- + drivers/mtd/mtdpart.c | 23 +--- + 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/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 +-- + 49 files changed, 116 insertions(+), 864 deletions(-) + delete mode 100644 drivers/mtd/maps/bfin-async-flash.c +Merging nand/nand/next (b1206122069a mtd: rawnand: gpmi: use core timings instead of an empirical derivation) +$ git merge nand/nand/next +Resolved 'drivers/mtd/nand/Kconfig' using previous resolution. +Auto-merging drivers/mtd/sm_ftl.c +Auto-merging drivers/mtd/nand/raw/vf610_nfc.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/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/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/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 .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 fd8a6a8f2367] Merge remote-tracking branch 'nand/nand/next' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 7 +- + Documentation/arm/Samsung-S3C24XX/S3C2412.txt | 2 +- + Documentation/driver-api/mtdnand.rst | 8 +- + Documentation/gpio/drivers-on-gpio.txt | 4 +- + 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 | 0 + 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 | 8 +- + drivers/mtd/nand/{ => raw}/cmx270_nand.c | 4 +- + drivers/mtd/nand/{ => raw}/cs553x_nand.c | 11 +- + drivers/mtd/nand/{ => raw}/davinci_nand.c | 0 + drivers/mtd/nand/{ => raw}/denali.c | 0 + 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 | 39 +- + 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 | 533 +++++++------ + 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 | 0 + 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 | 3 +- + drivers/mtd/nand/{ => raw}/sh_flctl.c | 6 +- + 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 | 0 + drivers/mtd/nand/{ => raw}/tango_nand.c | 0 + 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 +-- + 116 files changed, 3262 insertions(+), 3307 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 (100%) + 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 (99%) + 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 (100%) + rename drivers/mtd/nand/{ => raw}/denali.c (100%) + 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 (99%) + 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 (100%) + 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 (99%) + 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 (100%) + rename drivers/mtd/nand/{ => raw}/tango_nand.c (100%) + 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 cecdd6a3519b] Merge remote-tracking branch 'nand/nand/next' + Date: Thu Mar 22 12:18:48 2018 +1100 +Merging spi-nor/spi-nor/next (5c6038af2ed8 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 (1a3713c7cd8c crypto: arm64/sha256-neon - play nice with CONFIG_PREEMPT kernels) +$ git merge crypto/master +Removing include/crypto/lrw.h +Removing include/crypto/ablk_helper.h +Auto-merging drivers/crypto/ccp/psp-dev.c +CONFLICT (modify/delete): drivers/crypto/bfin_crc.c deleted in HEAD and modified in crypto/master. Version crypto/master of drivers/crypto/bfin_crc.c left in tree. +Auto-merging drivers/crypto/Makefile +Auto-merging drivers/crypto/Kconfig +Auto-merging crypto/testmgr.h +Auto-merging crypto/testmgr.c +Removing crypto/ablk_helper.c +Auto-merging crypto/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/rng/imx-rng.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/crypto/bfin_crc.c +drivers/crypto/bfin_crc.c: needs merge +rm 'drivers/crypto/bfin_crc.c' +$ git commit -v -a +[master b87e0fad1f64] Merge remote-tracking branch 'crypto/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/crypto/crypto_engine.rst | 48 + + .../devicetree/bindings/crypto/arm-cryptocell.txt | 3 +- + .../bindings/rng/{imx-rngc.txt => imx-rng.txt} | 11 +- + Documentation/devicetree/bindings/rng/omap_rng.txt | 7 +- + .../devicetree/bindings/rng/st,stm32-rng.txt | 4 + + MAINTAINERS | 15 +- + arch/arm/crypto/Kconfig | 6 + + arch/arm/crypto/Makefile | 2 + + 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/crypto/Kconfig | 6 + + arch/arm64/crypto/Makefile | 6 +- + 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/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/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 - + crypto/Kconfig | 129 +- + crypto/Makefile | 4 +- + crypto/ablk_helper.c | 150 - + crypto/ahash.c | 18 +- + crypto/cfb.c | 353 ++ + crypto/crypto_engine.c | 301 +- + crypto/crypto_user.c | 2 +- + crypto/ecc.c | 23 +- + crypto/ecdh.c | 23 +- + crypto/lrw.c | 152 +- + crypto/mcryptd.c | 34 +- + 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/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/mxc-rnga.c | 23 +- + drivers/char/hw_random/omap-rng.c | 22 +- + drivers/char/hw_random/stm32-rng.c | 44 +- + drivers/crypto/Kconfig | 27 + + drivers/crypto/Makefile | 1 + + drivers/crypto/atmel-aes.c | 8 +- + drivers/crypto/atmel-sha.c | 9 +- + drivers/crypto/atmel-tdes.c | 9 +- + drivers/crypto/bcm/util.c | 1 - + drivers/crypto/caam/caamalg.c | 19 +- + drivers/crypto/caam/caamalg_desc.c | 165 +- + drivers/crypto/caam/caamalg_desc.h | 24 +- + drivers/crypto/caam/caamalg_qi.c | 386 +- + drivers/crypto/caam/ctrl.c | 42 +- + drivers/crypto/caam/qi.c | 11 +- + 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/crypto/ccree/Makefile | 7 + + drivers/crypto/ccree/cc_aead.c | 2718 +++++++++++ + drivers/crypto/ccree/cc_aead.h | 109 + + drivers/crypto/ccree/cc_buffer_mgr.c | 1651 +++++++ + drivers/crypto/ccree/cc_buffer_mgr.h | 71 + + drivers/crypto/ccree/cc_cipher.c | 1150 +++++ + drivers/crypto/ccree/cc_cipher.h | 59 + + drivers/crypto/ccree/cc_crypto_ctx.h | 133 + + drivers/crypto/ccree/cc_debugfs.c | 101 + + drivers/crypto/ccree/cc_debugfs.h | 32 + + drivers/crypto/ccree/cc_driver.c | 518 +++ + drivers/crypto/ccree/cc_driver.h | 208 + + drivers/crypto/ccree/cc_fips.c | 120 + + drivers/crypto/ccree/cc_fips.h | 36 + + drivers/crypto/ccree/cc_hash.c | 2296 ++++++++++ + drivers/crypto/ccree/cc_hash.h | 109 + + drivers/crypto/ccree/cc_host_regs.h | 145 + + drivers/crypto/ccree/cc_hw_queue_defs.h | 590 +++ + drivers/crypto/ccree/cc_ivgen.c | 279 ++ + drivers/crypto/ccree/cc_ivgen.h | 55 + + drivers/crypto/ccree/cc_kernel_regs.h | 168 + + drivers/crypto/ccree/cc_lli_defs.h | 59 + + drivers/crypto/ccree/cc_pm.c | 122 + + drivers/crypto/ccree/cc_pm.h | 56 + + drivers/crypto/ccree/cc_request_mgr.c | 711 +++ + drivers/crypto/ccree/cc_request_mgr.h | 51 + + drivers/crypto/ccree/cc_sram_mgr.c | 120 + + drivers/crypto/ccree/cc_sram_mgr.h | 65 + + drivers/crypto/chelsio/chcr_algo.c | 473 +- + drivers/crypto/chelsio/chcr_algo.h | 11 +- + drivers/crypto/chelsio/chcr_core.h | 6 +- + drivers/crypto/chelsio/chcr_crypto.h | 32 +- + drivers/crypto/chelsio/chcr_ipsec.c | 5 +- + drivers/crypto/inside-secure/safexcel.c | 59 +- + drivers/crypto/inside-secure/safexcel.h | 15 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 2 +- + drivers/crypto/inside-secure/safexcel_hash.c | 69 +- + 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/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 | 179 +- + 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/staging/ccree/Kconfig | 4 +- + drivers/staging/ccree/Makefile | 2 +- + include/crypto/ablk_helper.h | 32 - + 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 - + 162 files changed, 23083 insertions(+), 8148 deletions(-) + create mode 100644 Documentation/crypto/crypto_engine.rst + rename Documentation/devicetree/bindings/rng/{imx-rngc.txt => imx-rng.txt} (54%) + 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 + 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/crypto/ccree/Makefile + create mode 100644 drivers/crypto/ccree/cc_aead.c + create mode 100644 drivers/crypto/ccree/cc_aead.h + create mode 100644 drivers/crypto/ccree/cc_buffer_mgr.c + create mode 100644 drivers/crypto/ccree/cc_buffer_mgr.h + create mode 100644 drivers/crypto/ccree/cc_cipher.c + create mode 100644 drivers/crypto/ccree/cc_cipher.h + create mode 100644 drivers/crypto/ccree/cc_crypto_ctx.h + create mode 100644 drivers/crypto/ccree/cc_debugfs.c + create mode 100644 drivers/crypto/ccree/cc_debugfs.h + create mode 100644 drivers/crypto/ccree/cc_driver.c + create mode 100644 drivers/crypto/ccree/cc_driver.h + create mode 100644 drivers/crypto/ccree/cc_fips.c + create mode 100644 drivers/crypto/ccree/cc_fips.h + create mode 100644 drivers/crypto/ccree/cc_hash.c + create mode 100644 drivers/crypto/ccree/cc_hash.h + create mode 100644 drivers/crypto/ccree/cc_host_regs.h + create mode 100644 drivers/crypto/ccree/cc_hw_queue_defs.h + create mode 100644 drivers/crypto/ccree/cc_ivgen.c + create mode 100644 drivers/crypto/ccree/cc_ivgen.h + create mode 100644 drivers/crypto/ccree/cc_kernel_regs.h + create mode 100644 drivers/crypto/ccree/cc_lli_defs.h + create mode 100644 drivers/crypto/ccree/cc_pm.c + create mode 100644 drivers/crypto/ccree/cc_pm.h + create mode 100644 drivers/crypto/ccree/cc_request_mgr.c + create mode 100644 drivers/crypto/ccree/cc_request_mgr.h + create mode 100644 drivers/crypto/ccree/cc_sram_mgr.c + create mode 100644 drivers/crypto/ccree/cc_sram_mgr.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 +Merging drm/drm-next (78230c46ec0a Merge tag 'omapdrm-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next) +$ git merge drm/drm-next +Removing include/drm/tinydrm/ili9341.h +Auto-merging include/drm/drm_atomic.h +Auto-merging drivers/gpu/drm/virtio/virtgpu_ioctl.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_tcon.h +Auto-merging drivers/gpu/drm/sun4i/sun4i_tcon.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/sun4i/sun4i_tcon.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_drv.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_crtc.c +Removing drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h +Removing drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c +Removing drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h +Removing drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c +Auto-merging drivers/gpu/drm/radeon/radeon_object.c +Auto-merging drivers/gpu/drm/radeon/radeon_device.c +Auto-merging drivers/gpu/drm/radeon/radeon_connectors.c +Auto-merging drivers/gpu/drm/nouveau/nv50_display.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.h +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c +Auto-merging drivers/gpu/drm/meson/meson_plane.c +Auto-merging drivers/gpu/drm/i915/selftests/i915_request.c +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.h +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/intel_hangcheck.c +Auto-merging drivers/gpu/drm/i915/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/intel_cdclk.c +Auto-merging drivers/gpu/drm/i915/intel_breadcrumbs.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_breadcrumbs.c +Auto-merging drivers/gpu/drm/i915/intel_bios.c +Auto-merging drivers/gpu/drm/i915/intel_audio.c +Auto-merging drivers/gpu/drm/i915/i915_request.h +Auto-merging drivers/gpu/drm/i915/i915_request.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_pmu.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pmu.h +Auto-merging drivers/gpu/drm/i915/i915_pmu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pmu.c +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gvt/trace.h +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.h +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Auto-merging drivers/gpu/drm/i915/gvt/mmio_context.c +Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c +Auto-merging drivers/gpu/drm/drm_probe_helper.c +Auto-merging drivers/gpu/drm/drm_mm.c +Auto-merging drivers/gpu/drm/drm_edid.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.h +Removing drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c +Removing drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.h +Removing drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +Auto-merging drivers/gpu/drm/amd/powerplay/inc/pp_thermal.h +Removing drivers/gpu/drm/amd/powerplay/inc/pp_feature.h +Removing drivers/gpu/drm/amd/powerplay/inc/polaris10_ppsmc.h +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.h +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/smu10_inc.h +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.h +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c +Removing drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c +Removing drivers/gpu/drm/amd/powerplay/hwmgr/cz_clockpowergating.h +Removing drivers/gpu/drm/amd/powerplay/hwmgr/cz_clockpowergating.c +Auto-merging drivers/gpu/drm/amd/powerplay/amd_powerplay.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/amd_powerplay.c +Auto-merging drivers/gpu/drm/amd/include/vega10_ip_offset.h +Auto-merging drivers/gpu/drm/amd/display/modules/color/color_gamma.h +Auto-merging drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c +Auto-merging drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dml_logger.h +Removing drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_calc.h +Removing drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_calc.c +Removing drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h +Removing drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +Removing drivers/gpu/drm/amd/display/dc/dce80/dce80_compressor.h +Removing drivers/gpu/drm/amd/display/dc/dce80/dce80_compressor.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h +Auto-merging drivers/gpu/drm/amd/display/dc/dc_stream.h +Auto-merging drivers/gpu/drm/amd/display/dc/dc.h +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_stream.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc_stream.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/si_dpm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/si.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/si.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/emu_soc.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +Removing drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging driveRecorded preimage for 'drivers/gpu/drm/amd/amdgpu/si.c' +Recorded preimage for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' +Recorded preimage for 'drivers/gpu/drm/amd/display/dc/core/dc_stream.c' +Recorded preimage for 'drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h' +Recorded preimage for 'drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c' +Recorded preimage for 'drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c' +Recorded preimage for 'drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c' +Resolved 'drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/amd/powerplay/amd_powerplay.c' +Resolved 'drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_pmu.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_pmu.h' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_request.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_breadcrumbs.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_lrc.c' using previous resolution. +Resolved 'drivers/gpu/drm/sun4i/sun4i_tcon.c' using previous resolution. +rs/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/display/bridge/ti,ths813x.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/si.c'. +Recorded resolution for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c'. +Recorded resolution for 'drivers/gpu/drm/amd/display/dc/core/dc_stream.c'. +Recorded resolution for 'drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h'. +Recorded resolution for 'drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c'. +Recorded resolution for 'drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c'. +Recorded resolution for 'drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c'. +Recorded resolution for 'drivers/gpu/drm/amd/powerplay/amd_powerplay.c'. +[master 3b8862523a7a] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/bridge/renesas,lvds.txt | 58 + + .../bridge/{ti,ths8135.txt => ti,ths813x.txt} | 13 +- + .../bindings/display/connector/dvi-connector.txt | 1 + + .../devicetree/bindings/display/msm/dsi.txt | 26 +- + .../display/panel/arm,versatile-tft-panel.txt | 31 + + .../devicetree/bindings/display/renesas,du.txt | 35 +- + .../bindings/display/rockchip/cdn-dp-rockchip.txt | 74 + + .../devicetree/bindings/display/st,stm32-ltdc.txt | 2 +- + .../bindings/display/sunxi/sun4i-drm.txt | 67 +- + Documentation/devicetree/overlay-notes.txt | 4 +- + Documentation/gpu/drm-kms.rst | 5 +- + Documentation/gpu/kms-properties.csv | 1 - + Documentation/gpu/todo.rst | 17 + + MAINTAINERS | 12 +- + arch/x86/kernel/devicetree.c | 2 +- + drivers/dma-buf/dma-fence.c | 1 + + drivers/dma-buf/reservation.c | 31 +- + drivers/dma-buf/sw_sync.c | 10 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 150 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 160 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 112 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 179 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 80 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 82 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 1506 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 95 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 431 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 263 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 127 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 112 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 58 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 412 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 98 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 78 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 110 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 566 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 290 - + drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 162 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 49 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 62 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 56 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 38 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 303 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 115 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 87 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 95 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 326 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 6 +- + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 306 +- + drivers/gpu/drm/amd/amdgpu/ci_dpm.h | 7 - + drivers/gpu/drm/amd/amdgpu/cik.c | 42 +- + drivers/gpu/drm/amd/amdgpu/cik.h | 2 + + drivers/gpu/drm/amd/amdgpu/cik_dpm.h | 7 +- + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 41 +- + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 80 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 81 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 79 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 81 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 25 +- + .../{powerplay/inc/pp_acpi.h => amdgpu/emu_soc.c} | 15 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 78 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 68 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 86 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 309 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 139 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 189 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 216 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 177 +- + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 17 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 92 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 200 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 7 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 13 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 56 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.h | 20 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 65 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.h | 24 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 44 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 53 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 82 +- + drivers/gpu/drm/amd/amdgpu/si.c | 31 +- + drivers/gpu/drm/amd/amdgpu/si.h | 2 + + drivers/gpu/drm/amd/amdgpu/si_dma.c | 50 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 35 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.h | 3 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 36 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 3 + + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 30 - + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 30 - + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 66 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 148 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 56 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 159 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 6 +- + drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 3 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 41 +- + drivers/gpu/drm/amd/amdgpu/vi.h | 2 + + drivers/gpu/drm/amd/amdkfd/Kconfig | 3 +- + drivers/gpu/drm/amd/amdkfd/Makefile | 4 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 356 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 301 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 14 + + .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 56 + + .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 93 + + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 3 + + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 357 + + drivers/gpu/drm/amd/amdkfd/kfd_iommu.h | 78 + + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 5 + + drivers/gpu/drm/amd/amdkfd/kfd_module.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 7 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 44 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 27 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 62 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 362 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 6 +- + drivers/gpu/drm/amd/display/Kconfig | 2 +- + drivers/gpu/drm/amd/display/Makefile | 5 +- + drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 6 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 295 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 36 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 274 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 126 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 14 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 76 - + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 22 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 33 - + drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c | 9 + + drivers/gpu/drm/amd/display/dc/basics/logger.c | 3 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 11 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 13 +- + .../drm/amd/display/dc/bios/bios_parser_helper.c | 8 + + .../drm/amd/display/dc/bios/bios_parser_helper.h | 1 + + .../gpu/drm/amd/display/dc/bios/command_table2.c | 16 +- + .../gpu/drm/amd/display/dc/bios/command_table2.h | 2 +- + .../drm/amd/display/dc/bios/command_table_helper.h | 33 +- + .../amd/display/dc/bios/command_table_helper2.h | 30 +- + .../display/dc/bios/command_table_helper_struct.h | 66 + + drivers/gpu/drm/amd/display/dc/calcs/Makefile | 14 +- + drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 190 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 78 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 241 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 35 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 156 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 7 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 175 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 26 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 30 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 3 +- + drivers/gpu/drm/amd/display/dc/dc.h | 47 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 3 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 20 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 4 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 28 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 24 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 14 +- + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 35 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 44 +- + drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 21 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 5 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 35 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.c | 14 +- + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 120 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 28 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 15 +- + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 134 +- + drivers/gpu/drm/amd/display/dc/dce/dce_transform.h | 1 + + .../amd/display/dc/dce100/dce100_hw_sequencer.c | 2 +- + .../amd/display/dc/dce100/dce100_hw_sequencer.h | 4 + + .../drm/amd/display/dc/dce100/dce100_resource.c | 51 + + .../drm/amd/display/dc/dce110/dce110_compressor.c | 14 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 366 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 9 +- + .../drm/amd/display/dc/dce110/dce110_opp_csc_v.c | 2 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 14 +- + .../display/dc/dce110/dce110_timing_generator.c | 122 + + .../display/dc/dce110/dce110_timing_generator.h | 6 + + .../display/dc/dce110/dce110_timing_generator_v.c | 17 +- + .../drm/amd/display/dc/dce110/dce110_transform_v.c | 5 +- + .../drm/amd/display/dc/dce112/dce112_compressor.c | 27 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 8 +- + .../amd/display/dc/dce120/dce120_hw_sequencer.c | 3 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 4 +- + .../display/dc/dce120/dce120_timing_generator.c | 3 +- + drivers/gpu/drm/amd/display/dc/dce80/Makefile | 2 +- + .../drm/amd/display/dc/dce80/dce80_compressor.c | 834 - + .../drm/amd/display/dc/dce80/dce80_compressor.h | 78 - + .../drm/amd/display/dc/dce80/dce80_hw_sequencer.c | 38 +- + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 90 + + .../amd/display/dc/dce80/dce80_timing_generator.c | 127 +- + .../amd/display/dc/dce80/dce80_timing_generator.h | 6 - + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 192 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.h | 5 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 22 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 35 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 56 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 77 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 39 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 25 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 547 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.h | 2 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 9 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.h | 14 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 14 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 28 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 10 + + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 3 +- + drivers/gpu/drm/amd/display/dc/dm_services.h | 31 - + drivers/gpu/drm/amd/display/dc/dm_services_types.h | 21 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 26 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 3 - + .../drm/amd/display/dc/dml/display_mode_structs.h | 1 - + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 6085 ---- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 598 - + .../drm/amd/display/dc/dml/display_rq_dlg_calc.c | 1772 -- + .../drm/amd/display/dc/dml/display_rq_dlg_calc.h | 148 - + .../amd/display/dc/dml/display_rq_dlg_helpers.c | 1 + + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.h | 3 +- + .../gpu/drm/amd/display/dc/dml/dml_common_defs.h | 2 - + .../gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 1 + + .../dc/dml/dml_logger.h} | 17 +- + .../amd/display/dc/gpio/dce120/hw_factory_dce120.c | 3 +- + .../display/dc/gpio/dce120/hw_translate_dce120.c | 3 +- + .../amd/display/dc/gpio/dcn10/hw_factory_dcn10.c | 3 +- + .../amd/display/dc/gpio/dcn10/hw_translate_dcn10.c | 3 +- + drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.c | 33 +- + .../display/dc/i2caux/dce110/aux_engine_dce110.c | 4 - + .../dc/i2caux/dce110/i2c_hw_engine_dce110.c | 6 +- + .../amd/display/dc/i2caux/dce120/i2caux_dce120.c | 3 +- + .../drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.c | 3 +- + drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c | 1 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 35 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/dce_calcs.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 7 - + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 10 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 4 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 45 + + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 2 + + .../amd/display/dc/irq/dce110/irq_service_dce110.c | 73 +- + .../amd/display/dc/irq/dce120/irq_service_dce120.c | 3 +- + .../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 3 +- + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 10 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 8 + + drivers/gpu/drm/amd/display/include/fixed31_32.h | 3 + + .../drm/amd/display/include/link_service_types.h | 5 +- + drivers/gpu/drm/amd/display/include/logger_types.h | 34 + + drivers/gpu/drm/amd/display/modules/color/Makefile | 31 + + .../drm/amd/display/modules/color/color_gamma.c | 1396 + + .../modules/color/color_gamma.h} | 58 +- + .../drm/amd/display/modules/freesync/freesync.c | 155 +- + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 9 + + .../gpu/drm/amd/display/modules/inc/mod_stats.h | 65 + + drivers/gpu/drm/amd/display/modules/stats/stats.c | 334 + + .../drm/amd/include/asic_reg/dcn/dcn_1_0_sh_mask.h | 14 + + .../drm/amd/include/asic_reg/gc/gc_9_1_sh_mask.h | 31150 +++++++++++++++++++ + .../amd/include/asic_reg/sdma0/sdma0_4_1_sh_mask.h | 1658 + + .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_3_d.h | 1 + + .../amd/include/asic_reg/smu/smu_7_1_3_sh_mask.h | 6 +- + .../amd/include/asic_reg/smuio/smuio_9_0_offset.h | 3 + + .../amd/include/asic_reg/smuio/smuio_9_0_sh_mask.h | 3 + + drivers/gpu/drm/amd/include/cgs_common.h | 200 +- + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 99 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 62 +- + drivers/gpu/drm/amd/include/soc15_hw_ip.h | 98 + + drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 70 + + .../amd/include/{soc15ip.h => vega10_ip_offset.h} | 370 +- + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 843 +- + drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 8 +- + .../drm/amd/powerplay/hwmgr/cz_clockpowergating.c | 209 - + .../drm/amd/powerplay/hwmgr/cz_clockpowergating.h | 36 - + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 54 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 646 +- + drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c | 114 - + drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 11 +- + .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 8 +- + .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 14 +- + .../powerplay/hwmgr/{rv_hwmgr.c => smu10_hwmgr.c} | 548 +- + .../powerplay/hwmgr/{rv_hwmgr.h => smu10_hwmgr.h} | 130 +- + .../amd/powerplay/hwmgr/{rv_inc.h => smu10_inc.h} | 4 +- + .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 19 +- + .../amd/powerplay/hwmgr/smu7_clockpowergating.h | 1 - + .../drm/amd/powerplay/hwmgr/smu7_dyn_defaults.h | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 860 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h | 34 +- + .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 17 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c | 4 +- + .../powerplay/hwmgr/{cz_hwmgr.c => smu8_hwmgr.c} | 1071 +- + .../powerplay/hwmgr/{cz_hwmgr.h => smu8_hwmgr.h} | 82 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 536 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h | 180 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 509 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 11 +- + .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 57 +- + .../amd/powerplay/hwmgr/vega10_processpptables.c | 21 +- + .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 18 +- + drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 2 +- + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 20 +- + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 210 +- + .../gpu/drm/amd/powerplay/inc/polaris10_ppsmc.h | 412 - + drivers/gpu/drm/amd/powerplay/inc/power_state.h | 4 +- + drivers/gpu/drm/amd/powerplay/inc/pp_feature.h | 67 - + drivers/gpu/drm/amd/powerplay/inc/pp_soc15.h | 6 +- + .../powerplay/inc/{pp_instance.h => pp_thermal.h} | 26 +- + drivers/gpu/drm/amd/powerplay/inc/rv_ppsmc.h | 3 +- + drivers/gpu/drm/amd/powerplay/inc/smu7.h | 19 + + drivers/gpu/drm/amd/powerplay/inc/smu7_discrete.h | 3 +- + drivers/gpu/drm/amd/powerplay/inc/smu9.h | 4 +- + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 44 +- + drivers/gpu/drm/amd/powerplay/inc/vega10_ppsmc.h | 1 + + drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 4 +- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 228 +- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.h | 2 - + drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 871 - + drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.h | 98 - + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 255 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.h | 2 - + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 33 +- + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.h | 1 - + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 266 +- + .../drm/amd/powerplay/smumgr/polaris10_smumgr.h | 1 - + drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c | 406 - + .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 344 + + .../smumgr/{rv_smumgr.h => smu10_smumgr.h} | 26 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 74 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 12 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 891 + + drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.h | 99 + + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 78 +- + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 197 +- + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.h | 3 - + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 316 +- + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h | 7 +- + drivers/gpu/drm/arc/arcpgu_hdmi.c | 3 +- + drivers/gpu/drm/arc/arcpgu_sim.c | 16 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 6 +- + drivers/gpu/drm/arm/malidp_crtc.c | 20 +- + drivers/gpu/drm/arm/malidp_drv.c | 51 +- + drivers/gpu/drm/arm/malidp_drv.h | 2 +- + drivers/gpu/drm/arm/malidp_hw.c | 26 +- + drivers/gpu/drm/arm/malidp_hw.h | 15 +- + drivers/gpu/drm/arm/malidp_planes.c | 146 +- + drivers/gpu/drm/arm/malidp_regs.h | 11 +- + drivers/gpu/drm/armada/armada_crtc.c | 9 +- + drivers/gpu/drm/armada/armada_overlay.c | 9 +- + drivers/gpu/drm/ast/ast_ttm.c | 22 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 24 +- + drivers/gpu/drm/bochs/bochs_mm.c | 14 +- + drivers/gpu/drm/bridge/Kconfig | 3 +- + drivers/gpu/drm/bridge/analogix-anx78xx.c | 3 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 103 +- + drivers/gpu/drm/bridge/dumb-vga-dac.c | 59 +- + drivers/gpu/drm/bridge/sii902x.c | 20 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 86 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 210 +- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 22 +- + drivers/gpu/drm/drm_atomic.c | 36 +- + drivers/gpu/drm/drm_atomic_helper.c | 12 +- + drivers/gpu/drm/drm_blend.c | 18 +- + drivers/gpu/drm/drm_color_mgmt.c | 133 + + drivers/gpu/drm/drm_connector.c | 122 +- + drivers/gpu/drm/drm_crtc.c | 16 +- + drivers/gpu/drm/drm_crtc_internal.h | 6 +- + drivers/gpu/drm/drm_debugfs_crc.c | 19 + + drivers/gpu/drm/drm_dp_helper.c | 4 + + drivers/gpu/drm/drm_dp_mst_topology.c | 11 +- + drivers/gpu/drm/drm_drv.c | 2 +- + drivers/gpu/drm/drm_edid.c | 6 +- + drivers/gpu/drm/drm_encoder.c | 4 + + drivers/gpu/drm/drm_fourcc.c | 50 +- + drivers/gpu/drm/drm_gem.c | 4 +- + drivers/gpu/drm/drm_ioctl.c | 6 +- + drivers/gpu/drm/drm_lease.c | 16 +- + drivers/gpu/drm/drm_memory.c | 13 + + drivers/gpu/drm/drm_mipi_dsi.c | 9 +- + drivers/gpu/drm/drm_mm.c | 9 +- + drivers/gpu/drm/drm_modes.c | 66 +- + drivers/gpu/drm/drm_modeset_lock.c | 1 + + drivers/gpu/drm/drm_of.c | 8 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 1 + + drivers/gpu/drm/drm_plane.c | 39 +- + drivers/gpu/drm/drm_plane_helper.c | 11 +- + drivers/gpu/drm/drm_prime.c | 193 +- + drivers/gpu/drm/drm_probe_helper.c | 2 +- + drivers/gpu/drm/drm_property.c | 101 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 48 +- + drivers/gpu/drm/drm_syncobj.c | 2 +- + drivers/gpu/drm/drm_vblank.c | 100 +- + drivers/gpu/drm/exynos/exynos_dp.c | 30 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 14 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 23 +- + drivers/gpu/drm/i2c/sil164_drv.c | 3 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 3 +- + drivers/gpu/drm/i915/Makefile | 9 +- + drivers/gpu/drm/i915/dvo_ivch.c | 28 +- + drivers/gpu/drm/i915/gvt/Makefile | 2 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 6 +- + drivers/gpu/drm/i915/gvt/gtt.c | 1457 +- + drivers/gpu/drm/i915/gvt/gtt.h | 189 +- + drivers/gpu/drm/i915/gvt/gvt.c | 2 +- + drivers/gpu/drm/i915/gvt/gvt.h | 21 +- + drivers/gpu/drm/i915/gvt/handlers.c | 38 +- + drivers/gpu/drm/i915/gvt/hypercall.h | 9 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 313 +- + drivers/gpu/drm/i915/gvt/mmio.c | 9 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 210 +- + drivers/gpu/drm/i915/gvt/mmio_context.h | 5 + + drivers/gpu/drm/i915/gvt/mpt.h | 67 +- + drivers/gpu/drm/i915/gvt/page_track.c | 184 + + drivers/gpu/drm/i915/gvt/page_track.h | 56 + + drivers/gpu/drm/i915/gvt/sched_policy.c | 5 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 58 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 2 +- + drivers/gpu/drm/i915/gvt/trace.h | 10 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 1 + + drivers/gpu/drm/i915/i915_debugfs.c | 355 +- + drivers/gpu/drm/i915/i915_drv.c | 298 +- + drivers/gpu/drm/i915/i915_drv.h | 140 +- + drivers/gpu/drm/i915/i915_gem.c | 383 +- + drivers/gpu/drm/i915/i915_gem.h | 7 +- + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 2 +- + drivers/gpu/drm/i915/i915_gem_clflush.c | 2 +- + drivers/gpu/drm/i915/i915_gem_context.c | 67 +- + drivers/gpu/drm/i915/i915_gem_context.h | 5 +- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 4 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 4 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 80 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 10 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 152 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 5 +- + drivers/gpu/drm/i915/i915_gem_internal.c | 8 +- + drivers/gpu/drm/i915/i915_gem_object.h | 17 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +- + drivers/gpu/drm/i915/i915_gem_render_state.h | 4 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 4 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 4 +- + drivers/gpu/drm/i915/i915_gem_timeline.h | 4 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 10 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 237 +- + drivers/gpu/drm/i915/i915_ioc32.c | 27 +- + drivers/gpu/drm/i915/i915_irq.c | 425 +- + drivers/gpu/drm/i915/i915_params.c | 5 +- + drivers/gpu/drm/i915/i915_params.h | 2 +- + drivers/gpu/drm/i915/i915_pci.c | 126 +- + drivers/gpu/drm/i915/i915_perf.c | 28 +- + drivers/gpu/drm/i915/i915_pmu.c | 296 +- + drivers/gpu/drm/i915/i915_pmu.h | 8 + + drivers/gpu/drm/i915/i915_query.c | 125 + + drivers/gpu/drm/i915/i915_query.h | 15 + + drivers/gpu/drm/i915/i915_reg.h | 378 +- + .../i915/{i915_gem_request.c => i915_request.c} | 448 +- + .../i915/{i915_gem_request.h => i915_request.h} | 241 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 56 +- + drivers/gpu/drm/i915/i915_syncmap.c | 16 +- + drivers/gpu/drm/i915/i915_trace.h | 128 +- + drivers/gpu/drm/i915/i915_vma.c | 3 +- + drivers/gpu/drm/i915/i915_vma.h | 2 +- + drivers/gpu/drm/i915/intel_atomic.c | 7 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 10 +- + drivers/gpu/drm/i915/intel_audio.c | 2 +- + drivers/gpu/drm/i915/intel_bios.c | 32 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 277 +- + drivers/gpu/drm/i915/intel_cdclk.c | 307 +- + drivers/gpu/drm/i915/intel_color.c | 97 +- + drivers/gpu/drm/i915/intel_crt.c | 20 +- + drivers/gpu/drm/i915/intel_csr.c | 5 +- + drivers/gpu/drm/i915/intel_ddi.c | 317 +- + drivers/gpu/drm/i915/intel_device_info.c | 291 +- + drivers/gpu/drm/i915/intel_device_info.h | 82 +- + drivers/gpu/drm/i915/intel_display.c | 444 +- + drivers/gpu/drm/i915/intel_display.h | 16 + + drivers/gpu/drm/i915/intel_dp.c | 1173 +- + drivers/gpu/drm/i915/intel_dp_link_training.c | 8 +- + drivers/gpu/drm/i915/intel_dpio_phy.c | 2 +- + drivers/gpu/drm/i915/intel_drv.h | 162 +- + drivers/gpu/drm/i915/intel_dsi.c | 5 - + drivers/gpu/drm/i915/intel_dvo.c | 31 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 251 +- + drivers/gpu/drm/i915/intel_fbc.c | 146 +- + drivers/gpu/drm/i915/intel_fbdev.c | 13 +- + drivers/gpu/drm/i915/intel_frontbuffer.c | 2 + + drivers/gpu/drm/i915/intel_guc.c | 89 +- + drivers/gpu/drm/i915/intel_guc.h | 4 +- + drivers/gpu/drm/i915/intel_guc_ads.c | 151 + + drivers/gpu/drm/i915/intel_guc_ads.h | 33 + + drivers/gpu/drm/i915/intel_guc_fw.c | 10 +- + drivers/gpu/drm/i915/intel_guc_log.c | 299 +- + drivers/gpu/drm/i915/intel_guc_log.h | 14 +- + drivers/gpu/drm/i915/intel_guc_submission.c | 331 +- + drivers/gpu/drm/i915/intel_hangcheck.c | 2 +- + drivers/gpu/drm/i915/intel_hdcp.c | 807 + + drivers/gpu/drm/i915/intel_hdmi.c | 297 +- + drivers/gpu/drm/i915/intel_hotplug.c | 44 +- + drivers/gpu/drm/i915/intel_huc.c | 181 +- + drivers/gpu/drm/i915/intel_huc.h | 2 +- + drivers/gpu/drm/i915/intel_huc_fw.c | 166 + + drivers/gpu/drm/i915/intel_huc_fw.h | 15 + + drivers/gpu/drm/i915/intel_i2c.c | 98 +- + drivers/gpu/drm/i915/intel_lpe_audio.c | 14 +- + drivers/gpu/drm/i915/intel_lrc.c | 705 +- + drivers/gpu/drm/i915/intel_lrc.h | 4 + + drivers/gpu/drm/i915/intel_lrc_reg.h | 68 + + drivers/gpu/drm/i915/intel_lspcon.c | 3 +- + drivers/gpu/drm/i915/intel_lvds.c | 44 +- + drivers/gpu/drm/i915/intel_mocs.c | 30 +- + drivers/gpu/drm/i915/intel_mocs.h | 2 +- + drivers/gpu/drm/i915/intel_modes.c | 17 - + drivers/gpu/drm/i915/intel_overlay.c | 85 +- + drivers/gpu/drm/i915/intel_panel.c | 20 +- + drivers/gpu/drm/i915/intel_pm.c | 212 +- + drivers/gpu/drm/i915/intel_psr.c | 229 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 226 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 125 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 210 +- + drivers/gpu/drm/i915/intel_sdvo.c | 97 +- + drivers/gpu/drm/i915/intel_sprite.c | 261 +- + drivers/gpu/drm/i915/intel_tv.c | 28 +- + drivers/gpu/drm/i915/intel_uc.c | 139 +- + drivers/gpu/drm/i915/intel_uc.h | 6 +- + drivers/gpu/drm/i915/intel_uc_fw.c | 5 +- + drivers/gpu/drm/i915/intel_uncore.c | 208 +- + drivers/gpu/drm/i915/intel_uncore.h | 42 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 13 +- + drivers/gpu/drm/i915/selftests/huge_gem_object.c | 4 +- + drivers/gpu/drm/i915/selftests/huge_pages.c | 14 +- + .../gpu/drm/i915/selftests/i915_gem_coherency.c | 8 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 12 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 6 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 118 +- + drivers/gpu/drm/i915/selftests/i915_gem_object.c | 24 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 2 +- + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 2 +- + drivers/gpu/drm/i915/selftests/i915_random.c | 3 +- + .../{i915_gem_request.c => i915_request.c} | 125 +- + drivers/gpu/drm/i915/selftests/i915_sw_fence.c | 134 + + drivers/gpu/drm/i915/selftests/intel_guc.c | 20 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 222 +- + drivers/gpu/drm/i915/selftests/intel_uncore.c | 31 +- + drivers/gpu/drm/i915/selftests/mock_context.c | 11 + + drivers/gpu/drm/i915/selftests/mock_context.h | 3 + + drivers/gpu/drm/i915/selftests/mock_engine.c | 10 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 8 +- + drivers/gpu/drm/i915/selftests/mock_request.c | 10 +- + drivers/gpu/drm/i915/selftests/mock_request.h | 8 +- + drivers/gpu/drm/imx/dw_hdmi-imx.c | 13 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 7 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 6 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 22 +- + drivers/gpu/drm/meson/meson_plane.c | 6 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 22 +- + drivers/gpu/drm/msm/Kconfig | 20 + + drivers/gpu/drm/msm/Makefile | 50 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 9 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 9 +- + drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 187 + + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 99 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.h | 4 + + drivers/gpu/drm/msm/adreno/a5xx_power.c | 26 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 52 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 70 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 14 +- + drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4.xml.h | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_crtc.c | 6 +- + .../drm/msm/{mdp => disp}/mdp4/mdp4_dsi_encoder.c | 0 + .../drm/msm/{mdp => disp}/mdp4/mdp4_dtv_encoder.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_irq.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_kms.c | 2 +- + drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_kms.h | 2 +- + .../drm/msm/{mdp => disp}/mdp4/mdp4_lcdc_encoder.c | 0 + .../msm/{mdp => disp}/mdp4/mdp4_lvds_connector.c | 0 + .../gpu/drm/msm/{mdp => disp}/mdp4/mdp4_lvds_pll.c | 0 + .../gpu/drm/msm/{mdp => disp}/mdp4/mdp4_plane.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5.xml.h | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_cfg.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_cfg.h | 0 + .../drm/msm/{mdp => disp}/mdp5/mdp5_cmd_encoder.c | 4 +- + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_crtc.c | 13 +- + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_ctl.c | 60 +- + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_ctl.h | 2 +- + .../gpu/drm/msm/{mdp => disp}/mdp5/mdp5_encoder.c | 5 +- + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_irq.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_kms.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_kms.h | 10 +- + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_mdss.c | 0 + .../gpu/drm/msm/{mdp => disp}/mdp5/mdp5_mixer.c | 0 + .../gpu/drm/msm/{mdp => disp}/mdp5/mdp5_mixer.h | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_pipe.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_pipe.h | 0 + .../gpu/drm/msm/{mdp => disp}/mdp5/mdp5_plane.c | 16 +- + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_smp.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_smp.h | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp_common.xml.h | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp_format.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp_kms.c | 0 + drivers/gpu/drm/msm/{mdp => disp}/mdp_kms.h | 0 + drivers/gpu/drm/msm/dsi/dsi.c | 25 +- + drivers/gpu/drm/msm/dsi/dsi.h | 1 + + drivers/gpu/drm/msm/dsi/dsi.xml.h | 187 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 19 + + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 47 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 6 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 10 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 251 + + drivers/gpu/drm/msm/dsi/pll/dsi_pll.c | 5 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 9 + + drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 822 + + drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c | 2 +- + drivers/gpu/drm/msm/msm_debugfs.c | 5 +- + drivers/gpu/drm/msm/msm_drv.c | 8 +- + drivers/gpu/drm/msm/msm_drv.h | 1 - + drivers/gpu/drm/msm/msm_fb.c | 6 +- + drivers/gpu/drm/msm/msm_fence.h | 2 - + drivers/gpu/drm/msm/msm_gem.c | 13 +- + drivers/gpu/drm/msm/msm_gem.h | 1 + + drivers/gpu/drm/msm/msm_gem_submit.c | 9 + + drivers/gpu/drm/msm/msm_gem_vma.c | 4 +- + drivers/gpu/drm/msm/msm_gpu.c | 12 +- + drivers/gpu/drm/msm/msm_gpu.h | 2 + + drivers/gpu/drm/msm/msm_ringbuffer.c | 2 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 54 +- + drivers/gpu/drm/nouveau/dispnv04/overlay.c | 26 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_ttm.h | 5 +- + drivers/gpu/drm/nouveau/nv50_display.c | 8 - + .../gpu/drm/omapdrm/displays/connector-analog-tv.c | 50 +- + drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 146 +- + drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 40 +- + drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 40 +- + drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 39 +- + .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 69 +- + drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 71 +- + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 44 +- + .../omapdrm/displays/panel-lgphilips-lb035q02.c | 38 +- + .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 42 +- + .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 38 +- + .../drm/omapdrm/displays/panel-sony-acx565akm.c | 41 +- + .../drm/omapdrm/displays/panel-tpo-td028ttec1.c | 49 +- + .../drm/omapdrm/displays/panel-tpo-td043mtea1.c | 32 +- + drivers/gpu/drm/omapdrm/dss/base.c | 27 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 2346 +- + drivers/gpu/drm/omapdrm/dss/display.c | 5 +- + drivers/gpu/drm/omapdrm/dss/dpi.c | 91 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 1553 +- + drivers/gpu/drm/omapdrm/dss/dss-of.c | 2 - + drivers/gpu/drm/omapdrm/dss/dss.c | 823 +- + drivers/gpu/drm/omapdrm/dss/dss.h | 245 +- + drivers/gpu/drm/omapdrm/dss/hdmi.h | 11 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 406 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c | 4 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_core.h | 4 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 418 +- + drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 24 +- + drivers/gpu/drm/omapdrm/dss/hdmi_phy.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi_pll.c | 15 +- + drivers/gpu/drm/omapdrm/dss/hdmi_wp.c | 2 +- + drivers/gpu/drm/omapdrm/dss/omapdss.h | 213 +- + drivers/gpu/drm/omapdrm/dss/output.c | 53 +- + drivers/gpu/drm/omapdrm/dss/pll.c | 44 +- + drivers/gpu/drm/omapdrm/dss/sdi.c | 162 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 453 +- + drivers/gpu/drm/omapdrm/dss/video-pll.c | 19 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 74 +- + drivers/gpu/drm/omapdrm/omap_crtc.h | 4 +- + drivers/gpu/drm/omapdrm/omap_dmm_priv.h | 10 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 46 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.h | 22 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 122 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 8 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 18 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 38 +- + drivers/gpu/drm/omapdrm/omap_fbdev.h | 9 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 41 +- + drivers/gpu/drm/omapdrm/omap_gem.h | 16 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 38 +- + drivers/gpu/drm/omapdrm/omap_irq.h | 2 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 16 +- + drivers/gpu/drm/omapdrm/tcm-sita.c | 12 +- + drivers/gpu/drm/omapdrm/tcm.h | 4 +- + drivers/gpu/drm/panel/Kconfig | 10 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-arm-versatile.c | 377 + + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 30 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 6 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 16 +- + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 38 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 37 +- + drivers/gpu/drm/pl111/pl111_display.c | 115 +- + drivers/gpu/drm/pl111/pl111_drm.h | 13 +- + drivers/gpu/drm/pl111/pl111_drv.c | 143 +- + drivers/gpu/drm/pl111/pl111_versatile.c | 118 +- + drivers/gpu/drm/qxl/qxl_object.c | 2 +- + drivers/gpu/drm/qxl/qxl_release.c | 2 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 32 +- + drivers/gpu/drm/radeon/mkregtable.c | 433 - + drivers/gpu/drm/radeon/radeon.h | 1 + + drivers/gpu/drm/radeon/radeon_connectors.c | 31 +- + drivers/gpu/drm/radeon/radeon_device.c | 2 + + drivers/gpu/drm/radeon/radeon_display.c | 2 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 4 +- + drivers/gpu/drm/radeon/radeon_object.c | 13 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 22 +- + drivers/gpu/drm/rcar-du/Kconfig | 9 +- + drivers/gpu/drm/rcar-du/Makefile | 10 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 51 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 42 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 5 - + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 175 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 12 - + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 14 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 93 - + drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h | 24 - + drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 272 - + drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h | 64 - + drivers/gpu/drm/rcar-du/rcar_du_of.c | 322 + + drivers/gpu/drm/rcar-du/rcar_du_of.h | 20 + + .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts | 76 + + .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts | 50 + + .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts | 50 + + .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts | 50 + + .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts | 50 + + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 8 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 2 - + drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 14 +- + drivers/gpu/drm/rcar-du/rcar_lvds.c | 540 + + drivers/gpu/drm/rcar-du/rcar_lvds_regs.h | 6 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 74 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 11 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 30 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 25 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 26 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 125 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 5 +- + drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 92 +- + drivers/gpu/drm/rockchip/rockchip_drm_psr.h | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 35 +- + drivers/gpu/drm/stm/drv.c | 18 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 53 +- + drivers/gpu/drm/stm/ltdc.c | 118 +- + drivers/gpu/drm/stm/ltdc.h | 1 + + drivers/gpu/drm/sun4i/Kconfig | 11 +- + drivers/gpu/drm/sun4i/Makefile | 8 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 292 +- + drivers/gpu/drm/sun4i/sun4i_backend.h | 18 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 21 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 28 +- + drivers/gpu/drm/sun4i/sun4i_drv.h | 1 + + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 24 +- + drivers/gpu/drm/sun4i/sun4i_frontend.c | 389 + + drivers/gpu/drm/sun4i/sun4i_frontend.h | 99 + + drivers/gpu/drm/sun4i/sun4i_layer.c | 158 +- + drivers/gpu/drm/sun4i/sun4i_layer.h | 12 + + drivers/gpu/drm/sun4i/sun4i_tcon.c | 53 +- + drivers/gpu/drm/sun4i/sun4i_tcon.h | 1 + + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 196 + + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 193 + + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 543 + + drivers/gpu/drm/sun4i/sun8i_hdmi_phy_clk.c | 132 + + drivers/gpu/drm/sun4i/sun8i_mixer.c | 23 + + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 8 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 8 +- + drivers/gpu/drm/sun4i/sunxi_engine.h | 90 + + drivers/gpu/drm/tegra/dc.c | 84 +- + drivers/gpu/drm/tegra/dc.h | 1 + + drivers/gpu/drm/tegra/drm.c | 36 +- + drivers/gpu/drm/tegra/drm.h | 14 - + drivers/gpu/drm/tegra/fb.c | 25 +- + drivers/gpu/drm/tegra/gem.c | 69 +- + drivers/gpu/drm/tegra/gem.h | 5 +- + drivers/gpu/drm/tegra/hub.c | 125 +- + drivers/gpu/drm/tegra/hub.h | 17 + + drivers/gpu/drm/tegra/plane.c | 28 +- + drivers/gpu/drm/tilcdc/Kconfig | 2 + + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 4 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 4 +- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 29 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 23 +- + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 8 +- + drivers/gpu/drm/tinydrm/Kconfig | 4 +- + drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 95 - + drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 34 +- + drivers/gpu/drm/tinydrm/ili9225.c | 6 +- + drivers/gpu/drm/tinydrm/mi0283qt.c | 109 +- + drivers/gpu/drm/tinydrm/mipi-dbi.c | 105 +- + drivers/gpu/drm/tinydrm/st7586.c | 15 +- + drivers/gpu/drm/tinydrm/st7735r.c | 14 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 10 +- + drivers/gpu/drm/ttm/ttm_bo.c | 121 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 41 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 35 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 20 +- + drivers/gpu/drm/ttm/ttm_memory.c | 93 + + drivers/gpu/drm/ttm/ttm_page_alloc.c | 52 +- + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 46 +- + drivers/gpu/drm/ttm/ttm_tt.c | 180 +- + drivers/gpu/drm/tve200/tve200_display.c | 10 +- + drivers/gpu/drm/tve200/tve200_drm.h | 2 - + drivers/gpu/drm/tve200/tve200_drv.c | 3 - + drivers/gpu/drm/vc4/Makefile | 1 + + drivers/gpu/drm/vc4/vc4_drv.c | 26 + + drivers/gpu/drm/vc4/vc4_drv.h | 68 + + drivers/gpu/drm/vc4/vc4_gem.c | 48 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- + drivers/gpu/drm/vc4/vc4_irq.c | 40 +- + drivers/gpu/drm/vc4/vc4_kms.c | 1 + + drivers/gpu/drm/vc4/vc4_perfmon.c | 188 + + drivers/gpu/drm/vc4/vc4_plane.c | 57 +- + drivers/gpu/drm/vc4/vc4_regs.h | 35 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 64 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 7 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 8 +- + drivers/gpu/drm/virtio/virtgpu_fb.c | 6 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 1 + + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 25 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 31 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 13 +- + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 13 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 +- + drivers/gpu/drm/zte/zx_plane.c | 15 +- + drivers/of/Kconfig | 1 + + drivers/of/overlay.c | 134 +- + drivers/of/resolver.c | 6 - + drivers/of/unittest-data/Makefile | 28 +- + drivers/of/unittest-data/overlay.dts | 101 +- + drivers/of/unittest-data/overlay_0.dts | 14 + + drivers/of/unittest-data/overlay_1.dts | 14 + + drivers/of/unittest-data/overlay_10.dts | 27 + + drivers/of/unittest-data/overlay_11.dts | 28 + + drivers/of/unittest-data/overlay_12.dts | 14 + + drivers/of/unittest-data/overlay_13.dts | 14 + + drivers/of/unittest-data/overlay_15.dts | 30 + + drivers/of/unittest-data/overlay_2.dts | 9 + + drivers/of/unittest-data/overlay_3.dts | 9 + + drivers/of/unittest-data/overlay_4.dts | 18 + + drivers/of/unittest-data/overlay_5.dts | 9 + + drivers/of/unittest-data/overlay_6.dts | 10 + + drivers/of/unittest-data/overlay_7.dts | 10 + + drivers/of/unittest-data/overlay_8.dts | 10 + + drivers/of/unittest-data/overlay_9.dts | 10 + + drivers/of/unittest-data/overlay_bad_phandle.dts | 23 +- + drivers/of/unittest-data/overlay_bad_symbol.dts | 25 +- + drivers/of/unittest-data/tests-overlay.dtsi | 217 +- + drivers/of/unittest.c | 300 +- + drivers/staging/vboxvideo/vbox_ttm.c | 23 +- + drivers/video/backlight/backlight.c | 73 + + include/drm/bridge/analogix_dp.h | 20 +- + include/drm/bridge/dw_hdmi.h | 24 +- + include/drm/bridge/dw_mipi_dsi.h | 17 +- + include/drm/drm_atomic.h | 24 +- + include/drm/drm_atomic_helper.h | 1 - + include/drm/drm_bridge.h | 35 +- + include/drm/drm_cache.h | 2 + + include/drm/drm_color_mgmt.h | 19 + + include/drm/drm_connector.h | 22 +- + include/drm/drm_dp_helper.h | 65 + + include/drm/drm_fourcc.h | 2 + + include/drm/drm_gem.h | 15 - + include/drm/drm_hdcp.h | 41 + + include/drm/drm_mode_config.h | 12 + + include/drm/drm_modes.h | 24 +- + include/drm/drm_plane.h | 32 + + include/drm/drm_plane_helper.h | 1 - + include/drm/drm_prime.h | 22 + + include/drm/drm_property.h | 24 +- + include/drm/drm_simple_kms_helper.h | 53 + + include/drm/drm_vblank.h | 20 +- + include/drm/i915_component.h | 3 +- + include/drm/i915_pciids.h | 39 +- + include/drm/tinydrm/ili9341.h | 54 - + include/drm/tinydrm/mipi-dbi.h | 5 +- + include/drm/tinydrm/tinydrm-helpers.h | 4 - + include/drm/ttm/ttm_bo_api.h | 28 +- + include/drm/ttm/ttm_bo_driver.h | 250 +- + include/drm/ttm/ttm_memory.h | 5 + + include/drm/ttm/ttm_tt.h | 272 + + include/linux/backlight.h | 58 + + include/linux/of.h | 6 +- + include/uapi/drm/amdgpu_drm.h | 5 + + include/uapi/drm/drm_mode.h | 43 +- + include/uapi/drm/i915_drm.h | 112 +- + include/uapi/drm/msm_drm.h | 2 + + include/uapi/drm/vc4_drm.h | 76 + + include/uapi/linux/kfd_ioctl.h | 8 +- + 941 files changed, 78169 insertions(+), 35792 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt + rename Documentation/devicetree/bindings/display/bridge/{ti,ths8135.txt => ti,ths813x.txt} (69%) + create mode 100644 Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.txt + create mode 100644 Documentation/devicetree/bindings/display/rockchip/cdn-dp-rockchip.txt + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c + rename drivers/gpu/drm/amd/{powerplay/inc/pp_acpi.h => amdgpu/emu_soc.c} (81%) + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_iommu.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_iommu.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/bios/command_table_helper_struct.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dce80/dce80_compressor.c + delete mode 100644 drivers/gpu/drm/amd/display/dc/dce80/dce80_compressor.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_calc.c + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_calc.h + rename drivers/gpu/drm/amd/{amdgpu/amdgpu_powerplay.h => display/dc/dml/dml_logger.h} (80%) + create mode 100644 drivers/gpu/drm/amd/display/modules/color/Makefile + create mode 100644 drivers/gpu/drm/amd/display/modules/color/color_gamma.c + rename drivers/gpu/drm/amd/{powerplay/inc/pp_asicblocks.h => display/modules/color/color_gamma.h} (54%) + create mode 100644 drivers/gpu/drm/amd/display/modules/inc/mod_stats.h + create mode 100644 drivers/gpu/drm/amd/display/modules/stats/stats.c + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/soc15_hw_ip.h + create mode 100644 drivers/gpu/drm/amd/include/soc15_ih_clientid.h + rename drivers/gpu/drm/amd/include/{soc15ip.h => vega10_ip_offset.h} (85%) + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/cz_clockpowergating.c + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/cz_clockpowergating.h + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c + rename drivers/gpu/drm/amd/powerplay/hwmgr/{rv_hwmgr.c => smu10_hwmgr.c} (55%) + rename drivers/gpu/drm/amd/powerplay/hwmgr/{rv_hwmgr.h => smu10_hwmgr.h} (67%) + rename drivers/gpu/drm/amd/powerplay/hwmgr/{rv_inc.h => smu10_inc.h} (97%) + rename drivers/gpu/drm/amd/powerplay/hwmgr/{cz_hwmgr.c => smu8_hwmgr.c} (58%) + rename drivers/gpu/drm/amd/powerplay/hwmgr/{cz_hwmgr.h => smu8_hwmgr.h} (79%) + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h + delete mode 100644 drivers/gpu/drm/amd/powerplay/inc/polaris10_ppsmc.h + delete mode 100644 drivers/gpu/drm/amd/powerplay/inc/pp_feature.h + rename drivers/gpu/drm/amd/powerplay/inc/{pp_instance.h => pp_thermal.h} (76%) + delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c + delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.h + delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c + rename drivers/gpu/drm/amd/powerplay/smumgr/{rv_smumgr.h => smu10_smumgr.h} (72%) + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.h + create mode 100644 drivers/gpu/drm/i915/gvt/page_track.c + create mode 100644 drivers/gpu/drm/i915/gvt/page_track.h + create mode 100644 drivers/gpu/drm/i915/i915_query.c + create mode 100644 drivers/gpu/drm/i915/i915_query.h + rename drivers/gpu/drm/i915/{i915_gem_request.c => i915_request.c} (73%) + rename drivers/gpu/drm/i915/{i915_gem_request.h => i915_request.h} (80%) + create mode 100644 drivers/gpu/drm/i915/intel_guc_ads.c + create mode 100644 drivers/gpu/drm/i915/intel_guc_ads.h + create mode 100644 drivers/gpu/drm/i915/intel_hdcp.c + create mode 100644 drivers/gpu/drm/i915/intel_huc_fw.c + create mode 100644 drivers/gpu/drm/i915/intel_huc_fw.h + create mode 100644 drivers/gpu/drm/i915/intel_lrc_reg.h + rename drivers/gpu/drm/i915/selftests/{i915_gem_request.c => i915_request.c} (87%) + create mode 100644 drivers/gpu/drm/msm/adreno/a5xx_debugfs.c + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4.xml.h (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_crtc.c (99%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_dsi_encoder.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_dtv_encoder.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_irq.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_kms.c (99%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_kms.h (99%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_lcdc_encoder.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_lvds_connector.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_lvds_pll.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_plane.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5.xml.h (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_cfg.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_cfg.h (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_cmd_encoder.c (99%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_crtc.c (99%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_ctl.c (94%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_ctl.h (98%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_encoder.c (99%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_irq.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_kms.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_kms.h (96%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_mdss.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_mixer.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_mixer.h (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_pipe.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_pipe.h (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_plane.c (98%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_smp.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_smp.h (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp_common.xml.h (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp_format.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp_kms.c (100%) + rename drivers/gpu/drm/msm/{mdp => disp}/mdp_kms.h (100%) + create mode 100644 drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c + create mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c + create mode 100644 drivers/gpu/drm/panel/panel-arm-versatile.c + delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c + delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h + delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c + delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_of.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_of.h + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts + create mode 100644 drivers/gpu/drm/rcar-du/rcar_lvds.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_frontend.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_frontend.h + create mode 100644 drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c + create mode 100644 drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h + create mode 100644 drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c + create mode 100644 drivers/gpu/drm/sun4i/sun8i_hdmi_phy_clk.c + create mode 100644 drivers/gpu/drm/vc4/vc4_perfmon.c + create mode 100644 drivers/of/unittest-data/overlay_0.dts + create mode 100644 drivers/of/unittest-data/overlay_1.dts + create mode 100644 drivers/of/unittest-data/overlay_10.dts + create mode 100644 drivers/of/unittest-data/overlay_11.dts + create mode 100644 drivers/of/unittest-data/overlay_12.dts + create mode 100644 drivers/of/unittest-data/overlay_13.dts + create mode 100644 drivers/of/unittest-data/overlay_15.dts + create mode 100644 drivers/of/unittest-data/overlay_2.dts + create mode 100644 drivers/of/unittest-data/overlay_3.dts + create mode 100644 drivers/of/unittest-data/overlay_4.dts + create mode 100644 drivers/of/unittest-data/overlay_5.dts + create mode 100644 drivers/of/unittest-data/overlay_6.dts + create mode 100644 drivers/of/unittest-data/overlay_7.dts + create mode 100644 drivers/of/unittest-data/overlay_8.dts + create mode 100644 drivers/of/unittest-data/overlay_9.dts + create mode 100644 include/drm/drm_hdcp.h + delete mode 100644 include/drm/tinydrm/ili9341.h + create mode 100644 include/drm/ttm/ttm_tt.h +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 (8c5cb3c1c570 Merge tag 'gvt-next-fixes-2018-03-20' of https://github.com/intel/gvt-linux into drm-intel-next-fixes) +$ git merge drm-intel/for-linux-next +Recorded preimage for 'drivers/gpu/drm/i915/gvt/scheduler.c' +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/scheduler.c +Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/gvt/scheduler.c'. +[master 28b0c219fb24] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/gvt/gtt.c | 24 ++++++++++++++++++++++- + drivers/gpu/drm/i915/gvt/gtt.h | 1 + + drivers/gpu/drm/i915/gvt/handlers.c | 9 +++++++++ + drivers/gpu/drm/i915/gvt/kvmgt.c | 22 ++++++++++++++------- + drivers/gpu/drm/i915/gvt/scheduler.c | 37 ++++++++++++++++++++++++++++++++---- + drivers/gpu/drm/i915/gvt/vgpu.c | 1 + + drivers/gpu/drm/i915/i915_gem.c | 23 +++++++++++++++------- + drivers/gpu/drm/i915/i915_pmu.c | 32 +++++++++++++------------------ + drivers/gpu/drm/i915/i915_request.c | 2 ++ + drivers/gpu/drm/i915/intel_ddi.c | 9 ++++++--- + 10 files changed, 119 insertions(+), 41 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 (1c7095d2836b Merge airlied/drm-next into drm-misc-next) +$ git merge drm-misc/for-linux-next +Resolved 'drivers/gpu/drm/sun4i/sun4i_tcon.h' using previous resolution. +Resolved 'sound/pci/hda/hda_intel.c' using previous resolution. +Auto-merging sound/pci/hda/hda_intel.c +CONFLICT (content): Merge conflict in sound/pci/hda/hda_intel.c +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_tcon.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/sun4i/sun4i_tcon.h +Auto-merging drivers/gpu/drm/sun4i/sun4i_tcon.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_rgb.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_drv.c +Auto-merging drivers/gpu/drm/drm_framebuffer.c +Auto-merging drivers/gpu/drm/drm_edid.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master cf0932a577b5] Merge remote-tracking branch 'drm-misc/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/panel/auo,g104sn02.txt | 12 + + .../bindings/display/panel/display-timing.txt | 5 + + .../bindings/display/panel/koe,tx31d200vm0baa.txt | 25 ++ + .../bindings/display/panel/orisetech,otm8009a.txt | 2 + + .../bindings/display/panel/raydium,rm68200.txt | 25 ++ + .../bindings/display/panel/simple-panel.txt | 4 + + .../bindings/display/sunxi/sun4i-drm.txt | 39 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/gpu/drivers.rst | 21 + + Documentation/gpu/drm-kms.rst | 3 + + Documentation/gpu/index.rst | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 - + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 151 +++++-- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 11 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 38 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 9 - + drivers/gpu/drm/drm_atomic.c | 42 +- + drivers/gpu/drm/drm_atomic_helper.c | 2 +- + drivers/gpu/drm/drm_bufs.c | 16 +- + drivers/gpu/drm/drm_edid.c | 3 +- + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/gpu/drm/drm_framebuffer.c | 5 +- + drivers/gpu/drm/drm_modes.c | 34 +- + drivers/gpu/drm/drm_plane.c | 2 +- + drivers/gpu/drm/drm_print.c | 65 ++- + drivers/gpu/drm/drm_property.c | 1 + + drivers/gpu/drm/i915/intel_color.c | 32 +- + drivers/gpu/drm/i915/intel_display.c | 15 +- + drivers/gpu/drm/meson/meson_drv.c | 37 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 22 +- + drivers/gpu/drm/meson/meson_vclk.c | 219 +++++++++- + drivers/gpu/drm/meson/meson_venc.c | 347 +++++++++++++++- + drivers/gpu/drm/meson/meson_venc.h | 1 + + drivers/gpu/drm/nouveau/nouveau_drm.c | 46 --- + drivers/gpu/drm/nouveau/nouveau_drv.h | 1 - + drivers/gpu/drm/panel/Kconfig | 9 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 4 +- + drivers/gpu/drm/panel/panel-lvds.c | 2 +- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 21 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 448 +++++++++++++++++++++ + drivers/gpu/drm/panel/panel-simple.c | 82 +++- + drivers/gpu/drm/qxl/qxl_display.c | 4 +- + drivers/gpu/drm/qxl/qxl_dumb.c | 2 +- + drivers/gpu/drm/qxl/qxl_fb.c | 6 +- + drivers/gpu/drm/qxl/qxl_gem.c | 2 +- + drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +- + drivers/gpu/drm/qxl/qxl_object.c | 6 +- + drivers/gpu/drm/radeon/radeon_drv.c | 2 - + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 33 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 7 - + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 74 ++-- + drivers/gpu/drm/sun4i/sun4i_backend.c | 154 ++++++- + drivers/gpu/drm/sun4i/sun4i_backend.h | 18 + + drivers/gpu/drm/sun4i/sun4i_drv.c | 12 +- + drivers/gpu/drm/sun4i/sun4i_layer.c | 4 + + drivers/gpu/drm/sun4i/sun4i_lvds.c | 55 +++ + drivers/gpu/drm/sun4i/sun4i_rgb.c | 8 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 52 +++ + drivers/gpu/drm/sun4i/sun4i_tcon.h | 1 + + drivers/gpu/drm/sun4i/sun6i_drc.c | 1 + + drivers/gpu/drm/vc4/vc4_crtc.c | 25 ++ + drivers/gpu/drm/vc4/vc4_drv.h | 60 +++ + drivers/gpu/drm/vc4/vc4_plane.c | 68 +--- + drivers/gpu/drm/vc4/vc4_regs.h | 1 + + drivers/gpu/drm/vc4/vc4_validate.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 4 +- + drivers/gpu/vga/vga_switcheroo.c | 152 ++----- + drivers/pci/pci-driver.c | 17 +- + drivers/pci/pci.c | 8 +- + drivers/pci/quirks.c | 39 ++ + include/drm/bridge/analogix_dp.h | 2 +- + include/drm/drm_color_mgmt.h | 12 + + include/drm/drm_dp_helper.h | 1 + + include/drm/drm_mode_object.h | 24 -- + include/drm/drm_print.h | 119 +++--- + include/drm/drm_property.h | 2 +- + include/linux/pci.h | 2 + + include/linux/pci_ids.h | 1 + + include/linux/vga_switcheroo.h | 6 - + include/sound/hdaudio.h | 3 - + scripts/coccinelle/api/drm-get-put.cocci | 10 - + sound/pci/hda/hda_intel.c | 36 +- + sound/pci/hda/hda_intel.h | 3 - + 85 files changed, 2218 insertions(+), 642 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/auo,g104sn02.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/koe,tx31d200vm0baa.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/raydium,rm68200.txt + create mode 100644 Documentation/gpu/drivers.rst + create mode 100644 drivers/gpu/drm/panel/panel-raydium-rm68200.c +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 (4a3928c6f8a5 Linux 4.16-rc3) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (fc0775da8e60 drm/etnaviv: etnaviv_sched: Staticize functions when possible) +$ git merge etnaviv/etnaviv/next +Merge made by the 'recursive' strategy. + .../bindings/display/etnaviv/etnaviv-drm.txt | 24 +- + drivers/gpu/drm/etnaviv/Kconfig | 1 + + drivers/gpu/drm/etnaviv/Makefile | 4 +- + drivers/gpu/drm/etnaviv/common.xml.h | 281 +++++++++++--- + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 18 + + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 52 ++- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 8 +- + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 21 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 5 + + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 68 ++-- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 406 ++++++++++----------- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 54 +-- + drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 65 ++++ + drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 78 +++- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 170 +++++++++ + drivers/gpu/drm/etnaviv/etnaviv_sched.h | 35 ++ + drivers/gpu/drm/etnaviv/state.xml.h | 256 ++++++++++--- + drivers/gpu/drm/etnaviv/state_3d.xml.h | 5 + + drivers/gpu/drm/etnaviv/state_blt.xml.h | 52 +++ + drivers/gpu/drm/etnaviv/state_hi.xml.h | 150 +++++++- + include/uapi/drm/etnaviv_drm.h | 6 + + 23 files changed, 1310 insertions(+), 455 deletions(-) + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_hwdb.c + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_sched.c + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_sched.h + create mode 100644 drivers/gpu/drm/etnaviv/state_blt.xml.h +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 +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-debugfs.c | 20 ++- + drivers/base/regmap/regmap-i2c.c | 4 - + drivers/base/regmap/regmap-mmio.c | 24 +++ + drivers/base/regmap/regmap.c | 306 ++++++++++++++--------------------- + include/linux/regmap.h | 3 + + 5 files changed, 168 insertions(+), 189 deletions(-) +Merging sound/for-next (9a2fe9b801f5 ALSA: usb: initial USB Audio Device Class 3.0 support) +$ git merge sound/for-next +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging include/sound/hdaudio.h +Merge made by the 'recursive' strategy. + include/linux/usb/audio-v2.h | 4 +- + include/linux/usb/audio-v3.h | 395 +++++++++++++++++++++++++++++++++++++++ + include/sound/emu10k1.h | 4 +- + include/sound/hdaudio.h | 2 + + include/uapi/linux/usb/audio.h | 1 + + sound/core/control.c | 18 +- + sound/core/init.c | 4 +- + sound/core/pcm_lib.c | 8 +- + sound/core/pcm_native.c | 19 +- + sound/core/vmaster.c | 7 +- + 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/usb/card.c | 7 +- + sound/usb/card.h | 2 +- + sound/usb/clock.c | 228 +++++++++++++++++++--- + sound/usb/clock.h | 4 +- + sound/usb/format.c | 91 +++++++-- + sound/usb/format.h | 6 +- + sound/usb/mixer.c | 337 ++++++++++++++++++++++----------- + sound/usb/quirks.c | 34 ++++ + sound/usb/quirks.h | 4 + + sound/usb/stream.c | 395 ++++++++++++++++++++++++++++++++------- + 32 files changed, 1517 insertions(+), 360 deletions(-) + create mode 100644 include/linux/usb/audio-v3.h +Merging sound-asoc/for-next (3c0239e01a18 Merge remote-tracking branch 'asoc/topic/zx_aud96p22' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/fsl/imx-wm8962.c +Removing sound/soc/blackfin/bfin-eval-adav80x.c +Removing sound/soc/blackfin/bfin-eval-adau1x81.c +Removing sound/soc/blackfin/bfin-eval-adau1x61.c +Removing sound/soc/blackfin/bfin-eval-adau1701.c +Removing sound/soc/blackfin/bfin-eval-adau1373.c +Removing sound/soc/blackfin/bf6xx-sport.h +Removing sound/soc/blackfin/bf6xx-sport.c +Removing sound/soc/blackfin/bf6xx-i2s.c +Removing sound/soc/blackfin/bf5xx-ssm2602.c +Removing sound/soc/blackfin/bf5xx-sport.h +Removing sound/soc/blackfin/bf5xx-sport.c +Removing sound/soc/blackfin/bf5xx-i2s.c +Removing sound/soc/blackfin/bf5xx-i2s-pcm.h +Removing sound/soc/blackfin/bf5xx-i2s-pcm.c +Removing sound/soc/blackfin/bf5xx-ad73311.c +Removing sound/soc/blackfin/bf5xx-ad1980.c +Removing sound/soc/blackfin/bf5xx-ad193x.c +Removing sound/soc/blackfin/bf5xx-ad1836.c +Removing sound/soc/blackfin/bf5xx-ac97.h +Removing sound/soc/blackfin/bf5xx-ac97.c +Removing sound/soc/blackfin/bf5xx-ac97-pcm.c +Removing sound/soc/blackfin/Makefile +Removing sound/soc/blackfin/Kconfig +Removing include/sound/rt5651.h +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt +Merge made by the 'recursive' strategy. + 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/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 +- + MAINTAINERS | 7 - + arch/x86/include/asm/platform_sst_audio.h | 1 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 47 +- + include/dt-bindings/sound/rt5651.h | 15 + + include/sound/da7219.h | 2 + + include/sound/dmaengine_pcm.h | 7 + + include/sound/rt5651.h | 29 - + include/sound/rt5659.h | 1 + + include/sound/soc-dapm.h | 16 + + include/sound/soc.h | 14 +- + include/uapi/sound/asound.h | 1 + + 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 | 277 ++++ + 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 | 1568 ++++++++++++++++++++ + 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 | 243 +-- + 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 | 27 +- + 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 | 12 +- + 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 +- + 483 files changed, 27559 insertions(+), 22871 deletions(-) + 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 include/dt-bindings/sound/rt5651.h + delete mode 100644 include/sound/rt5651.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 +Merging modules/modules-next (3f553b308bb0 module: propagate error in modules_open()) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Merge made by the 'recursive' strategy. + kernel/module.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging input/next (68106869e802 Input: pxrc - new driver for PhoenixRC Flight Controller Adapter) +$ git merge input/next +Auto-merging drivers/input/mouse/synaptics.c +Auto-merging drivers/input/misc/Makefile +Auto-merging drivers/input/misc/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/gpio-keys.txt | 8 + + .../bindings/input/zii,rave-sp-pwrbutton.txt | 22 ++ + Documentation/input/devices/pxrc.rst | 57 ++++ + drivers/input/joystick/Kconfig | 10 + + drivers/input/joystick/Makefile | 1 + + drivers/input/joystick/pxrc.c | 303 +++++++++++++++++++ + drivers/input/keyboard/gpio_keys.c | 145 +++++++++- + drivers/input/misc/Kconfig | 9 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/rave-sp-pwrbutton.c | 94 ++++++ + drivers/input/mouse/alps.c | 30 +- + 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/libps2.c | 322 ++++++++++++++------- + drivers/input/tablet/pegasus_notetaker.c | 32 +- + drivers/input/touchscreen/usbtouchscreen.c | 24 +- + include/dt-bindings/input/gpio-keys.h | 13 + + include/linux/gpio_keys.h | 2 + + include/linux/libps2.h | 38 ++- + 27 files changed, 1282 insertions(+), 475 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/zii,rave-sp-pwrbutton.txt + create mode 100644 Documentation/input/devices/pxrc.rst + create mode 100644 drivers/input/joystick/pxrc.c + create mode 100644 drivers/input/misc/rave-sp-pwrbutton.c + create mode 100644 include/dt-bindings/input/gpio-keys.h +Merging block/for-next (927fc3c30ffa Merge branch 'for-4.17/block' into for-next) +$ git merge block/for-next +Auto-merging include/linux/ide.h +Auto-merging include/linux/fs.h +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_scsih.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_fusion.c +Auto-merging drivers/scsi/iscsi_tcp.c +Auto-merging drivers/s390/block/dasd.c +Auto-merging drivers/nvme/host/multipath.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/nvdimm/pmem.c +Auto-merging drivers/md/raid5.c +Auto-merging drivers/md/raid10.c +Auto-merging drivers/md/raid1.c +Auto-merging drivers/md/md.c +Auto-merging drivers/md/dm.c +Auto-merging drivers/md/dm-table.c +Auto-merging drivers/md/bcache/super.c +Auto-merging drivers/block/xen-blkfront.c +Auto-merging drivers/block/loop.c +Auto-merging block/blk-core.c +Auto-merging block/blk-cgroup.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/cdrom/cdrom-standard.tex | 31 ++-- + MAINTAINERS | 1 + + arch/xtensa/platforms/iss/simdisk.c | 1 - + block/bio.c | 4 +- + block/blk-cgroup.c | 78 +++++++-- + block/blk-core.c | 250 +++++++++++++++++--------- + block/blk-mq-debugfs.c | 150 +++++++++------- + block/blk-mq.c | 20 +-- + block/blk-settings.c | 6 +- + block/blk-stat.c | 6 +- + block/blk-sysfs.c | 29 +-- + block/blk-timeout.c | 6 +- + block/blk-zoned.c | 4 +- + block/blk.h | 69 ++++++++ + block/bsg-lib.c | 165 ++++++++++++------ + block/bsg.c | 262 +++++++++++++--------------- + block/sed-opal.c | 37 ++-- + drivers/block/brd.c | 1 - + drivers/block/drbd/drbd_main.c | 3 +- + drivers/block/drbd/drbd_nl.c | 4 +- + drivers/block/loop.c | 12 +- + 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/cdrom/cdrom.c | 3 - + drivers/cdrom/gdrom.c | 3 + + 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/lightnvm/core.c | 2 +- + drivers/lightnvm/pblk-init.c | 2 +- + 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/misc/cardreader/rtsx_pcr.c | 4 +- + drivers/mmc/core/queue.c | 8 +- + drivers/mtd/mtd_blkdevs.c | 6 +- + drivers/nvdimm/blk.c | 2 +- + drivers/nvdimm/btt.c | 2 +- + drivers/nvdimm/nd.h | 1 - + drivers/nvdimm/pmem.c | 6 +- + drivers/nvme/host/core.c | 4 +- + drivers/nvme/host/multipath.c | 4 +- + 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/gdth.h | 3 - + drivers/scsi/iscsi_tcp.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +- + drivers/scsi/scsi_debug.c | 2 +- + drivers/scsi/scsi_lib.c | 6 +- + drivers/scsi/scsi_sysfs.c | 3 +- + drivers/scsi/scsi_transport_sas.c | 3 +- + drivers/scsi/sd.c | 8 +- + drivers/scsi/sr.c | 2 + + drivers/staging/rts5208/rtsx_chip.h | 12 +- + drivers/staging/rts5208/rtsx_transport.c | 10 +- + drivers/target/loopback/tcm_loop.c | 2 +- + fs/direct-io.c | 9 +- + include/linux/blk-cgroup.h | 1 + + include/linux/blk_types.h | 5 + + include/linux/blkdev.h | 121 +++++-------- + include/linux/bsg-lib.h | 7 +- + include/linux/bsg.h | 35 ++-- + include/linux/device-mapper.h | 2 - + include/linux/fs.h | 6 - + include/linux/ide.h | 1 - + include/linux/rtsx_pci.h | 12 +- + include/linux/sbitmap.h | 8 + + include/linux/scatterlist.h | 23 +-- + include/uapi/linux/msdos_fs.h | 2 + + lib/sbitmap.c | 10 +- + mm/backing-dev.c | 2 - + 109 files changed, 1575 insertions(+), 884 deletions(-) +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 (83260a18a9de dm bufio: support non-power-of-two block sizes) +$ 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 +Merge made by the 'recursive' strategy. + drivers/md/dm-bufio.c | 173 +++++++++----------------- + drivers/md/dm-cache-target.c | 3 +- + drivers/md/dm-crypt.c | 3 +- + drivers/md/dm-era-target.c | 3 +- + drivers/md/dm-integrity.c | 2 +- + drivers/md/dm-ioctl.c | 2 +- + drivers/md/dm-log-writes.c | 3 +- + drivers/md/dm-mpath.c | 3 +- + drivers/md/dm-raid.c | 3 +- + drivers/md/dm-snap-persistent.c | 2 +- + drivers/md/dm-switch.c | 3 +- + drivers/md/dm-thin.c | 3 +- + drivers/md/dm-verity.h | 2 +- + drivers/md/dm.c | 5 +- + drivers/md/persistent-data/dm-block-manager.c | 2 +- + include/linux/device-mapper.h | 3 +- + {drivers/md => include/linux}/dm-bufio.h | 4 +- + include/uapi/linux/dm-ioctl.h | 4 +- + 18 files changed, 89 insertions(+), 134 deletions(-) + rename {drivers/md => include/linux}/dm-bufio.h (98%) +Merging mmc/next (c42e8e054d95 Merge branch 'fixes' into next) +$ git merge mmc/next +Auto-merging drivers/mmc/host/Makefile +Auto-merging drivers/mmc/host/Kconfig +Auto-merging arch/arm64/boot/dts/hisilicon/hi3660.dtsi +Merge made by the 'recursive' strategy. + .../bindings/mmc/hi3798cv200-dw-mshc.txt | 40 +++ + Documentation/devicetree/bindings/mmc/mtk-sd.txt | 1 + + .../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 9 - + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 1 - + arch/arm/boot/dts/lpc18xx.dtsi | 1 - + arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts | 1 - + arch/arm/boot/dts/socfpga_arria5.dtsi | 1 - + arch/arm/boot/dts/socfpga_cyclone5.dtsi | 1 - + arch/arm/boot/dts/socfpga_vt.dts | 1 - + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 1 - + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 2 - + arch/sh/boards/mach-kfr2r09/setup.c | 2 +- + drivers/mmc/core/block.c | 34 +- + drivers/mmc/core/card.h | 1 + + drivers/mmc/core/core.c | 5 +- + drivers/mmc/core/debugfs.c | 13 +- + drivers/mmc/core/host.h | 3 +- + drivers/mmc/core/mmc.c | 2 + + drivers/mmc/core/quirks.h | 6 + + drivers/mmc/core/sd.c | 20 +- + drivers/mmc/core/sdio.c | 9 +- + drivers/mmc/core/slot-gpio.c | 23 +- + drivers/mmc/host/Kconfig | 9 + + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/dw_mmc-exynos.c | 8 +- + drivers/mmc/host/dw_mmc-hi3798cv200.c | 202 +++++++++++ + drivers/mmc/host/dw_mmc-pci.c | 1 - + drivers/mmc/host/dw_mmc-rockchip.c | 4 +- + drivers/mmc/host/dw_mmc.c | 63 +--- + drivers/mmc/host/dw_mmc.h | 27 +- + drivers/mmc/host/mtk-sd.c | 12 + + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 11 +- + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 17 +- + drivers/mmc/host/sdhci-acpi.c | 2 +- + drivers/mmc/host/sdhci-iproc.c | 1 + + drivers/mmc/host/sdhci-omap.c | 378 ++++++++++++++++++++- + drivers/mmc/host/sdhci-pci-core.c | 43 ++- + drivers/mmc/host/sdhci.c | 19 +- + drivers/mmc/host/sh_mmcif.c | 8 - + drivers/mmc/host/sunxi-mmc.c | 144 ++++---- + drivers/mmc/host/tmio_mmc_core.c | 66 ++-- + drivers/mmc/host/ushc.c | 2 - + include/linux/mfd/tmio.h | 1 - + include/linux/mmc/slot-gpio.h | 1 + + include/trace/events/mmc.h | 4 +- + 45 files changed, 920 insertions(+), 281 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/hi3798cv200-dw-mshc.txt + create mode 100644 drivers/mmc/host/dw_mmc-hi3798cv200.c +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 +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 (e2be8c26c80a mfd: pcf50633: Fix some memory leaks in the error handling path of 'pcf50633_probe()') +$ 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 +Auto-merging Documentation/devicetree/bindings/mfd/aspeed-lpc.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/aspeed-lpc.txt | 41 ++++++++ + drivers/mfd/Makefile | 1 - + drivers/mfd/ab8500-debugfs.c | 3 +- + drivers/mfd/abx500-core.c | 25 +++-- + 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/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/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 +--- + 32 files changed, 244 insertions(+), 332 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 (ba11349b2a57 dt-bindings: backlight: Add binding for RAVE SP backlight driver) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + .../leds/backlight/zii,rave-sp-backlight.txt | 23 ++++++ + drivers/video/backlight/Kconfig | 6 ++ + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/rave-sp-backlight.c | 82 ++++++++++++++++++++++ + include/linux/mfd/rave-sp.h | 1 + + 5 files changed, 113 insertions(+) + 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 +Merge made by the 'recursive' strategy. + .../bindings/power/reset/gpio-poweroff.txt | 3 + + .../bindings/power/reset/ocelot-reset.txt | 14 ++ + .../bindings/power/supply/axp20x_battery.txt | 8 +- + arch/arm/boot/dts/omap3-n900.dts | 1 + + drivers/power/reset/Kconfig | 16 ++ + drivers/power/reset/Makefile | 2 + + drivers/power/reset/at91-poweroff.c | 14 +- + drivers/power/reset/at91-reset.c | 4 +- + drivers/power/reset/gemini-poweroff.c | 30 ++-- + drivers/power/reset/gpio-poweroff.c | 8 +- + drivers/power/reset/ocelot-reset.c | 88 ++++++++++ + drivers/power/reset/sc27xx-poweroff.c | 66 ++++++++ + drivers/power/supply/axp20x_battery.c | 136 ++++++++++++---- + drivers/power/supply/axp288_fuel_gauge.c | 53 ++++-- + drivers/power/supply/bq2415x_charger.c | 5 +- + drivers/power/supply/bq27xxx_battery.c | 2 +- + drivers/power/supply/da9150-fg.c | 4 +- + drivers/power/supply/gpio-charger.c | 179 ++++++++------------- + drivers/power/supply/ltc2941-battery-gauge.c | 67 ++++++-- + drivers/power/supply/max17042_battery.c | 1 + + 20 files changed, 500 insertions(+), 201 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/reset/ocelot-reset.txt + create mode 100644 drivers/power/reset/ocelot-reset.c + create mode 100644 drivers/power/reset/sc27xx-poweroff.c +Merging regulator/for-next (4a95adc00584 Merge remote-tracking branches 'regulator/topic/88pg86x', 'regulator/topic/dt' and 'regulator/topic/gpio' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/88pg86x.txt | 22 ++++ + .../bindings/regulator/fixed-regulator.txt | 1 + + .../bindings/regulator/gpio-regulator.txt | 2 + + drivers/regulator/88pg86x.c | 114 +++++++++++++++++++++ + drivers/regulator/Kconfig | 9 ++ + drivers/regulator/Makefile | 1 + + drivers/regulator/core.c | 25 +++-- + drivers/regulator/da9055-regulator.c | 4 +- + drivers/regulator/da9211-regulator.c | 23 ++--- + drivers/regulator/gpio-regulator.c | 17 ++- + drivers/regulator/of_regulator.c | 1 + + drivers/regulator/qcom_smd-regulator.c | 2 - + include/linux/mfd/da9055/pdata.h | 5 +- + include/linux/regulator/da9211.h | 4 +- + include/linux/regulator/driver.h | 3 + + 15 files changed, 196 insertions(+), 37 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/88pg86x.txt + create mode 100644 drivers/regulator/88pg86x.c +Merging security/next-testing (6837ef4d4a99 Merge branch 'next-general' into next-testing) +$ git merge security/next-testing +Auto-merging security/selinux/hooks.c +Auto-merging kernel/signal.c +Auto-merging include/linux/security.h +Auto-merging fs/exec.c +Merge made by the 'recursive' strategy. + drivers/usb/core/devio.c | 10 ++-------- + fs/exec.c | 6 +++--- + include/linux/lsm_hooks.h | 5 +++-- + include/linux/sched/signal.h | 2 +- + include/linux/security.h | 4 ++-- + kernel/signal.c | 6 +++--- + security/apparmor/lsm.c | 17 ++++++++++++----- + security/security.c | 4 ++-- + security/selinux/hooks.c | 7 +++++-- + security/smack/smack_lsm.c | 12 +++++------- + 10 files changed, 38 insertions(+), 35 deletions(-) +Merging apparmor/apparmor-next (e540c3c90193 apparmor: update MAINTAINERS file git and wiki locations) +$ 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 | 75 ++-- + 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, 2022 insertions(+), 494 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 (638872e2ad9e evm: check for remount ro in progress before writing) +$ git merge integrity/next-integrity +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/integrity/ima/ima_policy.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 ++- + fs/fuse/inode.c | 3 ++ + include/linux/fs.h | 2 + + include/linux/lsm_hooks.h | 6 +++ + include/linux/security.h | 1 + + 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_main.c | 56 ++++++++++++++++----- + security/integrity/ima/ima_policy.c | 30 ++++++++---- + security/integrity/ima/ima_template_lib.c | 11 ++--- + security/integrity/integrity.h | 11 +++-- + security/security.c | 7 +++ + security/selinux/hooks.c | 6 +++ + security/smack/smack_lsm.c | 18 +++++++ + 21 files changed, 210 insertions(+), 70 deletions(-) +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 '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 +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fca01acbfca5] 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 (ea8d6a89c380 tpm2: add longer timeouts for creation commands.) +$ git merge tpmdd/next +Auto-merging drivers/char/tpm/tpm_tis_core.c +Auto-merging drivers/char/tpm/tpm2-cmd.c +Auto-merging drivers/char/tpm/tpm-interface.c +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm-interface.c | 76 +++++++++++++----- + drivers/char/tpm/tpm.h | 30 +++++--- + drivers/char/tpm/tpm2-cmd.c | 8 +- + drivers/char/tpm/tpm_crb.c | 162 +++++++++++++++++++++++---------------- + drivers/char/tpm/tpm_tis_core.c | 4 +- + include/linux/tpm.h | 4 +- + 6 files changed, 185 insertions(+), 99 deletions(-) +Merging watchdog/master (2e8ebed6ede0 Merge branch 'v4.16-fixes') +$ git merge watchdog/master +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 + + .../devicetree/bindings/watchdog/sirfsoc_wdt.txt | 4 + + .../devicetree/bindings/watchdog/sunxi-wdt.txt | 4 + + drivers/watchdog/Kconfig | 1 + + drivers/watchdog/asm9260_wdt.c | 8 +- + drivers/watchdog/aspeed_wdt.c | 9 +- + drivers/watchdog/coh901327_wdt.c | 18 +- + drivers/watchdog/dw_wdt.c | 32 ++- + 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/meson_wdt.c | 2 +- + drivers/watchdog/mtk_wdt.c | 2 +- + 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/sunxi_wdt.c | 2 +- + drivers/watchdog/uniphier_wdt.c | 5 +- + 25 files changed, 288 insertions(+), 242 deletions(-) +Merging iommu/next (5388d81be69c Merge branches 'x86/amd', 'x86/vt-d', 'arm/rockchip', 'arm/omap', 'arm/mediatek', 'arm/exynos', 'arm/renesas' and 'core' into next) +$ git merge iommu/next +Auto-merging drivers/acpi/arm64/iort.c +Merge made by the 'recursive' strategy. + .../bindings/iommu/renesas,ipmmu-vmsa.txt | 5 +- + drivers/acpi/arm64/iort.c | 111 +++++++++++++++- + drivers/iommu/amd_iommu.c | 139 ++++++++++++--------- + drivers/iommu/amd_iommu_init.c | 2 +- + drivers/iommu/amd_iommu_types.h | 4 +- + drivers/iommu/dma-iommu.c | 8 +- + drivers/iommu/dmar.c | 2 +- + drivers/iommu/exynos-iommu.c | 13 +- + drivers/iommu/intel-svm.c | 17 ++- + drivers/iommu/io-pgtable-arm-v7s.c | 21 ++-- + drivers/iommu/io-pgtable-arm.c | 24 ++-- + 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 | 18 +++ + 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 +-- + 22 files changed, 314 insertions(+), 168 deletions(-) +Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) +$ git merge dwmw2-iommu/master +Already up to date. +Merging vfio/next (46ed90f157f4 vfio: mdev: make a couple of functions and structure vfio_mdev_driver static) +$ git merge vfio/next +Already up to date. +Merging trivial/for-next (1972d6c0c86d MAINTAINERS: relinquish kconfig) +$ 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 +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 scripts/Makefile.lib +Auto-merging drivers/gpio/gpiolib-of.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 4 +- + .../devicetree/bindings/trivial-devices.txt | 12 + + Documentation/devicetree/overlay-notes.txt | 4 +- + MAINTAINERS | 4 + + arch/arm/boot/compressed/string.c | 10 + + arch/arm64/kernel/image.h | 1 + + arch/arm64/lib/strrchr.S | 2 +- + arch/powerpc/boot/stdio.c | 10 + + arch/powerpc/boot/string.h | 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/tests-phandle.dtsi | 25 + + drivers/of/unittest.c | 304 ++- + include/linux/libfdt_env.h | 6 +- + include/linux/of.h | 12 + + scripts/Makefile.lib | 9 +- + scripts/dtc/Makefile | 6 +- + 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 +- + 45 files changed, 1213 insertions(+), 5169 deletions(-) + 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 +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 (357982f0ad1d Merge remote-tracking branches 'spi/topic/sprd' and 'spi/topic/tegra20-slink' into spi-next) +$ git merge spi/for-next +Resolved 'drivers/spi/Kconfig' using previous resolution. +Auto-merging drivers/spi/Kconfig +CONFLICT (content): Merge conflict in drivers/spi/Kconfig +Auto-merging arch/arm/mach-pxa/raumfeld.c +Auto-merging arch/arm/mach-pxa/cm-x300.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 92ae77265d6a] Merge remote-tracking branch 'spi/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/spi/spi-gpio.txt | 24 +- + arch/arm/mach-pxa/cm-x300.c | 21 +- + arch/arm/mach-pxa/raumfeld.c | 26 +- + arch/arm/mach-s3c24xx/mach-jive.c | 55 +++-- + arch/arm/mach-s3c24xx/mach-qt2410.c | 26 +- + arch/arm/mach-s3c64xx/mach-smartq.c | 22 +- + arch/mips/alchemy/devboards/db1000.c | 24 +- + arch/mips/jz4740/board-qi_lb60.c | 26 +- + drivers/misc/eeprom/digsy_mtc_eeprom.c | 29 ++- + drivers/spi/spi-atmel.c | 8 +- + drivers/spi/spi-bcm-qspi.c | 4 +- + drivers/spi/spi-bcm2835aux.c | 18 +- + drivers/spi/spi-dw-mid.c | 6 +- + drivers/spi/spi-dw.c | 26 +- + drivers/spi/spi-dw.h | 4 +- + drivers/spi/spi-gpio.c | 270 +++++++-------------- + drivers/spi/spi-jcore.c | 11 +- + drivers/spi/spi-orion.c | 65 ++++- + drivers/spi/spi-pxa2xx-dma.c | 4 +- + drivers/spi/spi-pxa2xx.c | 56 +++-- + drivers/spi/spi-pxa2xx.h | 2 +- + drivers/spi/spi-rspi.c | 4 +- + drivers/spi/spi-sh-msiof.c | 4 +- + drivers/spi/spi-sprd-adi.c | 176 +++++++++++--- + drivers/spi/spi-tegra20-slink.c | 4 +- + drivers/spi/spi.c | 19 +- + include/linux/spi/spi_gpio.h | 49 +--- + 27 files changed, 571 insertions(+), 412 deletions(-) +Merging tip/auto-latest (a1b85ae11ccf Merge branch 'x86/timers') +$ git merge tip/auto-latest +Resolved 'drivers/bus/arm-cci.c' using previous resolution. +Auto-merging tools/perf/tests/shell/record+probe_libc_inet_pton.sh +Auto-merging kernel/workqueue.c +Removing kernel/sched/idle_task.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/events/core.c +Auto-merging include/linux/timekeeping.h +Auto-merging include/linux/efi.h +Auto-merging drivers/perf/arm-ccn.c +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/bus/arm-cci.c +CONFLICT (content): Merge conflict in drivers/bus/arm-cci.c +Auto-merging drivers/acpi/sleep.c +Auto-merging drivers/acpi/osl.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/machine_kexec_64.c +Auto-merging arch/x86/kernel/devicetree.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +CONFLICT (modify/delete): Documentation/trace/ftrace.txt deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of Documentation/trace/ftrace.txt left in tree. +Auto-merging Documentation/admin-guide/kernel-parameters.txt +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 2936e95ffa4f] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-kernel-irq | 7 + + Documentation/admin-guide/kernel-parameters.txt | 20 + + Documentation/devicetree/bindings/jailhouse.txt | 8 + + Documentation/features/list-arch.sh | 2 +- + Documentation/locking/lockdep-design.txt | 51 +- + Documentation/memory-barriers.txt | 34 +- + Documentation/timers/NO_HZ.txt | 7 - + Documentation/trace/coresight.txt | 51 + + Documentation/x86/x86_64/5level-paging.txt | 9 +- + MAINTAINERS | 25 + + arch/alpha/include/asm/cmpxchg.h | 20 +- + arch/alpha/include/asm/xchg.h | 27 - + arch/alpha/kernel/perf_event.c | 2 +- + arch/arm/Kconfig | 19 +- + arch/arm/include/asm/irq.h | 5 - + arch/arm/include/asm/mach/arch.h | 2 +- + arch/arm/kernel/entry-armv.S | 10 +- + arch/arm/kernel/irq.c | 10 - + arch/arm/kernel/setup.c | 2 +- + arch/arm/mach-imx/mmdc.c | 2 +- + arch/arm/mm/cache-l2x0-pmu.c | 2 +- + arch/arm64/include/asm/efi.h | 4 +- + arch/arm64/kernel/Makefile | 3 +- + arch/arm64/kernel/efi-rt-wrapper.S | 41 + + arch/arm64/kernel/efi.c | 6 + + arch/mips/kernel/perf_event_mipsxx.c | 2 +- + arch/powerpc/perf/core-book3s.c | 2 +- + arch/powerpc/perf/core-fsl-emb.c | 2 +- + arch/riscv/Kconfig | 1 + + arch/riscv/include/asm/Kbuild | 1 + + arch/riscv/kernel/entry.S | 7 +- + arch/riscv/kernel/irq.c | 13 - + arch/sparc/kernel/perf_event.c | 2 +- + arch/x86/Kconfig | 25 +- + arch/x86/boot/compressed/Makefile | 2 +- + arch/x86/boot/compressed/eboot.c | 3 +- + arch/x86/boot/compressed/head_64.S | 168 +- + arch/x86/boot/compressed/kaslr.c | 14 + + .../boot/compressed/{pagetable.c => kaslr_64.c} | 0 + arch/x86/boot/compressed/misc.c | 22 +- + arch/x86/boot/compressed/misc.h | 5 + + arch/x86/boot/compressed/pgtable.h | 20 + + arch/x86/boot/compressed/pgtable_64.c | 148 +- + arch/x86/entry/entry_64.S | 5 + + arch/x86/events/core.c | 22 +- + arch/x86/events/intel/core.c | 21 +- + arch/x86/events/intel/ds.c | 101 +- + arch/x86/events/intel/uncore.c | 2 +- + arch/x86/events/perf_event.h | 5 +- + arch/x86/include/asm/acpi.h | 11 + + arch/x86/include/asm/apic.h | 2 +- + arch/x86/include/asm/atomic.h | 106 +- + arch/x86/include/asm/atomic64_32.h | 106 +- + arch/x86/include/asm/atomic64_64.h | 108 +- + arch/x86/include/asm/cmpxchg.h | 12 +- + arch/x86/include/asm/cmpxchg_32.h | 8 +- + arch/x86/include/asm/cmpxchg_64.h | 4 +- + arch/x86/include/asm/efi.h | 26 +- + arch/x86/include/asm/intel_pconfig.h | 65 + + arch/x86/include/asm/io_apic.h | 10 +- + arch/x86/include/asm/jailhouse_para.h | 2 +- + arch/x86/include/asm/kaslr.h | 4 - + arch/x86/include/asm/mce.h | 53 +- + arch/x86/include/asm/mem_encrypt.h | 1 + + arch/x86/include/asm/microcode.h | 14 - + arch/x86/include/asm/msr.h | 14 + + arch/x86/include/asm/page_64.h | 6 +- + arch/x86/include/asm/page_64_types.h | 20 +- + arch/x86/include/asm/paravirt.h | 21 +- + arch/x86/include/asm/pci_x86.h | 2 + + arch/x86/include/asm/pgalloc.h | 5 +- + arch/x86/include/asm/pgtable-3level_types.h | 1 + + arch/x86/include/asm/pgtable.h | 11 +- + arch/x86/include/asm/pgtable_32.h | 2 + + arch/x86/include/asm/pgtable_32_types.h | 2 + + arch/x86/include/asm/pgtable_64.h | 23 +- + arch/x86/include/asm/pgtable_64_types.h | 70 +- + arch/x86/include/asm/required-features.h | 8 +- + arch/x86/include/asm/smp.h | 10 - + arch/x86/include/asm/sparsemem.h | 9 +- + arch/x86/include/asm/stacktrace.h | 2 - + arch/x86/include/asm/tsc.h | 1 + + arch/x86/include/asm/x86_init.h | 19 +- + arch/x86/include/uapi/asm/mce.h | 52 +- + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/acpi/boot.c | 22 +- + arch/x86/kernel/apic/apic.c | 111 +- + arch/x86/kernel/apic/io_apic.c | 16 +- + arch/x86/kernel/apic/x2apic_phys.c | 2 +- + arch/x86/kernel/cpu/Makefile | 2 +- + arch/x86/kernel/cpu/amd.c | 2 +- + arch/x86/kernel/cpu/cpuid-deps.c | 2 +- + arch/x86/kernel/cpu/intel.c | 90 + + arch/x86/kernel/cpu/intel_pconfig.c | 82 + + arch/x86/kernel/cpu/mcheck/mce-internal.h | 59 +- + arch/x86/kernel/cpu/mcheck/mce.c | 52 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 78 +- + arch/x86/kernel/crash.c | 3 +- + arch/x86/kernel/devicetree.c | 21 +- + arch/x86/kernel/dumpstack.c | 49 +- + arch/x86/kernel/dumpstack_32.c | 42 - + arch/x86/kernel/dumpstack_64.c | 42 - + arch/x86/kernel/e820.c | 18 + + arch/x86/kernel/head64.c | 81 +- + arch/x86/kernel/head_64.S | 22 +- + arch/x86/kernel/irqinit.c | 9 +- + arch/x86/kernel/jailhouse.c | 8 + + arch/x86/kernel/machine_kexec_32.c | 8 +- + arch/x86/kernel/machine_kexec_64.c | 9 +- + arch/x86/kernel/reboot.c | 3 +- + arch/x86/kernel/rtc.c | 6 +- + arch/x86/kernel/setup.c | 5 +- + arch/x86/kernel/tsc.c | 39 + + arch/x86/kernel/vmlinux.lds.S | 7 +- + arch/x86/kernel/x86_init.c | 21 +- + arch/x86/kvm/svm.c | 1 - + arch/x86/kvm/vmx.c | 1 - + arch/x86/lib/clear_page_64.S | 2 - + arch/x86/mm/Makefile | 15 +- + arch/x86/mm/debug_pagetables.c | 32 + + arch/x86/mm/dump_pagetables.c | 125 +- + arch/x86/mm/fault.c | 61 +- + arch/x86/mm/ident_map.c | 2 +- + arch/x86/mm/init_64.c | 32 +- + arch/x86/mm/kasan_init_64.c | 20 +- + arch/x86/mm/kaslr.c | 29 +- + arch/x86/mm/mem_encrypt.c | 578 +----- + arch/x86/mm/mem_encrypt_identity.c | 564 ++++++ + arch/x86/mm/tlb.c | 4 +- + arch/x86/pci/acpi.c | 8 +- + arch/x86/pci/direct.c | 5 +- + arch/x86/pci/legacy.c | 4 +- + arch/x86/pci/mmconfig-shared.c | 13 +- + arch/x86/platform/atom/punit_atom_debug.c | 17 +- + arch/x86/platform/efi/efi_64.c | 66 +- + arch/x86/platform/efi/efi_thunk_64.S | 2 +- + arch/x86/platform/efi/quirks.c | 10 +- + arch/x86/platform/intel-mid/intel-mid.c | 6 + + arch/x86/platform/intel-quark/imr.c | 24 +- + arch/x86/power/hibernate_64.c | 6 +- + arch/x86/xen/Kconfig | 5 - + arch/x86/xen/apic.c | 2 +- + arch/x86/xen/enlighten_pvh.c | 14 +- + arch/x86/xen/mmu_pv.c | 21 + + drivers/acpi/osl.c | 5 +- + drivers/acpi/sleep.c | 4 +- + drivers/edac/mce_amd.c | 11 +- + drivers/firmware/efi/apple-properties.c | 20 +- + drivers/firmware/efi/arm-runtime.c | 17 +- + drivers/firmware/efi/efi.c | 11 +- + drivers/firmware/efi/esrt.c | 17 +- + drivers/firmware/efi/libstub/Makefile | 2 +- + drivers/firmware/efi/libstub/secureboot.c | 12 +- + drivers/firmware/efi/libstub/tpm.c | 7 +- + drivers/input/evdev.c | 7 +- + drivers/iommu/irq_remapping.c | 4 +- + drivers/pci/pci.c | 6 +- + drivers/pci/probe.c | 22 +- + drivers/perf/arm-ccn.c | 4 +- + drivers/perf/arm_dsu_pmu.c | 2 +- + drivers/perf/arm_pmu.c | 2 +- + drivers/perf/hisilicon/hisi_uncore_pmu.c | 3 +- + drivers/perf/qcom_l2_pmu.c | 7 +- + drivers/perf/qcom_l3_pmu.c | 2 +- + drivers/perf/xgene_pmu.c | 4 +- + include/asm-generic/5level-fixup.h | 1 + + include/asm-generic/atomic-instrumented.h | 476 +++++ + include/asm-generic/pgtable-nop4d.h | 9 +- + include/linux/acpi.h | 7 + + include/linux/dmi.h | 9 + + include/linux/efi.h | 2 + + include/linux/hrtimer.h | 2 - + include/linux/hw_breakpoint.h | 7 + + include/linux/hypervisor.h | 17 +- + include/linux/interrupt.h | 2 - + include/linux/irq.h | 23 +- + include/linux/kasan.h | 2 +- + include/linux/mutex.h | 1 - + include/linux/perf_event.h | 30 +- + include/linux/rcupdate.h | 10 +- + include/linux/sched.h | 1 - + include/linux/sched/cpufreq.h | 5 +- + include/linux/sched/deadline.h | 6 - + include/linux/sched/isolation.h | 1 + + include/linux/sched/nohz.h | 6 - + include/linux/tick.h | 4 +- + include/linux/timekeeper_internal.h | 4 + + include/linux/timekeeping.h | 37 +- + include/linux/trace_events.h | 8 + + include/linux/types.h | 2 +- + include/trace/events/rcu.h | 4 + + include/uapi/linux/perf_event.h | 27 +- + include/uapi/linux/time.h | 1 + + kernel/cpu.c | 60 +- + kernel/events/core.c | 753 ++++++-- + kernel/events/hw_breakpoint.c | 115 +- + kernel/irq/Kconfig | 5 + + kernel/irq/handle.c | 15 + + kernel/irq/irq_sim.c | 13 +- + kernel/irq/irqdesc.c | 17 + + kernel/irq/manage.c | 10 +- + kernel/locking/lockdep.c | 24 +- + kernel/panic.c | 2 +- + kernel/rcu/rcu.h | 38 +- + kernel/rcu/rcuperf.c | 21 +- + kernel/rcu/rcutorture.c | 72 +- + kernel/rcu/srcutree.c | 29 +- + kernel/rcu/tree.c | 72 +- + kernel/rcu/tree.h | 36 +- + kernel/rcu/tree_exp.h | 36 +- + kernel/rcu/tree_plugin.h | 34 +- + kernel/sched/Makefile | 5 +- + kernel/sched/autogroup.c | 21 +- + kernel/sched/autogroup.h | 12 +- + kernel/sched/clock.c | 36 +- + kernel/sched/completion.c | 11 +- + kernel/sched/core.c | 174 +- + kernel/sched/cpuacct.c | 33 +- + kernel/sched/cpudeadline.c | 23 +- + kernel/sched/cpudeadline.h | 29 +- + kernel/sched/cpufreq.c | 1 - + kernel/sched/cpufreq_schedutil.c | 207 ++- + kernel/sched/cpupri.c | 15 +- + kernel/sched/cpupri.h | 25 +- + kernel/sched/cputime.c | 58 +- + kernel/sched/deadline.c | 82 +- + kernel/sched/debug.c | 99 +- + kernel/sched/fair.c | 1215 ++++++++----- + kernel/sched/idle.c | 142 +- + kernel/sched/idle_task.c | 110 -- + kernel/sched/isolation.c | 14 +- + kernel/sched/loadavg.c | 34 +- + kernel/sched/membarrier.c | 27 +- + kernel/sched/rt.c | 60 +- + kernel/sched/sched.h | 641 +++---- + kernel/sched/stats.c | 20 +- + kernel/sched/stats.h | 86 +- + kernel/sched/stop_task.c | 11 +- + kernel/sched/swait.c | 6 +- + kernel/sched/topology.c | 46 +- + kernel/sched/wait.c | 13 +- + kernel/sched/wait_bit.c | 23 +- + kernel/softirq.c | 82 +- + kernel/time/Kconfig | 10 - + kernel/time/clocksource.c | 66 +- + kernel/time/hrtimer.c | 16 +- + kernel/time/posix-stubs.c | 2 + + kernel/time/posix-timers.c | 26 +- + kernel/time/tick-common.c | 15 + + kernel/time/tick-internal.h | 6 + + kernel/time/tick-sched.c | 53 +- + kernel/time/timekeeping.c | 219 +-- + kernel/time/timekeeping.h | 1 - + kernel/trace/trace.c | 2 +- + kernel/trace/trace_event_perf.c | 102 ++ + kernel/trace/trace_kprobe.c | 91 +- + kernel/trace/trace_probe.h | 11 + + kernel/trace/trace_uprobe.c | 86 +- + kernel/workqueue.c | 3 +- + lib/debugobjects.c | 141 +- + mm/kasan/kasan_init.c | 2 +- + mm/zsmalloc.c | 13 +- + tools/arch/powerpc/include/uapi/asm/unistd.h | 402 +++++ + tools/build/Makefile.feature | 6 +- + tools/build/feature/Makefile | 14 +- + tools/include/linux/bitmap.h | 2 +- + tools/include/uapi/linux/perf_event.h | 27 +- + tools/lib/api/fs/fs.c | 44 +- + tools/lib/api/fs/fs.h | 2 + + tools/lib/symbol/kallsyms.c | 4 + + tools/memory-model/Documentation/cheatsheet.txt | 29 + + tools/memory-model/Documentation/explanation.txt | 1845 ++++++++++++++++++++ + tools/memory-model/Documentation/recipes.txt | 570 ++++++ + tools/memory-model/Documentation/references.txt | 107 ++ + tools/memory-model/README | 206 +++ + tools/memory-model/linux-kernel.bell | 52 + + tools/memory-model/linux-kernel.cat | 121 ++ + tools/memory-model/linux-kernel.cfg | 21 + + tools/memory-model/linux-kernel.def | 106 ++ + .../litmus-tests/CoRR+poonceonce+Once.litmus | 26 + + .../litmus-tests/CoRW+poonceonce+Once.litmus | 25 + + .../litmus-tests/CoWR+poonceonce+Once.litmus | 25 + + .../litmus-tests/CoWW+poonceonce.litmus | 18 + + .../litmus-tests/IRIW+mbonceonces+OnceOnce.litmus | 45 + + .../litmus-tests/IRIW+poonceonces+OnceOnce.litmus | 43 + + .../ISA2+pooncelock+pooncelock+pombonce.litmus | 41 + + .../litmus-tests/ISA2+poonceonces.litmus | 37 + + ...cerelease+poacquirerelease+poacquireonce.litmus | 39 + + .../litmus-tests/LB+ctrlonceonce+mbonceonce.litmus | 34 + + .../LB+poacquireonce+pooncerelease.litmus | 29 + + .../litmus-tests/LB+poonceonces.litmus | 28 + + .../litmus-tests/MP+onceassign+derefonce.litmus | 34 + + tools/memory-model/litmus-tests/MP+polocks.litmus | 35 + + .../litmus-tests/MP+poonceonces.litmus | 27 + + .../MP+pooncerelease+poacquireonce.litmus | 28 + + .../memory-model/litmus-tests/MP+porevlocks.litmus | 35 + + .../litmus-tests/MP+wmbonceonce+rmbonceonce.litmus | 30 + + .../memory-model/litmus-tests/R+mbonceonces.litmus | 30 + + .../memory-model/litmus-tests/R+poonceonces.litmus | 27 + + tools/memory-model/litmus-tests/README | 131 ++ + .../memory-model/litmus-tests/S+poonceonces.litmus | 28 + + .../S+wmbonceonce+poacquireonce.litmus | 27 + + .../litmus-tests/SB+mbonceonces.litmus | 32 + + .../litmus-tests/SB+poonceonces.litmus | 29 + + .../litmus-tests/WRC+poonceonces+Once.litmus | 35 + + .../WRC+pooncerelease+rmbonceonce+Once.litmus | 36 + + .../Z6.0+pooncelock+poonceLock+pombonce.litmus | 42 + + .../Z6.0+pooncelock+pooncelock+pombonce.litmus | 40 + + ...ooncerelease+poacquirerelease+mbonceonce.litmus | 42 + + tools/memory-model/lock.cat | 99 ++ + tools/perf/Documentation/perf-annotate.txt | 6 +- + tools/perf/Documentation/perf-data.txt | 2 +- + tools/perf/Documentation/perf-ftrace.txt | 2 +- + tools/perf/Documentation/perf-kallsyms.txt | 2 +- + tools/perf/Documentation/perf-kmem.txt | 6 +- + tools/perf/Documentation/perf-list.txt | 8 +- + tools/perf/Documentation/perf-mem.txt | 4 + + tools/perf/Documentation/perf-record.txt | 15 +- + tools/perf/Documentation/perf-report.txt | 5 +- + tools/perf/Documentation/perf-sched.txt | 2 +- + tools/perf/Documentation/perf-script-perl.txt | 2 +- + tools/perf/Documentation/perf-script.txt | 3 + + tools/perf/Documentation/perf-stat.txt | 33 +- + tools/perf/Documentation/perf-top.txt | 4 +- + tools/perf/Documentation/perf-trace.txt | 25 + + tools/perf/Documentation/perf.data-file-format.txt | 7 +- + tools/perf/Makefile.config | 25 +- + tools/perf/Makefile.perf | 10 +- + tools/perf/arch/arm/util/auxtrace.c | 2 +- + tools/perf/arch/arm/util/cs-etm.c | 51 +- + tools/perf/arch/powerpc/Makefile | 25 + + .../perf/arch/powerpc/entry/syscalls/mksyscalltbl | 37 + + tools/perf/arch/s390/annotate/instructions.c | 143 +- + tools/perf/arch/s390/util/header.c | 148 +- + tools/perf/arch/x86/tests/perf-time-to-tsc.c | 10 +- + tools/perf/arch/x86/util/auxtrace.c | 14 +- + tools/perf/builtin-annotate.c | 88 +- + tools/perf/builtin-c2c.c | 24 +- + tools/perf/builtin-ftrace.c | 18 +- + tools/perf/builtin-kvm.c | 16 +- + tools/perf/builtin-record.c | 56 +- + tools/perf/builtin-report.c | 31 +- + tools/perf/builtin-sched.c | 133 +- + tools/perf/builtin-script.c | 17 + + tools/perf/builtin-stat.c | 107 +- + tools/perf/builtin-top.c | 11 +- + tools/perf/builtin-trace.c | 60 +- + tools/perf/check-headers.sh | 1 + + tools/perf/perf.h | 3 + + tools/perf/python/twatch.py | 8 +- + .../perf/scripts/python/Perf-Trace-Util/Context.c | 34 +- + tools/perf/tests/Build | 1 + + tools/perf/tests/backward-ring-buffer.c | 5 +- + tools/perf/tests/bp_account.c | 195 +++ + tools/perf/tests/bpf.c | 8 +- + tools/perf/tests/builtin-test.c | 4 + + tools/perf/tests/code-reading.c | 43 +- + tools/perf/tests/dwarf-unwind.c | 46 +- + tools/perf/tests/keep-tracking.c | 9 +- + tools/perf/tests/mmap-basic.c | 11 +- + tools/perf/tests/openat-syscall-tp-fields.c | 10 +- + tools/perf/tests/perf-record.c | 10 +- + tools/perf/tests/shell/lib/probe_vfs_getname.sh | 2 +- + ...inet_pton.sh => record+probe_libc_inet_pton.sh} | 30 +- + tools/perf/tests/sw-clock.c | 11 +- + tools/perf/tests/switch-tracking.c | 10 +- + tools/perf/tests/task-exit.c | 11 +- + tools/perf/tests/tests.h | 1 + + tools/perf/tests/vmlinux-kallsyms.c | 4 +- + tools/perf/ui/browsers/annotate.c | 26 +- + tools/perf/ui/browsers/hists.c | 11 +- + tools/perf/util/annotate.c | 40 +- + tools/perf/util/annotate.h | 1 + + tools/perf/util/auxtrace.c | 37 +- + tools/perf/util/auxtrace.h | 2 + + tools/perf/util/build-id.c | 10 +- + tools/perf/util/cgroup.c | 126 +- + tools/perf/util/cgroup.h | 13 +- + tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 74 +- + tools/perf/util/cs-etm-decoder/cs-etm-decoder.h | 2 + + tools/perf/util/cs-etm.c | 478 ++++- + tools/perf/util/env.h | 9 + + tools/perf/util/event.c | 16 +- + tools/perf/util/evlist.c | 54 +- + tools/perf/util/evlist.h | 4 - + tools/perf/util/evsel.c | 26 +- + tools/perf/util/evsel.h | 6 +- + tools/perf/util/header.c | 312 +++- + tools/perf/util/header.h | 2 + + tools/perf/util/hist.c | 8 +- + tools/perf/util/hist.h | 1 - + .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 64 +- + .../perf/util/intel-pt-decoder/intel-pt-decoder.h | 2 +- + tools/perf/util/intel-pt.c | 110 +- + tools/perf/util/machine.c | 147 +- + tools/perf/util/machine.h | 6 +- + tools/perf/util/mmap.c | 84 +- + tools/perf/util/mmap.h | 16 +- + tools/perf/util/parse-events.c | 21 +- + tools/perf/util/parse-events.h | 2 +- + tools/perf/util/parse-events.l | 2 +- + tools/perf/util/parse-events.y | 18 +- + tools/perf/util/pmu.c | 47 +- + tools/perf/util/python.c | 106 +- + tools/perf/util/record.c | 43 +- + .../util/scripting-engines/trace-event-python.c | 147 +- + tools/perf/util/setup.py | 6 +- + tools/perf/util/sort.c | 7 +- + tools/perf/util/stat.h | 2 + + tools/perf/util/symbol.c | 35 +- + tools/perf/util/symbol.h | 19 +- + tools/perf/util/syscalltbl.c | 8 + + tools/perf/util/thread.h | 1 - + tools/perf/util/thread_map.c | 5 +- + tools/perf/util/thread_map.h | 3 +- + .../testing/selftests/rcutorture/bin/functions.sh | 17 +- + .../rcutorture/bin/kvm-recheck-rcuperf-ftrace.sh | 11 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 4 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 22 +- + .../selftests/rcutorture/configs/rcu/TASKS03 | 1 - + .../selftests/rcutorture/configs/rcu/TASKS03.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE04 | 1 - + .../selftests/rcutorture/configs/rcu/TREE04.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE07 | 1 - + .../rcutorture/configs/rcuperf/ver_functions.sh | 24 +- + .../selftests/rcutorture/doc/rcu-test-image.txt | 2 +- + 426 files changed, 14374 insertions(+), 5021 deletions(-) + create mode 100644 Documentation/devicetree/bindings/jailhouse.txt + create mode 100644 arch/arm64/kernel/efi-rt-wrapper.S + rename arch/x86/boot/compressed/{pagetable.c => kaslr_64.c} (100%) + create mode 100644 arch/x86/boot/compressed/pgtable.h + create mode 100644 arch/x86/include/asm/intel_pconfig.h + create mode 100644 arch/x86/kernel/cpu/intel_pconfig.c + create mode 100644 arch/x86/mm/mem_encrypt_identity.c + create mode 100644 include/asm-generic/atomic-instrumented.h + delete mode 100644 kernel/sched/idle_task.c + create mode 100644 tools/arch/powerpc/include/uapi/asm/unistd.h + create mode 100644 tools/memory-model/Documentation/cheatsheet.txt + create mode 100644 tools/memory-model/Documentation/explanation.txt + create mode 100644 tools/memory-model/Documentation/recipes.txt + create mode 100644 tools/memory-model/Documentation/references.txt + create mode 100644 tools/memory-model/README + create mode 100644 tools/memory-model/linux-kernel.bell + create mode 100644 tools/memory-model/linux-kernel.cat + create mode 100644 tools/memory-model/linux-kernel.cfg + create mode 100644 tools/memory-model/linux-kernel.def + create mode 100644 tools/memory-model/litmus-tests/CoRR+poonceonce+Once.litmus + create mode 100644 tools/memory-model/litmus-tests/CoRW+poonceonce+Once.litmus + create mode 100644 tools/memory-model/litmus-tests/CoWR+poonceonce+Once.litmus + create mode 100644 tools/memory-model/litmus-tests/CoWW+poonceonce.litmus + create mode 100644 tools/memory-model/litmus-tests/IRIW+mbonceonces+OnceOnce.litmus + create mode 100644 tools/memory-model/litmus-tests/IRIW+poonceonces+OnceOnce.litmus + create mode 100644 tools/memory-model/litmus-tests/ISA2+pooncelock+pooncelock+pombonce.litmus + create mode 100644 tools/memory-model/litmus-tests/ISA2+poonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/ISA2+pooncerelease+poacquirerelease+poacquireonce.litmus + create mode 100644 tools/memory-model/litmus-tests/LB+ctrlonceonce+mbonceonce.litmus + create mode 100644 tools/memory-model/litmus-tests/LB+poacquireonce+pooncerelease.litmus + create mode 100644 tools/memory-model/litmus-tests/LB+poonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+onceassign+derefonce.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+polocks.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+poonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+pooncerelease+poacquireonce.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+porevlocks.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+wmbonceonce+rmbonceonce.litmus + create mode 100644 tools/memory-model/litmus-tests/R+mbonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/R+poonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/README + create mode 100644 tools/memory-model/litmus-tests/S+poonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/S+wmbonceonce+poacquireonce.litmus + create mode 100644 tools/memory-model/litmus-tests/SB+mbonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/SB+poonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/WRC+poonceonces+Once.litmus + create mode 100644 tools/memory-model/litmus-tests/WRC+pooncerelease+rmbonceonce+Once.litmus + create mode 100644 tools/memory-model/litmus-tests/Z6.0+pooncelock+poonceLock+pombonce.litmus + create mode 100644 tools/memory-model/litmus-tests/Z6.0+pooncelock+pooncelock+pombonce.litmus + create mode 100644 tools/memory-model/litmus-tests/Z6.0+pooncerelease+poacquirerelease+mbonceonce.litmus + create mode 100644 tools/memory-model/lock.cat + create mode 100755 tools/perf/arch/powerpc/entry/syscalls/mksyscalltbl + create mode 100644 tools/perf/tests/bp_account.c + rename tools/perf/tests/shell/{trace+probe_libc_inet_pton.sh => record+probe_libc_inet_pton.sh} (62%) +$ 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 a247d0038e30] Merge remote-tracking branch 'tip/auto-latest' + Date: Thu Mar 22 14:49:55 2018 +1100 +$ 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 cc08ad032e4d] Merge remote-tracking branch 'tip/auto-latest' + Date: Thu Mar 22 14:49:55 2018 +1100 +$ git am -3 ../patches/0001-trace-doc-merge-fix-for-tracing-Unify-the-boot-and-m.patch +Applying: trace doc: merge fix for "tracing: Unify the "boot" and "mono" tracing clocks" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/trace/ftrace.rst +$ git add -A . +$ git commit -v -a --amend +[master 3fa5b6ca2484] Merge remote-tracking branch 'tip/auto-latest' + Date: Thu Mar 22 14:49:55 2018 +1100 +Merging clockevents/clockevents/next (135643b1d63d clocksource/drivers/npcm: Add NPCM7xx timer driver) +$ git merge clockevents/clockevents/next +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/timer/nuvoton,npcm7xx-timer.txt | 21 ++ + drivers/clocksource/Kconfig | 8 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/timer-npcm7xx.c | 215 +++++++++++++++++++++ + 4 files changed, 245 insertions(+) + create mode 100644 Documentation/devicetree/bindings/timer/nuvoton,npcm7xx-timer.txt + create mode 100644 drivers/clocksource/timer-npcm7xx.c +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 +Auto-merging include/linux/dmi.h +Auto-merging drivers/firmware/dmi_scan.c +Auto-merging drivers/edac/Kconfig +Merge made by the 'recursive' strategy. + drivers/acpi/nfit/core.c | 27 ++++++++++++++++++ + 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/firmware/dmi_scan.c | 31 ++++++++++++++++++++ + include/acpi/nfit.h | 18 ++++++++++++ + include/linux/dmi.h | 2 ++ + include/linux/edac.h | 3 ++ + 10 files changed, 175 insertions(+), 59 deletions(-) + create mode 100644 include/acpi/nfit.h +Merging irqchip/irq/irqchip-next (66569052fe53 irqchip/gic-v3: Don't try to reset AP0Rn) +$ git merge irqchip/irq/irqchip-next +Resolved 'drivers/irqchip/Makefile' using previous resolution. +Auto-merging include/linux/irqchip/arm-gic-v3.h +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Auto-merging drivers/irqchip/Makefile +CONFLICT (content): Merge conflict in drivers/irqchip/Makefile +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 62de9364d87a] Merge remote-tracking branch 'irqchip/irq/irqchip-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 8 + + .../bindings/interrupt-controller/qcom,pdc.txt | 78 ++++++ + arch/arm/include/asm/arch_gicv3.h | 41 ++- + drivers/irqchip/Kconfig | 9 + + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-gic-v3-its.c | 193 ++++++++++--- + drivers/irqchip/irq-gic-v3.c | 43 ++- + drivers/irqchip/irq-gic.c | 22 +- + drivers/irqchip/irq-renesas-intc-irqpin.c | 40 ++- + drivers/irqchip/irq-renesas-irqc.c | 30 +- + drivers/irqchip/qcom-pdc.c | 311 +++++++++++++++++++++ + include/linux/irqchip/arm-gic-v3.h | 3 +- + 12 files changed, 684 insertions(+), 95 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt + create mode 100644 drivers/irqchip/qcom-pdc.c +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 f2096b018877] 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 2a165d699ab6] Merge remote-tracking branch 'ftrace/for-next' + Date: Thu Mar 22 15:07:36 2018 +1100 +Merging rcu/rcu/next (08c5ee913265 softirq: Eliminate unused cond_resched_softirq() macro) +$ git merge rcu/rcu/next +Removing tools/testing/selftests/rcutorture/bin/parse-torture.sh +Auto-merging kernel/softirq.c +Auto-merging kernel/sched/core.c +Auto-merging include/linux/sched.h +Merge made by the 'recursive' strategy. + include/linux/rcupdate.h | 4 +- + include/linux/sched.h | 14 +- + kernel/rcu/rcu.h | 1 + + kernel/rcu/rcuperf.c | 2 +- + kernel/rcu/tree.c | 28 +-- + kernel/rcu/tree.h | 17 +- + kernel/rcu/tree_exp.h | 197 ++++++++++++--------- + kernel/rcu/tree_plugin.h | 59 ++++-- + kernel/rcu/update.c | 2 +- + kernel/sched/core.c | 14 -- + kernel/softirq.c | 3 +- + kernel/torture.c | 2 +- + kernel/trace/trace_benchmark.c | 4 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 55 ++++++ + .../selftests/rcutorture/bin/kvm-recheck.sh | 4 - + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 1 - + .../selftests/rcutorture/bin/parse-console.sh | 115 ++++++++++-- + .../selftests/rcutorture/bin/parse-torture.sh | 105 ----------- + 18 files changed, 354 insertions(+), 273 deletions(-) + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-find-errors.sh + delete mode 100755 tools/testing/selftests/rcutorture/bin/parse-torture.sh +Merging kvm/linux-next (4956aa3b8b59 Merge tag 'kvm-s390-next-4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge kvm/linux-next +Resolved 'drivers/video/Kconfig' using previous resolution. +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/video/Kconfig +CONFLICT (content): Merge conflict in drivers/video/Kconfig +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Auto-merging arch/s390/include/asm/mmu_context.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5f78bb850cc6] Merge remote-tracking branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 3 + + Documentation/virtual/kvm/api.txt | 104 ++++- + Documentation/virtual/kvm/cpuid.txt | 15 +- + arch/mips/include/asm/kvm_para.h | 5 + + arch/powerpc/include/asm/kvm_para.h | 5 + + 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/include/asm/kvm_host.h | 11 +- + arch/x86/include/asm/kvm_para.h | 6 + + arch/x86/include/asm/msr-index.h | 14 + + arch/x86/include/uapi/asm/hyperv.h | 4 + + arch/x86/include/uapi/asm/kvm.h | 19 +- + arch/x86/include/uapi/asm/kvm_para.h | 8 +- + arch/x86/kernel/kvm.c | 12 + + arch/x86/kvm/cpuid.c | 2 +- + arch/x86/kvm/emulate.c | 19 + + arch/x86/kvm/hyperv.c | 173 +++++++- + arch/x86/kvm/hyperv.h | 4 + + arch/x86/kvm/kvm_cache_regs.h | 2 +- + arch/x86/kvm/lapic.c | 10 +- + 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 | 38 +- + arch/x86/kvm/vmx.c | 513 ++++++++++++++---------- + arch/x86/kvm/x86.c | 220 ++++++++-- + arch/x86/kvm/x86.h | 2 + + include/asm-generic/kvm_para.h | 5 + + include/linux/kvm_para.h | 5 + + include/uapi/linux/kvm.h | 21 +- + virt/kvm/kvm_main.c | 36 +- + 41 files changed, 1303 insertions(+), 368 deletions(-) +Merging kvm-arm/next (f9f5dc19509b arm64: KVM: Use SMCCC_ARCH_WORKAROUND_1 for Falkor BP hardening) +$ git merge kvm-arm/next +Removing virt/kvm/arm/hyp/vgic-v2-sr.c +Auto-merging 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 +Merge made by the 'recursive' strategy. + Documentation/arm64/memory.txt | 9 +- + 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 | 4 +- + 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 | 73 +++--- + arch/arm64/kernel/cpu_errata.c | 76 +++--- + 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 | 18 +- + arch/arm64/kvm/hyp/hyp-entry.S | 86 +++---- + arch/arm64/kvm/hyp/switch.c | 388 ++++++++++++++++++------------- + 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 ++++++++++++++++++ + include/kvm/arm_vgic.h | 14 +- + 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-v2.c | 98 +++++--- + virt/kvm/arm/vgic/vgic-v3.c | 12 +- + virt/kvm/arm/vgic/vgic.c | 33 +++ + virt/kvm/arm/vgic/vgic.h | 3 + + 62 files changed, 2272 insertions(+), 1025 deletions(-) + create mode 100644 arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c + create mode 100644 arch/arm64/kvm/va_layout.c + delete mode 100644 virt/kvm/arm/hyp/vgic-v2-sr.c +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 (7928b2cbe55b Linux 4.16-rc1) +$ 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 (4d0f1ce69559 xen/acpi: upload _PSD info for non Dom0 CPUs too) +$ 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 | 24 ++++++++++++++++++++++++ + drivers/xen/xenbus/xenbus_dev_frontend.c | 16 ++++++++++++---- + drivers/xen/xenbus/xenbus_xs.c | 4 +++- + include/acpi/processor.h | 2 ++ + 6 files changed, 50 insertions(+), 15 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. +$ git am -3 ../patches/0001-percpu-include-sched.h-for-cond_resched.patch +Applying: percpu: include sched.h for cond_resched() +Using index info to reconstruct a base tree... +M mm/percpu.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging workqueues/for-next (1aa3798360db Merge branch 'for-4.17' into for-next) +$ git merge workqueues/for-next +Auto-merging kernel/workqueue.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/cgroup-defs.h +Merge made by the 'recursive' strategy. + fs/aio.c | 21 +++++----------- + include/linux/cgroup-defs.h | 2 +- + include/linux/workqueue.h | 23 +++++++++++++++++ + kernel/cgroup/cgroup.c | 21 ++++++---------- + kernel/workqueue.c | 60 ++++++++++++++++++++++++++++++++++++++++++--- + 5 files changed, 93 insertions(+), 34 deletions(-) +Merging drivers-x86/for-next (cc69c88fbeb9 platform/x86: dell-smbios: Resolve dependency error on DCDBAS) +$ git merge drivers-x86/for-next +Resolved 'drivers/platform/x86/Kconfig' using previous resolution. +Auto-merging drivers/platform/x86/wmi.c +Auto-merging drivers/platform/x86/Kconfig +CONFLICT (content): Merge conflict in drivers/platform/x86/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9c9d4c1e0e93] Merge remote-tracking branch 'drivers-x86/for-next' +$ git diff -M --stat --summary HEAD^.. + 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 +Merge made by the 'recursive' strategy. + drivers/hsi/clients/hsi_char.c | 5 ++--- + drivers/hsi/clients/ssi_protocol.c | 12 +++++------- + 2 files changed, 7 insertions(+), 10 deletions(-) +Merging leds/for-next (92d7ec1d71e3 leds: Fix wrong dmi_match on PC Engines APU LEDs) +$ git merge leds/for-next +Auto-merging drivers/ide/ide-disk.c +Auto-merging drivers/ata/libata-core.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/ata/libata-core.c | 2 +- + drivers/ide/ide-disk.c | 2 +- + drivers/leds/Kconfig | 29 ++-- + drivers/leds/Makefile | 1 + + drivers/leds/leds-apu.c | 28 +++- + drivers/leds/leds-mlxreg.c | 281 ++++++++++++++++++++++++++++++++++++ + drivers/leds/trigger/ledtrig-disk.c | 12 +- + include/linux/leds.h | 4 +- + 9 files changed, 342 insertions(+), 18 deletions(-) + create mode 100644 drivers/leds/leds-mlxreg.c +Merging ipmi/for-next (bc48fa1b9d3b ipmi:pci: Blacklist a Realtek "IPMI" device) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-devices-platform-ipmi | 238 +++++++++++ + .../devicetree/bindings/ipmi/aspeed-kcs-bmc.txt | 25 ++ + drivers/char/ipmi/Kconfig | 15 + + drivers/char/ipmi/Makefile | 2 + + drivers/char/ipmi/bt-bmc.c | 6 +- + drivers/char/ipmi/ipmi_bt_sm.c | 22 +- + drivers/char/ipmi/ipmi_devintf.c | 22 +- + drivers/char/ipmi/ipmi_dmi.c | 20 +- + drivers/char/ipmi/ipmi_dmi.h | 2 +- + drivers/char/ipmi/ipmi_kcs_sm.c | 22 +- + drivers/char/ipmi/ipmi_msghandler.c | 22 +- + drivers/char/ipmi/ipmi_powernv.c | 6 +- + drivers/char/ipmi/ipmi_poweroff.c | 25 +- + drivers/char/ipmi/ipmi_si.h | 1 + + drivers/char/ipmi/ipmi_si_hardcode.c | 1 + + drivers/char/ipmi/ipmi_si_hotmod.c | 1 + + drivers/char/ipmi/ipmi_si_intf.c | 192 ++++----- + drivers/char/ipmi/ipmi_si_mem_io.c | 1 + + drivers/char/ipmi/ipmi_si_parisc.c | 1 + + drivers/char/ipmi/ipmi_si_pci.c | 44 +- + drivers/char/ipmi/ipmi_si_platform.c | 155 +------ + drivers/char/ipmi/ipmi_si_port_io.c | 1 + + drivers/char/ipmi/ipmi_si_sm.h | 22 +- + drivers/char/ipmi/ipmi_smic_sm.c | 24 +- + drivers/char/ipmi/ipmi_ssif.c | 111 +---- + drivers/char/ipmi/ipmi_watchdog.c | 22 +- + drivers/char/ipmi/kcs_bmc.c | 467 +++++++++++++++++++++ + drivers/char/ipmi/kcs_bmc.h | 108 +++++ + drivers/char/ipmi/kcs_bmc_aspeed.c | 320 ++++++++++++++ + include/linux/ipmi-fru.h | 3 +- + include/linux/ipmi.h | 21 +- + include/linux/ipmi_smi.h | 21 +- + include/uapi/linux/ipmi.h | 20 - + include/uapi/linux/ipmi_bmc.h | 16 + + include/uapi/linux/ipmi_msgdefs.h | 20 - + 35 files changed, 1326 insertions(+), 673 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-platform-ipmi + create mode 100644 Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt + create mode 100644 drivers/char/ipmi/kcs_bmc.c + create mode 100644 drivers/char/ipmi/kcs_bmc.h + create mode 100644 drivers/char/ipmi/kcs_bmc_aspeed.c + create mode 100644 include/uapi/linux/ipmi_bmc.h +Merging driver-core/driver-core-next (995e8695f65d firmware: ensure the firmware cache is not used on incompatible calls) +$ git merge driver-core/driver-core-next +Auto-merging include/linux/device.h +Auto-merging drivers/base/firmware_loader/main.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../driver-api/firmware/fallback-mechanisms.rst | 2 +- + MAINTAINERS | 2 +- + drivers/base/Makefile | 2 +- + drivers/base/arch_topology.c | 12 +- + drivers/base/cpu.c | 4 +- + drivers/base/firmware_loader/Makefile | 7 + + drivers/base/firmware_loader/fallback.c | 674 +++++++++++++++++ + 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} | 809 ++------------------- + drivers/base/node.c | 4 +- + drivers/base/platform.c | 4 +- + drivers/base/soc.c | 2 + + include/linux/device.h | 1 + + kernel/sysctl.c | 11 + + lib/kobject.c | 39 +- + 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 ++ + 23 files changed, 1326 insertions(+), 891 deletions(-) + 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 100755 tools/testing/selftests/firmware/fw_lib.sh + create mode 100755 tools/testing/selftests/firmware/fw_run_tests.sh +$ git am -3 ../patches/0001-firmware-explicitly-include-vmalloc.h.patch +Applying: firmware: explicitly include vmalloc.h +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/base/firmware_loader/fallback.c +$ git add -A . +$ git commit -v -a --amend +[master bef539f4691d] Merge remote-tracking branch 'driver-core/driver-core-next' + Date: Thu Mar 22 15:55:44 2018 +1100 +Merging usb/usb-next (e3cb7bde9a6a USB: misc: uss720: more vendor/product ID's) +$ git merge usb/usb-next +Auto-merging drivers/usb/musb/musb_debugfs.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 56 ++ + .../bindings/arm/hisilicon/hisilicon.txt | 23 + + .../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/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 + + MAINTAINERS | 2 +- + 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/staging/typec/tcpci.c | 127 +++- + drivers/staging/typec/tcpci.h | 14 + + drivers/usb/chipidea/debug.c | 65 +-- + drivers/usb/chipidea/host.c | 6 +- + drivers/usb/core/Makefile | 2 +- + drivers/usb/core/hcd.c | 64 +- + drivers/usb/core/hub.c | 12 +- + drivers/usb/core/phy.c | 158 +++++ + drivers/usb/core/phy.h | 7 + + drivers/usb/core/quirks.c | 178 +++++- + 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/debugfs.c | 84 +-- + drivers/usb/gadget/udc/bcm63xx_udc.c | 33 +- + 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/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-mem.c | 2 + + drivers/usb/host/xhci-mtk.c | 98 +--- + 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 | 2 + + drivers/usb/isp1760/isp1760-udc.c | 6 +- + drivers/usb/misc/adutux.c | 4 +- + drivers/usb/misc/chaoskey.c | 8 +- + drivers/usb/misc/usbtest.c | 5 +- + drivers/usb/misc/uss720.c | 7 +- + drivers/usb/musb/musb_debugfs.c | 13 +- + drivers/usb/typec/fusb302/fusb302.c | 17 +- + drivers/usb/typec/tcpm.c | 33 +- + drivers/usb/typec/tps6598x.c | 15 +- + drivers/usb/typec/typec.c | 44 +- + drivers/usb/typec/ucsi/ucsi.c | 31 +- + 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 +- + include/linux/phy/phy.h | 31 +- + 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 + + 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 | 18 +- + 120 files changed, 4691 insertions(+), 1324 deletions(-) + 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 + create mode 100644 Documentation/devicetree/bindings/usb/usb-hcd.txt + 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 + create mode 100644 drivers/usb/core/phy.c + create mode 100644 drivers/usb/core/phy.h + create mode 100644 include/linux/usb/pd_ado.h + create mode 100644 include/linux/usb/pd_ext_sdb.h +Merging usb-gadget/next (7642d8386ac7 usb: dwc3: ep0: remove redundant assignment) +$ git merge usb-gadget/next +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/usb/dwc3/core.c +Auto-merging drivers/usb/dwc2/params.c +Auto-merging drivers/usb/dwc2/debugfs.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/amlogic,dwc3.txt | 42 ++ + drivers/usb/dwc2/core.c | 395 ++++++++++++----- + drivers/usb/dwc2/core.h | 136 ++++-- + drivers/usb/dwc2/core_intr.c | 304 +++++++++++-- + drivers/usb/dwc2/debugfs.c | 7 +- + 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/core.c | 64 ++- + drivers/usb/dwc3/core.h | 111 +++++ + drivers/usb/dwc3/debugfs.c | 79 ++-- + drivers/usb/dwc3/drd.c | 489 ++++++++++++++++++++- + drivers/usb/dwc3/dwc3-of-simple.c | 31 +- + drivers/usb/dwc3/ep0.c | 2 +- + drivers/usb/dwc3/gadget.c | 23 +- + drivers/usb/gadget/composite.c | 110 ++--- + drivers/usb/gadget/function/f_fs.c | 6 +- + drivers/usb/gadget/function/f_tcm.c | 2 +- + drivers/usb/gadget/legacy/mass_storage.c | 2 +- + drivers/usb/gadget/udc/atmel_usba_udc.c | 158 ++----- + drivers/usb/gadget/udc/atmel_usba_udc.h | 4 +- + drivers/usb/gadget/udc/bdc/bdc_ep.c | 3 +- + drivers/usb/gadget/udc/core.c | 4 +- + drivers/usb/gadget/udc/dummy_hcd.c | 2 +- + drivers/usb/gadget/udc/goku_udc.h | 2 +- + drivers/usb/phy/phy-ab8500-usb.c | 2 +- + drivers/usb/phy/phy-generic.c | 6 +- + drivers/usb/phy/phy-mxs-usb.c | 2 +- + drivers/usb/phy/phy-tegra-usb.c | 14 +- + include/linux/usb/composite.h | 3 + + 34 files changed, 2305 insertions(+), 780 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/amlogic,dwc3.txt +Merging usb-serial/usb-next (9b284d8e648b USB: serial: option: use mass-storage class define) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/option.c | 457 +++++++++++++++----------------------------- + 1 file changed, 153 insertions(+), 304 deletions(-) +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. + drivers/usb/chipidea/ci_hdrc_imx.c | 15 +++++++++++++-- + drivers/usb/chipidea/usbmisc_imx.c | 26 ++++++++++++++++---------- + 2 files changed, 29 insertions(+), 12 deletions(-) +Merging phy-next/next (e7f4da4c44fe phy: tegra: xusb: Uncomment register write) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (4958134df54c Merge 4.16-rc6 into tty-next) +$ git merge tty/tty-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/tty/hvc/Kconfig' using previous resolution. +Resolved 'drivers/tty/hvc/Makefile' using previous resolution. +Auto-merging include/linux/pci_ids.h +Auto-merging drivers/tty/serial/Makefile +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/tty/hvc/Makefile +CONFLICT (content): Merge conflict in drivers/tty/hvc/Makefile +Auto-merging drivers/tty/hvc/Kconfig +CONFLICT (content): Merge conflict in drivers/tty/hvc/Kconfig +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 +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 60df27fe07df] Merge remote-tracking branch 'tty/tty-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/serial/8250.txt | 1 + + .../bindings/serial/renesas,sci-serial.txt | 2 + + .../devicetree/bindings/serial/st,stm32-usart.txt | 2 + + 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 +- + drivers/parport/parport_serial.c | 3 - + 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 | 2 +- + 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/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/usb/misc/sisusbvga/sisusb_con.c | 68 +- + 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 +- + fs/devpts/inode.c | 66 +- + include/linux/console.h | 58 +- + include/linux/pci_ids.h | 3 + + include/linux/serial_core.h | 2 +- + include/uapi/linux/serial_core.h | 3 + + 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 +++++ + 52 files changed, 2899 insertions(+), 737 deletions(-) + create mode 100644 drivers/tty/hvc/hvc_riscv_sbi.c + create mode 100644 drivers/tty/serial/qcom_geni_serial.c + create mode 100644 tools/testing/selftests/filesystems/devpts_pts.c +Merging char-misc/char-misc-next (6f005302a23f Merge tag 'thunderbolt-for-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into char-misc-next) +$ git merge char-misc/char-misc-next +Auto-merging include/linux/pci_ids.h +Auto-merging drivers/parport/parport_serial.c +Auto-merging drivers/misc/lkdtm/refcount.c +Auto-merging drivers/char/Kconfig +Auto-merging arch/x86/include/uapi/asm/hyperv.h +Auto-merging arch/x86/entry/entry_64.S +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-bus-vmbus | 7 + + Documentation/ABI/testing/sysfs-bus-thunderbolt | 33 + + Documentation/ABI/testing/sysfs-class-mei | 9 + + .../ABI/testing/sysfs-driver-fsi-master-gpio | 10 + + Documentation/admin-guide/thunderbolt.rst | 15 +- + Documentation/devicetree/bindings/fsi/fsi.txt | 151 ++++ + .../devicetree/bindings/nvmem/imx-ocotp.txt | 23 +- + .../devicetree/bindings/nvmem/snvs-lpgpr.txt | 3 +- + Documentation/driver-api/uio-howto.rst | 5 + + MAINTAINERS | 2 +- + arch/x86/entry/entry_32.S | 3 + + arch/x86/entry/entry_64.S | 3 + + 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/uapi/asm/hyperv.h | 3 + + arch/x86/kernel/cpu/mshyperv.c | 40 ++ + arch/x86/kernel/irq.c | 7 + + block/genhd.c | 19 +- + drivers/char/Kconfig | 2 +- + drivers/char/xillybus/xillybus_pcie.c | 1 - + 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/hv/Makefile | 1 + + drivers/hv/channel_mgmt.c | 6 +- + drivers/hv/hv.c | 63 +- + drivers/hv/hv_balloon.c | 121 +++- + drivers/hv/hv_trace_balloon.h | 48 ++ + drivers/hv/hyperv_vmbus.h | 4 +- + drivers/hwtracing/coresight/coresight-cpu-debug.c | 2 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 4 +- + drivers/mcb/mcb-pci.c | 1 + + drivers/misc/Kconfig | 1 - + drivers/misc/Makefile | 20 +- + drivers/misc/aspeed-lpc-ctrl.c | 44 +- + drivers/misc/cardreader/rts5260.c | 12 +- + 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/nvmem/Kconfig | 4 +- + 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 | 122 ++-- + drivers/pps/clients/pps_parport.c | 21 +- + drivers/pps/generators/pps_gen_parport.c | 12 +- + drivers/siox/siox-core.c | 2 +- + drivers/slimbus/core.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/uio/uio_hv_generic.c | 89 +++ + drivers/w1/w1.c | 1 + + fs/char_dev.c | 10 +- + include/linux/hyperv.h | 2 +- + include/linux/nvmem-provider.h | 42 ++ + include/linux/pci_ids.h | 2 + + include/linux/thunderbolt.h | 19 + + lib/devres.c | 78 +-- + tools/hv/hv_fcopy_daemon.c | 4 +- + tools/hv/hv_kvp_daemon.c | 138 ++-- + tools/hv/hv_vss_daemon.c | 1 + + 99 files changed, 2682 insertions(+), 738 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-fsi-master-gpio + create mode 100644 Documentation/devicetree/bindings/fsi/fsi.txt + create mode 100644 drivers/hv/hv_trace_balloon.h + 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%) +Merging extcon/extcon-next (eb7768e774d1 Merge branch 'ib-extcon-drm-dt-v4.17' into extcon-next) +$ git merge extcon/extcon-next +Removing include/linux/extcon/extcon-gpio.h +Merge made by the 'recursive' strategy. + .../connector/samsung,usb-connector-11pin.txt | 49 ++++++++++ + .../bindings/connector/usb-connector.txt | 75 +++++++++++++++ + 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/gpu/drm/bridge/sil-sii8620.c | 97 ++++++++++++++++++- + include/linux/extcon.h | 6 ++ + include/linux/extcon/extcon-gpio.h | 47 ---------- + 9 files changed, 315 insertions(+), 126 deletions(-) + create mode 100644 Documentation/devicetree/bindings/connector/samsung,usb-connector-11pin.txt + create mode 100644 Documentation/devicetree/bindings/connector/usb-connector.txt + delete mode 100644 include/linux/extcon/extcon-gpio.h +Merging staging/staging-next (d59578da2bb8 staging: mt7621-dts: add dts files) +$ git merge staging/staging-next +Removing include/uapi/linux/telephony.h +Removing include/uapi/linux/ixjuser.h +Removing include/uapi/linux/irda.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/fsl/mc.h +Removing drivers/staging/vc04_services/interface/vchiq_arm/vchiq_version.c +Removing drivers/staging/vc04_services/interface/vchiq_arm/vchiq_memdrv.h +Removing drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +Removing drivers/staging/vc04_services/interface/vchiq_arm/vchiq_build_info.h +Removing drivers/staging/unisys/visorinput/ultrainputreport.h +Auto-merging drivers/staging/mt29f_spinand/mt29f_spinand.c +Auto-merging drivers/staging/lustre/lustre/llite/dcache.c +CONFLICT (modify/delete): drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c left in tree. +Removing drivers/staging/lustre/lnet/libcfs/linux/linux-mem.c +CONFLICT (modify/delete): drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c left in tree. +Removing drivers/staging/irda/net/wrapper.c +Removing drivers/staging/irda/net/timer.c +Removing drivers/staging/irda/net/qos.c +Removing drivers/staging/irda/net/parameters.c +Removing drivers/staging/irda/net/irttp.c +Removing drivers/staging/irda/net/irsysctl.c +Removing drivers/staging/irda/net/irqueue.c +Removing drivers/staging/irda/net/irproc.c +Removing drivers/staging/irda/net/irnetlink.c +Removing drivers/staging/irda/net/irnet/irnet_ppp.h +Removing drivers/staging/irda/net/irnet/irnet_ppp.c +Removing drivers/staging/irda/net/irnet/irnet_irda.h +Removing drivers/staging/irda/net/irnet/irnet_irda.c +Removing drivers/staging/irda/net/irnet/irnet.h +Removing drivers/staging/irda/net/irnet/Makefile +Removing drivers/staging/irda/net/irnet/Kconfig +Removing drivers/staging/irda/net/irmod.c +Removing drivers/staging/irda/net/irlmp_frame.c +Removing drivers/staging/irda/net/irlmp_event.c +Removing drivers/staging/irda/net/irlmp.c +Removing drivers/staging/irda/net/irlap_frame.c +Removing drivers/staging/irda/net/irlap_event.c +Removing drivers/staging/irda/net/irlap.c +Removing drivers/staging/irda/net/irlan/irlan_provider_event.c +Removing drivers/staging/irda/net/irlan/irlan_provider.c +Removing drivers/staging/irda/net/irlan/irlan_filter.c +Removing drivers/staging/irda/net/irlan/irlan_event.c +Removing drivers/staging/irda/net/irlan/irlan_eth.c +Removing drivers/staging/irda/net/irlan/irlan_common.c +Removing drivers/staging/irda/net/irlan/irlan_client_event.c +Removing drivers/staging/irda/net/irlan/irlan_client.c +Removing drivers/staging/irda/net/irlan/Makefile +Removing drivers/staging/irda/net/irlan/Kconfig +Removing drivers/staging/irda/net/irias_object.c +Removing drivers/staging/irda/net/iriap_event.c +Removing drivers/staging/irda/net/iriap.c +Removing drivers/staging/irda/net/irda_device.c +Removing drivers/staging/irda/net/ircomm/ircomm_tty_ioctl.c +Removing drivers/staging/irda/net/ircomm/ircomm_tty_attach.c +Removing drivers/staging/irda/net/ircomm/ircomm_tty.c +Removing drivers/staging/irda/net/ircomm/ircomm_ttp.c +Removing drivers/staging/irda/net/ircomm/ircomm_param.c +Removing drivers/staging/irda/net/ircomm/ircomm_lmp.c +Removing drivers/staging/irda/net/ircomm/ircomm_event.c +Removing drivers/staging/irda/net/ircomm/ircomm_core.c +Removing drivers/staging/irda/net/ircomm/Makefile +Removing drivers/staging/irda/net/ircomm/Kconfig +Removing drivers/staging/irda/net/discovery.c +CONFLICT (modify/delete): drivers/staging/irda/net/af_irda.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/irda/net/af_irda.c left in tree. +Removing drivers/staging/irda/net/Makefile +Removing drivers/staging/irda/net/Kconfig +Removing drivers/staging/irda/include/net/irda/wrapper.h +Removing drivers/staging/irda/include/net/irda/timer.h +Removing drivers/staging/irda/include/net/irda/qos.h +Removing drivers/staging/irda/include/net/irda/parameters.h +Removing drivers/staging/irda/include/net/irda/irttp.h +Removing drivers/staging/irda/include/net/irda/irqueue.h +Removing drivers/staging/irda/include/net/irda/irmod.h +Removing drivers/staging/irda/include/net/irda/irlmp_frame.h +Removing drivers/staging/irda/include/net/irda/irlmp_event.h +Removing drivers/staging/irda/include/net/irda/irlmp.h +Removing drivers/staging/irda/include/net/irda/irlap_frame.h +Removing drivers/staging/irda/include/net/irda/irlap_event.h +Removing drivers/staging/irda/include/net/irda/irlap.h +Removing drivers/staging/irda/include/net/irda/irlan_provider.h +Removing drivers/staging/irda/include/net/irda/irlan_filter.h +Removing drivers/staging/irda/include/net/irda/irlan_event.h +Removing drivers/staging/irda/include/net/irda/irlan_eth.h +Removing drivers/staging/irda/include/net/irda/irlan_common.h +Removing drivers/staging/irda/include/net/irda/irlan_client.h +Removing drivers/staging/irda/include/net/irda/irias_object.h +Removing drivers/staging/irda/include/net/irda/iriap_event.h +Removing drivers/staging/irda/include/net/irda/iriap.h +Removing drivers/staging/irda/include/net/irda/irda_device.h +Removing drivers/staging/irda/include/net/irda/irda.h +Removing drivers/staging/irda/include/net/irda/ircomm_tty_attach.h +Removing drivers/staging/irda/include/net/irda/ircomm_tty.h +Removing drivers/staging/irda/include/net/irda/ircomm_ttp.h +Removing drivers/staging/irda/include/net/irda/ircomm_param.h +Removing drivers/staging/irda/include/net/irda/ircomm_lmp.h +Removing drivers/staging/irda/include/net/irda/ircomm_event.h +Removing drivers/staging/irda/include/net/irda/ircomm_core.h +Removing drivers/staging/irda/include/net/irda/discovery.h +Removing drivers/staging/irda/include/net/irda/crc.h +Removing drivers/staging/irda/include/net/irda/af_irda.h +Removing drivers/staging/irda/drivers/w83977af_ir.h +Removing drivers/staging/irda/drivers/w83977af_ir.c +Removing drivers/staging/irda/drivers/w83977af.h +Removing drivers/staging/irda/drivers/vlsi_ir.h +Removing drivers/staging/irda/drivers/vlsi_ir.c +Removing drivers/staging/irda/drivers/via-ircc.h +Removing drivers/staging/irda/drivers/via-ircc.c +Removing drivers/staging/irda/drivers/toim3232-sir.c +Removing drivers/staging/irda/drivers/tekram-sir.c +Removing drivers/staging/irda/drivers/stir4200.c +Removing drivers/staging/irda/drivers/smsc-sio.h +Removing drivers/staging/irda/drivers/smsc-ircc2.h +Removing drivers/staging/irda/drivers/smsc-ircc2.c +Removing drivers/staging/irda/drivers/sir_dongle.c +Removing drivers/staging/irda/drivers/sir_dev.c +Removing drivers/staging/irda/drivers/sir-dev.h +Removing drivers/staging/irda/drivers/sh_sir.c +Removing drivers/staging/irda/drivers/sa1100_ir.c +Removing drivers/staging/irda/drivers/pxaficp_ir.c +Removing drivers/staging/irda/drivers/old_belkin-sir.c +Removing drivers/staging/irda/drivers/nsc-ircc.h +Removing drivers/staging/irda/drivers/nsc-ircc.c +Removing drivers/staging/irda/drivers/mcs7780.h +Removing drivers/staging/irda/drivers/mcs7780.c +Removing drivers/staging/irda/drivers/mcp2120-sir.c +Removing drivers/staging/irda/drivers/ma600-sir.c +Removing drivers/staging/irda/drivers/litelink-sir.c +Removing drivers/staging/irda/drivers/ksdazzle-sir.c +Removing drivers/staging/irda/drivers/ks959-sir.c +Removing drivers/staging/irda/drivers/kingsun-sir.c +Removing drivers/staging/irda/drivers/irtty-sir.h +Removing drivers/staging/irda/drivers/irtty-sir.c +Removing drivers/staging/irda/drivers/irda-usb.h +Removing drivers/staging/irda/drivers/irda-usb.c +Removing drivers/staging/irda/drivers/girbil-sir.c +Removing drivers/staging/irda/drivers/esi-sir.c +Removing drivers/staging/irda/drivers/donauboe.h +Removing drivers/staging/irda/drivers/donauboe.c +Removing drivers/staging/irda/drivers/bfin_sir.h +Removing drivers/staging/irda/drivers/bfin_sir.c +Removing drivers/staging/irda/drivers/au1k_ir.c +Removing drivers/staging/irda/drivers/ali-ircc.h +Removing drivers/staging/irda/drivers/ali-ircc.c +Removing drivers/staging/irda/drivers/actisys-sir.c +Removing drivers/staging/irda/drivers/act200l-sir.c +Removing drivers/staging/irda/drivers/Makefile +Removing drivers/staging/irda/drivers/Kconfig +Removing drivers/staging/irda/TODO +Removing drivers/staging/fsl-mc/include/dpcon.h +Removing drivers/staging/fsl-mc/include/dpbp.h +Removing drivers/staging/fsl-mc/bus/dpcon-cmd.h +Removing drivers/staging/fsl-mc/bus/dpbp-cmd.h +Removing drivers/staging/fsl-mc/TODO +Removing drivers/staging/ccree/cc_sram_mgr.h +Removing drivers/staging/ccree/cc_sram_mgr.c +Removing drivers/staging/ccree/cc_request_mgr.h +Removing drivers/staging/ccree/cc_request_mgr.c +Removing drivers/staging/ccree/cc_pm.h +Removing drivers/staging/ccree/cc_pm.c +Removing drivers/staging/ccree/cc_lli_defs.h +Removing drivers/staging/ccree/cc_kernel_regs.h +Removing drivers/staging/ccree/cc_ivgen.h +Removing drivers/staging/ccree/cc_ivgen.c +Removing drivers/staging/ccree/cc_hw_queue_defs.h +Removing drivers/staging/ccree/cc_host_regs.h +Removing drivers/staging/ccree/cc_hash.h +Removing drivers/staging/ccree/cc_hash.c +Removing drivers/staging/ccree/cc_fips.h +Removing drivers/staging/ccree/cc_fips.c +Removing drivers/staging/ccree/cc_driver.h +Removing drivers/staging/ccree/cc_driver.c +Removing drivers/staging/ccree/cc_debugfs.h +Removing drivers/staging/ccree/cc_debugfs.c +Removing drivers/staging/ccree/cc_crypto_ctx.h +Removing drivers/staging/ccree/cc_cipher.h +Removing drivers/staging/ccree/cc_cipher.c +Removing drivers/staging/ccree/cc_buffer_mgr.h +Removing drivers/staging/ccree/cc_buffer_mgr.c +Removing drivers/staging/ccree/cc_aead.h +Removing drivers/staging/ccree/cc_aead.c +Removing drivers/staging/ccree/TODO +CONFLICT (modify/delete): drivers/staging/ccree/Makefile deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/ccree/Makefile left in tree. +CONFLICT (modify/delete): drivers/staging/ccree/Kconfig deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/ccree/Kconfig left in tree. +Auto-merging drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c +Auto-merging drivers/irqchip/Makefile +Auto-merging drivers/irqchip/Kconfig +Auto-merging drivers/iio/chemical/ccs811.c +Auto-merging drivers/bus/fsl-mc/mc-sys.c +Auto-merging drivers/bus/fsl-mc/mc-io.c +Auto-merging drivers/bus/fsl-mc/fsl-mc-private.h +Auto-merging drivers/bus/fsl-mc/fsl-mc-msi.c +Auto-merging drivers/bus/fsl-mc/fsl-mc-allocator.c +Auto-merging drivers/bus/fsl-mc/dprc.c +Auto-merging drivers/bus/fsl-mc/dprc-driver.c +Auto-merging drivers/bus/fsl-mc/dpmcp.c +Auto-merging drivers/bus/fsl-mc/dpcon.c +Auto-merging drivers/bus/fsl-mc/dpbp.c +Auto-merging drivers/bus/Makefile +Auto-merging drivers/bus/Kconfig +Auto-merging arch/arm/boot/dts/bcm2835-rpi.dtsi +Auto-merging MAINTAINERS +Removing Documentation/networking/irda.txt +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/ccree/Kconfig drivers/staging/ccree/Makefile drivers/staging/irda/net/af_irda.c +drivers/staging/ccree/Kconfig: needs merge +drivers/staging/ccree/Makefile: needs merge +drivers/staging/irda/net/af_irda.c: needs merge +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/ccree/Kconfig' +rm 'drivers/staging/ccree/Makefile' +rm 'drivers/staging/irda/net/af_irda.c' +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 a08cad1afb80] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-bus-iio-chemical-vz89x | 2 +- + .../ABI/testing/sysfs-bus-iio-proximity-as3935 | 4 +- + .../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 + + .../bindings/soc/bcm/brcm,bcm2835-vchiq.txt | 16 + + Documentation/networking/dpaa2/index.rst | 8 + + .../networking/dpaa2}/overview.rst | 0 + Documentation/networking/index.rst | 1 + + Documentation/networking/irda.txt | 10 - + MAINTAINERS | 19 +- + arch/arm/boot/dts/bcm2835-rpi.dtsi | 6 + + 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 | 73 +- + drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpcon.c | 6 +- + drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.c | 2 +- + .../fsl-mc/bus => bus/fsl-mc}/dprc-driver.c | 2 +- + drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc.c | 3 +- + .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-allocator.c | 2 +- + .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-bus.c | 0 + .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-msi.c | 1 + + .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-private.h | 89 +- + drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-io.c | 2 +- + .../{staging/fsl-mc/bus => bus/fsl-mc}/mc-sys.c | 2 +- + 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 | 3 +- + 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/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/irqchip/Kconfig | 6 + + drivers/irqchip/Makefile | 1 + + .../bus => irqchip}/irq-gic-v3-its-fsl-mc-msi.c | 4 +- + 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/Makefile | 7 - + drivers/staging/ccree/TODO | 10 - + drivers/staging/ccree/cc_aead.c | 2701 ----------------- + drivers/staging/ccree/cc_aead.h | 109 - + drivers/staging/ccree/cc_buffer_mgr.c | 1651 ----------- + drivers/staging/ccree/cc_buffer_mgr.h | 74 - + drivers/staging/ccree/cc_cipher.c | 1164 -------- + drivers/staging/ccree/cc_cipher.h | 74 - + drivers/staging/ccree/cc_crypto_ctx.h | 170 -- + drivers/staging/ccree/cc_debugfs.c | 101 - + drivers/staging/ccree/cc_debugfs.h | 32 - + drivers/staging/ccree/cc_driver.c | 474 --- + drivers/staging/ccree/cc_driver.h | 194 -- + drivers/staging/ccree/cc_fips.c | 111 - + drivers/staging/ccree/cc_fips.h | 37 - + drivers/staging/ccree/cc_hash.c | 2295 --------------- + drivers/staging/ccree/cc_hash.h | 114 - + drivers/staging/ccree/cc_host_regs.h | 142 - + drivers/staging/ccree/cc_hw_queue_defs.h | 590 ---- + drivers/staging/ccree/cc_ivgen.c | 280 -- + drivers/staging/ccree/cc_ivgen.h | 55 - + drivers/staging/ccree/cc_kernel_regs.h | 167 -- + drivers/staging/ccree/cc_lli_defs.h | 59 - + drivers/staging/ccree/cc_pm.c | 122 - + drivers/staging/ccree/cc_pm.h | 57 - + drivers/staging/ccree/cc_request_mgr.c | 713 ----- + drivers/staging/ccree/cc_request_mgr.h | 51 - + drivers/staging/ccree/cc_sram_mgr.c | 107 - + drivers/staging/ccree/cc_sram_mgr.h | 65 - + drivers/staging/comedi/drivers/adl_pci6208.c | 3 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 11 +- + 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 | 2 +- + 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 | 19 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 3 +- + drivers/staging/fsl-dpaa2/ethernet/dpni-cmd.h | 4 +- + drivers/staging/fsl-dpaa2/ethernet/dpni.c | 2 +- + 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 | 2 +- + 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/ks7010_sdio.c | 188 +- + drivers/staging/ks7010/ks_hostif.c | 440 +-- + drivers/staging/ks7010/ks_hostif.h | 20 +- + drivers/staging/ks7010/ks_wlan.h | 10 - + drivers/staging/ks7010/ks_wlan_net.c | 96 +- + drivers/staging/ks7010/michael_mic.c | 10 +- + 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 | 107 - + .../staging/lustre/lnet/libcfs/linux/linux-mem.c | 51 - + .../staging/lustre/lnet/libcfs/linux/linux-prim.c | 112 - + 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 | 767 +++++ + drivers/staging/mt7621-dma/ralink-gdma.c | 928 ++++++ + 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 | 353 +++ + 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 | 80 +- + 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/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_mlme.c | 3 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 3 +- + drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c | 2 +- + drivers/staging/rtl8723bs/include/drv_types.h | 4 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 5 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 9 +- + 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_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/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/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 +- + drivers/staging/vc04_services/interface/vchi/TODO | 9 +- + .../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/vt6655/baseband.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 | 1921 ++++++------ + drivers/staging/wilc1000/host_interface.h | 2 +- + drivers/staging/wilc1000/linux_mon.c | 6 +- + 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 | 343 +-- + 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 +- + .../fsl-mc/include => include/linux/fsl}/mc.h | 108 + + include/linux/kernel.h | 9 + + include/linux/mfd/axp20x.h | 2 + + include/linux/wait.h | 114 + + include/uapi/linux/irda.h | 252 -- + include/uapi/linux/ixjuser.h | 721 ----- + include/uapi/linux/telephony.h | 263 -- + lib/int_sqrt.c | 30 + + 627 files changed, 26017 insertions(+), 89871 deletions(-) + 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/soc/bcm/brcm,bcm2835-vchiq.txt + 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 + 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 (72%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpcon.c (98%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.c (98%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc-driver.c (99%) + rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc.c (99%) + 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 (100%) + 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 (99%) + 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 + rename drivers/{staging/fsl-mc/bus => irqchip}/irq-gic-v3-its-fsl-mc-msi.c (97%) + delete mode 100644 drivers/staging/ccree/Kconfig + delete mode 100644 drivers/staging/ccree/Makefile + delete mode 100644 drivers/staging/ccree/TODO + delete mode 100644 drivers/staging/ccree/cc_aead.c + delete mode 100644 drivers/staging/ccree/cc_aead.h + delete mode 100644 drivers/staging/ccree/cc_buffer_mgr.c + delete mode 100644 drivers/staging/ccree/cc_buffer_mgr.h + delete mode 100644 drivers/staging/ccree/cc_cipher.c + delete mode 100644 drivers/staging/ccree/cc_cipher.h + delete mode 100644 drivers/staging/ccree/cc_crypto_ctx.h + delete mode 100644 drivers/staging/ccree/cc_debugfs.c + delete mode 100644 drivers/staging/ccree/cc_debugfs.h + delete mode 100644 drivers/staging/ccree/cc_driver.c + delete mode 100644 drivers/staging/ccree/cc_driver.h + delete mode 100644 drivers/staging/ccree/cc_fips.c + delete mode 100644 drivers/staging/ccree/cc_fips.h + delete mode 100644 drivers/staging/ccree/cc_hash.c + delete mode 100644 drivers/staging/ccree/cc_hash.h + delete mode 100644 drivers/staging/ccree/cc_host_regs.h + delete mode 100644 drivers/staging/ccree/cc_hw_queue_defs.h + delete mode 100644 drivers/staging/ccree/cc_ivgen.c + delete mode 100644 drivers/staging/ccree/cc_ivgen.h + delete mode 100644 drivers/staging/ccree/cc_kernel_regs.h + delete mode 100644 drivers/staging/ccree/cc_lli_defs.h + delete mode 100644 drivers/staging/ccree/cc_pm.c + delete mode 100644 drivers/staging/ccree/cc_pm.h + delete mode 100644 drivers/staging/ccree/cc_request_mgr.c + delete mode 100644 drivers/staging/ccree/cc_request_mgr.h + delete mode 100644 drivers/staging/ccree/cc_sram_mgr.c + delete mode 100644 drivers/staging/ccree/cc_sram_mgr.h + 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 + rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc.h (84%) + delete mode 100644 include/uapi/linux/irda.h + delete mode 100644 include/uapi/linux/ixjuser.h + delete mode 100644 include/uapi/linux/telephony.h +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 (65eac86c001a Merge branch 'topic/dw_axi' into next) +$ git merge slave-dma/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/qcom_bam_dma.txt | 4 + + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 + + .../devicetree/bindings/dma/renesas,usb-dmac.txt | 1 + + .../devicetree/bindings/dma/snps,dw-axi-dmac.txt | 41 + + MAINTAINERS | 6 + + drivers/dma/Kconfig | 10 + + drivers/dma/Makefile | 1 + + 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/imx-sdma.c | 21 + + drivers/dma/pl330.c | 6 +- + drivers/dma/qcom/bam_dma.c | 59 +- + drivers/dma/sh/rcar-dmac.c | 9 + + include/linux/dmaengine.h | 4 + + 16 files changed, 1502 insertions(+), 20 deletions(-) + 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 +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 (435458e41180 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/scsi_sysfs.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/scsi_debug.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_scsih.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 804 +++++++++++++++++++++ + .../devicetree/bindings/scsi/hisilicon-sas.txt | 7 + + Documentation/scsi/sd-parameters.txt | 22 + + drivers/scsi/Kconfig | 2 + + drivers/scsi/NCR53c406a.c | 2 +- + drivers/scsi/aacraid/aacraid.h | 5 + + drivers/scsi/aacraid/src.c | 205 +++++- + drivers/scsi/atp870u.c | 4 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 8 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 2 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 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 | 12 +- + drivers/scsi/ipr.c | 53 +- + drivers/scsi/ipr.h | 2 +- + drivers/scsi/isci/host.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 | 3 +- + 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 | 74 +- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 8 +- + drivers/scsi/mvsas/mv_94xx.c | 23 +- + 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_gbl.h | 4 +- + drivers/scsi/qedi/qedi_main.c | 4 +- + drivers/scsi/qla2xxx/qla_bsg.c | 3 +- + drivers/scsi/qla2xxx/qla_dbg.c | 4 +- + drivers/scsi/qla2xxx/qla_gs.c | 78 +- + drivers/scsi/qla2xxx/qla_init.c | 37 +- + drivers/scsi/qla2xxx/qla_inline.h | 1 + + drivers/scsi/qla2xxx/qla_iocb.c | 25 +- + drivers/scsi/qla2xxx/qla_isr.c | 23 +- + drivers/scsi/qla2xxx/qla_mbx.c | 5 +- + drivers/scsi/qla2xxx/qla_mr.c | 36 +- + 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_sup.c | 1 + + drivers/scsi/qla2xxx/qla_target.c | 14 +- + 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 | 241 +++--- + drivers/scsi/scsi_error.c | 8 +- + drivers/scsi/scsi_lib.c | 27 +- + drivers/scsi/scsi_sysfs.c | 11 + + drivers/scsi/scsi_transport_spi.c | 4 +- + drivers/scsi/sd_zbc.c | 3 +- + drivers/scsi/smartpqi/smartpqi_init.c | 44 ++ + drivers/scsi/sun3x_esp.c | 2 +- + drivers/scsi/sym53c416.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 | 739 +++++++++++++++++++ + 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 | 312 +++----- + drivers/scsi/ufs/ufshcd.h | 34 + + include/linux/raid_class.h | 1 + + include/scsi/scsi.h | 2 + + include/scsi/scsi_host.h | 6 + + 114 files changed, 5008 insertions(+), 1638 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-ufs + create mode 100644 Documentation/scsi/sd-parameters.txt + create mode 100644 drivers/scsi/ufs/ufs-sysfs.c + create mode 100644 drivers/scsi/ufs/ufs-sysfs.h +Merging scsi-mkp/for-next (ad448378825f scsi: ufs: Add support for Auto-Hibernate Idle Timer) +$ git merge scsi-mkp/for-next +Recorded preimage for 'drivers/scsi/qla2xxx/qla_os.c' +Auto-merging include/scsi/scsi_host.h +Auto-merging drivers/scsi/ufs/ufshcd.c +Removing drivers/scsi/sym53c416.h +Removing drivers/scsi/sym53c416.c +Removing drivers/scsi/scsi_module.c +Auto-merging drivers/scsi/qla2xxx/qla_target.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/qla2xxx/qla_isr.c +Auto-merging drivers/scsi/qla2xxx/qla_init.c +Auto-merging drivers/scsi/qla2xxx/qla_gs.c +Auto-merging drivers/scsi/qla2xxx/qla_def.h +Removing drivers/scsi/pcmcia/fdomain_stub.c +Removing drivers/scsi/pcmcia/fdomain_core.c +Auto-merging drivers/scsi/hosts.c +Removing drivers/scsi/fdomain.h +Removing drivers/scsi/fdomain.c +Removing drivers/scsi/eata_pio.h +Removing drivers/scsi/eata_pio.c +Removing drivers/scsi/eata_generic.h +CONFLICT (modify/delete): drivers/scsi/eata.c deleted in scsi-mkp/for-next and modified in HEAD. Version HEAD of drivers/scsi/eata.c left in tree. +Auto-merging drivers/scsi/device_handler/scsi_dh_alua.c +Auto-merging drivers/scsi/csiostor/csio_lnode.c +Removing drivers/scsi/NCR53c406a.c +Auto-merging drivers/scsi/Makefile +Auto-merging MAINTAINERS +Removing Documentation/scsi/tmscsim.txt +Removing Documentation/scsi/Mylex.txt +Removing Documentation/scsi/ChangeLog.1992-1997 +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 +Recorded resolution for 'drivers/scsi/qla2xxx/qla_os.c'. +[master 6e59f5d458f7] Merge remote-tracking branch 'scsi-mkp/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-driver-ufs | 81 + + Documentation/driver-api/scsi.rst | 6 - + 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/tmscsim.txt | 443 ----- + MAINTAINERS | 12 - + arch/powerpc/configs/c2k_defconfig | 1 - + drivers/scsi/Kconfig | 112 -- + drivers/scsi/Makefile | 5 - + drivers/scsi/NCR53c406a.c | 1090 ------------ + 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/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 | 2 +- + drivers/scsi/dpt_i2o.c | 27 +- + drivers/scsi/dpti.h | 1 - + drivers/scsi/eata.c | 2574 ---------------------------- + 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/hisi_sas/Kconfig | 2 +- + drivers/scsi/hosts.c | 24 - + drivers/scsi/ips.c | 4 - + drivers/scsi/lpfc/lpfc_nvme.c | 8 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 8 +- + drivers/scsi/mvme147.c | 107 +- + 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/qla2xxx/qla_dbg.c | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 12 +- + drivers/scsi/qla2xxx/qla_gbl.h | 4 +- + drivers/scsi/qla2xxx/qla_gs.c | 272 ++- + drivers/scsi/qla2xxx/qla_init.c | 35 +- + drivers/scsi/qla2xxx/qla_isr.c | 78 +- + drivers/scsi/qla2xxx/qla_mbx.c | 10 +- + drivers/scsi/qla2xxx/qla_mid.c | 6 - + drivers/scsi/qla2xxx/qla_nvme.c | 245 ++- + drivers/scsi/qla2xxx/qla_nvme.h | 9 +- + drivers/scsi/qla2xxx/qla_os.c | 12 +- + drivers/scsi/qla2xxx/qla_target.c | 15 +- + drivers/scsi/qla2xxx/qla_target.h | 2 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/scsi_devinfo.c | 13 +- + drivers/scsi/scsi_module.c | 73 - + drivers/scsi/smartpqi/smartpqi_init.c | 45 +- + drivers/scsi/sym53c416.c | 844 --------- + drivers/scsi/sym53c416.h | 33 - + drivers/scsi/ufs/ufs-sysfs.c | 168 +- + drivers/scsi/ufs/ufshcd.c | 26 + + drivers/scsi/ufs/ufshcd.h | 3 + + drivers/scsi/ufs/ufshci.h | 7 + + include/scsi/scsi_host.h | 36 - + 73 files changed, 1249 insertions(+), 11479 deletions(-) + delete mode 100644 Documentation/scsi/ChangeLog.1992-1997 + delete mode 100644 Documentation/scsi/Mylex.txt + delete mode 100644 Documentation/scsi/tmscsim.txt + 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 +$ git am -3 ../patches/0001-scsi-qla2xxx-merge-fix-in-qla_gs.c.patch +Applying: scsi: qla2xxx: merge fix in qla_gs.c +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/scsi/qla2xxx/qla_gs.c +$ git add -A . +$ git commit -v -a --amend +[master aadc6dfca925] Merge remote-tracking branch 'scsi-mkp/for-next' + Date: Thu Mar 22 16:54:23 2018 +1100 +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 (d09c02fa64a5 Merge branch 'for-4.17' into for-next) +$ git merge libata/for-next +Auto-merging drivers/ata/libata-core.c +Auto-merging drivers/ata/Makefile +Auto-merging drivers/ata/Kconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/ata/imx-sata.txt | 1 + + .../bindings/ata/nvidia,tegra124-ahci.txt | 36 ++- + drivers/ata/Kconfig | 16 +- + drivers/ata/Makefile | 1 + + drivers/ata/ahci_imx.c | 39 ++- + drivers/ata/ahci_tegra.c | 359 ++++++++++++++++----- + drivers/ata/libata-core.c | 44 ++- + drivers/ata/libata-transport.c | 4 + + drivers/ata/libata.h | 2 + + drivers/ata/pata_arasan_cf.c | 6 +- + drivers/ata/pata_bk3710.c | 8 +- + drivers/ata/pata_falcon.c | 8 +- + drivers/ata/pata_gayle.c | 219 +++++++++++++ + drivers/ata/pata_it821x.c | 6 +- + drivers/ata/pata_macio.c | 12 +- + drivers/ata/pata_mpc52xx.c | 1 - + drivers/ata/pata_samsung_cf.c | 4 +- + drivers/ata/sata_dwc_460ex.c | 1 - + include/linux/libata.h | 1 + + include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 2 + + 20 files changed, 638 insertions(+), 132 deletions(-) + create mode 100644 drivers/ata/pata_gayle.c +Merging vhost/linux-next (54939f252f97 fw_cfg: write vmcoreinfo details) +$ git merge vhost/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/firmware/qemu_fw_cfg.c | 291 +++++++++++++++++++++++++++++++-------- + include/uapi/linux/qemu_fw_cfg.h | 97 +++++++++++++ + kernel/crash_core.c | 1 + + 4 files changed, 329 insertions(+), 61 deletions(-) + create mode 100644 include/uapi/linux/qemu_fw_cfg.h +Merging rpmsg/for-next (6366ff79e09f 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/gpu/drm/msm/adreno/a5xx_gpu.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 77d49466d14a] 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 | 18 + + 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 | 24 +- + drivers/soc/qcom/mdt_loader.c | 7 +- + include/linux/remoteproc.h | 27 +- + include/linux/soc/qcom/mdt_loader.h | 3 +- + samples/Kconfig | 9 + + samples/Makefile | 2 +- + samples/qmi/Makefile | 1 + + samples/qmi/qmi_sample_client.c | 622 +++++++++++++++++++++++++++ + 23 files changed, 1541 insertions(+), 74 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 (95260c17b27e Merge tag 'v4.16-rc5' into devel) +$ git merge gpio/for-next +Auto-merging init/Kconfig +Auto-merging drivers/watchdog/Kconfig +Auto-merging drivers/iio/adc/Kconfig +Removing drivers/gpio/gpio-tz1090.c +Removing drivers/gpio/gpio-tz1090-pdc.c +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/gpio/gpio-tz1090.txt +Removing Documentation/devicetree/bindings/gpio/gpio-tz1090-pdc.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-sprd.txt | 28 + + .../devicetree/bindings/gpio/gpio-tz1090-pdc.txt | 45 -- + .../devicetree/bindings/gpio/gpio-tz1090.txt | 88 --- + .../bindings/gpio/nintendo,hollywood-gpio.txt | 27 + + .../bindings/gpio/raspberrypi,firmware-gpio.txt | 30 + + .../devicetree/bindings/powerpc/nintendo/wii.txt | 9 +- + MAINTAINERS | 2 +- + arch/x86/Kconfig | 10 +- + drivers/gpio/Kconfig | 59 +- + drivers/gpio/Makefile | 5 +- + drivers/gpio/gpio-davinci.c | 6 + + drivers/gpio/gpio-dwapb.c | 61 ++- + drivers/gpio/gpio-ftgpio010.c | 6 +- + drivers/gpio/gpio-hlwd.c | 115 ++++ + drivers/gpio/gpio-intel-mid.c | 4 +- + drivers/gpio/gpio-merrifield.c | 4 +- + drivers/gpio/gpio-ml-ioh.c | 1 - + drivers/gpio/gpio-mockup.c | 4 +- + drivers/gpio/gpio-omap.c | 6 +- + 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/gpiolib.c | 2 +- + drivers/gpio/gpiolib.h | 2 +- + drivers/iio/adc/Kconfig | 3 +- + drivers/iio/counter/Kconfig | 3 +- + drivers/iio/dac/Kconfig | 3 +- + drivers/watchdog/Kconfig | 3 +- + include/soc/bcm2835/raspberrypi-firmware.h | 18 + + init/Kconfig | 2 +- + tools/gpio/gpio-event-mon.c | 2 +- + 37 files changed, 945 insertions(+), 1073 deletions(-) + 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 drivers/gpio/gpio-hlwd.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 +Merging pinctrl/for-next (dfb1c1da3da7 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Removing drivers/pinctrl/pinctrl-tz1090.c +Removing drivers/pinctrl/pinctrl-tz1090-pdc.c +Auto-merging drivers/pinctrl/Makefile +Auto-merging drivers/pinctrl/Kconfig +Removing Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt +Removing Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/actions,s900-pinctrl.txt | 178 ++ + .../bindings/pinctrl/axis,artpec6-pinctrl.txt | 16 +- + .../bindings/pinctrl/img,tz1090-pdc-pinctrl.txt | 127 - + .../bindings/pinctrl/img,tz1090-pinctrl.txt | 227 -- + .../bindings/pinctrl/pinctrl-mcp23s08.txt | 2 + + .../devicetree/bindings/pinctrl/pinctrl-mt65xx.txt | 4 +- + .../bindings/pinctrl/qcom,sdm845-pinctrl.txt | 176 ++ + .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 3 +- + drivers/pinctrl/Kconfig | 12 - + drivers/pinctrl/Makefile | 2 - + drivers/pinctrl/core.c | 109 +- + drivers/pinctrl/devicetree.c | 6 +- + drivers/pinctrl/meson/pinctrl-meson8b.c | 20 +- + drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c | 16 +- + drivers/pinctrl/pinctrl-amd.c | 14 + + drivers/pinctrl/pinctrl-artpec6.c | 66 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 54 +- + drivers/pinctrl/pinctrl-ocelot.c | 2 +- + drivers/pinctrl/pinctrl-tz1090-pdc.c | 989 ------ + drivers/pinctrl/pinctrl-tz1090.c | 2005 ------------ + drivers/pinctrl/qcom/Kconfig | 9 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-msm.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sdm845.c | 1323 ++++++++ + drivers/pinctrl/samsung/pinctrl-exynos-arm.c | 56 +- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 14 +- + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 28 +- + drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 7 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 61 +- + drivers/pinctrl/samsung/pinctrl-samsung.h | 40 +- + drivers/pinctrl/sh-pfc/Kconfig | 5 + + drivers/pinctrl/sh-pfc/Makefile | 1 + + drivers/pinctrl/sh-pfc/core.c | 6 + + drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 72 +- + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 565 +++- + drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 569 +++- + drivers/pinctrl/sh-pfc/pfc-r8a77965.c | 3193 ++++++++++++++++++++ + drivers/pinctrl/sh-pfc/pfc-r8a77995.c | 293 ++ + drivers/pinctrl/sh-pfc/pinctrl.c | 2 +- + drivers/pinctrl/sh-pfc/sh_pfc.h | 1 + + drivers/pinctrl/stm32/pinctrl-stm32.c | 3 +- + include/dt-bindings/gpio/meson8b-gpio.h | 121 +- + include/dt-bindings/pinctrl/mt7623-pinfunc.h | 24 + + 43 files changed, 6814 insertions(+), 3610 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdm845-pinctrl.txt + delete mode 100644 drivers/pinctrl/pinctrl-tz1090-pdc.c + delete mode 100644 drivers/pinctrl/pinctrl-tz1090.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sdm845.c + create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a77965.c +Merging pinctrl-samsung/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (bccaa3f917c9 pwm: meson: Add clock source configuration for Meson-AXG) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (dd206bec9a44 pidns: simpler allocation of pid_* caches) +$ git merge userns/for-next +Auto-merging kernel/pid_namespace.c +Merge made by the 'recursive' strategy. + kernel/pid_namespace.c | 67 ++++++++++++++++++-------------------------------- + 1 file changed, 24 insertions(+), 43 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 (6c3b6d508391 selftests/seccomp: Allow get_metadata to XFAIL) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 10 +- + 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/kselftest.h | 3 +- + tools/testing/selftests/kselftest_harness.h | 26 ++++- + tools/testing/selftests/lib.mk | 1 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 15 ++- + 11 files changed, 195 insertions(+), 13 deletions(-) + create mode 100644 tools/testing/selftests/android/ion/ionmap_test.c +Merging y2038/y2038 (8bad56707b0b arm64: fix perf_regs.c) +$ git merge y2038/y2038 +Auto-merging kernel/time/posix-timers.c +Auto-merging kernel/time/posix-stubs.c +Auto-merging kernel/time/hrtimer.c +Auto-merging kernel/compat.c +Auto-merging include/uapi/linux/time.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/compat.h +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging arch/x86/kernel/sys_x86_64.c +Auto-merging arch/x86/include/asm/sys_ia32.h +Auto-merging arch/x86/events/core.c +CONFLICT (modify/delete): arch/tile/include/asm/compat.h deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of arch/tile/include/asm/compat.h left in tree. +Auto-merging arch/s390/kvm/priv.c +Auto-merging arch/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/tile/include/asm/compat.h +arch/tile/include/asm/compat.h: needs merge +rm 'arch/tile/include/asm/compat.h' +$ git commit -v -a +[master 42a6a80738a4] Merge remote-tracking branch 'y2038/y2038' +$ git diff -M --stat --summary HEAD^.. + arch/Kconfig | 15 +++++++++ + arch/arm64/include/asm/compat.h | 11 ------- + arch/arm64/include/asm/stat.h | 1 + + arch/arm64/kernel/perf_regs.c | 1 + + arch/mips/include/asm/compat.h | 11 ------- + arch/mips/kernel/signal32.c | 2 +- + arch/parisc/include/asm/compat.h | 11 ------- + arch/powerpc/include/asm/compat.h | 11 ------- + arch/powerpc/kernel/asm-offsets.c | 2 +- + arch/powerpc/oprofile/backtrace.c | 1 + + arch/s390/hypfs/hypfs_sprp.c | 1 - + arch/s390/include/asm/compat.h | 11 ------- + arch/s390/include/asm/elf.h | 4 +-- + arch/s390/kvm/priv.c | 1 - + arch/s390/pci/pci_clp.c | 1 - + arch/sparc/include/asm/compat.h | 11 ------- + arch/x86/events/core.c | 2 +- + arch/x86/include/asm/compat.h | 11 ------- + arch/x86/include/asm/ftrace.h | 2 +- + arch/x86/include/asm/sys_ia32.h | 2 +- + arch/x86/kernel/sys_x86_64.c | 2 +- + drivers/s390/block/dasd_ioctl.c | 1 - + drivers/s390/char/fs3270.c | 1 - + drivers/s390/char/sclp_ctl.c | 1 - + drivers/s390/char/vmcp.c | 1 - + drivers/s390/cio/chsc_sch.c | 1 - + drivers/s390/net/qeth_core_main.c | 2 +- + include/linux/compat.h | 11 ++++--- + include/linux/compat_time.h | 23 ++++++++++++++ + include/linux/restart_block.h | 7 ++-- + include/linux/syscalls.h | 12 +++---- + include/linux/time.h | 4 +-- + include/linux/time64.h | 10 +++++- + include/uapi/asm-generic/posix_types.h | 1 + + include/uapi/linux/time.h | 7 ++++ + kernel/compat.c | 52 +++++------------------------- + kernel/time/hrtimer.c | 10 ++++-- + kernel/time/posix-stubs.c | 12 ++++--- + kernel/time/posix-timers.c | 24 ++++++++++---- + kernel/time/time.c | 58 +++++++++++++++++++++++++++++++--- + 40 files changed, 177 insertions(+), 175 deletions(-) + create mode 100644 include/linux/compat_time.h +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 (c24ae3b69146 coresight: etm4x: Fix bit shifting) +$ git merge coresight/next +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (2b1ee1cca25a rtc: 88pm860x: remove artificial limitation) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-cmos.c +Auto-merging drivers/rtc/Makefile +Auto-merging drivers/rtc/Kconfig +Auto-merging arch/parisc/kernel/time.c +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 +- + arch/parisc/kernel/time.c | 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 | 2 +- + 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 | 18 +- + 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 | 2 +- + 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-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 +- + include/linux/mfd/samsung/rtc.h | 11 - + include/linux/rtc.h | 29 +- + include/trace/events/rtc.h | 206 +++++++++ + 121 files changed, 1796 insertions(+), 1023 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 (4a07628cc017 Merge branch 'for-4.17/dax' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Resolved 'arch/x86/mm/init_64.c' using previous resolution. +Recorded preimage for 'fs/xfs/xfs_inode.h' +Auto-merging mm/gup.c +Auto-merging mm/Kconfig +Auto-merging include/linux/mm.h +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/xfs/xfs_inode.h +CONFLICT (content): Merge conflict in fs/xfs/xfs_inode.h +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext2/super.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/block_dev.c +Auto-merging drivers/nvdimm/pmem.c +Auto-merging drivers/nvdimm/btt.c +Auto-merging drivers/nvdimm/blk.c +Auto-merging drivers/acpi/nfit/core.c +Auto-merging arch/x86/mm/init_64.c +CONFLICT (content): Merge conflict in arch/x86/mm/init_64.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/xfs/xfs_inode.h'. +[master 20a2ff9b2672] Merge remote-tracking branch 'nvdimm/libnvdimm-for-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/mm/init_64.c | 60 +++++----- + drivers/acpi/nfit/core.c | 85 +++++++------- + drivers/acpi/nfit/mce.c | 5 +- + drivers/acpi/numa.c | 10 +- + drivers/dax/device.c | 38 +++---- + drivers/dax/pmem.c | 18 +-- + drivers/dax/super.c | 96 +++++++++++++--- + drivers/nvdimm/blk.c | 3 +- + drivers/nvdimm/btt.c | 3 +- + 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/pfn_devs.c | 27 +++-- + drivers/nvdimm/pmem.c | 17 +-- + drivers/nvdimm/region_devs.c | 17 ++- + fs/Kconfig | 1 + + fs/block_dev.c | 5 - + fs/dax.c | 231 ++++++++++++++++++++++++++++++--------- + fs/ext2/ext2.h | 1 + + fs/ext2/inode.c | 43 +++++--- + fs/ext2/namei.c | 18 +-- + fs/ext2/super.c | 6 +- + fs/ext4/inode.c | 38 +++++-- + fs/ext4/super.c | 6 +- + fs/libfs.c | 27 +++++ + fs/xfs/xfs_aops.c | 21 +++- + fs/xfs/xfs_aops.h | 1 + + fs/xfs/xfs_file.c | 76 ++++++++++++- + fs/xfs/xfs_inode.h | 16 +++ + fs/xfs/xfs_ioctl.c | 8 +- + fs/xfs/xfs_iops.c | 21 ++-- + fs/xfs/xfs_pnfs.c | 16 +-- + fs/xfs/xfs_pnfs.h | 6 +- + fs/xfs/xfs_super.c | 20 ++-- + include/linux/dax.h | 46 ++++++-- + include/linux/fs.h | 3 + + include/linux/memremap.h | 28 ++--- + include/linux/mm.h | 61 ++++++++--- + include/linux/nd.h | 6 + + include/linux/wait_bit.h | 70 ++++++++++++ + kernel/memremap.c | 33 +++++- + kernel/sched/wait_bit.c | 48 ++++++++ + mm/Kconfig | 5 + + mm/gup.c | 5 + + mm/hmm.c | 13 +-- + mm/swap.c | 3 +- + tools/testing/nvdimm/test/nfit.c | 199 ++++++++++++++++++++------------- + 53 files changed, 1104 insertions(+), 535 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 +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/eeprom/at24.txt | 4 ++++ + 1 file changed, 4 insertions(+) +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 (2d00fcb32f71 Merge branch 'kspp/gcc-plugin/infrastructure' into for-next/kspp) +$ git merge kspp/for-next/kspp +Merge made by the 'recursive' strategy. +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 (2623866b3006 tools/testing/selftests/sysctl/sysctl.sh: add range clamping test) +$ git merge --no-ff akpm-current/current +Resolved 'drivers/block/zram/zram_drv.h' using previous resolution. +Resolved 'mm/memory.c' using previous resolution. +Resolved 'mm/page_alloc.c' using previous resolution. +Resolved 'mm/sparse.c' 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 scripts/checkpatch.pl +Auto-merging mm/zsmalloc.c +Auto-merging mm/swap.c +Auto-merging mm/sparse.c +CONFLICT (content): Merge conflict in mm/sparse.c +Auto-merging mm/rmap.c +Auto-merging mm/page_alloc.c +CONFLICT (content): Merge conflict in mm/page_alloc.c +Auto-merging mm/nommu.c +Auto-merging mm/mmap.c +Auto-merging mm/memory.c +CONFLICT (content): Merge conflict in mm/memory.c +Auto-merging mm/ksm.c +Auto-merging mm/gup.c +Auto-merging mm/backing-dev.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/sys.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/params.c +Auto-merging kernel/panic.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging init/main.c +Auto-merging init/do_mounts_rd.c +Auto-merging include/net/sock.h +Auto-merging include/linux/sched/signal.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/kasan.h +Auto-merging include/linux/cgroup-defs.h +Auto-merging include/asm-generic/pgtable.h +Auto-merging fs/proc/proc_net.c +Auto-merging fs/proc/base.c +Auto-merging fs/ocfs2/dlmglue.c +Auto-merging fs/exec.c +Auto-merging fs/direct-io.c +Auto-merging fs/dcache.c +Auto-merging fs/buffer.c +Auto-merging fs/Kconfig +Auto-merging drivers/of/unittest.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 drivers/base/node.c +Auto-merging block/genhd.c +Auto-merging arch/x86/mm/init_64.c +CONFLICT (modify/delete): arch/tile/mm/mmap.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/tile/mm/mmap.c left in tree. +CONFLICT (modify/delete): arch/tile/kernel/pci_gx.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/tile/kernel/pci_gx.c left in tree. +Auto-merging arch/sparc/mm/tlb.c +Auto-merging arch/sparc/mm/init_64.c +Auto-merging arch/sparc/kernel/sys_sparc_64.c +CONFLICT (modify/delete): arch/score/mm/cache.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/score/mm/cache.c left in tree. +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging arch/powerpc/include/asm/hugetlb.h +Auto-merging arch/parisc/kernel/sys_parisc.c +Auto-merging arch/parisc/kernel/cache.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/score/mm/cache.c arch/tile/kernel/pci_gx.c arch/tile/mm/mmap.c +arch/score/mm/cache.c: needs merge +arch/tile/kernel/pci_gx.c: needs merge +arch/tile/mm/mmap.c: needs merge +rm 'arch/score/mm/cache.c' +rm 'arch/tile/kernel/pci_gx.c' +rm 'arch/tile/mm/mmap.c' +$ git commit -v -a +[master 97d9af859a13] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/admin-guide/kernel-parameters.txt | 54 +-- + Documentation/cgroup-v2.txt | 74 +++ + Documentation/sysctl/kernel.txt | 54 +-- + Documentation/sysctl/vm.txt | 5 +- + .../trace/postprocess/trace-vmscan-postprocess.pl | 4 +- + MAINTAINERS | 2 +- + arch/arc/mm/cache.c | 2 +- + 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/arm64/mm/mmu.c | 10 + + arch/h8300/include/asm/byteorder.h | 1 - + 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/s390/mm/mmap.c | 15 +- + arch/sh/mm/cache-sh4.c | 2 +- + arch/sh/mm/cache-sh7705.c | 2 +- + 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/mm/init_64.c | 33 +- + arch/x86/mm/mmap.c | 18 +- + arch/x86/mm/pgtable.c | 48 ++ + arch/xtensa/mm/cache.c | 2 +- + block/genhd.c | 2 +- + drivers/base/memory.c | 40 +- + 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/of/unittest.c | 2 +- + fs/Kconfig | 3 + + fs/binfmt_aout.c | 1 + + fs/binfmt_elf.c | 1 + + fs/binfmt_elf_fdpic.c | 1 + + fs/binfmt_flat.c | 1 + + fs/buffer.c | 2 +- + fs/dcache.c | 42 +- + fs/direct-io.c | 9 +- + fs/exec.c | 28 +- + fs/fcntl.c | 2 +- + fs/hugetlbfs/inode.c | 17 +- + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/aops.c | 4 +- + fs/ocfs2/aops.h | 2 +- + fs/ocfs2/dir.c | 2 +- + fs/ocfs2/dlm/dlmcommon.h | 3 - + fs/ocfs2/dlm/dlmdomain.c | 14 - + fs/ocfs2/dlm/dlmdomain.h | 25 +- + fs/ocfs2/dlm/dlmlock.c | 3 +- + fs/ocfs2/dlm/dlmmaster.c | 15 +- + fs/ocfs2/dlm/dlmrecovery.c | 16 +- + fs/ocfs2/dlmglue.c | 23 +- + fs/ocfs2/file.c | 16 +- + fs/ocfs2/filecheck.c | 357 ++++++--------- + 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 | 83 +++- + fs/proc/inode.c | 67 ++- + fs/proc/internal.h | 20 +- + fs/proc/meminfo.c | 15 +- + fs/proc/proc_net.c | 7 +- + fs/proc/proc_sysctl.c | 26 +- + fs/proc/root.c | 19 +- + fs/proc/task_mmu.c | 153 +++---- + fs/seq_file.c | 134 ++++-- + include/asm-generic/pgtable.h | 10 + + include/linux/binfmts.h | 3 + + include/linux/cgroup-defs.h | 5 + + include/linux/fault-inject.h | 5 +- + include/linux/hugetlb.h | 27 +- + include/linux/kasan.h | 4 +- + include/linux/kernel.h | 7 +- + include/linux/list_lru.h | 3 +- + include/linux/memblock.h | 13 +- + include/linux/memcontrol.h | 34 ++ + 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 | 19 +- + include/linux/slab_def.h | 4 +- + include/linux/slub_def.h | 28 +- + include/linux/swap.h | 51 +-- + include/linux/sysctl.h | 15 + + include/linux/thread_info.h | 6 +- + include/linux/utsname.h | 6 + + include/linux/zsmalloc.h | 2 + + include/net/sock.h | 4 +- + include/trace/events/migrate.h | 2 +- + include/trace/events/vmscan.h | 17 +- + 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/ipc_sysctl.c | 22 +- + ipc/msg.c | 17 +- + ipc/sem.c | 45 +- + ipc/shm.c | 23 +- + ipc/util.c | 1 + + ipc/util.h | 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 | 98 +++- + kernel/utsname.c | 20 +- + lib/Kconfig.debug | 48 +- + lib/Kconfig.ubsan | 7 + + lib/Makefile | 3 + + lib/ioremap.c | 6 +- + lib/test_bitmap.c | 10 +- + lib/test_kasan.c | 8 + + lib/test_ubsan.c | 144 ++++++ + lib/vsprintf.c | 18 +- + mm/Makefile | 5 +- + mm/backing-dev.c | 48 +- + mm/cma.c | 88 +++- + mm/compaction.c | 16 +- + mm/failslab.c | 2 +- + mm/gup.c | 4 +- + mm/huge_memory.c | 42 +- + mm/hugetlb.c | 31 +- + mm/internal.h | 5 +- + mm/kasan/kasan.c | 69 ++- + mm/kmemleak.c | 12 +- + mm/ksm.c | 8 +- + mm/list_lru.c | 74 ++- + mm/memblock.c | 93 ++-- + mm/memcontrol.c | 264 ++++++++++- + mm/memfd.c | 342 ++++++++++++++ + mm/memory-failure.c | 18 +- + mm/memory.c | 37 +- + mm/memory_hotplug.c | 55 +-- + mm/mempolicy.c | 43 +- + mm/migrate.c | 357 +++++++-------- + mm/mincore.c | 12 +- + mm/mmap.c | 14 +- + mm/nommu.c | 12 - + mm/oom_kill.c | 219 +++++---- + mm/page_alloc.c | 502 ++++++++++++++------- + 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 | 12 +- + mm/slab.h | 26 +- + mm/slab_common.c | 79 ++-- + mm/slub.c | 196 ++++---- + mm/sparse-vmemmap.c | 6 +- + mm/sparse.c | 66 ++- + 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 | 50 +- + mm/vmstat.c | 1 + + mm/z3fold.c | 35 +- + mm/zsmalloc.c | 58 ++- + net/9p/client.c | 6 +- + scripts/checkpatch.pl | 167 ++++--- + security/apparmor/lsm.c | 1 + + security/selinux/hooks.c | 4 + + security/smack/smack_lsm.c | 3 + + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/proc/.gitignore | 5 + + tools/testing/selftests/proc/Makefile | 10 + + 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/sysctl/sysctl.sh | 43 ++ + 230 files changed, 4706 insertions(+), 2594 deletions(-) + 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 +$ 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: ipc/mqueue: add missing error code in init_mqueue_fs() +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: 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: fs: fsnotify: account fsnotify metadata to kmemcg +Applying: fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix +Applying: headers: untangle kmemleak.h from mm.h +Applying: headers-untangle-kmemleakh-from-mmh-fix +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 + + 83edb2ba750d...c5a3856bbe37 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (c5a3856bbe37 sparc64: NG4 memset 32 bits overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/alpha/include/uapi/asm/mman.h | 1 + + arch/arm/include/asm/memory.h | 6 - + arch/arm64/include/asm/memory.h | 6 - + arch/mips/include/uapi/asm/mman.h | 1 + + 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 | 2 +- + arch/powerpc/kernel/machine_kexec_file_64.c | 39 +-- + 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/sparc/kernel/irq_64.c | 1 - + arch/sparc/lib/NG4memset.S | 26 +- + 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 | 2 +- + arch/x86/kernel/machine_kexec_64.c | 45 +-- + arch/x86/kernel/pci-dma.c | 1 - + arch/x86/kernel/x86_init.c | 1 + + arch/x86/mm/init_32.c | 1 + + arch/x86/mm/init_64.c | 1 + + arch/x86/xen/mmu_pv.c | 38 ++- + arch/xtensa/include/uapi/asm/mman.h | 1 + + drivers/iommu/exynos-iommu.c | 1 + + drivers/iommu/mtk_iommu_v1.c | 1 - + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/net/ethernet/ti/cpsw.c | 1 + + drivers/net/wireless/realtek/rtlwifi/pci.c | 1 - + .../wireless/realtek/rtlwifi/rtl8192c/fw_common.c | 1 - + drivers/staging/rtl8188eu/hal/fw.c | 2 +- + drivers/staging/rtlwifi/pci.c | 1 - + drivers/virtio/virtio_ring.c | 1 - + fs/binfmt_elf.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 +- + include/linux/const.h | 9 + + include/linux/fsnotify_backend.h | 12 +- + include/linux/kexec.h | 32 +- + include/linux/memcontrol.h | 7 + + include/linux/sched.h | 3 + + include/linux/sched/mm.h | 24 ++ + include/linux/slab.h | 60 +++- + include/uapi/asm-generic/mman-common.h | 3 + + include/uapi/linux/const.h | 13 +- + ipc/mqueue.c | 4 +- + kernel/fork.c | 3 + + kernel/kexec_file.c | 240 ++++++++++++++- + kernel/ucount.c | 1 + + lib/test_firmware.c | 1 + + mm/cma.c | 1 + + mm/memblock.c | 1 + + mm/memcontrol.c | 25 +- + mm/mmap.c | 11 + + mm/page_alloc.c | 4 - + net/core/sysctl_net_core.c | 1 - + net/ipv4/route.c | 1 - + security/apparmor/lsm.c | 1 - + security/keys/big_key.c | 1 + + 67 files changed, 594 insertions(+), 456 deletions(-) + create mode 100644 include/linux/const.h 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..e9bb9ebd02c3 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20180322 |