diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-04-05 14:47:22 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-04-05 14:47:22 +1000 |
| commit | aa36efa8b2a4ff33c70ef532ec58d49148f1872a (patch) | |
| tree | 847a19fb3ae3afe3e8b22fb3bcd28341263fc628 | |
| parent | bec5f00fcaac40a1380196d00985b8e38f777d6c (diff) | |
| download | linux-next-aa36efa8b2a4ff33c70ef532ec58d49148f1872a.tar.gz | |
Add linux-next specific files for 20160405next-20160405
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 234 | ||||
| -rw-r--r-- | Next/Trees | 236 | ||||
| -rw-r--r-- | Next/merge.log | 3786 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4261 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..524322595205 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,234 @@ +Name SHA1 +---- ---- +origin e865f4965ff636cf18c9bed52dba44899ff63594 +fixes 9735a22799b9214d17d3c231fe377fc852f042e9 +kbuild-current 3d1450d54a4fc277fc4598acf2335f74b66b08fc +arc-current f86b8892a1b7ca03b048024519771d2db660398c +arm-current 0fc03d4c87611cefa4df10404a7e0df49b0a2132 +m68k-current efbec135f11d6f14f40806935827c53d8889f59b +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +powerpc-fixes 71528d8bd7a8aa920cd69d4223c6c87d5849257d +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +sparc 5ec712934ce1ff6e33bf3878034a91ca9bd600c9 +net c862cc9b70526a71d07e7bd86d9b61d1c792cead +ipsec d6af1a31cc72fbd558c7eddbc36f61bf09d1cf6a +ipvs 7617a24f83b5d67f4dab1844956be1cebc44aec8 +wireless-drivers 15da5d11040c636cddf85bd93fd4abe85f02fc9f +mac80211 ad8ec957f693c7f76e02793289e7819d087642be +sound-current f03b24a851d32ca85dacab01785b24a7ee717d37 +pci-current f55532a0c0b8bb6148f4e07853b876ef73bc69ca +driver-core.current f55532a0c0b8bb6148f4e07853b876ef73bc69ca +tty.current 5e00bbfbc5ec21e87d24e206bba9fc2cbe6631a1 +usb.current 5a07975ad0a36708c6b0a5b9fea1ff811d0b0c1f +usb-gadget-fixes 7e8ac87a44746b03a37d296fdb3e6b5d96350952 +usb-serial-fixes f55532a0c0b8bb6148f4e07853b876ef73bc69ca +usb-chipidea-fixes d144dfea8af7108f613139623e63952ed7e69c0c +staging.current 53c43c5ca13328ac8f415aa2251791b441a12b51 +char-misc.current f55532a0c0b8bb6148f4e07853b876ef73bc69ca +input-current 162f98dea487206d9ab79fc12ed64700667a894d +crypto-current ef609c238a8ea163cb0af759cc73c9e2555c89da +ide 1993b176a8224e371e0732ffada7ab9eb3b0912b +devicetree-current f76502aa9140ec338a59487218bf70a9c9e92b8f +rr-fixes 8244062ef1e54502ef55f54cced659913f244c3e +vfio-fixes 8160c4e455820d5008a1116d2dca35f0363bb062 +kselftest-fixes 505ce68c6da3432454c62e43c24a22ea5b1d754b +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 1b52e50f2a402a266f1ba2281f0a57e87637a047 +drm-intel-fixes 9735a22799b9214d17d3c231fe377fc852f042e9 +asm-generic a1cbaad75a8f891bca9cc65a1fb95ae1b28d2f6a +arc f55532a0c0b8bb6148f4e07853b876ef73bc69ca +arm 7150fbc6a7ec198c47fc6ade89084f6dc6a702b2 +arm-perf f55532a0c0b8bb6148f4e07853b876ef73bc69ca +arm-soc 35fe688abfcfeadf678664ae2e04815bb416de5a +at91 503057c24478eece49de687015ab80bce3b2dae8 +bcm2835-dt 48c3b1441a772f3623bfd8f42a35664b0172daa7 +bcm2835-soc 92e963f50fc74041b5e9e744c330dca48e04f08d +bcm2835-drivers 92e963f50fc74041b5e9e744c330dca48e04f08d +bcm2835-defconfig 8d1a8c92a8c04f344a57c271b5c0792bc552ae3e +berlin 9a7e0683324926963bcee47058c4f86f4fb6b409 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 00cb3ac4afaa685f3d8bb4f6c1ebb134dae67d74 +keystone 1bdd5a9b339c7a5e1443d40aecccaa87d858ea78 +mvebu 550cd80600c7490a2722addb05ba36951ab261a3 +omap 6de37509e43dfc2ba7362656d53902cc118ce3b7 +omap-pending 3ca4a238106dedc285193ee47f494a6584b6fd2f +qcom faaa41613dc85a708c58f7e9dc817d95542b5c31 +renesas 301c9ed92b8f689621c836c8335cf6cd5125828d +rockchip 0b4b91b4c9b20df772f18484cfdcd73e930d2e97 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 92e963f50fc74041b5e9e744c330dca48e04f08d +samsung-krzk dc66b800f7efab927a54d79236320b1f45cd64a5 +sunxi 93a96dc4ccc176b612a402f278c563d5414cc3ba +tegra 755f165105b11619cc1da577f030fce110fa9ea9 +arm64 f55532a0c0b8bb6148f4e07853b876ef73bc69ca +blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris f9f3f864b5e8c09d7837d8980edba4ad52969819 +h8300 8cad489261c564d4ee1db4de4ac365af56807d8a +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 7e26e9ff0a9301398bd7cf8d896536da3a54aa9a +m68k efbec135f11d6f14f40806935827c53d8889f59b +m68knommu a3595962d82495f51a80feb19dcdb135556a9527 +metag c8b6ad8b3f873ff5b971523f439f4b5a1ac75842 +microblaze 10f4b26deb411fdd61054a59d8c7d82e29712e33 +mips 24fead1eb3233ab5389bd85cf5e9b7b27e393254 +nios2 8fe889274c7a4d95c3e2d06f87ead499ea6faa2d +parisc-hd b562e44f507e863c6792946e4e1b1449fbbac85d +powerpc 6e669f085d595cb6053920832c89f1a13067db44 +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl fba4e9f9898ab181703723b9890ba29345edfe08 +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 05f13c49f4b81c7519b3a3b4965c944df9b883ab +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile f98983bbba0db6ba35fff37a4e8466f2152c39c5 +uml ad32a1f3c36b046b2e7b0361b88c18e3af61419e +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa 9da8320bb97768e35f2e64fa7642015271d672eb +btrfs bb7ab3b92e46da06b580c6f83abe7894dc449cca +btrfs-kdave eb2b7a82d42ef3c28604d82e4704978bed0312a9 +ceph 7c886661dc31992bf8fc8f4811fa1f210981924e +cifs b562e44f507e863c6792946e4e1b1449fbbac85d +configfs 96c22a3293512ba684e73a981196430f524689da +ecryptfs 933c32fe0e42b86d9bc5779401c3ce93d56bd231 +ext3 8f9e8f5fcc059a3cba87ce837c88316797ef3645 +ext4 dd018b1f64c14725a5d00468080eb04d8e21c119 +f2fs 0bc3d0fd7525bc02ce276d136622d29b1c0253d1 +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 742f992708dff0ada8b426228900ffb009c7167b +gfs2 3e11e530415027a57936545957126aff49267b76 +jfs 6ed71e9819ac3412fc6a3495f5ce141df274c916 +nfs 9735a22799b9214d17d3c231fe377fc852f042e9 +nfsd ac503e4a309a3993a069750f95c2815ee5db5aa5 +orangefs 45996492e5c85aa0ac93a95d1b2d1ed56851c865 +overlayfs e3608e3f68f6e82113555c873333722362eca6a0 +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs c27cb97218b3e72417ffc5e73dce488844017b39 +xfs f55532a0c0b8bb6148f4e07853b876ef73bc69ca +file-locks 5af9c2e19da6514a1a50b07d97d93b74a7711873 +vfs 489eda8cd1a695e3a8cf61dbee07f97ac83dc02c +pci f55532a0c0b8bb6148f4e07853b876ef73bc69ca +hid b7c33d5dcfe2d790a62c287bbcfc273d28ec9773 +i2c 8dcf32175b4e1817ea037a051f10dd7823e52344 +jdelvare-hwmon f02de116250d4ac6137cd3255be7d1f5678ac460 +dmi c3db05ecf8acef3e4ae9436d357a067052061eb0 +hwmon-staging c528f2aae5711c06fe5f9d892cd68d48e5f4e66a +v4l-dvb 405ddbfa68177b6169d09bc2308a39196a8eb64a +libata f8193efa5cdc5b82de00b2a423e5da53fa82f2fe +pm ea58c523eefdeefbc995a30bc4a15b55d19eb1bd +idle b318c60f942ce0165f65082696cbc85f51fa78df +thermal 81ad4276b505e987dd8ebbdf63605f92cd172b52 +thermal-soc c960fe12d00275c52dffc0013d64c5a50538a74c +ieee1394 384fbb96f9268eee0b703b39cb07557403bd9aac +dlm 82c7d823cc31cf56d964eebe1f91aaf1691cddce +swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df +slave-dma f55532a0c0b8bb6148f4e07853b876ef73bc69ca +net-next 9ef280c6c28f0c01aa9d909263ad47c796713a8e +ipsec-next cb866e3298cd7412503fc7e2c265753c853fab9d +ipvs-next f6ca9f46f6615c3a87529550058d1b468c0cad89 +wireless-drivers-next e46b4e2b46e173889b19999b8bd033d5e8b3acf0 +bluetooth 9ef280c6c28f0c01aa9d909263ad47c796713a8e +mac80211-next 0a87cadbb54e1595a5f64542adb4c63be914d290 +rdma 520a07bff6fbb23cac905007d74c67058b189acb +mtd 20c07a5bf094198ff2382aa5e7c930b3c9807792 +l2-mtd 5651d6aaf489d1db48c253cf884b40214e91c2c5 +nand be17c419f889b66142c935e4e349f7c3c1298f94 +crypto 34074205bb9f04b416efb3cbedcd90f418c86200 +drm 4604202ca8d2a5e33b4bca0812b5d92975ed1bd8 +drm-panel c8a3b2ae07130042682bc8e031bcfbae3754463d +drm-intel 27af5eea54d161e1636001a7f2b5efd3b7a3d1f9 +drm-tegra 3a9b33c6048a9f41c596954e9c3de7c3ab3c4717 +drm-misc 249c4f538b1aae55d41699f8bafc6cb762a7f48f +drm-exynos 25364a9e54fb8296837061bf684b76d20eec01fb +drm-msm fcda50c8f484cf1140232c8444470449f0619db9 +hdlcd 69c2565a3cca3d79572941d62165af7805d72762 +drm-vc4 4abfa518f0a071bb3c66e6f88feae3eeefaede03 +kbuild 2468fc97cc4555c37fa491379c98561b30c739f3 +kconfig f55532a0c0b8bb6148f4e07853b876ef73bc69ca +regmap 1688fc1d57333f8808f8cf04b1a5fdeb10c307c0 +sound 44fde3b89ba1e154b3cec7d711703fff53852983 +sound-asoc c6da59a2ef1dabe0e0cf9c0d81d24a9af2170428 +modules b37a05c083c85c2657dca9bbe1f5d79dccf756d5 +input 7d8d86252307ce34925c5ddec4ef1b32670353b9 +block 258b83ad99309bd13e90181acfaf3e7330627285 +device-mapper ef6e0d57417a198a7e978d496b49884fc3c6963c +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc-uh 1dceb0415aa0c6bc11dacdab47c9ef83a3604166 +md f9a67b1182e5abfcfcec24762ea95a77332f035e +mfd a557a7a09b085d7f940d9b28d07bba82dec3c038 +backlight 60d613d6aef4ae49988eeb3ad38af948c561db1e +battery 0df6e32b0e36710fe989095241833e09dac3e41d +omap_dss2 32ad61951574d011d363694d6037592e99da9421 +regulator 77f8e8e944cbadeeed9f48e345806e0b3c9693aa +security 9735a22799b9214d17d3c231fe377fc852f042e9 +integrity 95ee08fa373b9ede1059c2f384cfeafe10dcd6bb +keys 88a1b564a20e371e6be41b39b85673e9c1959491 +selinux e8203d2af614fba24fdc704401d08d3c0646927e +tpmdd 59f95b842ad0383b171df3ae81ab39f998467a76 +watchdog d1ed3ba4e3d76b4ebec239c64f990c26d7935700 +iommu 70cf769c5ba283483a42c46f3734202b55dd3041 +dwmw2-iommu 46924008273ed03bd11dbb32136e3da4cfe056e1 +vfio c4aec3101319f84363a57e09086c2aff6c60a3c3 +jc_docs 4817ebb144ffa5a1a2bc84b89ed9655dbe6c4502 +trivial d00cd819d7dfb1a24d814457f47ff4d6c7be152c +audit 0bf676d1fd5144e66ac06939fa3c7c12086c3b18 +devicetree 48a9b733e644ab4cc8e2a98950a36ddb12b8c54e +dt-rh bc553986a2f7c56d0de811485d5312ea29692d5d +mailbox aca04ce5dbda50758b813b1e3d710098991cfa9a +spi 80bed53f77e4659381f64113245175d8104d89d5 +tip c6ddb3131c7f0a1aa1863b7714c8d9255fa6011e +clockevents 23cb25d0f407e83be10747258092843e8e20d535 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd ff6fd1478c531a40279cf013227279f31ff90b41 +irqchip a66ce4b7d9d20b59afe0a898fa0b4faf0651fbcd +ftrace 7e6867bf831c71fe0e47438831ae3a94d4c7ab3c +rcu f74d79be23b4092c1ceedd1f9f540e0c72d47440 +kvm 1993b176a8224e371e0732ffada7ab9eb3b0912b +kvm-arm b40c4892d175874d118860c8282a85ee7b64bcbb +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus 58ded4201ff028b15f6b317228faa5f154a0663f +kvms390 c54f0d6ae057444453f5167e66ed999e8cf26936 +xen-tip 85d1a29de8e4e5bce20ca02103acf1082a6e530a +percpu 18fc93fd64129c96432812cb44f59c963871889b +workqueues 22aceb317678057dced5f1d6e3ac15acdb863e7b +drivers-x86 fffcad87d4e7c5f6f6f6e5fc9d337bd6f197f80f +chrome-platform 1dc318166a9a3c8646d1f8af6cff246ea89853b2 +hsi 87d99063be016ceee90723a13365a40b21eec0d9 +leds 916fe619951f41b55d4f2b9f26d64ad981bc0dfa +ipmi 42a018c63aee41d93962cf39e536c6f31fc023c1 +driver-core 3a3a5fece6f28c14d3d05c74fb7696412e53a067 +tty f55532a0c0b8bb6148f4e07853b876ef73bc69ca +usb f55532a0c0b8bb6148f4e07853b876ef73bc69ca +usb-gadget 0561f77e2db9e72dc32e4f82b56fca8ba6b31171 +usb-serial f55532a0c0b8bb6148f4e07853b876ef73bc69ca +usb-chipidea-next 01b8479400abdd61b026df37a3a19de7b8df32f5 +staging eb7bfed901b9fea6e48bec10009dc8c8641e36e7 +char-misc f55532a0c0b8bb6148f4e07853b876ef73bc69ca +extcon f55532a0c0b8bb6148f4e07853b876ef73bc69ca +cgroup 08fb4e7f8d5f2b4f01e6884b79d157ce32217f9a +scsi cf5277b893e53ea98180b6313489b83ee9266e2e +target-updates 5e47f1985d7107331c3f64fb3ec83d66fd73577e +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +pinctrl ca1c8b640fe8276f6171dcffebbbb466431aba6c +vhost c67f5db82027ba6d2ea4ac9176bc45996a03ae6a +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg d75868496ca0af1685f31726d8f5b5037c092a7a +gpio 8db9fce084e5d984497e521d2ce6246c9196fb8e +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm f55532a0c0b8bb6148f4e07853b876ef73bc69ca +dma-buf 8f496d3fcc9df8823e36a023a2fd8b08c7993f4c +userns f2ca379642d7a843be972ea4167abdd3c8c9e5d1 +ktest f55532a0c0b8bb6148f4e07853b876ef73bc69ca +clk c0553d04f8d35bf9706e20ba392ffa61ab2b6f5c +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest f55532a0c0b8bb6148f4e07853b876ef73bc69ca +y2038 477b8541b31fd4d32168514203a8da8b73884d90 +luto-misc afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc +borntraeger 36f90b0a2ddd60823fe193a85e60ff1906c2a9b3 +livepatching 222d586ca829e1805b609a75d3454eac107cdd4e +coresight a587ddafe3870f452ec9cdbda0bb0891b6c0494c +rtc 26ec9313b53744fdd2fcd915ac33bfdb0dc10160 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm fc0c2028135c7f75fce36b90e44efb8003a9173b +akpm-current 7a55317f3165f970a83b8bab110dc45574f7acde +akpm a005321fd803e44cabf70c098f4197e516e07806 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..dec9978e0d76 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,236 @@ +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/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#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 +powerpc-merge-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.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 +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 +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 +devicetree-current git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/merge +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +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 +ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +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://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/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 +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835-dt git git://github.com/anholt/linux.git#bcm2835-dt-next +bcm2835-soc git git://github.com/anholt/linux.git#bcm2835-soc-next +bcm2835-drivers git git://github.com/anholt/linux.git#bcm2835-drivers-next +bcm2835-defconfig git git://github.com/anholt/linux.git#bcm2835-defconfig-next +berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/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 +omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.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 +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-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/mripard/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 +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +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.git#mips-for-linux-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.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 +powerpc-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-denx-agust.git#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 +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.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 +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +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 +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git#for-next +file-locks git git://git.samba.org/jlayton/linux.git#linux-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +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 +jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/ +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 +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#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 +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-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 +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +nand git git://github.com/linux-nand/linux.git#nand/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-intel#topic/drm-misc +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next +drm-msm git git://people.freedesktop.org/~robclark/linux#msm-next +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +drm-vc4 git git://github.com/anholt/linux.git#drm-vc4-next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-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/rusty/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.infradead.org/battery-2.6.git#master +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.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 +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.infradead.org/users/pcmoore/selinux#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 +jc_docs git git://git.lwn.net/linux.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.infradead.org/users/pcmoore/audit#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/next +dt-rh 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.infradead.org/users/jcooper/linux.git#irqchip/for-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +kvm-ppc-paulus 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 git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/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://git.code.sf.net/p/openipmi/linux-ipmi#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-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 +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-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 +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 +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-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 +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.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 +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +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 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +borntraeger git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +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 +hwspinlock git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git#for-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +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..749d7951f39e --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3786 @@ +$ date -R +Tue, 05 Apr 2016 09:24:47 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 9735a22799b9 Linux 4.6-rc2 +Merging origin/master (e865f4965ff6 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) +$ git merge origin/master +Updating 9735a22799b9..e865f4965ff6 +Fast-forward + Documentation/filesystems/cramfs.txt | 2 +- + Documentation/filesystems/tmpfs.txt | 2 +- + Documentation/filesystems/vfs.txt | 4 +- + arch/arc/mm/cache.c | 2 +- + arch/arm/mm/flush.c | 4 +- + arch/parisc/kernel/cache.c | 2 +- + arch/parisc/mm/init.c | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 4 +- + arch/s390/hypfs/inode.c | 4 +- + block/bio.c | 12 +- + block/blk-core.c | 2 +- + block/blk-settings.c | 12 +- + block/blk-sysfs.c | 8 +- + block/cfq-iosched.c | 2 +- + block/compat_ioctl.c | 4 +- + block/ioctl.c | 4 +- + block/partition-generic.c | 8 +- + drivers/block/aoe/aoeblk.c | 2 +- + drivers/block/brd.c | 2 +- + drivers/block/drbd/drbd_int.h | 4 +- + drivers/block/drbd/drbd_nl.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- + drivers/gpu/drm/armada/armada_gem.c | 4 +- + drivers/gpu/drm/drm_gem.c | 4 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- + drivers/gpu/drm/i915/i915_gem.c | 8 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- + drivers/gpu/drm/ttm/ttm_tt.c | 4 +- + drivers/gpu/drm/via/via_dmablit.c | 2 +- + drivers/md/bitmap.c | 2 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 2 +- + drivers/misc/ibmasm/ibmasmfs.c | 4 +- + drivers/misc/vmw_vmci/vmci_queue_pair.c | 2 +- + drivers/mmc/core/host.c | 6 +- + drivers/mmc/host/sh_mmcif.c | 2 +- + drivers/mmc/host/tmio_mmc_dma.c | 4 +- + drivers/mmc/host/tmio_mmc_pio.c | 2 +- + drivers/mmc/host/usdhi6rol0.c | 2 +- + drivers/mtd/devices/block2mtd.c | 6 +- + drivers/mtd/nand/nandsim.c | 6 +- + drivers/nvdimm/btt.c | 2 +- + drivers/nvdimm/pmem.c | 2 +- + drivers/oprofile/oprofilefs.c | 4 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/st.c | 4 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 2 +- + .../lustre/include/linux/libcfs/linux/linux-mem.h | 4 +- + drivers/staging/lustre/include/linux/lnet/types.h | 2 +- + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 2 +- + drivers/staging/lustre/lnet/libcfs/debug.c | 2 +- + drivers/staging/lustre/lnet/libcfs/tracefile.c | 16 +- + drivers/staging/lustre/lnet/libcfs/tracefile.h | 6 +- + drivers/staging/lustre/lnet/lnet/lib-md.c | 2 +- + drivers/staging/lustre/lnet/lnet/lib-move.c | 6 +- + drivers/staging/lustre/lnet/lnet/lib-socket.c | 4 +- + drivers/staging/lustre/lnet/lnet/router.c | 6 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 20 +- + drivers/staging/lustre/lnet/selftest/conctl.c | 4 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 10 +- + drivers/staging/lustre/lnet/selftest/framework.c | 2 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 2 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 6 +- + .../lustre/include/linux/lustre_patchless_compat.h | 2 +- + drivers/staging/lustre/lustre/include/lu_object.h | 2 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 6 +- + drivers/staging/lustre/lustre/include/lustre_mdc.h | 4 +- + drivers/staging/lustre/lustre/include/lustre_net.h | 10 +- + drivers/staging/lustre/lustre/include/obd.h | 4 +- + .../staging/lustre/lustre/include/obd_support.h | 2 +- + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 4 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 12 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 2 +- + drivers/staging/lustre/lustre/llite/dir.c | 23 +- + .../staging/lustre/lustre/llite/llite_internal.h | 8 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 8 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 8 +- + drivers/staging/lustre/lustre/llite/lloop.c | 12 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 18 +- + drivers/staging/lustre/lustre/llite/rw.c | 24 +- + drivers/staging/lustre/lustre/llite/rw26.c | 28 +-- + drivers/staging/lustre/lustre/llite/vvp_io.c | 10 +- + drivers/staging/lustre/lustre/llite/vvp_page.c | 8 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 12 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 6 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 22 +- + drivers/staging/lustre/lustre/obdclass/cl_page.c | 6 +- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 6 +- + .../lustre/lustre/obdclass/linux/linux-obdo.c | 5 +- + .../lustre/lustre/obdclass/linux/linux-sysctl.c | 6 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 6 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 30 +-- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 16 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 44 ++-- + drivers/staging/lustre/lustre/osc/osc_page.c | 6 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 26 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 2 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/recover.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 2 +- + drivers/usb/gadget/function/f_fs.c | 4 +- + drivers/usb/gadget/legacy/inode.c | 4 +- + drivers/usb/storage/scsiglue.c | 2 +- + drivers/video/fbdev/pvr2fb.c | 2 +- + fs/9p/vfs_addr.c | 18 +- + fs/9p/vfs_file.c | 4 +- + fs/9p/vfs_super.c | 2 +- + fs/affs/file.c | 26 +- + fs/afs/dir.c | 2 +- + fs/afs/file.c | 4 +- + fs/afs/mntpt.c | 6 +- + fs/afs/super.c | 4 +- + fs/afs/write.c | 26 +- + fs/binfmt_elf.c | 2 +- + fs/binfmt_elf_fdpic.c | 2 +- + fs/block_dev.c | 4 +- + fs/btrfs/check-integrity.c | 64 ++--- + fs/btrfs/compression.c | 84 +++---- + fs/btrfs/disk-io.c | 14 +- + fs/btrfs/extent-tree.c | 4 +- + fs/btrfs/extent_io.c | 266 ++++++++++----------- + fs/btrfs/extent_io.h | 6 +- + fs/btrfs/file-item.c | 4 +- + fs/btrfs/file.c | 40 ++-- + fs/btrfs/free-space-cache.c | 30 +-- + fs/btrfs/inode-map.c | 10 +- + fs/btrfs/inode.c | 104 ++++---- + fs/btrfs/ioctl.c | 84 +++---- + fs/btrfs/lzo.c | 32 +-- + fs/btrfs/raid56.c | 28 +-- + fs/btrfs/reada.c | 30 +-- + fs/btrfs/relocation.c | 16 +- + fs/btrfs/scrub.c | 24 +- + fs/btrfs/send.c | 16 +- + fs/btrfs/struct-funcs.c | 4 +- + fs/btrfs/tests/extent-io-tests.c | 44 ++-- + fs/btrfs/tests/free-space-tests.c | 2 +- + fs/btrfs/volumes.c | 14 +- + fs/btrfs/zlib.c | 38 +-- + fs/buffer.c | 100 ++++---- + fs/cachefiles/rdwr.c | 38 +-- + fs/ceph/addr.c | 114 ++++----- + fs/ceph/caps.c | 2 +- + fs/ceph/dir.c | 4 +- + fs/ceph/file.c | 32 +-- + fs/ceph/inode.c | 6 +- + fs/ceph/mds_client.c | 2 +- + fs/ceph/mds_client.h | 2 +- + fs/ceph/super.c | 8 +- + fs/cifs/cifsfs.c | 2 +- + fs/cifs/cifsglob.h | 4 +- + fs/cifs/cifssmb.c | 16 +- + fs/cifs/connect.c | 2 +- + fs/cifs/file.c | 96 ++++---- + fs/cifs/inode.c | 10 +- + fs/configfs/mount.c | 4 +- + fs/cramfs/README | 26 +- + fs/cramfs/inode.c | 32 +-- + fs/crypto/crypto.c | 8 +- + fs/dax.c | 34 +-- + fs/direct-io.c | 26 +- + fs/dlm/lowcomms.c | 8 +- + fs/ecryptfs/crypto.c | 22 +- + fs/ecryptfs/inode.c | 8 +- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/main.c | 8 +- + fs/ecryptfs/mmap.c | 44 ++-- + fs/ecryptfs/read_write.c | 14 +- + fs/efivarfs/super.c | 4 +- + fs/exofs/dir.c | 30 +-- + fs/exofs/inode.c | 34 +-- + fs/exofs/namei.c | 4 +- + fs/ext2/dir.c | 36 +-- + fs/ext2/namei.c | 6 +- + fs/ext4/crypto.c | 8 +- + fs/ext4/dir.c | 4 +- + fs/ext4/ext4.h | 4 +- + fs/ext4/file.c | 4 +- + fs/ext4/inline.c | 18 +- + fs/ext4/inode.c | 118 ++++----- + fs/ext4/mballoc.c | 40 ++-- + fs/ext4/move_extent.c | 16 +- + fs/ext4/page-io.c | 4 +- + fs/ext4/readpage.c | 12 +- + fs/ext4/super.c | 4 +- + fs/ext4/symlink.c | 4 +- + fs/f2fs/data.c | 52 ++-- + fs/f2fs/debug.c | 6 +- + fs/f2fs/dir.c | 4 +- + fs/f2fs/f2fs.h | 2 +- + fs/f2fs/file.c | 74 +++--- + fs/f2fs/inline.c | 10 +- + fs/f2fs/namei.c | 16 +- + fs/f2fs/node.c | 10 +- + fs/f2fs/recovery.c | 2 +- + fs/f2fs/segment.c | 16 +- + fs/f2fs/super.c | 108 +++++---- + fs/freevxfs/vxfs_immed.c | 4 +- + fs/freevxfs/vxfs_lookup.c | 12 +- + fs/freevxfs/vxfs_subr.c | 2 +- + fs/fs-writeback.c | 2 +- + fs/fscache/page.c | 10 +- + fs/fuse/dev.c | 26 +- + fs/fuse/file.c | 72 +++--- + fs/fuse/inode.c | 16 +- + fs/gfs2/aops.c | 44 ++-- + fs/gfs2/bmap.c | 12 +- + fs/gfs2/file.c | 16 +- + fs/gfs2/meta_io.c | 4 +- + fs/gfs2/quota.c | 14 +- + fs/gfs2/rgrp.c | 5 +- + fs/hfs/bnode.c | 12 +- + fs/hfs/btree.c | 20 +- + fs/hfs/inode.c | 8 +- + fs/hfsplus/bitmap.c | 2 +- + fs/hfsplus/bnode.c | 90 +++---- + fs/hfsplus/btree.c | 22 +- + fs/hfsplus/inode.c | 8 +- + fs/hfsplus/super.c | 2 +- + fs/hfsplus/xattr.c | 6 +- + fs/hostfs/hostfs_kern.c | 18 +- + fs/hugetlbfs/inode.c | 10 +- + fs/isofs/compress.c | 36 +-- + fs/isofs/inode.c | 2 +- + fs/jbd2/commit.c | 4 +- + fs/jbd2/journal.c | 2 +- + fs/jbd2/transaction.c | 4 +- + fs/jffs2/debug.c | 8 +- + fs/jffs2/file.c | 23 +- + fs/jffs2/fs.c | 8 +- + fs/jffs2/gc.c | 8 +- + fs/jffs2/nodelist.c | 8 +- + fs/jffs2/write.c | 7 +- + fs/jfs/jfs_metapage.c | 42 ++-- + fs/jfs/jfs_metapage.h | 4 +- + fs/jfs/super.c | 2 +- + fs/kernfs/mount.c | 4 +- + fs/libfs.c | 24 +- + fs/logfs/dev_bdev.c | 2 +- + fs/logfs/dev_mtd.c | 10 +- + fs/logfs/dir.c | 12 +- + fs/logfs/file.c | 26 +- + fs/logfs/readwrite.c | 20 +- + fs/logfs/segment.c | 28 +-- + fs/logfs/super.c | 16 +- + fs/minix/dir.c | 18 +- + fs/minix/namei.c | 4 +- + fs/mpage.c | 22 +- + fs/ncpfs/dir.c | 10 +- + fs/ncpfs/ncplib_kernel.h | 2 +- + fs/nfs/blocklayout/blocklayout.c | 24 +- + fs/nfs/blocklayout/blocklayout.h | 4 +- + fs/nfs/client.c | 8 +- + fs/nfs/dir.c | 4 +- + fs/nfs/direct.c | 8 +- + fs/nfs/file.c | 20 +- + fs/nfs/internal.h | 6 +- + fs/nfs/nfs4xdr.c | 2 +- + fs/nfs/objlayout/objio_osd.c | 2 +- + fs/nfs/pagelist.c | 6 +- + fs/nfs/pnfs.c | 6 +- + fs/nfs/read.c | 16 +- + fs/nfs/write.c | 4 +- + fs/nilfs2/bmap.c | 2 +- + fs/nilfs2/btnode.c | 10 +- + fs/nilfs2/dir.c | 32 +-- + fs/nilfs2/gcinode.c | 2 +- + fs/nilfs2/inode.c | 4 +- + fs/nilfs2/mdt.c | 14 +- + fs/nilfs2/namei.c | 4 +- + fs/nilfs2/page.c | 18 +- + fs/nilfs2/recovery.c | 4 +- + fs/nilfs2/segment.c | 2 +- + fs/ntfs/aops.c | 50 ++-- + fs/ntfs/aops.h | 4 +- + fs/ntfs/attrib.c | 28 +-- + fs/ntfs/bitmap.c | 10 +- + fs/ntfs/compress.c | 77 +++--- + fs/ntfs/dir.c | 56 ++--- + fs/ntfs/file.c | 56 ++--- + fs/ntfs/index.c | 14 +- + fs/ntfs/inode.c | 12 +- + fs/ntfs/lcnalloc.c | 6 +- + fs/ntfs/logfile.c | 16 +- + fs/ntfs/mft.c | 34 +-- + fs/ntfs/ntfs.h | 2 +- + fs/ntfs/super.c | 72 +++--- + fs/ocfs2/alloc.c | 28 +-- + fs/ocfs2/aops.c | 50 ++-- + fs/ocfs2/cluster/heartbeat.c | 10 +- + fs/ocfs2/dlmfs/dlmfs.c | 4 +- + fs/ocfs2/file.c | 14 +- + fs/ocfs2/mmap.c | 6 +- + fs/ocfs2/ocfs2.h | 20 +- + fs/ocfs2/quota_global.c | 11 +- + fs/ocfs2/refcounttree.c | 24 +- + fs/ocfs2/super.c | 4 +- + fs/orangefs/inode.c | 10 +- + fs/orangefs/orangefs-bufmap.c | 4 +- + fs/orangefs/orangefs-utils.c | 2 +- + fs/pipe.c | 6 +- + fs/proc/task_mmu.c | 2 +- + fs/proc/vmcore.c | 4 +- + fs/pstore/inode.c | 4 +- + fs/qnx6/dir.c | 16 +- + fs/qnx6/inode.c | 4 +- + fs/qnx6/qnx6.h | 2 +- + fs/quota/dquot.c | 13 +- + fs/ramfs/inode.c | 4 +- + fs/reiserfs/file.c | 4 +- + fs/reiserfs/inode.c | 44 ++-- + fs/reiserfs/ioctl.c | 4 +- + fs/reiserfs/journal.c | 6 +- + fs/reiserfs/stree.c | 4 +- + fs/reiserfs/tail_conversion.c | 4 +- + fs/reiserfs/xattr.c | 18 +- + fs/splice.c | 32 +-- + fs/squashfs/block.c | 4 +- + fs/squashfs/cache.c | 18 +- + fs/squashfs/decompressor.c | 2 +- + fs/squashfs/file.c | 24 +- + fs/squashfs/file_direct.c | 22 +- + fs/squashfs/lz4_wrapper.c | 8 +- + fs/squashfs/lzo_wrapper.c | 8 +- + fs/squashfs/page_actor.c | 4 +- + fs/squashfs/page_actor.h | 2 +- + fs/squashfs/super.c | 2 +- + fs/squashfs/symlink.c | 6 +- + fs/squashfs/xz_wrapper.c | 4 +- + fs/squashfs/zlib_wrapper.c | 4 +- + fs/sync.c | 4 +- + fs/sysv/dir.c | 18 +- + fs/sysv/namei.c | 4 +- + fs/ubifs/file.c | 54 ++--- + fs/ubifs/super.c | 6 +- + fs/ubifs/ubifs.h | 4 +- + fs/udf/file.c | 6 +- + fs/udf/inode.c | 4 +- + fs/ufs/balloc.c | 6 +- + fs/ufs/dir.c | 32 +-- + fs/ufs/inode.c | 4 +- + fs/ufs/namei.c | 6 +- + fs/ufs/util.c | 4 +- + fs/ufs/util.h | 2 +- + fs/xfs/libxfs/xfs_bmap.c | 4 +- + fs/xfs/xfs_aops.c | 22 +- + fs/xfs/xfs_bmap_util.c | 4 +- + fs/xfs/xfs_file.c | 12 +- + fs/xfs/xfs_linux.h | 2 +- + fs/xfs/xfs_mount.c | 2 +- + fs/xfs/xfs_mount.h | 4 +- + fs/xfs/xfs_pnfs.c | 4 +- + fs/xfs/xfs_super.c | 8 +- + include/linux/backing-dev-defs.h | 2 +- + include/linux/bio.h | 2 +- + include/linux/blkdev.h | 2 +- + include/linux/buffer_head.h | 4 +- + include/linux/ceph/libceph.h | 4 +- + include/linux/f2fs_fs.h | 4 +- + include/linux/fs.h | 4 +- + include/linux/mm.h | 2 +- + include/linux/mm_types.h | 2 +- + include/linux/nfs_page.h | 6 +- + include/linux/nilfs2_fs.h | 4 +- + include/linux/pagemap.h | 32 +-- + include/linux/sunrpc/svc.h | 2 +- + include/linux/swap.h | 4 +- + ipc/mqueue.c | 4 +- + kernel/events/uprobes.c | 8 +- + mm/fadvise.c | 8 +- + mm/filemap.c | 126 +++++----- + mm/gup.c | 2 +- + mm/hugetlb.c | 8 +- + mm/madvise.c | 6 +- + mm/memory-failure.c | 2 +- + mm/memory.c | 55 +++-- + mm/mincore.c | 8 +- + mm/nommu.c | 2 +- + mm/page-writeback.c | 12 +- + mm/page_io.c | 2 +- + mm/readahead.c | 20 +- + mm/rmap.c | 2 +- + mm/shmem.c | 130 +++++----- + mm/swap.c | 14 +- + mm/swap_state.c | 12 +- + mm/swapfile.c | 12 +- + mm/truncate.c | 40 ++-- + mm/userfaultfd.c | 4 +- + mm/zswap.c | 4 +- + net/ceph/messenger.c | 6 +- + net/ceph/pagelist.c | 4 +- + net/ceph/pagevec.c | 30 +-- + net/sunrpc/auth_gss/auth_gss.c | 8 +- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 2 +- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 +- + net/sunrpc/cache.c | 4 +- + net/sunrpc/rpc_pipe.c | 4 +- + net/sunrpc/socklib.c | 6 +- + net/sunrpc/xdr.c | 50 ++-- + 401 files changed, 2933 insertions(+), 2918 deletions(-) +Merging fixes/master (9735a22799b9 Linux 4.6-rc2) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (f86b8892a1b7 ARC: Don't source drivers/pci/pcie/Kconfig ourselves) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 1 - + 1 file changed, 1 deletion(-) +Merging arm-current/fixes (0fc03d4c8761 ARM: SMP enable of cache maintanence broadcast) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/mm/proc-v7.S | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +Merging m68k-current/for-linus (efbec135f11d m68k: Fix misspellings in comments.) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-fixes/fixes (71528d8bd7a8 powerpc: Correct used_vsr comment) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (5ec712934ce1 sparc: Write up preadv2/pwritev2 syscalls.) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/include/uapi/asm/unistd.h | 4 +++- + arch/sparc/kernel/pci.c | 17 +++++++++++++++++ + arch/sparc/kernel/systbls_32.S | 2 +- + arch/sparc/kernel/systbls_64.S | 4 ++-- + 4 files changed, 23 insertions(+), 4 deletions(-) +Merging net/master (c862cc9b7052 bridge: Fix incorrect variable assignment on error path in br_sysfs_addbr) +$ git merge net/master +Merge made by the 'recursive' strategy. + net/bridge/br_sysfs_br.c | 1 + + net/l2tp/l2tp_ip.c | 8 +++++--- + net/l2tp/l2tp_ip6.c | 8 +++++--- + 3 files changed, 11 insertions(+), 6 deletions(-) +Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/netns/xfrm.h | 1 + + net/core/flow.c | 14 +++++++++++++- + net/ipv4/ip_vti.c | 18 ++++++++++++++++++ + net/xfrm/xfrm_output.c | 3 +++ + 4 files changed, 35 insertions(+), 1 deletion(-) +Merging ipvs/master (7617a24f83b5 ipvs: correct initial offset of Call-ID header search in SIP persistence engine) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (15da5d11040c Merge tag 'iwlwifi-for-kalle-2016-03-30' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/bcma/main.c | 17 ++++------------- + drivers/net/wireless/broadcom/b43/main.c | 6 ++++-- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 ++ + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 2 -- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 ++-- + drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 6 +++--- + 6 files changed, 15 insertions(+), 22 deletions(-) +Merging mac80211/master (ad8ec957f693 wext: unregister_pernet_subsys() on notifier registration failure) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + net/wireless/wext-core.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging sound-current/for-linus (f03b24a851d3 ALSA: usb-audio: Add a sample rate quirk for Phoenix Audio TMX320) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/hda/hdac_i915.c | 15 +++++++++++++++ + sound/usb/quirks.c | 1 + + 2 files changed, 16 insertions(+) +Merging pci-current/for-linus (f55532a0c0b8 Linux 4.6-rc1) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (f55532a0c0b8 Linux 4.6-rc1) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (5e00bbfbc5ec tty: Fix merge of "tty: Refactor tty_open()") +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/tty_io.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging usb.current/usb-linus (5a07975ad0a3 USB: digi_acceleport: do sanity checking for the number of ports) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/core/config.c | 16 ++++---- + drivers/usb/dwc3/core.c | 48 +++++++++------------- + drivers/usb/dwc3/gadget.c | 11 +++-- + drivers/usb/gadget/composite.c | 8 ++-- + drivers/usb/gadget/function/f_midi.c | 9 +++++ + drivers/usb/gadget/udc/atmel_usba_udc.c | 14 ------- + drivers/usb/phy/phy-qcom-8x16-usb.c | 72 +++++---------------------------- + drivers/usb/serial/cypress_m8.c | 11 +++-- + drivers/usb/serial/digi_acceleport.c | 19 +++++++++ + drivers/usb/serial/mct_u232.c | 9 ++++- + drivers/usb/usbip/usbip_common.c | 11 +++++ + include/uapi/linux/usb/ch9.h | 2 +- + 12 files changed, 102 insertions(+), 128 deletions(-) +Merging usb-gadget-fixes/fixes (7e8ac87a4474 usb: phy: qcom-8x16: fix regulator API abuse) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (f55532a0c0b8 Linux 4.6-rc1) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging staging.current/staging-linus (53c43c5ca133 Revert "Staging: olpc_dcon: Remove obsolete driver") +$ git merge staging.current/staging-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 + + drivers/iio/accel/bmc150-accel-core.c | 7 +- + drivers/iio/adc/Kconfig | 1 + + drivers/iio/adc/max1363.c | 12 +- + drivers/iio/gyro/bmg160_core.c | 9 +- + drivers/iio/health/max30100.c | 3 +- + drivers/iio/imu/inv_mpu6050/Kconfig | 3 +- + drivers/iio/industrialio-buffer.c | 1 + + drivers/iio/light/apds9960.c | 3 +- + drivers/iio/magnetometer/st_magn.h | 1 + + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/olpc_dcon/Kconfig | 35 ++ + drivers/staging/olpc_dcon/Makefile | 6 + + drivers/staging/olpc_dcon/TODO | 9 + + drivers/staging/olpc_dcon/olpc_dcon.c | 813 +++++++++++++++++++++++++++ + drivers/staging/olpc_dcon/olpc_dcon.h | 111 ++++ + drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 205 +++++++ + drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 161 ++++++ + drivers/staging/rdma/hfi1/Kconfig | 1 + + 20 files changed, 1377 insertions(+), 15 deletions(-) + create mode 100644 drivers/staging/olpc_dcon/Kconfig + create mode 100644 drivers/staging/olpc_dcon/Makefile + create mode 100644 drivers/staging/olpc_dcon/TODO + create mode 100644 drivers/staging/olpc_dcon/olpc_dcon.c + create mode 100644 drivers/staging/olpc_dcon/olpc_dcon.h + create mode 100644 drivers/staging/olpc_dcon/olpc_dcon_xo_1.c + create mode 100644 drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c +Merging char-misc.current/char-misc-linus (f55532a0c0b8 Linux 4.6-rc1) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (162f98dea487 Input: gtco - fix crash on detecting device without endpoints) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/tablet/gtco.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) +Merging crypto-current/master (ef609c238a8e sunrpc: Fix skcipher/shash conversion) +$ git merge crypto-current/master +Auto-merging net/sunrpc/auth_gss/gss_krb5_crypto.c +Merge made by the 'recursive' strategy. + net/sunrpc/auth_gss/gss_krb5_crypto.c | 8 ++++++-- + net/sunrpc/auth_gss/gss_krb5_mech.c | 3 ++- + 2 files changed, 8 insertions(+), 3 deletions(-) +Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge ide/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/seccomp/seccomp_bpf.c | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (9735a22799b9 Linux 4.6-rc2) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (a1cbaad75a8f asm-generic: remove old nonatomic-io wrapper files) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (7150fbc6a7ec Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 5 ----- + arch/arm/include/asm/unistd.h | 2 +- + arch/arm/include/uapi/asm/unistd.h | 2 ++ + arch/arm/kernel/bios32.c | 3 --- + arch/arm/kernel/calls.S | 4 +++- + 5 files changed, 6 insertions(+), 10 deletions(-) +Merging arm-perf/for-next/perf (f55532a0c0b8 Linux 4.6-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (35fe688abfcf arm-soc: document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 313 +++++++++++++++++++++++++++++++++ + 1 file changed, 313 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging at91/at91-next (503057c24478 Merge branches 'at91-4.7-soc' and 'at91-4.7-dt' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/atmel-at91.txt | 6 +- + arch/arm/boot/dts/sama5d2.dtsi | 36 ++++++++++ + arch/arm/mach-at91/sama5.c | 20 +++++- + arch/arm/mach-at91/soc.c | 81 +++++++++++++++++----- + arch/arm/mach-at91/soc.h | 12 +++- + include/soc/at91/atmel-sfr.h | 18 +++++ + 6 files changed, 152 insertions(+), 21 deletions(-) + create mode 100644 include/soc/at91/atmel-sfr.h +Merging bcm2835-dt/bcm2835-dt-next (48c3b1441a77 dt/bindings: bcm2835: correct description for DMA-int) +$ git merge bcm2835-dt/bcm2835-dt-next +Merge made by the 'recursive' strategy. + .../brcm,bcm2835-armctrl-ic.txt | 4 +- + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 4 ++ + arch/arm/boot/dts/bcm2835-rpi-a.dts | 4 ++ + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 ++ + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 4 ++ + arch/arm/boot/dts/bcm2835-rpi-b.dts | 4 ++ + arch/arm/boot/dts/bcm2835-rpi.dtsi | 9 +++++ + arch/arm/boot/dts/bcm2835.dtsi | 11 +++++ + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 4 ++ + arch/arm/boot/dts/bcm283x.dtsi | 47 ++++++++++++++++++++++ + 10 files changed, 93 insertions(+), 2 deletions(-) +Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge bcm2835-soc/bcm2835-soc-next +Already up-to-date. +Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge bcm2835-drivers/bcm2835-drivers-next +Already up-to-date. +Merging bcm2835-defconfig/bcm2835-defconfig-next (8d1a8c92a8c0 ARM: bcm2835: Enable CONFIG_PM.) +$ git merge bcm2835-defconfig/bcm2835-defconfig-next +Merge made by the 'recursive' strategy. + arch/arm/configs/bcm2835_defconfig | 3 ++- + arch/arm/configs/multi_v7_defconfig | 5 +++-- + 2 files changed, 5 insertions(+), 3 deletions(-) +Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (00cb3ac4afaa Merge branch 'imx/dt64' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.txt | 4 + + arch/arm/boot/dts/Makefile | 5 +- + arch/arm/boot/dts/imx25-pinfunc.h | 124 +-- + arch/arm/boot/dts/imx6q-ba16.dtsi | 2 + + arch/arm/boot/dts/imx6ul-tx6ul-0010.dts | 53 ++ + arch/arm/boot/dts/imx6ul-tx6ul-0011.dts | 68 ++ + arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts | 271 ++++++ + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 973 ++++++++++++++++++++++ + arch/arm64/boot/dts/freescale/Makefile | 3 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 168 ++++ + 10 files changed, 1615 insertions(+), 56 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6ul-tx6ul-0010.dts + create mode 100644 arch/arm/boot/dts/imx6ul-tx6ul-0011.dts + create mode 100644 arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts + create mode 100644 arch/arm/boot/dts/imx6ul-tx6ul.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts +Merging keystone/next (1bdd5a9b339c ARM: dts: k2*: Rename the k2* files to keystone-k2* files) +$ git merge keystone/next +Auto-merging arch/arm/boot/dts/keystone-k2l.dtsi +Auto-merging arch/arm/boot/dts/keystone-k2l-evm.dts +Auto-merging arch/arm/boot/dts/keystone-k2hk.dtsi +Auto-merging arch/arm/boot/dts/keystone-k2hk-evm.dts +Auto-merging arch/arm/boot/dts/keystone-k2e.dtsi +Auto-merging arch/arm/boot/dts/keystone-k2e-evm.dts +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + arch/arm/boot/dts/Makefile | 6 +++--- + arch/arm/boot/dts/{k2e-clocks.dtsi => keystone-k2e-clocks.dtsi} | 0 + arch/arm/boot/dts/{k2e-evm.dts => keystone-k2e-evm.dts} | 2 +- + arch/arm/boot/dts/{k2e-netcp.dtsi => keystone-k2e-netcp.dtsi} | 0 + arch/arm/boot/dts/{k2e.dtsi => keystone-k2e.dtsi} | 4 ++-- + arch/arm/boot/dts/{k2hk-clocks.dtsi => keystone-k2hk-clocks.dtsi} | 0 + arch/arm/boot/dts/{k2hk-evm.dts => keystone-k2hk-evm.dts} | 2 +- + arch/arm/boot/dts/{k2hk-netcp.dtsi => keystone-k2hk-netcp.dtsi} | 0 + arch/arm/boot/dts/{k2hk.dtsi => keystone-k2hk.dtsi} | 4 ++-- + arch/arm/boot/dts/{k2l-clocks.dtsi => keystone-k2l-clocks.dtsi} | 0 + arch/arm/boot/dts/{k2l-evm.dts => keystone-k2l-evm.dts} | 2 +- + arch/arm/boot/dts/{k2l-netcp.dtsi => keystone-k2l-netcp.dtsi} | 0 + arch/arm/boot/dts/{k2l.dtsi => keystone-k2l.dtsi} | 4 ++-- + 14 files changed, 13 insertions(+), 13 deletions(-) + rename arch/arm/boot/dts/{k2e-clocks.dtsi => keystone-k2e-clocks.dtsi} (100%) + rename arch/arm/boot/dts/{k2e-evm.dts => keystone-k2e-evm.dts} (98%) + rename arch/arm/boot/dts/{k2e-netcp.dtsi => keystone-k2e-netcp.dtsi} (100%) + rename arch/arm/boot/dts/{k2e.dtsi => keystone-k2e.dtsi} (97%) + rename arch/arm/boot/dts/{k2hk-clocks.dtsi => keystone-k2hk-clocks.dtsi} (100%) + rename arch/arm/boot/dts/{k2hk-evm.dts => keystone-k2hk-evm.dts} (99%) + rename arch/arm/boot/dts/{k2hk-netcp.dtsi => keystone-k2hk-netcp.dtsi} (100%) + rename arch/arm/boot/dts/{k2hk.dtsi => keystone-k2hk.dtsi} (96%) + rename arch/arm/boot/dts/{k2l-clocks.dtsi => keystone-k2l-clocks.dtsi} (100%) + rename arch/arm/boot/dts/{k2l-evm.dts => keystone-k2l-evm.dts} (98%) + rename arch/arm/boot/dts/{k2l-netcp.dtsi => keystone-k2l-netcp.dtsi} (100%) + rename arch/arm/boot/dts/{k2l.dtsi => keystone-k2l.dtsi} (96%) +Merging mvebu/for-next (550cd80600c7 Merge branch 'mvebu/defconfig' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + arch/arm/boot/dts/Makefile | 2 ++ + arch/arm/boot/dts/armada-385-linksys.dtsi | 8 +++--- + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 4 +-- + arch/arm/boot/dts/kirkwood-6192.dtsi | 4 +-- + arch/arm/boot/dts/kirkwood-6281.dtsi | 4 +-- + arch/arm/boot/dts/kirkwood-6282.dtsi | 4 +-- + arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 4 +-- + arch/arm/boot/dts/kirkwood-b3.dts | 19 ++++++------- + arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts | 4 +-- + arch/arm/boot/dts/kirkwood-cloudbox.dts | 2 +- + arch/arm/boot/dts/kirkwood-db-88f6281.dts | 14 +++++----- + arch/arm/boot/dts/kirkwood-db-88f6282.dts | 20 +++++++------- + arch/arm/boot/dts/kirkwood-dir665.dts | 20 +++++++------- + arch/arm/boot/dts/kirkwood-dnskw.dtsi | 6 ++--- + arch/arm/boot/dts/kirkwood-ds111.dts | 2 +- + arch/arm/boot/dts/kirkwood-ds112.dts | 6 ++++- + arch/arm/boot/dts/kirkwood-ds212.dts | 2 +- + arch/arm/boot/dts/kirkwood-ds411.dts | 6 ++++- + arch/arm/boot/dts/kirkwood-ds411slim.dts | 2 +- + arch/arm/boot/dts/kirkwood-ib62x0.dts | 4 +-- + arch/arm/boot/dts/kirkwood-iconnect.dts | 22 +++++++-------- + arch/arm/boot/dts/kirkwood-km_common.dtsi | 20 +++++++------- + arch/arm/boot/dts/kirkwood-laplug.dts | 19 +++++++------ + arch/arm/boot/dts/kirkwood-linkstation.dtsi | 17 ++++++------ + arch/arm/boot/dts/kirkwood-lsxl.dtsi | 16 +++++------ + arch/arm/boot/dts/kirkwood-mplcec4.dts | 18 ++++++------- + arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 24 ++++++++--------- + arch/arm/boot/dts/kirkwood-nas2big.dts | 18 ++++++------- + .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 20 +++++++------- + .../boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 23 +++++++--------- + arch/arm/boot/dts/kirkwood-netxbig.dtsi | 8 +++--- + arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 4 +-- + arch/arm/boot/dts/kirkwood-nsa310.dts | 18 ++++++------- + arch/arm/boot/dts/kirkwood-nsa320.dts | 31 +++++++++++++--------- + arch/arm/boot/dts/kirkwood-nsa325.dts | 17 +++++------- + arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 24 ++++++++--------- + arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 2 +- + arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 2 +- + arch/arm/boot/dts/kirkwood-openrd.dtsi | 14 +++------- + arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts | 2 +- + arch/arm/boot/dts/kirkwood-rd88f6192.dts | 20 +++++++------- + arch/arm/boot/dts/kirkwood-rd88f6281-a.dts | 2 +- + arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts | 2 +- + arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 20 +++++++------- + arch/arm/boot/dts/kirkwood-rs212.dts | 6 ++++- + arch/arm/boot/dts/kirkwood-synology.dtsi | 22 ++++++--------- + arch/arm/boot/dts/kirkwood-t5325.dts | 22 +++++++-------- + arch/arm/boot/dts/kirkwood-ts219-6281.dts | 4 +-- + arch/arm/boot/dts/kirkwood-ts219-6282.dts | 16 +++-------- + arch/arm/boot/dts/kirkwood-ts219.dtsi | 20 +++++++------- + arch/arm/boot/dts/kirkwood-ts419-6282.dts | 15 +++-------- + arch/arm/boot/dts/kirkwood-ts419.dtsi | 4 +-- + arch/arm/boot/dts/kirkwood.dtsi | 2 +- + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/mvebu_v5_defconfig | 2 +- + arch/arm/configs/mvebu_v7_defconfig | 1 + + drivers/bus/mvebu-mbus.c | 2 +- + 58 files changed, 286 insertions(+), 333 deletions(-) +Merging omap/for-next (6de37509e43d Merge branch 'omap-for-v4.6/fixes' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 5 +- + arch/arm/boot/dts/am4372.dtsi | 2 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 5 + + arch/arm/boot/dts/dm814x-clocks.dtsi | 243 +++++++++++++++++++++++++---- + arch/arm/boot/dts/dra62x-clocks.dtsi | 26 +++ + arch/arm/boot/dts/omap4.dtsi | 2 +- + arch/arm/mach-omap2/id.c | 4 +- + arch/arm/mach-omap2/io.c | 1 + + arch/arm/mach-omap2/omap_hwmod.c | 8 +- + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 2 + + arch/arm/mach-omap2/soc.h | 1 + + 11 files changed, 259 insertions(+), 40 deletions(-) +Merging omap-pending/for-next (3ca4a238106d ARM: OMAP2+: hwmod: Fix updating of sysconfig register) +$ git merge omap-pending/for-next +Already up-to-date. +Merging qcom/for-next (faaa41613dc8 ARM: dts: msm8974: Add SCM firmware node) +$ git merge qcom/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/firmware/qcom,scm.txt | 25 ++ + MAINTAINERS | 3 + + arch/arm/Makefile | 3 +- + arch/arm/boot/dts/qcom-msm8974.dtsi | 25 +- + arch/arm/mach-qcom/Kconfig | 17 +- + drivers/firmware/qcom_scm-32.c | 82 +++++++ + drivers/firmware/qcom_scm-64.c | 25 ++ + drivers/firmware/qcom_scm.c | 271 ++++++++++++++++++++- + drivers/firmware/qcom_scm.h | 12 + + drivers/soc/qcom/smd.c | 229 ++++++++++++----- + drivers/soc/qcom/spm.c | 8 +- + include/linux/qcom_scm.h | 6 + + include/linux/soc/qcom/smd.h | 8 +- + include/linux/soc/qcom/smem_state.h | 35 +++ + 14 files changed, 655 insertions(+), 94 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt +Merging renesas/next (301c9ed92b8f Merge branches 'heads/arm64-cleanup-for-v4.7', 'heads/arm64-dt-for-v4.7', 'heads/cleanup-for-v4.7', 'heads/defconfig-for-v4.7', 'heads/drivers-for-v4.7', 'heads/dt-for-v4.7' and 'heads/simple-pm-bus-for-v4.7' into next) +$ git merge renesas/next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/emev2-kzm9d.dts | 4 +- + arch/arm/boot/dts/r7s72100.dtsi | 15 +- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 20 +- + arch/arm/boot/dts/r8a73a4.dtsi | 75 ++---- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 34 +-- + arch/arm/boot/dts/r8a7740.dtsi | 57 ++--- + arch/arm/boot/dts/r8a7778-bockw.dts | 40 +-- + arch/arm/boot/dts/r8a7778.dtsi | 21 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 36 +-- + arch/arm/boot/dts/r8a7779.dtsi | 17 +- + arch/arm/boot/dts/r8a7790-lager.dts | 95 ++++---- + arch/arm/boot/dts/r8a7790.dtsi | 242 ++++++++++--------- + arch/arm/boot/dts/r8a7791-koelsch.dts | 71 +++--- + arch/arm/boot/dts/r8a7791-porter.dts | 63 +++-- + arch/arm/boot/dts/r8a7791.dtsi | 232 +++++++++--------- + arch/arm/boot/dts/r8a7793-gose.dts | 43 ++-- + arch/arm/boot/dts/r8a7793.dtsi | 204 ++++++++++------ + arch/arm/boot/dts/r8a7794-alt.dts | 32 +-- + arch/arm/boot/dts/r8a7794-silk.dts | 44 ++-- + arch/arm/boot/dts/r8a7794.dtsi | 267 +++++++++++++-------- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 30 +-- + arch/arm/boot/dts/sh73a0.dtsi | 89 +++---- + arch/arm/configs/multi_v7_defconfig | 2 + + arch/arm/configs/shmobile_defconfig | 3 + + arch/arm/mach-shmobile/timer.c | 26 +- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 46 ++-- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 42 +++- + drivers/bus/Kconfig | 2 +- + include/dt-bindings/clock/r8a7790-clock.h | 1 + + include/dt-bindings/clock/r8a7794-clock.h | 5 + + 30 files changed, 968 insertions(+), 890 deletions(-) +Merging rockchip/for-next (0b4b91b4c9b2 Merge branch 'v4.6-armsoc/dts64-fixes' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/rockchip,rk3399-cru.txt | 62 + + .../devicetree/bindings/soc/rockchip/grf.txt | 35 + + .../bindings/soc/rockchip/power_domain.txt | 37 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/rk3036-kylin.dts | 13 +- + arch/arm/boot/dts/rk3036.dtsi | 66 +- + arch/arm/boot/dts/rk3066a-rayeager.dts | 2 - + arch/arm/boot/dts/rk3228-evb.dts | 8 +- + arch/arm/boot/dts/rk3228.dtsi | 69 + + arch/arm/boot/dts/rk3288-evb.dtsi | 1 - + arch/arm/boot/dts/rk3288-firefly.dtsi | 2 - + arch/arm/boot/dts/rk3288-popmetal.dts | 1 - + arch/arm/boot/dts/rk3288-veyron.dtsi | 2 - + arch/arm/boot/dts/rk3288.dtsi | 7 +- + arch/arm/mach-rockchip/platsmp.c | 2 +- + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 10 +- + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 10 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 16 +- + drivers/clk/rockchip/Makefile | 1 + + drivers/clk/rockchip/clk-cpu.c | 29 +- + drivers/clk/rockchip/clk-pll.c | 301 +++- + drivers/clk/rockchip/clk-rk3036.c | 21 +- + drivers/clk/rockchip/clk-rk3188.c | 51 +- + drivers/clk/rockchip/clk-rk3228.c | 21 +- + drivers/clk/rockchip/clk-rk3288.c | 23 +- + drivers/clk/rockchip/clk-rk3368.c | 28 +- + drivers/clk/rockchip/clk-rk3399.c | 1540 ++++++++++++++++++++ + drivers/clk/rockchip/clk.c | 146 +- + drivers/clk/rockchip/clk.h | 106 +- + drivers/soc/rockchip/pm_domains.c | 142 +- + include/dt-bindings/clock/rk3399-cru.h | 752 ++++++++++ + include/dt-bindings/power/rk3399-power.h | 53 + + 32 files changed, 3388 insertions(+), 170 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.txt + create mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.txt + create mode 100644 drivers/clk/rockchip/clk-rk3399.c + create mode 100644 include/dt-bindings/clock/rk3399-cru.h + create mode 100644 include/dt-bindings/power/rk3399-power.h +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (dc66b800f7ef Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../bindings/arm/samsung/samsung-boards.txt | 2 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/exynos3250-artik5-eval.dts | 43 +++ + arch/arm/boot/dts/exynos3250-artik5.dtsi | 334 +++++++++++++++++++++ + arch/arm/boot/dts/exynos3250-monk.dts | 12 +- + arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 80 +++++ + arch/arm/boot/dts/exynos3250-rinato.dts | 71 ++++- + arch/arm/boot/dts/exynos3250.dtsi | 25 ++ + arch/arm/boot/dts/exynos4.dtsi | 21 ++ + arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 7 + + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 + + arch/arm/boot/dts/exynos4412-trats2.dts | 4 + + arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 7 + + .../boot/dts/exynos/exynos7-tmu-sensor-conf.dtsi | 25 ++ + .../arm64/boot/dts/exynos/exynos7-trip-points.dtsi | 54 ++++ + arch/arm64/boot/dts/exynos/exynos7.dtsi | 20 ++ + drivers/clk/samsung/clk-exynos3250.c | 15 + + include/dt-bindings/clock/exynos3250.h | 11 +- + 18 files changed, 736 insertions(+), 4 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos3250-artik5-eval.dts + create mode 100644 arch/arm/boot/dts/exynos3250-artik5.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos7-tmu-sensor-conf.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos7-trip-points.dtsi +Merging sunxi/sunxi/for-next (93a96dc4ccc1 Merge branches 'sunxi/dt-for-4.7', 'sunxi/clocks-for-4.7' and 'sunxi/fixes-for-4.6' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 6 + + arch/arm/boot/dts/sun4i-a10-a1000.dts | 24 ++ + arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 281 +++++++++++++++++++++ + arch/arm/boot/dts/sun4i-a10.dtsi | 33 ++- + arch/arm/boot/dts/sun5i-a13-difrnce-dit4350.dts | 226 +++++++++++++++++ + .../boot/dts/sun5i-a13-empire-electronix-d709.dts | 19 +- + arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts | 15 -- + arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 41 +++ + arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts | 208 +++++++++++++++ + arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 24 ++ + arch/arm/boot/dts/sun7i-a20.dtsi | 36 ++- + arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts | 120 ++++++++- + .../boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 243 ++++++++++++++++++ + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 186 ++++++++++++++ + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 167 ++++++++++++ + arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 105 +++----- + arch/arm/boot/dts/sun8i-h3.dtsi | 123 +++++++++ + arch/arm/boot/dts/sun8i-q8-common.dtsi | 2 - + drivers/clk/sunxi/clk-a10-mod1.c | 2 +- + 19 files changed, 1747 insertions(+), 114 deletions(-) + create mode 100644 arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts + create mode 100644 arch/arm/boot/dts/sun5i-a13-difrnce-dit4350.dts + create mode 100644 arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts + create mode 100644 arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-orangepi-2.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts +Merging tegra/for-next (755f165105b1 Merge branch for-4.6/arm64 into for-next) +$ git merge tegra/for-next +Auto-merging drivers/gpu/drm/tegra/drm.h +Auto-merging arch/arm64/boot/dts/nvidia/tegra210.dtsi +Auto-merging arch/arm64/boot/dts/nvidia/tegra132.dtsi +Auto-merging arch/arm64/boot/dts/nvidia/tegra132-norrin.dts +Merge made by the 'recursive' strategy. + .../bindings/arm/tegra/nvidia,tegra20-pmc.txt | 12 +- + arch/arm/boot/dts/tegra114-dalmore.dts | 2 +- + arch/arm/boot/dts/tegra114-roth.dts | 2 +- + arch/arm/boot/dts/tegra114-tn7.dts | 2 +- + arch/arm/boot/dts/tegra114.dtsi | 4 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 28 +++- + arch/arm/boot/dts/tegra124-nyan.dtsi | 4 +- + arch/arm/boot/dts/tegra124-venice2.dts | 2 +- + arch/arm/boot/dts/tegra124.dtsi | 4 +- + arch/arm/boot/dts/tegra20-harmony.dts | 2 +- + arch/arm/boot/dts/tegra20-paz00.dts | 2 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 4 +- + arch/arm/boot/dts/tegra20-trimslice.dts | 2 +- + arch/arm/boot/dts/tegra20-ventana.dts | 2 +- + arch/arm/boot/dts/tegra20-whistler.dts | 2 +- + arch/arm/boot/dts/tegra20.dtsi | 2 +- + arch/arm/boot/dts/tegra30-apalis-eval.dts | 2 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +- + arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +- + arch/arm/boot/dts/tegra30.dtsi | 2 +- + arch/arm/mach-tegra/platsmp.c | 16 +-- + arch/arm64/boot/dts/nvidia/Makefile | 1 + + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 4 +- + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 26 ++++ + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 126 +++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 2 +- + drivers/gpu/drm/tegra/drm.h | 2 +- + drivers/soc/tegra/Kconfig | 2 - + drivers/soc/tegra/pmc.c | 150 +++++++++++++-------- + include/soc/tegra/pmc.h | 35 ++--- + 31 files changed, 330 insertions(+), 120 deletions(-) + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts +Merging arm64/for-next/core (f55532a0c0b8 Linux 4.6-rc1) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Resolved 'arch/blackfin/mach-common/pm.c' using previous resolution. +Auto-merging arch/blackfin/mach-common/pm.c +CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 97b2b52c6a47] Merge remote-tracking branch 'blackfin/for-linus' +$ git diff -M --stat --summary HEAD^.. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON) +$ git merge h8300/h8300-next +Already up-to-date. +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted()) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (efbec135f11d m68k: Fix misspellings in comments.) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (a3595962d824 m68knommu: remove obsolete 68360 support) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init) +$ git merge metag/for-next +Auto-merging arch/metag/kernel/ftrace.c +Merge made by the 'recursive' strategy. + arch/metag/kernel/ftrace.c | 1 - + 1 file changed, 1 deletion(-) +Merging microblaze/next (10f4b26deb41 microblaze/PCI: export isa_io_base to fix link errors) +$ git merge microblaze/next +Auto-merging arch/microblaze/pci/pci-common.c +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/unistd.h | 2 +- + arch/microblaze/include/uapi/asm/unistd.h | 3 +++ + arch/microblaze/kernel/syscall_table.S | 3 +++ + arch/microblaze/pci/pci-common.c | 2 ++ + 4 files changed, 9 insertions(+), 1 deletion(-) +Merging mips/mips-for-linux-next (24fead1eb323 Merge branch '4.6-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Auto-merging fs/proc/vmcore.c +Auto-merging drivers/firmware/broadcom/bcm47xx_sprom.c +Removing arch/mips/include/asm/clkdev.h +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/qca,ath79-pll.txt | 6 +- + .../interrupt-controller/brcm,bcm6345-l1-intc.txt | 57 ++ + .../devicetree/bindings/mips/cavium/ciu3.txt | 27 + + .../bindings/serial/microchip,pic32-uart.txt | 29 + + .../devicetree/bindings/vendor-prefixes.txt | 3 + + arch/mips/Kconfig | 80 +- + arch/mips/Makefile | 19 + + arch/mips/alchemy/common/dbdma.c | 4 +- + arch/mips/alchemy/devboards/db1000.c | 18 +- + arch/mips/alchemy/devboards/db1550.c | 4 +- + arch/mips/ath79/Kconfig | 12 - + arch/mips/ath79/clock.c | 241 +++--- + arch/mips/ath79/setup.c | 61 +- + arch/mips/bcm47xx/Makefile | 2 +- + arch/mips/bcm47xx/bcm47xx_private.h | 3 - + arch/mips/bcm47xx/setup.c | 2 +- + arch/mips/bmips/setup.c | 1 + + arch/mips/boot/compressed/Makefile | 12 +- + arch/mips/boot/dts/brcm/bcm7435.dtsi | 2 +- + .../boot/dts/cavium-octeon/dlink_dsr-1000n.dts | 78 ++ + arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts | 205 +---- + arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dtsi | 231 +++++ + arch/mips/boot/dts/cavium-octeon/ubnt_e100.dts | 59 ++ + arch/mips/boot/dts/lantiq/easy50712.dts | 2 +- + arch/mips/boot/dts/qca/Makefile | 7 +- + arch/mips/boot/dts/qca/ar9132.dtsi | 19 +- + arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 100 +-- + arch/mips/boot/dts/qca/ar9331.dtsi | 155 ++++ + arch/mips/boot/dts/qca/ar9331_dpt_module.dts | 78 ++ + arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts | 102 +++ + arch/mips/boot/dts/qca/ar9331_omega.dts | 78 ++ + arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts | 118 +++ + arch/mips/boot/tools/Makefile | 8 + + arch/mips/boot/tools/relocs.c | 680 +++++++++++++++ + arch/mips/boot/tools/relocs.h | 45 + + arch/mips/boot/tools/relocs_32.c | 17 + + arch/mips/boot/tools/relocs_64.c | 27 + + arch/mips/boot/tools/relocs_main.c | 84 ++ + arch/mips/cavium-octeon/csrc-octeon.c | 13 +- + arch/mips/cavium-octeon/executive/cvmx-helper.c | 43 + + .../executive/cvmx-interrupt-decodes.c | 14 +- + arch/mips/cavium-octeon/executive/cvmx-pko.c | 2 +- + arch/mips/cavium-octeon/executive/cvmx-sysinfo.c | 72 +- + arch/mips/cavium-octeon/executive/octeon-model.c | 82 +- + arch/mips/cavium-octeon/octeon-irq.c | 679 ++++++++++++++- + arch/mips/cavium-octeon/octeon-platform.c | 94 +- + arch/mips/cavium-octeon/setup.c | 86 +- + arch/mips/cavium-octeon/smp.c | 153 +++- + arch/mips/configs/bcm47xx_defconfig | 1 - + arch/mips/configs/bigsur_defconfig | 1 - + arch/mips/configs/cavium_octeon_defconfig | 15 +- + arch/mips/configs/ci20_defconfig | 14 +- + arch/mips/configs/decstation_defconfig | 1 - + arch/mips/configs/ip22_defconfig | 1 - + arch/mips/configs/ip27_defconfig | 1 - + arch/mips/configs/jazz_defconfig | 1 - + arch/mips/configs/lemote2f_defconfig | 1 - + arch/mips/configs/mtx1_defconfig | 1 - + arch/mips/configs/nlm_xlp_defconfig | 1 - + arch/mips/configs/nlm_xlr_defconfig | 1 - + arch/mips/configs/rm200_defconfig | 1 - + arch/mips/dec/int-handler.S | 2 +- + arch/mips/fw/arc/memory.c | 2 +- + arch/mips/include/asm/Kbuild | 1 + + arch/mips/include/asm/bmips.h | 1 + + arch/mips/include/asm/bootinfo.h | 18 + + arch/mips/include/asm/cacheflush.h | 7 +- + arch/mips/include/asm/clkdev.h | 27 - + arch/mips/include/asm/cpu-features.h | 8 + + arch/mips/include/asm/cpu-info.h | 6 +- + arch/mips/include/asm/cpu-type.h | 5 + + arch/mips/include/asm/cpu.h | 97 ++- + arch/mips/include/asm/elf.h | 5 + + arch/mips/include/asm/highmem.h | 4 +- + arch/mips/include/asm/irq_regs.h | 10 + + .../asm/mach-cavium-octeon/kernel-entry-init.h | 2 +- + .../include/asm/mach-generic/kernel-entry-init.h | 2 +- + arch/mips/include/asm/mach-ip27/irq.h | 2 +- + .../mips/include/asm/mach-ip27/kernel-entry-init.h | 2 +- + arch/mips/include/asm/mach-jz4740/gpio.h | 2 +- + arch/mips/include/asm/mips-cm.h | 8 +- + arch/mips/include/asm/mips-cpc.h | 3 + + arch/mips/include/asm/mips-r2-to-r6-emul.h | 2 +- + arch/mips/include/asm/mipsregs.h | 1 + + arch/mips/include/asm/octeon/cvmx-bootinfo.h | 16 +- + arch/mips/include/asm/octeon/cvmx-ciu3-defs.h | 353 ++++++++ + arch/mips/include/asm/octeon/cvmx-config.h | 2 +- + arch/mips/include/asm/octeon/cvmx-coremask.h | 89 ++ + arch/mips/include/asm/octeon/cvmx-fpa-defs.h | 1 + + arch/mips/include/asm/octeon/cvmx-mio-defs.h | 410 ++++++++- + arch/mips/include/asm/octeon/cvmx-sysinfo.h | 37 +- + arch/mips/include/asm/octeon/cvmx.h | 29 +- + arch/mips/include/asm/octeon/octeon-feature.h | 19 +- + arch/mips/include/asm/octeon/octeon-model.h | 5 + + arch/mips/include/asm/octeon/octeon.h | 25 + + arch/mips/include/asm/pci/bridge.h | 18 +- + arch/mips/include/asm/pgtable-bits.h | 11 +- + arch/mips/include/asm/pgtable.h | 26 +- + arch/mips/include/asm/processor.h | 8 + + arch/mips/include/asm/seccomp.h | 47 +- + arch/mips/include/asm/sgi/hpc3.h | 2 +- + arch/mips/include/asm/sgiarcs.h | 4 +- + arch/mips/include/asm/smp-cps.h | 2 +- + arch/mips/include/asm/sn/ioc3.h | 2 +- + arch/mips/include/asm/sn/sn0/hubio.h | 2 +- + arch/mips/include/asm/uaccess.h | 2 +- + arch/mips/kernel/Makefile | 2 + + arch/mips/kernel/cps-vec.S | 296 ++++--- + arch/mips/kernel/cpu-probe.c | 39 +- + arch/mips/kernel/head.S | 20 + + arch/mips/kernel/mips-cm.c | 2 +- + arch/mips/kernel/mips-r2-to-r6-emul.c | 12 +- + arch/mips/kernel/module-rela.c | 75 +- + arch/mips/kernel/module.c | 77 +- + arch/mips/kernel/perf_event_mipsxx.c | 8 +- + arch/mips/kernel/pm-cps.c | 17 +- + arch/mips/kernel/proc.c | 1 + + arch/mips/kernel/process.c | 10 +- + arch/mips/kernel/relocate.c | 386 +++++++++ + arch/mips/kernel/scall32-o32.S | 11 +- + arch/mips/kernel/scall64-64.S | 3 +- + arch/mips/kernel/scall64-n32.S | 14 +- + arch/mips/kernel/scall64-o32.S | 14 +- + arch/mips/kernel/setup.c | 23 + + arch/mips/kernel/signal32.c | 6 + + arch/mips/kernel/smp-bmips.c | 87 ++ + arch/mips/kernel/smp-cps.c | 64 +- + arch/mips/kernel/smp.c | 12 + + arch/mips/kernel/spram.c | 1 + + arch/mips/kernel/traps.c | 59 +- + arch/mips/kernel/unaligned.c | 51 +- + arch/mips/kernel/vmlinux.lds.S | 21 + + arch/mips/kvm/tlb.c | 2 +- + arch/mips/kvm/trap_emul.c | 2 +- + arch/mips/lantiq/Kconfig | 12 +- + arch/mips/lantiq/prom.c | 13 +- + arch/mips/lantiq/xway/reset.c | 2 +- + arch/mips/loongson64/loongson-3/smp.c | 1 - + arch/mips/math-emu/dsemul.c | 2 +- + arch/mips/math-emu/ieee754dp.c | 6 +- + arch/mips/math-emu/ieee754sp.c | 6 +- + arch/mips/mm/c-r4k.c | 2 + + arch/mips/mm/cache.c | 41 +- + arch/mips/mm/sc-ip22.c | 2 +- + arch/mips/mm/sc-mips.c | 1 + + arch/mips/mm/tlb-r4k.c | 5 + + arch/mips/mm/tlbex.c | 4 +- + arch/mips/mti-malta/malta-setup.c | 7 +- + arch/mips/mti-sead3/sead3-setup.c | 5 + + arch/mips/pmcs-msp71xx/msp_setup.c | 2 +- + arch/mips/ralink/reset.c | 2 +- + arch/mips/sgi-ip27/ip27-memory.c | 2 +- + arch/mips/vr41xx/common/pmu.c | 2 +- + drivers/bus/brcmstb_gisb.c | 30 + + drivers/firmware/broadcom/Kconfig | 11 + + drivers/firmware/broadcom/Makefile | 1 + + .../firmware/broadcom/bcm47xx_sprom.c | 31 +- + drivers/irqchip/irq-mips-gic.c | 22 +- + drivers/pcmcia/db1xxx_ss.c | 11 +- + drivers/tty/serial/Kconfig | 21 + + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/pic32_uart.c | 960 +++++++++++++++++++++ + drivers/tty/serial/pic32_uart.h | 126 +++ + fs/proc/vmcore.c | 2 +- + include/asm-generic/seccomp.h | 14 + + include/dt-bindings/clock/ath79-clk.h | 19 + + include/linux/bcm47xx_sprom.h | 24 + + include/linux/crash_dump.h | 8 +- + include/linux/irqchip/mips-gic.h | 17 + + include/uapi/linux/serial_core.h | 3 + + kernel/seccomp.c | 13 +- + tools/testing/selftests/seccomp/seccomp_bpf.c | 30 +- + 172 files changed, 6958 insertions(+), 1099 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm6345-l1-intc.txt + create mode 100644 Documentation/devicetree/bindings/mips/cavium/ciu3.txt + create mode 100644 Documentation/devicetree/bindings/serial/microchip,pic32-uart.txt + create mode 100644 arch/mips/boot/dts/cavium-octeon/dlink_dsr-1000n.dts + create mode 100644 arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dtsi + create mode 100644 arch/mips/boot/dts/cavium-octeon/ubnt_e100.dts + create mode 100644 arch/mips/boot/dts/qca/ar9331.dtsi + create mode 100644 arch/mips/boot/dts/qca/ar9331_dpt_module.dts + create mode 100644 arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts + create mode 100644 arch/mips/boot/dts/qca/ar9331_omega.dts + create mode 100644 arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts + create mode 100644 arch/mips/boot/tools/Makefile + create mode 100644 arch/mips/boot/tools/relocs.c + create mode 100644 arch/mips/boot/tools/relocs.h + create mode 100644 arch/mips/boot/tools/relocs_32.c + create mode 100644 arch/mips/boot/tools/relocs_64.c + create mode 100644 arch/mips/boot/tools/relocs_main.c + delete mode 100644 arch/mips/include/asm/clkdev.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-ciu3-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-coremask.h + create mode 100644 arch/mips/kernel/relocate.c + rename arch/mips/bcm47xx/sprom.c => drivers/firmware/broadcom/bcm47xx_sprom.c (97%) + create mode 100644 drivers/tty/serial/pic32_uart.c + create mode 100644 drivers/tty/serial/pic32_uart.h + create mode 100644 include/dt-bindings/clock/ath79-clk.h + create mode 100644 include/linux/bcm47xx_sprom.h +Merging nios2/for-next (8fe889274c7a nios2: Replace fdt_translate_address with of_flat_dt_translate_address) +$ git merge nios2/for-next +Already up-to-date. +Merging parisc-hd/for-next (b562e44f507e Linux 4.5) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (6e669f085d59 powerpc: Fix unrecoverable SLB miss during restore_math()) +$ git merge powerpc/next +Already up-to-date. +Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (fba4e9f9898a powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (05f13c49f4b8 s390: Clarify pagefault interrupt) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/include/asm/pci.h | 3 +- + arch/s390/include/asm/seccomp.h | 2 + + arch/s390/mm/fault.c | 41 ++++++++-- + drivers/s390/block/dasd.c | 56 +++++++++++++ + drivers/s390/block/dasd_devmap.c | 27 +++++++ + drivers/s390/block/dasd_eckd.c | 164 +++++++++++++++++++++++++++++++++++++++ + drivers/s390/block/dasd_eckd.h | 33 +++++++- + drivers/s390/block/dasd_int.h | 3 + + drivers/s390/block/scm_blk.c | 2 +- + 9 files changed, 320 insertions(+), 11 deletions(-) +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (f98983bbba0d tile/defconfigs: Remove CONFIG_IPV6_PRIVACY) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/configs/tilegx_defconfig | 1 - + arch/tile/configs/tilepro_defconfig | 1 - + 2 files changed, 2 deletions(-) +Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (bb7ab3b92e46 btrfs: Fix misspellings in comments.) +$ git merge btrfs/next +Already up-to-date. +Merging btrfs-kdave/for-next (eb2b7a82d42e Merge branch 'for-next-4.6-20160404' into for-next-20160404) +$ git merge btrfs-kdave/for-next +Recorded preimage for 'fs/btrfs/extent_io.c' +Recorded preimage for 'fs/btrfs/file.c' +Recorded preimage for 'fs/btrfs/volumes.c' +Auto-merging include/trace/events/btrfs.h +Auto-merging fs/btrfs/volumes.c +CONFLICT (content): Merge conflict in fs/btrfs/volumes.c +Auto-merging fs/btrfs/relocation.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +CONFLICT (content): Merge conflict in fs/btrfs/file.c +Auto-merging fs/btrfs/extent_io.c +CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c +Auto-merging fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/disk-io.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/btrfs/extent_io.c'. +Recorded resolution for 'fs/btrfs/file.c'. +Recorded resolution for 'fs/btrfs/volumes.c'. +[master 086370259486] Merge remote-tracking branch 'btrfs-kdave/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/ctree.c | 18 +- + fs/btrfs/ctree.h | 96 +++--- + fs/btrfs/delayed-inode.c | 68 ++-- + fs/btrfs/dev-replace.c | 30 +- + fs/btrfs/disk-io.c | 8 +- + fs/btrfs/extent-tree.c | 721 ++++++++++++++++++++++++++++--------------- + fs/btrfs/extent_io.c | 39 ++- + fs/btrfs/file.c | 61 ++-- + fs/btrfs/inode-item.c | 2 +- + fs/btrfs/inode.c | 271 +++++++++++++++- + fs/btrfs/ioctl.c | 68 +++- + fs/btrfs/qgroup.c | 63 ++-- + fs/btrfs/relocation.c | 5 +- + fs/btrfs/root-tree.c | 4 +- + fs/btrfs/super.c | 58 ++-- + fs/btrfs/transaction.c | 2 +- + fs/btrfs/tree-log.c | 145 ++++++++- + fs/btrfs/volumes.c | 341 ++++++++++---------- + fs/btrfs/volumes.h | 7 +- + include/trace/events/btrfs.h | 228 +++++++++++++- + include/uapi/linux/btrfs.h | 15 +- + 21 files changed, 1583 insertions(+), 667 deletions(-) +Merging ceph/master (7c886661dc31 libceph: use KMEM_CACHE macro) +$ git merge ceph/master +Recorded preimage for 'fs/ceph/addr.c' +Recorded preimage for 'fs/ceph/inode.c' +Auto-merging fs/ceph/inode.c +CONFLICT (content): Merge conflict in fs/ceph/inode.c +Auto-merging fs/ceph/addr.c +CONFLICT (content): Merge conflict in fs/ceph/addr.c +Auto-merging drivers/block/rbd.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/ceph/addr.c'. +Recorded resolution for 'fs/ceph/inode.c'. +[master bfc8fb5172ff] Merge remote-tracking branch 'ceph/master' +$ git diff -M --stat --summary HEAD^.. + drivers/block/rbd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging cifs/for-next (b562e44f507e Linux 4.5) +$ git merge cifs/for-next +Already up-to-date. +Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging ext3/for_next (8f9e8f5fcc05 ocfs2: Fix Q_GETNEXTQUOTA for filesystem without quotas) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (dd018b1f64c1 ext4: ignore quota mount options if the quota feature is enabled) +$ git merge ext4/dev +Auto-merging include/linux/fs.h +Auto-merging fs/nfs/nfs4file.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/readpage.c +Auto-merging fs/ext4/page-io.c +Auto-merging fs/ext4/move_extent.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/dir.c +Auto-merging fs/ext4/crypto.c +Auto-merging fs/btrfs/file.c +Merge made by the 'recursive' strategy. + fs/btrfs/file.c | 2 +- + fs/dcache.c | 5 ++++- + fs/ext4/crypto.c | 49 +++++++++++++++++++++++++----------------- + fs/ext4/dir.c | 5 +++++ + fs/ext4/ext4.h | 29 +++++++++++++++++++++++-- + fs/ext4/file.c | 12 +++++++---- + fs/ext4/inode.c | 58 ++++++++++++++++++++++++-------------------------- + fs/ext4/move_extent.c | 4 ++-- + fs/ext4/namei.c | 5 +++++ + fs/ext4/page-io.c | 14 +++++++++++- + fs/ext4/readpage.c | 2 +- + fs/ext4/super.c | 38 ++++++++++++++++++++++----------- + fs/ext4/xattr.c | 32 ++++++++++++++++++++++++---- + fs/nfs/dir.c | 6 +++--- + fs/nfs/inode.c | 2 +- + fs/nfs/nfs4file.c | 4 ++-- + fs/overlayfs/super.c | 33 ++++++++++++++++++++++++++++ + include/linux/dcache.h | 10 +++++++++ + include/linux/fs.h | 10 +++++++++ + 19 files changed, 236 insertions(+), 84 deletions(-) +Merging f2fs/dev (0bc3d0fd7525 f2fs: add BUG_ON to avoid unnecessary flow) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/debug.c | 5 +-- + fs/f2fs/dir.c | 87 ++++++++++++++++++++++++--------------------- + fs/f2fs/f2fs.h | 7 ++-- + fs/f2fs/inline.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++- + fs/f2fs/node.c | 16 +++------ + fs/f2fs/recovery.c | 11 +++--- + fs/f2fs/super.c | 67 ++++++++++++++++++++++++++--------- + include/linux/f2fs_fs.h | 2 ++ + 8 files changed, 210 insertions(+), 79 deletions(-) +Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) +$ git merge fscache/fscache +Merge made by the 'recursive' strategy. +Merging fuse/for-next (742f992708df fuse: return patrial success from fuse_direct_io()) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/for-next (3e11e5304150 GFS2: ignore unlock failures after withdraw) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/glock.c | 9 ++++++++- + fs/gfs2/util.c | 1 + + 2 files changed, 9 insertions(+), 1 deletion(-) +Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats) +$ git merge jfs/jfs-next +Auto-merging fs/jfs/super.c +Merge made by the 'recursive' strategy. + fs/jfs/inode.c | 4 ++-- + fs/jfs/jfs_discard.c | 6 ++---- + fs/jfs/jfs_dtree.c | 10 ++++------ + fs/jfs/jfs_imap.c | 3 +-- + fs/jfs/jfs_inode.c | 2 +- + fs/jfs/jfs_logmgr.c | 14 ++++++-------- + fs/jfs/jfs_txnmgr.c | 21 +++++++++------------ + fs/jfs/namei.c | 4 ++-- + fs/jfs/super.c | 4 ++-- + 9 files changed, 29 insertions(+), 39 deletions(-) +Merging nfs/linux-next (9735a22799b9 Linux 4.6-rc2) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (ac503e4a309a nfsd: use short read as well as i_size to set eof) +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging orangefs/for-next (45996492e5c8 orangefs: fix orangefs_superblock locking) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (e3608e3f68f6 Btrfs: fix crash/invalid memory access on fsync when using overlayfs) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/overlayfs/super.c +Auto-merging fs/namei.c +Merge made by the 'recursive' strategy. + fs/namei.c | 48 ++++++++++++++++++++++++++++++++++++++---------- + fs/overlayfs/super.c | 2 +- + include/linux/namei.h | 2 ++ + 3 files changed, 41 insertions(+), 11 deletions(-) +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew)) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (489eda8cd1a6 Merge branches 'work.acl', 'work.const-path' and 'work.misc' into for-next) +$ git merge vfs/for-next +Auto-merging include/linux/fs.h +Auto-merging fs/namei.c +Auto-merging fs/ecryptfs/inode.c +Auto-merging fs/dcache.c +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/build.c | 13 ++--- + drivers/mtd/ubi/kapi.c | 19 +++---- + fs/9p/acl.c | 2 +- + fs/btrfs/acl.c | 3 -- + fs/ceph/acl.c | 2 + + fs/dcache.c | 13 ++--- + fs/ecryptfs/inode.c | 85 +++++++++++++------------------ + fs/ext2/acl.c | 3 -- + fs/ext4/acl.c | 3 -- + fs/f2fs/acl.c | 3 -- + fs/hfsplus/posix_acl.c | 3 -- + fs/inode.c | 4 +- + fs/jffs2/acl.c | 2 - + fs/jfs/acl.c | 6 --- + fs/namei.c | 4 +- + fs/nfs/nfs3acl.c | 43 +++++++++++++++- + fs/ocfs2/dlmglue.c | 3 ++ + fs/open.c | 6 +-- + fs/posix_acl.c | 106 ++++++++++++++++++++++++++------------- + fs/reiserfs/xattr_acl.c | 8 +-- + fs/xfs/xfs_acl.c | 20 +++----- + include/linux/fs.h | 14 +++++- + include/linux/lsm_hooks.h | 28 +++++------ + include/linux/posix_acl.h | 1 - + include/linux/security.h | 58 ++++++++++----------- + kernel/bpf/inode.c | 37 +++----------- + net/unix/af_unix.c | 2 +- + security/apparmor/file.c | 4 +- + security/apparmor/include/file.h | 4 +- + security/apparmor/include/path.h | 2 +- + security/apparmor/lsm.c | 83 +++++++++++------------------- + security/apparmor/path.c | 8 +-- + security/integrity/ima/ima.h | 2 +- + security/integrity/ima/ima_api.c | 2 +- + security/security.c | 28 +++++------ + security/selinux/hooks.c | 2 +- + security/tomoyo/common.h | 12 ++--- + security/tomoyo/file.c | 10 ++-- + security/tomoyo/mount.c | 4 +- + security/tomoyo/tomoyo.c | 28 +++++------ + 40 files changed, 335 insertions(+), 345 deletions(-) +Merging pci/next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (b7c33d5dcfe2 Merge branch 'for-4.6/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 10 ++++++ + drivers/hid/Makefile | 1 + + drivers/hid/hid-asus.c | 52 ++++++++++++++++++++++++++++ + drivers/hid/hid-core.c | 4 +++ + drivers/hid/hid-ids.h | 4 +++ + drivers/hid/hid-lenovo.c | 16 +++++++-- + drivers/hid/hid-microsoft.c | 6 ++++ + drivers/hid/hid-multitouch.c | 1 + + drivers/hid/hid-roccat.c | 5 ++- + drivers/hid/hid-wiimote-modules.c | 14 ++++---- + drivers/hid/hidraw.c | 18 ++++------ + drivers/hid/usbhid/hid-core.c | 73 ++++++++++++++++++++------------------- + drivers/hid/wacom_wac.c | 11 ++++++ + 13 files changed, 155 insertions(+), 60 deletions(-) + create mode 100644 drivers/hid/hid-asus.c +Merging i2c/i2c/for-next (8dcf32175b4e i2c: prevent endless uevent loop with CONFIG_I2C_DEBUG_CORE) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/i2c/i2c-core.c | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) +Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440) +$ git merge jdelvare-hwmon/master +Auto-merging Documentation/hwmon/max34440 +Merge made by the 'recursive' strategy. + Documentation/hwmon/max34440 | 6 +++--- + drivers/hwmon/emc2103.c | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (c528f2aae571 hwmon: (max31722) Add support for MAX31722/MAX31723 temperature sensors) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/max31722 | 34 +++++++++ + drivers/hwmon/Kconfig | 10 +++ + drivers/hwmon/Makefile | 1 + + drivers/hwmon/max31722.c | 165 +++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 210 insertions(+) + create mode 100644 Documentation/hwmon/max31722 + create mode 100644 drivers/hwmon/max31722.c +Merging v4l-dvb/master (405ddbfa6817 [media] Revert "[media] media: au0828 change to use Managed Media Controller API") +$ git merge v4l-dvb/master +Auto-merging sound/usb/stream.c +Removing sound/usb/media.h +Removing sound/usb/media.c +Merge made by the 'recursive' strategy. + drivers/media/usb/au0828/au0828-cards.c | 4 - + drivers/media/usb/au0828/au0828-core.c | 52 ++++-- + drivers/media/usb/au0828/au0828-input.c | 4 +- + drivers/media/usb/au0828/au0828-video.c | 63 ++++--- + drivers/media/usb/au0828/au0828.h | 9 +- + sound/usb/Kconfig | 4 - + sound/usb/Makefile | 2 - + sound/usb/card.c | 14 -- + sound/usb/card.h | 3 - + sound/usb/media.c | 318 -------------------------------- + sound/usb/media.h | 72 -------- + sound/usb/mixer.h | 3 - + sound/usb/pcm.c | 28 +-- + sound/usb/quirks-table.h | 1 - + sound/usb/stream.c | 2 - + sound/usb/usbaudio.h | 6 - + 16 files changed, 78 insertions(+), 507 deletions(-) + delete mode 100644 sound/usb/media.c + delete mode 100644 sound/usb/media.h +Merging libata/for-next (f8193efa5cdc Merge branch 'for-4.7' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/ahci-platform.txt | 4 + + arch/arm/boot/dts/qcom-apq8064.dtsi | 3 +- + drivers/ata/ahci_platform.c | 3 + + drivers/ata/libahci.c | 5 +- + drivers/ata/libata-core.c | 30 +- + drivers/ata/libata-eh.c | 111 ++++- + drivers/ata/libata-scsi.c | 459 +++++++++++++++------ + drivers/ata/libata.h | 8 +- + drivers/scsi/scsi_common.c | 53 +++ + drivers/scsi/scsi_error.c | 3 +- + include/linux/ata.h | 21 +- + include/linux/libata.h | 1 + + include/scsi/scsi_common.h | 1 + + include/scsi/scsi_eh.h | 1 + + 14 files changed, 554 insertions(+), 149 deletions(-) +Merging pm/linux-next (ea58c523eefd Merge branch 'pm-cpufreq-sched' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + drivers/cpufreq/Kconfig | 34 ++ + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/acpi-cpufreq.c | 42 +++ + drivers/cpufreq/cpufreq.c | 130 ++++++- + drivers/cpufreq/cpufreq_conservative.c | 25 +- + drivers/cpufreq/cpufreq_governor.c | 162 +++------ + drivers/cpufreq/cpufreq_governor.h | 44 +-- + drivers/cpufreq/cpufreq_governor_attr_set.c | 84 +++++ + drivers/cpufreq/cpufreq_ondemand.c | 29 +- + drivers/cpufreq/intel_pstate.c | 47 ++- + include/linux/cpufreq.h | 53 +++ + include/linux/sched.h | 5 +- + kernel/sched/Makefile | 1 + + kernel/sched/cpufreq.c | 48 ++- + kernel/sched/cpufreq_schedutil.c | 528 ++++++++++++++++++++++++++++ + kernel/sched/sched.h | 8 + + kernel/trace/power-traces.c | 1 + + 17 files changed, 1043 insertions(+), 199 deletions(-) + create mode 100644 drivers/cpufreq/cpufreq_governor_attr_set.c + create mode 100644 kernel/sched/cpufreq_schedutil.c +Merging idle/next (b318c60f942c intel_idle: Clean up all registered devices on exit.) +$ git merge idle/next +Auto-merging arch/x86/include/asm/msr-index.h +Merge made by the 'recursive' strategy. + arch/x86/include/asm/msr-index.h | 8 ++ + drivers/idle/intel_idle.c | 177 ++++++++++++++++++++++++++++++++------- + 2 files changed, 155 insertions(+), 30 deletions(-) +Merging thermal/next (81ad4276b505 Thermal: Ignore invalid trip points) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (c960fe12d002 thermal: hisilicon: fix IRQ imbalance enabling) +$ git merge thermal-soc/next +Removing drivers/thermal/tegra_soctherm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/rcar-thermal.txt | 1 - + .../devicetree/bindings/thermal/tegra-soctherm.txt | 12 + + Documentation/thermal/sysfs-api.txt | 44 +- + MAINTAINERS | 1 + + drivers/hwmon/lm75.c | 10 +- + drivers/hwmon/ntc_thermistor.c | 12 +- + drivers/hwmon/scpi-hwmon.c | 48 +- + drivers/hwmon/tmp102.c | 8 +- + drivers/input/touchscreen/sun4i-ts.c | 9 +- + drivers/thermal/Kconfig | 12 +- + drivers/thermal/Makefile | 2 +- + drivers/thermal/hisi_thermal.c | 45 +- + drivers/thermal/mtk_thermal.c | 12 +- + drivers/thermal/of-thermal.c | 10 +- + drivers/thermal/qcom-spmi-temp-alarm.c | 3 +- + drivers/thermal/rcar_thermal.c | 2 +- + drivers/thermal/rockchip_thermal.c | 17 +- + drivers/thermal/tegra/Kconfig | 13 + + drivers/thermal/tegra/Makefile | 5 + + drivers/thermal/tegra/soctherm-fuse.c | 169 +++++ + drivers/thermal/tegra/soctherm.c | 682 +++++++++++++++++++++ + drivers/thermal/tegra/soctherm.h | 123 ++++ + drivers/thermal/tegra/tegra124-soctherm.c | 196 ++++++ + drivers/thermal/tegra/tegra210-soctherm.c | 197 ++++++ + drivers/thermal/tegra_soctherm.c | 476 -------------- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 5 +- + include/dt-bindings/thermal/tegra124-soctherm.h | 1 + + include/linux/thermal.h | 1 + + 28 files changed, 1488 insertions(+), 628 deletions(-) + create mode 100644 drivers/thermal/tegra/Kconfig + create mode 100644 drivers/thermal/tegra/Makefile + create mode 100644 drivers/thermal/tegra/soctherm-fuse.c + create mode 100644 drivers/thermal/tegra/soctherm.c + create mode 100644 drivers/thermal/tegra/soctherm.h + create mode 100644 drivers/thermal/tegra/tegra124-soctherm.c + create mode 100644 drivers/thermal/tegra/tegra210-soctherm.c + delete mode 100644 drivers/thermal/tegra_soctherm.c +Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster()) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge slave-dma/next +Already up-to-date. +Merging net-next/master (9ef280c6c28f irda: sh_irda: remove driver) +$ git merge net-next/master +Auto-merging net/l2tp/l2tp_ip6.c +Removing drivers/net/irda/sh_irda.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/net/stmmac.txt | 2 + + Documentation/networking/stmmac.txt | 44 +- + Documentation/networking/timestamping.txt | 48 +- + MAINTAINERS | 1 + + drivers/net/ethernet/cadence/macb.c | 152 ++-- + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 20 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 30 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 75 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 5 + + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 6 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 6 + + drivers/net/ethernet/renesas/ravb.h | 204 +++++ + drivers/net/ethernet/renesas/ravb_main.c | 266 +++++-- + drivers/net/ethernet/renesas/ravb_ptp.c | 17 +- + drivers/net/ethernet/stmicro/stmmac/Makefile | 3 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 64 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 7 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 35 +- + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 255 ++++++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 407 ++++++++++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 396 ++++++++++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h | 129 +++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 354 +++++++++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 202 +++++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 225 ++++++ + drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 21 + + drivers/net/ethernet/stmicro/stmmac/mmc.h | 4 + + drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 349 ++++---- + drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 21 + + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 7 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 7 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 643 ++++++++++----- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 7 + + drivers/net/irda/Kconfig | 7 - + drivers/net/irda/Makefile | 1 - + drivers/net/irda/sh_irda.c | 875 --------------------- + drivers/net/tun.c | 3 +- + include/linux/stmmac.h | 2 + + include/net/ip.h | 3 +- + include/net/ipv6.h | 6 +- + include/net/sock.h | 13 +- + include/net/tcp.h | 14 +- + include/net/transp_v6.h | 3 +- + include/uapi/linux/net_tstamp.h | 10 + + net/can/raw.c | 2 +- + net/core/sock.c | 49 +- + net/ipv4/ip_sockglue.c | 9 +- + net/ipv4/ip_tunnel_core.c | 8 +- + net/ipv4/ping.c | 7 +- + net/ipv4/raw.c | 13 +- + net/ipv4/tcp.c | 22 +- + net/ipv4/tcp_input.c | 13 +- + net/ipv4/udp.c | 10 +- + net/ipv6/datagram.c | 9 +- + net/ipv6/icmp.c | 6 +- + net/ipv6/ip6_flowlabel.c | 3 +- + net/ipv6/ip6_output.c | 15 +- + net/ipv6/ipv6_sockglue.c | 3 +- + net/ipv6/ping.c | 3 +- + net/ipv6/raw.c | 7 +- + net/ipv6/udp.c | 10 +- + net/l2tp/l2tp_ip6.c | 10 +- + net/packet/af_packet.c | 30 +- + net/socket.c | 10 +- + 65 files changed, 3668 insertions(+), 1525 deletions(-) + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c + delete mode 100644 drivers/net/irda/sh_irda.c +Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error) +$ git merge ipsec-next/master +Already up-to-date. +Merging ipvs-next/master (f6ca9f46f661 netfilter: ipvs: avoid unused variable warnings) +$ git merge ipvs-next/master +Already up-to-date. +Merging wireless-drivers-next/master (e46b4e2b46e1 Merge tag 'trace-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (9ef280c6c28f irda: sh_irda: remove driver) +$ git merge bluetooth/master +Already up-to-date. +Merging mac80211-next/master (0a87cadbb54e nl80211: add feature for BSS selection support) +$ git merge mac80211-next/master +Auto-merging net/wireless/sme.c +Auto-merging net/wireless/nl80211.c +Auto-merging net/wireless/core.c +Auto-merging net/sctp/proc.c +Auto-merging net/netlink/af_netlink.c +Auto-merging net/mac80211/tx.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging fs/gfs2/glock.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Auto-merging drivers/net/wireless/ath/ath10k/htt_rx.c +Merge made by the 'recursive' strategy. + Documentation/networking/mac80211-injection.txt | 17 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 2 +- + drivers/net/wireless/ath/wcn36xx/txrx.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 5 + + fs/gfs2/glock.c | 4 +- + include/linux/rhashtable.h | 3 +- + include/net/cfg80211.h | 36 + + include/net/mac80211.h | 13 +- + include/uapi/linux/nl80211.h | 56 +- + lib/rhashtable.c | 6 +- + lib/test_rhashtable.c | 2 +- + net/ipv6/ila/ila_xlat.c | 3 +- + net/mac80211/cfg.c | 4 +- + net/mac80211/chan.c | 4 +- + net/mac80211/driver-ops.h | 15 + + net/mac80211/ieee80211_i.h | 9 + + net/mac80211/mesh.c | 12 +- + net/mac80211/mesh.h | 38 +- + net/mac80211/mesh_pathtbl.c | 950 ++++++++---------------- + net/mac80211/scan.c | 8 +- + net/mac80211/sta_info.c | 9 +- + net/mac80211/tdls.c | 40 +- + net/mac80211/trace.h | 12 + + net/mac80211/tx.c | 44 +- + net/mac80211/util.c | 5 +- + net/mac80211/vht.c | 30 +- + net/mac80211/wpa.c | 26 +- + net/netfilter/nft_hash.c | 4 +- + net/netlink/af_netlink.c | 3 +- + net/rfkill/core.c | 36 +- + net/sctp/proc.c | 3 +- + net/wireless/core.c | 7 + + net/wireless/nl80211.c | 117 +++ + net/wireless/scan.c | 2 + + net/wireless/sme.c | 2 + + 35 files changed, 792 insertions(+), 737 deletions(-) +Merging rdma/for-next (520a07bff6fb Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6) +$ git merge rdma/for-next +Already up-to-date. +Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan) +$ git merge mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/nand/nand_base.c | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) +Merging l2-mtd/master (5651d6aaf489 mtd: bcm47xxsflash: use ioremap_cache() instead of KSEG0ADDR()) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + drivers/bcma/driver_chipcommon_sflash.c | 1 - + drivers/mtd/chips/Kconfig | 1 + + drivers/mtd/devices/bcm47xxsflash.c | 29 ++++++++++++++++++++++++----- + drivers/mtd/devices/bcm47xxsflash.h | 3 ++- + include/linux/bcma/bcma_driver_chipcommon.h | 1 - + include/linux/mtd/map.h | 19 +++++++------------ + 6 files changed, 34 insertions(+), 20 deletions(-) +Merging nand/nand/next (be17c419f889 mtd: brcmnand: Add support for v6.2 controllers) +$ git merge nand/nand/next +Auto-merging drivers/mtd/nand/nandsim.c +Auto-merging drivers/mtd/nand/nand_base.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/brcm,brcmnand.txt | 1 + + Documentation/devicetree/bindings/mtd/nand.txt | 37 +++++++++++++++++++++- + drivers/mtd/nand/atmel_nand.c | 37 ++++++++++++---------- + drivers/mtd/nand/brcmnand/brcmnand.c | 3 +- + drivers/mtd/nand/jz4780_bch.c | 1 - + drivers/mtd/nand/nand_base.c | 6 +++- + drivers/mtd/nand/nandsim.c | 2 ++ + drivers/of/of_mtd.c | 36 +++++++++++++++++++++ + include/linux/mtd/nand.h | 8 +++++ + include/linux/of_mtd.h | 6 ++++ + 10 files changed, 116 insertions(+), 21 deletions(-) +Merging crypto/master (34074205bb9f crypto: qat - remove redundant arbiter configuration) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (4604202ca8d2 Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (c8a3b2ae0713 drm/bridge: Make (pre/post) enable/disable callbacks optional) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (27af5eea54d1 drm/i915: Move execlists irq handler to a bottom half) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_gem_userptr.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/gpu.tmpl | 8 +- + drivers/gpu/drm/i915/Kconfig | 6 + + drivers/gpu/drm/i915/Kconfig.debug | 12 + + drivers/gpu/drm/i915/Makefile | 2 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 211 +- + drivers/gpu/drm/i915/i915_debugfs.c | 316 +-- + drivers/gpu/drm/i915/i915_dma.c | 483 +++-- + drivers/gpu/drm/i915/i915_drv.c | 36 +- + drivers/gpu/drm/i915/i915_drv.h | 336 ++-- + drivers/gpu/drm/i915/i915_gem.c | 459 ++--- + drivers/gpu/drm/i915/i915_gem_context.c | 174 +- + drivers/gpu/drm/i915/i915_gem_debug.c | 16 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 136 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 505 +++-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 28 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 12 +- + drivers/gpu/drm/i915/i915_gem_render_state.h | 2 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 98 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 7 + + drivers/gpu/drm/i915/i915_gpu_error.c | 201 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 45 +- + drivers/gpu/drm/i915/i915_irq.c | 284 ++- + drivers/gpu/drm/i915/i915_params.c | 9 + + drivers/gpu/drm/i915/i915_params.h | 2 + + drivers/gpu/drm/i915/i915_reg.h | 178 +- + drivers/gpu/drm/i915/i915_sysfs.c | 10 + + drivers/gpu/drm/i915/i915_trace.h | 52 +- + drivers/gpu/drm/i915/i915_vgpu.c | 36 +- + drivers/gpu/drm/i915/intel_atomic.c | 5 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 4 +- + drivers/gpu/drm/i915/intel_audio.c | 16 +- + drivers/gpu/drm/i915/intel_bios.c | 224 ++- + drivers/gpu/drm/i915/intel_bios.h | 861 +------- + drivers/gpu/drm/i915/intel_color.c | 553 +++++ + drivers/gpu/drm/i915/intel_crt.c | 40 +- + drivers/gpu/drm/i915/intel_csr.c | 86 +- + drivers/gpu/drm/i915/intel_ddi.c | 1265 +----------- + drivers/gpu/drm/i915/intel_display.c | 2775 +++++++++++++------------- + drivers/gpu/drm/i915/intel_dp.c | 438 ++-- + drivers/gpu/drm/i915/intel_dp_mst.c | 10 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 1786 +++++++++++++++++ + drivers/gpu/drm/i915/intel_dpll_mgr.h | 164 ++ + drivers/gpu/drm/i915/intel_drv.h | 173 +- + drivers/gpu/drm/i915/intel_dsi.c | 116 +- + drivers/gpu/drm/i915/intel_dsi.h | 15 +- + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 49 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 126 +- + drivers/gpu/drm/i915/intel_fbc.c | 5 +- + drivers/gpu/drm/i915/intel_fbdev.c | 20 +- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 6 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 22 +- + drivers/gpu/drm/i915/intel_hdmi.c | 3 - + drivers/gpu/drm/i915/intel_lrc.c | 1008 +++++----- + drivers/gpu/drm/i915/intel_lrc.h | 15 +- + drivers/gpu/drm/i915/intel_lvds.c | 70 +- + drivers/gpu/drm/i915/intel_mocs.c | 14 +- + drivers/gpu/drm/i915/intel_overlay.c | 70 +- + drivers/gpu/drm/i915/intel_panel.c | 52 +- + drivers/gpu/drm/i915/intel_pm.c | 403 ++-- + drivers/gpu/drm/i915/intel_psr.c | 6 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 1450 +++++++------- + drivers/gpu/drm/i915/intel_ringbuffer.h | 109 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 149 +- + drivers/gpu/drm/i915/intel_sdvo.c | 20 +- + drivers/gpu/drm/i915/intel_sprite.c | 61 +- + drivers/gpu/drm/i915/intel_tv.c | 58 +- + drivers/gpu/drm/i915/intel_uncore.c | 159 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 826 ++++++++ + 68 files changed, 9542 insertions(+), 7354 deletions(-) + create mode 100644 drivers/gpu/drm/i915/Kconfig.debug + create mode 100644 drivers/gpu/drm/i915/intel_color.c + create mode 100644 drivers/gpu/drm/i915/intel_dpll_mgr.c + create mode 100644 drivers/gpu/drm/i915/intel_dpll_mgr.h + create mode 100644 drivers/gpu/drm/i915/intel_vbt_defs.h +Merging drm-tegra/drm/tegra/for-next (3a9b33c6048a drm/tegra: Don't set a gamma table size) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/dc.c | 1 - + 1 file changed, 1 deletion(-) +Merging drm-misc/topic/drm-misc (249c4f538b1a drm: Add new DCS commands in the enum list) +$ git merge drm-misc/topic/drm-misc +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c' using previous resolution. +Resolved 'include/drm/drm_crtc.h' using previous resolution. +Auto-merging include/drm/drm_crtc.h +CONFLICT (content): Merge conflict in include/drm/drm_crtc.h +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +Auto-merging drivers/gpu/drm/radeon/radeon_drv.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/drm_irq.c +Auto-merging drivers/gpu/drm/drm_crtc.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging drivers/gpu/drm/cirrus/cirrus_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e2315811407b] Merge remote-tracking branch 'drm-misc/topic/drm-misc' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 - + drivers/gpu/drm/ast/ast_drv.c | 2 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- + drivers/gpu/drm/bridge/dw-hdmi.c | 7 -- + drivers/gpu/drm/cirrus/cirrus_drv.c | 2 - + drivers/gpu/drm/drm_atomic_helper.c | 15 ++- + drivers/gpu/drm/drm_crtc.c | 18 ++-- + drivers/gpu/drm/drm_irq.c | 5 +- + drivers/gpu/drm/drm_sysfs.c | 156 --------------------------- + drivers/gpu/drm/i915/i915_drv.c | 2 - + drivers/gpu/drm/mgag200/mgag200_drv.c | 2 - + drivers/gpu/drm/nouveau/nouveau_drm.c | 2 - + drivers/gpu/drm/qxl/qxl_drv.c | 2 - + drivers/gpu/drm/radeon/radeon_drv.c | 2 - + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 5 +- + drivers/gpu/drm/ttm/Makefile | 3 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 3 - + drivers/gpu/drm/ttm/ttm_page_alloc.c | 8 +- + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 8 +- + drivers/gpu/drm/udl/udl_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 - + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 - + include/drm/drm_atomic_helper.h | 2 + + include/drm/drm_crtc.h | 14 +-- + include/drm/ttm/ttm_bo_driver.h | 3 +- + include/linux/console.h | 2 + + include/uapi/drm/drm.h | 18 +++- + include/uapi/drm/drm_mode.h | 10 ++ + include/video/mipi_display.h | 8 ++ + 29 files changed, 75 insertions(+), 234 deletions(-) +Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (fcda50c8f484 drm/msm: rename hdmi symbols) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (69c2565a3cca drm: ARM HDLCD - fix an error code) +$ git merge hdlcd/for-upstream/hdlcd +Merge made by the 'recursive' strategy. + drivers/gpu/drm/arm/hdlcd_drv.c | 14 +++----------- + 1 file changed, 3 insertions(+), 11 deletions(-) +Merging drm-vc4/drm-vc4-next (4abfa518f0a0 drm/vc4: Add DPI driver) +$ git merge drm-vc4/drm-vc4-next +Auto-merging include/uapi/drm/drm_mode.h +Auto-merging drivers/gpu/drm/drm_crtc.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/brcm,bcm-vc4.txt | 37 ++ + drivers/gpu/drm/drm_crtc.c | 2 + + drivers/gpu/drm/vc4/Kconfig | 1 + + drivers/gpu/drm/vc4/Makefile | 1 + + drivers/gpu/drm/vc4/vc4_debugfs.c | 1 + + drivers/gpu/drm/vc4/vc4_dpi.c | 520 +++++++++++++++++++++ + drivers/gpu/drm/vc4/vc4_drv.c | 1 + + drivers/gpu/drm/vc4/vc4_drv.h | 5 + + include/uapi/drm/drm_mode.h | 2 + + 9 files changed, 570 insertions(+) + create mode 100644 drivers/gpu/drm/vc4/vc4_dpi.c +Merging kbuild/for-next (2468fc97cc45 Merge branch 'kbuild/kbuild' into kbuild/for-next) +$ git merge kbuild/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kconfig/for-next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (1688fc1d5733 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regmap/regmap.txt | 59 +++++++--------------- + drivers/base/regmap/internal.h | 1 + + drivers/base/regmap/regcache-flat.c | 2 +- + drivers/base/regmap/regcache.c | 2 +- + drivers/base/regmap/regmap-mmio.c | 5 +- + 5 files changed, 26 insertions(+), 43 deletions(-) +Merging sound/for-next (44fde3b89ba1 ALSA: hda - Update chmap tlv to report sink's capability) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + include/sound/hda_chmap.h | 2 + + include/sound/hda_i915.h | 10 +- + sound/firewire/Kconfig | 1 + + sound/firewire/amdtp-stream.c | 4 + + sound/firewire/bebob/bebob.c | 217 +++++++++------ + sound/firewire/bebob/bebob.h | 5 +- + sound/firewire/dice/dice.c | 34 +-- + sound/firewire/digi00x/digi00x-transaction.c | 7 +- + sound/firewire/digi00x/digi00x.c | 107 +++++--- + sound/firewire/digi00x/digi00x.h | 3 + + sound/firewire/fireworks/fireworks.c | 168 ++++++++---- + sound/firewire/fireworks/fireworks.h | 3 + + sound/firewire/lib.c | 32 +++ + sound/firewire/lib.h | 3 + + sound/firewire/oxfw/oxfw.c | 151 +++++++---- + sound/firewire/oxfw/oxfw.h | 4 +- + sound/hda/hdac_i915.c | 47 +++- + sound/hda/hdmi_chmap.c | 44 ++- + sound/pci/hda/patch_hdmi.c | 386 ++++++++++++++++++--------- + 19 files changed, 830 insertions(+), 398 deletions(-) +Merging sound-asoc/for-next (c6da59a2ef1d Merge remote-tracking branches 'asoc/topic/wm8960' and 'asoc/topic/wm8962' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/st,sti-asoc-card.txt | 4 +- + .../devicetree/bindings/sound/tas571x.txt | 10 +- + include/uapi/sound/asoc.h | 42 ++- + sound/hda/ext/hdac_ext_stream.c | 5 +- + sound/soc/codecs/Kconfig | 6 +- + sound/soc/codecs/cs35l32.c | 17 +- + sound/soc/codecs/cs47l24.c | 41 ++- + sound/soc/codecs/hdac_hdmi.c | 94 +++--- + sound/soc/codecs/nau8825.c | 310 ++++++++++++------- + sound/soc/codecs/nau8825.h | 28 +- + sound/soc/codecs/rt5640.c | 2 +- + sound/soc/codecs/rt5640.h | 36 +-- + sound/soc/codecs/rt5645.c | 6 + + sound/soc/codecs/rt5677.c | 24 +- + sound/soc/codecs/tas571x.c | 141 ++++++++- + sound/soc/codecs/tas571x.h | 22 ++ + sound/soc/codecs/wm8962.c | 11 +- + sound/soc/codecs/wm8962.h | 6 +- + sound/soc/codecs/wm_adsp.c | 17 +- + sound/soc/intel/Kconfig | 2 +- + sound/soc/intel/common/sst-acpi.h | 9 + + sound/soc/intel/skylake/Makefile | 2 +- + sound/soc/intel/skylake/bxt-sst.c | 328 +++++++++++++++++++++ + sound/soc/intel/skylake/skl-messages.c | 120 ++++++++ + sound/soc/intel/skylake/skl-sst-dsp.c | 5 + + sound/soc/intel/skylake/skl-sst-dsp.h | 13 + + sound/soc/intel/skylake/skl-topology.c | 14 +- + sound/soc/intel/skylake/skl-topology.h | 8 +- + sound/soc/intel/skylake/skl.c | 32 +- + sound/soc/omap/mcbsp.c | 8 + + sound/soc/qcom/lpass-platform.c | 8 +- + sound/soc/soc-dapm.c | 7 + + sound/soc/sti/uniperif.h | 22 +- + 33 files changed, 1127 insertions(+), 273 deletions(-) + create mode 100644 sound/soc/intel/skylake/bxt-sst.c +Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew)) +$ git merge modules/modules-next +Already up-to-date. +Merging input/next (7d8d86252307 Input: gpio-keys - clean up device tree binding example) +$ git merge input/next +Auto-merging drivers/input/tablet/gtco.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/gpio-keys.txt | 10 ++++----- + drivers/input/tablet/acecad.c | 12 +++++------ + drivers/input/tablet/aiptek.c | 20 ++++++++++-------- + drivers/input/tablet/gtco.c | 24 +++++++++++----------- + drivers/input/tablet/kbtab.c | 8 ++++---- + 5 files changed, 38 insertions(+), 36 deletions(-) +Merging block/for-next (258b83ad9930 Merge branch 'for-linus' into for-next) +$ git merge block/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (ef6e0d57417a dm raid1: do not error successfully written bios during suspend) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-raid1.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc-uh/next (1dceb0415aa0 mmc: sdhci: Fix regression setting power on Trats2 board) +$ git merge mmc-uh/next +Merge made by the 'recursive' strategy. + drivers/mmc/host/sdhci-pxav3.c | 22 ++++++++++++++++++++++ + drivers/mmc/host/sdhci.c | 39 ++++++++++++++++++++++++++++++--------- + drivers/mmc/host/sdhci.h | 4 ++++ + 3 files changed, 56 insertions(+), 9 deletions(-) +Merging md/for-next (f9a67b1182e5 md/bitmap: clear bitmap if bitmap_create failed) +$ git merge md/for-next +Auto-merging drivers/md/bitmap.c +Merge made by the 'recursive' strategy. + drivers/md/bitmap.c | 19 +++++++++++-------- + drivers/md/md.c | 5 ++++- + drivers/md/raid1.c | 2 +- + 3 files changed, 16 insertions(+), 10 deletions(-) +Merging mfd/for-mfd-next (a557a7a09b08 mfd: lp8788-irq: Uninitialized variable in irq handler) +$ git merge mfd/for-mfd-next +Merge made by the 'recursive' strategy. + drivers/mfd/da9063-irq.c | 2 -- + drivers/mfd/intel_quark_i2c_gpio.c | 45 +++++++++++++++++++++++--------------- + drivers/mfd/lp8788-irq.c | 2 +- + drivers/mfd/mfd-core.c | 2 +- + include/linux/mfd/syscon.h | 1 + + 5 files changed, 30 insertions(+), 22 deletions(-) +Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (0df6e32b0e36 power: pm2301-charger: use __maybe_unused to hide pm functions) +$ git merge battery/master +Already up-to-date. +Merging omap_dss2/for-next (32ad61951574 video: fbdev: sis: remove unused variable) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (77f8e8e944cb Merge remote-tracking branches 'regulator/topic/maxim', 'regulator/topic/pwm', 'regulator/topic/qcom-spmi' and 'regulator/topic/twl' into regulator-next) +$ git merge regulator/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/regulator/qcom,spmi-regulator.txt | 37 +++ + MAINTAINERS | 4 +- + drivers/regulator/Makefile | 6 +- + drivers/regulator/act8865-regulator.c | 113 +++++++-- + drivers/regulator/core.c | 64 +++-- + drivers/regulator/gpio-regulator.c | 2 + + .../regulator/{max14577.c => max14577-regulator.c} | 0 + .../regulator/{max77693.c => max77693-regulator.c} | 0 + .../regulator/{max8997.c => max8997-regulator.c} | 0 + drivers/regulator/of_regulator.c | 6 +- + drivers/regulator/pwm-regulator.c | 23 +- + drivers/regulator/qcom_spmi-regulator.c | 273 ++++++++++++++------- + drivers/regulator/s2mps11.c | 28 ++- + drivers/regulator/twl-regulator.c | 86 +++++-- + include/linux/mfd/samsung/s2mps11.h | 2 + + include/linux/regulator/act8865.h | 2 + + include/linux/regulator/consumer.h | 4 +- + include/linux/regulator/driver.h | 5 + + include/linux/regulator/machine.h | 1 + + 19 files changed, 481 insertions(+), 175 deletions(-) + rename drivers/regulator/{max14577.c => max14577-regulator.c} (100%) + rename drivers/regulator/{max77693.c => max77693-regulator.c} (100%) + rename drivers/regulator/{max8997.c => max8997-regulator.c} (100%) +Merging security/next (9735a22799b9 Linux 4.6-rc2) +$ git merge security/next +Already up-to-date. +Merging integrity/next (95ee08fa373b ima: require signed IMA policy) +$ git merge integrity/next +Already up-to-date. +Merging keys/keys-next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next) +$ git merge keys/keys-next +Already up-to-date. +Merging selinux/next (e8203d2af614 selinux: consolidate the ptrace parent lookup code) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Merge made by the 'recursive' strategy. + net/netlabel/netlabel_kapi.c | 2 +- + security/selinux/hooks.c | 48 +++++++++++++++++++-------------------- + security/selinux/include/objsec.h | 5 ++-- + 3 files changed, 26 insertions(+), 29 deletions(-) +Merging tpmdd/next (59f95b842ad0 Merge branch 'master' into next) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/st33zp24/Kconfig | 11 +- + drivers/char/tpm/st33zp24/i2c.c | 76 +++++++++--- + drivers/char/tpm/st33zp24/spi.c | 190 +++++++++++++++++------------ + drivers/char/tpm/st33zp24/st33zp24.c | 2 +- + drivers/char/tpm/st33zp24/st33zp24.h | 2 +- + drivers/char/tpm/tpm-chip.c | 214 +++++++++++++++++++++++---------- + drivers/char/tpm/tpm-dev.c | 15 ++- + drivers/char/tpm/tpm-interface.c | 50 ++++---- + drivers/char/tpm/tpm-sysfs.c | 11 +- + drivers/char/tpm/tpm.h | 25 ++-- + drivers/char/tpm/tpm2-cmd.c | 8 +- + drivers/char/tpm/tpm_atmel.c | 14 +-- + drivers/char/tpm/tpm_eventlog.c | 2 +- + drivers/char/tpm/tpm_eventlog.h | 4 +- + drivers/char/tpm/tpm_i2c_atmel.c | 16 +-- + drivers/char/tpm/tpm_i2c_infineon.c | 6 +- + drivers/char/tpm/tpm_i2c_nuvoton.c | 24 ++-- + drivers/char/tpm/tpm_infineon.c | 22 ++-- + drivers/char/tpm/tpm_nsc.c | 20 +-- + drivers/char/tpm/tpm_tis.c | 18 +-- + include/linux/platform_data/st33zp24.h | 2 +- + 21 files changed, 458 insertions(+), 274 deletions(-) +Merging watchdog/master (d1ed3ba4e3d7 watchdog: Ensure that wdd is not dereferenced if NULL) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (70cf769c5ba2 Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'arm/mediatek', 'arm/io-pgtable', 'arm/renesas' and 'core' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (c4aec3101319 vfio/pci: return -EFAULT if copy_to_user fails) +$ git merge vfio/next +Already up-to-date. +Merging jc_docs/docs-next (4817ebb144ff serial: doc: Correct return type of mctrl_gpio_to_gpiod()) +$ git merge jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/IRQ-domain.txt | 12 +++++++++++ + Documentation/block/00-INDEX | 4 ++++ + Documentation/kernel-docs.txt | 13 +++++++++--- + Documentation/mmc/00-INDEX | 2 ++ + Documentation/mmc/mmc-tools.txt | 34 +++++++++++++++++++++++++++++++ + Documentation/networking/filter.txt | 2 +- + Documentation/serial/driver | 40 +++++++++++++++++++++++-------------- + 7 files changed, 88 insertions(+), 19 deletions(-) + create mode 100644 Documentation/mmc/mmc-tools.txt +Merging trivial/for-next (d00cd819d7df drivers/rtc: broken link fix) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (0bf676d1fd51 audit: cleanup prune_tree_thread) +$ git merge audit/next +Merge made by the 'recursive' strategy. + kernel/audit_tree.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) +Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (bc553986a2f7 dtc: turn off dtc unit address warnings by default) +$ git merge dt-rh/for-next +Merge made by the 'recursive' strategy. + scripts/Makefile.lib | 5 +++++ + scripts/dtc/checks.c | 26 ++++++++++++++++++++++++++ + scripts/dtc/flattree.c | 4 ++-- + scripts/dtc/libfdt/fdt_ro.c | 6 ++---- + scripts/dtc/version_gen.h | 2 +- + 5 files changed, 36 insertions(+), 7 deletions(-) +Merging mailbox/mailbox-for-next (aca04ce5dbda Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (80bed53f77e4 Merge remote-tracking branch 'spi/topic/xlp' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + .../bindings/spi/microchip,spi-pic32.txt | 34 + + drivers/spi/Kconfig | 8 +- + drivers/spi/Makefile | 1 + + drivers/spi/spi-fsl-dspi.c | 7 + + drivers/spi/spi-fsl-espi.c | 30 +- + drivers/spi/spi-imx.c | 16 +- + drivers/spi/spi-octeon.c | 17 +- + drivers/spi/spi-omap2-mcspi.c | 62 +- + drivers/spi/spi-pic32.c | 888 +++++++++++++++++++++ + drivers/spi/spi-pxa2xx-dma.c | 28 +- + drivers/spi/spi-pxa2xx.c | 14 +- + drivers/spi/spi-pxa2xx.h | 3 - + drivers/spi/spi-rockchip.c | 16 +- + drivers/spi/spi.c | 4 +- + 14 files changed, 1033 insertions(+), 95 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/microchip,spi-pic32.txt + create mode 100644 drivers/spi/spi-pic32.c +Merging tip/auto-latest (c6ddb3131c7f Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging mm/nommu.c +Auto-merging mm/gup.c +Removing lib/proportions.c +Auto-merging kernel/sched/sched.h +Auto-merging include/linux/sched.h +Removing include/linux/proportions.h +Auto-merging include/linux/mm.h +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging arch/x86/include/asm/msr-index.h +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 8 + + Documentation/x86/pat.txt | 32 ++ + Documentation/x86/protection-keys.txt | 27 + + arch/arm/kernel/hw_breakpoint.c | 4 +- + arch/arm64/kernel/hw_breakpoint.c | 4 +- + arch/ia64/include/asm/iommu.h | 1 - + arch/x86/Kconfig | 15 +- + arch/x86/boot/compressed/Makefile | 14 +- + arch/x86/boot/compressed/head_32.S | 28 ++ + arch/x86/boot/compressed/head_64.S | 8 + + arch/x86/crypto/camellia_aesni_avx2_glue.c | 3 +- + arch/x86/crypto/camellia_aesni_avx_glue.c | 2 +- + arch/x86/crypto/poly1305_glue.c | 2 +- + arch/x86/crypto/serpent_avx2_glue.c | 2 +- + arch/x86/crypto/serpent_sse2_glue.c | 2 +- + arch/x86/events/Kconfig | 36 ++ + arch/x86/events/Makefile | 9 +- + arch/x86/events/intel/Makefile | 9 + + arch/x86/events/intel/bts.c | 105 ++-- + arch/x86/events/intel/cstate.c | 547 ++++++++++----------- + arch/x86/events/intel/pt.c | 85 +--- + arch/x86/events/intel/rapl.c | 121 +++-- + arch/x86/events/intel/uncore.c | 218 ++++---- + arch/x86/events/msr.c | 36 +- + arch/x86/include/asm/apic.h | 4 +- + arch/x86/include/asm/cpufeature.h | 10 - + arch/x86/include/asm/cpufeatures.h | 2 + + arch/x86/include/asm/msr-index.h | 4 + + arch/x86/include/asm/mtrr.h | 6 +- + arch/x86/include/asm/pat.h | 2 +- + arch/x86/include/asm/pgtable.h | 2 +- + arch/x86/include/asm/tlbflush.h | 2 +- + arch/x86/include/asm/uv/uv_bau.h | 2 +- + arch/x86/include/asm/xor_avx.h | 4 +- + arch/x86/kernel/apic/apic.c | 2 +- + arch/x86/kernel/cpu/amd.c | 2 +- + arch/x86/kernel/cpu/common.c | 7 +- + arch/x86/kernel/cpu/intel.c | 10 +- + arch/x86/kernel/cpu/mtrr/cyrix.c | 4 +- + arch/x86/kernel/cpu/mtrr/generic.c | 28 +- + arch/x86/kernel/cpu/mtrr/main.c | 13 +- + arch/x86/kernel/cpu/mtrr/mtrr.h | 1 + + arch/x86/kernel/cpu/vmware.c | 2 +- + arch/x86/kernel/dumpstack.c | 19 +- + arch/x86/kernel/kvm.c | 2 +- + arch/x86/kernel/tce_64.c | 2 +- + arch/x86/kvm/mmu.c | 3 +- + arch/x86/lib/usercopy_32.c | 4 +- + arch/x86/mm/hugetlbpage.c | 4 +- + arch/x86/mm/init.c | 8 +- + arch/x86/mm/init_32.c | 2 +- + arch/x86/mm/init_64.c | 4 +- + arch/x86/mm/ioremap.c | 4 +- + arch/x86/mm/pageattr.c | 4 +- + arch/x86/mm/pat.c | 90 +++- + arch/x86/oprofile/nmi_int.c | 4 +- + arch/x86/oprofile/op_model_ppro.c | 2 +- + arch/x86/platform/uv/tlb_uv.c | 35 +- + arch/x86/power/hibernate_32.c | 2 +- + arch/x86/xen/enlighten.c | 13 +- + drivers/firmware/efi/arm-init.c | 18 +- + drivers/gpu/drm/drm_cache.c | 6 +- + drivers/gpu/drm/i915/i915_gem.c | 2 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- + drivers/lguest/interrupts_and_traps.c | 6 +- + drivers/lguest/lg.h | 1 + + drivers/lguest/x86/core.c | 8 +- + drivers/staging/unisys/visorbus/visorchipset.c | 2 +- + include/linux/mm.h | 64 +-- + include/linux/perf_event.h | 6 + + include/linux/proportions.h | 137 ------ + include/linux/sched.h | 1 - + include/uapi/linux/perf_event.h | 1 + + kernel/events/core.c | 156 +++++- + kernel/events/internal.h | 10 +- + kernel/events/ring_buffer.c | 104 ++-- + kernel/locking/lockdep.c | 2 + + kernel/sched/core.c | 70 ++- + kernel/sched/cpuacct.c | 148 ++++-- + kernel/sched/fair.c | 74 ++- + kernel/sched/sched.h | 1 + + kernel/trace/trace_event_perf.c | 3 + + lib/Makefile | 2 +- + lib/proportions.c | 407 --------------- + mm/gup.c | 51 +- + mm/nommu.c | 44 +- + tools/perf/Documentation/intel-pt.txt | 7 + + tools/perf/Documentation/itrace.txt | 8 + + tools/perf/Documentation/perf-annotate.txt | 2 +- + tools/perf/Documentation/perf-diff.txt | 2 +- + tools/perf/Documentation/perf-mem.txt | 8 + + tools/perf/Documentation/perf-report.txt | 2 +- + tools/perf/Documentation/perf-script.txt | 4 + + tools/perf/builtin-mem.c | 11 +- + tools/perf/perf.c | 3 +- + tools/perf/tests/Build | 1 + + tools/perf/tests/builtin-test.c | 4 + + tools/perf/tests/event-times.c | 236 +++++++++ + tools/perf/tests/tests.h | 1 + + tools/perf/util/auxtrace.c | 7 + + tools/perf/util/auxtrace.h | 2 + + tools/perf/util/config.c | 57 +-- + tools/perf/util/hist.c | 5 +- + tools/perf/util/hist.h | 2 - + tools/perf/util/intel-bts.c | 5 + + tools/perf/util/intel-pt.c | 22 +- + .../perf/util/scripting-engines/trace-event-perl.c | 114 ++++- + 107 files changed, 1910 insertions(+), 1546 deletions(-) + create mode 100644 Documentation/x86/protection-keys.txt + create mode 100644 arch/x86/events/Kconfig + create mode 100644 arch/x86/events/intel/Makefile + delete mode 100644 include/linux/proportions.h + delete mode 100644 lib/proportions.c + create mode 100644 tools/perf/tests/event-times.c +Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer) +$ git merge clockevents/clockevents/next +Resolved 'drivers/clocksource/Kconfig' using previous resolution. +Auto-merging drivers/clocksource/Kconfig +CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 72020b8efa27] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. +Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (ff6fd1478c53 ARM: socfpga: Enable Arria10 L2 cache ECC on startup) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + .../bindings/arm/altera/socfpga-eccmgr.txt | 40 +++ + arch/arm/mach-socfpga/core.h | 1 + + arch/arm/mach-socfpga/l2_cache.c | 49 ++++ + arch/arm/mach-socfpga/socfpga.c | 10 +- + drivers/edac/Kconfig | 5 +- + drivers/edac/altera_edac.c | 300 +++++++++++++++++---- + drivers/edac/altera_edac.h | 91 +++++++ + 7 files changed, 440 insertions(+), 56 deletions(-) +Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ftrace/for-next (7e6867bf831c tracing: Record and show NMI state) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (f74d79be23b4 Merge branches 'locktorture.2016.03.31d' and 'docmb.2016.03.31d' into HEAD) +$ git merge rcu/rcu/next +Auto-merging Documentation/kernel-parameters.txt +Removing Documentation/RCU/Design/htmlqqz.sh +Removing Documentation/RCU/Design/Requirements/Requirements.htmlx +Removing Documentation/RCU/Design/Requirements/RCUApplicability.svg +Removing Documentation/RCU/Design/Requirements/2013-08-is-it-dead.png +Merge made by the 'recursive' strategy. + .../Design/Data-Structures/BigTreeClassicRCU.svg | 474 +++ + .../Design/Data-Structures/BigTreeClassicRCUBH.svg | 499 ++++ + .../Data-Structures/BigTreeClassicRCUBHdyntick.svg | 695 +++++ + .../Data-Structures/BigTreePreemptRCUBHdyntick.svg | 741 +++++ + .../BigTreePreemptRCUBHdyntickCB.svg | 858 ++++++ + .../Design/Data-Structures/Data-Structures.html | 1333 +++++++++ + .../Design/Data-Structures/HugeTreeClassicRCU.svg | 939 ++++++ + .../RCU/Design/Data-Structures/TreeLevel.svg | 828 ++++++ + .../RCU/Design/Data-Structures/TreeMapping.svg | 305 ++ + .../Design/Data-Structures/TreeMappingLevel.svg | 380 +++ + .../RCU/Design/Data-Structures/blkd_task.svg | 843 ++++++ + .../RCU/Design/Data-Structures/nxtlist.svg | 396 +++ + .../RCU/Design/Requirements/2013-08-is-it-dead.png | Bin 100825 -> 0 bytes + .../RCU/Design/Requirements/RCUApplicability.svg | 237 -- + .../RCU/Design/Requirements/Requirements.html | 941 +++--- + .../RCU/Design/Requirements/Requirements.htmlx | 2741 ------------------ + Documentation/RCU/Design/htmlqqz.sh | 108 - + Documentation/RCU/trace.txt | 10 +- + Documentation/RCU/whatisRCU.txt | 22 +- + Documentation/kernel-parameters.txt | 38 + + Documentation/ko_KR/memory-barriers.txt | 3048 ++++++++++++++++++++ + Documentation/memory-barriers.txt | 78 +- + include/linux/rcupdate.h | 30 +- + include/linux/rcutiny.h | 16 + + include/linux/rcutree.h | 2 + + include/trace/events/rcu.h | 79 +- + kernel/locking/locktorture.c | 18 +- + kernel/rcu/Makefile | 1 + + kernel/rcu/rcuperf.c | 655 +++++ + kernel/rcu/rcutorture.c | 29 +- + kernel/rcu/tree.c | 302 +- + kernel/rcu/tree.h | 20 +- + kernel/rcu/tree_plugin.h | 37 +- + kernel/rcu/tree_trace.c | 13 +- + kernel/rcu/update.c | 4 +- + kernel/torture.c | 4 +- + lib/Kconfig.debug | 33 + + tools/testing/selftests/rcutorture/bin/jitter.sh | 83 + + .../rcutorture/bin/kvm-recheck-rcuperf-ftrace.sh | 121 + + .../rcutorture/bin/kvm-recheck-rcuperf.sh | 96 + + .../selftests/rcutorture/bin/kvm-recheck.sh | 5 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 59 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 24 +- + .../selftests/rcutorture/configs/rcu/TREE04 | 2 +- + .../selftests/rcutorture/configs/rcu/TREE04.boot | 2 +- + .../selftests/rcutorture/configs/rcuperf/CFLIST | 1 + + .../selftests/rcutorture/configs/rcuperf/CFcommon | 2 + + .../selftests/rcutorture/configs/rcuperf/TREE | 20 + + .../selftests/rcutorture/configs/rcuperf/TREE54 | 23 + + .../rcutorture/configs/rcuperf/ver_functions.sh | 52 + + 50 files changed, 13515 insertions(+), 3732 deletions(-) + create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCU.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBH.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBHdyntick.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreePreemptRCUBHdyntick.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreePreemptRCUBHdyntickCB.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/Data-Structures.html + create mode 100644 Documentation/RCU/Design/Data-Structures/HugeTreeClassicRCU.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/TreeLevel.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/TreeMapping.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/TreeMappingLevel.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/blkd_task.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/nxtlist.svg + delete mode 100644 Documentation/RCU/Design/Requirements/2013-08-is-it-dead.png + delete mode 100644 Documentation/RCU/Design/Requirements/RCUApplicability.svg + delete mode 100644 Documentation/RCU/Design/Requirements/Requirements.htmlx + delete mode 100755 Documentation/RCU/Design/htmlqqz.sh + create mode 100644 Documentation/ko_KR/memory-barriers.txt + create mode 100644 kernel/rcu/rcuperf.c + create mode 100755 tools/testing/selftests/rcutorture/bin/jitter.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-rcuperf-ftrace.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-rcuperf.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/rcuperf/CFLIST + create mode 100644 tools/testing/selftests/rcutorture/configs/rcuperf/CFcommon + create mode 100644 tools/testing/selftests/rcutorture/configs/rcuperf/TREE + create mode 100644 tools/testing/selftests/rcutorture/configs/rcuperf/TREE54 + create mode 100644 tools/testing/selftests/rcutorture/configs/rcuperf/ver_functions.sh +Merging kvm/linux-next (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (b40c4892d175 arm64: KVM: vgic-v3: Only wipe LRs on vcpu exit) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvm-ppc-paulus/kvm-ppc-next (58ded4201ff0 KVM: PPC: Add support for 64bit TCE windows) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (c54f0d6ae057 KVM: s390: allocate only one DMA page per VM) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (85d1a29de8e4 Xen on ARM and ARM64: update MAINTAINERS info) +$ git merge xen-tip/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 ++++---- + arch/x86/xen/apic.c | 12 ++++++++++-- + arch/x86/xen/smp.c | 2 ++ + 3 files changed, 16 insertions(+), 6 deletions(-) +Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (22aceb317678 workqueue: Fix comment for work_on_cpu()) +$ git merge workqueues/for-next +Already up-to-date. +Merging drivers-x86/for-next (fffcad87d4e7 hp-wmi: Remove GPS rfkill support via pre-2009 interface) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (1dc318166a9a platform/chrome: use to_platform_device()) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/chromeos_laptop.c | 15 ++++++++ + drivers/platform/chrome/chromeos_pstore.c | 55 ++++++++++++++++++++++++++++-- + drivers/platform/chrome/cros_ec_lightbar.c | 3 +- + 3 files changed, 69 insertions(+), 4 deletions(-) +Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (916fe619951f leds: trigger: Introduce a kernel panic LED trigger) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/trigger/Kconfig | 7 +++++++ + drivers/leds/trigger/Makefile | 1 + + drivers/leds/trigger/ledtrig-panic.c | 30 ++++++++++++++++++++++++++++++ + 3 files changed, 38 insertions(+) + create mode 100644 drivers/leds/trigger/ledtrig-panic.c +Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. +Merging driver-core/driver-core-next (3a3a5fece6f2 fs: kernfs: Replace CURRENT_TIME by current_fs_time()) +$ git merge driver-core/driver-core-next +Auto-merging include/linux/fs.h +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + CREDITS | 1 + + Documentation/devices.txt | 86 ++++++++++++++---------------------------- + arch/x86/Kconfig | 6 +++ + drivers/base/Makefile | 2 +- + drivers/firmware/qemu_fw_cfg.c | 4 +- + fs/char_dev.c | 4 ++ + fs/debugfs/inode.c | 7 +++- + fs/kernfs/dir.c | 8 ++-- + fs/kernfs/inode.c | 15 +++++--- + include/linux/fs.h | 2 + + include/linux/isa.h | 2 +- + 11 files changed, 65 insertions(+), 72 deletions(-) +Merging tty/tty-next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (0561f77e2db9 usb: gadget: f_acm: Fix configfs attr name) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (01b8479400ab usb: chipidea: imx: avoid EPROBE_DEFER printed as error) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. +Merging staging/staging-next (eb7bfed901b9 Merge tag 'iio-for-4.7a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next) +$ git merge staging/staging-next +Recorded preimage for 'drivers/iio/gyro/bmg160_core.c' +Recorded preimage for 'drivers/staging/lustre/lnet/selftest/brw_test.c' +Recorded preimage for 'drivers/staging/lustre/lustre/include/lu_object.h' +Recorded preimage for 'drivers/staging/lustre/lustre/llite/llite_internal.h' +Recorded preimage for 'drivers/staging/lustre/lustre/llite/llite_lib.c' +Recorded preimage for 'drivers/staging/lustre/lustre/llite/llite_mmap.c' +Recorded preimage for 'drivers/staging/lustre/lustre/llite/rw.c' +Recorded preimage for 'drivers/staging/lustre/lustre/llite/rw26.c' +Recorded preimage for 'drivers/staging/lustre/lustre/llite/vvp_io.c' +Recorded preimage for 'drivers/staging/lustre/lustre/llite/vvp_page.c' +Recorded preimage for 'drivers/staging/lustre/lustre/obdclass/class_obd.c' +Recorded preimage for 'drivers/staging/lustre/lustre/obdecho/echo_client.c' +Recorded preimage for 'drivers/staging/lustre/lustre/osc/lproc_osc.c' +Recorded preimage for 'drivers/staging/lustre/lustre/osc/osc_cache.c' +Recorded preimage for 'drivers/staging/lustre/lustre/osc/osc_page.c' +Recorded preimage for 'drivers/staging/lustre/lustre/osc/osc_request.c' +Auto-merging drivers/staging/unisys/visorbus/visorchipset.c +Auto-merging drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c +Auto-merging drivers/staging/lustre/lustre/ptlrpc/client.c +Auto-merging drivers/staging/lustre/lustre/osc/osc_request.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/osc_request.c +Auto-merging drivers/staging/lustre/lustre/osc/osc_page.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/osc_page.c +Auto-merging drivers/staging/lustre/lustre/osc/osc_cache.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/osc_cache.c +Auto-merging drivers/staging/lustre/lustre/osc/lproc_osc.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/lproc_osc.c +Auto-merging drivers/staging/lustre/lustre/obdecho/echo_client.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/obdecho/echo_client.c +Auto-merging drivers/staging/lustre/lustre/obdclass/lu_object.c +Auto-merging drivers/staging/lustre/lustre/obdclass/class_obd.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/obdclass/class_obd.c +Auto-merging drivers/staging/lustre/lustre/obdclass/cl_page.c +Auto-merging drivers/staging/lustre/lustre/mdc/mdc_request.c +Auto-merging drivers/staging/lustre/lustre/lmv/lmv_obd.c +Auto-merging drivers/staging/lustre/lustre/llite/vvp_page.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/vvp_page.c +Auto-merging drivers/staging/lustre/lustre/llite/vvp_io.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/vvp_io.c +Auto-merging drivers/staging/lustre/lustre/llite/rw26.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/rw26.c +Auto-merging drivers/staging/lustre/lustre/llite/rw.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/rw.c +Auto-merging drivers/staging/lustre/lustre/llite/lproc_llite.c +Auto-merging drivers/staging/lustre/lustre/llite/llite_mmap.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_mmap.c +Auto-merging drivers/staging/lustre/lustre/llite/llite_lib.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_lib.c +Auto-merging drivers/staging/lustre/lustre/llite/llite_internal.h +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_internal.h +Auto-merging drivers/staging/lustre/lustre/llite/lcommon_misc.c +Auto-merging drivers/staging/lustre/lustre/llite/glimpse.c +Auto-merging drivers/staging/lustre/lustre/llite/dir.c +Auto-merging drivers/staging/lustre/lustre/ldlm/ldlm_request.c +Auto-merging drivers/staging/lustre/lustre/ldlm/ldlm_lib.c +CONFLICT (modify/delete): drivers/staging/lustre/lustre/lclient/lcommon_cl.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lustre/lclient/lcommon_cl.c left in tree. +Auto-merging drivers/staging/lustre/lustre/include/obd.h +Auto-merging drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +Auto-merging drivers/staging/lustre/lustre/include/lu_object.h +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/include/lu_object.h +Removing drivers/staging/lustre/lustre/include/linux/obd.h +Removing drivers/staging/lustre/lustre/include/lclient.h +Auto-merging drivers/staging/lustre/lnet/selftest/selftest.h +Auto-merging drivers/staging/lustre/lnet/selftest/rpc.c +Auto-merging drivers/staging/lustre/lnet/selftest/framework.c +Auto-merging drivers/staging/lustre/lnet/selftest/conrpc.c +Auto-merging drivers/staging/lustre/lnet/selftest/conctl.c +Auto-merging drivers/staging/lustre/lnet/selftest/brw_test.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lnet/selftest/brw_test.c +Auto-merging drivers/staging/lustre/lnet/lnet/lib-move.c +Auto-merging drivers/staging/lustre/lnet/libcfs/tracefile.c +Auto-merging drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c +CONFLICT (modify/delete): drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h left in tree. +Auto-merging drivers/staging/lustre/include/linux/libcfs/libcfs_private.h +Removing drivers/staging/iio/impedance-analyzer/ad5933.h +Removing drivers/staging/iio/accel/adis16220_core.c +Removing drivers/staging/iio/accel/adis16220.h +Removing drivers/staging/iio/accel/adis16204_core.c +Removing drivers/staging/iio/accel/adis16204.h +Removing drivers/staging/comedi/drivers/ni_mio_c_common.c +Removing drivers/staging/android/timed_output.h +Removing drivers/staging/android/timed_output.c +Removing drivers/staging/android/timed_gpio.h +Removing drivers/staging/android/timed_gpio.c +Auto-merging drivers/iio/gyro/bmg160_core.c +CONFLICT (content): Merge conflict in drivers/iio/gyro/bmg160_core.c +Auto-merging drivers/iio/adc/Kconfig +Auto-merging drivers/iio/accel/bmc150-accel-core.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/lustre/lustre/lclient/lcommon_cl.c drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h +drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h: needs merge +drivers/staging/lustre/lustre/lclient/lcommon_cl.c: needs merge +rm 'drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h' +rm 'drivers/staging/lustre/lustre/lclient/lcommon_cl.c' +$ git commit -v -a +Recorded resolution for 'drivers/iio/gyro/bmg160_core.c'. +Recorded resolution for 'drivers/staging/lustre/lnet/selftest/brw_test.c'. +Recorded resolution for 'drivers/staging/lustre/lustre/include/lu_object.h'. +Recorded resolution for 'drivers/staging/lustre/lustre/llite/llite_internal.h'. +Recorded resolution for 'drivers/staging/lustre/lustre/llite/llite_lib.c'. +Recorded resolution for 'drivers/staging/lustre/lustre/llite/llite_mmap.c'. +Recorded resolution for 'drivers/staging/lustre/lustre/llite/rw.c'. +Recorded resolution for 'drivers/staging/lustre/lustre/llite/rw26.c'. +Recorded resolution for 'drivers/staging/lustre/lustre/llite/vvp_io.c'. +Recorded resolution for 'drivers/staging/lustre/lustre/llite/vvp_page.c'. +Recorded resolution for 'drivers/staging/lustre/lustre/obdclass/class_obd.c'. +Recorded resolution for 'drivers/staging/lustre/lustre/obdecho/echo_client.c'. +Recorded resolution for 'drivers/staging/lustre/lustre/osc/lproc_osc.c'. +Recorded resolution for 'drivers/staging/lustre/lustre/osc/osc_cache.c'. +Recorded resolution for 'drivers/staging/lustre/lustre/osc/osc_page.c'. +Recorded resolution for 'drivers/staging/lustre/lustre/osc/osc_request.c'. +[master 62e6e83f8427] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-iio | 15 +- + .../devicetree/bindings/iio/accel/mma8452.txt | 3 +- + .../devicetree/bindings/iio/adc/lpc1850-adc.txt | 21 + + .../bindings/iio/adc/rockchip-saradc.txt | 6 +- + .../devicetree/bindings/iio/dac/lpc1850-dac.txt | 20 + + .../bindings/iio/magnetometer/ak8975.txt | 2 + + .../bindings/iio/potentiometer/mcp4131.txt | 84 + + .../devicetree/bindings/iio/pressure/ms5611.txt | 19 + + .../devicetree/bindings/iio/st-sensors.txt | 1 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 2 +- + drivers/iio/accel/Kconfig | 5 +- + drivers/iio/accel/bmc150-accel-core.c | 28 +- + drivers/iio/accel/bmc150-accel-i2c.c | 7 +- + drivers/iio/accel/bmc150-accel-spi.c | 8 +- + drivers/iio/accel/bmc150-accel.h | 1 + + drivers/iio/accel/kxcjk-1013.c | 25 +- + drivers/iio/accel/mma8452.c | 188 +- + drivers/iio/accel/mma9553.c | 1 - + drivers/iio/accel/mxc4005.c | 29 - + drivers/iio/accel/st_accel.h | 1 + + drivers/iio/accel/st_accel_core.c | 92 + + drivers/iio/accel/st_accel_i2c.c | 4 + + drivers/iio/accel/stk8312.c | 1 - + drivers/iio/accel/stk8ba50.c | 1 - + drivers/iio/adc/Kconfig | 10 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/at91-sama5d2_adc.c | 102 +- + drivers/iio/adc/ina2xx-adc.c | 43 +- + drivers/iio/adc/lpc18xx_adc.c | 231 +++ + drivers/iio/adc/rockchip_saradc.c | 19 + + drivers/iio/common/st_sensors/st_sensors_buffer.c | 28 +- + drivers/iio/dac/Kconfig | 10 + + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/lpc18xx_dac.c | 210 ++ + drivers/iio/gyro/bmg160_core.c | 51 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 30 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 3 +- + drivers/iio/imu/kmx61.c | 1 - + drivers/iio/industrialio-core.c | 41 + + drivers/iio/light/stk3310.c | 1 - + drivers/iio/light/tsl2563.c | 3 +- + drivers/iio/magnetometer/ak8975.c | 70 +- + drivers/iio/magnetometer/bmc150_magn.c | 1 - + drivers/iio/potentiometer/Kconfig | 18 + + drivers/iio/potentiometer/Makefile | 1 + + drivers/iio/potentiometer/mcp4131.c | 494 +++++ + drivers/iio/potentiometer/mcp4531.c | 13 +- + drivers/iio/potentiometer/tpl0102.c | 2 +- + drivers/iio/pressure/Kconfig | 10 + + drivers/iio/pressure/Makefile | 1 + + drivers/iio/pressure/hp206c.c | 426 ++++ + drivers/iio/pressure/ms5611.h | 23 +- + drivers/iio/pressure/ms5611_core.c | 146 +- + drivers/iio/pressure/ms5611_i2c.c | 25 +- + drivers/iio/pressure/ms5611_spi.c | 32 +- + drivers/staging/android/Kconfig | 14 - + drivers/staging/android/Makefile | 2 - + drivers/staging/android/ion/ion.c | 10 +- + drivers/staging/android/timed_gpio.c | 166 -- + drivers/staging/android/timed_gpio.h | 33 - + drivers/staging/android/timed_output.c | 110 - + drivers/staging/android/timed_output.h | 37 - + drivers/staging/comedi/comedi_buf.c | 10 +- + drivers/staging/comedi/comedi_fops.c | 54 +- + drivers/staging/comedi/comedidev.h | 4 +- + drivers/staging/comedi/drivers.c | 40 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 12 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 104 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 71 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 189 +- + drivers/staging/comedi/drivers/amplc_pci263.c | 86 +- + drivers/staging/comedi/drivers/c6xdigio.c | 4 +- + drivers/staging/comedi/drivers/dt282x.c | 119 +- + drivers/staging/comedi/drivers/ni_660x.c | 1156 ++++------- + drivers/staging/comedi/drivers/ni_labpc.h | 33 +- + drivers/staging/comedi/drivers/ni_labpc_common.c | 65 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 95 +- + drivers/staging/comedi/drivers/ni_labpc_pci.c | 4 +- + drivers/staging/comedi/drivers/ni_labpc_regs.h | 82 +- + drivers/staging/comedi/drivers/ni_mio_c_common.c | 0 + drivers/staging/comedi/drivers/ni_mio_common.c | 6 +- + drivers/staging/comedi/drivers/ni_tio.c | 807 +++++--- + drivers/staging/comedi/drivers/ni_tio.h | 66 +- + drivers/staging/comedi/drivers/ni_tio_internal.h | 322 ++- + drivers/staging/comedi/drivers/ni_tiocmd.c | 116 +- + drivers/staging/comedi/drivers/plx9052.h | 122 +- + drivers/staging/comedi/drivers/z8536.h | 89 +- + drivers/staging/dgnc/dgnc_cls.c | 2 +- + drivers/staging/dgnc/dgnc_driver.c | 52 +- + drivers/staging/dgnc/dgnc_driver.h | 23 +- + drivers/staging/dgnc/dgnc_mgmt.c | 28 +- + drivers/staging/dgnc/dgnc_neo.c | 122 +- + drivers/staging/dgnc/dgnc_sysfs.c | 2 +- + drivers/staging/dgnc/dgnc_tty.c | 179 +- + drivers/staging/emxx_udc/emxx_udc.c | 20 +- + drivers/staging/emxx_udc/emxx_udc.h | 40 +- + drivers/staging/fbtft/fb_agm1264k-fl.c | 2 +- + drivers/staging/fbtft/fbtft-io.c | 8 +- + drivers/staging/fbtft/fbtft_device.c | 6 +- + drivers/staging/fwserial/dma_fifo.c | 8 +- + drivers/staging/fwserial/dma_fifo.h | 16 +- + drivers/staging/fwserial/fwserial.c | 42 +- + drivers/staging/fwserial/fwserial.h | 42 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 8 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.h | 2 +- + drivers/staging/gs_fpgaboot/io.c | 1 - + drivers/staging/i4l/pcbit/capi.h | 2 +- + drivers/staging/i4l/pcbit/drv.c | 8 +- + drivers/staging/i4l/pcbit/edss1.c | 2 +- + drivers/staging/i4l/pcbit/layer2.h | 2 +- + drivers/staging/iio/accel/Kconfig | 23 - + drivers/staging/iio/accel/Makefile | 6 - + drivers/staging/iio/accel/adis16201.h | 156 +- + drivers/staging/iio/accel/adis16203.h | 132 +- + drivers/staging/iio/accel/adis16204.h | 68 - + drivers/staging/iio/accel/adis16204_core.c | 253 --- + drivers/staging/iio/accel/adis16209.h | 39 + + drivers/staging/iio/accel/adis16220.h | 140 -- + drivers/staging/iio/accel/adis16220_core.c | 494 ----- + drivers/staging/iio/accel/adis16240.h | 50 + + drivers/staging/iio/accel/adis16240_core.c | 4 +- + drivers/staging/iio/adc/ad7192.c | 50 +- + drivers/staging/iio/adc/ad7280a.c | 40 +- + drivers/staging/iio/adc/ad7280a.h | 8 +- + drivers/staging/iio/adc/ad7606.h | 28 +- + drivers/staging/iio/adc/ad7606_core.c | 6 +- + drivers/staging/iio/adc/ad7606_spi.c | 5 +- + drivers/staging/iio/adc/ad7780.c | 2 +- + drivers/staging/iio/frequency/ad9832.c | 2 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 45 +- + drivers/staging/iio/impedance-analyzer/ad5933.h | 28 - + drivers/staging/iio/light/isl29028.c | 55 +- + drivers/staging/iio/light/tsl2x7x_core.c | 211 +- + drivers/staging/iio/meter/ade7753.c | 4 +- + drivers/staging/iio/meter/ade7754.c | 4 +- + drivers/staging/iio/meter/ade7758.h | 16 +- + drivers/staging/iio/meter/ade7758_core.c | 77 +- + drivers/staging/iio/meter/ade7758_ring.c | 4 +- + drivers/staging/iio/meter/ade7759.c | 4 +- + drivers/staging/iio/meter/ade7854.c | 3 +- + drivers/staging/iio/resolver/ad2s1210.h | 8 +- + drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 15 +- + .../staging/lustre/include/linux/libcfs/libcfs.h | 51 +- + .../lustre/include/linux/libcfs/libcfs_cpu.h | 79 + + .../lustre/include/linux/libcfs/libcfs_crypto.h | 136 +- + .../lustre/include/linux/libcfs/libcfs_fail.h | 15 +- + .../lustre/include/linux/libcfs/libcfs_hash.h | 4 +- + .../lustre/include/linux/libcfs/libcfs_ioctl.h | 161 +- + .../lustre/include/linux/libcfs/libcfs_prim.h | 31 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 75 - + .../lustre/include/linux/libcfs/libcfs_workitem.h | 12 +- + .../lustre/include/linux/libcfs/linux/libcfs.h | 2 +- + .../lustre/include/linux/libcfs/linux/linux-cpu.h | 2 +- + .../lustre/include/linux/libcfs/linux/linux-mem.h | 80 - + .../lustre/include/linux/libcfs/linux/linux-time.h | 4 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 10 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 4 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 1 - + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 3 - + drivers/staging/lustre/lnet/libcfs/fail.c | 3 + + drivers/staging/lustre/lnet/libcfs/hash.c | 6 +- + drivers/staging/lustre/lnet/libcfs/libcfs_lock.c | 54 +- + drivers/staging/lustre/lnet/libcfs/libcfs_mem.c | 28 - + .../lustre/lnet/libcfs/linux/linux-crypto.c | 283 ++- + .../lustre/lnet/libcfs/linux/linux-module.c | 154 +- + .../staging/lustre/lnet/libcfs/linux/linux-prim.c | 31 - + drivers/staging/lustre/lnet/libcfs/module.c | 132 +- + drivers/staging/lustre/lnet/libcfs/tracefile.c | 17 +- + drivers/staging/lustre/lnet/libcfs/workitem.c | 12 +- + drivers/staging/lustre/lnet/lnet/api-ni.c | 4 + + drivers/staging/lustre/lnet/lnet/lib-move.c | 10 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 6 +- + drivers/staging/lustre/lnet/selftest/conctl.c | 50 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 19 +- + drivers/staging/lustre/lnet/selftest/console.c | 11 +- + drivers/staging/lustre/lnet/selftest/framework.c | 14 +- + drivers/staging/lustre/lnet/selftest/ping_test.c | 6 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 10 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 4 +- + drivers/staging/lustre/lnet/selftest/timer.c | 12 +- + drivers/staging/lustre/lustre/fld/fld_request.c | 14 +- + drivers/staging/lustre/lustre/include/cl_object.h | 962 ++------- + drivers/staging/lustre/lustre/include/lclient.h | 408 ---- + drivers/staging/lustre/lustre/include/linux/obd.h | 125 -- + drivers/staging/lustre/lustre/include/lu_object.h | 64 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 4 +- + .../lustre/lustre/include/lustre/lustre_user.h | 36 +- + drivers/staging/lustre/lustre/include/lustre_cfg.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_dlm.h | 14 +- + .../staging/lustre/lustre/include/lustre_import.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_lib.h | 60 +- + drivers/staging/lustre/lustre/include/obd.h | 14 +- + drivers/staging/lustre/lustre/include/obd_cksum.h | 1 + + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 1203 ----------- + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 10 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 5 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 19 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 85 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 1 + + drivers/staging/lustre/lustre/llite/Makefile | 5 +- + drivers/staging/lustre/lustre/llite/dir.c | 24 +- + drivers/staging/lustre/lustre/llite/file.c | 133 +- + .../lustre/lustre/{lclient => llite}/glimpse.c | 87 +- + drivers/staging/lustre/lustre/llite/lcommon_cl.c | 327 +++ + .../lustre/{lclient => llite}/lcommon_misc.c | 45 +- + drivers/staging/lustre/lustre/llite/llite_close.c | 28 +- + .../staging/lustre/lustre/llite/llite_internal.h | 244 +-- + drivers/staging/lustre/lustre/llite/llite_lib.c | 21 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 42 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 10 +- + drivers/staging/lustre/lustre/llite/rw.c | 363 ++-- + drivers/staging/lustre/lustre/llite/rw26.c | 304 ++- + drivers/staging/lustre/lustre/llite/super25.c | 14 +- + drivers/staging/lustre/lustre/llite/vvp_dev.c | 254 ++- + drivers/staging/lustre/lustre/llite/vvp_internal.h | 332 ++- + drivers/staging/lustre/lustre/llite/vvp_io.c | 925 +++++---- + drivers/staging/lustre/lustre/llite/vvp_lock.c | 53 +- + drivers/staging/lustre/lustre/llite/vvp_object.c | 141 +- + drivers/staging/lustre/lustre/llite/vvp_page.c | 211 +- + drivers/staging/lustre/lustre/llite/vvp_req.c | 121 ++ + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 3 - + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 26 +- + .../staging/lustre/lustre/lov/lov_cl_internal.h | 105 +- + drivers/staging/lustre/lustre/lov/lov_dev.c | 5 +- + drivers/staging/lustre/lustre/lov/lov_internal.h | 2 + + drivers/staging/lustre/lustre/lov/lov_io.c | 233 +-- + drivers/staging/lustre/lustre/lov/lov_lock.c | 996 +-------- + drivers/staging/lustre/lustre/lov/lov_obd.c | 1 - + drivers/staging/lustre/lustre/lov/lov_object.c | 48 +- + drivers/staging/lustre/lustre/lov/lov_offset.c | 13 + + drivers/staging/lustre/lustre/lov/lov_page.c | 183 +- + drivers/staging/lustre/lustre/lov/lovsub_lock.c | 383 ---- + drivers/staging/lustre/lustre/lov/lovsub_page.c | 4 +- + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 8 +- + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 21 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 4 +- + drivers/staging/lustre/lustre/obdclass/cl_io.c | 417 ++-- + drivers/staging/lustre/lustre/obdclass/cl_lock.c | 2152 +------------------- + drivers/staging/lustre/lustre/obdclass/cl_object.c | 294 ++- + drivers/staging/lustre/lustre/obdclass/cl_page.c | 654 +----- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 2 +- + drivers/staging/lustre/lustre/obdclass/debug.c | 4 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 4 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 4 +- + drivers/staging/lustre/lustre/obdclass/obdo.c | 3 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 115 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 50 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 378 +++- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 159 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 23 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 279 +-- + drivers/staging/lustre/lustre/osc/osc_lock.c | 1693 ++++++--------- + drivers/staging/lustre/lustre/osc/osc_object.c | 35 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 513 +++-- + drivers/staging/lustre/lustre/osc/osc_request.c | 385 ++-- + drivers/staging/lustre/lustre/ptlrpc/client.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 16 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 14 +- + drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 2 +- + drivers/staging/media/omap1/omap1_camera.c | 68 +- + drivers/staging/media/omap4iss/iss.c | 2 +- + drivers/staging/most/hdm-dim2/dim2_errors.h | 8 - + drivers/staging/most/hdm-dim2/dim2_hal.h | 14 +- + drivers/staging/most/hdm-dim2/dim2_reg.h | 8 - + drivers/staging/netlogic/xlr_net.c | 2 +- + drivers/staging/nvec/nvec.c | 11 +- + drivers/staging/nvec/nvec_power.c | 4 +- + drivers/staging/octeon/ethernet-rx.c | 7 +- + drivers/staging/octeon/ethernet-rx.h | 2 +- + drivers/staging/octeon/ethernet-tx.c | 15 +- + drivers/staging/octeon/ethernet.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 5 - + drivers/staging/rtl8188eu/core/rtw_cmd.c | 49 +- + drivers/staging/rtl8188eu/core/rtw_debug.c | 5 - + drivers/staging/rtl8188eu/core/rtw_efuse.c | 7 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 5 - + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 5 - + drivers/staging/rtl8188eu/core/rtw_mlme.c | 13 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 49 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 5 - + drivers/staging/rtl8188eu/core/rtw_recv.c | 5 - + drivers/staging/rtl8188eu/core/rtw_rf.c | 5 - + drivers/staging/rtl8188eu/core/rtw_security.c | 5 - + drivers/staging/rtl8188eu/core/rtw_sreset.c | 5 - + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 5 - + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 5 - + drivers/staging/rtl8188eu/core/rtw_xmit.c | 5 - + .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | 2 +- + drivers/staging/rtl8188eu/hal/bb_cfg.c | 5 - + drivers/staging/rtl8188eu/hal/fw.c | 4 - + drivers/staging/rtl8188eu/hal/hal_com.c | 5 - + drivers/staging/rtl8188eu/hal/hal_intf.c | 7 +- + drivers/staging/rtl8188eu/hal/mac_cfg.c | 5 - + drivers/staging/rtl8188eu/hal/odm.c | 5 - + drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 5 - + drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 5 - + drivers/staging/rtl8188eu/hal/phy.c | 5 - + drivers/staging/rtl8188eu/hal/pwrseq.c | 5 - + drivers/staging/rtl8188eu/hal/pwrseqcmd.c | 4 - + drivers/staging/rtl8188eu/hal/rf.c | 4 - + drivers/staging/rtl8188eu/hal/rf_cfg.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 9 +- + drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 5 - + drivers/staging/rtl8188eu/hal/usb_halinit.c | 7 +- + drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 5 - + drivers/staging/rtl8188eu/include/Hal8188EPhyReg.h | 5 - + .../staging/rtl8188eu/include/HalHWImg8188E_FW.h | 5 - + drivers/staging/rtl8188eu/include/HalVerDef.h | 5 - + drivers/staging/rtl8188eu/include/basic_types.h | 5 - + drivers/staging/rtl8188eu/include/drv_types.h | 5 - + drivers/staging/rtl8188eu/include/fw.h | 4 - + drivers/staging/rtl8188eu/include/hal_com.h | 5 - + drivers/staging/rtl8188eu/include/hal_intf.h | 5 - + drivers/staging/rtl8188eu/include/ieee80211.h | 5 - + drivers/staging/rtl8188eu/include/mlme_osdep.h | 5 - + drivers/staging/rtl8188eu/include/mp_custom_oid.h | 5 - + drivers/staging/rtl8188eu/include/odm.h | 5 - + drivers/staging/rtl8188eu/include/odm_HWConfig.h | 4 - + drivers/staging/rtl8188eu/include/odm_RTL8188E.h | 5 - + .../staging/rtl8188eu/include/odm_RegDefine11N.h | 5 - + drivers/staging/rtl8188eu/include/odm_debug.h | 5 - + drivers/staging/rtl8188eu/include/odm_precomp.h | 5 - + drivers/staging/rtl8188eu/include/odm_reg.h | 5 - + drivers/staging/rtl8188eu/include/odm_types.h | 5 - + drivers/staging/rtl8188eu/include/osdep_intf.h | 5 - + drivers/staging/rtl8188eu/include/osdep_service.h | 5 - + drivers/staging/rtl8188eu/include/pwrseq.h | 5 - + drivers/staging/rtl8188eu/include/pwrseqcmd.h | 5 - + drivers/staging/rtl8188eu/include/recv_osdep.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_cmd.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_dm.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_led.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_recv.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 4 - + drivers/staging/rtl8188eu/include/rtl8188e_xmit.h | 5 - + drivers/staging/rtl8188eu/include/rtw_android.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ap.h | 5 - + drivers/staging/rtl8188eu/include/rtw_cmd.h | 5 - + drivers/staging/rtl8188eu/include/rtw_debug.h | 5 - + drivers/staging/rtl8188eu/include/rtw_eeprom.h | 5 - + drivers/staging/rtl8188eu/include/rtw_efuse.h | 5 - + drivers/staging/rtl8188eu/include/rtw_event.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ht.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ioctl.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ioctl_rtl.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ioctl_set.h | 5 - + drivers/staging/rtl8188eu/include/rtw_iol.h | 5 - + drivers/staging/rtl8188eu/include/rtw_mlme.h | 5 - + drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 5 - + .../staging/rtl8188eu/include/rtw_mp_phy_regdef.h | 5 - + drivers/staging/rtl8188eu/include/rtw_pwrctrl.h | 5 - + drivers/staging/rtl8188eu/include/rtw_qos.h | 5 - + drivers/staging/rtl8188eu/include/rtw_recv.h | 5 - + drivers/staging/rtl8188eu/include/rtw_rf.h | 5 - + drivers/staging/rtl8188eu/include/rtw_security.h | 5 - + drivers/staging/rtl8188eu/include/rtw_sreset.h | 5 - + drivers/staging/rtl8188eu/include/rtw_xmit.h | 5 - + drivers/staging/rtl8188eu/include/sta_info.h | 5 - + drivers/staging/rtl8188eu/include/usb_hal.h | 5 - + drivers/staging/rtl8188eu/include/usb_ops_linux.h | 5 - + drivers/staging/rtl8188eu/include/wifi.h | 5 - + drivers/staging/rtl8188eu/include/wlan_bssdef.h | 5 - + drivers/staging/rtl8188eu/include/xmit_osdep.h | 5 - + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 13 +- + drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 5 - + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 5 - + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 5 - + drivers/staging/rtl8188eu/os_dep/recv_linux.c | 5 - + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 5 - + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 7 +- + drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 4 - + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 5 - + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +- + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 2 +- + drivers/staging/rtl8192u/r8190_rtl8256.c | 2 +- + drivers/staging/rtl8192u/r8192U_wx.c | 22 - + drivers/staging/rtl8712/basic_types.h | 4 - + drivers/staging/rtl8712/drv_types.h | 4 - + drivers/staging/rtl8712/ethernet.h | 4 - + drivers/staging/rtl8712/hal_init.c | 16 +- + drivers/staging/rtl8712/ieee80211.c | 4 - + drivers/staging/rtl8712/mlme_linux.c | 2 +- + drivers/staging/rtl8712/os_intfs.c | 4 +- + drivers/staging/rtl8712/rtl8712_cmd.c | 18 +- + drivers/staging/rtl8712/rtl871x_cmd.c | 80 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 4 +- + drivers/staging/rtl8712/rtl871x_ioctl_set.c | 6 - + drivers/staging/rtl8712/rtl871x_mlme.c | 4 +- + drivers/staging/rtl8712/usb_ops_linux.c | 2 +- + drivers/staging/rtl8723au/core/rtw_ap.c | 3 +- + drivers/staging/rtl8723au/core/rtw_recv.c | 25 - + drivers/staging/rtl8723au/core/rtw_wlan_util.c | 10 - + drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 2 - + drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c | 2 +- + drivers/staging/rtl8723au/include/rtw_mlme_ext.h | 2 - + drivers/staging/rtl8723au/include/rtw_recv.h | 2 - + drivers/staging/rts5208/ms.c | 14 +- + drivers/staging/rts5208/rtsx_card.c | 21 - + drivers/staging/rts5208/rtsx_card.h | 2 - + drivers/staging/rts5208/rtsx_chip.c | 35 - + drivers/staging/rts5208/rtsx_chip.h | 3 - + drivers/staging/skein/skein_base.h | 5 - + drivers/staging/skein/skein_block.c | 30 +- + drivers/staging/skein/threefish_block.c | 2144 +++++++++---------- + drivers/staging/slicoss/slicoss.c | 5 + + drivers/staging/sm750fb/ddk750_chip.c | 2 +- + drivers/staging/speakup/main.c | 6 +- + drivers/staging/speakup/serialio.h | 3 +- + drivers/staging/unisys/Documentation/overview.txt | 19 - + drivers/staging/unisys/include/channel.h | 10 +- + drivers/staging/unisys/include/visorbus.h | 14 - + drivers/staging/unisys/visorbus/visorbus_main.c | 381 +--- + drivers/staging/unisys/visorbus/visorchipset.c | 132 +- + drivers/staging/unisys/visorinput/visorinput.c | 2 +- + drivers/staging/vt6655/baseband.c | 24 +- + drivers/staging/vt6655/baseband.h | 6 +- + drivers/staging/vt6655/card.c | 95 +- + drivers/staging/vt6655/card.h | 9 +- + drivers/staging/vt6655/desc.h | 3 +- + drivers/staging/vt6655/mac.c | 15 +- + drivers/staging/vt6655/srom.c | 9 +- + drivers/staging/vt6656/main_usb.c | 6 +- + drivers/staging/vt6656/wcmd.c | 8 +- + drivers/staging/wilc1000/Kconfig | 1 - + drivers/staging/wilc1000/host_interface.c | 107 +- + drivers/staging/wilc1000/host_interface.h | 8 +- + drivers/staging/wilc1000/linux_mon.c | 24 +- + drivers/staging/wilc1000/linux_wlan.c | 67 +- + drivers/staging/wilc1000/wilc_spi.c | 3 - + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 50 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 12 +- + drivers/staging/wilc1000/wilc_wlan.c | 48 +- + drivers/staging/wilc1000/wilc_wlan.h | 6 +- + drivers/staging/wilc1000/wilc_wlan_cfg.c | 7 +- + drivers/staging/wilc1000/wilc_wlan_if.h | 21 - + drivers/staging/wlan-ng/cfg80211.c | 4 +- + drivers/staging/wlan-ng/p80211conv.c | 5 +- + drivers/staging/wlan-ng/p80211netdev.c | 4 +- + drivers/staging/wlan-ng/p80211netdev.h | 1 - + drivers/staging/wlan-ng/prism2usb.c | 2 +- + drivers/staging/xgifb/XGI_main_26.c | 5 +- + drivers/staging/xgifb/vb_init.c | 16 +- + drivers/staging/xgifb/vb_setmode.c | 22 +- + drivers/staging/xgifb/vb_table.h | 135 +- + drivers/staging/xgifb/vb_util.h | 8 +- + include/linux/iio/buffer.h | 2 + + include/linux/iio/iio.h | 2 + + include/uapi/linux/iio/types.h | 2 + + tools/iio/generic_buffer.c | 14 +- + tools/iio/iio_event_monitor.c | 18 + + 458 files changed, 12980 insertions(+), 18357 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/lpc1850-adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/lpc1850-dac.txt + create mode 100644 Documentation/devicetree/bindings/iio/potentiometer/mcp4131.txt + create mode 100644 Documentation/devicetree/bindings/iio/pressure/ms5611.txt + create mode 100644 drivers/iio/adc/lpc18xx_adc.c + create mode 100644 drivers/iio/dac/lpc18xx_dac.c + create mode 100644 drivers/iio/potentiometer/mcp4131.c + create mode 100644 drivers/iio/pressure/hp206c.c + delete mode 100644 drivers/staging/android/timed_gpio.c + delete mode 100644 drivers/staging/android/timed_gpio.h + delete mode 100644 drivers/staging/android/timed_output.c + delete mode 100644 drivers/staging/android/timed_output.h + delete mode 100644 drivers/staging/comedi/drivers/ni_mio_c_common.c + delete mode 100644 drivers/staging/iio/accel/adis16204.h + delete mode 100644 drivers/staging/iio/accel/adis16204_core.c + delete mode 100644 drivers/staging/iio/accel/adis16220.h + delete mode 100644 drivers/staging/iio/accel/adis16220_core.c + delete mode 100644 drivers/staging/iio/impedance-analyzer/ad5933.h + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h + delete mode 100644 drivers/staging/lustre/lustre/include/lclient.h + delete mode 100644 drivers/staging/lustre/lustre/include/linux/obd.h + delete mode 100644 drivers/staging/lustre/lustre/lclient/lcommon_cl.c + rename drivers/staging/lustre/lustre/{lclient => llite}/glimpse.c (80%) + create mode 100644 drivers/staging/lustre/lustre/llite/lcommon_cl.c + rename drivers/staging/lustre/lustre/{lclient => llite}/lcommon_misc.c (88%) + create mode 100644 drivers/staging/lustre/lustre/llite/vvp_req.c +$ git am -3 ../patches/0001-lustre-fix-ups-for-PAGE_CACHE_.-removal.patch +Applying: lustre: fix ups for PAGE_CACHE_... removal +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h +M drivers/staging/lustre/lustre/llite/vvp_dev.c +M drivers/staging/lustre/lustre/lov/lov_offset.c +M drivers/staging/lustre/lustre/lov/lov_page.c +M drivers/staging/lustre/lustre/osc/osc_io.c +$ git add -A . +$ git commit -v -a --amend +[master 7abf04a7ea12] Merge remote-tracking branch 'staging/staging-next' + Date: Tue Apr 5 13:35:52 2016 +1000 +Merging char-misc/char-misc-next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge extcon/extcon-next +Already up-to-date. +Merging cgroup/for-next (08fb4e7f8d5f Merge branch 'for-4.6' into for-next) +$ git merge cgroup/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (cf5277b893e5 Merge branch 'fixes' into for-next) +$ git merge scsi/for-next +Removing drivers/scsi/atari_NCR5380.c +Merge made by the 'recursive' strategy. + Documentation/scsi/g_NCR5380.txt | 17 +- + Documentation/scsi/scsi-parameters.txt | 11 +- + drivers/infiniband/ulp/srp/ib_srp.c | 2 +- + drivers/message/fusion/mptspi.c | 2 +- + drivers/s390/scsi/zfcp_unit.c | 3 +- + drivers/scsi/Kconfig | 15 +- + drivers/scsi/NCR5380.c | 657 ++++--- + drivers/scsi/NCR5380.h | 143 +- + drivers/scsi/aacraid/linit.c | 3 +- + drivers/scsi/arm/cumana_1.c | 25 +- + drivers/scsi/arm/oak.c | 22 +- + drivers/scsi/atari_NCR5380.c | 2676 ---------------------------- + drivers/scsi/atari_scsi.c | 144 +- + drivers/scsi/constants.c | 859 +-------- + drivers/scsi/cxlflash/main.c | 138 +- + drivers/scsi/cxlflash/main.h | 5 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 4 +- + drivers/scsi/dmx3191d.c | 10 +- + drivers/scsi/dtc.c | 27 +- + drivers/scsi/dtc.h | 7 +- + drivers/scsi/fnic/fnic.h | 2 +- + drivers/scsi/fnic/fnic_scsi.c | 91 +- + drivers/scsi/g_NCR5380.c | 141 +- + drivers/scsi/g_NCR5380.h | 26 +- + drivers/scsi/mac_scsi.c | 241 +-- + drivers/scsi/mpt3sas/mpt3sas_base.c | 33 +- + drivers/scsi/pas16.c | 27 +- + drivers/scsi/pas16.h | 5 +- + drivers/scsi/scsi_priv.h | 2 +- + drivers/scsi/scsi_proc.c | 3 +- + drivers/scsi/scsi_scan.c | 44 +- + drivers/scsi/scsi_sysfs.c | 11 +- + drivers/scsi/scsi_trace.c | 161 ++ + drivers/scsi/scsi_transport_fc.c | 9 +- + drivers/scsi/scsi_transport_iscsi.c | 5 +- + drivers/scsi/scsi_transport_sas.c | 7 +- + drivers/scsi/sense_codes.h | 826 +++++++++ + drivers/scsi/snic/snic_disc.c | 2 +- + drivers/scsi/sun3_scsi.c | 47 +- + drivers/scsi/t128.c | 19 +- + drivers/scsi/t128.h | 7 +- + include/scsi/scsi_device.h | 9 +- + include/scsi/scsi_proto.h | 9 + + include/trace/events/scsi.h | 6 +- + 44 files changed, 1904 insertions(+), 4599 deletions(-) + delete mode 100644 drivers/scsi/atari_NCR5380.c + create mode 100644 drivers/scsi/sense_codes.h +Merging target-updates/for-next (5e47f1985d71 target: Fix target_release_cmd_kref shutdown comp leak) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging pinctrl/for-next (ca1c8b640fe8 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/img,pistachio-pinctrl.txt | 12 ++++---- + MAINTAINERS | 2 ++ + drivers/pinctrl/bcm/pinctrl-bcm281xx.c | 2 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 13 ++++++++ + drivers/pinctrl/bcm/pinctrl-cygnus-mux.c | 2 +- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 2 +- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 2 +- + drivers/pinctrl/berlin/berlin.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 17 +++++------ + drivers/pinctrl/intel/pinctrl-intel.c | 35 ++++++++++++++++++++-- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 4 +-- + drivers/pinctrl/meson/pinctrl-meson.c | 2 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 4 +-- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 6 ++-- + drivers/pinctrl/pinconf-generic.c | 2 +- + drivers/pinctrl/pinctrl-amd.c | 3 +- + drivers/pinctrl/pinctrl-as3722.c | 2 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 4 +-- + drivers/pinctrl/pinctrl-digicolor.c | 2 +- + drivers/pinctrl/pinctrl-lpc18xx.c | 2 +- + drivers/pinctrl/pinctrl-palmas.c | 2 +- + drivers/pinctrl/pinctrl-pic32.c | 2 +- + drivers/pinctrl/pinctrl-pistachio.c | 26 ++++++++-------- + drivers/pinctrl/pinctrl-tb10x.c | 2 +- + drivers/pinctrl/pinctrl-utils.c | 4 +-- + drivers/pinctrl/pinctrl-utils.h | 2 +- + drivers/pinctrl/pinctrl-xway.c | 17 +++++++++++ + drivers/pinctrl/pinctrl-zynq.c | 2 +- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ipq4019.c | 14 ++++----- + drivers/pinctrl/qcom/pinctrl-msm.c | 2 +- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 +- + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 2 +- + drivers/pinctrl/sh-pfc/core.c | 4 ++- + drivers/pinctrl/stm32/pinctrl-stm32.c | 4 +-- + drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c | 1 + + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 17 ++++++----- + drivers/pinctrl/sunxi/pinctrl-sunxi.h | 21 ++++++------- + drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 2 +- + drivers/pinctrl/tegra/pinctrl-tegra.c | 4 +-- + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 2 +- + 43 files changed, 164 insertions(+), 94 deletions(-) +Merging vhost/linux-next (c67f5db82027 virtio_net: replace netdev_alloc_skb_ip_align() with napi_alloc_skb()) +$ git merge vhost/linux-next +Already up-to-date. +Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias) +$ git merge remoteproc/for-next +Merge made by the 'recursive' strategy. +Merging rpmsg/for-next (d75868496ca0 MAINTAINERS: Add mailing list for remote processor subsystems) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (8db9fce084e5 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-74x164.txt | 4 +- + .../devicetree/bindings/gpio/gpio-mpc8xxx.txt | 20 +++- + .../devicetree/bindings/gpio/gpio-xlp.txt | 3 + + Documentation/devicetree/bindings/gpio/gpio.txt | 14 +++ + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 15 +-- + arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 6 +- + arch/powerpc/sysdev/cpm1.c | 36 ++---- + arch/powerpc/sysdev/cpm_common.c | 18 +-- + arch/powerpc/sysdev/ppc4xx_gpio.c | 17 +-- + arch/powerpc/sysdev/simple_gpio.c | 13 +- + arch/sh/boards/mach-sdk7786/gpio.c | 4 +- + arch/sh/boards/mach-x3proto/gpio.c | 4 +- + arch/unicore32/kernel/gpio.c | 4 +- + drivers/gpio/Kconfig | 6 +- + drivers/gpio/gpio-74x164.c | 25 ++++ + drivers/gpio/gpio-amdpt.c | 123 +++---------------- + drivers/gpio/gpio-bcm-kona.c | 14 +-- + drivers/gpio/gpio-it87.c | 10 ++ + drivers/gpio/gpio-mb86s7x.c | 10 +- + drivers/gpio/gpio-mc9s08dz60.c | 12 +- + drivers/gpio/gpio-mcp23s08.c | 111 ++++++----------- + drivers/gpio/gpio-menz127.c | 4 +- + drivers/gpio/gpio-moxart.c | 7 +- + drivers/gpio/gpio-mvebu.c | 5 +- + drivers/gpio/gpio-octeon.c | 26 ++-- + drivers/gpio/gpio-pl061.c | 12 +- + drivers/gpio/gpio-pxa.c | 4 +- + drivers/gpio/gpio-rcar.c | 20 ++++ + drivers/gpio/gpio-sta2x11.c | 8 +- + drivers/gpio/gpio-tpic2810.c | 35 +++--- + drivers/gpio/gpio-xgene-sb.c | 15 +-- + drivers/gpio/gpio-xgene.c | 9 +- + drivers/gpio/gpio-xlp.c | 25 +++- + drivers/gpio/gpio-zx.c | 14 +-- + drivers/gpio/gpiolib.c | 133 ++++++++++++++------- + drivers/input/keyboard/adp5589-keys.c | 12 +- + drivers/input/touchscreen/ad7879.c | 10 +- + drivers/soc/fsl/qe/gpio.c | 20 ++-- + kernel/irq/irqdomain.c | 1 + + tools/gpio/Makefile | 2 +- + tools/gpio/lsgpio.c | 2 +- + 41 files changed, 371 insertions(+), 462 deletions(-) +Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (8f496d3fcc9d dma-buf/fence: fix fence_is_later v2) +$ git merge dma-buf/for-next +Merge made by the 'recursive' strategy. +Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (c0553d04f8d3 dt-bindings: arm: add DT binding for Marvell AP806 system controller) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../arm/marvell/ap806-system-controller.txt | 35 + + drivers/clk/Makefile | 2 +- + drivers/clk/bcm/clk-bcm2835.c | 1203 ++++++++++++-------- + include/dt-bindings/clock/bcm2835.h | 20 +- + 4 files changed, 769 insertions(+), 491 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval') +$ git merge y2038/y2038 +Merge made by the 'recursive' strategy. + drivers/scsi/qla2xxx/qla_mr.c | 5 ++--- + fs/afs/main.c | 6 ++---- + 2 files changed, 4 insertions(+), 7 deletions(-) +Merging luto-misc/next (afd2ff9b7e1b Linux 4.4) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2) +$ git merge borntraeger/linux-next +Already up-to-date. +Merging livepatching/for-next (222d586ca829 Merge branch 'for-4.7/arch-independent-klp-relocations' into for-next) +$ git merge livepatching/for-next +Removing arch/x86/kernel/livepatch.c +Auto-merging arch/x86/kernel/Makefile +Merge made by the 'recursive' strategy. + Documentation/livepatch/module-elf-format.txt | 311 ++++++++++++++++++++++++++ + arch/s390/include/asm/livepatch.h | 7 - + arch/s390/kernel/module.c | 6 +- + arch/x86/include/asm/livepatch.h | 2 - + arch/x86/kernel/Makefile | 1 - + arch/x86/kernel/livepatch.c | 70 ------ + include/linux/livepatch.h | 20 -- + include/linux/module.h | 25 +++ + include/uapi/linux/elf.h | 10 +- + kernel/livepatch/core.c | 148 +++++++----- + kernel/module.c | 125 ++++++++++- + samples/livepatch/livepatch-sample.c | 1 + + 12 files changed, 563 insertions(+), 163 deletions(-) + create mode 100644 Documentation/livepatch/module-elf-format.txt + delete mode 100644 arch/x86/kernel/livepatch.c +Merging coresight/next (a587ddafe387 coresight: removing gratuitous boot time log messages) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-coresight-devices-etb10 | 69 +- + .../ABI/testing/sysfs-bus-coresight-devices-etm4x | 13 + + .../ABI/testing/sysfs-bus-coresight-devices-tmc | 77 + + drivers/hwtracing/coresight/Makefile | 12 +- + drivers/hwtracing/coresight/coresight-etb10.c | 82 +- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 33 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 2126 +++++++++++++++++ + drivers/hwtracing/coresight/coresight-etm4x.c | 2475 +++----------------- + drivers/hwtracing/coresight/coresight-etm4x.h | 222 +- + drivers/hwtracing/coresight/coresight-funnel.c | 1 - + drivers/hwtracing/coresight/coresight-priv.h | 10 + + drivers/hwtracing/coresight/coresight-replicator.c | 1 - + drivers/hwtracing/coresight/coresight-tmc-etf.c | 606 +++++ + drivers/hwtracing/coresight/coresight-tmc-etr.c | 470 ++++ + drivers/hwtracing/coresight/coresight-tmc.c | 555 +---- + drivers/hwtracing/coresight/coresight-tmc.h | 167 ++ + drivers/hwtracing/coresight/coresight-tpiu.c | 1 - + drivers/hwtracing/coresight/coresight.c | 17 +- + 18 files changed, 4107 insertions(+), 2830 deletions(-) + create mode 100644 drivers/hwtracing/coresight/coresight-etm4x-sysfs.c + create mode 100644 drivers/hwtracing/coresight/coresight-tmc-etf.c + create mode 100644 drivers/hwtracing/coresight/coresight-tmc-etr.c + create mode 100644 drivers/hwtracing/coresight/coresight-tmc.h +Merging rtc/rtc-next (26ec9313b537 rtc: m41t80: handle oscillator failure bit) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/maxim-ds1302.txt | 46 +++ + drivers/rtc/Kconfig | 15 +- + drivers/rtc/rtc-at91sam9.c | 2 +- + drivers/rtc/rtc-ds1216.c | 3 - + drivers/rtc/rtc-ds1286.c | 3 - + drivers/rtc/rtc-ds1302.c | 348 +++++++--------- + drivers/rtc/rtc-ds1343.c | 2 - + drivers/rtc/rtc-ds1511.c | 3 - + drivers/rtc/rtc-ds1553.c | 3 - + drivers/rtc/rtc-ds1672.c | 5 - + drivers/rtc/rtc-ds1685.c | 3 - + drivers/rtc/rtc-ds1742.c | 3 - + drivers/rtc/rtc-ep93xx.c | 3 - + drivers/rtc/rtc-gemini.c | 1 - + drivers/rtc/rtc-isl12022.c | 5 - + drivers/rtc/rtc-isl1208.c | 6 - + drivers/rtc/rtc-m41t80.c | 447 ++++++++++++++------- + drivers/rtc/rtc-m48t35.c | 3 - + drivers/rtc/rtc-m48t86.c | 4 - + drivers/rtc/rtc-max6900.c | 5 - + drivers/rtc/rtc-pcf2123.c | 4 - + drivers/rtc/rtc-pcf8563.c | 5 - + drivers/rtc/rtc-rs5c313.c | 2 - + drivers/rtc/rtc-rs5c348.c | 4 - + drivers/rtc/rtc-rs5c372.c | 6 +- + drivers/rtc/rtc-rx8581.c | 5 - + drivers/rtc/rtc-sh.c | 2 - + drivers/rtc/rtc-stk17ta8.c | 3 - + drivers/rtc/rtc-x1205.c | 5 - + 29 files changed, 506 insertions(+), 440 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/maxim-ds1302.txt +Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) +$ git merge hwspinlock/for-next +Already up-to-date. +Merging nvdimm/libnvdimm-for-next (fc0c2028135c x86, pmem: use memcpy_mcsafe() for memcpy_from_pmem()) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging akpm-current/current (7a55317f3165 ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Resolved 'arch/mips/kernel/process.c' using previous resolution. +Auto-merging mm/rmap.c +Auto-merging mm/memory.c +Auto-merging mm/hugetlb.c +Auto-merging mm/filemap.c +Auto-merging lib/Makefile +Auto-merging include/linux/swap.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/fs.h +Auto-merging fs/ocfs2/cluster/heartbeat.c +Auto-merging fs/ocfs2/alloc.c +Auto-merging arch/x86/mm/hugetlbpage.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/mips/kernel/process.c +CONFLICT (content): Merge conflict in arch/mips/kernel/process.c +Auto-merging MAINTAINERS +Auto-merging Documentation/filesystems/vfs.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 04de2377ad7d] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/Locking | 4 + + Documentation/filesystems/vfs.txt | 16 +- + Documentation/vm/ksm.txt | 63 + + Documentation/vm/page_migration | 69 +- + Documentation/vm/transhuge.txt | 10 +- + MAINTAINERS | 1 - + arch/Kconfig | 5 + + arch/alpha/kernel/process.c | 8 - + arch/arc/kernel/process.c | 7 - + arch/arm/Kconfig | 1 + + arch/arm/include/asm/page.h | 2 + + arch/arm/kernel/process.c | 4 +- + arch/arm/vfp/vfpmodule.c | 4 - + arch/arm64/kernel/process.c | 7 - + arch/arm64/mm/hugetlbpage.c | 1 + + arch/avr32/Kconfig | 1 + + arch/avr32/kernel/process.c | 4 +- + arch/blackfin/include/asm/processor.h | 7 - + arch/c6x/kernel/process.c | 4 - + arch/cris/Kconfig | 1 + + arch/cris/arch-v10/kernel/process.c | 9 - + arch/cris/arch-v32/kernel/process.c | 4 +- + arch/frv/include/asm/processor.h | 7 - + arch/h8300/include/asm/processor.h | 7 - + arch/hexagon/kernel/process.c | 7 - + arch/ia64/Kconfig | 1 + + arch/ia64/kernel/perfmon.c | 4 +- + arch/ia64/kernel/process.c | 14 +- + arch/m32r/kernel/process.c | 9 - + arch/m68k/include/asm/processor.h | 7 - + arch/metag/Kconfig | 1 + + arch/metag/include/asm/processor.h | 2 - + arch/metag/kernel/process.c | 6 +- + arch/metag/mm/hugetlbpage.c | 1 + + arch/microblaze/include/asm/processor.h | 10 - + arch/mn10300/Kconfig | 1 + + arch/mn10300/include/asm/fpu.h | 6 +- + arch/mn10300/kernel/process.c | 4 +- + arch/nios2/include/asm/processor.h | 5 - + arch/openrisc/include/asm/processor.h | 9 - + arch/parisc/kernel/process.c | 7 - + arch/powerpc/kernel/process.c | 4 - + arch/powerpc/mm/hugetlbpage.c | 6 +- + arch/s390/Kconfig | 1 + + arch/s390/kernel/process.c | 5 +- + arch/score/kernel/process.c | 2 - + arch/sh/Kconfig | 1 + + arch/sh/kernel/process_32.c | 7 - + arch/sh/kernel/process_64.c | 5 +- + arch/sparc/Kconfig | 1 + + arch/sparc/kernel/process_32.c | 12 +- + arch/sparc/kernel/process_64.c | 4 +- + arch/tile/Kconfig | 1 + + arch/tile/kernel/process.c | 4 +- + arch/tile/kernel/setup.c | 4 +- + arch/tile/mm/hugetlbpage.c | 7 +- + arch/tile/mm/init.c | 2 +- + arch/um/kernel/process.c | 4 - + arch/unicore32/kernel/process.c | 7 - + arch/x86/Kconfig | 1 + + arch/x86/kernel/machine_kexec_64.c | 46 + + arch/x86/kernel/process.c | 5 +- + arch/x86/mm/hugetlbpage.c | 1 + + arch/x86/mm/numa.c | 4 +- + arch/xtensa/Kconfig | 1 + + arch/xtensa/kernel/process.c | 4 +- + block/genhd.c | 2 +- + drivers/block/aoe/aoecmd.c | 2 +- + drivers/block/zram/zram_drv.c | 3 +- + drivers/hwtracing/intel_th/msu.c | 2 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 2 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +- + drivers/virtio/virtio_balloon.c | 53 +- + fs/ext4/fsync.c | 5 +- + fs/ocfs2/alloc.c | 3 +- + fs/ocfs2/cluster/heartbeat.c | 180 ++- + fs/ocfs2/ocfs2_fs.h | 2 +- + fs/proc/page.c | 5 +- + include/linux/balloon_compaction.h | 49 +- + include/linux/bootmem.h | 16 +- + include/linux/compiler-gcc.h | 1 + + include/linux/compiler.h | 4 + + include/linux/crc64_ecma.h | 56 + + include/linux/device.h | 12 +- + include/linux/fs.h | 2 + + include/linux/hugetlb.h | 1 + + include/linux/hugetlb_inline.h | 6 +- + include/linux/kasan.h | 30 +- + include/linux/kernel.h | 4 +- + include/linux/kexec.h | 4 + + include/linux/memory_hotplug.h | 6 +- + include/linux/mempolicy.h | 10 +- + include/linux/mempool.h | 3 +- + include/linux/migrate.h | 2 + + include/linux/mm.h | 25 +- + include/linux/mm_types.h | 14 +- + include/linux/mmzone.h | 5 +- + include/linux/nodemask.h | 11 +- + include/linux/oom.h | 9 +- + include/linux/padata.h | 5 - + include/linux/page-flags.h | 47 +- + include/linux/page_ref.h | 26 +- + include/linux/pagemap.h | 8 +- + include/linux/sched.h | 15 +- + include/linux/sem.h | 1 + + include/linux/slab.h | 16 +- + include/linux/string.h | 2 +- + include/linux/swap.h | 1 + + include/linux/types.h | 1 - + include/linux/vm_event_item.h | 1 + + include/trace/events/huge_memory.h | 38 +- + include/uapi/linux/kernel-page-flags.h | 1 + + include/uapi/linux/magic.h | 2 + + init/main.c | 9 +- + ipc/msg.c | 5 +- + ipc/sem.c | 124 +- + kernel/cpuset.c | 8 +- + kernel/exit.c | 34 +- + kernel/fork.c | 4 +- + kernel/kexec.c | 119 +- + kernel/kexec_core.c | 15 +- + kernel/kexec_file.c | 8 +- + kernel/padata.c | 99 -- + lib/Kconfig | 7 + + lib/Makefile | 3 +- + lib/crc64_ecma.c | 341 +++++ + lib/nodemask.c | 30 + + lib/test_kasan.c | 29 + + mm/backing-dev.c | 20 +- + mm/balloon_compaction.c | 101 +- + mm/compaction.c | 204 ++- + mm/filemap.c | 2 +- + mm/huge_memory.c | 92 +- + mm/hugetlb.c | 28 +- + mm/internal.h | 11 +- + mm/kasan/Makefile | 4 + + mm/kasan/kasan.c | 71 +- + mm/kasan/kasan.h | 11 +- + mm/kasan/quarantine.c | 289 +++++ + mm/kasan/report.c | 1 + + mm/ksm.c | 733 ++++++++++- + mm/memblock.c | 3 + + mm/memcontrol.c | 11 +- + mm/memory.c | 2 +- + mm/memory_hotplug.c | 6 +- + mm/mempolicy.c | 44 +- + mm/mempool.c | 7 +- + mm/migrate.c | 238 +++- + mm/page_alloc.c | 166 ++- + mm/page_isolation.c | 9 +- + mm/rmap.c | 2 +- + mm/slab.c | 523 ++++---- + mm/slab.h | 2 + + mm/slab_common.c | 4 + + mm/slub.c | 10 +- + mm/util.c | 23 + + mm/vmscan.c | 31 +- + mm/vmstat.c | 2 + + mm/zsmalloc.c | 1338 ++++++++++++++------ + net/wireless/util.c | 2 +- + scripts/checkpatch.pl | 12 +- + 161 files changed, 4410 insertions(+), 1601 deletions(-) + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c + create mode 100644 lib/nodemask.c + create mode 100644 mm/kasan/quarantine.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: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 9177e8f4084a...a005321fd803 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (a005321fd803 drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..195163909790 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 4.5-rc2 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.4 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..721a5b8a7c83 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20160405 |