diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-03-31 14:00:18 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-03-31 14:00:18 +1100 |
| commit | 3fdbce4cc3e9f3f3c59046b96d3f5ac72b37ba22 (patch) | |
| tree | 8c88585a2d177befb633cc824cd34d940cd8d3a0 | |
| parent | 8b7a4d5375b6c885d5496836ffdb70f0ea1e8a2e (diff) | |
| download | linux-next-3fdbce4cc3e9f3f3c59046b96d3f5ac72b37ba22.tar.gz | |
Add linux-next specific files for 20160331next-20160331
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 | 2391 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 2866 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..753d6d41a881 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,234 @@ +Name SHA1 +---- ---- +origin 62f444e0548eb503b42c8447675b468f5cf40c69 +fixes 6c020251498ecc759fa961f9360de7cf65b885e8 +kbuild-current 3d1450d54a4fc277fc4598acf2335f74b66b08fc +arc-current f86b8892a1b7ca03b048024519771d2db660398c +arm-current f474c8c857d996f34c39f66bbed23faaa739fad6 +m68k-current efbec135f11d6f14f40806935827c53d8889f59b +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +powerpc-fixes 71528d8bd7a8aa920cd69d4223c6c87d5849257d +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +sparc 5ec712934ce1ff6e33bf3878034a91ca9bd600c9 +net cb41c997d4446b39dd03b8a74196125739d7c3ac +ipsec 215276c0147ef49bc07692ca68bae35a30a64b9a +ipvs 7617a24f83b5d67f4dab1844956be1cebc44aec8 +wireless-drivers 2acd846485549655582ee379ceb966206f91e6f8 +mac80211 ad8ec957f693c7f76e02793289e7819d087642be +sound-current 6b94fb14fcff3d9be13aae271f2345ab3f656b0c +pci-current f55532a0c0b8bb6148f4e07853b876ef73bc69ca +driver-core.current f55532a0c0b8bb6148f4e07853b876ef73bc69ca +tty.current f55532a0c0b8bb6148f4e07853b876ef73bc69ca +usb.current f55532a0c0b8bb6148f4e07853b876ef73bc69ca +usb-gadget-fixes 7e8ac87a44746b03a37d296fdb3e6b5d96350952 +usb-serial-fixes f6cede5b49e822ebc41a099fe41ab4989f64e2cb +usb-chipidea-fixes d144dfea8af7108f613139623e63952ed7e69c0c +staging.current f55532a0c0b8bb6148f4e07853b876ef73bc69ca +char-misc.current f55532a0c0b8bb6148f4e07853b876ef73bc69ca +input-current d314e9e80c5ea561b73584b73806c2ae9e30f503 +crypto-current e54358915d0a00399c11c2c23ae1be674cba188a +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 f55532a0c0b8bb6148f4e07853b876ef73bc69ca +asm-generic a1cbaad75a8f891bca9cc65a1fb95ae1b28d2f6a +arc f55532a0c0b8bb6148f4e07853b876ef73bc69ca +arm 1b3bf847977c2e5974012ddd4b25fef50967d785 +arm-perf f55532a0c0b8bb6148f4e07853b876ef73bc69ca +arm-soc 35fe688abfcfeadf678664ae2e04815bb416de5a +at91 503057c24478eece49de687015ab80bce3b2dae8 +bcm2835-dt 3428a63be5b909aac096ce3211b530e5b44adf17 +bcm2835-soc 92e963f50fc74041b5e9e744c330dca48e04f08d +bcm2835-drivers 92e963f50fc74041b5e9e744c330dca48e04f08d +bcm2835-defconfig 0a05d3b71ada526ef93019fb3fbd6a95561a8a5f +berlin 9a7e0683324926963bcee47058c4f86f4fb6b409 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 00cb3ac4afaa685f3d8bb4f6c1ebb134dae67d74 +keystone 1bdd5a9b339c7a5e1443d40aecccaa87d858ea78 +mvebu bf8bfe311ea044ff7a83e0a6ec2c66bd0afb234f +omap aec24f100558d3572aa7da7aaa66b68342ed9996 +omap-pending 3ca4a238106dedc285193ee47f494a6584b6fd2f +qcom f17d0d578214b6bb51819f9b43ab7e1d1c7c1c0a +renesas 301c9ed92b8f689621c836c8335cf6cd5125828d +rockchip 0b4b91b4c9b20df772f18484cfdcd73e930d2e97 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 92e963f50fc74041b5e9e744c330dca48e04f08d +samsung-krzk 60e4932450a101b6f7a0c83b87526ba6f83b5577 +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 56da73f0559a9dcb75272ae561fdbcb8d45add6b +nios2 fc9964ada7c5fa220f68fea708c34bd6c9261d04 +parisc-hd b562e44f507e863c6792946e4e1b1449fbbac85d +powerpc 6e669f085d595cb6053920832c89f1a13067db44 +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl fba4e9f9898ab181703723b9890ba29345edfe08 +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 4fe339bc21e01d72fedb0c6f8d2edaa357fbb68b +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile f98983bbba0db6ba35fff37a4e8466f2152c39c5 +uml ad32a1f3c36b046b2e7b0361b88c18e3af61419e +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa 9da8320bb97768e35f2e64fa7642015271d672eb +btrfs bb7ab3b92e46da06b580c6f83abe7894dc449cca +btrfs-kdave 2f06df5ab10067ee1a4bede47cb34a90dd551b55 +ceph 7c886661dc31992bf8fc8f4811fa1f210981924e +cifs b562e44f507e863c6792946e4e1b1449fbbac85d +configfs 96c22a3293512ba684e73a981196430f524689da +ecryptfs 933c32fe0e42b86d9bc5779401c3ce93d56bd231 +ext3 8f9e8f5fcc059a3cba87ce837c88316797ef3645 +ext4 3d43bcfef5f0548845a425365011c499875491b0 +f2fs f55532a0c0b8bb6148f4e07853b876ef73bc69ca +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 742f992708dff0ada8b426228900ffb009c7167b +gfs2 3e11e530415027a57936545957126aff49267b76 +jfs 6ed71e9819ac3412fc6a3495f5ce141df274c916 +nfs f55532a0c0b8bb6148f4e07853b876ef73bc69ca +nfsd ac503e4a309a3993a069750f95c2815ee5db5aa5 +orangefs 45996492e5c85aa0ac93a95d1b2d1ed56851c865 +overlayfs e3608e3f68f6e82113555c873333722362eca6a0 +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs c27cb97218b3e72417ffc5e73dce488844017b39 +xfs f55532a0c0b8bb6148f4e07853b876ef73bc69ca +file-locks 5af9c2e19da6514a1a50b07d97d93b74a7711873 +vfs e60e62528559a1401ad82b55fa173a9cf274236b +pci f55532a0c0b8bb6148f4e07853b876ef73bc69ca +hid b428a267271e9a963771e94fccbc48347d94ac1a +i2c f55532a0c0b8bb6148f4e07853b876ef73bc69ca +jdelvare-hwmon f02de116250d4ac6137cd3255be7d1f5678ac460 +dmi c3db05ecf8acef3e4ae9436d357a067052061eb0 +hwmon-staging c528f2aae5711c06fe5f9d892cd68d48e5f4e66a +v4l-dvb df92cda7a31a5843173c3ebd1a168db35027bbba +libata d991c872ac7ffaacc4df93efbfbcb4189cee6440 +pm 5a963666f45473fa00c2cc8e617ce3e9004c2dac +idle 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 +thermal 81ad4276b505e987dd8ebbdf63605f92cd172b52 +thermal-soc a134b4143b65ab1e3ec04c9626039b3c0cf94681 +ieee1394 384fbb96f9268eee0b703b39cb07557403bd9aac +dlm 82c7d823cc31cf56d964eebe1f91aaf1691cddce +swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df +slave-dma f55532a0c0b8bb6148f4e07853b876ef73bc69ca +net-next e46b4e2b46e173889b19999b8bd033d5e8b3acf0 +ipsec-next cb866e3298cd7412503fc7e2c265753c853fab9d +ipvs-next f6ca9f46f6615c3a87529550058d1b468c0cad89 +wireless-drivers-next e46b4e2b46e173889b19999b8bd033d5e8b3acf0 +bluetooth de06dbfa7861c9019eedefc0c356ba86e5098f1b +mac80211-next 0a87cadbb54e1595a5f64542adb4c63be914d290 +rdma 520a07bff6fbb23cac905007d74c67058b189acb +mtd f55532a0c0b8bb6148f4e07853b876ef73bc69ca +l2-mtd f55532a0c0b8bb6148f4e07853b876ef73bc69ca +nand a5565e3737b8a12ce8f20e6808abd15939b2974a +crypto 34074205bb9f04b416efb3cbedcd90f418c86200 +drm 4604202ca8d2a5e33b4bca0812b5d92975ed1bd8 +drm-panel c8a3b2ae07130042682bc8e031bcfbae3754463d +drm-intel 55c561a708eec328822721233b1148119e80f5c3 +drm-tegra 341917fe2b62876599315a537b8e248e31bd1366 +drm-misc 00c9672606f781f2db7e904127dcbdc2831701ca +drm-exynos 25364a9e54fb8296837061bf684b76d20eec01fb +drm-msm fcda50c8f484cf1140232c8444470449f0619db9 +hdlcd 879e40bea6f2711422b7c71ccc9b8f1ba06e16ce +drm-vc4 90d7116061f86c1f8ea460806a0414addea7b58b +kbuild 2468fc97cc4555c37fa491379c98561b30c739f3 +kconfig f55532a0c0b8bb6148f4e07853b876ef73bc69ca +regmap f66918ebe3224fc45a36fb54ff426838dcb299c9 +sound 97cc2ed27e5a168cf423f67c3bc7c6cc41d12f82 +sound-asoc 3034bde71170b90c3a68019182af3e615aa29e31 +modules b37a05c083c85c2657dca9bbe1f5d79dccf756d5 +input d314e9e80c5ea561b73584b73806c2ae9e30f503 +block 258b83ad99309bd13e90181acfaf3e7330627285 +device-mapper ef6e0d57417a198a7e978d496b49884fc3c6963c +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc-uh 1dceb0415aa0c6bc11dacdab47c9ef83a3604166 +md de24075022dcf9e74a0494f089897c697959eb5a +mfd a557a7a09b085d7f940d9b28d07bba82dec3c038 +backlight 60d613d6aef4ae49988eeb3ad38af948c561db1e +battery 0df6e32b0e36710fe989095241833e09dac3e41d +omap_dss2 32ad61951574d011d363694d6037592e99da9421 +regulator bf59522bc462ef66abbde569efbaeade25dff81d +security 88a1b564a20e371e6be41b39b85673e9c1959491 +integrity 95ee08fa373b9ede1059c2f384cfeafe10dcd6bb +keys 88a1b564a20e371e6be41b39b85673e9c1959491 +selinux 759b31c1d4295a1dab34b4669ee838fb3131cd91 +tpmdd 59f95b842ad0383b171df3ae81ab39f998467a76 +watchdog d1ed3ba4e3d76b4ebec239c64f990c26d7935700 +iommu 70cf769c5ba283483a42c46f3734202b55dd3041 +dwmw2-iommu 46924008273ed03bd11dbb32136e3da4cfe056e1 +vfio c4aec3101319f84363a57e09086c2aff6c60a3c3 +jc_docs abfa6cd8cda71b9071191e72711bd474e539b1b2 +trivial d00cd819d7dfb1a24d814457f47ff4d6c7be152c +audit b562e44f507e863c6792946e4e1b1449fbbac85d +devicetree 48a9b733e644ab4cc8e2a98950a36ddb12b8c54e +dt-rh 5027e19db8cee24e189f8afa53b548e1ac5d0c1d +mailbox aca04ce5dbda50758b813b1e3d710098991cfa9a +spi 32d84d7e37c45dbe569eadd637566ae0d28e3bed +tip 05e9c83b75dd24edaba6f90fc56608dd009b13c9 +clockevents 23cb25d0f407e83be10747258092843e8e20d535 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd ff6fd1478c531a40279cf013227279f31ff90b41 +irqchip a66ce4b7d9d20b59afe0a898fa0b4faf0651fbcd +ftrace 7e6867bf831c71fe0e47438831ae3a94d4c7ab3c +rcu abec4017af67236ad376e940e2d22cbac07bb2e8 +kvm aca04ce5dbda50758b813b1e3d710098991cfa9a +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 7084fa868b509646fa30773d5d3ef4f26a62eb6f +usb-chipidea-next 01b8479400abdd61b026df37a3a19de7b8df32f5 +staging b2073dcb80b61043f6ae6aeb2311907b0418392a +char-misc f55532a0c0b8bb6148f4e07853b876ef73bc69ca +extcon f55532a0c0b8bb6148f4e07853b876ef73bc69ca +cgroup 08fb4e7f8d5f2b4f01e6884b79d157ce32217f9a +scsi cf5277b893e53ea98180b6313489b83ee9266e2e +target-updates 5e47f1985d7107331c3f64fb3ec83d66fd73577e +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +pinctrl 44b03c105106842580f31f37cf88a2a95ae5074e +vhost c67f5db82027ba6d2ea4ac9176bc45996a03ae6a +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg d75868496ca0af1685f31726d8f5b5037c092a7a +gpio 7f950861041b3a65dc6bd58d15ac855faea4891d +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm f55532a0c0b8bb6148f4e07853b876ef73bc69ca +dma-buf 8f496d3fcc9df8823e36a023a2fd8b08c7993f4c +userns f2ca379642d7a843be972ea4167abdd3c8c9e5d1 +ktest f55532a0c0b8bb6148f4e07853b876ef73bc69ca +clk 2aac7ddf9a410e3418c9cc69618f304550466793 +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest f55532a0c0b8bb6148f4e07853b876ef73bc69ca +y2038 477b8541b31fd4d32168514203a8da8b73884d90 +luto-misc afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc +borntraeger 36f90b0a2ddd60823fe193a85e60ff1906c2a9b3 +livepatching fda0b150a173b78fc6d36fd7e39ce87490f4e234 +coresight 93eb18df7af9712c4556c70b9a30106f4b5dfbe2 +rtc d6dca1d76d10435fd9471e62ba1d342a8916387d +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm fc0c2028135c7f75fce36b90e44efb8003a9173b +akpm-current 2093093128be47337cd6500b5c38c959482ce908 +akpm c0d1fdb30d9eb81477010e0ac48d6d89a37bebab 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..4c838201b1ee --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2391 @@ +$ date -R +Thu, 31 Mar 2016 09:43:17 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide +Merging origin/master (62f444e0548e Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge origin/master +Updating 1993b176a822..62f444e0548e +Fast-forward + crypto/asymmetric_keys/pkcs7_trust.c | 2 ++ + drivers/hwmon/max1111.c | 6 ++++++ + fs/dlm/config.c | 3 +-- + 3 files changed, 9 insertions(+), 2 deletions(-) +Merging fixes/master (6c020251498e perf tools: Fix build break on powerpc) +$ git merge fixes/master +Merge made by the 'recursive' strategy. + tools/perf/arch/powerpc/util/header.c | 2 ++ + 1 file changed, 2 insertions(+) +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 (f474c8c857d9 ARM: 8544/1: set_memory_xx fixes) +$ git merge arm-current/fixes +Already up-to-date. +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 +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/processor.h | 2 +- + arch/powerpc/kernel/process.c | 2 +- + arch/powerpc/mm/hugetlbpage.c | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) +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 (cb41c997d444 team: team should sync the port's uc/mc addrs when add a port) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/networking/switchdev.txt | 2 +- + drivers/isdn/hisax/isac.c | 15 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 16 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 6 + + drivers/net/ethernet/cadence/macb.c | 69 ++++++-- + drivers/net/ethernet/hisilicon/hns/hnae.h | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 64 +++---- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 3 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 12 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 40 +++-- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 196 ++++++++++----------- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h | 23 +-- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 3 + + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 16 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 10 +- + drivers/net/ethernet/qlogic/qed/qed_int.c | 2 +- + drivers/net/ethernet/qlogic/qlge/qlge.h | 2 +- + drivers/net/ethernet/renesas/ravb_main.c | 2 +- + .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 4 +- + drivers/net/phy/bcm7xxx.c | 4 + + drivers/net/team/team.c | 5 + + drivers/net/usb/plusb.c | 2 +- + drivers/net/usb/qmi_wwan.c | 1 + + include/linux/brcmphy.h | 2 + + include/linux/netfilter/ipset/ip_set.h | 4 + + kernel/bpf/syscall.c | 6 +- + net/bridge/br_stp.c | 2 +- + net/bridge/netfilter/ebtables.c | 4 + + net/bridge/netfilter/nft_reject_bridge.c | 20 +-- + net/core/netpoll.c | 3 +- + net/ipv4/fou.c | 16 ++ + net/ipv4/ip_tunnel_core.c | 4 +- + net/ipv4/netfilter/arp_tables.c | 43 ++--- + net/ipv4/netfilter/ip_tables.c | 48 ++--- + net/ipv4/netfilter/ipt_SYNPROXY.c | 54 +++--- + net/ipv6/netfilter/ip6_tables.c | 48 ++--- + net/netfilter/ipset/ip_set_bitmap_gen.h | 2 +- + net/netfilter/ipset/ip_set_core.c | 33 +++- + net/netfilter/ipset/ip_set_hash_gen.h | 2 +- + net/netfilter/ipset/ip_set_list_set.c | 2 +- + net/netfilter/nfnetlink_queue.c | 7 +- + net/openvswitch/Kconfig | 4 +- + net/openvswitch/conntrack.c | 24 +-- + net/sctp/output.c | 6 +- + net/switchdev/switchdev.c | 2 +- + net/xfrm/xfrm_input.c | 3 + + 46 files changed, 479 insertions(+), 359 deletions(-) +Merging ipsec/master (215276c0147e xfrm: Reset encapsulation field of the skb before transformation) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/netns/xfrm.h | 1 + + net/core/flow.c | 14 +++++++++++++- + net/xfrm/xfrm_output.c | 3 +++ + 3 files changed, 17 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 (2acd84648554 rtlwifi: fix gcc-6 indentation warning) +$ 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/realtek/rtlwifi/rtl8821ae/dm.c | 6 +++--- + 3 files changed, 11 insertions(+), 18 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 (6b94fb14fcff ALSA: dice: fix memory leak when unplugging) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/timer.c | 20 +++++++++++++------- + sound/core/timer_compat.c | 30 +++++++++++++++++++++++++++++- + sound/firewire/dice/dice-stream.c | 14 ++++---------- + sound/pci/hda/patch_realtek.c | 10 +++++++++- + 4 files changed, 55 insertions(+), 19 deletions(-) +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 (f55532a0c0b8 Linux 4.6-rc1) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (f55532a0c0b8 Linux 4.6-rc1) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (7e8ac87a4474 usb: phy: qcom-8x16: fix regulator API abuse) +$ git merge usb-gadget-fixes/fixes +Merge made by the 'recursive' strategy. + 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 +++++---------------------------- + include/uapi/linux/usb/ch9.h | 2 +- + 7 files changed, 52 insertions(+), 112 deletions(-) +Merging usb-serial-fixes/usb-linus (f6cede5b49e8 Linux 4.5-rc7) +$ 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 (f55532a0c0b8 Linux 4.6-rc1) +$ git merge staging.current/staging-linus +Already up-to-date. +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 (d314e9e80c5e Input: sur40 - fix DMA on stack) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (e54358915d0a PKCS#7: pkcs7_validate_trust(): initialize the _trusted output argument) +$ git merge crypto-current/master +Already up-to-date. +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 (f55532a0c0b8 Linux 4.6-rc1) +$ 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 (1b3bf847977c Merge branches 'amba', 'fixes', 'misc' and 'tauros2' into for-next) +$ git merge arm/for-next +Already up-to-date. +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 (3428a63be5b9 ARM: bcm2835: Add VC4 to the device tree.) +$ git merge bcm2835-dt/bcm2835-dt-next +Merge made by the 'recursive' strategy. + 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/bcm2836-rpi-2-b.dts | 4 +++ + arch/arm/boot/dts/bcm283x.dtsi | 47 ++++++++++++++++++++++++++++++++ + 8 files changed, 80 insertions(+) +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 (0a05d3b71ada ARM: multi_v7_defconfig: Enable BCM283x) +$ git merge bcm2835-defconfig/bcm2835-defconfig-next +Already up-to-date. +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 (bf8bfe311ea0 Merge branch 'mvebu/defconfig' into mvebu/for-next) +$ git merge mvebu/for-next +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-nsa320.dts | 13 +++++++++++-- + 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 +- + 9 files changed, 24 insertions(+), 11 deletions(-) +Merging omap/for-next (aec24f100558 Merge branch 'omap-for-v4.6/fixes-not-urgent' into for-next) +$ git merge omap/for-next +Resolved 'arch/arm/boot/dts/logicpd-torpedo-som.dtsi' using previous resolution. +Auto-merging arch/arm/boot/dts/logicpd-torpedo-som.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/logicpd-torpedo-som.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c8a2d10685d9] Merge remote-tracking branch 'omap/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/boot/dts/dm814x-clocks.dtsi | 243 +++++++++++++++++++++++++---- + arch/arm/boot/dts/dra62x-clocks.dtsi | 26 +++ + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 2 + + 3 files changed, 240 insertions(+), 31 deletions(-) +Merging omap-pending/for-next (3ca4a238106d ARM: OMAP2+: hwmod: Fix updating of sysconfig register) +$ git merge omap-pending/for-next +Merge made by the 'recursive' strategy. + arch/arm/mach-omap2/omap_hwmod.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging qcom/for-next (f17d0d578214 ARM: dts: msm8974: Add SCM firmware node) +$ git merge qcom/for-next +Resolved 'MAINTAINERS' using previous resolution. +Auto-merging arch/arm/Makefile +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 382b46ba3b73] Merge remote-tracking branch 'qcom/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/firmware/qcom,scm.txt | 25 ++ + MAINTAINERS | 3 + + arch/arm/Makefile | 3 +- + arch/arm/boot/dts/qcom-msm8974.dtsi | 11 + + 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/smp2p.c | 2 +- + 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 +++ + 15 files changed, 655 insertions(+), 82 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 (60e4932450a1 Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + 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 ++++++++ + 8 files changed, 146 insertions(+) + 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 d572dcffd31b] 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 (56da73f0559a 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 drivers/firmware/broadcom/bcm47xx_sprom.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/qca,ath79-pll.txt | 6 +- + .../devicetree/bindings/mips/cavium/ciu3.txt | 27 + + .../devicetree/bindings/vendor-prefixes.txt | 3 + + arch/mips/Kconfig | 14 +- + arch/mips/alchemy/common/dbdma.c | 4 +- + arch/mips/ath79/Kconfig | 12 - + arch/mips/ath79/clock.c | 241 +++++--- + arch/mips/ath79/setup.c | 65 +- + 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/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/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/ci20_defconfig | 14 +- + arch/mips/dec/int-handler.S | 2 +- + arch/mips/fw/arc/memory.c | 2 +- + arch/mips/include/asm/bmips.h | 1 + + arch/mips/include/asm/cpu-features.h | 4 + + arch/mips/include/asm/cpu-info.h | 4 +- + arch/mips/include/asm/cpu-type.h | 5 + + arch/mips/include/asm/cpu.h | 96 +-- + 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/processor.h | 8 + + 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/cps-vec.S | 296 +++++---- + arch/mips/kernel/cpu-probe.c | 34 +- + 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/process.c | 10 +- + 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/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/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/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 +- + include/dt-bindings/clock/ath79-clk.h | 19 + + include/linux/bcm47xx_sprom.h | 24 + + include/linux/irqchip/mips-gic.h | 17 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 30 +- + 118 files changed, 4171 insertions(+), 957 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/cavium/ciu3.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/include/asm/octeon/cvmx-ciu3-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-coremask.h + rename arch/mips/bcm47xx/sprom.c => drivers/firmware/broadcom/bcm47xx_sprom.c (97%) + create mode 100644 include/dt-bindings/clock/ath79-clk.h + create mode 100644 include/linux/bcm47xx_sprom.h +Merging nios2/for-next (fc9964ada7c5 nios2: Replace fdt_translate_address with of_flat_dt_translate_address) +$ git merge nios2/for-next +Merge made by the 'recursive' strategy. + arch/nios2/kernel/prom.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +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 (4fe339bc21e0 s390: wire up preadv2/pwritev2 syscalls) +$ git merge s390/features +Auto-merging arch/s390/mm/gup.c +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 3 + + arch/s390/crypto/prng.c | 2 + + arch/s390/include/asm/cache.h | 3 + + arch/s390/include/uapi/asm/unistd.h | 4 +- + arch/s390/kernel/perf_cpum_cf.c | 1 + + arch/s390/kernel/perf_cpum_sf.c | 2 +- + arch/s390/kernel/syscalls.S | 2 + + arch/s390/mm/gup.c | 8 +- + arch/s390/mm/init.c | 10 +- + arch/s390/pci/pci_clp.c | 3 +- + drivers/s390/block/dasd.c | 56 +++++++++ + drivers/s390/block/dasd_alias.c | 226 +++++++++--------------------------- + drivers/s390/block/dasd_devmap.c | 27 +++++ + drivers/s390/block/dasd_eckd.c | 202 ++++++++++++++++++++++++++++++-- + drivers/s390/block/dasd_eckd.h | 36 +++++- + drivers/s390/block/dasd_int.h | 5 + + 16 files changed, 396 insertions(+), 194 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 (2f06df5ab100 Merge branch 'for-next-4.6-20160324' into for-next-20160324) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/disk-io.c +Merge made by the 'recursive' strategy. + fs/btrfs/ctree.c | 6 +- + fs/btrfs/ctree.h | 81 +++++------ + fs/btrfs/dev-replace.c | 28 +--- + fs/btrfs/disk-io.c | 53 +++---- + fs/btrfs/extent-tree.c | 64 +++++---- + fs/btrfs/extent_io.c | 39 ++++-- + fs/btrfs/file.c | 9 +- + fs/btrfs/inode-item.c | 2 +- + fs/btrfs/inode.c | 264 ++++++++++++++++++++++++++++++++++- + fs/btrfs/ioctl.c | 66 ++++++++- + fs/btrfs/relocation.c | 3 +- + fs/btrfs/root-tree.c | 4 +- + fs/btrfs/super.c | 22 ++- + fs/btrfs/transaction.c | 2 +- + fs/btrfs/tree-log.c | 8 +- + fs/btrfs/volumes.c | 335 ++++++++++++++++++++++----------------------- + fs/btrfs/volumes.h | 7 +- + include/uapi/linux/btrfs.h | 15 +- + 18 files changed, 666 insertions(+), 342 deletions(-) +Merging ceph/master (7c886661dc31 libceph: use KMEM_CACHE macro) +$ git merge ceph/master +Auto-merging drivers/block/rbd.c +Merge made by the 'recursive' strategy. + 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 +Merge made by the 'recursive' strategy. + include/linux/configfs.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +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 +Merge made by the 'recursive' strategy. + fs/ocfs2/quota_global.c | 11 +++++++++-- + fs/quota/dquot.c | 13 +++++++++++-- + 2 files changed, 20 insertions(+), 4 deletions(-) +Merging ext4/dev (3d43bcfef5f0 ext4 crypto: use dget_parent() in ext4_d_revalidate()) +$ git merge ext4/dev +Auto-merging include/linux/fs.h +Auto-merging fs/nfs/nfs4file.c +Auto-merging fs/nfs/inode.c +Merge made by the 'recursive' strategy. + fs/dcache.c | 5 ++++- + fs/ext4/crypto.c | 49 +++++++++++++++++++++++++++++-------------------- + fs/ext4/ext4.h | 6 ++++-- + fs/ext4/file.c | 12 ++++++++---- + fs/ext4/page-io.c | 14 +++++++++++++- + fs/ext4/readpage.c | 2 +- + 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 ++++++++++ + 13 files changed, 146 insertions(+), 39 deletions(-) +Merging f2fs/dev (f55532a0c0b8 Linux 4.6-rc1) +$ git merge f2fs/dev +Already up-to-date. +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 +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 (f55532a0c0b8 Linux 4.6-rc1) +$ 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/btrfs/file.c +Merge made by the 'recursive' strategy. + fs/btrfs/file.c | 2 +- + fs/namei.c | 48 ++++++++++++++++++++++++++++++++++++++---------- + fs/overlayfs/super.c | 2 +- + include/linux/namei.h | 2 ++ + 4 files changed, 42 insertions(+), 12 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 (e60e62528559 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/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 | 16 ++---- + 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, 333 insertions(+), 343 deletions(-) +Merging pci/next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (b428a267271e Merge branches 'for-4.6/upstream-fixes' and 'for-4.7/hidraw' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-lenovo.c | 16 +++++++-- + drivers/hid/hid-wiimote-modules.c | 14 ++++---- + drivers/hid/hidraw.c | 13 +++---- + drivers/hid/usbhid/hid-core.c | 73 ++++++++++++++++++++------------------- + drivers/hid/wacom_wac.c | 11 ++++++ + 5 files changed, 73 insertions(+), 54 deletions(-) +Merging i2c/i2c/for-next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge i2c/i2c/for-next +Already up-to-date. +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 (df92cda7a31a Merge branch 'v4l_for_linus' into to_next) +$ git merge v4l-dvb/master +Auto-merging sound/usb/card.c +Merge made by the 'recursive' strategy. + drivers/media/media-device.c | 143 ++++++++++++++++++++++---------- + drivers/media/media-devnode.c | 3 + + drivers/media/media-entity.c | 16 ++-- + drivers/media/usb/au0828/au0828-cards.c | 4 - + drivers/media/usb/au0828/au0828-core.c | 74 ++++++++++++----- + drivers/media/usb/au0828/au0828-input.c | 4 +- + drivers/media/usb/au0828/au0828-video.c | 63 +++++++------- + drivers/media/usb/au0828/au0828.h | 9 +- + drivers/media/v4l2-core/v4l2-mc.c | 2 +- + include/media/media-device.h | 38 +++++++-- + sound/usb/card.c | 2 +- + sound/usb/media.c | 30 ++++--- + 12 files changed, 247 insertions(+), 141 deletions(-) +Merging libata/for-next (d991c872ac7f libata: Fixup awkward whitespace in warning by removing line continuation.) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + drivers/ata/libahci.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging pm/linux-next (5a963666f454 Merge branch 'acpi-processor' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + arch/x86/kernel/cpu/mcheck/therm_throt.c | 3 ++ + drivers/acpi/acpi_processor.c | 52 ++++++++++++++++++++++++++++++++ + drivers/acpi/bus.c | 3 ++ + drivers/acpi/internal.h | 6 ++++ + 4 files changed, 64 insertions(+) +Merging idle/next (31ade3b83e18 Linux 4.4-rc3) +$ git merge idle/next +Already up-to-date. +Merging thermal/next (81ad4276b505 Thermal: Ignore invalid trip points) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (a134b4143b65 thermal: tegra: add PM support) +$ git merge thermal-soc/next +Removing drivers/thermal/tegra_soctherm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../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 | 5 +- + 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 + + 27 files changed, 1464 insertions(+), 611 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 (e46b4e2b46e1 Merge tag 'trace-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ git merge net-next/master +Already up-to-date. +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 (de06dbfa7861 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) +$ 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 (f55532a0c0b8 Linux 4.6-rc1) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (f55532a0c0b8 Linux 4.6-rc1) +$ git merge l2-mtd/master +Already up-to-date. +Merging nand/nand/next (a5565e3737b8 mtd: nand: jz4780: fixup, device structure assigned at probe) +$ git merge nand/nand/next +Merge made by the 'recursive' strategy. + drivers/mtd/nand/atmel_nand.c | 37 ++++++++++++++++++++----------------- + 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 ++++++ + 7 files changed, 77 insertions(+), 19 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 (55c561a708ee drm/i915: Remove PIPE_CONF_CHECK_I_ALT) +$ 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 +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 | 287 +-- + drivers/gpu/drm/i915/i915_dma.c | 488 +++-- + drivers/gpu/drm/i915/i915_drv.c | 36 +- + drivers/gpu/drm/i915/i915_drv.h | 311 ++- + drivers/gpu/drm/i915/i915_gem.c | 421 ++--- + 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 | 130 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 411 ++-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 26 +- + 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 | 50 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 7 + + drivers/gpu/drm/i915/i915_gpu_error.c | 197 +- + 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 | 173 +- + drivers/gpu/drm/i915/i915_sysfs.c | 10 + + drivers/gpu/drm/i915/i915_trace.h | 52 +- + drivers/gpu/drm/i915/i915_vgpu.c | 14 +- + 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 | 556 ++++++ + drivers/gpu/drm/i915/intel_crt.c | 40 +- + drivers/gpu/drm/i915/intel_csr.c | 86 +- + drivers/gpu/drm/i915/intel_ddi.c | 1218 +----------- + drivers/gpu/drm/i915/intel_display.c | 2623 +++++++++++++------------- + drivers/gpu/drm/i915/intel_dp.c | 189 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 10 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 1773 +++++++++++++++++ + drivers/gpu/drm/i915/intel_dpll_mgr.h | 164 ++ + drivers/gpu/drm/i915/intel_drv.h | 171 +- + 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 | 33 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 126 +- + drivers/gpu/drm/i915/intel_fbc.c | 4 +- + drivers/gpu/drm/i915/intel_fbdev.c | 19 +- + 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 | 998 +++++----- + drivers/gpu/drm/i915/intel_lrc.h | 16 +- + drivers/gpu/drm/i915/intel_lvds.c | 70 +- + drivers/gpu/drm/i915/intel_mocs.c | 14 +- + drivers/gpu/drm/i915/intel_overlay.c | 64 +- + drivers/gpu/drm/i915/intel_panel.c | 52 +- + drivers/gpu/drm/i915/intel_pm.c | 398 ++-- + drivers/gpu/drm/i915/intel_psr.c | 6 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 1449 +++++++------- + drivers/gpu/drm/i915/intel_ringbuffer.h | 106 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 149 +- + drivers/gpu/drm/i915/intel_sdvo.c | 20 +- + drivers/gpu/drm/i915/intel_sprite.c | 27 +- + 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, 9035 insertions(+), 7057 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 (341917fe2b62 gpu: host1x: Use a signed return type for do_relocs()) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (00c9672606f7 drm: Untangle __KERNEL__ guards) +$ git merge drm-misc/topic/drm-misc +Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c' +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/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 +Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c'. +[master c7cbbd893dab] 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_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_crtc.h | 14 +-- + include/drm/ttm/ttm_bo_driver.h | 3 +- + include/linux/console.h | 2 + + include/uapi/drm/drm.h | 14 ++- + include/uapi/drm/drm_mode.h | 10 ++ + 26 files changed, 50 insertions(+), 230 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 (879e40bea6f2 drm: ARM HDLCD - get rid of devm_clk_put()) +$ git merge hdlcd/for-upstream/hdlcd +Resolved 'arch/arm64/boot/dts/arm/juno-base.dtsi' using previous resolution. +Auto-merging arch/arm64/boot/dts/arm/juno-base.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/arm/juno-base.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0b7c2ce88d7c] Merge remote-tracking branch 'hdlcd/for-upstream/hdlcd' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/arm/hdlcd_drv.c | 15 +++------------ + 1 file changed, 3 insertions(+), 12 deletions(-) +Merging drm-vc4/drm-vc4-next (90d7116061f8 drm/vc4: Recognize a more specific compatible string for V3D.) +$ git merge drm-vc4/drm-vc4-next +Already up-to-date. +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 (f66918ebe322 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 | 4 +- + 5 files changed, 25 insertions(+), 43 deletions(-) +Merging sound/for-next (97cc2ed27e5a ALSA: hda - Fix yet another i915 pointer leftover in error path) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + include/sound/hda_i915.h | 10 +- + sound/firewire/Kconfig | 1 + + sound/firewire/bebob/bebob.c | 4 +- + sound/firewire/fireworks/fireworks.c | 21 +- + sound/firewire/oxfw/oxfw.h | 1 - + sound/hda/hdac_i915.c | 47 +++-- + sound/pci/hda/patch_hdmi.c | 373 ++++++++++++++++++++++++----------- + 7 files changed, 309 insertions(+), 148 deletions(-) +Merging sound-asoc/for-next (3034bde71170 Merge remote-tracking branches 'asoc/topic/rt5677', 'asoc/topic/tas571x', 'asoc/topic/topology', 'asoc/topic/wm8960' and 'asoc/topic/wm8962' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + include/uapi/sound/asoc.h | 42 ++++- + sound/hda/ext/hdac_ext_stream.c | 5 +- + sound/soc/codecs/Kconfig | 4 +- + sound/soc/codecs/cs35l32.c | 17 +- + sound/soc/codecs/cs47l24.c | 41 ++++- + sound/soc/codecs/nau8825.c | 305 +++++++++++++++++++----------- + sound/soc/codecs/nau8825.h | 22 ++- + 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 | 37 ++-- + 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 | 17 +- + sound/soc/omap/mcbsp.c | 8 + + sound/soc/soc-dapm.c | 7 + + 27 files changed, 908 insertions(+), 200 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 (d314e9e80c5e Input: sur40 - fix DMA on stack) +$ git merge input/next +Already up-to-date. +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 (de24075022dc md: fix a trivial typo in comments) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.c | 2 +- + drivers/md/raid1.c | 2 +- + 2 files changed, 2 insertions(+), 2 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 (bf59522bc462 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 | 55 +++++++++- + 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, 344 insertions(+), 94 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 (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next) +$ 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 (759b31c1d429 selinux: simply inode label states to INVALID and INITIALIZED) +$ 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 | 10 ++++++---- + security/selinux/include/objsec.h | 5 ++--- + 3 files changed, 9 insertions(+), 8 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 (abfa6cd8cda7 modsign: Fix documentation on module signing enforcement parameter.) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (d00cd819d7df drivers/rtc: broken link fix) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (b562e44f507e Linux 4.5) +$ git merge audit/next +Already up-to-date. +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 (5027e19db8ce of: Add vendor prefix for eGalax_eMPIA Technology Inc) +$ git merge dt-rh/for-next +Already up-to-date. +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 (32d84d7e37c4 Merge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/fsl-espi', 'spi/topic/octeon', 'spi/topic/pxa2xx' and 'spi/topic/xlp' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + drivers/spi/Kconfig | 2 +- + 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-pxa2xx-dma.c | 28 +++++++++---------- + drivers/spi/spi-pxa2xx.c | 14 +++++++--- + drivers/spi/spi-pxa2xx.h | 3 --- + drivers/spi/spi-rockchip.c | 2 +- + drivers/spi/spi.c | 4 +-- + 11 files changed, 95 insertions(+), 90 deletions(-) +Merging tip/auto-latest (05e9c83b75dd Merge branch 'x86/mm') +$ git merge tip/auto-latest +Merge made by the 'recursive' strategy. + Documentation/x86/pat.txt | 32 ++++++ + Documentation/x86/protection-keys.txt | 27 +++++ + Documentation/x86/topology.txt | 208 ++++++++++++++++++++++++++++++++++ + arch/x86/events/amd/core.c | 21 +++- + arch/x86/events/perf_event.h | 11 +- + arch/x86/include/asm/msr-index.h | 8 +- + arch/x86/include/asm/mtrr.h | 6 +- + arch/x86/include/asm/pat.h | 2 +- + arch/x86/include/asm/processor.h | 2 - + arch/x86/include/asm/smp.h | 1 + + arch/x86/include/asm/thread_info.h | 6 +- + arch/x86/kernel/amd_nb.c | 6 +- + arch/x86/kernel/cpu/amd.c | 12 +- + arch/x86/kernel/cpu/mtrr/generic.c | 24 ++-- + arch/x86/kernel/cpu/mtrr/main.c | 13 ++- + arch/x86/kernel/cpu/mtrr/mtrr.h | 1 + + arch/x86/kernel/cpu/powerflags.c | 2 + + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/mm/pat.c | 90 +++++++++++---- + arch/x86/ras/mce_amd_inj.c | 3 +- + arch/x86/xen/enlighten.c | 9 -- + include/linux/atomic.h | 34 +++--- + include/linux/sched.h | 4 +- + kernel/sched/core.c | 18 +++ + kernel/time/tick-sched.c | 61 +++++----- + kernel/time/tick-sched.h | 2 +- + tools/perf/MANIFEST | 1 + + tools/perf/tests/perf-targz-src-pkg | 2 +- + 28 files changed, 478 insertions(+), 130 deletions(-) + create mode 100644 Documentation/x86/protection-keys.txt + create mode 100644 Documentation/x86/topology.txt +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 b258679e23b0] 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 (abec4017af67 rcu: Track rcu_dereference() in RCU read-side critical section) +$ git merge rcu/rcu/next +Auto-merging lib/Kconfig.debug +Auto-merging kernel/rcu/tree_plugin.h +Auto-merging kernel/rcu/tree.h +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/rcu/rcutorture.c +Auto-merging kernel/rcu/Makefile +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/rcupdate.h +Auto-merging include/linux/lockdep.h +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/RCU/trace.txt | 10 +- + Documentation/kernel-parameters.txt | 38 ++ + include/linux/lockdep.h | 49 ++ + include/linux/rcupdate.h | 12 + + include/linux/rcutiny.h | 16 + + include/linux/rcutree.h | 2 + + include/linux/sched.h | 3 + + include/linux/srcu.h | 2 +- + include/trace/events/rcu.h | 78 ++- + kernel/fork.c | 3 + + kernel/locking/lockdep.c | 327 +++++++++- + kernel/locking/lockdep_internals.h | 91 +++ + kernel/locking/lockdep_proc.c | 127 ++++ + kernel/rcu/Makefile | 1 + + kernel/rcu/rcuperf.c | 655 +++++++++++++++++++++ + kernel/rcu/rcutorture.c | 4 +- + kernel/rcu/tree.c | 162 +++-- + kernel/rcu/tree.h | 3 +- + kernel/rcu/tree_plugin.h | 26 +- + kernel/rcu/tree_trace.c | 7 +- + kernel/rcu/update.c | 25 +- + lib/Kconfig.debug | 57 ++ + .../rcutorture/bin/kvm-recheck-rcuperf-ftrace.sh | 121 ++++ + .../rcutorture/bin/kvm-recheck-rcuperf.sh | 96 +++ + .../selftests/rcutorture/bin/kvm-recheck.sh | 5 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 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 ++ + 31 files changed, 1947 insertions(+), 73 deletions(-) + create mode 100644 kernel/rcu/rcuperf.c + 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 (aca04ce5dbda Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ 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 +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 (7084fa868b50 USB: serial: cp210x: add new access functions for large registers) +$ 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 (b2073dcb80b6 staging: comedi: comedi_fops.c: fix lines over 80 characters) +$ git merge staging/staging-next +Removing drivers/staging/iio/impedance-analyzer/ad5933.h +Removing drivers/staging/comedi/drivers/ni_mio_c_common.c +Merge made by the 'recursive' strategy. + drivers/staging/comedi/comedi_buf.c | 10 +- + drivers/staging/comedi/comedi_fops.c | 54 +- + drivers/staging/comedi/comedidev.h | 4 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 38 +- + 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 | 24 +- + drivers/staging/dgnc/dgnc_mgmt.c | 28 +- + drivers/staging/dgnc/dgnc_neo.c | 70 +- + drivers/staging/dgnc/dgnc_sysfs.c | 2 +- + drivers/staging/dgnc/dgnc_tty.c | 148 +- + 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/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/adis16201.h | 156 +- + drivers/staging/iio/accel/adis16203.h | 132 +- + drivers/staging/iio/accel/adis16204.h | 159 +- + drivers/staging/iio/accel/adis16209.h | 39 + + drivers/staging/iio/accel/adis16220.h | 48 + + drivers/staging/iio/accel/adis16240.h | 50 + + drivers/staging/iio/accel/adis16240_core.c | 4 +- + drivers/staging/iio/adc/ad7192.c | 20 +- + drivers/staging/iio/adc/ad7606_spi.c | 5 +- + drivers/staging/iio/frequency/ad9832.c | 2 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 31 +- + drivers/staging/iio/impedance-analyzer/ad5933.h | 28 - + 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/ade7759.c | 4 +- + drivers/staging/iio/meter/ade7854.c | 3 +- + drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 3 +- + .../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_private.h | 75 - + .../lustre/include/linux/libcfs/libcfs_workitem.h | 12 +- + .../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 | 281 ++- + .../lustre/lnet/libcfs/linux/linux-module.c | 154 +- + .../staging/lustre/lnet/libcfs/linux/linux-prim.c | 7 - + drivers/staging/lustre/lnet/libcfs/module.c | 132 +- + 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 | 4 +- + 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/include/lustre_lib.h | 2 +- + drivers/staging/lustre/lustre/include/obd_cksum.h | 1 + + drivers/staging/lustre/lustre/obdclass/cl_lock.c | 2 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 4 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 5 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 12 +- + 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/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 | 3 - + drivers/staging/unisys/visorbus/visorbus_main.c | 369 +--- + drivers/staging/unisys/visorbus/visorchipset.c | 125 +- + 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/prism2usb.c | 2 +- + drivers/staging/xgifb/XGI_main_26.c | 5 +- + drivers/staging/xgifb/vb_init.c | 3 +- + drivers/staging/xgifb/vb_setmode.c | 19 +- + drivers/staging/xgifb/vb_util.h | 8 +- + 288 files changed, 4750 insertions(+), 5661 deletions(-) + delete mode 100644 drivers/staging/comedi/drivers/ni_mio_c_common.c + delete mode 100644 drivers/staging/iio/impedance-analyzer/ad5933.h +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 (44b03c105106 MAINTAINERS: pinctrl: samsung: Add two new maintainers) +$ 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/freescale/pinctrl-imx.c | 17 +++++------ + drivers/pinctrl/intel/pinctrl-intel.c | 35 ++++++++++++++++++++-- + drivers/pinctrl/pinctrl-pistachio.c | 24 +++++++-------- + drivers/pinctrl/sh-pfc/core.c | 4 ++- + drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c | 1 + + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 17 ++++++----- + drivers/pinctrl/sunxi/pinctrl-sunxi.h | 21 ++++++------- + 9 files changed, 86 insertions(+), 47 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +++ + drivers/remoteproc/st_remoteproc.c | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging gpio/for-next (7f950861041b Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + 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 | 16 +--- + 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 | 2 + + drivers/gpio/gpio-74x164.c | 24 +++++ + drivers/gpio/gpio-amdpt.c | 123 +++---------------------- + drivers/gpio/gpio-mb86s7x.c | 2 - + drivers/gpio/gpio-mcp23s08.c | 102 ++++++-------------- + drivers/gpio/gpio-menz127.c | 13 +-- + drivers/gpio/gpio-octeon.c | 26 ++---- + drivers/gpio/gpio-rcar.c | 20 ++++ + drivers/gpio/gpio-xgene.c | 5 + + drivers/input/keyboard/adp5589-keys.c | 12 +-- + drivers/input/touchscreen/ad7879.c | 10 +- + drivers/soc/fsl/qe/gpio.c | 20 ++-- + 21 files changed, 166 insertions(+), 309 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 (2aac7ddf9a41 clk: qcom: ipq4019: add some fixed clocks for ddrppl and fepll) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + drivers/clk/mediatek/reset.c | 2 +- + drivers/clk/mmp/reset.c | 2 +- + drivers/clk/qcom/gcc-ipq4019.c | 70 +++++++++++++++++++-------------------- + drivers/clk/qcom/reset.c | 2 +- + drivers/clk/qcom/reset.h | 2 +- + drivers/clk/rockchip/softrst.c | 2 +- + drivers/clk/sirf/clk-atlas7.c | 2 +- + drivers/clk/sunxi/clk-a10-ve.c | 2 +- + drivers/clk/sunxi/clk-sun9i-mmc.c | 2 +- + drivers/clk/sunxi/clk-usb.c | 2 +- + drivers/clk/tegra/clk.c | 2 +- + 11 files changed, 45 insertions(+), 45 deletions(-) +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 (fda0b150a173 Merge branch 'for-4.6/notifier-cleanup' into for-next) +$ git merge livepatching/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging coresight/next (93eb18df7af9 coresight: configuring ETF in FIFO mode when acting as link) +$ 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 | 81 +- + .../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-priv.h | 10 + + drivers/hwtracing/coresight/coresight-tmc-etf.c | 606 +++++ + drivers/hwtracing/coresight/coresight-tmc-etr.c | 470 ++++ + drivers/hwtracing/coresight/coresight-tmc.c | 554 +---- + drivers/hwtracing/coresight/coresight-tmc.h | 167 ++ + drivers/hwtracing/coresight/coresight.c | 17 +- + 15 files changed, 4107 insertions(+), 2825 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 (d6dca1d76d10 rtc: at91sam9: remove duplicate assignment of variable mr) +$ 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-ds1302.c | 348 ++++++++++----------- + 4 files changed, 213 insertions(+), 198 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 +Merge made by the 'recursive' strategy. + arch/x86/include/asm/pmem.h | 9 +++++++++ + drivers/nvdimm/pmem.c | 4 ++-- + include/linux/pmem.h | 22 ++++++++++++++++------ + 3 files changed, 27 insertions(+), 8 deletions(-) +$ git am -3 ../patches/0001-powerpc-ppc4xx-remove-unused-local-variable.patch +Applying: powerpc: ppc4xx: remove unused local variable +Merging akpm-current/current (2093093128be ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Auto-merging include/linux/sched.h +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/vm/ksm.txt | 63 ++ + MAINTAINERS | 3 +- + arch/arm/include/asm/page.h | 2 + + arch/arm64/mm/hugetlbpage.c | 1 + + arch/metag/mm/hugetlbpage.c | 1 + + arch/powerpc/mm/hugetlbpage.c | 6 +- + arch/tile/mm/hugetlbpage.c | 7 +- + arch/tile/mm/init.c | 2 +- + arch/x86/include/asm/tlbflush.h | 6 - + arch/x86/kernel/machine_kexec_64.c | 46 ++ + arch/x86/mm/hugetlbpage.c | 1 + + arch/x86/mm/tlb.c | 14 +- + block/genhd.c | 2 +- + drivers/block/aoe/aoecmd.c | 2 +- + 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 +- + 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 | 2 +- + include/linux/bootmem.h | 16 +- + include/linux/compiler-gcc.h | 1 + + include/linux/compiler.h | 8 +- + include/linux/crc64_ecma.h | 56 ++ + include/linux/device.h | 12 +- + include/linux/huge_mm.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/mm.h | 6 +- + include/linux/mm_types.h | 14 +- + include/linux/nodemask.h | 18 +- + include/linux/oom.h | 9 +- + include/linux/page_ref.h | 26 +- + include/linux/pagemap.h | 8 +- + include/linux/sched.h | 6 +- + 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/trace/events/huge_memory.h | 38 +- + include/trace/events/page_isolation.h | 2 +- + init/main.c | 9 +- + ipc/msg.c | 5 +- + ipc/sem.c | 124 ++-- + kernel/cpuset.c | 8 +- + kernel/exit.c | 32 +- + kernel/kexec.c | 119 ++-- + kernel/kexec_core.c | 8 +- + kernel/kexec_file.c | 8 +- + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 ++++++++++ + lib/test_kasan.c | 29 + + mm/backing-dev.c | 20 +- + mm/filemap.c | 2 +- + mm/huge_memory.c | 92 ++- + mm/hugetlb.c | 24 +- + mm/internal.h | 6 +- + 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 | 8 +- + mm/mempool.c | 7 +- + mm/oom_kill.c | 6 +- + mm/page_alloc.c | 137 +++- + mm/page_isolation.c | 11 +- + mm/rmap.c | 28 +- + mm/slab.c | 523 ++++++++------- + mm/slab.h | 2 + + mm/slab_common.c | 4 + + mm/slub.c | 8 +- + mm/vmscan.c | 29 +- + mm/zsmalloc.c | 139 ++-- + net/wireless/util.c | 2 +- + scripts/checkpatch.pl | 12 +- + 91 files changed, 2759 insertions(+), 784 deletions(-) + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.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 +Applying: staging/goldfish: use 6-arg get_user_pages() +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + d7cd6b48264d...c0d1fdb30d9e akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (c0d1fdb30d9e staging/goldfish: use 6-arg get_user_pages()) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +-- + drivers/platform/goldfish/goldfish_pipe.c | 3 +-- + 2 files changed, 2 insertions(+), 4 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..baf9f97b2e6a --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20160331 |