diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-04-19 15:11:20 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-04-19 15:11:20 +1000 |
| commit | b20b2d571b5fb9e53df79dd728416ff8b3966298 (patch) | |
| tree | 33ee0986596e902bd01ac4df16cc6caeb2be5da3 | |
| parent | 0784c0ffaaf0be01843229a3c655c8b952b11617 (diff) | |
| download | linux-next-b20b2d571b5fb9e53df79dd728416ff8b3966298.tar.gz | |
Add linux-next specific files for 20160419next-20160419
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 | 5994 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 6469 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..aea1bab5fe0f --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,234 @@ +Name SHA1 +---- ---- +origin 95d0c4277c27520cabdc40646f5a2e507fcd315a +fixes 9735a22799b9214d17d3c231fe377fc852f042e9 +kbuild-current 3d1450d54a4fc277fc4598acf2335f74b66b08fc +arc-current 421e31e58c2a48b85bce06902140d1b5fef6050d +arm-current 9c18fcf7ae0ef87f0723dfd74c27d608c7486e0e +m68k-current 7b8ba82ad4ada669c564ec8ccba9cadc6e8abfb1 +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +powerpc-fixes 71528d8bd7a8aa920cd69d4223c6c87d5849257d +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +sparc 5ec712934ce1ff6e33bf3878034a91ca9bd600c9 +net ab2ed0171a50ddee8390f472bb83f60d393b4b04 +ipsec d6af1a31cc72fbd558c7eddbc36f61bf09d1cf6a +ipvs bcf4934288402be3464110109a4dae3bd6fb3e93 +wireless-drivers de478a61389cacafe94dc8b035081b681b878f9d +mac80211 8f815cdde3e550e10c2736990d791f60c2ce43eb +sound-current ed0739b577f2ddd53835f1e20d014fccab195c42 +pci-current 67e658794ca191b3221b143f2a1c10d002c40bc8 +driver-core.current c3b46c73264b03000d1e18b22f5caf63332547c9 +tty.current c3b46c73264b03000d1e18b22f5caf63332547c9 +usb.current c3b46c73264b03000d1e18b22f5caf63332547c9 +usb-gadget-fixes c3b46c73264b03000d1e18b22f5caf63332547c9 +usb-serial-fixes bf16200689118d19de1b8d2a3c314fc21f5dc7bb +usb-chipidea-fixes d144dfea8af7108f613139623e63952ed7e69c0c +staging.current bf16200689118d19de1b8d2a3c314fc21f5dc7bb +char-misc.current c3b46c73264b03000d1e18b22f5caf63332547c9 +input-current eda5ecc0a6b865561997e177c393f0b0136fe3b7 +crypto-current f709b45ec461b548c41a00044dba1f1b572783bf +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 31318a922395ec9e78d6e2ddf70779355afc7594 +asm-generic a1cbaad75a8f891bca9cc65a1fb95ae1b28d2f6a +arc e4863ecc1b9d13099459a4bbcf35461d54b4f61d +arm b8dafd7fde6cccdcafb11842c29609d56eb1a390 +arm-perf f55532a0c0b8bb6148f4e07853b876ef73bc69ca +arm-soc 7dde46570e4b2af4290c3293568fc0859efba08e +at91 503057c24478eece49de687015ab80bce3b2dae8 +bcm2835-dt 48c3b1441a772f3623bfd8f42a35664b0172daa7 +bcm2835-soc 92e963f50fc74041b5e9e744c330dca48e04f08d +bcm2835-drivers 92e963f50fc74041b5e9e744c330dca48e04f08d +bcm2835-defconfig 8d1a8c92a8c04f344a57c271b5c0792bc552ae3e +berlin 9a7e0683324926963bcee47058c4f86f4fb6b409 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 6ffbe53bca8f7f17b3aaceeac154d31eaf98dd37 +keystone 02e15d23400608a9843a66c0b5fc4f3d6dd80b50 +mvebu 550cd80600c7490a2722addb05ba36951ab261a3 +omap edc590ce8a30770e935394f60a0ab3709151a416 +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +qcom 28c3334242a9e615c2fe71365015dcda7c432ba0 +renesas 5189157db46ba212d418ed3de48a09e22a0be53e +rockchip 670939f6a0eb6fcd40e6894d275357851c249a6f +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 92e963f50fc74041b5e9e744c330dca48e04f08d +samsung-krzk 45209b9c75f5bc7a9b6ab51470f9370e500eed68 +sunxi 93a96dc4ccc176b612a402f278c563d5414cc3ba +tegra bee573cd1dec8f204c242117dc7a4dfa22056300 +arm64 561662301eb6a40d569453b3555fc8cfce094b93 +blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris f9f3f864b5e8c09d7837d8980edba4ad52969819 +h8300 8cad489261c564d4ee1db4de4ac365af56807d8a +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 7e26e9ff0a9301398bd7cf8d896536da3a54aa9a +m68k efbec135f11d6f14f40806935827c53d8889f59b +m68knommu c3b46c73264b03000d1e18b22f5caf63332547c9 +metag c8b6ad8b3f873ff5b971523f439f4b5a1ac75842 +microblaze 10f4b26deb411fdd61054a59d8c7d82e29712e33 +mips 3f315fa1f5d6cb06121c62e2328573cdbf006bd2 +nios2 8fe889274c7a4d95c3e2d06f87ead499ea6faa2d +parisc-hd 1ef27c516c24d4aefe9bf1c8eafe18435bf2f012 +powerpc 1050e689a63baffdadcd33498c15d859922504c0 +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl fba4e9f9898ab181703723b9890ba29345edfe08 +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 c7d4d259b7477866376435155eb0ccdaee880677 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile f98983bbba0db6ba35fff37a4e8466f2152c39c5 +uml ad32a1f3c36b046b2e7b0361b88c18e3af61419e +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa 9da8320bb97768e35f2e64fa7642015271d672eb +btrfs bb7ab3b92e46da06b580c6f83abe7894dc449cca +btrfs-kdave eca999f1db56ff53a57a747f6a87fdf03f3ac443 +ceph 2224d879c7c0f85c14183ef82eb48bd875ceb599 +cifs 90de6800c240dfe089e254116a7c055e70b709fd +configfs 96c22a3293512ba684e73a981196430f524689da +ecryptfs 933c32fe0e42b86d9bc5779401c3ce93d56bd231 +ext3 8f9e8f5fcc059a3cba87ce837c88316797ef3645 +ext4 86cf0011caf37237b44500f21322f4c3b3913fe3 +f2fs 4da7bf5a4345f3ce9699476a8022f66cfb4a8ce9 +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 742f992708dff0ada8b426228900ffb009c7167b +gfs2 e97321fa095f1ea7110d4d2ba446bd6141ed9a03 +jfs 6ed71e9819ac3412fc6a3495f5ce141df274c916 +nfs c3b46c73264b03000d1e18b22f5caf63332547c9 +nfsd ac503e4a309a3993a069750f95c2815ee5db5aa5 +orangefs e56f49814250f4ca4b66ec7d3a71152846761d1b +overlayfs e3608e3f68f6e82113555c873333722362eca6a0 +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs c27cb97218b3e72417ffc5e73dce488844017b39 +xfs d8bdd04e309b1b56939f44f9ad14038b9a6dd2e8 +file-locks 5af9c2e19da6514a1a50b07d97d93b74a7711873 +vfs 489eda8cd1a695e3a8cf61dbee07f97ac83dc02c +pci 9735a22799b9214d17d3c231fe377fc852f042e9 +hid 1cdd4e9759b48327779c265680a3a84d772b2d00 +i2c cd5d37e832678361defc2c1a5ca63e5700c9de9b +jdelvare-hwmon f02de116250d4ac6137cd3255be7d1f5678ac460 +dmi c3db05ecf8acef3e4ae9436d357a067052061eb0 +hwmon-staging 5b3af0edd8dbedb65ab9f7d36f19ff39b091d89b +v4l-dvb 405ddbfa68177b6169d09bc2308a39196a8eb64a +libata c5cf484d03f1bcbb33ad4c2efba52f5676d5df88 +pm f10503242155b4bc1f4d557f94e1df4bddb32a18 +idle f55532a0c0b8bb6148f4e07853b876ef73bc69ca +thermal 81ad4276b505e987dd8ebbdf63605f92cd172b52 +thermal-soc c960fe12d00275c52dffc0013d64c5a50538a74c +ieee1394 384fbb96f9268eee0b703b39cb07557403bd9aac +dlm 82c7d823cc31cf56d964eebe1f91aaf1691cddce +swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df +slave-dma 9bcc2ce189ca7a675d9a23c01057cfb90c2d11f8 +net-next 266a0a790fb545fa1802a899ac44f61b1d6335a7 +ipsec-next cb866e3298cd7412503fc7e2c265753c853fab9d +ipvs-next 5a504528f28f86b2a4d096633f37490acf917f45 +wireless-drivers-next 171a900c4eb7b34667e64ffed316a50425b45581 +bluetooth edc73417d8f33a1dd329295275168923298d9a7b +mac80211-next 81948527fce52c73c9a0742b8ec8d26b97f6c3c0 +rdma 520a07bff6fbb23cac905007d74c67058b189acb +mtd 20c07a5bf094198ff2382aa5e7c930b3c9807792 +l2-mtd 08922f644878c9163ada8df3ef9def89be1d5e90 +nand a3fd27e69422fe7852de0c9ff459aad2133078a8 +crypto b3ab30a7cbdaf7ba20dddeac252cc0238312fff0 +drm f9fd2adaacd8dc0ecbb38d96f3c62f20f0697176 +drm-panel bbdca2fd5ab01b1f33d09f9e1abe3de207ab1ab0 +drm-intel 5f304c87363401eb85cae304d025e93267353d3a +drm-tegra 3a9b33c6048a9f41c596954e9c3de7c3ab3c4717 +drm-misc 8d4d0d700dda04c5095a08e91f59f537995aa024 +drm-exynos 25364a9e54fb8296837061bf684b76d20eec01fb +drm-msm fcda50c8f484cf1140232c8444470449f0619db9 +hdlcd 69c2565a3cca3d79572941d62165af7805d72762 +drm-vc4 5883980313af70aec0ceebaef6ef0709726e5e63 +kbuild 2468fc97cc4555c37fa491379c98561b30c739f3 +kconfig f55532a0c0b8bb6148f4e07853b876ef73bc69ca +regmap 8eabbbb9c0c9ec729473d98517f1458f71e48c0d +sound a19c921fca0a865b657d59b2c9a05aa0a2905126 +sound-asoc 880e54f0dff294072240a9104695e44c7b4b56b2 +modules 13771c666003d75f31f03023010878272053f893 +input 74813cebd678dd471b4fcd7d3019aecab9dbcedd +block 06fde609f0bd091bdf6edbe5c0d909e1a6674ebc +device-mapper 3ff6a535b994e22dac5d38afd0171a35fbb52ddb +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc-uh 7af73d0b0f280a2e329cf68a5930d020f20ef71a +md 7dedd15dd2527055390b9742c87a02556d3180f4 +mfd a557a7a09b085d7f940d9b28d07bba82dec3c038 +backlight 60d613d6aef4ae49988eeb3ad38af948c561db1e +battery 4a99fa06a8ca27a5187636e630568658000af575 +omap_dss2 32ad61951574d011d363694d6037592e99da9421 +regulator a3a6f6a965e9cea158f99a60f314e9434c5c78cc +security 3c9d6296b7aee536a96ea2b53a15d23511738c1c +integrity f5f8f020b2dad433b59e730e9ed2f55726868942 +keys 1ea6102bba5f4b9ab9a1708fd406cdd5dbbf26c2 +selinux 0fd71a620be8648486a126fccadf9f7c2a818676 +tpmdd 0c61500a7f09e6f2dc50039a2fba3240294ea27c +watchdog d1ed3ba4e3d76b4ebec239c64f990c26d7935700 +iommu ba72c41365842af9f9e50e54be5ea0edbbb69da6 +dwmw2-iommu 46924008273ed03bd11dbb32136e3da4cfe056e1 +vfio c4aec3101319f84363a57e09086c2aff6c60a3c3 +jc_docs 78f3873decadde42da6edf419635b5972ae61e00 +trivial dc5a533f91305f91645513abde2da52026385a04 +audit 7ffb8e317bae03b8ee5bdcec93dc3723be945e9b +devicetree 48a9b733e644ab4cc8e2a98950a36ddb12b8c54e +dt-rh bc553986a2f7c56d0de811485d5312ea29692d5d +mailbox aca04ce5dbda50758b813b1e3d710098991cfa9a +spi 83c0d79ca937853cc2b4b561fa49be25c67478e7 +tip 0db6774ba37ddda1141159e45aac3c723221da79 +clockevents 23cb25d0f407e83be10747258092843e8e20d535 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd 2364d423a7b34bd972761eeed1f764c962980c23 +irqchip a66ce4b7d9d20b59afe0a898fa0b4faf0651fbcd +ftrace 7e6867bf831c71fe0e47438831ae3a94d4c7ab3c +rcu 4530d62e04e35c636ffaf93e5c99e96633f40a3e +kvm 316314cae15fb0e3869b76b468f59a0c83ac3d4e +kvm-arm 06a71a24bae57a07afee9cda6b00495347d8a448 +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus 58ded4201ff028b15f6b317228faa5f154a0663f +kvms390 c87ff1433acafa66d1f097cf71ce4c9cd413397f +xen-tip 85d1a29de8e4e5bce20ca02103acf1082a6e530a +percpu 18fc93fd64129c96432812cb44f59c963871889b +workqueues 22aceb317678057dced5f1d6e3ac15acdb863e7b +drivers-x86 4f62568c1fcf0f7da49e7c22bdd01645aa508e80 +chrome-platform 1dc318166a9a3c8646d1f8af6cff246ea89853b2 +hsi 87d99063be016ceee90723a13365a40b21eec0d9 +leds 4a91c45ea57c4974c797b89dfed19e946a774787 +ipmi 42a018c63aee41d93962cf39e536c6f31fc023c1 +driver-core 5614e7725856ea383f458377980298111439e0fb +tty c3b46c73264b03000d1e18b22f5caf63332547c9 +usb 7ce04cff59d510c88bfa0745202281cf3c6417ae +usb-gadget 761aa987a847e0e8b9a8d806f1be82217b88b0d3 +usb-serial bf16200689118d19de1b8d2a3c314fc21f5dc7bb +usb-chipidea-next 4e332df63487418ec512c3c376c07df9ab3ae035 +staging 4145ba76b1f7f3296cc673c299084145e1267029 +char-misc 7553c7e68fd144643e74a279ef51b74a15214071 +extcon b5dbb9f578424ab8e73fc48049bf818688c8041e +cgroup 08fb4e7f8d5f2b4f01e6884b79d157ce32217f9a +scsi 0237d1ea51f0e2bc45dec165963ac646d12a7d27 +target-updates 5e47f1985d7107331c3f64fb3ec83d66fd73577e +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +pinctrl ca1c8b640fe8276f6171dcffebbbb466431aba6c +vhost c00bbcf8628969e103d4a7b351a53746f1025576 +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg 9735a22799b9214d17d3c231fe377fc852f042e9 +gpio 9c088f21bb5d19cda0cc10e97c0a0c0d61938f34 +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm f55532a0c0b8bb6148f4e07853b876ef73bc69ca +dma-buf 8f496d3fcc9df8823e36a023a2fd8b08c7993f4c +userns f2ca379642d7a843be972ea4167abdd3c8c9e5d1 +ktest f55532a0c0b8bb6148f4e07853b876ef73bc69ca +clk 5eda83ab215efec37c45889149e28cd2ffc38368 +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest f55532a0c0b8bb6148f4e07853b876ef73bc69ca +y2038 477b8541b31fd4d32168514203a8da8b73884d90 +luto-misc afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc +borntraeger 36f90b0a2ddd60823fe193a85e60ff1906c2a9b3 +livepatching 4fe83e63352a005464a380532d95252e74f2b887 +coresight 27268ed3d16957078e867656a6a871c51102e484 +rtc 44c31a263a5e986ceb7aaddeb314df5813624211 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm a390180291dd9a2392bbab4242cde712c326efc6 +akpm-current 6c454fa77b7837cd116e0e89a4f4e7114673b125 +akpm 15866294ee81143449a6bf7f26bcdb1ab174dc64 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..e8cd62aabc0d --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5994 @@ +$ date -R +Tue, 19 Apr 2016 09:39:19 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 9d090d01e3ef Merge tag 'dm-4.6-fix-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm +Merging origin/master (95d0c4277c27 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ git merge origin/master +Updating 9d090d01e3ef..95d0c4277c27 +Fast-forward + Makefile | 2 +- + arch/s390/Kconfig | 3 +++ + arch/s390/include/asm/pci.h | 3 ++- + arch/s390/include/asm/seccomp.h | 2 ++ + arch/s390/lib/spinlock.c | 1 + + drivers/s390/block/dcssblk.c | 5 +++-- + drivers/s390/block/scm_blk.c | 2 +- + 7 files changed, 13 insertions(+), 5 deletions(-) +Merging fixes/master (9735a22799b9 Linux 4.6-rc2) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (421e31e58c2a ARCv2: Enable LOCKDEP) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/include/asm/irqflags-arcv2.h | 36 ++++++++++++++++++++++++++++++++++- + arch/arc/kernel/entry-arcv2.S | 10 +++++++++- + arch/arc/kernel/entry-compact.S | 3 +++ + arch/arc/kernel/unaligned.c | 2 +- + 4 files changed, 48 insertions(+), 3 deletions(-) +Merging arm-current/fixes (9c18fcf7ae0e ARM: 8551/2: DMA: Fix kzalloc flags in __dma_alloc) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/mm/dma-mapping.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging m68k-current/for-linus (7b8ba82ad4ad m68k/defconfig: Update defconfigs for v4.6-rc2) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-fixes/fixes (71528d8bd7a8 powerpc: Correct used_vsr comment) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (5ec712934ce1 sparc: Write up preadv2/pwritev2 syscalls.) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/include/uapi/asm/unistd.h | 4 +++- + arch/sparc/kernel/pci.c | 17 +++++++++++++++++ + arch/sparc/kernel/systbls_32.S | 2 +- + arch/sparc/kernel/systbls_64.S | 4 ++-- + 4 files changed, 23 insertions(+), 4 deletions(-) +Merging net/master (ab2ed0171a50 macsec: fix crypto Kconfig dependency) +$ git merge net/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/mediatek-net.txt | 7 +- + drivers/bcma/main.c | 17 +- + drivers/isdn/mISDN/socket.c | 3 + + drivers/net/Kconfig | 1 + + drivers/net/dsa/mv88e6xxx.c | 34 +--- + drivers/net/ethernet/broadcom/bgmac.c | 5 + + drivers/net/ethernet/broadcom/bgmac.h | 6 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 6 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 5 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 3 + + drivers/net/ethernet/chelsio/cxgb4/sge.c | 20 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 33 ++++ + drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 30 ++- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 49 +++-- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 10 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 49 +++-- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 10 +- + drivers/net/ethernet/renesas/ravb_main.c | 3 + + drivers/net/ethernet/renesas/sh_eth.c | 6 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 16 +- + drivers/net/ethernet/ti/cpsw.c | 31 +-- + drivers/net/usb/cdc_mbim.c | 9 +- + drivers/net/vrf.c | 177 ++---------------- + drivers/net/wireless/broadcom/b43/main.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 + + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 2 - + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 6 +- + include/linux/rculist_nulls.h | 39 ++++ + include/net/ip6_route.h | 3 + + include/net/ipv6.h | 2 + + include/net/route.h | 3 + + include/net/sctp/structs.h | 8 +- + include/net/sock.h | 6 +- + include/uapi/linux/Kbuild | 1 + + kernel/bpf/verifier.c | 1 + + net/bridge/netfilter/ebtables.c | 6 +- + net/core/skbuff.c | 7 +- + net/decnet/dn_route.c | 9 +- + net/ipv4/netfilter/arptable_filter.c | 6 + + net/ipv4/route.c | 19 +- + net/ipv4/udp.c | 9 +- + net/ipv6/addrconf.c | 22 ++- + net/ipv6/datagram.c | 169 ++++++++++------- + net/ipv6/route.c | 19 +- + net/ipv6/udp.c | 1 + + net/netfilter/nf_conntrack_proto_tcp.c | 4 + + net/netlink/af_netlink.c | 2 +- + net/packet/af_packet.c | 1 + + net/rds/cong.c | 4 +- + net/rds/ib_cm.c | 2 +- + net/sched/sch_generic.c | 5 +- + net/sctp/outqueue.c | 15 +- + net/sctp/sm_make_chunk.c | 3 +- + net/sctp/sm_sideeffect.c | 36 ++-- + net/sctp/transport.c | 19 +- + net/tipc/core.c | 1 + + net/tipc/core.h | 3 + + net/tipc/name_distr.c | 35 +++- + net/wireless/nl80211.c | 2 +- + tools/testing/selftests/net/.gitignore | 1 + + tools/testing/selftests/net/Makefile | 2 +- + tools/testing/selftests/net/reuseport_dualstack.c | 208 +++++++++++++++++++++ + 63 files changed, 783 insertions(+), 440 deletions(-) + create mode 100644 tools/testing/selftests/net/reuseport_dualstack.c +Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/netns/xfrm.h | 1 + + net/core/flow.c | 14 +++++++++++++- + net/ipv4/ip_vti.c | 18 ++++++++++++++++++ + net/xfrm/xfrm_output.c | 3 +++ + 4 files changed, 35 insertions(+), 1 deletion(-) +Merging ipvs/master (bcf493428840 netfilter: ebtables: Fix extension lookup with identical name) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (de478a61389c ath9k: ar5008_hw_cmn_spur_mitigate: add missing mask_m & mask_p initialisation) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 8 +++----- + drivers/net/wireless/ath/ath9k/ar9002_phy.c | 5 ----- + 2 files changed, 3 insertions(+), 10 deletions(-) +Merging mac80211/master (8f815cdde3e5 nl80211: check netlink protocol in socket release notification) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (ed0739b577f2 ALSA - hda: hdmi check NULL pointer in hdmi_set_chmap) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/hda_generic.c | 6 ++++-- + sound/pci/hda/patch_hdmi.c | 2 ++ + 2 files changed, 6 insertions(+), 2 deletions(-) +Merging pci-current/for-linus (67e658794ca1 cxgb4: Set VPD size so we can read both VPD structures) +$ git merge pci-current/for-linus +Auto-merging drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +Merge made by the 'recursive' strategy. + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 10 +++++++ + drivers/pci/access.c | 42 ++++++++++++++++++++++++++++++ + drivers/pci/host/pci-imx6.c | 20 +++++++++----- + drivers/pci/pci.h | 1 + + include/linux/pci.h | 1 + + 5 files changed, 68 insertions(+), 6 deletions(-) +Merging driver-core.current/driver-core-linus (c3b46c73264b Linux 4.6-rc4) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (c3b46c73264b Linux 4.6-rc4) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (c3b46c73264b Linux 4.6-rc4) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (c3b46c73264b Linux 4.6-rc4) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (bf1620068911 Linux 4.6-rc3) +$ 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 (bf1620068911 Linux 4.6-rc3) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (c3b46c73264b Linux 4.6-rc4) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (eda5ecc0a6b8 Input: pmic8xxx-pwrkey - fix algorithm for converting trigger delay) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + Documentation/input/event-codes.txt | 4 ++++ + drivers/input/joystick/xpad.c | 2 ++ + drivers/input/misc/arizona-haptics.c | 1 - + drivers/input/misc/pmic8xxx-pwrkey.c | 7 ++++--- + drivers/input/tablet/gtco.c | 10 +++++++++- + 5 files changed, 19 insertions(+), 5 deletions(-) +Merging crypto-current/master (f709b45ec461 crypto: ccp - Prevent information leakage on export) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + arch/x86/crypto/sha-mb/sha1_mb.c | 4 ++-- + crypto/rsa-pkcs1pad.c | 12 ++++++------ + drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 3 +++ + drivers/crypto/ccp/ccp-crypto-sha.c | 3 +++ + 4 files changed, 14 insertions(+), 8 deletions(-) +Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge ide/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature) +$ git merge kselftest-fixes/fixes +Already up-to-date. +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 (31318a922395 drm/i915: Use fw_domains_put_with_fifo() on HSW) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_drv.h | 5 ++-- + drivers/gpu/drm/i915/i915_gem_userptr.c | 29 +++++++++++++---------- + drivers/gpu/drm/i915/intel_lrc.c | 16 +++++++++---- + drivers/gpu/drm/i915/intel_pm.c | 42 ++++++++++++++++++++++----------- + drivers/gpu/drm/i915/intel_ringbuffer.c | 18 ++++++++------ + drivers/gpu/drm/i915/intel_uncore.c | 6 ++++- + 6 files changed, 75 insertions(+), 41 deletions(-) +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 (e4863ecc1b9d ARC: RIP arc_{get|set}_core_freq() clk API) +$ git merge arc/for-next +Removing arch/arc/kernel/clk.c +Removing arch/arc/include/asm/clk.h +Auto-merging arch/arc/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/timer/snps,arc-timer.txt | 31 +++ + .../devicetree/bindings/timer/snps,archs-gfrc.txt | 14 ++ + .../devicetree/bindings/timer/snps,archs-rtc.txt | 14 ++ + arch/arc/Kconfig | 4 +- + arch/arc/boot/dts/abilis_tb10x.dtsi | 14 ++ + arch/arc/boot/dts/axc001.dtsi | 14 +- + arch/arc/boot/dts/axc003.dtsi | 16 +- + arch/arc/boot/dts/axc003_idu.dtsi | 14 +- + arch/arc/boot/dts/nsim_700.dts | 10 +- + arch/arc/boot/dts/nsim_hs.dts | 8 +- + arch/arc/boot/dts/nsim_hs_idu.dts | 8 +- + arch/arc/boot/dts/nsimosci.dts | 10 +- + arch/arc/boot/dts/nsimosci_hs.dts | 8 +- + arch/arc/boot/dts/nsimosci_hs_idu.dts | 8 +- + arch/arc/boot/dts/skeleton.dtsi | 14 ++ + arch/arc/boot/dts/skeleton_hs.dtsi | 52 +++++ + arch/arc/boot/dts/skeleton_hs_idu.dtsi | 46 +++++ + arch/arc/boot/dts/vdk_axc003.dtsi | 14 +- + arch/arc/boot/dts/vdk_axc003_idu.dtsi | 12 +- + arch/arc/include/asm/clk.h | 22 --- + arch/arc/include/asm/irq.h | 13 +- + arch/arc/kernel/Makefile | 2 +- + arch/arc/kernel/clk.c | 21 -- + arch/arc/kernel/devtree.c | 13 +- + arch/arc/kernel/intc-arcv2.c | 17 +- + arch/arc/kernel/intc-compact.c | 17 +- + arch/arc/kernel/irq.c | 50 +---- + arch/arc/kernel/mcip.c | 7 +- + arch/arc/kernel/setup.c | 17 +- + arch/arc/kernel/smp.c | 17 +- + arch/arc/kernel/time.c | 220 ++++++++++++++------- + arch/arc/plat-axs10x/axs10x.c | 27 ++- + 32 files changed, 506 insertions(+), 248 deletions(-) + create mode 100644 Documentation/devicetree/bindings/timer/snps,arc-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/snps,archs-gfrc.txt + create mode 100644 Documentation/devicetree/bindings/timer/snps,archs-rtc.txt + create mode 100644 arch/arc/boot/dts/skeleton_hs.dtsi + create mode 100644 arch/arc/boot/dts/skeleton_hs_idu.dtsi + delete mode 100644 arch/arc/include/asm/clk.h + delete mode 100644 arch/arc/kernel/clk.c +Merging arm/for-next (b8dafd7fde6c Merge branches 'fixes', 'kexec-for-next' and 'misc' into for-next) +$ git merge arm/for-next +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kdump/kdump.txt | 13 +++---------- + Documentation/kernel-parameters.txt | 5 ----- + arch/arm/include/asm/dma-mapping.h | 2 -- + arch/arm/include/asm/memory.h | 27 ++++++++++++++++++++++----- + arch/arm/kernel/bios32.c | 3 --- + arch/arm/kernel/setup.c | 26 ++++++++++++++++++++++++++ + arch/arm/mach-keystone/keystone.c | 7 +------ + arch/arm/mm/dma-mapping.c | 16 ---------------- + arch/arm/mm/idmap.c | 2 +- + scripts/kallsyms.c | 10 ++-------- + scripts/link-vmlinux.sh | 4 ---- + 11 files changed, 55 insertions(+), 60 deletions(-) +Merging arm-perf/for-next/perf (f55532a0c0b8 Linux 4.6-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (7dde46570e4b ARM: SoC: Document merges) +$ git merge arm-soc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.txt | 3 + + Documentation/devicetree/bindings/arm/arm-boards | 8 + + .../devicetree/bindings/arm/atmel-at91.txt | 6 +- + Documentation/devicetree/bindings/arm/rockchip.txt | 4 + + .../bindings/phy/phy-lpc18xx-usb-otg.txt | 2 +- + .../devicetree/bindings/soc/rockchip/grf.txt | 35 ++ + .../bindings/soc/rockchip/power_domain.txt | 37 ++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 11 + + arch/arm/arm-soc-for-next-contents.txt | 69 +++ + arch/arm/boot/dts/Makefile | 8 +- + arch/arm/boot/dts/arm-realview-eb-11mp-revb.dts | 93 ++++ + arch/arm/boot/dts/arm-realview-eb-11mp.dts | 74 +++ + arch/arm/boot/dts/arm-realview-eb-a9mp.dts | 70 +++ + arch/arm/boot/dts/arm-realview-eb-mp.dtsi | 225 +++++++++ + arch/arm/boot/dts/arm-realview-eb.dts | 166 +++++++ + arch/arm/boot/dts/arm-realview-eb.dtsi | 453 +++++++++++++++++ + arch/arm/boot/dts/arm-realview-pb1176.dts | 40 ++ + arch/arm/boot/dts/arm-realview-pb11mp.dts | 19 +- + arch/arm/boot/dts/arm-realview-pba8.dts | 178 +++++++ + arch/arm/boot/dts/arm-realview-pbx-a9.dts | 229 +++++++++ + arch/arm/boot/dts/arm-realview-pbx.dtsi | 542 +++++++++++++++++++++ + arch/arm/boot/dts/armv7-m.dtsi | 2 +- + arch/arm/boot/dts/emev2-kzm9d.dts | 4 +- + arch/arm/boot/dts/lpc18xx.dtsi | 47 +- + arch/arm/boot/dts/lpc4350-hitex-eval.dts | 41 +- + arch/arm/boot/dts/lpc4357-ea4357-devkit.dts | 29 +- + 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 | 15 +- + arch/arm/boot/dts/r8a7790-lager.dts | 95 ++-- + arch/arm/boot/dts/r8a7790.dtsi | 88 ++-- + arch/arm/boot/dts/r8a7791-koelsch.dts | 71 ++- + arch/arm/boot/dts/r8a7791-porter.dts | 63 ++- + arch/arm/boot/dts/r8a7791.dtsi | 79 +-- + arch/arm/boot/dts/r8a7793-gose.dts | 43 +- + arch/arm/boot/dts/r8a7793.dtsi | 45 +- + arch/arm/boot/dts/r8a7794-alt.dts | 32 +- + arch/arm/boot/dts/r8a7794-silk.dts | 44 +- + arch/arm/boot/dts/r8a7794.dtsi | 66 +-- + arch/arm/boot/dts/rk3036-evb.dts | 5 + + arch/arm/boot/dts/rk3036-kylin.dts | 18 +- + arch/arm/boot/dts/rk3036.dtsi | 71 ++- + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 11 +- + arch/arm/boot/dts/rk3066a-rayeager.dts | 9 +- + arch/arm/boot/dts/rk3066a.dtsi | 6 +- + arch/arm/boot/dts/rk3188-radxarock.dts | 7 +- + arch/arm/boot/dts/rk3188.dtsi | 6 +- + arch/arm/boot/dts/rk3228-evb.dts | 8 +- + arch/arm/boot/dts/rk3228.dtsi | 69 +++ + arch/arm/boot/dts/rk3288-evb.dtsi | 8 +- + arch/arm/boot/dts/rk3288-firefly.dtsi | 9 +- + arch/arm/boot/dts/rk3288-popmetal.dts | 9 +- + arch/arm/boot/dts/rk3288-r89.dts | 7 +- + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 100 ++++ + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 49 +- + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 9 + + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 44 ++ + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 7 + + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 16 + + arch/arm/boot/dts/rk3288-veyron.dtsi | 18 +- + arch/arm/boot/dts/rk3288.dtsi | 84 +++- + arch/arm/boot/dts/sama5d2.dtsi | 36 ++ + arch/arm/boot/dts/sh73a0-kzm9g.dts | 30 +- + arch/arm/boot/dts/sh73a0.dtsi | 87 ++-- + arch/arm/boot/dts/socfpga.dtsi | 4 + + arch/arm/boot/dts/socfpga_arria10.dtsi | 32 +- + arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts | 1 + + arch/arm/boot/dts/socfpga_cyclone5.dtsi | 6 - + arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 94 +++- + arch/arm/boot/dts/socfpga_cyclone5_socrates.dts | 1 + + arch/arm/configs/multi_v7_defconfig | 13 +- + arch/arm/configs/shmobile_defconfig | 3 + + arch/arm/mach-at91/sama5.c | 20 +- + arch/arm/mach-at91/soc.c | 81 ++- + arch/arm/mach-at91/soc.h | 12 +- + arch/arm/mach-realview/realview_pbx.c | 2 + + arch/arm/mach-rockchip/platsmp.c | 2 +- + arch/arm/mach-sti/Kconfig | 9 +- + arch/arm64/Kconfig.platforms | 5 + + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/amlogic/Makefile | 3 + + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 69 +++ + arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 52 ++ + arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts | 52 ++ + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 65 +++ + .../boot/dts/amlogic/meson-gxbb-vega-s95-meta.dts | 2 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95-pro.dts | 2 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95-telos.dts | 2 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 4 + + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 5 - + arch/arm64/boot/dts/lg/Makefile | 5 + + arch/arm64/boot/dts/lg/lg1312-ref.dts | 36 ++ + arch/arm64/boot/dts/lg/lg1312.dtsi | 351 +++++++++++++ + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 46 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 42 +- + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 8 +- + arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 319 ++++++++++++ + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 8 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 16 +- + arch/arm64/configs/defconfig | 4 + + drivers/bus/Kconfig | 2 +- + drivers/reset/core.c | 217 +++++---- + drivers/reset/reset-lpc18xx.c | 22 +- + drivers/soc/qcom/smd.c | 229 ++++++--- + drivers/soc/qcom/spm.c | 8 +- + drivers/soc/rockchip/pm_domains.c | 142 +++++- + drivers/soc/versatile/soc-realview.c | 19 +- + include/dt-bindings/power/rk3399-power.h | 53 ++ + include/linux/reset-controller.h | 2 + + include/linux/reset.h | 188 +++++-- + include/linux/soc/qcom/smd.h | 8 +- + include/linux/soc/qcom/smem_state.h | 35 ++ + include/soc/at91/atmel-sfr.h | 18 + + 121 files changed, 5341 insertions(+), 1038 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/arm-realview-eb-11mp-revb.dts + create mode 100644 arch/arm/boot/dts/arm-realview-eb-11mp.dts + create mode 100644 arch/arm/boot/dts/arm-realview-eb-a9mp.dts + create mode 100644 arch/arm/boot/dts/arm-realview-eb-mp.dtsi + create mode 100644 arch/arm/boot/dts/arm-realview-eb.dts + create mode 100644 arch/arm/boot/dts/arm-realview-eb.dtsi + create mode 100644 arch/arm/boot/dts/arm-realview-pba8.dts + create mode 100644 arch/arm/boot/dts/arm-realview-pbx-a9.dts + create mode 100644 arch/arm/boot/dts/arm-realview-pbx.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi + create mode 100644 arch/arm64/boot/dts/lg/Makefile + create mode 100644 arch/arm64/boot/dts/lg/lg1312-ref.dts + create mode 100644 arch/arm64/boot/dts/lg/lg1312.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts + create mode 100644 include/dt-bindings/power/rk3399-power.h + create mode 100644 include/soc/at91/atmel-sfr.h +Merging at91/at91-next (503057c24478 Merge branches 'at91-4.7-soc' and 'at91-4.7-dt' into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging bcm2835-dt/bcm2835-dt-next (48c3b1441a77 dt/bindings: bcm2835: correct description for DMA-int) +$ git merge bcm2835-dt/bcm2835-dt-next +Merge made by the 'recursive' strategy. + .../brcm,bcm2835-armctrl-ic.txt | 4 +- + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 4 ++ + arch/arm/boot/dts/bcm2835-rpi-a.dts | 4 ++ + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 ++ + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 4 ++ + arch/arm/boot/dts/bcm2835-rpi-b.dts | 4 ++ + arch/arm/boot/dts/bcm2835-rpi.dtsi | 9 +++++ + arch/arm/boot/dts/bcm2835.dtsi | 11 +++++ + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 4 ++ + arch/arm/boot/dts/bcm283x.dtsi | 47 ++++++++++++++++++++++ + 10 files changed, 93 insertions(+), 2 deletions(-) +Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge bcm2835-soc/bcm2835-soc-next +Already up-to-date. +Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge bcm2835-drivers/bcm2835-drivers-next +Already up-to-date. +Merging bcm2835-defconfig/bcm2835-defconfig-next (8d1a8c92a8c0 ARM: bcm2835: Enable CONFIG_PM.) +$ git merge bcm2835-defconfig/bcm2835-defconfig-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + arch/arm/configs/bcm2835_defconfig | 3 ++- + arch/arm/configs/multi_v7_defconfig | 5 +++-- + 2 files changed, 5 insertions(+), 3 deletions(-) +Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (6ffbe53bca8f Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.txt | 4 + + .../devicetree/bindings/clock/imx35-clock.txt | 1 + + .../devicetree/bindings/dma/fsl-imx-sdma.txt | 27 + + .../devicetree/bindings/mtd/fsl-quadspi.txt | 3 +- + .../devicetree/bindings/spi/spi-fsl-dspi.txt | 5 +- + arch/arm/boot/dts/Makefile | 18 +- + arch/arm/boot/dts/imx25-pinfunc.h | 124 +-- + arch/arm/boot/dts/imx28.dtsi | 26 + + arch/arm/boot/dts/imx31.dtsi | 8 + + arch/arm/boot/dts/imx35.dtsi | 8 + + arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts | 42 +- + arch/arm/boot/dts/imx6dl-tx6s-8034.dts | 237 +++++ + arch/arm/boot/dts/imx6dl-tx6s-8035.dts | 253 ++++++ + arch/arm/boot/dts/imx6dl-tx6u-801x.dts | 42 +- + arch/arm/boot/dts/imx6dl-tx6u-8033.dts | 248 ++++++ + arch/arm/boot/dts/imx6dl-tx6u-811x.dts | 60 +- + arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dts | 255 ++++++ + arch/arm/boot/dts/imx6q-ba16.dtsi | 5 +- + arch/arm/boot/dts/imx6q-tbs2910.dts | 2 +- + arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts | 42 +- + arch/arm/boot/dts/imx6q-tx6q-1010.dts | 42 +- + arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts | 72 +- + arch/arm/boot/dts/imx6q-tx6q-1020.dts | 72 +- + arch/arm/boot/dts/imx6q-tx6q-1036.dts | 252 ++++++ + arch/arm/boot/dts/imx6q-tx6q-1110.dts | 60 +- + arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts | 264 ++++++ + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 30 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 788 +++++++++-------- + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 96 ++ + arch/arm/boot/dts/imx6qp-nitrogen6_max.dts | 59 ++ + arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 709 +++++++++++++++ + arch/arm/boot/dts/imx6sx-sdb-sai.dts | 67 ++ + arch/arm/boot/dts/imx6sx-sdb.dtsi | 16 + + arch/arm/boot/dts/imx6sx.dtsi | 6 +- + 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/arm/boot/dts/imx7d-nitrogen7.dts | 745 ++++++++++++++++ + arch/arm/boot/dts/imx7d.dtsi | 31 + + arch/arm/boot/dts/ls1021a.dtsi | 65 +- + arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 16 + + arch/arm/boot/dts/vf-colibri.dtsi | 40 +- + arch/arm/boot/dts/vf500-colibri.dtsi | 5 + + arch/arm/boot/dts/vf500.dtsi | 1 + + arch/arm/boot/dts/vf610-colibri.dtsi | 5 + + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 734 ++++++++++++++++ + arch/arm/boot/dts/vfxxx.dtsi | 21 + + arch/arm/configs/imx_v6_v7_defconfig | 4 + + arch/arm/configs/multi_v5_defconfig | 21 +- + arch/arm/mach-imx/Kconfig | 2 +- + .../mach-imx/devices/platform-sdhci-esdhc-imx.c | 5 +- + arch/arm64/boot/dts/freescale/Makefile | 3 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 181 ++++ + arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 13 + + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 22 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts | 9 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 12 +- + drivers/clk/imx/clk-gate2.c | 7 +- + drivers/clk/imx/clk-imx35.c | 4 +- + drivers/clk/imx/clk-imx6q.c | 2 +- + drivers/clk/imx/clk-imx6sx.c | 10 +- + drivers/clk/imx/clk-imx7d.c | 3 +- + drivers/clk/imx/clk-pllv3.c | 14 +- + drivers/clk/imx/clk-vf610.c | 60 +- + drivers/clk/imx/clk.h | 13 +- + include/dt-bindings/clock/imx7d-clock.h | 3 +- + include/dt-bindings/clock/vf610-clock.h | 8 +- + 68 files changed, 6772 insertions(+), 595 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6dl-tx6s-8034.dts + create mode 100644 arch/arm/boot/dts/imx6dl-tx6s-8035.dts + create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-8033.dts + create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dts + create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1036.dts + create mode 100644 arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts + create mode 100644 arch/arm/boot/dts/imx6qp-nitrogen6_max.dts + create mode 100644 arch/arm/boot/dts/imx6sx-nitrogen6sx.dts + create mode 100644 arch/arm/boot/dts/imx6sx-sdb-sai.dts + 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/arm/boot/dts/imx7d-nitrogen7.dts + create mode 100644 arch/arm/boot/dts/vf610-zii-dev-rev-b.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts +Merging keystone/next (02e15d234006 Merge branch 'for_4.7/kesytone' into next) +$ 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 +++--- + .../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 ++-- + .../boot/dts/{k2hk-clocks.dtsi => keystone-k2hk-clocks.dtsi} | 0 + arch/arm/boot/dts/{k2hk-evm.dts => keystone-k2hk-evm.dts} | 2 +- + .../boot/dts/{k2hk-netcp.dtsi => keystone-k2hk-netcp.dtsi} | 0 + arch/arm/boot/dts/{k2hk.dtsi => keystone-k2hk.dtsi} | 4 ++-- + .../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 ++-- + arch/arm/boot/dts/keystone.dtsi | 11 +++++++++++ + arch/arm/configs/keystone_defconfig | 2 ++ + 16 files changed, 26 insertions(+), 13 deletions(-) + rename arch/arm/boot/dts/{k2e-clocks.dtsi => keystone-k2e-clocks.dtsi} (100%) + rename arch/arm/boot/dts/{k2e-evm.dts => keystone-k2e-evm.dts} (98%) + rename arch/arm/boot/dts/{k2e-netcp.dtsi => keystone-k2e-netcp.dtsi} (100%) + rename arch/arm/boot/dts/{k2e.dtsi => keystone-k2e.dtsi} (97%) + rename arch/arm/boot/dts/{k2hk-clocks.dtsi => keystone-k2hk-clocks.dtsi} (100%) + rename arch/arm/boot/dts/{k2hk-evm.dts => keystone-k2hk-evm.dts} (99%) + rename arch/arm/boot/dts/{k2hk-netcp.dtsi => keystone-k2hk-netcp.dtsi} (100%) + rename arch/arm/boot/dts/{k2hk.dtsi => keystone-k2hk.dtsi} (96%) + rename arch/arm/boot/dts/{k2l-clocks.dtsi => keystone-k2l-clocks.dtsi} (100%) + rename arch/arm/boot/dts/{k2l-evm.dts => keystone-k2l-evm.dts} (98%) + rename arch/arm/boot/dts/{k2l-netcp.dtsi => keystone-k2l-netcp.dtsi} (100%) + rename arch/arm/boot/dts/{k2l.dtsi => keystone-k2l.dtsi} (96%) +Merging mvebu/for-next (550cd80600c7 Merge branch 'mvebu/defconfig' into mvebu/for-next) +$ git merge mvebu/for-next +Resolved 'arch/arm/configs/multi_v7_defconfig' using previous resolution. +Auto-merging arch/arm/configs/multi_v7_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master aeef10c124f2] Merge remote-tracking branch 'mvebu/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 +- + arch/arm/boot/dts/Makefile | 2 ++ + arch/arm/boot/dts/armada-385-linksys.dtsi | 6 ++--- + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 4 +-- + arch/arm/boot/dts/kirkwood-6192.dtsi | 4 +-- + arch/arm/boot/dts/kirkwood-6281.dtsi | 4 +-- + arch/arm/boot/dts/kirkwood-6282.dtsi | 4 +-- + arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 4 +-- + arch/arm/boot/dts/kirkwood-b3.dts | 19 ++++++------- + arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts | 4 +-- + arch/arm/boot/dts/kirkwood-cloudbox.dts | 2 +- + arch/arm/boot/dts/kirkwood-db-88f6281.dts | 14 +++++----- + arch/arm/boot/dts/kirkwood-db-88f6282.dts | 20 +++++++------- + arch/arm/boot/dts/kirkwood-dir665.dts | 20 +++++++------- + arch/arm/boot/dts/kirkwood-dnskw.dtsi | 6 ++--- + arch/arm/boot/dts/kirkwood-ds111.dts | 2 +- + arch/arm/boot/dts/kirkwood-ds112.dts | 6 ++++- + arch/arm/boot/dts/kirkwood-ds212.dts | 2 +- + arch/arm/boot/dts/kirkwood-ds411.dts | 6 ++++- + arch/arm/boot/dts/kirkwood-ds411slim.dts | 2 +- + arch/arm/boot/dts/kirkwood-ib62x0.dts | 4 +-- + arch/arm/boot/dts/kirkwood-iconnect.dts | 22 +++++++-------- + arch/arm/boot/dts/kirkwood-km_common.dtsi | 20 +++++++------- + arch/arm/boot/dts/kirkwood-laplug.dts | 19 +++++++------ + arch/arm/boot/dts/kirkwood-linkstation.dtsi | 17 ++++++------ + arch/arm/boot/dts/kirkwood-lsxl.dtsi | 16 +++++------ + arch/arm/boot/dts/kirkwood-mplcec4.dts | 18 ++++++------- + arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 24 ++++++++--------- + arch/arm/boot/dts/kirkwood-nas2big.dts | 18 ++++++------- + .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 20 +++++++------- + .../boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 23 +++++++--------- + arch/arm/boot/dts/kirkwood-netxbig.dtsi | 8 +++--- + arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 4 +-- + arch/arm/boot/dts/kirkwood-nsa310.dts | 18 ++++++------- + arch/arm/boot/dts/kirkwood-nsa320.dts | 31 +++++++++++++--------- + arch/arm/boot/dts/kirkwood-nsa325.dts | 17 +++++------- + arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 24 ++++++++--------- + arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 2 +- + arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 2 +- + arch/arm/boot/dts/kirkwood-openrd.dtsi | 14 +++------- + arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts | 2 +- + arch/arm/boot/dts/kirkwood-rd88f6192.dts | 20 +++++++------- + arch/arm/boot/dts/kirkwood-rd88f6281-a.dts | 2 +- + arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts | 2 +- + arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 20 +++++++------- + arch/arm/boot/dts/kirkwood-rs212.dts | 6 ++++- + arch/arm/boot/dts/kirkwood-synology.dtsi | 22 ++++++--------- + arch/arm/boot/dts/kirkwood-t5325.dts | 22 +++++++-------- + arch/arm/boot/dts/kirkwood-ts219-6281.dts | 4 +-- + arch/arm/boot/dts/kirkwood-ts219-6282.dts | 16 +++-------- + arch/arm/boot/dts/kirkwood-ts219.dtsi | 20 +++++++------- + arch/arm/boot/dts/kirkwood-ts419-6282.dts | 15 +++-------- + arch/arm/boot/dts/kirkwood-ts419.dtsi | 4 +-- + arch/arm/boot/dts/kirkwood.dtsi | 2 +- + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/mvebu_v5_defconfig | 2 +- + arch/arm/configs/mvebu_v7_defconfig | 1 + + 57 files changed, 284 insertions(+), 331 deletions(-) +Merging omap/for-next (edc590ce8a30 Merge branch 'omap-for-v4.7/dt' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/omap/omap.txt | 6 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 6 +- + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 13 +- + arch/arm/boot/dts/am335x-chiliboard.dts | 75 ++ + arch/arm/boot/dts/am335x-chilisom.dtsi | 77 +- + arch/arm/boot/dts/am335x-cm-t335.dts | 1 + + arch/arm/boot/dts/am335x-evm.dts | 1 + + arch/arm/boot/dts/am335x-icev2.dts | 306 ++++++++ + arch/arm/boot/dts/am335x-igep0033.dtsi | 1 + + arch/arm/boot/dts/am335x-phycore-som.dtsi | 1 + + arch/arm/boot/dts/am335x-shc.dts | 2 +- + arch/arm/boot/dts/am33xx-clocks.dtsi | 90 +-- + arch/arm/boot/dts/am33xx.dtsi | 10 +- + arch/arm/boot/dts/am35xx-clocks.dtsi | 20 +- + arch/arm/boot/dts/am4372.dtsi | 16 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 3 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 3 +- + arch/arm/boot/dts/am43xx-clocks.dtsi | 170 +++-- + arch/arm/boot/dts/am572x-idk.dts | 85 +++ + arch/arm/boot/dts/am57xx-beagle-x15.dts | 26 +- + arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 +- + arch/arm/boot/dts/am57xx-idk-common.dtsi | 302 ++++++++ + arch/arm/boot/dts/da850.dtsi | 4 +- + arch/arm/boot/dts/dm814x-clocks.dtsi | 253 ++++++- + arch/arm/boot/dts/dm814x.dtsi | 2 + + arch/arm/boot/dts/dm816x-clocks.dtsi | 42 +- + arch/arm/boot/dts/dm816x.dtsi | 2 + + arch/arm/boot/dts/dra62x-clocks.dtsi | 26 + + arch/arm/boot/dts/dra7-evm.dts | 39 +- + arch/arm/boot/dts/dra7.dtsi | 200 ++++- + arch/arm/boot/dts/dra72-evm-common.dtsi | 833 ++++++++++++++++++++ + arch/arm/boot/dts/dra72-evm-revc.dts | 73 ++ + arch/arm/boot/dts/dra72-evm.dts | 835 +-------------------- + arch/arm/boot/dts/dra7xx-clocks.dtsi | 394 +++++----- + arch/arm/boot/dts/omap2420-clocks.dtsi | 38 +- + arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 2 +- + arch/arm/boot/dts/omap2420.dtsi | 4 + + arch/arm/boot/dts/omap2430-clocks.dtsi | 58 +- + arch/arm/boot/dts/omap2430.dtsi | 6 +- + arch/arm/boot/dts/omap24xx-clocks.dtsi | 228 +++--- + arch/arm/boot/dts/omap3-beagle.dts | 1 + + arch/arm/boot/dts/omap3-n9.dts | 14 + + arch/arm/boot/dts/omap3-n950-n9.dtsi | 151 ++++ + arch/arm/boot/dts/omap3-n950.dts | 99 +++ + arch/arm/boot/dts/omap3.dtsi | 6 +- + arch/arm/boot/dts/omap3430es1-clocks.dtsi | 30 +- + arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi | 44 +- + arch/arm/boot/dts/omap34xx.dtsi | 2 +- + .../omap36xx-am35xx-omap3430es2plus-clocks.dtsi | 32 +- + arch/arm/boot/dts/omap36xx-clocks.dtsi | 14 +- + .../boot/dts/omap36xx-omap3430es2plus-clocks.dtsi | 14 +- + arch/arm/boot/dts/omap36xx.dtsi | 2 +- + arch/arm/boot/dts/omap3xxx-clocks.dtsi | 276 +++---- + arch/arm/boot/dts/omap4-kc1.dts | 182 +++++ + arch/arm/boot/dts/omap4-var-som-om44.dtsi | 2 +- + arch/arm/boot/dts/omap4.dtsi | 6 +- + arch/arm/boot/dts/omap443x-clocks.dtsi | 2 +- + arch/arm/boot/dts/omap443x.dtsi | 2 +- + arch/arm/boot/dts/omap4460.dtsi | 2 +- + arch/arm/boot/dts/omap446x-clocks.dtsi | 4 +- + arch/arm/boot/dts/omap44xx-clocks.dtsi | 316 ++++---- + arch/arm/boot/dts/omap5.dtsi | 6 +- + arch/arm/boot/dts/omap54xx-clocks.dtsi | 260 +++---- + arch/arm/configs/omap2plus_defconfig | 58 +- + arch/arm/mach-omap1/id.c | 1 + + arch/arm/mach-omap2/Makefile | 2 +- + arch/arm/mach-omap2/clockdomains7xx_data.c | 2 +- + arch/arm/mach-omap2/id.c | 1 + + arch/arm/mach-omap2/io.c | 3 +- + arch/arm/mach-omap2/omap-wakeupgen.c | 12 + + arch/arm/mach-omap2/pm34xx.c | 23 +- + arch/arm/mach-omap2/powerdomains7xx_data.c | 82 +- + arch/arm/mach-omap2/soc.h | 140 +--- + drivers/clk/ti/clk-7xx.c | 2 +- + 75 files changed, 3851 insertions(+), 2198 deletions(-) + create mode 100644 arch/arm/boot/dts/am335x-icev2.dts + create mode 100644 arch/arm/boot/dts/am572x-idk.dts + create mode 100644 arch/arm/boot/dts/am57xx-idk-common.dtsi + create mode 100644 arch/arm/boot/dts/dra72-evm-common.dtsi + create mode 100644 arch/arm/boot/dts/dra72-evm-revc.dts + create mode 100644 arch/arm/boot/dts/omap4-kc1.dts +Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) +$ git merge omap-pending/for-next +Merge made by the 'recursive' strategy. + arch/arm/mach-omap2/omap_hwmod.c | 12 +- + arch/arm/mach-omap2/omap_hwmod.h | 2 + + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 2 + + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 364 ++++++++++++++++++++- + arch/arm/mach-omap2/omap_hwmod_reset.c | 65 ++++ + 5 files changed, 437 insertions(+), 8 deletions(-) +Merging qcom/for-next (28c3334242a9 ARM: dts: msm8974: Add SCM firmware node) +$ git merge qcom/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/firmware/qcom,scm.txt | 25 ++ + arch/arm/Makefile | 3 +- + arch/arm/boot/dts/Makefile | 2 + + .../arm/boot/dts/qcom-apq8064-dragonboard-600c.dts | 377 +++++++++++++++++++++ + arch/arm/boot/dts/qcom-apq8064-pins.dtsi | 39 +++ + arch/arm/boot/dts/qcom-apq8064.dtsi | 41 ++- + arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1-c1.dts | 22 ++ + arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 59 ++++ + arch/arm/boot/dts/qcom-ipq4019.dtsi | 175 ++++++++++ + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 8 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 112 +++++- + 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 + + include/linux/qcom_scm.h | 6 + + 17 files changed, 1239 insertions(+), 37 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt + create mode 100644 arch/arm/boot/dts/qcom-apq8064-dragonboard-600c.dts + create mode 100644 arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1-c1.dts + create mode 100644 arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi + create mode 100644 arch/arm/boot/dts/qcom-ipq4019.dtsi +Merging renesas/next (5189157db46b Merge branches 'heads/arm64-dt-for-v4.7', 'heads/dt-for-v4.7', 'heads/soc-for-v4.7' and 'heads/rcar-sysc-for-v4.7' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + .../bindings/power/renesas,rcar-sysc.txt | 48 +++++ + arch/arm/boot/dts/r8a7779.dtsi | 2 +- + arch/arm/boot/dts/r8a7790-lager.dts | 22 ++- + arch/arm/boot/dts/r8a7790.dtsi | 158 ++++++++++------ + arch/arm/boot/dts/r8a7791-koelsch.dts | 1 + + arch/arm/boot/dts/r8a7791-porter.dts | 14 +- + arch/arm/boot/dts/r8a7791.dtsi | 158 +++++++++------- + arch/arm/boot/dts/r8a7793.dtsi | 159 +++++++++++----- + arch/arm/boot/dts/r8a7794.dtsi | 201 ++++++++++++++++----- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 7 + + arch/arm/boot/dts/sh73a0.dtsi | 2 +- + arch/arm/mach-shmobile/timer.c | 56 ++---- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 16 ++ + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 57 ++++++ + include/dt-bindings/clock/r8a7790-clock.h | 1 + + include/dt-bindings/clock/r8a7794-clock.h | 5 + + include/dt-bindings/power/r8a7779-sysc.h | 27 +++ + include/dt-bindings/power/r8a7790-sysc.h | 34 ++++ + include/dt-bindings/power/r8a7791-sysc.h | 26 +++ + include/dt-bindings/power/r8a7793-sysc.h | 28 +++ + include/dt-bindings/power/r8a7794-sysc.h | 26 +++ + include/dt-bindings/power/r8a7795-sysc.h | 42 +++++ + 22 files changed, 815 insertions(+), 275 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt + create mode 100644 include/dt-bindings/power/r8a7779-sysc.h + create mode 100644 include/dt-bindings/power/r8a7790-sysc.h + create mode 100644 include/dt-bindings/power/r8a7791-sysc.h + create mode 100644 include/dt-bindings/power/r8a7793-sysc.h + create mode 100644 include/dt-bindings/power/r8a7794-sysc.h + create mode 100644 include/dt-bindings/power/r8a7795-sysc.h +Merging rockchip/for-next (670939f6a0eb Merge branch 'v4.7-armsoc/dts32' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/rockchip,rk3399-cru.txt | 62 + + arch/arm/boot/dts/rk3228.dtsi | 80 + + 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 +- + include/dt-bindings/clock/rk3399-cru.h | 752 ++++++++++ + 14 files changed, 3025 insertions(+), 136 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.txt + create mode 100644 drivers/clk/rockchip/clk-rk3399.c + create mode 100644 include/dt-bindings/clock/rk3399-cru.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 (45209b9c75f5 Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Removing arch/arm/mach-exynos/regs-srom.h +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/arm/samsung/samsung-boards.txt | 2 + + .../bindings/memory-controllers/exynos-srom.txt | 79 +++++ + MAINTAINERS | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/cros-adc-thermistors.dtsi | 8 +- + arch/arm/boot/dts/exynos3250-artik5-eval.dts | 43 +++ + arch/arm/boot/dts/exynos3250-artik5.dtsi | 334 +++++++++++++++++++++ + arch/arm/boot/dts/exynos3250-monk.dts | 12 +- + arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 80 +++++ + arch/arm/boot/dts/exynos3250-rinato.dts | 71 ++++- + arch/arm/boot/dts/exynos3250.dtsi | 27 +- + arch/arm/boot/dts/exynos4.dtsi | 27 +- + arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 7 + + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 + + arch/arm/boot/dts/exynos4412-trats2.dts | 16 +- + arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 7 + + arch/arm/boot/dts/exynos4x12.dtsi | 2 +- + arch/arm/boot/dts/exynos5.dtsi | 4 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 2 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 8 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 12 +- + arch/arm/boot/dts/exynos5250-spring.dts | 2 +- + arch/arm/boot/dts/exynos5250.dtsi | 10 +- + arch/arm/boot/dts/exynos5410-smdk5410.dts | 2 +- + arch/arm/boot/dts/exynos5410.dtsi | 4 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 6 +- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 2 +- + arch/arm/boot/dts/exynos5420.dtsi | 12 +- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 17 +- + arch/arm/boot/dts/exynos5440.dtsi | 4 +- + arch/arm/boot/dts/s5pv210-smdkv210.dts | 2 +- + arch/arm/configs/exynos_defconfig | 11 + + arch/arm/configs/multi_v7_defconfig | 4 + + arch/arm/mach-exynos/Kconfig | 3 + + arch/arm/mach-exynos/exynos.c | 17 -- + arch/arm/mach-exynos/include/mach/map.h | 3 - + arch/arm/mach-exynos/regs-srom.h | 53 ---- + arch/arm/mach-exynos/suspend.c | 20 +- + arch/arm/plat-samsung/include/plat/map-s5p.h | 1 - + .../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 | 49 +++ + drivers/clk/samsung/clk-exynos3250.c | 15 + + drivers/memory/Kconfig | 1 + + drivers/memory/Makefile | 1 + + drivers/memory/samsung/Kconfig | 13 + + drivers/memory/samsung/Makefile | 1 + + drivers/memory/samsung/exynos-srom.c | 231 ++++++++++++++ + drivers/memory/samsung/exynos-srom.h | 51 ++++ + include/dt-bindings/clock/exynos3250.h | 11 +- + 50 files changed, 1225 insertions(+), 151 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/exynos-srom.txt + create mode 100644 arch/arm/boot/dts/exynos3250-artik5-eval.dts + create mode 100644 arch/arm/boot/dts/exynos3250-artik5.dtsi + delete mode 100644 arch/arm/mach-exynos/regs-srom.h + 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 + create mode 100644 drivers/memory/samsung/Kconfig + create mode 100644 drivers/memory/samsung/Makefile + create mode 100644 drivers/memory/samsung/exynos-srom.c + create mode 100644 drivers/memory/samsung/exynos-srom.h +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 (bee573cd1dec Merge branch for-4.7/arm64 into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + .../bindings/arm/tegra/nvidia,tegra20-pmc.txt | 12 +- + arch/arm/boot/dts/tegra114-dalmore.dts | 6 +- + 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 | 32 +- + arch/arm/boot/dts/tegra124-nyan.dtsi | 8 +- + arch/arm/boot/dts/tegra124-venice2.dts | 6 +- + arch/arm/boot/dts/tegra124.dtsi | 4 +- + arch/arm/boot/dts/tegra20-harmony.dts | 6 +- + arch/arm/boot/dts/tegra20-iris-512.dts | 4 + + arch/arm/boot/dts/tegra20-medcom-wide.dts | 4 + + arch/arm/boot/dts/tegra20-paz00.dts | 6 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 8 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 4 + + arch/arm/boot/dts/tegra20-trimslice.dts | 6 +- + arch/arm/boot/dts/tegra20-ventana.dts | 6 +- + arch/arm/boot/dts/tegra20-whistler.dts | 6 +- + arch/arm/boot/dts/tegra20.dtsi | 4 +- + arch/arm/boot/dts/tegra30-apalis-eval.dts | 6 +- + arch/arm/boot/dts/tegra30-beaver.dts | 4 + + arch/arm/boot/dts/tegra30-cardhu.dtsi | 6 +- + arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 6 +- + arch/arm/boot/dts/tegra30.dtsi | 4 +- + arch/arm/mach-tegra/platsmp.c | 16 +- + arch/arm64/boot/dts/nvidia/Makefile | 1 + + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 55 +- + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 120 +- + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 8 +- + arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi | 14 +- + arch/arm64/boot/dts/nvidia/tegra210-p2571.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 30 +- + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 1424 ++++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 122 +- + drivers/clk/tegra/clk-pll.c | 46 + + drivers/clk/tegra/clk-tegra210.c | 16 +- + drivers/clk/tegra/clk.h | 6 + + drivers/gpu/drm/tegra/drm.h | 2 +- + drivers/soc/tegra/Kconfig | 2 - + drivers/soc/tegra/pmc.c | 150 ++- + include/dt-bindings/clock/tegra210-car.h | 2 +- + include/soc/tegra/pmc.h | 35 +- + 43 files changed, 1927 insertions(+), 282 deletions(-) + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts +Merging arm64/for-next/core (561662301eb6 arm64, mm, numa: Add NUMA balancing support for arm64.) +$ git merge arm64/for-next/core +Auto-merging drivers/firmware/efi/arm-init.c +Merge made by the 'recursive' strategy. + Documentation/arm64/booting.txt | 4 + + Documentation/devicetree/bindings/numa.txt | 275 ++++++++++++++++++++ + arch/arm64/Kconfig | 27 ++ + arch/arm64/Kconfig.debug | 2 +- + arch/arm64/include/asm/kernel-pgtable.h | 21 +- + arch/arm64/include/asm/memory.h | 30 ++- + arch/arm64/include/asm/mmu.h | 1 + + arch/arm64/include/asm/mmzone.h | 12 + + arch/arm64/include/asm/numa.h | 45 ++++ + arch/arm64/include/asm/pgtable.h | 31 ++- + arch/arm64/include/asm/smp.h | 11 + + arch/arm64/include/asm/sysreg.h | 4 + + arch/arm64/include/asm/topology.h | 10 + + arch/arm64/include/asm/virt.h | 6 + + arch/arm64/kernel/cpufeature.c | 5 + + arch/arm64/kernel/cpuidle.c | 9 +- + arch/arm64/kernel/debug-monitors.c | 3 +- + arch/arm64/kernel/efi-entry.S | 2 +- + arch/arm64/kernel/head.S | 32 ++- + arch/arm64/kernel/hw_breakpoint.c | 8 +- + arch/arm64/kernel/image.h | 4 + + arch/arm64/kernel/insn.c | 2 +- + arch/arm64/kernel/pci.c | 10 + + arch/arm64/kernel/setup.c | 80 +----- + arch/arm64/kernel/smp.c | 42 +++ + arch/arm64/kernel/vdso.c | 4 +- + arch/arm64/kernel/vmlinux.lds.S | 26 +- + arch/arm64/mm/Makefile | 1 + + arch/arm64/mm/context.c | 3 +- + arch/arm64/mm/dump.c | 16 +- + arch/arm64/mm/fault.c | 33 ++- + arch/arm64/mm/init.c | 89 ++++++- + arch/arm64/mm/mm.h | 1 - + arch/arm64/mm/mmu.c | 24 +- + arch/arm64/mm/numa.c | 396 +++++++++++++++++++++++++++++ + drivers/firmware/efi/arm-init.c | 8 + + drivers/firmware/efi/libstub/fdt.c | 24 +- + drivers/of/Kconfig | 3 + + drivers/of/Makefile | 1 + + drivers/of/of_numa.c | 211 +++++++++++++++ + include/linux/of.h | 9 + + 41 files changed, 1327 insertions(+), 198 deletions(-) + create mode 100644 Documentation/devicetree/bindings/numa.txt + create mode 100644 arch/arm64/include/asm/mmzone.h + create mode 100644 arch/arm64/include/asm/numa.h + create mode 100644 arch/arm64/mm/numa.c + create mode 100644 drivers/of/of_numa.c +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 97543a460cc3] 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 (c3b46c73264b Linux 4.6-rc4) +$ 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 (3f315fa1f5d6 Merge branch '4.6-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Auto-merging drivers/firmware/broadcom/bcm47xx_sprom.c +Auto-merging drivers/cpufreq/loongson1-cpufreq.c +Removing arch/mips/include/asm/clkdev.h +Auto-merging arch/mips/configs/loongson1b_defconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../interrupt-controller/brcm,bcm6345-l1-intc.txt | 57 ++ + .../devicetree/bindings/mips/brcm/soc.txt | 3 +- + .../devicetree/bindings/mips/cavium/ciu3.txt | 27 + + .../bindings/serial/microchip,pic32-uart.txt | 29 + + .../devicetree/bindings/vendor-prefixes.txt | 3 + + .../bindings/watchdog/microchip,pic32-dmt.txt | 19 + + .../bindings/watchdog/microchip,pic32-wdt.txt | 18 + + MAINTAINERS | 9 + + arch/mips/Kconfig | 117 ++- + arch/mips/Makefile | 19 + + arch/mips/ath79/Kconfig | 12 - + arch/mips/ath79/clock.c | 211 +++-- + arch/mips/ath79/setup.c | 61 +- + arch/mips/bcm47xx/Makefile | 2 +- + arch/mips/bcm47xx/bcm47xx_private.h | 3 - + arch/mips/bcm47xx/setup.c | 2 +- + arch/mips/bmips/Kconfig | 4 + + arch/mips/bmips/setup.c | 12 + + arch/mips/boot/compressed/Makefile | 5 + + arch/mips/boot/dts/brcm/Makefile | 2 + + arch/mips/boot/dts/brcm/bcm6328.dtsi | 50 +- + arch/mips/boot/dts/brcm/bcm6358.dtsi | 130 +++ + arch/mips/boot/dts/brcm/bcm6368.dtsi | 32 +- + arch/mips/boot/dts/brcm/bcm7125.dtsi | 69 +- + arch/mips/boot/dts/brcm/bcm7346.dtsi | 6 +- + arch/mips/boot/dts/brcm/bcm7358.dtsi | 2 - + arch/mips/boot/dts/brcm/bcm7360.dtsi | 42 +- + arch/mips/boot/dts/brcm/bcm7362.dtsi | 6 +- + arch/mips/boot/dts/brcm/bcm7420.dtsi | 77 +- + arch/mips/boot/dts/brcm/bcm7425.dtsi | 100 ++- + arch/mips/boot/dts/brcm/bcm7435.dtsi | 139 ++- + arch/mips/boot/dts/brcm/bcm96358nb4ser.dts | 46 + + arch/mips/boot/dts/brcm/bcm96368mvwg.dts | 4 +- + arch/mips/boot/dts/brcm/bcm97125cbmb.dts | 24 + + arch/mips/boot/dts/brcm/bcm97360svmb.dts | 8 + + arch/mips/boot/dts/brcm/bcm97420c.dts | 28 + + arch/mips/boot/dts/brcm/bcm97425svmb.dts | 28 + + arch/mips/boot/dts/brcm/bcm97435svmb.dts | 38 +- + .../boot/dts/cavium-octeon/dlink_dsr-1000n.dts | 78 ++ + arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts | 205 +---- + arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dtsi | 231 +++++ + arch/mips/boot/dts/cavium-octeon/ubnt_e100.dts | 59 ++ + arch/mips/boot/dts/lantiq/easy50712.dts | 2 +- + arch/mips/boot/dts/qca/Makefile | 7 +- + arch/mips/boot/dts/qca/ar9132.dtsi | 17 +- + arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 98 +-- + arch/mips/boot/dts/qca/ar9331.dtsi | 155 ++++ + arch/mips/boot/dts/qca/ar9331_dpt_module.dts | 78 ++ + arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts | 102 +++ + arch/mips/boot/dts/qca/ar9331_omega.dts | 78 ++ + arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts | 118 +++ + arch/mips/boot/tools/Makefile | 8 + + arch/mips/boot/tools/relocs.c | 680 +++++++++++++++ + arch/mips/boot/tools/relocs.h | 45 + + arch/mips/boot/tools/relocs_32.c | 17 + + arch/mips/boot/tools/relocs_64.c | 27 + + arch/mips/boot/tools/relocs_main.c | 84 ++ + arch/mips/cavium-octeon/csrc-octeon.c | 13 +- + arch/mips/cavium-octeon/executive/cvmx-helper.c | 43 + + 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 | 155 +++- + arch/mips/configs/bcm47xx_defconfig | 1 - + arch/mips/configs/bcm63xx_defconfig | 1 + + arch/mips/configs/bigsur_defconfig | 1 - + arch/mips/configs/bmips_be_defconfig | 1 + + arch/mips/configs/cavium_octeon_defconfig | 15 +- + arch/mips/configs/decstation_defconfig | 1 - + arch/mips/configs/ip22_defconfig | 1 - + arch/mips/configs/ip27_defconfig | 1 - + arch/mips/configs/jazz_defconfig | 1 - + arch/mips/configs/lemote2f_defconfig | 1 - + .../{ls1b_defconfig => loongson1b_defconfig} | 35 +- + arch/mips/configs/mtx1_defconfig | 1 - + arch/mips/configs/nlm_xlp_defconfig | 1 - + arch/mips/configs/nlm_xlr_defconfig | 1 - + arch/mips/configs/rm200_defconfig | 1 - + arch/mips/include/asm/Kbuild | 1 + + arch/mips/include/asm/asmmacro.h | 195 +++-- + arch/mips/include/asm/bitops.h | 17 +- + arch/mips/include/asm/bmips.h | 1 + + arch/mips/include/asm/bootinfo.h | 18 + + arch/mips/include/asm/cacheflush.h | 7 +- + arch/mips/include/asm/cacheops.h | 6 + + arch/mips/include/asm/clkdev.h | 27 - + arch/mips/include/asm/cpu-features.h | 11 + + arch/mips/include/asm/cpu-info.h | 5 +- + arch/mips/include/asm/cpu-type.h | 5 + + arch/mips/include/asm/cpu.h | 102 ++- + arch/mips/include/asm/elf.h | 19 +- + arch/mips/include/asm/hazards.h | 7 +- + arch/mips/include/asm/highmem.h | 4 +- + arch/mips/include/asm/io.h | 10 +- + arch/mips/include/asm/irq_regs.h | 10 + + arch/mips/include/asm/irqflags.h | 5 + + arch/mips/include/asm/llsc.h | 28 + + .../include/asm/mach-bmips/cpu-feature-overrides.h | 14 + + arch/mips/include/asm/mach-bmips/ioremap.h | 33 + + arch/mips/include/asm/mach-loongson32/cpufreq.h | 1 - + arch/mips/include/asm/mach-loongson32/dma.h | 25 + + arch/mips/include/asm/mach-loongson32/irq.h | 1 - + arch/mips/include/asm/mach-loongson32/loongson1.h | 4 +- + arch/mips/include/asm/mach-loongson32/nand.h | 30 + + arch/mips/include/asm/mach-loongson32/platform.h | 14 +- + arch/mips/include/asm/mach-loongson32/regs-clk.h | 24 +- + arch/mips/include/asm/mach-loongson32/regs-mux.h | 84 +- + arch/mips/include/asm/mach-loongson32/regs-pwm.h | 12 +- + .../asm/mach-loongson64/cpu-feature-overrides.h | 12 +- + .../asm/mach-loongson64/kernel-entry-init.h | 18 +- + arch/mips/include/asm/mips-cm.h | 10 +- + arch/mips/include/asm/mips-cpc.h | 3 + + arch/mips/include/asm/mipsregs.h | 38 + + 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-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 | 27 +- + 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.h | 10 +- + arch/mips/include/asm/pgtable-64.h | 18 +- + arch/mips/include/asm/pgtable-bits.h | 11 +- + arch/mips/include/asm/pgtable.h | 82 +- + arch/mips/include/asm/processor.h | 10 +- + arch/mips/include/asm/seccomp.h | 47 +- + arch/mips/include/asm/sibyte/bcm1480_regs.h | 4 +- + arch/mips/include/asm/signal.h | 12 +- + arch/mips/include/asm/smp-cps.h | 2 +- + arch/mips/include/asm/switch_to.h | 2 +- + arch/mips/include/asm/uasm.h | 3 +- + arch/mips/include/asm/watch.h | 10 +- + arch/mips/include/uapi/asm/inst.h | 10 + + arch/mips/include/uapi/asm/siginfo.h | 22 +- + arch/mips/kernel/Makefile | 4 +- + arch/mips/kernel/bmips_5xxx_init.S | 753 ++++++++++++++++ + arch/mips/kernel/bmips_vec.S | 50 +- + arch/mips/kernel/cps-vec.S | 296 ++++--- + arch/mips/kernel/cpu-probe.c | 85 +- + arch/mips/kernel/crash.c | 16 +- + arch/mips/kernel/head.S | 20 + + arch/mips/kernel/idle.c | 5 + + arch/mips/kernel/mips-r2-to-r6-emul.c | 105 +-- + arch/mips/kernel/module-rela.c | 58 +- + arch/mips/kernel/module.c | 60 +- + arch/mips/kernel/perf_event_mipsxx.c | 6 + + arch/mips/kernel/pm-cps.c | 15 +- + arch/mips/kernel/pm.c | 2 +- + arch/mips/kernel/proc.c | 1 + + arch/mips/kernel/process.c | 6 +- + arch/mips/kernel/ptrace.c | 7 +- + arch/mips/kernel/r4k_fpu.S | 10 +- + arch/mips/kernel/relocate.c | 386 +++++++++ + arch/mips/kernel/scall32-o32.S | 11 +- + arch/mips/kernel/scall64-64.S | 3 +- + arch/mips/kernel/scall64-n32.S | 14 +- + arch/mips/kernel/scall64-o32.S | 14 +- + arch/mips/kernel/setup.c | 33 +- + arch/mips/kernel/signal.c | 2 +- + arch/mips/kernel/signal32.c | 6 + + arch/mips/kernel/smp-bmips.c | 88 ++ + arch/mips/kernel/smp-cps.c | 64 +- + arch/mips/kernel/smp.c | 24 +- + arch/mips/kernel/spram.c | 1 + + arch/mips/kernel/traps.c | 24 +- + arch/mips/kernel/vmlinux.lds.S | 21 + + arch/mips/kernel/watch.c | 79 +- + arch/mips/lantiq/Kconfig | 12 +- + arch/mips/lantiq/prom.c | 13 +- + arch/mips/lantiq/xway/reset.c | 2 +- + arch/mips/lib/memset.S | 2 + + arch/mips/loongson32/common/platform.c | 105 ++- + arch/mips/loongson32/common/reset.c | 13 +- + arch/mips/loongson32/common/time.c | 27 +- + arch/mips/loongson32/ls1b/board.c | 67 +- + arch/mips/loongson64/Platform | 2 +- + arch/mips/loongson64/common/env.c | 7 +- + arch/mips/loongson64/loongson-3/Makefile | 2 +- + .../mips/loongson64/loongson-3}/acpi_init.c | 0 + arch/mips/loongson64/loongson-3/irq.c | 10 +- + arch/mips/loongson64/loongson-3/numa.c | 6 +- + arch/mips/loongson64/loongson-3/smp.c | 107 ++- + arch/mips/math-emu/dsemul.c | 2 +- + arch/mips/math-emu/ieee754dp.c | 9 +- + arch/mips/math-emu/ieee754sp.c | 9 +- + arch/mips/mm/c-r4k.c | 72 +- + arch/mips/mm/cache.c | 41 +- + arch/mips/mm/dma-default.c | 7 +- + arch/mips/mm/init.c | 2 +- + arch/mips/mm/page.c | 9 + + arch/mips/mm/sc-mips.c | 1 + + arch/mips/mm/tlb-r4k.c | 27 +- + arch/mips/mm/tlbex.c | 126 ++- + arch/mips/mm/uasm-mips.c | 2 + + arch/mips/mm/uasm.c | 3 + + arch/mips/mti-malta/malta-setup.c | 7 +- + arch/mips/mti-sead3/sead3-setup.c | 5 + + arch/mips/oprofile/common.c | 2 +- + arch/mips/pci/pci-ip32.c | 1 - + arch/mips/pci/pci.c | 3 - + arch/mips/pmcs-msp71xx/msp_setup.c | 2 +- + arch/mips/pnx833x/common/setup.c | 3 - + arch/mips/ralink/reset.c | 2 +- + arch/mips/sibyte/Kconfig | 3 +- + arch/mips/vr41xx/common/pmu.c | 2 +- + drivers/bus/brcmstb_gisb.c | 30 + + drivers/cpufreq/Makefile | 2 +- + .../{ls1x-cpufreq.c => loongson1-cpufreq.c} | 114 +-- + drivers/firmware/broadcom/Kconfig | 11 + + drivers/firmware/broadcom/Makefile | 1 + + .../firmware/broadcom/bcm47xx_sprom.c | 27 +- + drivers/irqchip/irq-mips-gic.c | 22 +- + drivers/platform/mips/Kconfig | 4 - + drivers/platform/mips/Makefile | 1 - + drivers/platform/mips/cpu_hwmon.c | 4 +- + drivers/tty/serial/Kconfig | 21 + + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/pic32_uart.c | 960 +++++++++++++++++++++ + drivers/tty/serial/pic32_uart.h | 126 +++ + drivers/watchdog/Kconfig | 26 + + drivers/watchdog/Makefile | 2 + + drivers/watchdog/pic32-dmt.c | 257 ++++++ + drivers/watchdog/pic32-wdt.c | 263 ++++++ + fs/proc/vmcore.c | 2 +- + include/asm-generic/seccomp.h | 14 + + include/asm-generic/siginfo.h | 15 - + include/dt-bindings/clock/ath79-clk.h | 19 + + include/linux/bcm47xx_sprom.h | 24 + + include/linux/crash_dump.h | 8 +- + include/linux/irqchip/mips-gic.h | 17 + + include/linux/signal.h | 15 + + include/uapi/linux/serial_core.h | 3 + + kernel/seccomp.c | 13 +- + scripts/ld-version.sh | 2 +- + tools/testing/selftests/seccomp/seccomp_bpf.c | 30 +- + 240 files changed, 10304 insertions(+), 1560 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm6345-l1-intc.txt + create mode 100644 Documentation/devicetree/bindings/mips/cavium/ciu3.txt + create mode 100644 Documentation/devicetree/bindings/serial/microchip,pic32-uart.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/microchip,pic32-dmt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/microchip,pic32-wdt.txt + create mode 100644 arch/mips/boot/dts/brcm/bcm6358.dtsi + create mode 100644 arch/mips/boot/dts/brcm/bcm96358nb4ser.dts + create mode 100644 arch/mips/boot/dts/cavium-octeon/dlink_dsr-1000n.dts + create mode 100644 arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dtsi + create mode 100644 arch/mips/boot/dts/cavium-octeon/ubnt_e100.dts + create mode 100644 arch/mips/boot/dts/qca/ar9331.dtsi + create mode 100644 arch/mips/boot/dts/qca/ar9331_dpt_module.dts + create mode 100644 arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts + create mode 100644 arch/mips/boot/dts/qca/ar9331_omega.dts + create mode 100644 arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts + create mode 100644 arch/mips/boot/tools/Makefile + create mode 100644 arch/mips/boot/tools/relocs.c + create mode 100644 arch/mips/boot/tools/relocs.h + create mode 100644 arch/mips/boot/tools/relocs_32.c + create mode 100644 arch/mips/boot/tools/relocs_64.c + create mode 100644 arch/mips/boot/tools/relocs_main.c + rename arch/mips/configs/{ls1b_defconfig => loongson1b_defconfig} (84%) + delete mode 100644 arch/mips/include/asm/clkdev.h + create mode 100644 arch/mips/include/asm/llsc.h + create mode 100644 arch/mips/include/asm/mach-bmips/cpu-feature-overrides.h + create mode 100644 arch/mips/include/asm/mach-bmips/ioremap.h + create mode 100644 arch/mips/include/asm/mach-loongson32/dma.h + create mode 100644 arch/mips/include/asm/mach-loongson32/nand.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-ciu3-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-coremask.h + create mode 100644 arch/mips/kernel/bmips_5xxx_init.S + create mode 100644 arch/mips/kernel/relocate.c + rename {drivers/platform/mips => arch/mips/loongson64/loongson-3}/acpi_init.c (100%) + rename drivers/cpufreq/{ls1x-cpufreq.c => loongson1-cpufreq.c} (65%) + rename arch/mips/bcm47xx/sprom.c => drivers/firmware/broadcom/bcm47xx_sprom.c (98%) + create mode 100644 drivers/tty/serial/pic32_uart.c + create mode 100644 drivers/tty/serial/pic32_uart.h + create mode 100644 drivers/watchdog/pic32-dmt.c + create mode 100644 drivers/watchdog/pic32-wdt.c + create mode 100644 include/dt-bindings/clock/ath79-clk.h + create mode 100644 include/linux/bcm47xx_sprom.h +Merging nios2/for-next (8fe889274c7a nios2: Replace fdt_translate_address with of_flat_dt_translate_address) +$ git merge nios2/for-next +Already up-to-date. +Merging parisc-hd/for-next (1ef27c516c24 parisc: Add ARCH_TRACEHOOK and regset support) +$ git merge parisc-hd/for-next +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Merge made by the 'recursive' strategy. + arch/parisc/Kconfig | 2 + + arch/parisc/include/asm/ftrace.h | 2 + + arch/parisc/include/asm/syscall.h | 9 + + arch/parisc/include/asm/thread_info.h | 4 +- + arch/parisc/include/asm/uaccess.h | 91 +++---- + arch/parisc/include/uapi/asm/ptrace.h | 48 ++++ + arch/parisc/kernel/ptrace.c | 368 +++++++++++++++++++++++++- + arch/parisc/kernel/syscall.S | 1 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 8 +- + 9 files changed, 472 insertions(+), 61 deletions(-) +Merging powerpc/next (1050e689a63b cxl: Delete an unnecessary check before the function call "kfree") +$ git merge powerpc/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/powerpc/eeh-pci-error-recovery.txt | 2 +- + MAINTAINERS | 13 ++ + arch/powerpc/Kconfig | 4 +- + arch/powerpc/include/asm/opal-api.h | 16 +- + arch/powerpc/include/asm/ppc_asm.h | 3 + + arch/powerpc/include/asm/reg.h | 1 + + arch/powerpc/kernel/eeh.c | 2 +- + arch/powerpc/kernel/eeh_event.c | 2 +- + arch/powerpc/kernel/exceptions-64s.S | 102 ---------- + arch/powerpc/kernel/ibmebus.c | 2 +- + arch/powerpc/kernel/mce.c | 2 +- + arch/powerpc/kernel/misc_32.S | 6 - + arch/powerpc/kernel/nvram_64.c | 12 +- + arch/powerpc/kernel/process.c | 2 + + arch/powerpc/kernel/prom.c | 1 + + arch/powerpc/kernel/rtasd.c | 2 +- + arch/powerpc/kernel/time.c | 1 + + arch/powerpc/kernel/vio.c | 4 +- + arch/powerpc/lib/copy_32.S | 2 +- + arch/powerpc/mm/mmap.c | 1 + + arch/powerpc/mm/slb.c | 1 - + arch/powerpc/mm/slb_low.S | 50 ----- + arch/powerpc/platforms/cell/spu_base.c | 7 +- + arch/powerpc/platforms/powernv/opal-hmi.c | 8 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 225 ++++++++++++++++++----- + drivers/cpufreq/ppc_cbe_cpufreq_pmi.c | 15 +- + drivers/macintosh/rack-meter.c | 5 +- + drivers/misc/cxl/api.c | 9 - + drivers/misc/cxl/context.c | 3 +- + drivers/misc/cxl/pci.c | 41 ++++- + 30 files changed, 276 insertions(+), 268 deletions(-) +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 (c7d4d259b747 s390/crypto: cleanup and move the header with the cpacf definitions) +$ git merge s390/features +Removing arch/s390/crypto/crypt_s390.h +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 10 + + arch/s390/crypto/aes_s390.c | 117 +++--- + arch/s390/crypto/crypt_s390.h | 493 ------------------------- + arch/s390/crypto/des_s390.c | 72 ++-- + arch/s390/crypto/ghash_s390.c | 16 +- + arch/s390/crypto/prng.c | 60 ++-- + arch/s390/crypto/sha1_s390.c | 10 +- + arch/s390/crypto/sha256_s390.c | 14 +- + arch/s390/crypto/sha512_s390.c | 14 +- + arch/s390/crypto/sha_common.c | 10 +- + arch/s390/include/asm/cpacf.h | 410 +++++++++++++++++++++ + arch/s390/include/asm/pci.h | 35 +- + arch/s390/include/asm/sclp.h | 13 + + arch/s390/include/uapi/asm/dasd.h | 32 ++ + arch/s390/mm/fault.c | 41 ++- + arch/s390/pci/pci_debug.c | 61 +++- + arch/s390/pci/pci_sysfs.c | 23 ++ + drivers/s390/block/dasd.c | 92 ++++- + drivers/s390/block/dasd_3990_erp.c | 20 +- + drivers/s390/block/dasd_devmap.c | 27 ++ + drivers/s390/block/dasd_eckd.c | 699 +++++++++++++++++++++++++++++++++++- + drivers/s390/block/dasd_eckd.h | 34 +- + drivers/s390/block/dasd_int.h | 17 +- + drivers/s390/block/dasd_ioctl.c | 61 ++++ + drivers/s390/char/Makefile | 2 + + drivers/s390/char/sclp.h | 38 +- + drivers/s390/char/sclp_cmd.c | 61 ---- + drivers/s390/char/sclp_cpi_sys.c | 2 +- + drivers/s390/char/sclp_pci.c | 192 ++++++++++ + 29 files changed, 1883 insertions(+), 793 deletions(-) + delete mode 100644 arch/s390/crypto/crypt_s390.h + create mode 100644 arch/s390/include/asm/cpacf.h + create mode 100644 drivers/s390/char/sclp_pci.c +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 (eca999f1db56 Merge branch 'for-next-4.6-20160411' into for-next-20160411) +$ git merge btrfs-kdave/for-next +Resolved 'fs/btrfs/extent_io.c' using previous resolution. +Resolved 'fs/btrfs/file.c' using previous resolution. +Resolved 'fs/btrfs/volumes.c' using previous resolution. +Auto-merging include/trace/events/btrfs.h +Auto-merging fs/btrfs/volumes.c +CONFLICT (content): Merge conflict in fs/btrfs/volumes.c +Auto-merging fs/btrfs/send.c +Auto-merging fs/btrfs/scrub.c +Auto-merging fs/btrfs/relocation.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +CONFLICT (content): Merge conflict in fs/btrfs/file.c +Auto-merging fs/btrfs/extent_io.c +CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c +Auto-merging fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/disk-io.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7c287742f6fe] Merge remote-tracking branch 'btrfs-kdave/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/ctree.c | 6 +- + fs/btrfs/ctree.h | 97 +++--- + fs/btrfs/delayed-inode.c | 68 ++--- + fs/btrfs/dev-replace.c | 28 +- + fs/btrfs/disk-io.c | 8 +- + fs/btrfs/extent-tree.c | 700 ++++++++++++++++++++++++++++--------------- + fs/btrfs/extent_io.c | 39 ++- + fs/btrfs/file.c | 54 ++-- + fs/btrfs/inode-item.c | 2 +- + fs/btrfs/inode.c | 273 ++++++++++++++++- + fs/btrfs/ioctl.c | 149 +++++++-- + fs/btrfs/relocation.c | 4 +- + fs/btrfs/root-tree.c | 4 +- + fs/btrfs/scrub.c | 19 +- + fs/btrfs/send.c | 56 ++-- + fs/btrfs/super.c | 58 ++-- + fs/btrfs/transaction.c | 2 +- + fs/btrfs/tree-log.c | 21 +- + fs/btrfs/volumes.c | 350 +++++++++++----------- + fs/btrfs/volumes.h | 7 +- + include/trace/events/btrfs.h | 139 ++++++++- + include/uapi/linux/btrfs.h | 15 +- + 22 files changed, 1398 insertions(+), 701 deletions(-) +Merging ceph/master (2224d879c7c0 rbd: use GFP_NOIO consistently for request allocations) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (90de6800c240 Merge tag 'sh-fixes-4.6-rc1' of git://git.libc.org/linux-sh) +$ git merge cifs/for-next +Already up-to-date. +Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging ext3/for_next (8f9e8f5fcc05 ocfs2: Fix Q_GETNEXTQUOTA for filesystem without quotas) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (86cf0011caf3 ext4: allow readdir()'s of large empty directories to be interrupted) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. + fs/compat.c | 4 ++++ + fs/ext4/dir.c | 5 +++++ + fs/ext4/namei.c | 5 +++++ + fs/readdir.c | 2 ++ + 4 files changed, 16 insertions(+) +Merging f2fs/dev (4da7bf5a4345 f2fs: remove redundant condition check) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/checkpoint.c | 2 +- + fs/f2fs/data.c | 2 +- + fs/f2fs/debug.c | 5 +-- + fs/f2fs/dir.c | 87 ++++++++++++++++++++++++--------------------- + fs/f2fs/f2fs.h | 7 ++-- + fs/f2fs/file.c | 13 +++++-- + fs/f2fs/inline.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++- + fs/f2fs/node.c | 16 +++------ + fs/f2fs/recovery.c | 11 +++--- + fs/f2fs/segment.c | 2 ++ + fs/f2fs/super.c | 67 ++++++++++++++++++++++++++--------- + include/linux/f2fs_fs.h | 2 ++ + 12 files changed, 224 insertions(+), 84 deletions(-) +Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) +$ git merge fscache/fscache +Merge made by the 'recursive' strategy. +Merging fuse/for-next (742f992708df fuse: return patrial success from fuse_direct_io()) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/for-next (e97321fa095f GFS2: Don't dereference inode in gfs2_inode_lookup until it's valid) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/file.c +Merge made by the 'recursive' strategy. + fs/gfs2/file.c | 28 ++++++++++++++++++++++++++-- + fs/gfs2/glock.c | 11 +++++++++-- + fs/gfs2/glops.c | 7 ------- + fs/gfs2/inode.c | 6 +++--- + fs/gfs2/util.c | 1 + + 5 files changed, 39 insertions(+), 14 deletions(-) +Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats) +$ git merge jfs/jfs-next +Auto-merging fs/jfs/super.c +Merge made by the 'recursive' strategy. + fs/jfs/inode.c | 4 ++-- + fs/jfs/jfs_discard.c | 6 ++---- + fs/jfs/jfs_dtree.c | 10 ++++------ + fs/jfs/jfs_imap.c | 3 +-- + fs/jfs/jfs_inode.c | 2 +- + fs/jfs/jfs_logmgr.c | 14 ++++++-------- + fs/jfs/jfs_txnmgr.c | 21 +++++++++------------ + fs/jfs/namei.c | 4 ++-- + fs/jfs/super.c | 4 ++-- + 9 files changed, 29 insertions(+), 39 deletions(-) +Merging nfs/linux-next (c3b46c73264b Linux 4.6-rc4) +$ 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 (e56f49814250 orangefs: remove unused variable) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (e3608e3f68f6 Btrfs: fix crash/invalid memory access on fsync when using overlayfs) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/overlayfs/super.c +Auto-merging fs/namei.c +Merge made by the 'recursive' strategy. + fs/namei.c | 48 ++++++++++++++++++++++++++++++++++++++---------- + fs/overlayfs/super.c | 2 +- + include/linux/namei.h | 2 ++ + 3 files changed, 41 insertions(+), 11 deletions(-) +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (d8bdd04e309b Merge branch 'xfs-4.7-misc-fixes' into for-next) +$ git merge xfs/for-next +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_pnfs.c +Auto-merging fs/xfs/xfs_mount.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_bmap_util.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/xfs/libxfs/xfs_bmap.c +Auto-merging fs/namei.c +Merge made by the 'recursive' strategy. + fs/namei.c | 1 - + fs/xfs/kmem.c | 26 +-- + fs/xfs/kmem.h | 2 +- + fs/xfs/libxfs/xfs_attr.c | 58 ++----- + fs/xfs/libxfs/xfs_bmap.c | 22 ++- + fs/xfs/libxfs/xfs_dir2_sf.c | 9 +- + fs/xfs/libxfs/xfs_inode_fork.c | 72 ++++++--- + fs/xfs/libxfs/xfs_inode_fork.h | 1 + + fs/xfs/libxfs/xfs_log_format.h | 5 + + fs/xfs/libxfs/xfs_sb.c | 8 +- + fs/xfs/libxfs/xfs_shared.h | 102 +----------- + fs/xfs/xfs_aops.c | 354 ++++++++++++++++++++--------------------- + fs/xfs/xfs_aops.h | 15 +- + fs/xfs/xfs_attr.h | 4 +- + fs/xfs/xfs_attr_inactive.c | 16 +- + fs/xfs/xfs_attr_list.c | 85 +++------- + fs/xfs/xfs_bmap_util.c | 45 ++---- + fs/xfs/xfs_dquot.c | 9 +- + fs/xfs/xfs_file.c | 8 +- + fs/xfs/xfs_fsops.c | 14 +- + fs/xfs/xfs_inode.c | 63 +++----- + fs/xfs/xfs_inode.h | 5 +- + fs/xfs/xfs_inode_item.c | 6 +- + fs/xfs/xfs_ioctl.c | 31 +--- + fs/xfs/xfs_iomap.c | 53 ++---- + fs/xfs/xfs_iops.c | 117 +++++++++----- + fs/xfs/xfs_log.c | 62 +------- + fs/xfs/xfs_log.h | 3 +- + fs/xfs/xfs_log_cil.c | 1 - + fs/xfs/xfs_log_priv.h | 1 - + fs/xfs/xfs_log_recover.c | 12 +- + fs/xfs/xfs_mount.c | 1 - + fs/xfs/xfs_pnfs.c | 7 +- + fs/xfs/xfs_qm.c | 9 +- + fs/xfs/xfs_qm_syscalls.c | 26 +-- + fs/xfs/xfs_rtalloc.c | 21 ++- + fs/xfs/xfs_super.c | 37 ++--- + fs/xfs/xfs_symlink.c | 37 ++--- + fs/xfs/xfs_trace.h | 15 +- + fs/xfs/xfs_trans.c | 88 +++++----- + fs/xfs/xfs_trans.h | 8 +- + fs/xfs/xfs_xattr.c | 17 +- + 42 files changed, 594 insertions(+), 882 deletions(-) +Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew)) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (489eda8cd1a6 Merge branches 'work.acl', 'work.const-path' and 'work.misc' into for-next) +$ git merge vfs/for-next +Auto-merging include/linux/fs.h +Auto-merging fs/namei.c +Auto-merging fs/ecryptfs/inode.c +Auto-merging fs/dcache.c +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/build.c | 13 ++--- + drivers/mtd/ubi/kapi.c | 19 +++---- + fs/9p/acl.c | 2 +- + fs/btrfs/acl.c | 3 -- + fs/ceph/acl.c | 2 + + fs/dcache.c | 13 ++--- + fs/ecryptfs/inode.c | 85 +++++++++++++------------------ + fs/ext2/acl.c | 3 -- + fs/ext4/acl.c | 3 -- + fs/f2fs/acl.c | 3 -- + fs/hfsplus/posix_acl.c | 3 -- + fs/inode.c | 4 +- + fs/jffs2/acl.c | 2 - + fs/jfs/acl.c | 6 --- + fs/namei.c | 4 +- + fs/nfs/nfs3acl.c | 43 +++++++++++++++- + fs/ocfs2/dlmglue.c | 3 ++ + fs/open.c | 6 +-- + fs/posix_acl.c | 106 ++++++++++++++++++++++++++------------- + fs/reiserfs/xattr_acl.c | 8 +-- + fs/xfs/xfs_acl.c | 20 +++----- + include/linux/fs.h | 14 +++++- + include/linux/lsm_hooks.h | 28 +++++------ + include/linux/posix_acl.h | 1 - + include/linux/security.h | 58 ++++++++++----------- + kernel/bpf/inode.c | 37 +++----------- + net/unix/af_unix.c | 2 +- + security/apparmor/file.c | 4 +- + security/apparmor/include/file.h | 4 +- + security/apparmor/include/path.h | 2 +- + security/apparmor/lsm.c | 83 +++++++++++------------------- + security/apparmor/path.c | 8 +-- + security/integrity/ima/ima.h | 2 +- + security/integrity/ima/ima_api.c | 2 +- + security/security.c | 28 +++++------ + security/selinux/hooks.c | 2 +- + security/tomoyo/common.h | 12 ++--- + security/tomoyo/file.c | 10 ++-- + security/tomoyo/mount.c | 4 +- + security/tomoyo/tomoyo.c | 28 +++++------ + 40 files changed, 335 insertions(+), 345 deletions(-) +Merging pci/next (9735a22799b9 Linux 4.6-rc2) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (1cdd4e9759b4 Merge branch 'for-4.7/thingm' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 10 ++++++++++ + drivers/hid/Makefile | 1 + + drivers/hid/hid-asus.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-core.c | 34 +++++++++++++++---------------- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-roccat.c | 5 ++--- + drivers/hid/hid-thingm.c | 44 +++++++++++++++------------------------- + drivers/hid/hidraw.c | 18 ++++++----------- + drivers/hid/wacom_wac.c | 5 +++++ + 9 files changed, 109 insertions(+), 61 deletions(-) + create mode 100644 drivers/hid/hid-asus.c +Merging i2c/i2c/for-next (cd5d37e83267 Merge branch 'i2c/for-4.7' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i2c/i2c-rk3x.txt | 4 +- + drivers/i2c/busses/Kconfig | 4 +- + drivers/i2c/busses/i2c-bcm-iproc.c | 2 +- + drivers/i2c/busses/i2c-bcm-kona.c | 5 +- + drivers/i2c/busses/i2c-brcmstb.c | 4 +- + drivers/i2c/busses/i2c-cpm.c | 4 +- + drivers/i2c/busses/i2c-i801.c | 52 +++--- + drivers/i2c/busses/i2c-ibm_iic.c | 2 +- + drivers/i2c/busses/i2c-img-scb.c | 4 +- + drivers/i2c/busses/i2c-iop3xx.c | 5 +- + drivers/i2c/busses/i2c-ismt.c | 2 + + drivers/i2c/busses/i2c-lpc2k.c | 4 +- + drivers/i2c/busses/i2c-mt65xx.c | 5 +- + drivers/i2c/busses/i2c-ocores.c | 5 +- + drivers/i2c/busses/i2c-octeon.c | 190 +++++++++++---------- + drivers/i2c/busses/i2c-powermac.c | 4 +- + drivers/i2c/busses/i2c-qup.c | 2 +- + drivers/i2c/busses/i2c-rk3x.c | 88 +++------- + drivers/i2c/busses/i2c-sh_mobile.c | 3 +- + drivers/i2c/busses/i2c-sirf.c | 4 +- + drivers/i2c/busses/i2c-st.c | 3 +- + drivers/i2c/busses/i2c-tegra.c | 74 +++++++- + drivers/i2c/i2c-core.c | 3 +- + drivers/misc/eeprom/at24.c | 9 +- + include/linux/i2c.h | 5 + + include/uapi/linux/i2c.h | 13 +- + 26 files changed, 261 insertions(+), 239 deletions(-) +Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440) +$ git merge jdelvare-hwmon/master +Auto-merging Documentation/hwmon/max34440 +Merge made by the 'recursive' strategy. + Documentation/hwmon/max34440 | 6 +++--- + drivers/hwmon/emc2103.c | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (5b3af0edd8db hwmon: (it87) Add support for IT8628E) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/ltc2978.txt | 1 + + Documentation/hwmon/fam15h_power | 65 +- + Documentation/hwmon/it87 | 15 +- + Documentation/hwmon/max31722 | 34 + + drivers/hwmon/Kconfig | 15 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/fam15h_power.c | 215 +- + drivers/hwmon/it87.c | 2281 +++++++++++--------- + drivers/hwmon/max31722.c | 165 ++ + 9 files changed, 1783 insertions(+), 1009 deletions(-) + create mode 100644 Documentation/hwmon/max31722 + create mode 100644 drivers/hwmon/max31722.c +Merging v4l-dvb/master (405ddbfa6817 [media] Revert "[media] media: au0828 change to use Managed Media Controller API") +$ git merge v4l-dvb/master +Already up-to-date. +Merging libata/for-next (c5cf484d03f1 Merge branch 'for-4.6-fixes' into for-next) +$ git merge libata/for-next +Auto-merging arch/arm/boot/dts/qcom-apq8064.dtsi +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/ahci-platform.txt | 4 + + arch/arm/boot/dts/qcom-apq8064.dtsi | 3 +- + drivers/ata/Kconfig | 8 + + drivers/ata/Makefile | 1 + + drivers/ata/ahci_platform.c | 3 + + drivers/ata/ahci_seattle.c | 210 ++++++++++ + drivers/ata/libahci.c | 5 +- + drivers/ata/libata-core.c | 46 +- + drivers/ata/libata-eh.c | 111 ++++- + drivers/ata/libata-scsi.c | 461 +++++++++++++++------ + drivers/ata/libata.h | 8 +- + drivers/scsi/scsi_common.c | 53 +++ + drivers/scsi/scsi_error.c | 3 +- + include/linux/ata.h | 21 +- + include/linux/libata.h | 1 + + include/scsi/scsi_common.h | 1 + + include/scsi/scsi_eh.h | 1 + + 17 files changed, 782 insertions(+), 158 deletions(-) + create mode 100644 drivers/ata/ahci_seattle.c +Merging pm/linux-next (f10503242155 Merge branch 'acpi-tables' into linux-next) +$ git merge pm/linux-next +Removing include/acpi/platform/acwinex.h +Removing include/acpi/platform/acmsvcex.h +Auto-merging drivers/cpufreq/Makefile +Auto-merging arch/arm/mach-exynos/exynos.c +Merge made by the 'recursive' strategy. + Documentation/acpi/initrd_table_override.txt | 65 ++- + arch/arm/mach-exynos/exynos.c | 29 -- + arch/arm/mach-pxa/raumfeld.c | 12 +- + arch/arm/mach-tegra/board-paz00.c | 6 +- + arch/x86/kernel/setup.c | 12 +- + arch/x86/platform/efi/quirks.c | 2 +- + drivers/acpi/Kconfig | 8 +- + drivers/acpi/Makefile | 1 + + drivers/acpi/acpica/Makefile | 1 + + drivers/acpi/acpica/acdebug.h | 4 +- + drivers/acpi/acpica/acevents.h | 2 - + drivers/acpi/acpica/acglobal.h | 11 + + drivers/acpi/acpica/acinterp.h | 2 +- + drivers/acpi/acpica/aclocal.h | 1 + + drivers/acpi/acpica/acmacros.h | 8 +- + drivers/acpi/acpica/acnamesp.h | 5 +- + drivers/acpi/acpica/acparser.h | 2 +- + drivers/acpi/acpica/acpredef.h | 9 + + drivers/acpi/acpica/acresrc.h | 4 +- + drivers/acpi/acpica/acstruct.h | 2 +- + drivers/acpi/acpica/acutils.h | 23 +- + drivers/acpi/acpica/dbconvert.c | 4 +- + drivers/acpi/acpica/dbinput.c | 13 +- + drivers/acpi/acpica/dbutils.c | 9 +- + drivers/acpi/acpica/evregion.c | 74 +-- + drivers/acpi/acpica/evrgnini.c | 1 - + drivers/acpi/acpica/exconcat.c | 439 +++++++++++++++++ + drivers/acpi/acpica/exconfig.c | 4 +- + drivers/acpi/acpica/exconvrt.c | 4 +- + drivers/acpi/acpica/exdump.c | 15 +- + drivers/acpi/acpica/exmisc.c | 290 ----------- + drivers/acpi/acpica/exutils.c | 12 +- + drivers/acpi/acpica/hwregs.c | 25 +- + drivers/acpi/acpica/hwxface.c | 4 +- + drivers/acpi/acpica/nsaccess.c | 7 +- + drivers/acpi/acpica/nsconvert.c | 3 +- + drivers/acpi/acpica/nsdump.c | 9 +- + drivers/acpi/acpica/nsinit.c | 76 ++- + drivers/acpi/acpica/nsload.c | 2 +- + drivers/acpi/acpica/nsprepkg.c | 6 + + drivers/acpi/acpica/psopinfo.c | 2 +- + drivers/acpi/acpica/rsdump.c | 50 +- + drivers/acpi/acpica/rsutils.c | 2 +- + drivers/acpi/acpica/tbfadt.c | 26 +- + drivers/acpi/acpica/tbxfload.c | 2 +- + drivers/acpi/acpica/utdebug.c | 47 +- + drivers/acpi/acpica/utdecode.c | 30 +- + drivers/acpi/acpica/uteval.c | 4 +- + drivers/acpi/acpica/utglobal.c | 48 ++ + drivers/acpi/acpica/utmisc.c | 2 +- + drivers/acpi/acpica/utnonansi.c | 67 +-- + drivers/acpi/acpica/utprint.c | 5 - + drivers/acpi/acpica/uttrack.c | 2 +- + drivers/acpi/bus.c | 39 +- + drivers/acpi/ec.c | 241 +++++----- + drivers/acpi/evged.c | 156 ++++++ + drivers/acpi/internal.h | 1 - + drivers/acpi/osl.c | 276 +---------- + drivers/acpi/sleep.c | 7 + + drivers/acpi/tables.c | 312 +++++++++++- + drivers/acpi/utils.c | 6 +- + drivers/base/platform.c | 19 +- + drivers/base/property.c | 34 +- + drivers/cpufreq/Kconfig | 44 ++ + drivers/cpufreq/Makefile | 2 + + drivers/cpufreq/acpi-cpufreq.c | 129 +++-- + drivers/cpufreq/cpufreq-dt-platdev.c | 41 ++ + drivers/cpufreq/cpufreq-nforce2.c | 28 +- + drivers/cpufreq/cpufreq.c | 167 ++++++- + drivers/cpufreq/cpufreq_conservative.c | 25 +- + drivers/cpufreq/cpufreq_governor.c | 162 ++----- + drivers/cpufreq/cpufreq_governor.h | 44 +- + drivers/cpufreq/cpufreq_governor_attr_set.c | 84 ++++ + drivers/cpufreq/cpufreq_ondemand.c | 29 +- + drivers/cpufreq/e_powersaver.c | 62 ++- + drivers/cpufreq/elanfreq.c | 4 +- + drivers/cpufreq/ia64-acpi-cpufreq.c | 10 +- + drivers/cpufreq/intel_pstate.c | 60 +-- + drivers/cpufreq/longhaul.c | 84 ++-- + drivers/cpufreq/loongson2_cpufreq.c | 7 +- + drivers/cpufreq/maple-cpufreq.c | 11 +- + drivers/cpufreq/mt8173-cpufreq.c | 14 +- + drivers/cpufreq/omap-cpufreq.c | 7 +- + drivers/cpufreq/p4-clockmod.c | 19 +- + drivers/cpufreq/pmac32-cpufreq.c | 14 +- + drivers/cpufreq/pmac64-cpufreq.c | 47 +- + drivers/cpufreq/powernow-k6.c | 16 +- + drivers/cpufreq/powernow-k7.c | 70 ++- + drivers/cpufreq/pxa2xx-cpufreq.c | 18 +- + drivers/cpufreq/s3c2412-cpufreq.c | 15 +- + drivers/cpufreq/s3c2440-cpufreq.c | 6 +- + drivers/cpufreq/s3c24xx-cpufreq-debugfs.c | 4 +- + drivers/cpufreq/s3c24xx-cpufreq.c | 59 +-- + drivers/cpufreq/s5pv210-cpufreq.c | 10 +- + drivers/cpufreq/sc520_freq.c | 10 +- + drivers/cpufreq/speedstep-centrino.c | 6 +- + drivers/cpufreq/speedstep-ich.c | 8 +- + drivers/cpufreq/speedstep-lib.c | 11 +- + drivers/cpufreq/speedstep-smi.c | 7 +- + drivers/cpufreq/tegra124-cpufreq.c | 7 - + drivers/cpuidle/cpuidle.c | 2 + + drivers/idle/intel_idle.c | 137 ++++++ + drivers/mfd/intel-lpss-acpi.c | 12 +- + drivers/mfd/intel-lpss-pci.c | 20 +- + drivers/mfd/intel-lpss.c | 2 +- + drivers/mfd/intel-lpss.h | 4 +- + drivers/mfd/mfd-core.c | 4 +- + drivers/platform/x86/acer-wmi.c | 16 +- + drivers/platform/x86/eeepc-wmi.c | 24 +- + include/acpi/acpi_bus.h | 2 +- + include/acpi/acpiosxf.h | 2 +- + include/acpi/acpixf.h | 4 +- + include/acpi/actbl.h | 4 +- + include/acpi/actbl1.h | 74 ++- + include/acpi/actbl2.h | 39 +- + include/acpi/actbl3.h | 43 +- + include/acpi/actypes.h | 7 +- + include/acpi/platform/acenv.h | 44 +- + include/acpi/platform/acmsvcex.h | 54 --- + include/acpi/platform/acwinex.h | 49 -- + include/linux/acpi.h | 11 +- + include/linux/apple-gmux.h | 2 +- + include/linux/cpufreq-dt.h | 2 + + include/linux/cpufreq.h | 54 +++ + include/linux/mfd/core.h | 4 +- + include/linux/platform_device.h | 6 +- + include/linux/property.h | 15 +- + include/linux/sched.h | 5 +- + kernel/sched/Makefile | 1 + + kernel/sched/cpufreq.c | 48 +- + kernel/sched/cpufreq_schedutil.c | 530 +++++++++++++++++++++ + kernel/sched/sched.h | 8 + + kernel/trace/power-traces.c | 1 + + sound/pci/hda/thinkpad_helper.c | 2 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- + .../acpi/os_specific/service_layers/osunixmap.c | 2 +- + tools/power/acpi/tools/acpidbg/acpidbg.c | 4 +- + tools/power/acpi/tools/acpidump/apdump.c | 3 +- + tools/power/acpi/tools/acpidump/apmain.c | 3 +- + 140 files changed, 3265 insertions(+), 1908 deletions(-) + create mode 100644 drivers/acpi/acpica/exconcat.c + create mode 100644 drivers/acpi/evged.c + create mode 100644 drivers/cpufreq/cpufreq-dt-platdev.c + create mode 100644 drivers/cpufreq/cpufreq_governor_attr_set.c + delete mode 100644 include/acpi/platform/acmsvcex.h + delete mode 100644 include/acpi/platform/acwinex.h + create mode 100644 kernel/sched/cpufreq_schedutil.c +Merging idle/next (f55532a0c0b8 Linux 4.6-rc1) +$ 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 (c960fe12d002 thermal: hisilicon: fix IRQ imbalance enabling) +$ git merge thermal-soc/next +Removing drivers/thermal/tegra_soctherm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/rcar-thermal.txt | 1 - + .../devicetree/bindings/thermal/tegra-soctherm.txt | 12 + + Documentation/thermal/sysfs-api.txt | 44 +- + MAINTAINERS | 1 + + drivers/hwmon/lm75.c | 10 +- + drivers/hwmon/ntc_thermistor.c | 12 +- + drivers/hwmon/scpi-hwmon.c | 48 +- + drivers/hwmon/tmp102.c | 8 +- + drivers/input/touchscreen/sun4i-ts.c | 9 +- + drivers/thermal/Kconfig | 12 +- + drivers/thermal/Makefile | 2 +- + drivers/thermal/hisi_thermal.c | 45 +- + drivers/thermal/mtk_thermal.c | 12 +- + drivers/thermal/of-thermal.c | 10 +- + drivers/thermal/qcom-spmi-temp-alarm.c | 3 +- + drivers/thermal/rcar_thermal.c | 2 +- + drivers/thermal/rockchip_thermal.c | 17 +- + drivers/thermal/tegra/Kconfig | 13 + + drivers/thermal/tegra/Makefile | 5 + + drivers/thermal/tegra/soctherm-fuse.c | 169 +++++ + drivers/thermal/tegra/soctherm.c | 682 +++++++++++++++++++++ + drivers/thermal/tegra/soctherm.h | 123 ++++ + drivers/thermal/tegra/tegra124-soctherm.c | 196 ++++++ + drivers/thermal/tegra/tegra210-soctherm.c | 197 ++++++ + drivers/thermal/tegra_soctherm.c | 476 -------------- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 5 +- + include/dt-bindings/thermal/tegra124-soctherm.h | 1 + + include/linux/thermal.h | 1 + + 28 files changed, 1488 insertions(+), 628 deletions(-) + create mode 100644 drivers/thermal/tegra/Kconfig + create mode 100644 drivers/thermal/tegra/Makefile + create mode 100644 drivers/thermal/tegra/soctherm-fuse.c + create mode 100644 drivers/thermal/tegra/soctherm.c + create mode 100644 drivers/thermal/tegra/soctherm.h + create mode 100644 drivers/thermal/tegra/tegra124-soctherm.c + create mode 100644 drivers/thermal/tegra/tegra210-soctherm.c + delete mode 100644 drivers/thermal/tegra_soctherm.c +Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster()) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (9bcc2ce189ca Merge branches 'topic/bcm', 'topic/dw', 'topic/hsu', 'topic/mpc512x', 'topic/pl08x' and 'topic/xilinx' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dma/snps-dma.txt | 4 +- + .../devicetree/bindings/dma/xilinx/xilinx_vdma.txt | 4 + + arch/avr32/mach-at32ap/at32ap700x.c | 16 +- + drivers/ata/sata_dwc_460ex.c | 4 +- + drivers/dma/Kconfig | 2 +- + drivers/dma/amba-pl08x.c | 86 ++-- + drivers/dma/bcm2835-dma.c | 529 ++++++++++++++++----- + drivers/dma/dmaengine.c | 31 +- + drivers/dma/dw/core.c | 264 +++++----- + drivers/dma/dw/platform.c | 12 +- + drivers/dma/dw/regs.h | 50 +- + drivers/dma/hsu/hsu.c | 8 +- + drivers/dma/hsu/hsu.h | 4 + + drivers/dma/mpc512x_dma.c | 174 ++++--- + drivers/dma/xilinx/xilinx_vdma.c | 103 +++- + drivers/spi/spi-pxa2xx-pci.c | 8 +- + drivers/tty/serial/8250/8250_pci.c | 8 +- + include/linux/amba/pl08x.h | 2 +- + include/linux/dmaengine.h | 20 +- + include/linux/platform_data/dma-dw.h | 8 +- + 20 files changed, 926 insertions(+), 411 deletions(-) +Merging net-next/master (266a0a790fb5 bpf: avoid warning for wrong pointer cast) +$ git merge net-next/master +Resolved 'drivers/net/dsa/mv88e6xxx.c' using previous resolution. +Resolved 'net/ipv4/udp.c' using previous resolution. +Auto-merging net/wireless/nl80211.c +Auto-merging net/sctp/sm_sideeffect.c +Auto-merging net/packet/af_packet.c +Auto-merging net/netlink/af_netlink.c +Auto-merging net/ipv6/udp.c +Auto-merging net/ipv6/datagram.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/ipv4/udp.c +CONFLICT (content): Merge conflict in net/ipv4/udp.c +Auto-merging net/core/skbuff.c +Auto-merging kernel/bpf/verifier.c +Auto-merging include/net/sock.h +Auto-merging include/net/sctp/structs.h +Auto-merging include/net/route.h +Auto-merging include/net/ipv6.h +Auto-merging fs/gfs2/glock.c +Auto-merging drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/ops.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Removing drivers/net/wireless/intel/iwlwifi/mvm/coex_legacy.c +Auto-merging drivers/net/wireless/broadcom/b43/main.c +Removing drivers/net/irda/sh_irda.c +Auto-merging drivers/net/ethernet/ti/cpsw.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c +Auto-merging drivers/net/ethernet/renesas/ravb_main.c +Auto-merging drivers/net/ethernet/intel/i40evf/i40e_txrx.h +Auto-merging drivers/net/ethernet/intel/i40evf/i40e_txrx.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_txrx.h +Auto-merging drivers/net/ethernet/intel/i40e/i40e_txrx.c +Auto-merging drivers/net/ethernet/intel/fm10k/fm10k_pf.c +Auto-merging drivers/net/ethernet/broadcom/genet/bcmgenet.c +Auto-merging drivers/net/dsa/mv88e6xxx.c +CONFLICT (content): Merge conflict in drivers/net/dsa/mv88e6xxx.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b15dd0a554dd] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/80211.tmpl | 1 - + Documentation/devicetree/bindings/net/stmmac.txt | 2 + + .../bindings/net/wireless/qcom,ath10k.txt | 23 +- + Documentation/networking/dsa/bcm_sf2.txt | 2 +- + Documentation/networking/dsa/dsa.txt | 20 +- + Documentation/networking/ip-sysctl.txt | 10 + + Documentation/networking/mac80211-injection.txt | 17 +- + Documentation/networking/segmentation-offloads.txt | 130 ++ + Documentation/networking/stmmac.txt | 44 +- + Documentation/networking/switchdev.txt | 28 +- + Documentation/networking/timestamping.txt | 48 +- + MAINTAINERS | 1 + + drivers/bluetooth/hci_bcm.c | 1 + + drivers/bluetooth/hci_bcsp.c | 57 +- + drivers/bluetooth/hci_ldisc.c | 11 +- + drivers/bluetooth/hci_uart.h | 1 + + drivers/bluetooth/hci_vhci.c | 9 +- + drivers/net/dsa/bcm_sf2.c | 58 +- + drivers/net/dsa/mv88e6060.c | 47 +- + drivers/net/dsa/mv88e6060.h | 11 + + drivers/net/dsa/mv88e6123.c | 68 +- + drivers/net/dsa/mv88e6131.c | 115 +- + drivers/net/dsa/mv88e6171.c | 64 +- + drivers/net/dsa/mv88e6352.c | 82 +- + drivers/net/dsa/mv88e6xxx.c | 585 +++++---- + drivers/net/dsa/mv88e6xxx.h | 141 +-- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 299 ++++- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 18 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 173 ++- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_fw_hdr.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 433 ++++++- + drivers/net/ethernet/broadcom/bnxt/bnxt_nvm_defs.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 44 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h | 3 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 52 +- + drivers/net/ethernet/cadence/macb.c | 152 +-- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 3 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 3 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 1 + + drivers/net/ethernet/freescale/fec_main.c | 16 +- + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 20 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 30 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 75 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 5 + + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 6 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 6 + + drivers/net/ethernet/ibm/ibmvnic.c | 251 +++- + drivers/net/ethernet/ibm/ibmvnic.h | 4 + + drivers/net/ethernet/intel/Kconfig | 80 +- + drivers/net/ethernet/intel/e1000/e1000.h | 2 + + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 4 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 8 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 2 + + drivers/net/ethernet/intel/e1000e/ethtool.c | 4 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 12 +- + drivers/net/ethernet/intel/fm10k/fm10k.h | 14 +- + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 223 ++-- + drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 85 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 6 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 72 +- + drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_ptp.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_tlv.c | 24 +- + drivers/net/ethernet/intel/fm10k/fm10k_type.h | 8 +- + drivers/net/ethernet/intel/i40e/i40e.h | 3 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 33 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_common.c | 16 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 5 +- + drivers/net/ethernet/intel/i40e/i40e_devids.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 20 +- + drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 14 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 47 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 43 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 71 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 45 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 34 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 45 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 95 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 2 + + drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 1 - + drivers/net/ethernet/intel/i40evf/i40e_common.c | 1 + + drivers/net/ethernet/intel/i40evf/i40e_devids.h | 1 + + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 67 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 45 +- + drivers/net/ethernet/intel/i40evf/i40e_type.h | 43 + + drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 45 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 73 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 3 +- + drivers/net/ethernet/intel/igb/igb_main.c | 32 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 17 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 12 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 13 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 91 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 7 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c | 6 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 9 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 359 +++--- + drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c | 42 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_model.h | 8 + + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 6 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 6 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 35 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 119 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 31 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 683 +++++++++- + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 9 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 133 +- + drivers/net/ethernet/jme.c | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 106 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 4 +- + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 8 + + drivers/net/ethernet/mellanox/mlxsw/Makefile | 1 + + drivers/net/ethernet/mellanox/mlxsw/core.c | 736 ++++++++--- + drivers/net/ethernet/mellanox/mlxsw/core.h | 82 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 667 +++++++++- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 392 +++++- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 134 +- + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 1001 +++++++++++---- + drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c | 480 +++++++ + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 45 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 22 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 1101 +++++++++++----- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 10 +- + .../net/ethernet/netronome/nfp/nfp_net_debugfs.c | 24 +- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 30 +- + drivers/net/ethernet/qlogic/Kconfig | 21 + + drivers/net/ethernet/qlogic/qed/qed.h | 50 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 6 +- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 2 + + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 51 +- + .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 127 ++ + drivers/net/ethernet/qlogic/qed/qed_l2.c | 56 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 26 +- + drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 31 + + drivers/net/ethernet/qlogic/qed/qed_sp.h | 7 + + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 255 ++++ + drivers/net/ethernet/qlogic/qede/qede.h | 17 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 237 +++- + drivers/net/ethernet/qlogic/qede/qede_main.c | 281 ++++- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 2 +- + drivers/net/ethernet/renesas/ravb.h | 206 ++- + drivers/net/ethernet/renesas/ravb_main.c | 272 +++- + drivers/net/ethernet/renesas/ravb_ptp.c | 26 +- + drivers/net/ethernet/stmicro/stmmac/Makefile | 3 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 64 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 6 - + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 7 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 35 +- + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 255 ++++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 407 ++++++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 389 ++++++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h | 129 ++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 354 ++++++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 202 +++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 225 ++++ + drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 21 + + drivers/net/ethernet/stmicro/stmmac/mmc.h | 4 + + drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 349 +++--- + drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 21 + + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 7 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 7 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 643 +++++++--- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 7 + + drivers/net/ethernet/ti/cpsw.c | 52 +- + drivers/net/ethernet/wiznet/Kconfig | 14 + + drivers/net/ethernet/wiznet/Makefile | 1 + + drivers/net/ethernet/wiznet/w5100-spi.c | 300 +++++ + drivers/net/ethernet/wiznet/w5100.c | 935 +++++++++----- + drivers/net/ethernet/wiznet/w5100.h | 35 + + drivers/net/fjes/fjes_hw.c | 30 +- + drivers/net/fjes/fjes_hw.h | 9 +- + drivers/net/fjes/fjes_main.c | 134 +- + drivers/net/geneve.c | 60 +- + drivers/net/hyperv/hyperv_net.h | 14 + + drivers/net/hyperv/netvsc.c | 29 + + drivers/net/hyperv/netvsc_drv.c | 312 ++++- + drivers/net/hyperv/rndis_filter.c | 6 + + drivers/net/ieee802154/adf7242.c | 2 + + drivers/net/irda/Kconfig | 7 - + drivers/net/irda/Makefile | 1 - + drivers/net/irda/sh_irda.c | 875 ------------- + drivers/net/phy/mdio-mux.c | 10 +- + drivers/net/phy/mdio_bus.c | 4 +- + drivers/net/phy/phy.c | 81 ++ + drivers/net/phy/phy_device.c | 3 +- + drivers/net/tun.c | 114 +- + drivers/net/vxlan.c | 288 +++-- + drivers/net/wireless/admtek/adm8211.c | 4 +- + drivers/net/wireless/ath/ar5523/ar5523.c | 4 +- + drivers/net/wireless/ath/ath.h | 2 +- + drivers/net/wireless/ath/ath10k/ce.c | 44 +- + drivers/net/wireless/ath/ath10k/ce.h | 15 +- + drivers/net/wireless/ath/ath10k/core.c | 156 ++- + drivers/net/wireless/ath/ath10k/core.h | 43 +- + drivers/net/wireless/ath/ath10k/debug.c | 100 +- + drivers/net/wireless/ath/ath10k/htt.c | 2 +- + drivers/net/wireless/ath/ath10k/htt.h | 55 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 716 +++++++---- + drivers/net/wireless/ath/ath10k/htt_tx.c | 291 ++++- + drivers/net/wireless/ath/ath10k/hw.h | 6 +- + drivers/net/wireless/ath/ath10k/mac.c | 614 +++++++-- + drivers/net/wireless/ath/ath10k/mac.h | 6 + + drivers/net/wireless/ath/ath10k/pci.c | 106 +- + drivers/net/wireless/ath/ath10k/txrx.c | 37 +- + drivers/net/wireless/ath/ath10k/txrx.h | 4 +- + drivers/net/wireless/ath/ath10k/wmi-ops.h | 23 + + drivers/net/wireless/ath/ath10k/wmi.c | 140 ++- + drivers/net/wireless/ath/ath10k/wmi.h | 54 + + drivers/net/wireless/ath/ath5k/ani.c | 2 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 10 +- + drivers/net/wireless/ath/ath5k/attach.c | 8 +- + drivers/net/wireless/ath/ath5k/base.c | 32 +- + drivers/net/wireless/ath/ath5k/debug.c | 6 +- + drivers/net/wireless/ath/ath5k/led.c | 2 +- + drivers/net/wireless/ath/ath5k/pcu.c | 6 +- + drivers/net/wireless/ath/ath5k/phy.c | 32 +- + drivers/net/wireless/ath/ath5k/qcu.c | 8 +- + drivers/net/wireless/ath/ath5k/reset.c | 10 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 22 +- + drivers/net/wireless/ath/ath6kl/core.h | 2 +- + drivers/net/wireless/ath/ath6kl/wmi.c | 27 +- + drivers/net/wireless/ath/ath6kl/wmi.h | 2 +- + .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 4 +- + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 44 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 10 +- + drivers/net/wireless/ath/ath9k/ar9003_mci.c | 39 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 10 +- + .../net/wireless/ath/ath9k/ar9330_1p1_initvals.h | 4 +- + .../net/wireless/ath/ath9k/ar9330_1p2_initvals.h | 4 +- + drivers/net/wireless/ath/ath9k/ar9340_initvals.h | 4 +- + .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 4 +- + .../net/wireless/ath/ath9k/ar9462_2p1_initvals.h | 4 +- + drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 4 +- + drivers/net/wireless/ath/ath9k/ar953x_initvals.h | 4 +- + .../net/wireless/ath/ath9k/ar955x_1p0_initvals.h | 2 +- + .../net/wireless/ath/ath9k/ar9565_1p0_initvals.h | 2 +- + drivers/net/wireless/ath/ath9k/ar956x_initvals.h | 2 +- + .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 4 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 4 - + drivers/net/wireless/ath/ath9k/btcoex.c | 138 +- + drivers/net/wireless/ath/ath9k/btcoex.h | 2 + + drivers/net/wireless/ath/ath9k/calib.c | 6 +- + drivers/net/wireless/ath/ath9k/channel.c | 8 +- + drivers/net/wireless/ath/ath9k/common-init.c | 28 +- + drivers/net/wireless/ath/ath9k/common.c | 4 +- + drivers/net/wireless/ath/ath9k/debug.c | 24 +- + drivers/net/wireless/ath/ath9k/debug_sta.c | 6 +- + drivers/net/wireless/ath/ath9k/dynack.c | 2 +- + drivers/net/wireless/ath/ath9k/gpio.c | 69 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 8 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 22 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 12 +- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 2 +- + drivers/net/wireless/ath/ath9k/hw.c | 267 ++-- + drivers/net/wireless/ath/ath9k/hw.h | 11 +- + drivers/net/wireless/ath/ath9k/init.c | 13 +- + drivers/net/wireless/ath/ath9k/main.c | 13 +- + drivers/net/wireless/ath/ath9k/reg.h | 90 +- + drivers/net/wireless/ath/ath9k/rng.c | 20 +- + drivers/net/wireless/ath/ath9k/xmit.c | 4 +- + drivers/net/wireless/ath/carl9170/mac.c | 12 +- + drivers/net/wireless/ath/carl9170/main.c | 6 +- + drivers/net/wireless/ath/carl9170/phy.c | 18 +- + drivers/net/wireless/ath/carl9170/rx.c | 2 +- + drivers/net/wireless/ath/carl9170/tx.c | 8 +- + drivers/net/wireless/ath/regd.c | 16 +- + drivers/net/wireless/ath/regd.h | 2 +- + drivers/net/wireless/ath/wcn36xx/main.c | 12 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 4 +- + drivers/net/wireless/ath/wcn36xx/txrx.c | 4 +- + drivers/net/wireless/ath/wil6210/Makefile | 1 + + drivers/net/wireless/ath/wil6210/cfg80211.c | 336 ++++- + drivers/net/wireless/ath/wil6210/debugfs.c | 59 +- + drivers/net/wireless/ath/wil6210/interrupt.c | 6 +- + drivers/net/wireless/ath/wil6210/ioctl.c | 11 +- + drivers/net/wireless/ath/wil6210/main.c | 81 +- + drivers/net/wireless/ath/wil6210/netdev.c | 9 +- + drivers/net/wireless/ath/wil6210/p2p.c | 253 ++++ + drivers/net/wireless/ath/wil6210/pcie_bus.c | 1 + + drivers/net/wireless/ath/wil6210/rx_reorder.c | 204 +-- + drivers/net/wireless/ath/wil6210/trace.h | 19 +- + drivers/net/wireless/ath/wil6210/txrx.c | 67 +- + drivers/net/wireless/ath/wil6210/txrx.h | 12 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 110 +- + drivers/net/wireless/ath/wil6210/wil_platform.h | 8 +- + drivers/net/wireless/ath/wil6210/wmi.c | 136 +- + drivers/net/wireless/ath/wil6210/wmi.h | 1264 +++++++++---------- + drivers/net/wireless/atmel/at76c50x-usb.c | 6 +- + drivers/net/wireless/atmel/atmel.c | 2 +- + drivers/net/wireless/broadcom/b43/b43.h | 4 +- + drivers/net/wireless/broadcom/b43/main.c | 34 +- + drivers/net/wireless/broadcom/b43/phy_ac.c | 2 +- + drivers/net/wireless/broadcom/b43/phy_common.c | 2 +- + drivers/net/wireless/broadcom/b43/phy_ht.c | 16 +- + drivers/net/wireless/broadcom/b43/phy_lcn.c | 10 +- + drivers/net/wireless/broadcom/b43/phy_lp.c | 30 +- + drivers/net/wireless/broadcom/b43/phy_n.c | 176 +-- + drivers/net/wireless/broadcom/b43/tables_lpphy.c | 14 +- + drivers/net/wireless/broadcom/b43/tables_nphy.c | 16 +- + drivers/net/wireless/broadcom/b43/tables_phy_lcn.c | 2 +- + drivers/net/wireless/broadcom/b43/xmit.c | 8 +- + drivers/net/wireless/broadcom/b43legacy/main.c | 12 +- + drivers/net/wireless/broadcom/b43legacy/xmit.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 2 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 74 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 8 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 5 +- + .../wireless/broadcom/brcm80211/brcmsmac/channel.c | 10 +- + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 16 +- + .../wireless/broadcom/brcm80211/brcmsmac/main.c | 4 +- + drivers/net/wireless/cisco/airo.c | 6 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 8 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 12 +- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 30 +- + drivers/net/wireless/intel/iwlegacy/3945-rs.c | 22 +- + drivers/net/wireless/intel/iwlegacy/3945.c | 20 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 41 +- + drivers/net/wireless/intel/iwlegacy/4965-rs.c | 22 +- + drivers/net/wireless/intel/iwlegacy/4965.c | 6 +- + drivers/net/wireless/intel/iwlegacy/4965.h | 2 +- + drivers/net/wireless/intel/iwlegacy/common.c | 92 +- + drivers/net/wireless/intel/iwlegacy/common.h | 30 +- + drivers/net/wireless/intel/iwlegacy/debug.c | 4 +- + drivers/net/wireless/intel/iwlwifi/Kconfig | 10 - + drivers/net/wireless/intel/iwlwifi/dvm/agn.h | 8 +- + drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/dev.h | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/devices.c | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/lib.c | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 12 +- + drivers/net/wireless/intel/iwlwifi/dvm/main.c | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 22 +- + drivers/net/wireless/intel/iwlwifi/dvm/rs.h | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/rx.c | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/rxon.c | 10 +- + drivers/net/wireless/intel/iwlwifi/dvm/scan.c | 38 +- + drivers/net/wireless/intel/iwlwifi/dvm/sta.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/tx.c | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-1000.c | 12 +- + drivers/net/wireless/intel/iwlwifi/iwl-2000.c | 20 +- + drivers/net/wireless/intel/iwlwifi/iwl-5000.c | 13 +- + drivers/net/wireless/intel/iwlwifi/iwl-6000.c | 22 +- + drivers/net/wireless/intel/iwlwifi/iwl-7000.c | 30 +- + drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 15 +- + drivers/net/wireless/intel/iwlwifi/iwl-9000.c | 19 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 9 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 100 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.c | 38 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.h | 6 +- + .../net/wireless/intel/iwlwifi/iwl-fw-error-dump.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h | 41 +- + drivers/net/wireless/intel/iwlwifi/iwl-fw.h | 2 + + drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 10 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 26 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 12 + + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 52 +- + .../net/wireless/intel/iwlwifi/mvm/coex_legacy.c | 1315 -------------------- + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 1 - + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 91 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 169 +-- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h | 15 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h | 35 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 108 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 140 ++- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 56 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 57 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 91 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 53 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 34 +- + drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/power.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 28 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 15 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 58 +- + drivers/net/wireless/intel/iwlwifi/mvm/sf.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 262 +++- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 87 +- + drivers/net/wireless/intel/iwlwifi/mvm/tdls.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 15 - + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 198 ++- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 165 ++- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 16 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 6 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 12 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 35 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 80 +- + drivers/net/wireless/intersil/orinoco/cfg.c | 6 +- + drivers/net/wireless/intersil/orinoco/hw.c | 2 +- + drivers/net/wireless/intersil/orinoco/scan.c | 4 +- + drivers/net/wireless/intersil/p54/eeprom.c | 32 +- + drivers/net/wireless/intersil/p54/main.c | 4 +- + drivers/net/wireless/intersil/p54/p54.h | 2 +- + drivers/net/wireless/intersil/p54/txrx.c | 4 +- + drivers/net/wireless/mac80211_hwsim.c | 19 +- + drivers/net/wireless/marvell/libertas/cfg.c | 10 +- + drivers/net/wireless/marvell/libertas/cmd.c | 4 +- + drivers/net/wireless/marvell/libertas_tf/main.c | 4 +- + .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 5 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 63 +- + drivers/net/wireless/marvell/mwifiex/cfp.c | 12 +- + drivers/net/wireless/marvell/mwifiex/fw.h | 11 + + drivers/net/wireless/marvell/mwifiex/main.c | 8 +- + drivers/net/wireless/marvell/mwifiex/main.h | 2 + + drivers/net/wireless/marvell/mwifiex/pcie.c | 98 +- + drivers/net/wireless/marvell/mwifiex/pcie.h | 18 +- + drivers/net/wireless/marvell/mwifiex/scan.c | 8 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 7 +- + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 28 + + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 2 + + drivers/net/wireless/marvell/mwifiex/sta_event.c | 3 + + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 3 +- + drivers/net/wireless/marvell/mwifiex/tdls.c | 2 +- + drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 4 +- + drivers/net/wireless/marvell/mwifiex/uap_txrx.c | 92 ++ + drivers/net/wireless/marvell/mwl8k.c | 88 +- + drivers/net/wireless/mediatek/mt7601u/init.c | 4 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 30 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 7 +- + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 43 +- + drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 21 +- + drivers/net/wireless/ralink/rt2x00/rt61pci.c | 22 +- + drivers/net/wireless/ralink/rt2x00/rt73usb.c | 22 +- + drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 12 +- + drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 4 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 193 ++- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 130 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 31 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 44 +- + .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c | 847 ++++++------- + .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 611 +++++---- + .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | 865 ++++++------- + .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 652 +++++----- + .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c | 851 +++++++------ + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 31 +- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.h | 19 +- + .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.c | 5 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 39 +- + drivers/net/wireless/realtek/rtlwifi/regd.c | 16 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/phy.c | 3 +- + .../wireless/realtek/rtlwifi/rtl8192c/dm_common.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/phy.c | 2 +- + .../wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 5 + + .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/rf.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 3 + + .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 6 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 7 +- + drivers/net/wireless/rndis_wlan.c | 4 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 100 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 8 +- + drivers/net/wireless/rsi/rsi_91x_pkt.c | 24 +- + drivers/net/wireless/rsi/rsi_main.h | 2 +- + drivers/net/wireless/st/cw1200/main.c | 10 +- + drivers/net/wireless/st/cw1200/scan.c | 2 +- + drivers/net/wireless/st/cw1200/sta.c | 6 +- + drivers/net/wireless/st/cw1200/txrx.c | 2 +- + drivers/net/wireless/st/cw1200/wsm.c | 4 +- + drivers/net/wireless/ti/wl1251/main.c | 2 +- + drivers/net/wireless/ti/wl1251/ps.c | 2 +- + drivers/net/wireless/ti/wl1251/rx.c | 2 +- + drivers/net/wireless/ti/wl12xx/main.c | 8 +- + drivers/net/wireless/ti/wl12xx/scan.c | 22 +- + drivers/net/wireless/ti/wl18xx/cmd.c | 6 +- + drivers/net/wireless/ti/wl18xx/event.c | 6 +- + drivers/net/wireless/ti/wl18xx/main.c | 22 +- + drivers/net/wireless/ti/wl18xx/scan.c | 8 +- + drivers/net/wireless/ti/wl18xx/tx.c | 2 +- + drivers/net/wireless/ti/wlcore/cmd.c | 36 +- + drivers/net/wireless/ti/wlcore/cmd.h | 6 +- + drivers/net/wireless/ti/wlcore/main.c | 42 +- + drivers/net/wireless/ti/wlcore/ps.c | 6 +- + drivers/net/wireless/ti/wlcore/rx.c | 4 +- + drivers/net/wireless/ti/wlcore/rx.h | 2 +- + drivers/net/wireless/ti/wlcore/scan.c | 16 +- + drivers/net/wireless/ti/wlcore/tx.c | 2 +- + drivers/net/wireless/ti/wlcore/tx.h | 4 +- + drivers/net/wireless/ti/wlcore/wlcore.h | 4 +- + drivers/net/wireless/ti/wlcore/wlcore_i.h | 2 +- + drivers/net/wireless/wl3501_cs.c | 2 +- + drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 4 +- + drivers/of/of_mdio.c | 21 +- + drivers/staging/rtl8188eu/os_dep/mon.c | 2 +- + drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 4 +- + drivers/staging/rtl8723au/include/ieee80211.h | 2 +- + drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 54 +- + drivers/staging/vt6655/channel.c | 4 +- + drivers/staging/vt6655/device_main.c | 4 +- + drivers/staging/vt6655/rxtx.c | 2 +- + drivers/staging/vt6656/channel.c | 4 +- + drivers/staging/vt6656/int.c | 2 +- + drivers/staging/vt6656/main_usb.c | 2 +- + drivers/staging/vt6656/rxtx.c | 2 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 +- + drivers/staging/wlan-ng/cfg80211.c | 6 +- + drivers/target/iscsi/iscsi_target_util.c | 5 +- + fs/afs/rxrpc.c | 30 +- + fs/cifs/connect.c | 4 +- + fs/gfs2/glock.c | 4 +- + include/linux/ath9k_platform.h | 4 + + include/linux/bpf.h | 7 + + include/linux/ethtool.h | 7 + + include/linux/filter.h | 4 - + include/linux/ieee80211.h | 24 + + include/linux/mdio.h | 11 + + include/linux/mlx5/mlx5_ifc.h | 253 ++-- + include/linux/net.h | 3 +- + include/linux/netdev_features.h | 11 +- + include/linux/netdevice.h | 33 +- + include/linux/perf_event.h | 4 +- + include/linux/phy.h | 4 + + include/linux/qed/qed_eth_if.h | 13 +- + include/linux/qed/qed_if.h | 20 +- + include/linux/rhashtable.h | 3 +- + include/linux/sctp.h | 67 + + include/linux/skbuff.h | 34 +- + include/linux/stmmac.h | 2 + + include/linux/trace_events.h | 9 +- + include/linux/udp.h | 16 +- + include/net/af_rxrpc.h | 4 +- + include/net/cfg80211.h | 106 +- + include/net/devlink.h | 61 + + include/net/dsa.h | 25 +- + include/net/inet6_hashtables.h | 12 +- + include/net/inet_hashtables.h | 47 +- + include/net/ip.h | 3 +- + include/net/ip_tunnels.h | 20 +- + include/net/ipv6.h | 6 +- + include/net/mac80211.h | 63 +- + include/net/netfilter/nf_conntrack_ecache.h | 108 +- + include/net/netns/ipv4.h | 3 + + include/net/protocol.h | 3 - + include/net/request_sock.h | 31 +- + include/net/route.h | 7 +- + include/net/sctp/sctp.h | 31 +- + include/net/sctp/structs.h | 13 +- + include/net/sock.h | 130 +- + include/net/tcp.h | 36 +- + include/net/transp_v6.h | 3 +- + include/net/udp.h | 22 +- + include/net/udp_tunnel.h | 10 +- + include/net/vxlan.h | 71 +- + include/rxrpc/packet.h | 2 - + include/trace/perf.h | 23 +- + include/trace/trace_events.h | 3 - + include/uapi/linux/bpf.h | 1 + + include/uapi/linux/devlink.h | 63 + + include/uapi/linux/if_ether.h | 1 + + include/uapi/linux/if_link.h | 2 + + include/uapi/linux/inet_diag.h | 2 + + include/uapi/linux/net_tstamp.h | 10 + + include/uapi/linux/netfilter/nfnetlink_queue.h | 10 + + include/uapi/linux/nl80211.h | 95 +- + include/uapi/linux/sock_diag.h | 1 + + kernel/bpf/helpers.c | 17 +- + kernel/bpf/stackmap.c | 2 +- + kernel/bpf/verifier.c | 118 +- + kernel/events/core.c | 27 +- + kernel/trace/bpf_trace.c | 95 +- + kernel/trace/trace_event_perf.c | 40 +- + kernel/trace/trace_events.c | 18 + + kernel/trace/trace_kprobe.c | 10 +- + kernel/trace/trace_syscalls.c | 13 +- + kernel/trace/trace_uprobe.c | 5 +- + lib/rhashtable.c | 6 +- + lib/test_rhashtable.c | 2 +- + net/6lowpan/iphc.c | 11 +- + net/bluetooth/af_bluetooth.c | 2 +- + net/bluetooth/hci_event.c | 13 + + net/bluetooth/hci_request.c | 6 +- + net/bluetooth/l2cap_sock.c | 2 +- + net/bridge/br_ioctl.c | 40 +- + net/bridge/br_sysfs_br.c | 84 +- + net/bridge/br_sysfs_if.c | 5 +- + net/bridge/br_vlan.c | 30 +- + net/bridge/netfilter/nf_tables_bridge.c | 47 +- + net/can/raw.c | 2 +- + net/core/datagram.c | 9 +- + net/core/dev.c | 77 +- + net/core/devlink.c | 1250 +++++++++++++++++-- + net/core/ethtool.c | 25 +- + net/core/filter.c | 92 +- + net/core/rtnetlink.c | 23 +- + net/core/skbuff.c | 29 +- + net/core/sock.c | 97 +- + net/core/sock_diag.c | 1 + + net/dccp/ipv4.c | 9 +- + net/dccp/ipv6.c | 9 +- + net/dsa/dsa.c | 23 +- + net/dsa/slave.c | 59 +- + net/hsr/Kconfig | 5 +- + net/hsr/hsr_device.c | 80 +- + net/hsr/hsr_device.h | 2 +- + net/hsr/hsr_forward.c | 43 +- + net/hsr/hsr_framereg.c | 30 +- + net/hsr/hsr_main.h | 13 +- + net/hsr/hsr_netlink.c | 10 +- + net/hsr/hsr_slave.c | 4 +- + net/ipv4/af_inet.c | 73 +- + net/ipv4/cipso_ipv4.c | 3 +- + net/ipv4/fib_semantics.c | 34 +- + net/ipv4/fou.c | 64 +- + net/ipv4/gre_offload.c | 41 +- + net/ipv4/inet_connection_sock.c | 3 + + net/ipv4/inet_diag.c | 77 +- + net/ipv4/inet_hashtables.c | 80 +- + net/ipv4/ip_gre.c | 20 +- + net/ipv4/ip_sockglue.c | 16 +- + net/ipv4/ip_tunnel_core.c | 29 +- + net/ipv4/ipip.c | 7 +- + net/ipv4/ping.c | 7 +- + net/ipv4/raw.c | 13 +- + net/ipv4/sysctl_net_ipv4.c | 11 + + net/ipv4/tcp.c | 22 +- + net/ipv4/tcp_input.c | 65 +- + net/ipv4/tcp_ipv4.c | 86 +- + net/ipv4/tcp_minisocks.c | 5 +- + net/ipv4/tcp_offload.c | 30 +- + net/ipv4/tcp_output.c | 16 +- + net/ipv4/udp.c | 370 ++---- + net/ipv4/udp_diag.c | 18 +- + net/ipv4/udp_offload.c | 140 +-- + net/ipv4/udp_tunnel.c | 2 + + net/ipv6/Makefile | 5 +- + net/ipv6/addrconf.c | 10 +- + net/ipv6/af_inet6.c | 9 + + net/ipv6/datagram.c | 9 +- + net/ipv6/icmp.c | 6 +- + net/ipv6/ila/ila_xlat.c | 3 +- + net/ipv6/inet6_hashtables.c | 62 +- + net/ipv6/ip6_flowlabel.c | 3 +- + net/ipv6/ip6_gre.c | 81 +- + net/ipv6/ip6_offload.c | 23 +- + net/ipv6/ip6_offload.h | 3 +- + net/ipv6/ip6_output.c | 15 +- + net/ipv6/ipv6_sockglue.c | 9 +- + net/ipv6/netfilter/ip6t_SYNPROXY.c | 56 +- + net/ipv6/netfilter/nf_reject_ipv6.c | 2 +- + net/ipv6/ping.c | 3 +- + net/ipv6/raw.c | 7 +- + net/ipv6/sit.c | 14 +- + net/ipv6/tcp_ipv6.c | 38 +- + net/ipv6/udp.c | 249 ++-- + net/ipv6/udp_offload.c | 11 +- + net/l2tp/l2tp_ip6.c | 10 +- + net/llc/llc_proc.c | 2 +- + net/mac80211/agg-tx.c | 5 + + net/mac80211/cfg.c | 32 +- + net/mac80211/debugfs.c | 3 + + net/mac80211/debugfs_netdev.c | 12 +- + net/mac80211/debugfs_sta.c | 134 +- + net/mac80211/driver-ops.h | 15 + + net/mac80211/ibss.c | 27 +- + net/mac80211/ieee80211_i.h | 45 +- + net/mac80211/iface.c | 4 +- + net/mac80211/key.c | 1 + + net/mac80211/main.c | 10 +- + net/mac80211/mesh.c | 48 +- + net/mac80211/mesh.h | 71 +- + net/mac80211/mesh_hwmp.c | 4 + + net/mac80211/mesh_pathtbl.c | 965 +++++--------- + net/mac80211/mesh_plink.c | 23 +- + net/mac80211/mlme.c | 30 +- + net/mac80211/ocb.c | 2 - + net/mac80211/rate.c | 2 +- + net/mac80211/rate.h | 4 +- + net/mac80211/rc80211_minstrel.c | 6 +- + net/mac80211/rc80211_minstrel_ht.c | 81 +- + net/mac80211/rx.c | 485 +++++++- + net/mac80211/scan.c | 20 +- + net/mac80211/spectmgmt.c | 4 +- + net/mac80211/sta_info.c | 289 +++-- + net/mac80211/sta_info.h | 130 +- + net/mac80211/status.c | 4 +- + net/mac80211/tdls.c | 18 +- + net/mac80211/trace.h | 18 +- + net/mac80211/tx.c | 211 +++- + net/mac80211/util.c | 29 +- + net/mac80211/vht.c | 4 +- + net/mac80211/wpa.c | 26 +- + net/mpls/mpls_gso.c | 1 + + net/netfilter/ipvs/ip_vs_xmit.c | 6 +- + net/netfilter/nf_conntrack_core.c | 15 +- + net/netfilter/nf_conntrack_ecache.c | 84 ++ + net/netfilter/nfnetlink_queue.c | 105 ++ + net/netfilter/nft_hash.c | 4 +- + net/netfilter/xt_socket.c | 6 +- + net/netlink/af_netlink.c | 3 +- + net/openvswitch/vport-internal_dev.c | 3 +- + net/packet/af_packet.c | 44 +- + net/rfkill/core.c | 36 +- + net/rxrpc/Kconfig | 2 +- + net/rxrpc/Makefile | 7 +- + net/rxrpc/af_rxrpc.c | 9 + + net/rxrpc/ar-accept.c | 4 +- + net/rxrpc/ar-ack.c | 81 +- + net/rxrpc/ar-call.c | 11 +- + net/rxrpc/ar-connection.c | 14 +- + net/rxrpc/ar-connevent.c | 27 +- + net/rxrpc/ar-input.c | 18 +- + net/rxrpc/ar-internal.h | 70 +- + net/rxrpc/ar-output.c | 6 +- + net/rxrpc/ar-proc.c | 2 +- + net/rxrpc/ar-recvmsg.c | 18 +- + net/rxrpc/ar-security.c | 166 +-- + net/rxrpc/insecure.c | 83 ++ + net/rxrpc/misc.c | 89 ++ + net/rxrpc/rxkad.c | 61 +- + net/sched/em_meta.c | 8 +- + net/sctp/Kconfig | 4 + + net/sctp/Makefile | 1 + + net/sctp/inqueue.c | 3 + + net/sctp/proc.c | 104 +- + net/sctp/sctp_diag.c | 497 ++++++++ + net/sctp/sm_sideeffect.c | 7 + + net/sctp/socket.c | 223 +++- + net/sctp/ulpqueue.c | 9 +- + net/socket.c | 35 +- + net/sunrpc/socklib.c | 2 +- + net/sunrpc/svcsock.c | 8 +- + net/sunrpc/xprtsock.c | 8 +- + net/tipc/bearer.c | 101 +- + net/tipc/bearer.h | 15 - + net/tipc/discover.c | 7 +- + net/tipc/discover.h | 2 +- + net/tipc/link.c | 55 +- + net/tipc/link.h | 2 +- + net/tipc/msg.h | 15 + + net/tipc/node.c | 9 +- + net/tipc/server.c | 19 +- + net/tipc/server.h | 4 +- + net/tipc/subscr.c | 4 +- + net/wireless/chan.c | 2 +- + net/wireless/core.c | 15 +- + net/wireless/debugfs.c | 4 +- + net/wireless/ibss.c | 6 +- + net/wireless/mesh.c | 4 +- + net/wireless/mlme.c | 2 +- + net/wireless/nl80211.c | 198 ++- + net/wireless/rdev-ops.h | 2 +- + net/wireless/reg.c | 30 +- + net/wireless/reg.h | 2 +- + net/wireless/scan.c | 16 +- + net/wireless/sme.c | 22 +- + net/wireless/trace.h | 26 +- + net/wireless/util.c | 40 +- + net/wireless/wext-compat.c | 14 +- + net/wireless/wext-core.c | 5 +- + samples/bpf/Makefile | 5 + + samples/bpf/bpf_load.c | 26 +- + samples/bpf/offwaketime_kern.c | 36 +- + samples/bpf/test_overhead_kprobe_kern.c | 41 + + samples/bpf/test_overhead_tp_kern.c | 36 + + samples/bpf/test_overhead_user.c | 162 +++ + samples/bpf/test_verifier.c | 268 ++++ + samples/bpf/tracex1_kern.c | 4 +- + samples/bpf/tracex2_kern.c | 4 +- + samples/bpf/tracex5_kern.c | 6 +- + 777 files changed, 31694 insertions(+), 15449 deletions(-) + create mode 100644 Documentation/networking/segmentation-offloads.txt + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c + create mode 100644 drivers/net/ethernet/wiznet/w5100-spi.c + create mode 100644 drivers/net/ethernet/wiznet/w5100.h + delete mode 100644 drivers/net/irda/sh_irda.c + create mode 100644 drivers/net/wireless/ath/wil6210/p2p.c + delete mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/coex_legacy.c + create mode 100644 net/rxrpc/insecure.c + create mode 100644 net/rxrpc/misc.c + create mode 100644 net/sctp/sctp_diag.c + create mode 100644 samples/bpf/test_overhead_kprobe_kern.c + create mode 100644 samples/bpf/test_overhead_tp_kern.c + create mode 100644 samples/bpf/test_overhead_user.c +$ git am -3 ../patches/0001-Revert-soreuseport-fix-ordering-for-mixed-v4-v6-sock.patch +Applying: Revert "soreuseport: fix ordering for mixed v4/v6 sockets" +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/rculist_nulls.h +M include/net/sock.h +M net/ipv4/udp.c +$ git add -A . +$ git commit -v -a --amend +[master cc7fdc9a3cd8] Merge remote-tracking branch 'net-next/master' + Date: Tue Apr 19 11:26:28 2016 +1000 +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 (5a504528f28f ipvs: don't alter conntrack in OPS mode) +$ git merge ipvs-next/master +Merge made by the 'recursive' strategy. + include/linux/netfilter/x_tables.h | 12 +- + include/net/ip_vs.h | 17 ++ + net/ipv4/netfilter/arp_tables.c | 303 ++++++++++---------------------- + net/ipv4/netfilter/ip_tables.c | 327 +++++++++-------------------------- + net/ipv6/netfilter/ip6_tables.c | 320 +++++++++------------------------- + net/netfilter/ipvs/ip_vs_conn.c | 29 +++- + net/netfilter/ipvs/ip_vs_core.c | 154 +++++++++++++++++ + net/netfilter/ipvs/ip_vs_ctl.c | 46 ++++- + net/netfilter/ipvs/ip_vs_nfct.c | 4 + + net/netfilter/ipvs/ip_vs_pe_sip.c | 15 ++ + net/netfilter/nf_conntrack_netlink.c | 117 +++++-------- + net/netfilter/x_tables.c | 245 +++++++++++++++++++++++++- + 12 files changed, 815 insertions(+), 774 deletions(-) +Merging wireless-drivers-next/master (171a900c4eb7 rtl8xxxu: MAINTAINERS: Update to point to the active devel branch) +$ git merge wireless-drivers-next/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 7 + + .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 4 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 247 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 4 - + .../broadcom/brcm80211/brcmfmac/firmware.c | 30 +- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 1 + + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 209 ++ + .../broadcom/brcm80211/brcmfmac/fwsignal.h | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 46 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/proto.h | 16 + + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 32 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 2 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 127 +- + drivers/net/wireless/marvell/mwifiex/main.c | 2 +- + drivers/net/wireless/marvell/mwifiex/main.h | 3 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 21 +- + drivers/net/wireless/marvell/mwifiex/pcie.h | 9 +- + drivers/net/wireless/marvell/mwifiex/scan.c | 185 +- + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 13 +- + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 44 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 2502 ++++++++++++++++---- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 90 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 15 +- + 26 files changed, 2618 insertions(+), 999 deletions(-) +Merging bluetooth/master (edc73417d8f3 6lowpan: move mac802154 header) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/net/ieee802154/mrf24j40.c | 14 ++++- + include/linux/ieee802154.h | 45 ++++++++++++++- + include/net/6lowpan.h | 37 ++++++++++++- + include/net/mac802154.h | 10 ++++ + net/6lowpan/6lowpan_i.h | 9 +++ + net/6lowpan/core.c | 8 +-- + net/6lowpan/debugfs.c | 22 ++++---- + net/6lowpan/iphc.c | 111 ++++++++++++++++--------------------- + net/6lowpan/nhc_udp.c | 2 +- + net/bluetooth/6lowpan.c | 82 ++++++++++++++------------- + net/ieee802154/6lowpan/6lowpan_i.h | 14 +---- + net/ieee802154/6lowpan/core.c | 6 +- + net/ieee802154/6lowpan/tx.c | 14 ++--- + net/ieee802154/nl802154.c | 10 ++++ + 14 files changed, 237 insertions(+), 147 deletions(-) +Merging mac80211-next/master (81948527fce5 cfg80211: Add option to report the bss entry in connect result) +$ git merge mac80211-next/master +Auto-merging net/wireless/nl80211.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/80211.tmpl | 1 + + include/net/cfg80211.h | 43 +++++++++++++++++++++++++++++++++++----- + include/uapi/linux/nl80211.h | 3 +++ + net/wireless/core.h | 1 + + net/wireless/nl80211.c | 3 ++- + net/wireless/sme.c | 28 ++++++++++++++++++++------ + net/wireless/util.c | 2 +- + 7 files changed, 68 insertions(+), 13 deletions(-) +Merging rdma/for-next (520a07bff6fb Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6) +$ git merge rdma/for-next +Already up-to-date. +Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (08922f644878 mtd: devices: m25p80: add support for mmap read request) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + drivers/bcma/driver_chipcommon_sflash.c | 1 - + drivers/mtd/chips/Kconfig | 1 + + drivers/mtd/devices/bcm47xxsflash.c | 29 ++++++++++++++++++++++++----- + drivers/mtd/devices/bcm47xxsflash.h | 3 ++- + drivers/mtd/devices/m25p80.c | 22 ++++++++++++++++++++++ + include/linux/bcma/bcma_driver_chipcommon.h | 1 - + include/linux/mtd/map.h | 19 +++++++------------ + 7 files changed, 56 insertions(+), 20 deletions(-) +Merging nand/nand/next (a3fd27e69422 Merge branch 'mtd-nand-trigger' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds into nand/next) +$ git merge nand/nand/next +Auto-merging drivers/mtd/nand/nandsim.c +Auto-merging drivers/mtd/nand/nand_base.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/brcm,brcmnand.txt | 1 + + Documentation/devicetree/bindings/mtd/nand.txt | 37 +- + arch/arm/mach-pxa/spitz.c | 55 +- + arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 +- + arch/mips/jz4740/board-qi_lb60.c | 87 +-- + drivers/leds/trigger/Kconfig | 15 + + drivers/leds/trigger/Makefile | 2 + + drivers/leds/trigger/ledtrig-mtd.c | 45 ++ + drivers/leds/trigger/ledtrig-panic.c | 30 ++ + drivers/memory/fsl_ifc.c | 36 +- + drivers/memory/omap-gpmc.c | 7 - + drivers/mtd/devices/docg3.c | 46 +- + drivers/mtd/mtdchar.c | 123 ++++- + drivers/mtd/mtdconcat.c | 2 +- + drivers/mtd/mtdcore.c | 379 +++++++++++++ + drivers/mtd/mtdpart.c | 23 +- + drivers/mtd/nand/ams-delta.c | 1 + + drivers/mtd/nand/atmel_nand.c | 302 ++++++----- + drivers/mtd/nand/au1550nd.c | 1 + + drivers/mtd/nand/bf5xx_nand.c | 51 +- + drivers/mtd/nand/brcmnand/brcmnand.c | 266 +++++---- + drivers/mtd/nand/cafe_nand.c | 44 +- + drivers/mtd/nand/cmx270_nand.c | 1 + + drivers/mtd/nand/davinci_nand.c | 118 ++-- + drivers/mtd/nand/denali.c | 50 +- + drivers/mtd/nand/diskonchip.c | 60 ++- + drivers/mtd/nand/docg4.c | 33 +- + drivers/mtd/nand/fsl_elbc_nand.c | 84 +-- + drivers/mtd/nand/fsl_ifc_nand.c | 317 ++++------- + drivers/mtd/nand/fsl_upm.c | 1 + + drivers/mtd/nand/fsmc_nand.c | 322 +++-------- + drivers/mtd/nand/gpio.c | 1 + + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 62 ++- + drivers/mtd/nand/hisi504_nand.c | 26 +- + drivers/mtd/nand/jz4740_nand.c | 2 +- + drivers/mtd/nand/jz4780_bch.c | 1 - + drivers/mtd/nand/jz4780_nand.c | 20 +- + drivers/mtd/nand/lpc32xx_mlc.c | 51 +- + drivers/mtd/nand/lpc32xx_slc.c | 58 +- + drivers/mtd/nand/mpc5121_nfc.c | 1 + + drivers/mtd/nand/mxc_nand.c | 213 ++++---- + drivers/mtd/nand/nand_base.c | 436 +++++++-------- + drivers/mtd/nand/nand_bch.c | 27 +- + drivers/mtd/nand/nandsim.c | 2 + + drivers/mtd/nand/nuc900_nand.c | 1 + + drivers/mtd/nand/omap2.c | 227 ++++---- + drivers/mtd/nand/orion_nand.c | 1 + + drivers/mtd/nand/pasemi_nand.c | 16 +- + drivers/mtd/nand/plat_nand.c | 1 + + drivers/mtd/nand/pxa3xx_nand.c | 132 +++-- + drivers/mtd/nand/qcom_nandc.c | 88 ++- + drivers/mtd/nand/s3c2410.c | 36 +- + drivers/mtd/nand/sh_flctl.c | 88 ++- + drivers/mtd/nand/sharpsl.c | 2 +- + drivers/mtd/nand/sm_common.c | 93 +++- + drivers/mtd/nand/socrates_nand.c | 1 + + drivers/mtd/nand/sunxi_nand.c | 598 ++++++++++++++------- + drivers/mtd/nand/vf610_nfc.c | 35 +- + drivers/mtd/onenand/onenand_base.c | 235 ++++---- + drivers/of/of_mtd.c | 36 ++ + drivers/staging/mt29f_spinand/mt29f_spinand.c | 48 +- + include/linux/fsl_ifc.h | 45 +- + include/linux/leds.h | 6 + + include/linux/mtd/fsmc.h | 18 - + include/linux/mtd/mtd.h | 75 ++- + include/linux/mtd/nand.h | 27 +- + include/linux/mtd/onenand.h | 2 - + include/linux/mtd/sharpsl.h | 2 +- + include/linux/of_mtd.h | 6 + + include/uapi/mtd/mtd-abi.h | 2 +- + 70 files changed, 3172 insertions(+), 2090 deletions(-) + create mode 100644 drivers/leds/trigger/ledtrig-mtd.c + create mode 100644 drivers/leds/trigger/ledtrig-panic.c +Merging crypto/master (b3ab30a7cbda crypto: qat - fix section mismatch warning) +$ git merge crypto/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/DocBook/crypto-API.tmpl | 6 +- + .../devicetree/bindings/crypto/fsl-imx-scc.txt | 21 + + Documentation/devicetree/bindings/rng/hisi-rng.txt | 12 + + MAINTAINERS | 1 + + arch/arm/boot/dts/imx25.dtsi | 9 + + crypto/algif_aead.c | 268 +++++++- + crypto/asymmetric_keys/pkcs7_parser.c | 1 + + crypto/drbg.c | 39 +- + crypto/lzo.c | 2 +- + drivers/char/hw_random/Kconfig | 16 +- + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/exynos-rng.c | 33 +- + drivers/char/hw_random/hisi-rng.c | 126 ++++ + drivers/crypto/Kconfig | 18 +- + drivers/crypto/Makefile | 1 + + drivers/crypto/ccp/ccp-dev.c | 2 +- + drivers/crypto/marvell/hash.c | 3 +- + drivers/crypto/mxc-scc.c | 762 +++++++++++++++++++++ + drivers/crypto/n2_core.c | 2 +- + drivers/crypto/qat/qat_c3xxx/adf_drv.c | 4 +- + .../crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c | 23 - + drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 6 +- + drivers/crypto/qat/qat_c62x/adf_drv.c | 4 +- + drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c | 23 - + drivers/crypto/qat/qat_c62xvf/adf_drv.c | 6 +- + drivers/crypto/qat/qat_common/Makefile | 2 +- + drivers/crypto/qat/qat_common/adf_admin.c | 2 +- + drivers/crypto/qat/qat_common/adf_cfg_strings.h | 2 - + drivers/crypto/qat/qat_common/adf_common_drv.h | 18 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 31 +- + drivers/crypto/qat/qat_common/adf_init.c | 15 +- + drivers/crypto/qat/qat_common/adf_sriov.c | 8 +- + drivers/crypto/qat/qat_common/adf_vf2pf_msg.c | 92 +++ + drivers/crypto/qat/qat_common/adf_vf_isr.c | 61 +- + drivers/crypto/qat/qat_common/qat_asym_algs.c | 4 +- + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 4 +- + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c | 23 - + drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 6 +- + drivers/crypto/s5p-sss.c | 185 ++++- + drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 10 +- + include/crypto/aead.h | 3 +- + include/crypto/hash.h | 3 +- + include/crypto/skcipher.h | 3 +- + include/linux/crypto.h | 3 +- + lib/mpi/mpicoder.c | 122 ++-- + 45 files changed, 1680 insertions(+), 306 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/fsl-imx-scc.txt + create mode 100644 Documentation/devicetree/bindings/rng/hisi-rng.txt + create mode 100644 drivers/char/hw_random/hisi-rng.c + create mode 100644 drivers/crypto/mxc-scc.c + create mode 100644 drivers/crypto/qat/qat_common/adf_vf2pf_msg.c +Merging drm/drm-next (f9fd2adaacd8 Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next) +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/i915/intel_uncore.c +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_lvds.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_gem_userptr.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Removing drivers/gpu/drm/exynos/exynos_dp_reg.c +Removing drivers/gpu/drm/exynos/exynos_dp_core.h +Removing drivers/gpu/drm/exynos/exynos_dp_core.c +Auto-merging drivers/gpu/drm/exynos/Makefile +Auto-merging drivers/gpu/drm/exynos/Kconfig +Auto-merging drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h +Auto-merging arch/arm/boot/dts/exynos5420-smdk5420.dts +Auto-merging arch/arm/boot/dts/exynos5420-peach-pit.dts +Auto-merging arch/arm/boot/dts/exynos5250-spring.dts +Auto-merging arch/arm/boot/dts/exynos5250-snow-common.dtsi +Auto-merging arch/arm/boot/dts/exynos5250-smdk5250.dts +Auto-merging arch/arm/boot/dts/exynos5250-arndale.dts +Merge made by the 'recursive' strategy. + Documentation/DocBook/gpu.tmpl | 8 +- + .../bindings/display/bridge/analogix_dp.txt | 52 + + .../bindings/display/exynos/exynos_dp.txt | 93 +- + .../display/rockchip/analogix_dp-rockchip.txt | 92 + + arch/arm/boot/dts/exynos5250-arndale.dts | 2 - + arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 - + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 +- + arch/arm/boot/dts/exynos5250-spring.dts | 4 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 +- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 2 - + arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 - + 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/Kconfig | 2 + + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/analogix/Kconfig | 3 + + drivers/gpu/drm/bridge/analogix/Makefile | 2 + + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1430 +++++++++++ + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 281 +++ + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 1320 ++++++++++ + .../analogix/analogix_dp_reg.h} | 270 +- + drivers/gpu/drm/bridge/dw-hdmi.c | 7 - + drivers/gpu/drm/cirrus/cirrus_drv.c | 2 - + drivers/gpu/drm/drm_atomic_helper.c | 15 +- + drivers/gpu/drm/drm_crtc.c | 18 +- + drivers/gpu/drm/drm_irq.c | 5 +- + drivers/gpu/drm/drm_sysfs.c | 156 -- + drivers/gpu/drm/exynos/Kconfig | 3 +- + drivers/gpu/drm/exynos/Makefile | 2 +- + drivers/gpu/drm/exynos/exynos_dp.c | 314 +++ + drivers/gpu/drm/exynos/exynos_dp_core.c | 1499 ----------- + drivers/gpu/drm/exynos/exynos_dp_core.h | 282 --- + drivers/gpu/drm/exynos/exynos_dp_reg.c | 1263 ---------- + drivers/gpu/drm/gma500/framebuffer.c | 13 +- + drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 6 +- + drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c | 2 +- + 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 | 480 ++-- + drivers/gpu/drm/i915/i915_drv.c | 32 +- + drivers/gpu/drm/i915/i915_drv.h | 311 ++- + drivers/gpu/drm/i915/i915_gem.c | 410 +-- + 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 | 383 ++- + drivers/gpu/drm/i915/i915_gem_gtt.h | 19 +- + 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 | 280 +-- + 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 | 4 - + 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 | 65 +- + 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 | 141 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 826 ++++++ + 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/rockchip/Kconfig | 9 + + drivers/gpu/drm/rockchip/Makefile | 1 + + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 384 +++ + 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/bridge/analogix_dp.h | 41 + + include/drm/drm_atomic_helper.h | 2 + + include/drm/drm_crtc.h | 14 +- + include/drm/ttm/ttm_bo_driver.h | 3 +- + include/linux/console.h | 2 + + include/uapi/drm/drm.h | 18 +- + include/uapi/drm/drm_mode.h | 10 + + include/video/mipi_display.h | 8 + + 127 files changed, 13186 insertions(+), 10507 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/analogix_dp.txt + create mode 100644 Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt + create mode 100644 drivers/gpu/drm/bridge/analogix/Kconfig + create mode 100644 drivers/gpu/drm/bridge/analogix/Makefile + create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c + create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_core.h + create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c + rename drivers/gpu/drm/{exynos/exynos_dp_reg.h => bridge/analogix/analogix_dp_reg.h} (62%) + create mode 100644 drivers/gpu/drm/exynos/exynos_dp.c + delete mode 100644 drivers/gpu/drm/exynos/exynos_dp_core.c + delete mode 100644 drivers/gpu/drm/exynos/exynos_dp_core.h + delete mode 100644 drivers/gpu/drm/exynos/exynos_dp_reg.c + 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 + create mode 100644 drivers/gpu/drm/rockchip/analogix_dp-rockchip.c + create mode 100644 include/drm/bridge/analogix_dp.h +Merging drm-panel/drm/panel/for-next (bbdca2fd5ab0 drm/panel: simple: Remove useless drm_mode_set_name()) +$ git merge drm-panel/drm/panel/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../display/panel/olimex,lcd-olinuxino-43-ts.txt | 7 ++ + .../bindings/display/panel/ontat,yx700wv03.txt | 7 ++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/gpu/drm/panel/panel-simple.c | 74 +++++++++++++++++++++- + 4 files changed, 88 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino-43-ts.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/ontat,yx700wv03.txt +Merging drm-intel/for-linux-next (5f304c873634 drm/i915/kbl: Reset secondary power well requests left on by DMC/KVMR) +$ git merge drm-intel/for-linux-next +Resolved 'drivers/gpu/drm/i915/i915_irq.c' using previous resolution. +Auto-merging drivers/gpu/drm/i915/intel_uncore.c +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_gem_userptr.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2020d573bbdc] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/Kconfig.debug | 29 + + drivers/gpu/drm/i915/Makefile | 2 + + drivers/gpu/drm/i915/i915_debugfs.c | 134 +++-- + drivers/gpu/drm/i915/i915_dma.c | 43 +- + drivers/gpu/drm/i915/i915_drv.c | 75 ++- + drivers/gpu/drm/i915/i915_drv.h | 203 +++++-- + drivers/gpu/drm/i915/i915_gem.c | 358 ++++++----- + drivers/gpu/drm/i915/i915_gem.h | 34 ++ + drivers/gpu/drm/i915/i915_gem_context.c | 228 +++---- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 53 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 35 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 254 ++++---- + drivers/gpu/drm/i915/i915_gem_gtt.h | 9 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 92 ++- + drivers/gpu/drm/i915/i915_gem_stolen.c | 98 +-- + drivers/gpu/drm/i915/i915_gem_userptr.c | 77 ++- + drivers/gpu/drm/i915/i915_gpu_error.c | 23 +- + drivers/gpu/drm/i915/i915_guc_reg.h | 11 +- + drivers/gpu/drm/i915/i915_irq.c | 605 ++++++++++--------- + drivers/gpu/drm/i915/i915_reg.h | 46 +- + drivers/gpu/drm/i915/i915_trace.h | 2 +- + drivers/gpu/drm/i915/i915_vgpu.c | 36 +- + drivers/gpu/drm/i915/intel_audio.c | 2 +- + drivers/gpu/drm/i915/intel_bios.c | 91 ++- + drivers/gpu/drm/i915/intel_color.c | 45 +- + drivers/gpu/drm/i915/intel_csr.c | 20 +- + drivers/gpu/drm/i915/intel_ddi.c | 229 ++++++- + drivers/gpu/drm/i915/intel_display.c | 928 ++++++++++++++++------------- + drivers/gpu/drm/i915/intel_dp.c | 302 ++++++---- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 36 +- + drivers/gpu/drm/i915/intel_drv.h | 27 +- + drivers/gpu/drm/i915/intel_dsi.c | 204 ++++++- + drivers/gpu/drm/i915/intel_dsi.h | 15 +- + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 184 +++--- + drivers/gpu/drm/i915/intel_dsi_pll.c | 156 +++-- + drivers/gpu/drm/i915/intel_fbc.c | 5 +- + drivers/gpu/drm/i915/intel_fbdev.c | 13 +- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 4 +- + drivers/gpu/drm/i915/intel_guc.h | 2 + + drivers/gpu/drm/i915/intel_guc_loader.c | 51 +- + drivers/gpu/drm/i915/intel_hdmi.c | 2 +- + drivers/gpu/drm/i915/intel_i2c.c | 25 +- + drivers/gpu/drm/i915/intel_lrc.c | 234 +++++--- + drivers/gpu/drm/i915/intel_lrc.h | 11 +- + drivers/gpu/drm/i915/intel_mocs.c | 155 +++-- + drivers/gpu/drm/i915/intel_mocs.h | 2 + + drivers/gpu/drm/i915/intel_opregion.c | 34 +- + drivers/gpu/drm/i915/intel_overlay.c | 18 +- + drivers/gpu/drm/i915/intel_pm.c | 141 ++--- + drivers/gpu/drm/i915/intel_psr.c | 2 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 136 ++--- + drivers/gpu/drm/i915/intel_ringbuffer.h | 32 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 244 +++++--- + drivers/gpu/drm/i915/intel_sprite.c | 34 +- + drivers/gpu/drm/i915/intel_uncore.c | 531 ++++++++++++----- + drivers/gpu/drm/i915/intel_vbt_defs.h | 18 +- + include/drm/drm_mem_util.h | 19 + + include/linux/vmalloc.h | 4 + + mm/vmalloc.c | 27 + + 59 files changed, 3954 insertions(+), 2476 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_gem.h +Merging drm-tegra/drm/tegra/for-next (3a9b33c6048a drm/tegra: Don't set a gamma table size) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/dc.c | 1 - + 1 file changed, 1 deletion(-) +Merging drm-misc/topic/drm-misc (8d4d0d700dda drm/atomic-helper: Print an error if vblank wait times out) +$ git merge drm-misc/topic/drm-misc +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/drm_gem.c +Auto-merging drivers/gpu/drm/drm_edid.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/bochs/bochs_fbdev.c | 15 ---------- + drivers/gpu/drm/bochs/bochs_kms.c | 7 ----- + drivers/gpu/drm/drm_atomic_helper.c | 2 ++ + drivers/gpu/drm/drm_crtc.c | 18 +++++------ + drivers/gpu/drm/drm_crtc_helper.c | 8 +++-- + drivers/gpu/drm/drm_dp_mst_topology.c | 41 +++++++++++++++++++++---- + drivers/gpu/drm/drm_edid.c | 51 ++++++++++++++++++++++++++------ + drivers/gpu/drm/drm_gem.c | 16 +++++----- + drivers/gpu/drm/i915/i915_debugfs.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 9 ------ + include/drm/drmP.h | 2 +- + include/drm/drm_crtc.h | 2 ++ + 12 files changed, 107 insertions(+), 67 deletions(-) +Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (fcda50c8f484 drm/msm: rename hdmi symbols) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (69c2565a3cca drm: ARM HDLCD - fix an error code) +$ git merge hdlcd/for-upstream/hdlcd +Already up-to-date. +Merging drm-vc4/drm-vc4-next (5883980313af drm/vc4: Fix NULL deref in HDMI init error path) +$ git merge drm-vc4/drm-vc4-next +Auto-merging include/uapi/drm/drm_mode.h +Auto-merging drivers/gpu/drm/drm_crtc.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/brcm,bcm-vc4.txt | 36 ++ + drivers/gpu/drm/drm_crtc.c | 2 + + drivers/gpu/drm/vc4/Kconfig | 1 + + drivers/gpu/drm/vc4/Makefile | 1 + + drivers/gpu/drm/vc4/vc4_debugfs.c | 1 + + drivers/gpu/drm/vc4/vc4_dpi.c | 520 +++++++++++++++++++++ + drivers/gpu/drm/vc4/vc4_drv.c | 1 + + drivers/gpu/drm/vc4/vc4_drv.h | 5 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- + include/uapi/drm/drm_mode.h | 2 + + 10 files changed, 570 insertions(+), 1 deletion(-) + create mode 100644 drivers/gpu/drm/vc4/vc4_dpi.c +Merging kbuild/for-next (2468fc97cc45 Merge branch 'kbuild/kbuild' into kbuild/for-next) +$ git merge kbuild/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kconfig/for-next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (8eabbbb9c0c9 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regmap/regmap.txt | 59 +++++++--------------- + drivers/base/regmap/internal.h | 1 + + drivers/base/regmap/regcache-flat.c | 2 +- + drivers/base/regmap/regcache.c | 2 +- + drivers/base/regmap/regmap-mmio.c | 5 +- + drivers/base/regmap/regmap-spmi.c | 2 +- + 6 files changed, 27 insertions(+), 44 deletions(-) +Merging sound/for-next (a19c921fca0a ALSA: lx646es: Fix possible uninitialized variable reference) +$ git merge sound/for-next +Auto-merging sound/pci/hda/patch_hdmi.c +Auto-merging sound/pci/hda/hda_generic.c +Merge made by the 'recursive' strategy. + Documentation/sound/alsa/HD-Audio.txt | 26 +- + Documentation/sound/alsa/timestamping.txt | 2 +- + include/sound/hda_chmap.h | 2 + + include/sound/hda_i915.h | 10 +- + sound/core/pcm_lib.c | 2 +- + sound/firewire/Kconfig | 1 + + sound/firewire/amdtp-stream.c | 4 + + sound/firewire/bebob/bebob.c | 217 +++++++++------ + sound/firewire/bebob/bebob.h | 5 +- + sound/firewire/dice/dice.c | 34 +-- + sound/firewire/digi00x/digi00x-transaction.c | 7 +- + sound/firewire/digi00x/digi00x.c | 107 +++++--- + sound/firewire/digi00x/digi00x.h | 3 + + sound/firewire/fireworks/fireworks.c | 168 ++++++++---- + sound/firewire/fireworks/fireworks.h | 3 + + sound/firewire/lib.c | 32 +++ + sound/firewire/lib.h | 3 + + sound/firewire/oxfw/oxfw.c | 151 +++++++---- + sound/firewire/oxfw/oxfw.h | 4 +- + sound/hda/hdac_i915.c | 47 +++- + sound/hda/hdmi_chmap.c | 44 ++- + sound/pci/ctxfi/cttimer.c | 6 +- + sound/pci/hda/hda_generic.c | 2 + + sound/pci/hda/patch_hdmi.c | 386 ++++++++++++++++++--------- + sound/pci/intel8x0.c | 20 +- + sound/pci/lx6464es/lx_core.c | 2 +- + sound/usb/mixer.c | 78 +++++- + 27 files changed, 925 insertions(+), 441 deletions(-) +Merging sound-asoc/for-next (880e54f0dff2 Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/samsung/odroidx2_max98090.c +Removing Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/davinci-mcbsp.txt | 51 +++ + .../devicetree/bindings/sound/rockchip-i2s.txt | 5 + + .../bindings/sound/samsung,odroidx2-max98090.txt | 35 -- + .../devicetree/bindings/sound/st,sti-asoc-card.txt | 4 +- + .../devicetree/bindings/sound/tas571x.txt | 10 +- + include/sound/hdmi-codec.h | 100 ++++++ + include/sound/pcm_iec958.h | 2 + + include/uapi/sound/asoc.h | 42 ++- + sound/core/pcm_iec958.c | 65 +++- + sound/hda/ext/hdac_ext_stream.c | 5 +- + sound/soc/au1x/dbdma2.c | 4 +- + sound/soc/codecs/Kconfig | 12 +- + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/arizona.c | 14 + + sound/soc/codecs/arizona.h | 2 + + sound/soc/codecs/cs35l32.c | 17 +- + sound/soc/codecs/cs47l24.c | 44 ++- + sound/soc/codecs/hdac_hdmi.c | 94 +++-- + sound/soc/codecs/hdmi-codec.c | 396 +++++++++++++++++++++ + sound/soc/codecs/nau8825.c | 310 ++++++++++------ + sound/soc/codecs/nau8825.h | 28 +- + sound/soc/codecs/rt5640.c | 2 +- + sound/soc/codecs/rt5640.h | 36 +- + sound/soc/codecs/rt5645.c | 6 + + sound/soc/codecs/rt5677.c | 24 +- + sound/soc/codecs/tas571x.c | 141 +++++++- + sound/soc/codecs/tas571x.h | 22 ++ + sound/soc/codecs/wm5102.c | 5 + + sound/soc/codecs/wm5110.c | 2 + + sound/soc/codecs/wm8962.c | 11 +- + sound/soc/codecs/wm8962.h | 6 +- + sound/soc/codecs/wm8997.c | 2 + + sound/soc/codecs/wm8998.c | 2 + + sound/soc/codecs/wm_adsp.c | 52 ++- + sound/soc/davinci/Kconfig | 6 +- + sound/soc/davinci/davinci-i2s.c | 80 +++-- + sound/soc/dwc/designware_i2s.c | 14 +- + sound/soc/fsl/imx-pcm-fiq.c | 2 +- + sound/soc/intel/Kconfig | 2 +- + sound/soc/intel/common/sst-acpi.h | 9 + + sound/soc/intel/haswell/sst-haswell-ipc.c | 2 +- + 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 | 42 ++- + sound/soc/intel/skylake/skl-topology.h | 8 +- + sound/soc/intel/skylake/skl.c | 32 +- + sound/soc/omap/mcbsp.c | 8 + + sound/soc/qcom/lpass-platform.c | 8 +- + sound/soc/rockchip/rockchip_i2s.c | 67 +++- + sound/soc/rockchip/rockchip_i2s.h | 7 + + sound/soc/samsung/Kconfig | 8 - + sound/soc/samsung/Makefile | 2 - + sound/soc/samsung/i2s.c | 31 +- + sound/soc/samsung/odroidx2_max98090.c | 185 ---------- + sound/soc/soc-dapm.c | 7 + + sound/soc/sti/sti_uniperif.c | 144 +++++++- + sound/soc/sti/uniperif.h | 220 +++++++++++- + sound/soc/sti/uniperif_player.c | 182 +++++++--- + sound/soc/sti/uniperif_reader.c | 229 ++++++++---- + 62 files changed, 2591 insertions(+), 725 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/davinci-mcbsp.txt + delete mode 100644 Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt + create mode 100644 include/sound/hdmi-codec.h + create mode 100644 sound/soc/codecs/hdmi-codec.c + create mode 100644 sound/soc/intel/skylake/bxt-sst.c + delete mode 100644 sound/soc/samsung/odroidx2_max98090.c +Merging modules/modules-next (13771c666003 module: Issue warnings when tainting kernel) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + include/linux/module.h | 4 ++-- + kernel/module.c | 16 ++++++++++++---- + 2 files changed, 14 insertions(+), 6 deletions(-) +Merging input/next (74813cebd678 Input: bcm_iproc_tsc - use syscon to access shared registers) +$ git merge input/next +Auto-merging drivers/input/tablet/gtco.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/gpio-keys.txt | 10 +-- + .../input/touchscreen/brcm,iproc-touchscreen.txt | 21 ++++-- + arch/arm/boot/dts/bcm-cygnus.dtsi | 11 +++- + drivers/input/keyboard/omap-keypad.c | 52 +-------------- + drivers/input/tablet/acecad.c | 12 ++-- + drivers/input/tablet/aiptek.c | 20 +++--- + drivers/input/tablet/gtco.c | 24 +++---- + drivers/input/tablet/kbtab.c | 8 +-- + drivers/input/touchscreen/bcm_iproc_tsc.c | 77 ++++++++++++---------- + drivers/input/touchscreen/ti_am335x_tsc.c | 16 ++--- + 10 files changed, 111 insertions(+), 140 deletions(-) +Merging block/for-next (06fde609f0bd Merge branch 'for-4.7/drivers' into for-next) +$ git merge block/for-next +Auto-merging drivers/nvme/host/pci.c +Auto-merging drivers/mmc/card/block.c +Auto-merging drivers/block/loop.c +Merge made by the 'recursive' strategy. + Documentation/block/queue-sysfs.txt | 9 ++ + Documentation/block/writeback_cache_control.txt | 4 +- + arch/um/drivers/ubd_kern.c | 2 +- + block/blk-core.c | 8 +- + block/blk-flush.c | 11 +- + block/blk-mq-tag.c | 17 ++- + block/blk-settings.c | 50 ++++---- + block/blk-sysfs.c | 39 +++++++ + drivers/block/drbd/drbd_main.c | 2 +- + drivers/block/loop.c | 2 +- + drivers/block/mtip32xx/mtip32xx.c | 12 +- + drivers/block/nbd.c | 4 +- + drivers/block/osdblk.c | 2 +- + drivers/block/ps3disk.c | 2 +- + drivers/block/skd_main.c | 4 +- + drivers/block/virtio_blk.c | 6 +- + drivers/block/xen-blkback/xenbus.c | 2 +- + drivers/block/xen-blkfront.c | 3 +- + drivers/ide/ide-disk.c | 6 +- + drivers/md/bcache/super.c | 2 +- + drivers/md/dm-table.c | 20 ++-- + drivers/md/md.c | 2 +- + drivers/md/raid5-cache.c | 3 +- + drivers/mmc/card/block.c | 2 +- + drivers/mtd/mtd_blkdevs.c | 2 +- + drivers/nvme/host/core.c | 112 +++++++++++++++++- + drivers/nvme/host/nvme.h | 55 ++------- + drivers/nvme/host/pci.c | 145 +++++++++++------------- + drivers/scsi/sd.c | 10 +- + drivers/target/target_core_iblock.c | 6 +- + include/linux/blk-mq.h | 4 +- + include/linux/blkdev.h | 11 +- + mm/page-writeback.c | 6 +- + 33 files changed, 343 insertions(+), 222 deletions(-) +Merging device-mapper/for-next (3ff6a535b994 dm mpath: eliminate use of spinlock in IO fast-paths) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-mpath.c | 351 ++++++++++++++++++++++++++++---------------------- + drivers/md/dm-thin.c | 2 +- + drivers/md/dm.c | 10 +- + 3 files changed, 200 insertions(+), 163 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 (7af73d0b0f28 Merge branch 'fixes' into next) +$ git merge mmc-uh/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 3 + + arch/arm/mach-davinci/devices-da8xx.c | 20 -- + arch/arm/mach-davinci/devices.c | 16 -- + drivers/mmc/core/Kconfig | 21 ++ + drivers/mmc/core/Makefile | 4 +- + drivers/mmc/core/core.c | 12 +- + drivers/mmc/core/mmc.c | 29 ++- + drivers/mmc/core/pwrseq.c | 108 ++++----- + drivers/mmc/core/pwrseq.h | 19 +- + drivers/mmc/core/pwrseq_emmc.c | 81 ++++--- + drivers/mmc/core/pwrseq_simple.c | 91 +++---- + drivers/mmc/host/Kconfig | 1 + + drivers/mmc/host/atmel-mci.c | 9 - + drivers/mmc/host/davinci_mmc.c | 151 +++++------- + drivers/mmc/host/dw_mmc-exynos.c | 23 +- + drivers/mmc/host/dw_mmc-rockchip.c | 43 ++-- + drivers/mmc/host/dw_mmc.c | 11 +- + drivers/mmc/host/dw_mmc.h | 2 - + drivers/mmc/host/mmci.c | 20 -- + drivers/mmc/host/mtk-sd.c | 19 +- + drivers/mmc/host/omap_hsmmc.c | 34 +-- + drivers/mmc/host/sdhci-acpi.c | 90 ++++++- + drivers/mmc/host/sdhci-of-at91.c | 48 +++- + drivers/mmc/host/sdhci-pci-core.c | 9 +- + drivers/mmc/host/sdhci-pic32.c | 1 - + drivers/mmc/host/sdhci.c | 263 ++++++++++----------- + drivers/mmc/host/sdhci.h | 7 +- + drivers/mmc/host/sh_mmcif.c | 74 +++--- + drivers/mmc/host/sh_mobile_sdhi.c | 118 ++++++++- + drivers/mmc/host/tmio_mmc.h | 8 +- + drivers/mmc/host/tmio_mmc_pio.c | 121 +++++----- + include/linux/mmc/dw_mmc.h | 12 +- + include/linux/mmc/host.h | 31 ++- + include/linux/mmc/tmio.h | 2 + + include/trace/events/mmc.h | 182 ++++++++++++++ + 35 files changed, 983 insertions(+), 700 deletions(-) + create mode 100644 include/trace/events/mmc.h +Merging md/for-next (7dedd15dd252 md/raid0: fix uninitialized variable bug) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/raid0.c | 1 + + 1 file changed, 1 insertion(+) +Merging mfd/for-mfd-next (a557a7a09b08 mfd: lp8788-irq: Uninitialized variable in irq handler) +$ git merge mfd/for-mfd-next +Auto-merging drivers/mfd/mfd-core.c +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 (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry) +$ git merge battery/master +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/arm/atmel-at91.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/atmel-at91.txt | 59 +++++ + MAINTAINERS | 5 + + drivers/power/ipaq_micro_battery.c | 2 +- + drivers/power/max8925_power.c | 10 +- + drivers/power/reset/Kconfig | 8 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/at91-sama5d2_shdwc.c | 282 +++++++++++++++++++++ + drivers/power/sbs-battery.c | 4 - + 8 files changed, 361 insertions(+), 10 deletions(-) + create mode 100644 drivers/power/reset/at91-sama5d2_shdwc.c +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 (a3a6f6a965e9 Merge remote-tracking branches 'regulator/topic/s2mps11', 'regulator/topic/sysfs-init' and 'regulator/topic/twl' into regulator-next) +$ git merge regulator/for-next +Auto-merging drivers/regulator/max8997-regulator.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/regulator/max8973-regulator.txt | 7 + + .../devicetree/bindings/regulator/pv88080.txt | 49 +++ + .../bindings/regulator/qcom,spmi-regulator.txt | 37 ++ + .../bindings/regulator/twl-regulator.txt | 6 + + MAINTAINERS | 6 +- + drivers/regulator/Kconfig | 8 + + drivers/regulator/Makefile | 7 +- + drivers/regulator/act8865-regulator.c | 113 ++++-- + drivers/regulator/as3722-regulator.c | 65 +++- + drivers/regulator/core.c | 102 +++-- + drivers/regulator/gpio-regulator.c | 2 + + drivers/regulator/lp3971.c | 2 +- + drivers/regulator/lp3972.c | 2 +- + .../regulator/{max14577.c => max14577-regulator.c} | 0 + drivers/regulator/max77686-regulator.c | 12 +- + .../regulator/{max77693.c => max77693-regulator.c} | 0 + drivers/regulator/max77802-regulator.c | 2 +- + drivers/regulator/max8973-regulator.c | 97 +++++ + .../regulator/{max8997.c => max8997-regulator.c} | 2 +- + drivers/regulator/of_regulator.c | 6 +- + drivers/regulator/pv88080-regulator.c | 419 +++++++++++++++++++++ + drivers/regulator/pv88080-regulator.h | 92 +++++ + drivers/regulator/pwm-regulator.c | 61 +-- + drivers/regulator/qcom_spmi-regulator.c | 275 +++++++++----- + drivers/regulator/s2mps11.c | 41 +- + drivers/regulator/twl-regulator.c | 106 +++++- + include/linux/mfd/as3722.h | 1 + + include/linux/mfd/samsung/core.h | 3 + + 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 + + include/linux/regulator/max8973-regulator.h | 5 + + 34 files changed, 1299 insertions(+), 243 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/pv88080.txt + 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} (99%) + create mode 100644 drivers/regulator/pv88080-regulator.c + create mode 100644 drivers/regulator/pv88080-regulator.h +Merging security/next (3c9d6296b7ae security: drop the unused hook skb_owned_by) +$ git merge security/next +Auto-merging security/security.c +Auto-merging include/linux/lsm_hooks.h +Merge made by the 'recursive' strategy. + include/linux/lsm_hooks.h | 1 - + security/security.c | 1 - + 2 files changed, 2 deletions(-) +Merging integrity/next (f5f8f020b2da ima: add support for creating files using the mknodat syscall) +$ git merge integrity/next +Auto-merging fs/namei.c +Merge made by the 'recursive' strategy. + fs/exec.c | 29 +++++++++++++++++++++-------- + fs/namei.c | 2 ++ + include/linux/ima.h | 6 ++++++ + security/integrity/ima/ima_appraise.c | 7 ++++++- + security/integrity/ima/ima_main.c | 25 ++++++++++++++++++++++++- + security/integrity/integrity.h | 1 + + 6 files changed, 60 insertions(+), 10 deletions(-) +Merging keys/keys-next (1ea6102bba5f Merge branch 'keys-trust' into keys-next) +$ git merge keys/keys-next +Resolved 'crypto/asymmetric_keys/pkcs7_parser.c' using previous resolution. +Removing include/linux/verify_pefile.h +Auto-merging crypto/asymmetric_keys/pkcs7_parser.c +CONFLICT (content): Merge conflict in crypto/asymmetric_keys/pkcs7_parser.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f50c4fa10548] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/security/keys.txt | 52 ++++++ + arch/x86/kernel/kexec-bzimage64.c | 18 +- + certs/Kconfig | 9 + + certs/system_keyring.c | 139 +++++++++++--- + crypto/asymmetric_keys/Kconfig | 6 +- + crypto/asymmetric_keys/Makefile | 5 +- + crypto/asymmetric_keys/asymmetric_keys.h | 2 + + crypto/asymmetric_keys/asymmetric_type.c | 96 +++++++++- + crypto/asymmetric_keys/mscode_parser.c | 21 +-- + crypto/asymmetric_keys/pkcs7_key_type.c | 72 +++----- + crypto/asymmetric_keys/pkcs7_parser.c | 58 +++--- + crypto/asymmetric_keys/pkcs7_parser.h | 11 +- + crypto/asymmetric_keys/pkcs7_trust.c | 43 ++--- + crypto/asymmetric_keys/pkcs7_verify.c | 107 +++++------ + crypto/asymmetric_keys/public_key.c | 20 +- + crypto/asymmetric_keys/restrict.c | 108 +++++++++++ + crypto/asymmetric_keys/signature.c | 18 ++ + crypto/asymmetric_keys/verify_pefile.c | 40 +--- + crypto/asymmetric_keys/verify_pefile.h | 5 +- + crypto/asymmetric_keys/x509_cert_parser.c | 52 +++--- + crypto/asymmetric_keys/x509_parser.h | 12 +- + crypto/asymmetric_keys/x509_public_key.c | 297 +++++++++--------------------- + fs/cifs/cifsacl.c | 2 +- + fs/nfs/nfs4idmap.c | 2 +- + include/crypto/pkcs7.h | 6 +- + include/crypto/public_key.h | 33 ++-- + include/keys/asymmetric-subtype.h | 2 +- + include/keys/asymmetric-type.h | 13 +- + include/keys/system_keyring.h | 41 ++--- + include/linux/key-type.h | 1 - + include/linux/key.h | 44 +++-- + include/linux/verification.h | 49 +++++ + include/linux/verify_pefile.h | 22 --- + include/uapi/linux/keyctl.h | 10 + + kernel/module_signing.c | 7 +- + net/dns_resolver/dns_key.c | 2 +- + net/rxrpc/ar-key.c | 4 +- + security/integrity/Kconfig | 1 - + security/integrity/digsig.c | 15 +- + security/integrity/ima/Kconfig | 35 ++-- + security/integrity/ima/Makefile | 2 +- + security/integrity/ima/ima_mok.c | 23 +-- + security/keys/Kconfig | 15 ++ + security/keys/Makefile | 1 + + security/keys/big_key.c | 198 ++++++++++++++++++-- + security/keys/compat.c | 4 + + security/keys/dh.c | 160 ++++++++++++++++ + security/keys/internal.h | 12 ++ + security/keys/key.c | 42 ++++- + security/keys/keyctl.c | 5 + + security/keys/keyring.c | 46 ++++- + security/keys/persistent.c | 4 +- + security/keys/process_keys.c | 16 +- + security/keys/request_key.c | 4 +- + security/keys/request_key_auth.c | 2 +- + security/keys/user_defined.c | 42 ++--- + 56 files changed, 1339 insertions(+), 717 deletions(-) + create mode 100644 crypto/asymmetric_keys/restrict.c + create mode 100644 include/linux/verification.h + delete mode 100644 include/linux/verify_pefile.h + create mode 100644 security/keys/dh.c +Merging selinux/next (0fd71a620be8 selinux: Change bool variable name to index.) +$ 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 | 95 +++++++++++++++++++++++++--------- + security/selinux/include/classmap.h | 2 +- + security/selinux/include/conditional.h | 2 +- + security/selinux/include/objsec.h | 5 +- + security/selinux/ss/services.c | 6 +-- + 6 files changed, 78 insertions(+), 34 deletions(-) +Merging tpmdd/next (0c61500a7f09 tpm/st33zp24: Remove unneeded tpm_reg in get_burstcount) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/st33zp24/Kconfig | 11 +- + drivers/char/tpm/st33zp24/i2c.c | 65 +++++++--- + drivers/char/tpm/st33zp24/spi.c | 179 +++++++++++++++------------ + drivers/char/tpm/st33zp24/st33zp24.c | 12 +- + drivers/char/tpm/st33zp24/st33zp24.h | 2 +- + drivers/char/tpm/tpm-chip.c | 215 +++++++++++++++++++++++---------- + 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 | 9 +- + drivers/char/tpm/tpm_atmel.c | 14 +-- + drivers/char/tpm/tpm_crb.c | 32 ++--- + 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 | 29 ++--- + include/linux/platform_data/st33zp24.h | 2 +- + 22 files changed, 461 insertions(+), 304 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 (ba72c4136584 Merge branches 'iommu/fixes', 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'x86/amd' and 'ppc/pamu' into next) +$ git merge iommu/next +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 7 + + drivers/iommu/Kconfig | 3 +- + drivers/iommu/amd_iommu.c | 167 +++++++++++++++--- + drivers/iommu/amd_iommu_init.c | 329 +++++++++++++++++++++++++++++++----- + drivers/iommu/amd_iommu_types.h | 14 ++ + drivers/iommu/dmar.c | 47 +++--- + drivers/iommu/intel-iommu.c | 2 +- + drivers/iommu/io-pgtable-arm-v7s.c | 29 +++- + drivers/iommu/io-pgtable-arm.c | 9 +- + drivers/iommu/io-pgtable.c | 3 +- + drivers/iommu/io-pgtable.h | 6 + + drivers/iommu/mtk_iommu.c | 14 +- + drivers/iommu/omap-iommu-debug.c | 2 +- + drivers/iommu/omap-iommu.c | 10 +- + drivers/iommu/rockchip-iommu.c | 2 + + include/linux/iommu.h | 1 + + 16 files changed, 545 insertions(+), 100 deletions(-) +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 (78f3873decad Documentation: HOWTO: update git home URL in translations) +$ git merge jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/IRQ-domain.txt | 12 +++++++++++ + Documentation/block/00-INDEX | 4 ++++ + Documentation/ja_JP/HOWTO | 6 ------ + Documentation/kernel-docs.txt | 29 +++++++++++++++---------- + Documentation/ko_KR/HOWTO | 8 +++---- + Documentation/mmc/00-INDEX | 2 ++ + Documentation/mmc/mmc-tools.txt | 34 ++++++++++++++++++++++++++++++ + Documentation/networking/filter.txt | 2 +- + Documentation/serial/driver | 42 ++++++++++++++++++++++++++----------- + Documentation/vm/pagemap.txt | 2 +- + Documentation/zh_CN/HOWTO | 4 +--- + README | 20 +++++++++--------- + 12 files changed, 116 insertions(+), 49 deletions(-) + create mode 100644 Documentation/mmc/mmc-tools.txt +Merging trivial/for-next (dc5a533f9130 serial: mctrl_gpio: Grammar s/lines GPIOs/line GPIOs/, /sets/set/) +$ git merge trivial/for-next +Merge made by the 'recursive' strategy. + arch/avr32/include/asm/addrspace.h | 2 +- + arch/blackfin/lib/udivsi3.S | 2 +- + arch/blackfin/mach-bf609/include/mach/defBF60x_base.h | 2 +- + arch/c6x/include/asm/clock.h | 2 +- + arch/c6x/platforms/cache.c | 2 +- + arch/cris/arch-v10/drivers/axisflashmap.c | 2 +- + arch/cris/arch-v32/drivers/axisflashmap.c | 2 +- + arch/cris/arch-v32/drivers/cryptocop.c | 2 +- + arch/cris/arch-v32/mach-a3/dram_init.S | 2 +- + arch/cris/arch-v32/mach-fs/dram_init.S | 2 +- + arch/hexagon/include/asm/hexagon_vm.h | 2 +- + arch/hexagon/include/asm/vm_mmu.h | 2 +- + arch/hexagon/kernel/kgdb.c | 4 ++-- + arch/hexagon/kernel/vm_ops.S | 2 +- + arch/hexagon/lib/memcpy.S | 2 +- + arch/ia64/include/asm/sn/ioc3.h | 2 +- + arch/ia64/include/asm/sn/shubio.h | 4 ++-- + arch/ia64/kernel/efi.c | 2 +- + arch/ia64/lib/idiv32.S | 2 +- + arch/ia64/lib/idiv64.S | 2 +- + arch/metag/include/asm/metag_regs.h | 2 +- + arch/metag/include/asm/tbx.h | 6 +++--- + arch/metag/tbx/tbipcx.S | 2 +- + arch/metag/tbx/tbisoft.S | 6 +++--- + arch/x86/kernel/cpu/microcode/intel.c | 2 +- + arch/x86/kvm/iommu.c | 2 +- + block/partitions/efi.c | 4 ++-- + drivers/edac/amd64_edac.c | 2 +- + drivers/mtd/sm_ftl.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 4 ++-- + drivers/scsi/aic94xx/aic94xx_hwi.c | 2 +- + drivers/scsi/aic94xx/aic94xx_seq.c | 2 +- + drivers/scsi/isci/port.c | 2 +- + drivers/tty/serial/serial_mctrl_gpio.h | 4 ++-- + drivers/w1/w1_io.c | 2 +- + fs/exofs/super.c | 2 +- + fs/jbd2/recovery.c | 2 +- + fs/jbd2/transaction.c | 6 +++--- + fs/super.c | 2 +- + net/tipc/socket.c | 2 +- + tools/perf/tests/openat-syscall-all-cpus.c | 2 +- + tools/perf/util/evsel.c | 2 +- + tools/perf/util/machine.c | 2 +- + tools/perf/util/parse-events.c | 2 +- + tools/perf/util/session.c | 2 +- + 46 files changed, 57 insertions(+), 57 deletions(-) +Merging audit/next (7ffb8e317bae audit: we don't need to __set_current_state(TASK_RUNNING)) +$ git merge audit/next +Auto-merging kernel/audit.c +Merge made by the 'recursive' strategy. + kernel/audit.c | 12 +++++------- + kernel/audit_tree.c | 12 +++++------- + 2 files changed, 10 insertions(+), 14 deletions(-) +Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (bc553986a2f7 dtc: turn off dtc unit address warnings by default) +$ git merge dt-rh/for-next +Merge made by the 'recursive' strategy. + scripts/Makefile.lib | 5 +++++ + scripts/dtc/checks.c | 26 ++++++++++++++++++++++++++ + scripts/dtc/flattree.c | 4 ++-- + scripts/dtc/libfdt/fdt_ro.c | 6 ++---- + scripts/dtc/version_gen.h | 2 +- + 5 files changed, 36 insertions(+), 7 deletions(-) +Merging mailbox/mailbox-for-next (aca04ce5dbda Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (83c0d79ca937 Merge remote-tracking branch 'spi/topic/xlp' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + .../bindings/spi/microchip,spi-pic32.txt | 34 + + .../devicetree/bindings/spi/sqi-pic32.txt | 18 + + drivers/spi/Kconfig | 14 +- + drivers/spi/Makefile | 2 + + drivers/spi/spi-bcm53xx.c | 78 +- + drivers/spi/spi-cadence.c | 244 +++--- + drivers/spi/spi-dln2.c | 3 + + drivers/spi/spi-fsl-dspi.c | 11 +- + drivers/spi/spi-fsl-espi.c | 30 +- + drivers/spi/spi-octeon.c | 17 +- + drivers/spi/spi-omap2-mcspi.c | 62 +- + drivers/spi/spi-pic32-sqi.c | 768 ++++++++++++++++++ + drivers/spi/spi-pic32.c | 888 +++++++++++++++++++++ + drivers/spi/spi-pxa2xx-dma.c | 28 +- + drivers/spi/spi-pxa2xx.c | 14 +- + drivers/spi/spi-pxa2xx.h | 3 - + drivers/spi/spi-ti-qspi.c | 45 +- + drivers/spi/spi.c | 1 + + 18 files changed, 2076 insertions(+), 184 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/microchip,spi-pic32.txt + create mode 100644 Documentation/devicetree/bindings/spi/sqi-pic32.txt + create mode 100644 drivers/spi/spi-pic32-sqi.c + create mode 100644 drivers/spi/spi-pic32.c +Merging tip/auto-latest (0db6774ba37d Merge branch 'x86/cleanups') +$ git merge tip/auto-latest +Recorded preimage for 'drivers/cpufreq/longhaul.c' +Auto-merging tools/perf/util/session.c +Auto-merging tools/perf/util/parse-events.c +Auto-merging tools/perf/util/machine.c +Auto-merging tools/perf/util/evsel.c +Removing tools/perf/arch/x86/util/tsc.h +Removing lib/proportions.c +Auto-merging kernel/trace/trace_event_perf.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/events/core.c +Auto-merging include/linux/sched.h +Removing include/linux/proportions.h +Auto-merging include/linux/perf_event.h +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/cpufreq/longhaul.c +CONFLICT (content): Merge conflict in drivers/cpufreq/longhaul.c +Removing arch/xtensa/include/asm/rwsem.h +Auto-merging arch/x86/crypto/sha-mb/sha1_mb.c +Removing arch/sparc/include/asm/rwsem.h +Removing arch/sh/include/asm/rwsem.h +Auto-merging arch/arm64/kernel/hw_breakpoint.c +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/cpufreq/longhaul.c'. +[master f1832adf14cf] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 8 + + Documentation/memory-barriers.txt | 78 +-- + Documentation/x86/pat.txt | 32 + + arch/arm/kernel/hw_breakpoint.c | 4 +- + arch/arm64/kernel/hw_breakpoint.c | 4 +- + arch/ia64/include/asm/iommu.h | 1 - + arch/s390/include/asm/rwsem.h | 7 +- + arch/sh/include/asm/Kbuild | 1 + + arch/sh/include/asm/rwsem.h | 132 ---- + arch/sparc/include/asm/Kbuild | 1 + + arch/sparc/include/asm/rwsem.h | 124 ---- + arch/x86/Kconfig | 15 +- + arch/x86/crypto/aesni-intel_glue.c | 2 +- + arch/x86/crypto/camellia_aesni_avx2_glue.c | 5 +- + arch/x86/crypto/camellia_aesni_avx_glue.c | 4 +- + arch/x86/crypto/chacha20_glue.c | 3 +- + arch/x86/crypto/poly1305_glue.c | 5 +- + arch/x86/crypto/serpent_avx2_glue.c | 2 +- + arch/x86/crypto/serpent_sse2_glue.c | 2 +- + arch/x86/crypto/sha-mb/sha1_mb.c | 4 +- + arch/x86/crypto/sha1_ssse3_glue.c | 2 +- + arch/x86/crypto/sha256_ssse3_glue.c | 2 +- + arch/x86/crypto/sha512_ssse3_glue.c | 2 +- + arch/x86/entry/entry_64.S | 12 +- + arch/x86/entry/syscalls/syscall_32.tbl | 4 +- + arch/x86/entry/syscalls/syscall_64.tbl | 2 + + arch/x86/entry/vdso/vclock_gettime.c | 15 - + arch/x86/entry/vdso/vdso-layout.lds.S | 5 +- + arch/x86/entry/vdso/vma.c | 11 - + arch/x86/events/Kconfig | 36 ++ + arch/x86/events/Makefile | 9 +- + arch/x86/events/amd/uncore.c | 2 + + arch/x86/events/core.c | 2 +- + arch/x86/events/intel/Makefile | 9 + + arch/x86/events/intel/bts.c | 105 ++-- + arch/x86/events/intel/cstate.c | 547 ++++++++--------- + arch/x86/events/intel/pt.c | 87 +-- + arch/x86/events/intel/rapl.c | 121 ++-- + arch/x86/events/intel/uncore.c | 218 ++++--- + arch/x86/events/msr.c | 36 +- + arch/x86/ia32/ia32_signal.c | 2 +- + arch/x86/include/asm/apic.h | 4 +- + arch/x86/include/asm/bios_ebda.h | 21 - + arch/x86/include/asm/clocksource.h | 9 +- + arch/x86/include/asm/cpufeature.h | 25 - + arch/x86/include/asm/cpufeatures.h | 5 + + arch/x86/include/asm/irq_work.h | 2 +- + arch/x86/include/asm/msr-index.h | 4 + + arch/x86/include/asm/msr.h | 20 +- + arch/x86/include/asm/mtrr.h | 6 +- + arch/x86/include/asm/paravirt.h | 45 +- + arch/x86/include/asm/paravirt_types.h | 14 +- + arch/x86/include/asm/pat.h | 2 +- + arch/x86/include/asm/pgtable.h | 2 +- + arch/x86/include/asm/rwsem.h | 7 +- + arch/x86/include/asm/tlbflush.h | 2 +- + arch/x86/include/asm/tsc.h | 2 +- + arch/x86/include/asm/uaccess.h | 25 +- + arch/x86/include/asm/uv/uv_bau.h | 2 +- + arch/x86/include/asm/xor_32.h | 2 +- + arch/x86/include/asm/xor_avx.h | 4 +- + arch/x86/kernel/acpi/boot.c | 8 +- + arch/x86/kernel/apic/apic.c | 32 +- + arch/x86/kernel/apic/apic_noop.c | 4 +- + arch/x86/kernel/apic/io_apic.c | 2 +- + arch/x86/kernel/apic/ipi.c | 2 +- + arch/x86/kernel/apic/vector.c | 2 +- + arch/x86/kernel/cpu/amd.c | 20 +- + arch/x86/kernel/cpu/common.c | 80 ++- + arch/x86/kernel/cpu/cyrix.c | 2 +- + arch/x86/kernel/cpu/intel.c | 12 +- + arch/x86/kernel/cpu/mcheck/mce.c | 4 +- + arch/x86/kernel/cpu/mcheck/mce_intel.c | 2 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 2 +- + arch/x86/kernel/cpu/mshyperv.c | 12 + + arch/x86/kernel/cpu/mtrr/cyrix.c | 4 +- + arch/x86/kernel/cpu/mtrr/generic.c | 28 +- + arch/x86/kernel/cpu/mtrr/main.c | 13 +- + arch/x86/kernel/cpu/mtrr/mtrr.h | 1 + + arch/x86/kernel/cpu/vmware.c | 2 +- + arch/x86/kernel/devicetree.c | 2 +- + arch/x86/kernel/dumpstack.c | 19 +- + arch/x86/kernel/fpu/bugs.c | 16 +- + arch/x86/kernel/fpu/core.c | 50 +- + arch/x86/kernel/fpu/init.c | 16 +- + arch/x86/kernel/fpu/regset.c | 25 +- + arch/x86/kernel/fpu/xstate.c | 18 +- + arch/x86/kernel/head_32.S | 116 ++-- + arch/x86/kernel/head_64.S | 103 ++-- + arch/x86/kernel/hpet.c | 3 +- + arch/x86/kernel/kvm.c | 2 +- + arch/x86/kernel/paravirt.c | 6 +- + arch/x86/kernel/pci-iommu_table.c | 2 +- + arch/x86/kernel/process_64.c | 167 +++--- + arch/x86/kernel/signal.c | 4 +- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/kernel/tce_64.c | 2 +- + arch/x86/kernel/tsc.c | 33 +- + arch/x86/kernel/uprobes.c | 4 +- + arch/x86/kvm/cpuid.c | 2 +- + arch/x86/kvm/mmu.c | 3 +- + arch/x86/kvm/trace.h | 3 +- + arch/x86/kvm/vmx.c | 2 +- + arch/x86/kvm/x86.c | 16 +- + arch/x86/lib/usercopy_32.c | 4 +- + arch/x86/mm/extable.c | 86 ++- + arch/x86/mm/hugetlbpage.c | 4 +- + arch/x86/mm/init.c | 8 +- + arch/x86/mm/init_32.c | 2 +- + arch/x86/mm/init_64.c | 4 +- + arch/x86/mm/ioremap.c | 4 +- + arch/x86/mm/pageattr.c | 4 +- + arch/x86/mm/pat.c | 109 ++-- + arch/x86/oprofile/nmi_int.c | 6 +- + arch/x86/oprofile/op_model_ppro.c | 2 +- + arch/x86/pci/xen.c | 2 +- + arch/x86/platform/uv/tlb_uv.c | 35 +- + arch/x86/power/hibernate_32.c | 2 +- + arch/x86/ras/Kconfig | 2 +- + arch/x86/ras/Makefile | 2 +- + arch/x86/xen/enlighten.c | 40 +- + arch/xtensa/include/asm/Kbuild | 1 + + arch/xtensa/include/asm/rwsem.h | 131 ---- + drivers/cpufreq/longhaul.c | 2 +- + drivers/gpu/drm/drm_cache.c | 6 +- + drivers/gpu/drm/i915/i915_gem.c | 2 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- + drivers/input/joystick/analog.c | 6 +- + drivers/iommu/irq_remapping.c | 2 +- + drivers/lguest/x86/core.c | 2 +- + drivers/net/hamradio/baycom_epp.c | 8 +- + drivers/staging/unisys/visorbus/visorchipset.c | 2 +- + include/asm-generic/rwsem.h | 13 +- + include/asm-generic/vmlinux.lds.h | 4 +- + include/linux/futex.h | 12 +- + include/linux/perf_event.h | 6 + + include/linux/proportions.h | 137 ----- + include/linux/rwsem-spinlock.h | 2 +- + include/linux/rwsem.h | 2 + + include/linux/sched.h | 35 +- + include/uapi/linux/futex.h | 6 +- + include/uapi/linux/perf_event.h | 1 + + kernel/events/core.c | 156 ++++- + kernel/events/internal.h | 10 +- + kernel/events/ring_buffer.c | 104 +++- + kernel/fork.c | 7 + + kernel/futex.c | 557 ++++++++++++++++- + kernel/locking/lockdep.c | 2 +- + kernel/locking/locktorture.c | 18 +- + kernel/locking/rwsem-spinlock.c | 19 +- + kernel/locking/rwsem-xadd.c | 31 +- + kernel/sched/clock.c | 48 +- + kernel/sched/core.c | 73 ++- + kernel/sched/cpuacct.c | 147 ++++- + kernel/sched/fair.c | 74 ++- + kernel/sched/sched.h | 1 + + kernel/trace/trace_event_perf.c | 3 + + lib/Makefile | 2 +- + lib/proportions.c | 407 ------------- + tools/build/Makefile.feature | 2 + + tools/build/feature/Makefile | 4 + + tools/build/feature/test-all.c | 5 + + tools/build/feature/test-dwarf_getlocations.c | 12 + + tools/objtool/Documentation/stack-validation.txt | 38 +- + tools/objtool/builtin-check.c | 97 ++- + tools/perf/Documentation/intel-pt.txt | 7 + + tools/perf/Documentation/itrace.txt | 8 + + tools/perf/Documentation/perf-annotate.txt | 2 +- + tools/perf/Documentation/perf-diff.txt | 2 +- + tools/perf/Documentation/perf-list.txt | 107 +++- + tools/perf/Documentation/perf-mem.txt | 8 + + tools/perf/Documentation/perf-report.txt | 2 +- + tools/perf/Documentation/perf-sched.txt | 16 + + tools/perf/Documentation/perf-script.txt | 14 + + tools/perf/Documentation/perf-trace.txt | 32 + + tools/perf/Makefile.perf | 15 +- + tools/perf/arch/x86/Makefile | 23 + + tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 374 ++++++++++++ + tools/perf/arch/x86/entry/syscalls/syscalltbl.sh | 39 ++ + tools/perf/arch/x86/tests/perf-time-to-tsc.c | 2 +- + tools/perf/arch/x86/util/dwarf-regs.c | 8 +- + tools/perf/arch/x86/util/intel-bts.c | 5 + + tools/perf/arch/x86/util/intel-pt.c | 5 + + tools/perf/arch/x86/util/tsc.c | 32 +- + tools/perf/arch/x86/util/tsc.h | 17 - + tools/perf/bench/futex-hash.c | 38 +- + tools/perf/bench/futex.h | 14 + + tools/perf/builtin-config.c | 39 +- + tools/perf/builtin-inject.c | 1 + + tools/perf/builtin-kmem.c | 2 +- + tools/perf/builtin-kvm.c | 2 +- + tools/perf/builtin-mem.c | 11 +- + tools/perf/builtin-record.c | 172 +++++- + tools/perf/builtin-sched.c | 198 +++++- + tools/perf/builtin-script.c | 122 ++-- + tools/perf/builtin-top.c | 2 +- + tools/perf/builtin-trace.c | 668 +++++++++++---------- + tools/perf/config/Makefile | 11 +- + tools/perf/jvmti/jvmti_agent.c | 43 +- + tools/perf/perf.c | 3 +- + tools/perf/tests/Build | 1 + + tools/perf/tests/bpf.c | 2 +- + tools/perf/tests/builtin-test.c | 4 + + tools/perf/tests/code-reading.c | 2 +- + tools/perf/tests/event-times.c | 236 ++++++++ + tools/perf/tests/keep-tracking.c | 2 +- + tools/perf/tests/openat-syscall-tp-fields.c | 2 +- + tools/perf/tests/perf-record.c | 2 +- + tools/perf/tests/switch-tracking.c | 2 +- + tools/perf/tests/tests.h | 1 + + tools/perf/trace/beauty/eventfd.c | 38 ++ + tools/perf/trace/beauty/mmap.c | 158 +++++ + tools/perf/trace/beauty/mode_t.c | 68 +++ + tools/perf/trace/beauty/pid.c | 18 + + tools/perf/trace/beauty/sched_policy.c | 44 ++ + tools/perf/trace/beauty/socket_type.c | 60 ++ + tools/perf/trace/beauty/waitid_options.c | 26 + + tools/perf/ui/browsers/hists.c | 3 +- + tools/perf/ui/stdio/hist.c | 3 +- + tools/perf/util/Build | 10 +- + tools/perf/util/auxtrace.c | 7 + + tools/perf/util/auxtrace.h | 2 + + tools/perf/util/bpf-loader.c | 143 +++++ + tools/perf/util/bpf-loader.h | 19 + + tools/perf/util/callchain.c | 5 +- + tools/perf/util/callchain.h | 9 +- + tools/perf/util/config.c | 222 ++++++- + tools/perf/util/config.h | 26 + + tools/perf/util/cpumap.c | 12 + + tools/perf/util/cpumap.h | 2 + + tools/perf/util/data.c | 41 ++ + tools/perf/util/data.h | 11 +- + tools/perf/util/dwarf-aux.c | 9 + + tools/perf/util/event.c | 13 +- + tools/perf/util/event.h | 9 + + tools/perf/util/evlist.c | 60 +- + tools/perf/util/evlist.h | 18 +- + tools/perf/util/evsel.c | 108 +--- + tools/perf/util/evsel.h | 26 +- + tools/perf/util/evsel_fprintf.c | 212 +++++++ + tools/perf/util/hist.c | 7 +- + tools/perf/util/hist.h | 2 - + tools/perf/util/intel-bts.c | 5 + + tools/perf/util/intel-pt.c | 22 +- + tools/perf/util/jitdump.c | 37 +- + tools/perf/util/jitdump.h | 3 + + tools/perf/util/machine.c | 26 +- + tools/perf/util/machine.h | 4 + + tools/perf/util/map.c | 14 + + tools/perf/util/ordered-events.c | 9 + + tools/perf/util/ordered-events.h | 1 + + tools/perf/util/parse-events.c | 60 +- + tools/perf/util/pmu.c | 13 +- + tools/perf/util/python-ext-sources | 1 + + tools/perf/util/record.c | 5 +- + .../perf/util/scripting-engines/trace-event-perl.c | 126 +++- + .../util/scripting-engines/trace-event-python.c | 2 +- + tools/perf/util/session.c | 111 +--- + tools/perf/util/session.h | 12 +- + tools/perf/util/symbol-elf.c | 13 +- + tools/perf/util/symbol.c | 54 -- + tools/perf/util/symbol.h | 11 + + tools/perf/util/symbol_fprintf.c | 71 +++ + tools/perf/util/syscalltbl.c | 134 +++++ + tools/perf/util/syscalltbl.h | 20 + + tools/perf/util/thread.h | 6 + + tools/perf/util/thread_map.c | 22 +- + tools/perf/util/thread_map.h | 3 + + tools/perf/util/tool.h | 1 + + tools/perf/util/tsc.h | 21 +- + tools/perf/util/unwind-libunwind.c | 25 +- + tools/perf/util/util.h | 5 + + tools/testing/selftests/x86/Makefile | 1 + + tools/testing/selftests/x86/fsgsbase.c | 398 ++++++++++++ + 274 files changed, 6775 insertions(+), 3379 deletions(-) + delete mode 100644 arch/sh/include/asm/rwsem.h + delete mode 100644 arch/sparc/include/asm/rwsem.h + create mode 100644 arch/x86/events/Kconfig + create mode 100644 arch/x86/events/intel/Makefile + delete mode 100644 arch/xtensa/include/asm/rwsem.h + delete mode 100644 include/linux/proportions.h + delete mode 100644 lib/proportions.c + create mode 100644 tools/build/feature/test-dwarf_getlocations.c + create mode 100644 tools/perf/arch/x86/entry/syscalls/syscall_64.tbl + create mode 100755 tools/perf/arch/x86/entry/syscalls/syscalltbl.sh + delete mode 100644 tools/perf/arch/x86/util/tsc.h + create mode 100644 tools/perf/tests/event-times.c + create mode 100644 tools/perf/trace/beauty/eventfd.c + create mode 100644 tools/perf/trace/beauty/mmap.c + create mode 100644 tools/perf/trace/beauty/mode_t.c + create mode 100644 tools/perf/trace/beauty/pid.c + create mode 100644 tools/perf/trace/beauty/sched_policy.c + create mode 100644 tools/perf/trace/beauty/socket_type.c + create mode 100644 tools/perf/trace/beauty/waitid_options.c + create mode 100644 tools/perf/util/config.h + create mode 100644 tools/perf/util/evsel_fprintf.c + create mode 100644 tools/perf/util/symbol_fprintf.c + create mode 100644 tools/perf/util/syscalltbl.c + create mode 100644 tools/perf/util/syscalltbl.h + create mode 100644 tools/testing/selftests/x86/fsgsbase.c +$ git am -3 ../patches/0001-perf-trace-fix-build-when-HAVE_DWARF_UNWIND_SUPPORT-.patch +Applying: perf: trace: fix build when HAVE_DWARF_UNWIND_SUPPORT is not set +$ git reset HEAD^ +Unstaged changes after reset: +M tools/perf/builtin-trace.c +$ git add -A . +$ git commit -v -a --amend +[master ea460da99a6b] Merge remote-tracking branch 'tip/auto-latest' + Date: Tue Apr 19 12:54:47 2016 +1000 +$ git am -3 ../patches/0001-Revert-perf-tools-Build-syscall-table-.c-header-from.patch +Applying: Revert "perf tools: Build syscall table .c header from kernel's syscall_64.tbl" +$ git reset HEAD^ +Unstaged changes after reset: +M tools/perf/Makefile.perf +M tools/perf/arch/x86/Makefile +D tools/perf/arch/x86/entry/syscalls/syscall_64.tbl +D tools/perf/arch/x86/entry/syscalls/syscalltbl.sh +M tools/perf/config/Makefile +M tools/perf/util/Build +M tools/perf/util/syscalltbl.c +$ git add -A . +$ git commit -v -a --amend +[master 053b2a8b2f37] Merge remote-tracking branch 'tip/auto-latest' + Date: Tue Apr 19 12:54:47 2016 +1000 +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 2d29cab0409a] 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 (2364d423a7b3 ARM: socfpga: Enable Arria10 OCRAM ECC on startup) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + .../bindings/arm/altera/socfpga-eccmgr.txt | 50 +++ + arch/arm/mach-socfpga/core.h | 1 + + arch/arm/mach-socfpga/l2_cache.c | 49 +++ + arch/arm/mach-socfpga/ocram.c | 133 +++++++ + arch/arm/mach-socfpga/socfpga.c | 10 +- + drivers/edac/Kconfig | 5 +- + drivers/edac/altera_edac.c | 417 +++++++++++++++++---- + drivers/edac/altera_edac.h | 128 +++++++ + 8 files changed, 719 insertions(+), 74 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 (4530d62e04e3 documentation: State purpose of memory-barriers.txt) +$ git merge rcu/rcu/next +Auto-merging Documentation/kernel-parameters.txt +Removing Documentation/RCU/Design/htmlqqz.sh +Removing Documentation/RCU/Design/Requirements/Requirements.htmlx +Removing Documentation/RCU/Design/Requirements/RCUApplicability.svg +Removing Documentation/RCU/Design/Requirements/2013-08-is-it-dead.png +Merge made by the 'recursive' strategy. + .../Design/Data-Structures/BigTreeClassicRCU.svg | 474 ++++ + .../Design/Data-Structures/BigTreeClassicRCUBH.svg | 499 ++++ + .../Data-Structures/BigTreeClassicRCUBHdyntick.svg | 695 +++++ + .../Data-Structures/BigTreePreemptRCUBHdyntick.svg | 741 ++++++ + .../BigTreePreemptRCUBHdyntickCB.svg | 858 ++++++ + .../Design/Data-Structures/Data-Structures.html | 1333 ++++++++++ + .../Design/Data-Structures/HugeTreeClassicRCU.svg | 939 +++++++ + .../RCU/Design/Data-Structures/TreeLevel.svg | 828 ++++++ + .../RCU/Design/Data-Structures/TreeMapping.svg | 305 +++ + .../Design/Data-Structures/TreeMappingLevel.svg | 380 +++ + .../RCU/Design/Data-Structures/blkd_task.svg | 843 ++++++ + .../RCU/Design/Data-Structures/nxtlist.svg | 396 +++ + .../RCU/Design/Requirements/2013-08-is-it-dead.png | Bin 100825 -> 0 bytes + .../RCU/Design/Requirements/RCUApplicability.svg | 237 -- + .../RCU/Design/Requirements/Requirements.html | 941 ++++--- + .../RCU/Design/Requirements/Requirements.htmlx | 2741 -------------------- + Documentation/RCU/Design/htmlqqz.sh | 108 - + Documentation/RCU/trace.txt | 10 +- + Documentation/RCU/whatisRCU.txt | 25 +- + Documentation/kernel-parameters.txt | 38 + + Documentation/memory-barriers.txt | 34 +- + include/linux/rcupdate.h | 30 +- + include/linux/rcutiny.h | 16 + + include/linux/rcutree.h | 2 + + include/trace/events/rcu.h | 79 +- + kernel/rcu/Makefile | 2 + + kernel/rcu/rcuperf.c | 655 +++++ + kernel/rcu/rcutorture.c | 29 +- + kernel/rcu/tree.c | 311 ++- + kernel/rcu/tree.h | 20 +- + kernel/rcu/tree_plugin.h | 37 +- + kernel/rcu/tree_trace.c | 13 +- + kernel/rcu/update.c | 4 +- + kernel/rcu/waketorture.c | 435 ++++ + kernel/torture.c | 4 +- + lib/Kconfig.debug | 66 + + tools/testing/selftests/rcutorture/bin/jitter.sh | 83 + + .../rcutorture/bin/kvm-recheck-rcuperf-ftrace.sh | 121 + + .../rcutorture/bin/kvm-recheck-rcuperf.sh | 96 + + .../selftests/rcutorture/bin/kvm-recheck-wake.sh | 39 + + .../selftests/rcutorture/bin/kvm-recheck.sh | 5 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 59 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 24 +- + .../selftests/rcutorture/configs/rcu/TREE04 | 2 +- + .../selftests/rcutorture/configs/rcu/TREE04.boot | 2 +- + .../selftests/rcutorture/configs/rcuperf/CFLIST | 1 + + .../selftests/rcutorture/configs/rcuperf/CFcommon | 2 + + .../selftests/rcutorture/configs/rcuperf/TREE | 20 + + .../selftests/rcutorture/configs/rcuperf/TREE54 | 23 + + .../rcutorture/configs/rcuperf/ver_functions.sh | 52 + + .../selftests/rcutorture/configs/wake/CFLIST | 1 + + .../selftests/rcutorture/configs/wake/CFcommon | 2 + + tools/testing/selftests/rcutorture/configs/wake/SH | 19 + + .../selftests/rcutorture/configs/wake/SH.boot | 1 + + .../testing/selftests/rcutorture/configs/wake/STI | 19 + + .../selftests/rcutorture/configs/wake/STI.boot | 1 + + .../rcutorture/configs/wake/ver_functions.sh | 43 + + 57 files changed, 11043 insertions(+), 3700 deletions(-) + create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCU.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBH.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBHdyntick.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreePreemptRCUBHdyntick.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreePreemptRCUBHdyntickCB.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/Data-Structures.html + create mode 100644 Documentation/RCU/Design/Data-Structures/HugeTreeClassicRCU.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/TreeLevel.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/TreeMapping.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/TreeMappingLevel.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/blkd_task.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/nxtlist.svg + delete mode 100644 Documentation/RCU/Design/Requirements/2013-08-is-it-dead.png + delete mode 100644 Documentation/RCU/Design/Requirements/RCUApplicability.svg + delete mode 100644 Documentation/RCU/Design/Requirements/Requirements.htmlx + delete mode 100755 Documentation/RCU/Design/htmlqqz.sh + create mode 100644 kernel/rcu/rcuperf.c + create mode 100644 kernel/rcu/waketorture.c + create mode 100755 tools/testing/selftests/rcutorture/bin/jitter.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-rcuperf-ftrace.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-rcuperf.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-wake.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 + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFLIST + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFcommon + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/ver_functions.sh +Merging kvm/linux-next (316314cae15f KVM: x86: mask CPUID(0xD,0x1).EAX against host value) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (06a71a24bae5 arm64: KVM: unregister notifiers in hyp mode teardown path) +$ 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 (c87ff1433aca KVM: s390: add clear I/O irq operation for FLIC) +$ git merge kvms390/next +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/devices/s390_flic.txt | 12 +++++++ + arch/s390/include/uapi/asm/kvm.h | 1 + + arch/s390/include/uapi/asm/sie.h | 7 ++++- + arch/s390/kvm/interrupt.c | 42 +++++++++++++++++++++++++ + 4 files changed, 61 insertions(+), 1 deletion(-) +Merging xen-tip/linux-next (85d1a29de8e4 Xen on ARM and ARM64: update MAINTAINERS info) +$ git merge xen-tip/linux-next +Already up-to-date. +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 (4f62568c1fcf fujitsu-laptop: Support radio LED) +$ git merge drivers-x86/for-next +Merge made by the 'recursive' strategy. + drivers/platform/x86/fujitsu-laptop.c | 51 +++++++++++++++++++++++++++++++++++ + 1 file changed, 51 insertions(+) +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 (4a91c45ea57c leds: tca6507: silence an uninitialized variable warning) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/leds-tca6507.c | 2 ++ + 1 file changed, 2 insertions(+) +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 (5614e7725856 Merge 4.6-rc4 into driver-core-next) +$ git merge driver-core/driver-core-next +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/fs.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + CREDITS | 1 + + Documentation/devices.txt | 86 ++-- + arch/x86/Kconfig | 6 + + drivers/base/Makefile | 2 +- + drivers/base/devcoredump.c | 83 +++- + drivers/firmware/qemu_fw_cfg.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 4 +- + fs/char_dev.c | 4 + + fs/debugfs/file.c | 436 +++++++++++++++++---- + fs/debugfs/inode.c | 108 ++++- + fs/debugfs/internal.h | 26 ++ + fs/kernfs/dir.c | 8 +- + fs/kernfs/inode.c | 15 +- + include/linux/debugfs.h | 49 ++- + include/linux/devcoredump.h | 86 +++- + include/linux/fs.h | 2 + + include/linux/isa.h | 2 +- + lib/Kconfig.debug | 1 + + .../api/debugfs/debugfs_simple_attr.cocci | 67 ++++ + 19 files changed, 811 insertions(+), 179 deletions(-) + create mode 100644 fs/debugfs/internal.h + create mode 100644 scripts/coccinelle/api/debugfs/debugfs_simple_attr.cocci +Merging tty/tty-next (c3b46c73264b Linux 4.6-rc4) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (7ce04cff59d5 usb: wusbcore: remove unreachable code) +$ git merge usb/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/host/whci/qset.c | 8 +- + drivers/usb/host/xhci-ring.c | 2 +- + drivers/usb/usbip/stub_dev.c | 3 +- + drivers/usb/usbip/usbip_common.c | 7 ++ + drivers/usb/usbip/usbip_common.h | 4 +- + drivers/usb/usbip/usbip_event.c | 168 ++++++++++++++++++++++++++++---------- + drivers/usb/wusbcore/devconnect.c | 1 - + include/uapi/linux/usb/ch9.h | 121 +++++++++++++++++++++++++++ + 8 files changed, 265 insertions(+), 49 deletions(-) +Merging usb-gadget/next (761aa987a847 usb: dwc3: debugfs: dump out endpoint details) +$ git merge usb-gadget/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/usb/dwc3.txt | 6 +- + .../devicetree/bindings/usb/qcom,dwc3.txt | 1 - + drivers/phy/Kconfig | 3 +- + drivers/usb/Kconfig | 3 +- + drivers/usb/dwc3/core.c | 118 +++---- + drivers/usb/dwc3/core.h | 72 ++-- + drivers/usb/dwc3/debug.h | 6 +- + drivers/usb/dwc3/debugfs.c | 355 ++++++++++++++++++-- + drivers/usb/dwc3/dwc3-omap.c | 9 - + drivers/usb/dwc3/ep0.c | 29 +- + drivers/usb/dwc3/gadget.c | 371 +++++++++------------ + drivers/usb/dwc3/gadget.h | 6 +- + drivers/usb/dwc3/platform_data.h | 2 +- + drivers/usb/gadget/Kconfig | 1 + + drivers/usb/gadget/function/f_fs.c | 2 +- + drivers/usb/gadget/function/f_mass_storage.c | 36 +- + drivers/usb/gadget/function/f_mass_storage.h | 2 - + drivers/usb/gadget/legacy/acm_ms.c | 4 - + drivers/usb/gadget/legacy/mass_storage.c | 4 - + drivers/usb/gadget/legacy/multi.c | 12 - + drivers/usb/gadget/legacy/nokia.c | 7 - + drivers/usb/gadget/udc/at91_udc.c | 5 +- + drivers/usb/gadget/udc/pch_udc.c | 175 +++------- + drivers/usb/gadget/udc/r8a66597-udc.c | 2 +- + drivers/usb/gadget/udc/udc-core.c | 26 +- + drivers/usb/phy/phy-qcom-8x16-usb.c | 5 +- + drivers/usb/renesas_usbhs/fifo.c | 16 +- + drivers/usb/renesas_usbhs/mod_gadget.c | 9 +- + drivers/usb/renesas_usbhs/mod_host.c | 3 +- + drivers/usb/renesas_usbhs/pipe.c | 3 +- + drivers/usb/renesas_usbhs/pipe.h | 6 +- + include/linux/usb/gadget.h | 4 + + 32 files changed, 712 insertions(+), 591 deletions(-) +Merging usb-serial/usb-next (bf1620068911 Linux 4.6-rc3) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (4e332df63487 usb: otg-fsm: support multiple instances) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/ci_hdrc_imx.c | 4 -- + drivers/usb/common/usb-otg-fsm.c | 10 ++--- + include/linux/usb/otg-fsm.h | 91 +++++++++++++++++++++++++++++++++++--- + 3 files changed, 88 insertions(+), 17 deletions(-) +Merging staging/staging-next (4145ba76b1f7 staging: unisys: visornic: prevent double-unlock of priv_lock) +$ git merge staging/staging-next +Auto-merging include/linux/sched.h +Auto-merging drivers/staging/wlan-ng/cfg80211.c +Auto-merging drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +Auto-merging drivers/staging/vt6656/main_usb.c +Auto-merging drivers/staging/unisys/visorbus/visorchipset.c +Auto-merging drivers/staging/lustre/lustre/llite/lcommon_misc.c +Auto-merging drivers/staging/lustre/lustre/llite/glimpse.c +Removing drivers/staging/lustre/lustre/lclient/lcommon_cl.c +Removing drivers/staging/lustre/lustre/include/linux/obd.h +Removing drivers/staging/lustre/lustre/include/lclient.h +Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h +Removing drivers/staging/iio/impedance-analyzer/ad5933.h +Removing drivers/staging/iio/accel/adis16220_core.c +Removing drivers/staging/iio/accel/adis16220.h +Removing drivers/staging/iio/accel/adis16204_core.c +Removing drivers/staging/iio/accel/adis16204.h +Removing drivers/staging/comedi/drivers/ni_mio_c_common.c +Removing drivers/staging/android/timed_output.h +Removing drivers/staging/android/timed_output.c +Removing drivers/staging/android/timed_gpio.h +Removing drivers/staging/android/timed_gpio.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-iio | 15 +- + .../devicetree/bindings/iio/accel/mma8452.txt | 3 +- + .../devicetree/bindings/iio/adc/lpc1850-adc.txt | 21 + + .../bindings/iio/adc/rockchip-saradc.txt | 6 +- + .../devicetree/bindings/iio/dac/lpc1850-dac.txt | 20 + + .../bindings/iio/magnetometer/ak8975.txt | 2 + + .../bindings/iio/potentiometer/mcp4131.txt | 84 + + .../devicetree/bindings/iio/pressure/ms5611.txt | 19 + + .../devicetree/bindings/iio/st-sensors.txt | 1 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 2 +- + drivers/iio/accel/Kconfig | 5 +- + drivers/iio/accel/bmc150-accel-core.c | 28 +- + drivers/iio/accel/bmc150-accel-i2c.c | 7 +- + drivers/iio/accel/bmc150-accel-spi.c | 8 +- + drivers/iio/accel/bmc150-accel.h | 1 + + drivers/iio/accel/kxcjk-1013.c | 25 +- + drivers/iio/accel/mma8452.c | 188 +- + drivers/iio/accel/mma9553.c | 1 - + drivers/iio/accel/mxc4005.c | 29 - + drivers/iio/accel/st_accel.h | 1 + + drivers/iio/accel/st_accel_core.c | 92 + + drivers/iio/accel/st_accel_i2c.c | 4 + + drivers/iio/accel/stk8312.c | 1 - + drivers/iio/accel/stk8ba50.c | 1 - + drivers/iio/adc/Kconfig | 10 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/at91-sama5d2_adc.c | 102 +- + drivers/iio/adc/ina2xx-adc.c | 43 +- + drivers/iio/adc/lpc18xx_adc.c | 231 +++ + drivers/iio/adc/rockchip_saradc.c | 19 + + drivers/iio/common/st_sensors/st_sensors_buffer.c | 28 +- + drivers/iio/dac/Kconfig | 10 + + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/lpc18xx_dac.c | 210 ++ + drivers/iio/gyro/bmg160_core.c | 51 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 30 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 3 +- + drivers/iio/imu/kmx61.c | 1 - + drivers/iio/industrialio-core.c | 41 + + drivers/iio/light/stk3310.c | 1 - + drivers/iio/light/tsl2563.c | 3 +- + drivers/iio/magnetometer/ak8975.c | 70 +- + drivers/iio/magnetometer/bmc150_magn.c | 1 - + drivers/iio/potentiometer/Kconfig | 18 + + drivers/iio/potentiometer/Makefile | 1 + + drivers/iio/potentiometer/mcp4131.c | 494 +++++ + drivers/iio/potentiometer/mcp4531.c | 13 +- + drivers/iio/potentiometer/tpl0102.c | 2 +- + drivers/iio/pressure/Kconfig | 10 + + drivers/iio/pressure/Makefile | 1 + + drivers/iio/pressure/hp206c.c | 426 ++++ + drivers/iio/pressure/ms5611.h | 23 +- + drivers/iio/pressure/ms5611_core.c | 146 +- + drivers/iio/pressure/ms5611_i2c.c | 25 +- + drivers/iio/pressure/ms5611_spi.c | 32 +- + drivers/staging/android/Kconfig | 14 - + drivers/staging/android/Makefile | 2 - + drivers/staging/android/ion/ion.c | 10 +- + drivers/staging/android/lowmemorykiller.c | 9 +- + drivers/staging/android/timed_gpio.c | 166 -- + drivers/staging/android/timed_gpio.h | 33 - + drivers/staging/android/timed_output.c | 110 - + drivers/staging/android/timed_output.h | 37 - + drivers/staging/comedi/comedi_buf.c | 10 +- + drivers/staging/comedi/comedi_fops.c | 54 +- + drivers/staging/comedi/comedidev.h | 4 +- + drivers/staging/comedi/drivers.c | 40 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 12 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 104 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 71 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 189 +- + drivers/staging/comedi/drivers/amplc_pci263.c | 86 +- + drivers/staging/comedi/drivers/c6xdigio.c | 4 +- + drivers/staging/comedi/drivers/dt282x.c | 119 +- + drivers/staging/comedi/drivers/ni_660x.c | 1156 ++++------- + drivers/staging/comedi/drivers/ni_labpc.h | 33 +- + drivers/staging/comedi/drivers/ni_labpc_common.c | 65 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 95 +- + drivers/staging/comedi/drivers/ni_labpc_pci.c | 4 +- + drivers/staging/comedi/drivers/ni_labpc_regs.h | 82 +- + drivers/staging/comedi/drivers/ni_mio_c_common.c | 0 + drivers/staging/comedi/drivers/ni_mio_common.c | 6 +- + drivers/staging/comedi/drivers/ni_tio.c | 807 +++++--- + drivers/staging/comedi/drivers/ni_tio.h | 66 +- + drivers/staging/comedi/drivers/ni_tio_internal.h | 322 ++- + drivers/staging/comedi/drivers/ni_tiocmd.c | 116 +- + drivers/staging/comedi/drivers/plx9052.h | 122 +- + drivers/staging/comedi/drivers/z8536.h | 89 +- + drivers/staging/dgnc/dgnc_cls.c | 2 +- + drivers/staging/dgnc/dgnc_driver.c | 52 +- + drivers/staging/dgnc/dgnc_driver.h | 23 +- + drivers/staging/dgnc/dgnc_mgmt.c | 28 +- + drivers/staging/dgnc/dgnc_neo.c | 122 +- + drivers/staging/dgnc/dgnc_sysfs.c | 2 +- + drivers/staging/dgnc/dgnc_tty.c | 218 +- + drivers/staging/dgnc/digi.h | 4 +- + drivers/staging/emxx_udc/emxx_udc.c | 20 +- + drivers/staging/emxx_udc/emxx_udc.h | 40 +- + drivers/staging/fbtft/fb_agm1264k-fl.c | 2 +- + drivers/staging/fbtft/fbtft-io.c | 8 +- + drivers/staging/fbtft/fbtft_device.c | 6 +- + drivers/staging/fwserial/dma_fifo.c | 8 +- + drivers/staging/fwserial/dma_fifo.h | 16 +- + drivers/staging/fwserial/fwserial.c | 42 +- + drivers/staging/fwserial/fwserial.h | 42 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 8 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.h | 2 +- + drivers/staging/gs_fpgaboot/io.c | 1 - + drivers/staging/i4l/pcbit/capi.h | 2 +- + drivers/staging/i4l/pcbit/drv.c | 8 +- + drivers/staging/i4l/pcbit/edss1.c | 2 +- + drivers/staging/i4l/pcbit/layer2.h | 2 +- + drivers/staging/iio/accel/Kconfig | 23 - + drivers/staging/iio/accel/Makefile | 6 - + drivers/staging/iio/accel/adis16201.h | 156 +- + drivers/staging/iio/accel/adis16203.h | 132 +- + drivers/staging/iio/accel/adis16204.h | 68 - + drivers/staging/iio/accel/adis16204_core.c | 253 --- + drivers/staging/iio/accel/adis16209.h | 39 + + drivers/staging/iio/accel/adis16220.h | 140 -- + drivers/staging/iio/accel/adis16220_core.c | 494 ----- + drivers/staging/iio/accel/adis16240.h | 50 + + drivers/staging/iio/accel/adis16240_core.c | 4 +- + drivers/staging/iio/adc/ad7192.c | 50 +- + drivers/staging/iio/adc/ad7280a.c | 40 +- + drivers/staging/iio/adc/ad7280a.h | 8 +- + drivers/staging/iio/adc/ad7606.h | 28 +- + drivers/staging/iio/adc/ad7606_core.c | 6 +- + drivers/staging/iio/adc/ad7606_spi.c | 5 +- + drivers/staging/iio/adc/ad7780.c | 2 +- + drivers/staging/iio/frequency/ad9832.c | 2 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 45 +- + drivers/staging/iio/impedance-analyzer/ad5933.h | 28 - + drivers/staging/iio/light/isl29028.c | 55 +- + drivers/staging/iio/light/tsl2x7x_core.c | 211 +- + drivers/staging/iio/meter/ade7753.c | 4 +- + drivers/staging/iio/meter/ade7754.c | 4 +- + drivers/staging/iio/meter/ade7758.h | 16 +- + drivers/staging/iio/meter/ade7758_core.c | 77 +- + drivers/staging/iio/meter/ade7758_ring.c | 4 +- + drivers/staging/iio/meter/ade7759.c | 4 +- + drivers/staging/iio/meter/ade7854.c | 3 +- + drivers/staging/iio/resolver/ad2s1210.h | 8 +- + drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 15 +- + .../staging/lustre/include/linux/libcfs/libcfs.h | 51 +- + .../lustre/include/linux/libcfs/libcfs_cpu.h | 79 + + .../lustre/include/linux/libcfs/libcfs_crypto.h | 136 +- + .../lustre/include/linux/libcfs/libcfs_debug.h | 18 +- + .../lustre/include/linux/libcfs/libcfs_fail.h | 15 +- + .../lustre/include/linux/libcfs/libcfs_hash.h | 4 +- + .../lustre/include/linux/libcfs/libcfs_ioctl.h | 161 +- + .../lustre/include/linux/libcfs/libcfs_prim.h | 31 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 75 - + .../lustre/include/linux/libcfs/libcfs_workitem.h | 12 +- + .../lustre/include/linux/libcfs/linux/libcfs.h | 2 +- + .../lustre/include/linux/libcfs/linux/linux-cpu.h | 2 +- + .../lustre/include/linux/libcfs/linux/linux-mem.h | 80 - + .../lustre/include/linux/libcfs/linux/linux-time.h | 4 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 10 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 4 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 1 - + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 3 - + drivers/staging/lustre/lnet/libcfs/debug.c | 126 +- + drivers/staging/lustre/lnet/libcfs/fail.c | 3 + + drivers/staging/lustre/lnet/libcfs/hash.c | 6 +- + drivers/staging/lustre/lnet/libcfs/libcfs_lock.c | 54 +- + drivers/staging/lustre/lnet/libcfs/libcfs_mem.c | 28 - + .../lustre/lnet/libcfs/linux/linux-crypto.c | 283 ++- + .../lustre/lnet/libcfs/linux/linux-module.c | 154 +- + .../staging/lustre/lnet/libcfs/linux/linux-prim.c | 31 - + drivers/staging/lustre/lnet/libcfs/module.c | 132 +- + drivers/staging/lustre/lnet/libcfs/tracefile.c | 17 +- + drivers/staging/lustre/lnet/libcfs/workitem.c | 12 +- + drivers/staging/lustre/lnet/lnet/api-ni.c | 4 + + drivers/staging/lustre/lnet/lnet/lib-move.c | 10 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 60 +- + drivers/staging/lustre/lnet/selftest/conctl.c | 50 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 168 +- + drivers/staging/lustre/lnet/selftest/conrpc.h | 40 +- + drivers/staging/lustre/lnet/selftest/console.c | 248 +-- + drivers/staging/lustre/lnet/selftest/console.h | 40 +- + drivers/staging/lustre/lnet/selftest/framework.c | 218 +- + drivers/staging/lustre/lnet/selftest/ping_test.c | 34 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 127 +- + drivers/staging/lustre/lnet/selftest/rpc.h | 6 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 191 +- + drivers/staging/lustre/lnet/selftest/timer.c | 12 +- + drivers/staging/lustre/lustre/fld/fld_cache.c | 3 +- + drivers/staging/lustre/lustre/fld/fld_request.c | 14 +- + drivers/staging/lustre/lustre/include/cl_object.h | 962 ++------- + drivers/staging/lustre/lustre/include/lclient.h | 408 ---- + drivers/staging/lustre/lustre/include/linux/obd.h | 125 -- + drivers/staging/lustre/lustre/include/lu_object.h | 64 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 8 +- + .../lustre/lustre/include/lustre/lustre_user.h | 54 +- + drivers/staging/lustre/lustre/include/lustre_cfg.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_dlm.h | 14 +- + .../staging/lustre/lustre/include/lustre_import.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_lib.h | 60 +- + drivers/staging/lustre/lustre/include/lustre_mdc.h | 18 + + drivers/staging/lustre/lustre/include/obd.h | 14 +- + drivers/staging/lustre/lustre/include/obd_cksum.h | 1 + + drivers/staging/lustre/lustre/include/obd_class.h | 3 +- + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 1203 ----------- + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 6 - + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 12 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 5 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 19 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 130 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 1 + + drivers/staging/lustre/lustre/llite/Makefile | 5 +- + drivers/staging/lustre/lustre/llite/dir.c | 62 +- + drivers/staging/lustre/lustre/llite/file.c | 192 +- + .../lustre/lustre/{lclient => llite}/glimpse.c | 87 +- + drivers/staging/lustre/lustre/llite/lcommon_cl.c | 327 +++ + .../lustre/{lclient => llite}/lcommon_misc.c | 45 +- + drivers/staging/lustre/lustre/llite/llite_close.c | 31 +- + .../staging/lustre/lustre/llite/llite_internal.h | 248 +-- + drivers/staging/lustre/lustre/llite/llite_lib.c | 46 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 42 +- + drivers/staging/lustre/lustre/llite/lloop.c | 3 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 10 +- + drivers/staging/lustre/lustre/llite/namei.c | 6 +- + drivers/staging/lustre/lustre/llite/rw.c | 369 ++-- + drivers/staging/lustre/lustre/llite/rw26.c | 307 ++- + drivers/staging/lustre/lustre/llite/super25.c | 14 +- + drivers/staging/lustre/lustre/llite/vvp_dev.c | 265 ++- + drivers/staging/lustre/lustre/llite/vvp_internal.h | 332 ++- + drivers/staging/lustre/lustre/llite/vvp_io.c | 927 +++++---- + drivers/staging/lustre/lustre/llite/vvp_lock.c | 53 +- + drivers/staging/lustre/lustre/llite/vvp_object.c | 141 +- + drivers/staging/lustre/lustre/llite/vvp_page.c | 211 +- + drivers/staging/lustre/lustre/llite/vvp_req.c | 121 ++ + drivers/staging/lustre/lustre/llite/xattr.c | 12 +- + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 3 - + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 31 +- + .../staging/lustre/lustre/lov/lov_cl_internal.h | 105 +- + drivers/staging/lustre/lustre/lov/lov_dev.c | 15 +- + drivers/staging/lustre/lustre/lov/lov_internal.h | 2 + + drivers/staging/lustre/lustre/lov/lov_io.c | 245 +-- + drivers/staging/lustre/lustre/lov/lov_lock.c | 996 +-------- + drivers/staging/lustre/lustre/lov/lov_merge.c | 11 + + drivers/staging/lustre/lustre/lov/lov_obd.c | 1 - + drivers/staging/lustre/lustre/lov/lov_object.c | 54 +- + drivers/staging/lustre/lustre/lov/lov_offset.c | 12 + + drivers/staging/lustre/lustre/lov/lov_pack.c | 7 +- + drivers/staging/lustre/lustre/lov/lov_page.c | 183 +- + drivers/staging/lustre/lustre/lov/lovsub_dev.c | 9 +- + drivers/staging/lustre/lustre/lov/lovsub_lock.c | 386 +--- + drivers/staging/lustre/lustre/lov/lovsub_object.c | 6 +- + drivers/staging/lustre/lustre/lov/lovsub_page.c | 4 +- + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 8 +- + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 23 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 6 +- + drivers/staging/lustre/lustre/obdclass/cl_io.c | 430 ++-- + drivers/staging/lustre/lustre/obdclass/cl_lock.c | 2152 +------------------- + drivers/staging/lustre/lustre/obdclass/cl_object.c | 303 ++- + drivers/staging/lustre/lustre/obdclass/cl_page.c | 654 +----- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 2 +- + drivers/staging/lustre/lustre/obdclass/debug.c | 4 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 4 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 3 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 7 +- + .../staging/lustre/lustre/obdclass/lustre_peer.c | 3 +- + drivers/staging/lustre/lustre/obdclass/obdo.c | 3 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 169 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 50 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 378 +++- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 159 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 23 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 282 +-- + drivers/staging/lustre/lustre/osc/osc_lock.c | 1696 ++++++--------- + drivers/staging/lustre/lustre/osc/osc_object.c | 38 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 514 +++-- + drivers/staging/lustre/lustre/osc/osc_request.c | 388 ++-- + drivers/staging/lustre/lustre/ptlrpc/client.c | 10 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 9 +- + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 16 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 14 +- + drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 2 +- + drivers/staging/media/omap1/omap1_camera.c | 68 +- + drivers/staging/media/omap4iss/iss.c | 2 +- + drivers/staging/most/hdm-dim2/dim2_errors.h | 8 - + drivers/staging/most/hdm-dim2/dim2_hal.h | 14 +- + drivers/staging/most/hdm-dim2/dim2_reg.h | 8 - + drivers/staging/netlogic/xlr_net.c | 2 +- + drivers/staging/nvec/nvec.c | 11 +- + drivers/staging/nvec/nvec_power.c | 4 +- + drivers/staging/octeon/ethernet-rx.c | 7 +- + drivers/staging/octeon/ethernet-rx.h | 2 +- + drivers/staging/octeon/ethernet-tx.c | 15 +- + drivers/staging/octeon/ethernet.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 5 - + drivers/staging/rtl8188eu/core/rtw_cmd.c | 49 +- + drivers/staging/rtl8188eu/core/rtw_debug.c | 5 - + drivers/staging/rtl8188eu/core/rtw_efuse.c | 7 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 5 - + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 5 - + drivers/staging/rtl8188eu/core/rtw_mlme.c | 13 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 49 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 5 - + drivers/staging/rtl8188eu/core/rtw_recv.c | 5 - + drivers/staging/rtl8188eu/core/rtw_rf.c | 5 - + drivers/staging/rtl8188eu/core/rtw_security.c | 5 - + drivers/staging/rtl8188eu/core/rtw_sreset.c | 5 - + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 5 - + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 5 - + drivers/staging/rtl8188eu/core/rtw_xmit.c | 5 - + .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | 2 +- + drivers/staging/rtl8188eu/hal/bb_cfg.c | 5 - + drivers/staging/rtl8188eu/hal/fw.c | 4 - + drivers/staging/rtl8188eu/hal/hal_com.c | 5 - + drivers/staging/rtl8188eu/hal/hal_intf.c | 7 +- + drivers/staging/rtl8188eu/hal/mac_cfg.c | 5 - + drivers/staging/rtl8188eu/hal/odm.c | 5 - + drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 5 - + drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 5 - + drivers/staging/rtl8188eu/hal/phy.c | 5 - + drivers/staging/rtl8188eu/hal/pwrseq.c | 5 - + drivers/staging/rtl8188eu/hal/pwrseqcmd.c | 4 - + drivers/staging/rtl8188eu/hal/rf.c | 4 - + drivers/staging/rtl8188eu/hal/rf_cfg.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 9 +- + drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 5 - + drivers/staging/rtl8188eu/hal/usb_halinit.c | 7 +- + drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 5 - + drivers/staging/rtl8188eu/include/Hal8188EPhyReg.h | 5 - + .../staging/rtl8188eu/include/HalHWImg8188E_FW.h | 5 - + drivers/staging/rtl8188eu/include/HalVerDef.h | 5 - + drivers/staging/rtl8188eu/include/basic_types.h | 5 - + drivers/staging/rtl8188eu/include/drv_types.h | 5 - + drivers/staging/rtl8188eu/include/fw.h | 4 - + drivers/staging/rtl8188eu/include/hal_com.h | 5 - + drivers/staging/rtl8188eu/include/hal_intf.h | 5 - + drivers/staging/rtl8188eu/include/ieee80211.h | 5 - + drivers/staging/rtl8188eu/include/mlme_osdep.h | 5 - + drivers/staging/rtl8188eu/include/mp_custom_oid.h | 5 - + drivers/staging/rtl8188eu/include/odm.h | 5 - + drivers/staging/rtl8188eu/include/odm_HWConfig.h | 4 - + drivers/staging/rtl8188eu/include/odm_RTL8188E.h | 5 - + .../staging/rtl8188eu/include/odm_RegDefine11N.h | 5 - + drivers/staging/rtl8188eu/include/odm_debug.h | 5 - + drivers/staging/rtl8188eu/include/odm_precomp.h | 5 - + drivers/staging/rtl8188eu/include/odm_reg.h | 5 - + drivers/staging/rtl8188eu/include/odm_types.h | 5 - + drivers/staging/rtl8188eu/include/osdep_intf.h | 5 - + drivers/staging/rtl8188eu/include/osdep_service.h | 5 - + drivers/staging/rtl8188eu/include/pwrseq.h | 5 - + drivers/staging/rtl8188eu/include/pwrseqcmd.h | 5 - + drivers/staging/rtl8188eu/include/recv_osdep.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_cmd.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_dm.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_led.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_recv.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 4 - + drivers/staging/rtl8188eu/include/rtl8188e_xmit.h | 5 - + drivers/staging/rtl8188eu/include/rtw_android.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ap.h | 5 - + drivers/staging/rtl8188eu/include/rtw_cmd.h | 5 - + drivers/staging/rtl8188eu/include/rtw_debug.h | 5 - + drivers/staging/rtl8188eu/include/rtw_eeprom.h | 5 - + drivers/staging/rtl8188eu/include/rtw_efuse.h | 5 - + drivers/staging/rtl8188eu/include/rtw_event.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ht.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ioctl.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ioctl_rtl.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ioctl_set.h | 5 - + drivers/staging/rtl8188eu/include/rtw_iol.h | 5 - + drivers/staging/rtl8188eu/include/rtw_mlme.h | 5 - + drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 5 - + .../staging/rtl8188eu/include/rtw_mp_phy_regdef.h | 5 - + drivers/staging/rtl8188eu/include/rtw_pwrctrl.h | 5 - + drivers/staging/rtl8188eu/include/rtw_qos.h | 5 - + drivers/staging/rtl8188eu/include/rtw_recv.h | 5 - + drivers/staging/rtl8188eu/include/rtw_rf.h | 5 - + drivers/staging/rtl8188eu/include/rtw_security.h | 5 - + drivers/staging/rtl8188eu/include/rtw_sreset.h | 5 - + drivers/staging/rtl8188eu/include/rtw_xmit.h | 5 - + drivers/staging/rtl8188eu/include/sta_info.h | 5 - + drivers/staging/rtl8188eu/include/usb_hal.h | 5 - + drivers/staging/rtl8188eu/include/usb_ops_linux.h | 5 - + drivers/staging/rtl8188eu/include/wifi.h | 5 - + drivers/staging/rtl8188eu/include/wlan_bssdef.h | 5 - + drivers/staging/rtl8188eu/include/xmit_osdep.h | 5 - + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 13 +- + drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 5 - + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 5 - + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 5 - + drivers/staging/rtl8188eu/os_dep/recv_linux.c | 5 - + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 5 - + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 7 +- + drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 4 - + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 5 - + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +- + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 2 +- + drivers/staging/rtl8192u/r8190_rtl8256.c | 2 +- + drivers/staging/rtl8192u/r8192U_wx.c | 22 - + drivers/staging/rtl8712/basic_types.h | 4 - + drivers/staging/rtl8712/drv_types.h | 4 - + drivers/staging/rtl8712/ethernet.h | 4 - + drivers/staging/rtl8712/hal_init.c | 16 +- + drivers/staging/rtl8712/ieee80211.c | 4 - + drivers/staging/rtl8712/mlme_linux.c | 2 +- + drivers/staging/rtl8712/os_intfs.c | 4 +- + drivers/staging/rtl8712/rtl8712_cmd.c | 18 +- + drivers/staging/rtl8712/rtl871x_cmd.c | 80 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 4 +- + drivers/staging/rtl8712/rtl871x_ioctl_set.c | 6 - + drivers/staging/rtl8712/rtl871x_mlme.c | 4 +- + drivers/staging/rtl8712/usb_ops_linux.c | 2 +- + drivers/staging/rtl8723au/core/rtw_ap.c | 3 +- + drivers/staging/rtl8723au/core/rtw_recv.c | 25 - + drivers/staging/rtl8723au/core/rtw_wlan_util.c | 10 - + drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 2 - + drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c | 2 +- + drivers/staging/rtl8723au/include/rtw_mlme_ext.h | 2 - + drivers/staging/rtl8723au/include/rtw_recv.h | 2 - + drivers/staging/rts5208/ms.c | 14 +- + drivers/staging/rts5208/rtsx_card.c | 21 - + drivers/staging/rts5208/rtsx_card.h | 2 - + drivers/staging/rts5208/rtsx_chip.c | 35 - + drivers/staging/rts5208/rtsx_chip.h | 3 - + drivers/staging/skein/skein_base.h | 5 - + drivers/staging/skein/skein_block.c | 30 +- + drivers/staging/skein/threefish_block.c | 2144 +++++++++---------- + drivers/staging/slicoss/slicoss.c | 5 + + drivers/staging/sm750fb/ddk750_chip.c | 2 +- + drivers/staging/speakup/main.c | 6 +- + drivers/staging/speakup/serialio.h | 3 +- + drivers/staging/unisys/Documentation/overview.txt | 19 - + drivers/staging/unisys/include/channel.h | 10 +- + drivers/staging/unisys/include/visorbus.h | 15 - + drivers/staging/unisys/visorbus/visorbus_main.c | 381 +--- + drivers/staging/unisys/visorbus/visorchannel.c | 5 +- + drivers/staging/unisys/visorbus/visorchipset.c | 337 ++- + drivers/staging/unisys/visorinput/visorinput.c | 8 +- + drivers/staging/unisys/visornic/visornic_main.c | 53 +- + drivers/staging/vme/devices/vme_pio2_gpio.c | 5 +- + drivers/staging/vt6655/baseband.c | 24 +- + drivers/staging/vt6655/baseband.h | 6 +- + drivers/staging/vt6655/card.c | 95 +- + drivers/staging/vt6655/card.h | 9 +- + drivers/staging/vt6655/desc.h | 3 +- + drivers/staging/vt6655/mac.c | 15 +- + drivers/staging/vt6655/srom.c | 9 +- + drivers/staging/vt6656/main_usb.c | 6 +- + drivers/staging/vt6656/wcmd.c | 8 +- + drivers/staging/wilc1000/Kconfig | 1 - + drivers/staging/wilc1000/host_interface.c | 107 +- + drivers/staging/wilc1000/host_interface.h | 8 +- + drivers/staging/wilc1000/linux_mon.c | 24 +- + drivers/staging/wilc1000/linux_wlan.c | 67 +- + drivers/staging/wilc1000/wilc_spi.c | 3 - + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 50 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 12 +- + drivers/staging/wilc1000/wilc_wlan.c | 48 +- + drivers/staging/wilc1000/wilc_wlan.h | 6 +- + drivers/staging/wilc1000/wilc_wlan_cfg.c | 7 +- + drivers/staging/wilc1000/wilc_wlan_if.h | 21 - + drivers/staging/wlan-ng/cfg80211.c | 4 +- + drivers/staging/wlan-ng/p80211conv.c | 5 +- + drivers/staging/wlan-ng/p80211netdev.c | 4 +- + drivers/staging/wlan-ng/p80211netdev.h | 1 - + drivers/staging/wlan-ng/prism2usb.c | 2 +- + drivers/staging/xgifb/XGI_main_26.c | 5 +- + drivers/staging/xgifb/vb_init.c | 16 +- + drivers/staging/xgifb/vb_setmode.c | 22 +- + drivers/staging/xgifb/vb_table.h | 135 +- + drivers/staging/xgifb/vb_util.h | 8 +- + include/linux/iio/buffer.h | 2 + + include/linux/iio/iio.h | 2 + + include/linux/sched.h | 4 + + include/uapi/linux/iio/types.h | 2 + + tools/iio/generic_buffer.c | 14 +- + tools/iio/iio_event_monitor.c | 18 + + 483 files changed, 13974 insertions(+), 19354 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/lpc1850-adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/lpc1850-dac.txt + create mode 100644 Documentation/devicetree/bindings/iio/potentiometer/mcp4131.txt + create mode 100644 Documentation/devicetree/bindings/iio/pressure/ms5611.txt + create mode 100644 drivers/iio/adc/lpc18xx_adc.c + create mode 100644 drivers/iio/dac/lpc18xx_dac.c + create mode 100644 drivers/iio/potentiometer/mcp4131.c + create mode 100644 drivers/iio/pressure/hp206c.c + delete mode 100644 drivers/staging/android/timed_gpio.c + delete mode 100644 drivers/staging/android/timed_gpio.h + delete mode 100644 drivers/staging/android/timed_output.c + delete mode 100644 drivers/staging/android/timed_output.h + delete mode 100644 drivers/staging/comedi/drivers/ni_mio_c_common.c + delete mode 100644 drivers/staging/iio/accel/adis16204.h + delete mode 100644 drivers/staging/iio/accel/adis16204_core.c + delete mode 100644 drivers/staging/iio/accel/adis16220.h + delete mode 100644 drivers/staging/iio/accel/adis16220_core.c + delete mode 100644 drivers/staging/iio/impedance-analyzer/ad5933.h + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h + delete mode 100644 drivers/staging/lustre/lustre/include/lclient.h + delete mode 100644 drivers/staging/lustre/lustre/include/linux/obd.h + delete mode 100644 drivers/staging/lustre/lustre/lclient/lcommon_cl.c + rename drivers/staging/lustre/lustre/{lclient => llite}/glimpse.c (80%) + create mode 100644 drivers/staging/lustre/lustre/llite/lcommon_cl.c + rename drivers/staging/lustre/lustre/{lclient => llite}/lcommon_misc.c (88%) + create mode 100644 drivers/staging/lustre/lustre/llite/vvp_req.c +Merging char-misc/char-misc-next (7553c7e68fd1 Merge 4.6-rc4 into char-misc-next) +$ git merge char-misc/char-misc-next +Merge made by the 'recursive' strategy. + drivers/misc/mei/bus.c | 19 ++++--------------- + 1 file changed, 4 insertions(+), 15 deletions(-) +Merging extcon/extcon-next (b5dbb9f57842 extcon: usb-gpio: Don't miss event during suspend/resume) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-usb-gpio.c | 22 +++++++++------------- + 1 file changed, 9 insertions(+), 13 deletions(-) +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 (0237d1ea51f0 pm80xx: Remove bogus address masking in pm8001_ioremap()) +$ git merge scsi/for-next +Auto-merging lib/Makefile +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/ata/pata_icside.c | 2 +- + drivers/infiniband/ulp/srp/ib_srp.c | 6 +- + drivers/message/fusion/mptspi.c | 2 +- + drivers/s390/scsi/zfcp_unit.c | 3 +- + drivers/scsi/Kconfig | 16 +- + drivers/scsi/NCR5380.c | 657 ++++---- + drivers/scsi/NCR5380.h | 143 +- + drivers/scsi/arm/cumana_1.c | 25 +- + drivers/scsi/arm/cumana_2.c | 2 +- + drivers/scsi/arm/eesox.c | 2 +- + drivers/scsi/arm/oak.c | 22 +- + drivers/scsi/arm/powertec.c | 2 +- + drivers/scsi/atari_NCR5380.c | 2676 -------------------------------- + drivers/scsi/atari_scsi.c | 144 +- + drivers/scsi/bnx2fc/bnx2fc.h | 3 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 100 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 14 +- + drivers/scsi/constants.c | 859 +--------- + drivers/scsi/dmx3191d.c | 10 +- + drivers/scsi/dtc.c | 27 +- + drivers/scsi/dtc.h | 7 +- + drivers/scsi/esas2r/esas2r_main.c | 4 +- + 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/hisi_sas/hisi_sas.h | 4 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 32 +- + drivers/scsi/libiscsi.c | 9 +- + drivers/scsi/lpfc/lpfc.h | 4 +- + drivers/scsi/lpfc/lpfc_attr.c | 26 +- + drivers/scsi/lpfc/lpfc_ct.c | 6 +- + drivers/scsi/lpfc/lpfc_els.c | 176 ++- + drivers/scsi/lpfc/lpfc_hbadisc.c | 5 +- + drivers/scsi/lpfc/lpfc_hw.h | 75 +- + drivers/scsi/lpfc/lpfc_hw4.h | 29 +- + drivers/scsi/lpfc/lpfc_init.c | 27 +- + drivers/scsi/lpfc/lpfc_mbox.c | 12 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 4 +- + drivers/scsi/lpfc/lpfc_sli.c | 131 +- + drivers/scsi/lpfc/lpfc_version.h | 6 +- + drivers/scsi/lpfc/lpfc_vport.c | 5 +- + drivers/scsi/mac_scsi.c | 241 +-- + drivers/scsi/mpt3sas/mpt3sas_base.c | 4 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 2 +- + drivers/scsi/mvsas/mv_init.c | 19 +- + drivers/scsi/pas16.c | 27 +- + drivers/scsi/pas16.h | 5 +- + drivers/scsi/pm8001/pm8001_init.c | 2 - + drivers/scsi/qla2xxx/qla_mr.c | 5 +- + drivers/scsi/qla2xxx/qla_nx.c | 2 +- + drivers/scsi/scsi_debug.c | 2 +- + drivers/scsi/scsi_lib.c | 172 +- + drivers/scsi/scsi_priv.h | 2 +- + drivers/scsi/scsi_proc.c | 3 +- + drivers/scsi/scsi_scan.c | 46 +- + drivers/scsi/scsi_sysfs.c | 9 +- + drivers/scsi/scsi_trace.c | 161 ++ + drivers/scsi/scsi_transport_fc.c | 9 +- + drivers/scsi/scsi_transport_iscsi.c | 19 +- + drivers/scsi/scsi_transport_sas.c | 7 +- + drivers/scsi/sense_codes.h | 826 ++++++++++ + drivers/scsi/snic/snic.h | 5 +- + drivers/scsi/snic/snic_ctl.c | 8 +- + drivers/scsi/snic/snic_debugfs.c | 20 +- + drivers/scsi/snic/snic_disc.c | 19 +- + drivers/scsi/snic/snic_fwint.h | 4 +- + drivers/scsi/snic/snic_io.c | 62 +- + drivers/scsi/snic/snic_isr.c | 6 +- + drivers/scsi/snic/snic_main.c | 44 +- + drivers/scsi/snic/snic_scsi.c | 56 +- + drivers/scsi/snic/snic_stats.h | 12 +- + drivers/scsi/snic/vnic_dev.c | 44 +- + drivers/scsi/sun3_scsi.c | 47 +- + drivers/scsi/t128.c | 19 +- + drivers/scsi/t128.h | 7 +- + drivers/usb/storage/scsiglue.c | 2 +- + include/linux/scatterlist.h | 25 + + include/scsi/scsi.h | 19 - + include/scsi/scsi_device.h | 14 +- + include/scsi/scsi_host.h | 2 +- + include/scsi/scsi_proto.h | 9 + + include/trace/events/scsi.h | 6 +- + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/sg_pool.c | 172 ++ + 88 files changed, 2818 insertions(+), 4920 deletions(-) + delete mode 100644 drivers/scsi/atari_NCR5380.c + create mode 100644 drivers/scsi/sense_codes.h + create mode 100644 lib/sg_pool.c +Merging target-updates/for-next (5e47f1985d71 target: Fix target_release_cmd_kref shutdown comp leak) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging pinctrl/for-next (ca1c8b640fe8 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/bcm/pinctrl-bcm281xx.c | 2 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 13 +++++++++++++ + drivers/pinctrl/bcm/pinctrl-cygnus-mux.c | 2 +- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 2 +- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 2 +- + drivers/pinctrl/berlin/berlin.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 4 ++-- + drivers/pinctrl/meson/pinctrl-meson.c | 2 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 4 ++-- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 4 ++-- + drivers/pinctrl/pinconf-generic.c | 2 +- + drivers/pinctrl/pinctrl-amd.c | 3 ++- + drivers/pinctrl/pinctrl-as3722.c | 2 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 4 ++-- + drivers/pinctrl/pinctrl-digicolor.c | 2 +- + drivers/pinctrl/pinctrl-lpc18xx.c | 2 +- + drivers/pinctrl/pinctrl-palmas.c | 2 +- + drivers/pinctrl/pinctrl-pic32.c | 2 +- + drivers/pinctrl/pinctrl-pistachio.c | 2 +- + drivers/pinctrl/pinctrl-tb10x.c | 2 +- + drivers/pinctrl/pinctrl-utils.c | 4 ++-- + drivers/pinctrl/pinctrl-utils.h | 2 +- + drivers/pinctrl/pinctrl-zynq.c | 2 +- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 2 +- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 +- + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 2 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 4 ++-- + drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 2 +- + drivers/pinctrl/tegra/pinctrl-tegra.c | 4 ++-- + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 2 +- + 33 files changed, 53 insertions(+), 39 deletions(-) +Merging vhost/linux-next (c00bbcf86289 virtio: add VIRTIO_CONFIG_S_NEEDS_RESET device status bit) +$ 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 (9735a22799b9 Linux 4.6-rc2) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (9c088f21bb5d Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Removing include/linux/i2c/sx150x.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-74x164.txt | 4 +- + .../devicetree/bindings/gpio/gpio-mpc8xxx.txt | 20 +++- + .../devicetree/bindings/gpio/gpio-xlp.txt | 3 + + Documentation/devicetree/bindings/gpio/gpio.txt | 14 +++ + .../{gpio => power/reset}/gpio-poweroff.txt | 0 + .../{gpio => power/reset}/gpio-restart.txt | 0 + Documentation/gpio/driver.txt | 89 +++++++++++++++ + MAINTAINERS | 1 + + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 15 +-- + arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 6 +- + arch/powerpc/sysdev/cpm1.c | 36 ++---- + arch/powerpc/sysdev/cpm_common.c | 18 +-- + arch/powerpc/sysdev/ppc4xx_gpio.c | 17 +-- + arch/powerpc/sysdev/simple_gpio.c | 13 +-- + arch/sh/boards/mach-sdk7786/gpio.c | 4 +- + arch/sh/boards/mach-x3proto/gpio.c | 4 +- + arch/unicore32/kernel/gpio.c | 4 +- + drivers/gpio/Kconfig | 20 +++- + drivers/gpio/Makefile | 3 +- + drivers/gpio/gpio-74x164.c | 25 +++++ + drivers/gpio/gpio-amdpt.c | 123 +++------------------ + drivers/gpio/gpio-bcm-kona.c | 14 +-- + drivers/gpio/gpio-brcmstb.c | 1 + + drivers/gpio/gpio-f7188x.c | 52 +++++++-- + drivers/gpio/gpio-it87.c | 10 ++ + drivers/gpio/gpio-loongson1.c | 102 +++++++++++++++++ + drivers/gpio/gpio-mb86s7x.c | 10 +- + drivers/gpio/gpio-mc9s08dz60.c | 12 +- + drivers/gpio/gpio-mcp23s08.c | 111 ++++++------------- + drivers/gpio/gpio-menz127.c | 22 ++-- + drivers/gpio/gpio-moxart.c | 7 +- + drivers/gpio/gpio-mvebu.c | 5 +- + drivers/gpio/gpio-octeon.c | 26 ++--- + drivers/gpio/gpio-palmas.c | 13 +-- + drivers/gpio/gpio-pca953x.c | 42 ++++++- + drivers/gpio/gpio-pl061.c | 12 +- + drivers/gpio/gpio-rc5t583.c | 12 -- + drivers/gpio/gpio-rcar.c | 85 +++++--------- + drivers/gpio/gpio-sta2x11.c | 8 +- + drivers/gpio/gpio-sx150x.c | 100 ++++++++++++++--- + drivers/gpio/gpio-tc3589x.c | 69 ++++++++---- + drivers/gpio/gpio-tpic2810.c | 35 +++--- + drivers/gpio/gpio-tps65218.c | 45 ++++++-- + drivers/gpio/gpio-tps6586x.c | 13 +-- + drivers/gpio/gpio-tps65910.c | 16 +-- + drivers/gpio/gpio-vx855.c | 23 ++++ + drivers/gpio/gpio-wm831x.c | 25 ++++- + drivers/gpio/gpio-wm8994.c | 25 ++++- + drivers/gpio/gpio-xgene-sb.c | 15 +-- + drivers/gpio/gpio-xgene.c | 9 +- + drivers/gpio/gpio-xlp.c | 25 ++++- + drivers/gpio/gpio-zx.c | 14 +-- + drivers/gpio/gpio-zynq.c | 4 +- + drivers/gpio/gpiolib-of.c | 17 +-- + drivers/gpio/gpiolib.c | 63 +++++++---- + drivers/input/keyboard/adp5589-keys.c | 12 +- + drivers/input/touchscreen/ad7879.c | 10 +- + drivers/soc/fsl/qe/gpio.c | 20 ++-- + include/linux/gpio/driver.h | 25 ++++- + include/linux/i2c/sx150x.h | 82 -------------- + kernel/irq/irqdomain.c | 1 + + tools/gpio/Makefile | 2 +- + tools/gpio/lsgpio.c | 2 +- + 63 files changed, 909 insertions(+), 706 deletions(-) + rename Documentation/devicetree/bindings/{gpio => power/reset}/gpio-poweroff.txt (100%) + rename Documentation/devicetree/bindings/{gpio => power/reset}/gpio-restart.txt (100%) + create mode 100644 drivers/gpio/gpio-loongson1.c + delete mode 100644 include/linux/i2c/sx150x.h +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 (5eda83ab215e clk: ti: dra7-atl-clock: Fix of_node reference counting) +$ git merge clk/clk-next +Auto-merging drivers/clk/ti/clk-7xx.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../arm/marvell/ap806-system-controller.txt | 35 + + .../devicetree/bindings/clock/artpec6.txt | 41 + + .../devicetree/bindings/clock/hi3519-crg.txt | 46 + + MAINTAINERS | 2 +- + drivers/clk/Makefile | 3 +- + drivers/clk/at91/clk-h32mx.c | 2 +- + drivers/clk/axis/Makefile | 1 + + drivers/clk/axis/clk-artpec6.c | 242 ++++ + drivers/clk/bcm/clk-bcm2835.c | 1203 ++++++++++++-------- + drivers/clk/clk-clps711x.c | 19 +- + drivers/clk/clk-composite.c | 33 + + drivers/clk/clk-ls1x.c | 3 +- + drivers/clk/clk-nspire.c | 3 +- + drivers/clk/clk-palmas.c | 4 +- + drivers/clk/clk-qoriq.c | 2 +- + drivers/clk/clk-rk808.c | 1 - + drivers/clk/clk-tango4.c | 73 +- + drivers/clk/clk-twl6040.c | 1 - + drivers/clk/clk-wm831x.c | 1 - + drivers/clk/clk-xgene.c | 2 +- + drivers/clk/clk.c | 46 + + drivers/clk/hisilicon/Kconfig | 15 + + drivers/clk/hisilicon/Makefile | 2 + + drivers/clk/hisilicon/clk-hi3519.c | 129 +++ + drivers/clk/hisilicon/clk.c | 23 +- + drivers/clk/hisilicon/clk.h | 14 +- + drivers/clk/hisilicon/reset.c | 124 ++ + drivers/clk/hisilicon/reset.h | 32 + + drivers/clk/meson/meson8b-clkc.c | 6 +- + drivers/clk/mmp/clk-mmp2.c | 14 +- + drivers/clk/mmp/clk-of-mmp2.c | 10 +- + drivers/clk/mmp/clk-of-pxa168.c | 8 +- + drivers/clk/mmp/clk-of-pxa1928.c | 12 +- + drivers/clk/mmp/clk-of-pxa910.c | 8 +- + drivers/clk/mmp/clk-pxa168.c | 8 +- + drivers/clk/mmp/clk-pxa910.c | 8 +- + drivers/clk/renesas/clk-mstp.c | 7 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 34 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 29 +- + drivers/clk/renesas/renesas-cpg-mssr.h | 6 +- + drivers/clk/samsung/clk-exynos5420.c | 77 +- + drivers/clk/sirf/clk-atlas6.c | 7 +- + drivers/clk/sirf/clk-prima2.c | 7 +- + drivers/clk/sunxi/clk-a10-hosc.c | 3 +- + drivers/clk/ti/clk-54xx.c | 1 + + drivers/clk/ti/clk-7xx.c | 1 + + drivers/clk/ti/clk-dra7-atl.c | 2 + + drivers/clk/ti/clkt_dflt.c | 2 +- + drivers/clk/ti/clkt_dpll.c | 3 + + drivers/clk/ti/dpll.c | 5 + + drivers/clk/zte/clk-zx296702.c | 3 +- + include/dt-bindings/clock/axis,artpec6-clkctrl.h | 38 + + include/dt-bindings/clock/bcm2835.h | 20 +- + include/dt-bindings/clock/exynos5420.h | 24 +- + include/dt-bindings/clock/hi3519-clock.h | 40 + + include/linux/clk-provider.h | 9 +- + include/linux/clk/renesas.h | 8 +- + include/linux/clk/ti.h | 2 + + 58 files changed, 1828 insertions(+), 676 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt + create mode 100644 Documentation/devicetree/bindings/clock/artpec6.txt + create mode 100644 Documentation/devicetree/bindings/clock/hi3519-crg.txt + create mode 100644 drivers/clk/axis/Makefile + create mode 100644 drivers/clk/axis/clk-artpec6.c + create mode 100644 drivers/clk/hisilicon/clk-hi3519.c + create mode 100644 drivers/clk/hisilicon/reset.c + create mode 100644 drivers/clk/hisilicon/reset.h + create mode 100644 include/dt-bindings/clock/axis,artpec6-clkctrl.h + create mode 100644 include/dt-bindings/clock/hi3519-clock.h +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. + fs/afs/main.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 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 (4fe83e63352a Merge branch 'for-4.7/livepatching-ppc64' into for-next) +$ git merge livepatching/for-next +Resolved 'arch/powerpc/Kconfig' using previous resolution. +Resolved 'arch/powerpc/kernel/process.c' using previous resolution. +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/module.c +Auto-merging include/linux/module.h +Auto-merging include/linux/ftrace.h +Removing arch/x86/kernel/livepatch.c +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/powerpc/kernel/process.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/process.c +Auto-merging arch/powerpc/kernel/entry_64.S +Auto-merging arch/powerpc/kernel/asm-offsets.c +Auto-merging arch/powerpc/Kconfig +CONFLICT (content): Merge conflict in arch/powerpc/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 68f98e4e6eed] Merge remote-tracking branch 'livepatching/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/livepatch/module-elf-format.txt | 311 ++++++++++++++++++++++++++ + arch/powerpc/Kconfig | 3 + + arch/powerpc/include/asm/livepatch.h | 62 +++++ + arch/powerpc/include/asm/thread_info.h | 4 +- + arch/powerpc/kernel/asm-offsets.c | 4 + + arch/powerpc/kernel/entry_64.S | 97 ++++++++ + arch/powerpc/kernel/irq.c | 3 + + arch/powerpc/kernel/process.c | 6 +- + arch/powerpc/kernel/setup_64.c | 17 +- + arch/s390/include/asm/livepatch.h | 7 - + arch/s390/kernel/module.c | 6 +- + arch/x86/include/asm/livepatch.h | 2 - + arch/x86/kernel/Makefile | 1 - + arch/x86/kernel/livepatch.c | 70 ------ + include/linux/ftrace.h | 1 + + include/linux/livepatch.h | 20 -- + include/linux/module.h | 25 +++ + include/uapi/linux/elf.h | 10 +- + kernel/livepatch/core.c | 188 +++++++++++----- + kernel/module.c | 125 ++++++++++- + kernel/trace/ftrace.c | 14 +- + samples/livepatch/livepatch-sample.c | 1 + + 22 files changed, 798 insertions(+), 179 deletions(-) + create mode 100644 Documentation/livepatch/module-elf-format.txt + create mode 100644 arch/powerpc/include/asm/livepatch.h + delete mode 100644 arch/x86/kernel/livepatch.c +Merging coresight/next (27268ed3d169 coresight: etm4x: modify q_support type) +$ 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 + + arch/arm64/boot/dts/arm/juno.dts | 305 +++ + drivers/hwtracing/coresight/Makefile | 12 +- + drivers/hwtracing/coresight/coresight-etb10.c | 87 +- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 33 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 2126 +++++++++++++++++ + drivers/hwtracing/coresight/coresight-etm4x.c | 2475 +++----------------- + drivers/hwtracing/coresight/coresight-etm4x.h | 222 +- + drivers/hwtracing/coresight/coresight-funnel.c | 1 - + drivers/hwtracing/coresight/coresight-priv.h | 10 + + drivers/hwtracing/coresight/coresight-replicator.c | 1 - + drivers/hwtracing/coresight/coresight-tmc-etf.c | 611 +++++ + drivers/hwtracing/coresight/coresight-tmc-etr.c | 467 ++++ + drivers/hwtracing/coresight/coresight-tmc.c | 558 +---- + drivers/hwtracing/coresight/coresight-tmc.h | 166 ++ + drivers/hwtracing/coresight/coresight-tpiu.c | 1 - + drivers/hwtracing/coresight/coresight.c | 36 +- + 19 files changed, 4431 insertions(+), 2839 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 (44c31a263a5e rtc: ds1307: ds3231 temperature s16 overflow) +$ 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-da9052.c | 13 +- + drivers/rtc/rtc-ds1216.c | 3 - + drivers/rtc/rtc-ds1286.c | 3 - + drivers/rtc/rtc-ds1302.c | 348 +++++++--------- + drivers/rtc/rtc-ds1307.c | 25 +- + drivers/rtc/rtc-ds1343.c | 2 - + drivers/rtc/rtc-ds1511.c | 3 - + drivers/rtc/rtc-ds1553.c | 3 - + drivers/rtc/rtc-ds1672.c | 5 - + drivers/rtc/rtc-ds1685.c | 4 +- + drivers/rtc/rtc-ds1742.c | 3 - + drivers/rtc/rtc-ep93xx.c | 3 - + drivers/rtc/rtc-gemini.c | 1 - + drivers/rtc/rtc-isl12022.c | 5 - + drivers/rtc/rtc-isl1208.c | 6 - + drivers/rtc/rtc-m41t80.c | 447 ++++++++++++++------- + drivers/rtc/rtc-m48t35.c | 3 - + drivers/rtc/rtc-m48t86.c | 4 - + drivers/rtc/rtc-max6900.c | 5 - + drivers/rtc/rtc-pcf2123.c | 4 - + drivers/rtc/rtc-pcf8563.c | 5 - + drivers/rtc/rtc-rs5c313.c | 2 - + drivers/rtc/rtc-rs5c348.c | 4 - + drivers/rtc/rtc-rs5c372.c | 6 +- + drivers/rtc/rtc-rx8581.c | 5 - + drivers/rtc/rtc-sh.c | 2 - + drivers/rtc/rtc-stk17ta8.c | 3 - + drivers/rtc/rtc-x1205.c | 5 - + 31 files changed, 531 insertions(+), 454 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 (a390180291dd libnvdimm, pfn: fix nvdimm_namespace_add_poison() vs section alignment) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging akpm-current/current (6c454fa77b78 ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Resolved 'arch/mips/kernel/process.c' using previous resolution. +Auto-merging net/wireless/util.c +Auto-merging mm/page-writeback.c +Auto-merging mm/gup.c +Auto-merging mm/backing-dev.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm.h +Auto-merging fs/f2fs/file.c +Auto-merging fs/btrfs/volumes.c +Auto-merging drivers/net/ethernet/qlogic/qede/qede_main.c +Auto-merging arch/x86/mm/hugetlbpage.c +Auto-merging arch/x86/kvm/paging_tmpl.h +Auto-merging arch/x86/kvm/mmu.c +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/mips/mm/tlb-r4k.c +Auto-merging arch/mips/kernel/process.c +CONFLICT (content): Merge conflict in arch/mips/kernel/process.c +Auto-merging arch/mips/include/asm/pgtable.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging MAINTAINERS +Auto-merging Documentation/vm/pagemap.txt +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 05f6342217fa] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + Documentation/cgroup-v1/memory.txt | 2 + + Documentation/filesystems/proc.txt | 20 +- + Documentation/filesystems/tmpfs.txt | 88 +- + Documentation/kernel-parameters.txt | 8 + + Documentation/memory-hotplug.txt | 9 +- + Documentation/sysctl/vm.txt | 39 + + Documentation/vm/ksm.txt | 63 + + Documentation/vm/pagemap.txt | 2 + + Documentation/vm/transhuge.txt | 48 +- + Documentation/vm/unevictable-lru.txt | 15 +- + MAINTAINERS | 1 - + arch/Kconfig | 5 + + arch/alpha/kernel/process.c | 8 - + arch/arc/include/asm/hugepage.h | 2 - + arch/arc/kernel/process.c | 7 - + arch/arm/Kconfig | 1 + + arch/arm/include/asm/page.h | 2 + + arch/arm/include/asm/pgtable-3level.h | 5 - + arch/arm/kernel/process.c | 4 +- + arch/arm/vfp/vfpmodule.c | 4 - + arch/arm64/include/asm/pgtable.h | 5 - + arch/arm64/kernel/process.c | 7 - + arch/arm64/mm/hugetlbpage.c | 1 + + arch/avr32/Kconfig | 1 + + arch/avr32/kernel/process.c | 4 +- + arch/blackfin/include/asm/processor.h | 7 - + arch/c6x/kernel/process.c | 4 - + arch/cris/Kconfig | 1 + + arch/cris/arch-v10/kernel/process.c | 9 - + arch/cris/arch-v32/kernel/process.c | 4 +- + arch/frv/include/asm/processor.h | 7 - + arch/h8300/include/asm/processor.h | 7 - + arch/hexagon/kernel/process.c | 7 - + arch/ia64/Kconfig | 1 + + arch/ia64/kernel/perfmon.c | 4 +- + arch/ia64/kernel/process.c | 14 +- + arch/m32r/kernel/process.c | 9 - + arch/m68k/include/asm/processor.h | 7 - + arch/metag/Kconfig | 1 + + arch/metag/include/asm/processor.h | 2 - + arch/metag/kernel/process.c | 6 +- + arch/metag/mm/hugetlbpage.c | 1 + + arch/microblaze/include/asm/processor.h | 10 - + arch/mips/include/asm/pgtable.h | 1 + + arch/mips/kernel/process.c | 4 - + arch/mips/mm/gup.c | 15 +- + arch/mips/mm/tlb-r4k.c | 21 +- + arch/mn10300/Kconfig | 1 + + arch/mn10300/include/asm/fpu.h | 6 +- + arch/mn10300/kernel/process.c | 4 +- + arch/nios2/include/asm/processor.h | 5 - + arch/openrisc/include/asm/processor.h | 9 - + arch/parisc/kernel/process.c | 7 - + arch/powerpc/include/asm/book3s/64/pgtable.h | 1 + + arch/powerpc/include/asm/pgtable.h | 1 - + arch/powerpc/kernel/process.c | 4 - + arch/powerpc/mm/hugetlbpage.c | 6 +- + arch/s390/Kconfig | 1 + + arch/s390/include/asm/pgtable.h | 1 + + arch/s390/kernel/process.c | 5 +- + arch/s390/mm/gup.c | 19 +- + arch/score/kernel/process.c | 2 - + arch/sh/Kconfig | 1 + + arch/sh/kernel/process_32.c | 7 - + arch/sh/kernel/process_64.c | 5 +- + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/pgtable_64.h | 2 - + arch/sparc/kernel/process_32.c | 12 +- + arch/sparc/kernel/process_64.c | 4 +- + arch/sparc/mm/gup.c | 19 +- + arch/tile/Kconfig | 1 + + arch/tile/include/asm/pgtable.h | 1 - + arch/tile/kernel/process.c | 4 +- + arch/tile/kernel/setup.c | 4 +- + arch/tile/mm/hugetlbpage.c | 7 +- + arch/tile/mm/init.c | 2 +- + arch/um/kernel/process.c | 4 - + arch/unicore32/kernel/process.c | 7 - + arch/x86/Kconfig | 1 + + arch/x86/include/asm/pgtable.h | 1 + + arch/x86/kernel/machine_kexec_64.c | 46 + + arch/x86/kernel/process.c | 5 +- + arch/x86/kvm/mmu.c | 150 +- + arch/x86/kvm/paging_tmpl.h | 6 +- + arch/x86/mm/gup.c | 15 +- + arch/x86/mm/hugetlbpage.c | 1 + + arch/x86/mm/numa.c | 4 +- + arch/xtensa/Kconfig | 1 + + arch/xtensa/kernel/process.c | 4 +- + block/genhd.c | 2 +- + drivers/base/node.c | 20 +- + drivers/block/aoe/aoecmd.c | 2 +- + drivers/char/mem.c | 24 + + drivers/char/random.c | 21 +- + 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/btrfs/volumes.c | 2 +- + fs/efivarfs/inode.c | 40 +- + fs/ext4/fsync.c | 5 +- + fs/ext4/ioctl.c | 2 +- + fs/f2fs/file.c | 2 +- + fs/ocfs2/alloc.c | 3 +- + fs/ocfs2/cluster/heartbeat.c | 180 +- + fs/ocfs2/ocfs2_fs.h | 2 +- + fs/proc/meminfo.c | 11 +- + fs/proc/page.c | 8 +- + fs/proc/task_mmu.c | 61 +- + fs/reiserfs/objectid.c | 2 +- + fs/ubifs/sb.c | 2 +- + include/asm-generic/pgtable.h | 8 + + include/linux/bootmem.h | 16 +- + include/linux/compaction.h | 136 +- + include/linux/compiler-gcc.h | 1 + + include/linux/compiler.h | 4 + + include/linux/crc64_ecma.h | 56 + + include/linux/device.h | 12 +- + include/linux/efi.h | 14 +- + include/linux/genhd.h | 23 +- + include/linux/huge_mm.h | 23 +- + 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/kvm_host.h | 2 +- + include/linux/memcontrol.h | 48 +- + include/linux/memory_hotplug.h | 6 +- + include/linux/mempolicy.h | 16 +- + include/linux/mempool.h | 3 +- + include/linux/migrate.h | 2 + + include/linux/migrate_mode.h | 2 + + include/linux/mm.h | 30 +- + include/linux/mm_inline.h | 24 +- + include/linux/mm_types.h | 15 +- + include/linux/mmzone.h | 10 +- + include/linux/nodemask.h | 11 +- + include/linux/oom.h | 9 +- + include/linux/padata.h | 5 - + include/linux/page-flags.h | 10 + + include/linux/page_ref.h | 26 +- + include/linux/pagemap.h | 8 +- + include/linux/pageteam.h | 337 +++ + include/linux/random.h | 1 - + include/linux/sched.h | 15 +- + include/linux/sem.h | 1 + + include/linux/shmem_fs.h | 29 +- + include/linux/slab.h | 16 +- + include/linux/string.h | 2 +- + include/linux/swap.h | 1 + + include/linux/types.h | 1 - + include/linux/uuid.h | 21 +- + include/linux/vm_event_item.h | 1 + + include/linux/vmstat.h | 4 + + include/trace/events/compaction.h | 3 +- + include/trace/events/huge_memory.h | 38 +- + include/trace/events/migrate.h | 7 +- + include/trace/events/mmflags.h | 7 + + include/uapi/linux/kernel-page-flags.h | 3 +- + include/uapi/linux/uuid.h | 4 - + init/main.c | 9 +- + ipc/msg.c | 5 +- + ipc/sem.c | 124 +- + ipc/shm.c | 6 +- + kernel/cpuset.c | 8 +- + kernel/exit.c | 34 +- + kernel/fork.c | 4 +- + kernel/kexec.c | 119 +- + kernel/kexec_core.c | 15 +- + kernel/kexec_file.c | 8 +- + kernel/padata.c | 99 - + kernel/sysctl.c | 26 + + kernel/sysctl_binary.c | 23 +- + lib/Kconfig | 7 + + lib/Makefile | 3 +- + lib/crc64_ecma.c | 341 ++++ + lib/nodemask.c | 30 + + lib/test_kasan.c | 29 + + lib/uuid.c | 91 +- + lib/vsprintf.c | 21 +- + mm/Kconfig | 16 + + mm/backing-dev.c | 20 +- + mm/compaction.c | 254 ++- + mm/filemap.c | 20 +- + mm/gup.c | 19 +- + mm/highmem.c | 12 +- + mm/huge_memory.c | 472 ++++- + mm/hugetlb.c | 37 +- + mm/internal.h | 38 +- + 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 | 224 +- + mm/memory-failure.c | 7 +- + mm/memory.c | 278 ++- + mm/memory_hotplug.c | 21 +- + mm/mempolicy.c | 44 +- + mm/mempool.c | 7 +- + mm/migrate.c | 51 +- + mm/mlock.c | 185 +- + mm/mmap.c | 21 +- + mm/mremap.c | 47 +- + mm/oom_kill.c | 115 +- + mm/page-writeback.c | 10 +- + mm/page_alloc.c | 460 +++-- + mm/page_io.c | 6 +- + mm/page_isolation.c | 10 +- + mm/page_owner.c | 3 + + mm/rmap.c | 133 +- + mm/shmem.c | 2139 +++++++++++++++++++- + mm/slab.c | 523 ++--- + mm/slab.h | 2 + + mm/slab_common.c | 4 + + mm/slub.c | 10 +- + mm/swap.c | 10 + + mm/swap_state.c | 3 +- + mm/truncate.c | 2 +- + mm/util.c | 24 + + mm/vmscan.c | 205 +- + mm/vmstat.c | 88 +- + mm/zsmalloc.c | 139 +- + net/wireless/util.c | 2 +- + scripts/checkpatch.pl | 12 +- + security/integrity/ima/ima_policy.c | 14 +- + tools/vm/page-types.c | 2 + + virt/kvm/kvm_main.c | 14 +- + 231 files changed, 7923 insertions(+), 2226 deletions(-) + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/linux/pageteam.h + create mode 100644 lib/crc64_ecma.c + create mode 100644 lib/nodemask.c + create mode 100644 mm/kasan/quarantine.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 45f78c9a6c54...15866294ee81 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (15866294ee81 drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..195163909790 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 4.5-rc2 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.4 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..6844978e6afa --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20160419 |