diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-10-08 16:08:09 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-10-08 16:08:09 +1100 |
| commit | 312456d0533dbc53f3b6644eeb660a4d9d685f62 (patch) | |
| tree | 2adb1fdd61efbdb49dd269b2c23921044f982161 | |
| parent | 70577f0508dbd11d079eda493600b15fd5bd11fd (diff) | |
Add linux-next specific files for 20151008next-20151008
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 230 | ||||
| -rw-r--r-- | Next/Trees | 232 | ||||
| -rw-r--r-- | Next/merge.log | 6929 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 7396 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..d52efede2405 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,230 @@ +Name SHA1 +---- ---- +origin c6fa8e6de3dc420cba092bf155b2ed25bcd537f7 +fixes c7e9ad7da219cf3f8a7cc45eb1c02fdd91199e8d +kbuild-current 3d1450d54a4fc277fc4598acf2335f74b66b08fc +arc-current e4140819dadc3624accac8294881bca8a3cba4ed +arm-current 868e87ccda2461cafd4a0d39f1486eb8f4a9a6f9 +m68k-current 95bc06ef049b808a067327bd8490b608b47e3870 +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-fixes 4108efb02daa09cbb5db048ada55a5b021b5183d +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +sparc 73958c651fbf70d8d8bf2a60b871af5f7a2e3199 +net 41747509b437dcca880b52a035453f5e4ba14aa4 +ipsec 4e077237cfb6ab13701d504060d3ae248b191e6e +ipvs 6ece90f9a13e2592cbd6634f74bcb306169b5ab6 +sound-current 601d62959d08a450d4666c728ddd2f47c5ba1cfe +pci-current 1266963170f576d4d08e6310b6963e26d3ff9d1e +wireless-drivers de28a05ee28e36fa1fc68fcfc7c6cc1c6f7c270c +driver-core.current 9ffecb10283508260936b96022d4ee43a7798b4c +tty.current 0c55627167870255158db1cde0d28366f91c8872 +usb.current 72194739f54607bbf8cfded159627a2015381557 +usb-gadget-fixes f5f6afa85aa82a8ee59072f2d09f2b381f24c871 +usb-serial-fixes 19ab6bc5674a30fdb6a2436b068d19a3c17dc73e +staging.current b1d562acc78f0af46de0dfe447410bc40bdb7ece +char-misc.current 41ada9df7f340998e810dcda21a00da5f75c4147 +input-current 879f2fea8a5a748bcbf98d2cdce9139c045505d3 +crypto-current 09185e2756a83763bcbfe51b308b85979f0de027 +ide d681f1166919d6829083c069a83edcd59bfd5e34 +devicetree-current f76502aa9140ec338a59487218bf70a9c9e92b8f +rr-fixes 275d7d44d802ef271a42dc87ac091a495ba72fc5 +vfio-fixes 4bc94d5dc95d3a2159d821b39277477e69507f67 +kselftest-fixes ae7858180510d6fd0dfaf66d209bc6103db1678f +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 1b52e50f2a402a266f1ba2281f0a57e87637a047 +drm-intel-fixes 049e6dde7e57f0054fdc49102e7ef4830c698b46 +asm-generic 643165c8bbc8617d8222cb50c89e34fe64d226cf +arc 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f +arm d12fad0e3b19944de4d6e46939ca9f35f10ec7d2 +arm-perf 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f +arm-soc 3eedf0e8b2013c643314d4e37ccb769a00bc4807 +at91 5ccea17e1ab306e5b4548074d545b7d8f93d8119 +bcm2835 b2776bf7149bddd1f4161f14f79520f17fc1d71d +berlin 99c5d7234cf2a67e8aa6f50eeb8d3e626076c757 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs e82731e47607630fafadc10a92f4d81d27edefc8 +keystone afef8d3343d1895583a13c1810abe591b9366f27 +mvebu 790f485f2afadb7b6d8de82ae42684451ec38c88 +omap 9a5e3f27d1b8ca349b79e8b5fe1874eeeedb6f45 +omap-pending 30aa18d3bea5f9470af5aa48ab8df88bde97c795 +qcom 16a066d6dce844b9a085b6a7d2868b122e9d5a23 +renesas fd4b8416a5dd39e1af9c290d65bca5fd34b30a69 +rockchip 906d303752895d32a40378b7f89103b7a331017e +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung acf92fee9a9b6e2b27fb027fcae87c8546d74954 +samsung-krzk 52265cb1da16445a2b00701c582d3b447c0f24d0 +sunxi 88e817c8f6476b726757fcaf5f44d13b60493b34 +tegra 84529095fefd93c14b39b8342c6bc87a3d1019e0 +arm64 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f +blackfin d91e14b3b9e1d8e1d552f4d6aff45551bbb410b1 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris d81a922cf21f5eae60ccd0c128e7a95d10cf83aa +h8300 99bcfda85f66499b9318fa349dea0f73be8c0a68 +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 ae40b7e2875228d961c2202d69b55d416644e830 +m68k bab84fa9cc09dfa9702029f83ea6bf8bf5ae96af +m68knommu a8dcf707ae27da4460b0e64480fce3eedc125b8f +metag 3fe6942f04866ec38b515da6eb38eeceafcbfce3 +microblaze b14132797d8041a42e03f4ffa1e722da1425adfb +mips bdb232890472f58d4ebd75b8135518b4f324d67b +nios2 8840da98bfec88f17184f33bfc7ff9dcc22f3b63 +parisc-hd 64291f7db5bd8150a74ad2036f1037e6a0428df2 +powerpc 2adc48a691866fbb3134dd3abd77647a8b5a9307 +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl 4524cd093fa8f03b198e095ebbb679c30839559c +mpc5xxx 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025 +s390 2130eeefadb5aa92d4d7386fed1b1eff6a977ad0 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile dfd51f97823eb86b20946fef68002ec61fdda31f +uml bdbac7d0e2b3930ae7f6d40eb37c5ea575ef763b +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa 895fb3159280fe7695b35ec7c87ec19e13ca5b6e +btrfs 3a9508b0221dfd290b95fb0ab199958fe078bbdf +ceph 8dbd263de1cba18100a9fb30fed606e6d7939b9d +cifs c6fa8e6de3dc420cba092bf155b2ed25bcd537f7 +ecryptfs 933c32fe0e42b86d9bc5779401c3ce93d56bd231 +ext3 d4eb6dee471250661a5183a7336b18c85990e26d +ext4 36086d43f6575c081067de9855786a2fc91df77b +f2fs 464c2b76e1a21542112c95694de38316e5f5ef67 +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 0a30f612d6cfd936235b41b090dbe0119c9039d1 +gfs2 491e94f790982bec5a1334dd3db2708de3724bdf +jfs 26456955719b79cc4a011b18221aa68f599f6b6c +nfs c6fa8e6de3dc420cba092bf155b2ed25bcd537f7 +nfsd be68fcecd492bcaed9cb04b1e1edda285b9a4623 +orangefs 548049495cb46348866aec1cb7721e9d00b4eb83 +overlayfs d9aa4e0bfb63ca3cf0ef388528d5c073f1966ffb +squashfs 62421645bb702c077ee5a462815525106cb53bcf +v9fs 46cfbe8e037a5041e17a672016550d358b232319 +ubifs 1cb8f9776c7dcadc57885c6653943511d282633b +xfs 1f93e4a96c9109378204c147b3eec0d0e8100fde +file-locks 128a37852234c1bd68eee4e7447f5362778009b8 +vfs 397d425dc26da728396e66d392d5dcb8dac30c37 +pci ebfc4df6bfc889ae3426e287724de9f781a7265c +hid 369032a61d65784ddbf9238e3c1f8bffbed98e63 +i2c f5956abbe4301c11216527422b7904a492b5f9a8 +jdelvare-hwmon 902fd32b771142a69a37cec7b09eda334181ef8e +dmi 1dc51b8288007753ad7cd7d08bb8fa930fc8bb10 +hwmon-staging 91cec9604f544fe78d9dfdb71d4f55bb0808da93 +v4l-dvb 41a8f406dacde0d1faf4adb9015426a7d285801a +kbuild a8503631df45237a70bff4e8f9baf1dad14cda46 +kconfig c0ddc8c745b7f89c50385fd7aa03c78dc543fa7a +libata 75458f95afed0b4fc9334ddd86175173db586366 +pm 1f866e8d0ca2c44bf60f51de42cb066313786975 +idle f05bd12f0e9c6da2b58e1ddd4b3edeae5ee35c20 +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +thermal 97584d1838b7e2545c3b10aacef3327fcaa9531b +thermal-soc b840b6e65cbe2b84ec398bb286d121a9eb2597ee +ieee1394 d71e6a11737f4b3d857425a1d6f893231cbd1296 +dlm b3a5bbfd780d9e9291f5f257be06e9ad6db11657 +swiotlb 9d99c7123c9af5f47a2037933a3ffaec3e37efad +slave-dma e1ec9fcc7fa5247197f9556a29dff54acd4c9d4f +net-next acb4a6bfc80ddeea4c44074dd630f916259e909e +ipsec-next c386578f1cdb4dac230395a951f88027f64346e3 +ipvs-next 92240e8dc0d1a94ea3dde7cb19aace113dcc6cb9 +wireless-drivers-next 7e64e5e66af8308725bfd03fcdf185c09b3056a7 +bluetooth 9bc63ca0904da3f163c01087e27952dd962d548d +rdma 070b399723206a4ed80410358f801a7df68d08e6 +mtd e5a5d92d9dc36055b971d79e408e345f5ce88701 +l2-mtd eb042ec35956de2684de2a05a814cd15efe570ca +crypto 9196d9676fe790975fdb1fc03230629139c6ea8e +drm d4070ff71363a2b6598633f23558f809600ebad2 +drm-panel a33ee95f8f456c241897a4b6153610b8488d009d +drm-intel 4f91fc6d2c1d98b3da7a8341ef5ec66ccf2916b9 +drm-tegra 3fe2c7d4c85b4557c9772ff16f31ddc18cfd2521 +drm-misc b44f84081b8db1b5830cbd30280ba1109cc1a084 +drm-exynos 7d9071a095023cd1db8fa18fa0d648dc1a5210e0 +drm-msm d248b61f611463cca906d5663a9a0de63ade97a9 +sound a04267fd87b62cd03d2a2ebb05a5b38d272e8d11 +sound-asoc 5c89b11f0711e1e24fd34103298db54b630592a0 +modules 5cfb203a304deaaa8c7c5368722b214d24583137 +input 726d0d407b9a06b4f30053b33ae7d5edec8d5095 +block f7e7868b4743f1cc5e59e6e0ddd3ccf9cfe53a1b +device-mapper 30c2a1faaeb3db94fc92f79553cc72634aa3b218 +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh 097cfc1cff293febe369f4ddc97adb5ecdabe72f +kgdb 2d289f14f00a0da6bae7c8415fc8dd9d030458b8 +md 6f5ac9a5bc8a246b71ed58b243a8254b9bc56b79 +mfd 006d2c2a7105bfea4b839cb8f2e2ff9e0d0512e9 +backlight 7111c6c672fc8714c5092952a24df6694d46d71f +battery 3636859b280ca595da4556274a509223f47e9a39 +omap_dss2 6a5e3bd0c8bc1025bb5092f54d5aea38216c665e +regulator 494fa9126950291c2df2334286fd0a6571352342 +security 049e6dde7e57f0054fdc49102e7ef4830c698b46 +integrity 24fd03c87695a76f0517df42a37e51b1597d2c8a +selinux db73b9d316b6eec81eae73d6f950d06379d519ce +lblnet b2776bf7149bddd1f4161f14f79520f17fc1d71d +watchdog 55f1dfb398d91d6c354abf0bdde16f1989ad9c12 +iommu eea87ff7bd4411bab81ad54d86999c4885b4cd5b +dwmw2-iommu 5dbaf90a6780b2989515212cb2584b7771cecad1 +vfio a714ea5fa41623c8d8c42bed0dfb38a4d653451d +jc_docs b479bfd00e463034a73a9894d4f6d87988cbc559 +trivial 0c6cac7ab44435d8837931a561cc4d58530cc032 +audit fdccf57528695a97da9b4fd9b1484306f25e4e0e +devicetree 48a9b733e644ab4cc8e2a98950a36ddb12b8c54e +dt-rh a13f18f59d2646754cda3662a9e215ff43e7a7d5 +mailbox 86e488adaab77a733b01e759bf7bfda054479660 +spi 637370041cecce2687ac5661b6f8262ebc4d15f8 +tip 32f01b56d7b6e1cd1a19ef4ec098b3f4f06fc9b4 +clockevents 0e4baaa9a11bb0f3618a2131de5a4b3bc783d89a +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd df77345c5394a347bb5bc647adc397dcaea2236b +irqchip a8bcdc32fafbeb236910e6ddc0161003a458ffc1 +tiny f114040e3ea6e07372334ade75d1ee0775c355e1 +ftrace 37aea98b84c0ce2ac638510fefeed9f8f920bd34 +rcu 7afa512b9fb66dbff919384e43eeccd46b4ba291 +kvm b7d2063177a584cb1afb06fc0ed6c48b576f3e75 +kvm-arm 1f93e4a96c9109378204c147b3eec0d0e8100fde +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus 3eb4ee68254235e4f47bc0410538fcdaede39589 +kvms390 feeb6eb53dad7f4d25f47c3e97ee9ee022093aeb +xen-tip 10e5d40c0b617e360d60f4ada01b32c18243aa68 +percpu 5a928541585b40a91e6cc06017b6079d1b0fb9e9 +workqueues 874bbfe600a660cba9c776b3957b1ce393151b76 +drivers-x86 9ffecb10283508260936b96022d4ee43a7798b4c +chrome-platform 1d95e6f10fd88b936815b669f51bba2685a61b5d +regmap 370f4455d3bb8a575e114330422ad0ed07b66c1e +hsi d9cb7d74c479f78b2d682667ab3bc84b2279c453 +leds 654cf406e9a16a8d791f3095d5c44bd16982d0f8 +ipmi f22b7d0682d3ae7a38327edc68bfff06978ec920 +driver-core dbe2256ddd8e8420c254c79f4045c41cb5f4bd6b +tty 1a76eb5b04062cf2a32d5c7f0aefc9d92c3f986a +usb d5f9e73309b774dd9d86428edd7958b0960bcb85 +usb-gadget ec1f9d9f01384fe656a6f92b90de274146fe35a1 +usb-serial 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f +staging d3337eb1e113bed287b58677e755c807be88d507 +char-misc c39b7eef7d92f5ffef1abf04227a62fa2a6a62b2 +extcon de992acb93df41fd6cd0ea975ae192363033694a +kdbus fc87a0ace7e3a40e9e5988943a5187b04104fb7e +cgroup a3e72739b7a7ea225dd11c4096f97123f6427d87 +scsi 15e3d5a285ab9283136dba34bbf72886d9146706 +target-updates f719334383001d87046557e8799216a9bfbd8a85 +target-merge 8edb1554f7c2eb73cf70c9856aec01e786b9bcf9 +pinctrl 0254cb138f0ef69ce32fa83772abd89236e94e40 +vhost d629f2b585cb766ed9732008976d029cb5d5e584 +remoteproc 8de3dbd0895bebe52d069a82feae8e3fb51c1bdf +rpmsg b1b9891441fa33fd0d49b5cb3aa7f04bca1cc1db +gpio 2db8aba860c70478f6af18c410a3e513a2d2f541 +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm 7e3b7dc76c41f9042a7079eb07d071f744bbd87a +dma-buf 86ea07ca846a7c352f39dd0b7d81f15f403c7db8 +userns 4b75de8615050c1b0dd8d7794838c42f74ed36ba +ktest b953c0d234bc72e8489d3bf51a276c5c4ec85345 +clk 7866ca1a4ad9ef7604b427536fbce400cb3ea6fb +random 7185ad2672a7d50bc384de0e38d90b75d99f3d82 +aio 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f +llvmlinux 25d4aee23af28a6ef04d70a1028c012665384df1 +kselftest e2343596c9d67858b028e73e4cfc8dfba2ee4655 +y2038 ed8c2241c1ae1b64e4a783ae7a2c685c93142a8d +luto-misc a6c5170d1edea97c538c81e377e56c7b5c5b7e63 +access_once c231afa3ccf176490dcafc3666559e7567690e76 +livepatching 07d42d41dfc438dc21e24e60e3f1092ff4ab2d0e +coresight ce9478fdb6e094405a96de7e15fe177889a37441 +rtc 0c155bd0c1791be957dbff893edaf1c56f685bc9 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm ae4f976968896f8f41b3a7aa21be6146492211e5 +akpm-current c3a0c7301db7c3797655cf114e67f4162830c370 +akpm 723e82d551f6f10c1987cb6544e9454ae2f6c3a0 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..30c175d639c9 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,232 @@ +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 +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-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 +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 +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +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 +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 git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-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://codeaurora.org/quic/kernel/agross-msm.git#qcom/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://github.com/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 +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.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.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 +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +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 +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 +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 +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-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 +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 +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 +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 git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://neil.brown.name/md#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 +selinux git git://git.infradead.org/users/pcmoore/selinux#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet#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 +tiny git git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux.git#tiny/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 +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.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 +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 +kdbus git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#kdbus +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://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.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 +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +aio git git://git.kvack.org/~bcrl/aio-next.git#master +llvmlinux git git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next +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 +access_once 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..fd054b80f64c --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6929 @@ +$ date -R +Thu, 08 Oct 2015 09:07:08 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at f6702681a0af Merge tag 'for-linus-4.3b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip +Merging origin/master (c6fa8e6de3dc Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) +$ git merge origin/master +Updating f6702681a0af..c6fa8e6de3dc +Fast-forward + Documentation/devicetree/bindings/spi/sh-msiof.txt | 2 +- + arch/alpha/include/asm/word-at-a-time.h | 2 ++ + arch/arm64/kernel/debug-monitors.c | 23 ++++++++------- + arch/arm64/kernel/insn.c | 6 ++-- + arch/arm64/kernel/setup.c | 2 ++ + arch/arm64/mm/fault.c | 1 + + arch/h8300/include/asm/Kbuild | 1 + + arch/powerpc/include/asm/Kbuild | 1 - + arch/tile/include/asm/Kbuild | 1 - + arch/tile/include/asm/word-at-a-time.h | 8 ++++- + drivers/base/regmap/regmap-debugfs.c | 5 ++-- + drivers/mtd/nand/mxc_nand.c | 2 +- + drivers/mtd/nand/sunxi_nand.c | 27 +++++++---------- + drivers/regulator/axp20x-regulator.c | 4 +-- + drivers/regulator/core.c | 4 +++ + drivers/spi/spi-davinci.c | 7 +++-- + drivers/video/fbdev/broadsheetfb.c | 8 +++-- + drivers/video/fbdev/fsl-diu-fb.c | 9 +++++- + drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 1 + + .../video/fbdev/omap2/displays-new/connector-dvi.c | 2 +- + .../omap2/displays-new/panel-sony-acx565akm.c | 1 + + drivers/video/fbdev/tridentfb.c | 12 ++++++-- + drivers/video/of_display_timing.c | 1 + + fs/nfs/nfs4proc.c | 15 ++++++++-- + fs/nfs/nfs4state.c | 3 +- + fs/nfs/nfs4trace.h | 2 +- + fs/nfs/write.c | 14 ++++----- + lib/string.c | 3 +- + mm/filemap.c | 34 ++++++++++------------ + net/sunrpc/xprtrdma/transport.c | 2 +- + net/sunrpc/xprtrdma/verbs.c | 9 ++++-- + 31 files changed, 126 insertions(+), 86 deletions(-) +Merging fixes/master (c7e9ad7da219 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge fixes/master +Already up-to-date. +$ git am -3 ../patches/0001-word-at-a-time.h-powerpc-implement-define-zero_bytem.patch +Applying: word-at-a-time.h: powerpc: implement define zero_bytemask +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 (e4140819dadc ARC: signal handling robustify) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (868e87ccda24 ARM: make RiscPC depend on MMU) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging m68k-current/for-linus (95bc06ef049b m68k/defconfig: Update defconfigs for v4.3-rc1) +$ 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 mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) +$ git merge mips-fixes/mips-fixes +Already up-to-date. +Merging powerpc-fixes/fixes (4108efb02daa cxl: Fix number of allocated pages in SPA) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/configs/ppc64_defconfig | 2 +- + arch/powerpc/configs/pseries_defconfig | 2 +- + arch/powerpc/platforms/ps3/os-area.c | 5 ----- + drivers/misc/cxl/api.c | 1 + + drivers/misc/cxl/context.c | 3 +++ + drivers/misc/cxl/cxl.h | 1 + + drivers/misc/cxl/file.c | 13 ++++++++++--- + drivers/misc/cxl/irq.c | 4 +--- + drivers/misc/cxl/native.c | 2 +- + drivers/misc/cxl/pci.c | 28 ++++++++++++++++++++++++++++ + 10 files changed, 47 insertions(+), 14 deletions(-) +Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (73958c651fbf sparc64: use ENTRY/ENDPROC in VISsave) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/include/uapi/asm/asi.h | 2 +- + arch/sparc/lib/VISsave.S | 10 +++++----- + 2 files changed, 6 insertions(+), 6 deletions(-) +Merging net/master (41747509b437 Merge branch 'ovs-ct-fixes') +$ git merge net/master +Merge made by the 'recursive' strategy. + arch/arm/net/bpf_jit_32.c | 1 + + drivers/net/can/sja1000/peak_pci.c | 1 + + drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | 4 ++ + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 2 + + drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 4 +- + drivers/net/ethernet/nxp/lpc_eth.c | 13 ++-- + drivers/net/ppp/pppoe.c | 1 - + drivers/net/usb/asix_common.c | 4 +- + drivers/net/wireless/ath/ath10k/hw.h | 4 +- + drivers/net/wireless/ath/ath9k/init.c | 1 + + drivers/net/wireless/b43/main.c | 1 + + drivers/net/wireless/rt2x00/rt2800usb.c | 1 + + include/net/inet_timewait_sock.h | 4 +- + include/uapi/linux/openvswitch.h | 36 +++++----- + net/core/filter.c | 6 +- + net/dsa/dsa.c | 70 ++++++++++++++++--- + net/ipv4/arp.c | 8 ++- + net/ipv4/inet_connection_sock.c | 19 +++--- + net/ipv6/xfrm6_policy.c | 1 + + net/openvswitch/actions.c | 19 ++++-- + net/openvswitch/conntrack.c | 89 ++++++++++++------------- + net/openvswitch/conntrack.h | 14 +++- + net/openvswitch/flow.h | 2 +- + net/openvswitch/flow_netlink.c | 30 +++++---- + net/openvswitch/flow_table.c | 3 +- + net/openvswitch/vport.c | 42 ++++-------- + net/sched/act_mirred.c | 17 +++-- + net/unix/af_unix.c | 12 ++-- + 29 files changed, 248 insertions(+), 165 deletions(-) +Merging ipsec/master (4e077237cfb6 xfrm: Fix state threshold configuration from userspace) +$ git merge ipsec/master +Auto-merging net/ipv6/xfrm6_policy.c +Merge made by the 'recursive' strategy. + net/ipv6/xfrm6_output.c | 17 +++++++++++------ + net/ipv6/xfrm6_policy.c | 6 ++++-- + net/xfrm/xfrm_user.c | 4 +++- + 3 files changed, 18 insertions(+), 9 deletions(-) +Merging ipvs/master (6ece90f9a13e netfilter: fix Kconfig dependencies for nf_dup_ipv{4,6}) +$ git merge ipvs/master +Merge made by the 'recursive' strategy. + net/ipv4/netfilter/Kconfig | 1 + + net/ipv6/netfilter/Kconfig | 1 + + 2 files changed, 2 insertions(+) +Merging sound-current/for-linus (601d62959d08 Merge tag 'asoc-fix-v4.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 --------- + sound/pci/hda/patch_cirrus.c | 1 + + sound/pci/hda/patch_realtek.c | 1 + + sound/pci/hda/patch_sigmatel.c | 6 +++++- + sound/soc/au1x/db1200.c | 4 ++++ + sound/soc/codecs/rt5645.c | 6 +++--- + sound/soc/codecs/rt5645.h | 16 +++++++++------- + sound/soc/codecs/sgtl5000.c | 6 +++--- + sound/soc/codecs/tas2552.c | 2 +- + sound/soc/codecs/tlv320aic3x.c | 19 +++++++++++-------- + sound/soc/codecs/wm8962.c | 5 ++++- + sound/soc/dwc/designware_i2s.c | 19 ++++++++++++++----- + sound/soc/fsl/imx-ssi.c | 19 +++++++++---------- + sound/synth/emux/emux_oss.c | 3 ++- + 14 files changed, 67 insertions(+), 49 deletions(-) +Merging pci-current/for-linus (1266963170f5 PCI: Prevent out of bounds access in numa_node override) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + drivers/pci/pci-sysfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging wireless-drivers/master (de28a05ee28e Merge tag 'iwlwifi-for-kalle-2015-10-05' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/iwlwifi/dvm/lib.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-7000.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/d3.c | 27 +++++++++++---------------- + drivers/net/wireless/iwlwifi/mvm/fw.c | 4 ++-- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 1 + + drivers/net/wireless/iwlwifi/mvm/mvm.h | 5 +++++ + drivers/net/wireless/iwlwifi/mvm/ops.c | 1 + + drivers/net/wireless/iwlwifi/pcie/drv.c | 5 +++++ + drivers/net/wireless/rtlwifi/pci.h | 2 ++ + drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 17 +++++++++++++++++ + drivers/net/wireless/rtlwifi/rtl8821ae/sw.c | 5 +++++ + drivers/net/wireless/rtlwifi/wifi.h | 3 +++ + 12 files changed, 54 insertions(+), 20 deletions(-) +Merging driver-core.current/driver-core-linus (9ffecb102835 Linux 4.3-rc3) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (0c5562716787 drivers/tty: require read access for controlling terminal) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/n_tty.c | 15 +++++--------- + drivers/tty/serial/8250/8250_port.c | 8 ++++++++ + drivers/tty/serial/atmel_serial.c | 2 +- + drivers/tty/serial/imx.c | 20 +++++++++++++------ + drivers/tty/tty_buffer.c | 22 +++++++++++++++----- + drivers/tty/tty_io.c | 40 +++++++++++++++++++++++++++++++------ + 6 files changed, 79 insertions(+), 28 deletions(-) +Merging usb.current/usb-linus (72194739f546 usb: Add device quirk for Logitech PTZ cameras) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/usb/renesas_usbhs.txt | 1 + + drivers/phy/phy-berlin-sata.c | 1 + + drivers/phy/phy-qcom-ufs.c | 11 +++++++++++ + drivers/phy/phy-rockchip-usb.c | 6 ++++++ + drivers/usb/core/quirks.c | 13 +++++++++++++ + drivers/usb/gadget/udc/bdc/bdc_ep.c | 4 +++- + drivers/usb/misc/chaoskey.c | 2 +- + drivers/usb/renesas_usbhs/common.c | 7 ++++++- + include/linux/usb/renesas_usbhs.h | 2 +- + 9 files changed, 43 insertions(+), 4 deletions(-) +Merging usb-gadget-fixes/fixes (f5f6afa85aa8 usb: renesas_usbhs: Add support for R-Car H3) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (19ab6bc5674a USB: option: add ZTE PIDs) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (b1d562acc78f staging: speakup: fix speakup-r regression) +$ git merge staging.current/staging-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + drivers/staging/speakup/fakekey.c | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) +Merging char-misc.current/char-misc-linus (41ada9df7f34 mcb: Fix error handling in mcb_pci_probe()) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/mcb/mcb-pci.c | 6 ++++-- + drivers/misc/mei/hbm.c | 2 +- + drivers/nvmem/core.c | 8 ++++---- + drivers/nvmem/sunxi_sid.c | 11 ++++++++++- + 4 files changed, 19 insertions(+), 8 deletions(-) +Merging input-current/for-linus (879f2fea8a5a Input: ads7846 - correct the value got from SPI) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/touchscreen/ads7846.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) +Merging crypto-current/master (09185e2756a8 hwrng: xgene - fix handling platform_get_irq) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (d681f1166919 ide: remove deprecated use of pci api) +$ 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 (275d7d44d802 module: Fix locking in symbol_put_addr()) +$ git merge rr-fixes/fixes +Merge made by the 'recursive' strategy. + kernel/module.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) +Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (ae7858180510 selftests: exec: revert to default emit rule) +$ 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 +Merge made by the 'recursive' strategy. + drivers/mfd/intel-lpss.h | 2 ++ + drivers/mfd/max77843.c | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) +Merging drm-intel-fixes/for-linux-next-fixes (049e6dde7e57 Linux 4.3-rc4) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (6ff33f3902c3 Linux 4.3-rc1) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (d12fad0e3b19 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + Documentation/arm/memory.txt | 2 +- + arch/arm/Kconfig | 7 ++++-- + arch/arm/include/asm/irqflags.h | 10 ++++++++ + arch/arm/include/asm/mach/arch.h | 2 +- + arch/arm/include/asm/memory.h | 2 ++ + arch/arm/include/asm/pgtable.h | 2 +- + arch/arm/include/asm/smp.h | 4 ++-- + arch/arm/include/asm/unistd.h | 7 ------ + arch/arm/kernel/entry-armv.S | 33 +++---------------------- + arch/arm/kernel/hw_breakpoint.c | 1 - + arch/arm/kernel/kgdb.c | 31 ++++++++++-------------- + arch/arm/kernel/smp.c | 12 +++++++++- + arch/arm/kernel/smp_twd.c | 4 ---- + arch/arm/kernel/traps.c | 52 ---------------------------------------- + arch/arm/lib/clear_user.S | 4 ++++ + arch/arm/mm/Kconfig | 12 ---------- + arch/arm/mm/dma-mapping.c | 7 ++++++ + arch/arm/mm/mmu.c | 3 +++ + lib/nmi_backtrace.c | 11 ++++++++- + 19 files changed, 72 insertions(+), 134 deletions(-) +Merging arm-perf/for-next/perf (6ff33f3902c3 Linux 4.3-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (3eedf0e8b201 arm-soc: document merges) +$ git merge arm-soc/for-next +Removing arch/arm/mach-shmobile/sh-gpio.h +Removing arch/arm/mach-shmobile/r8a7778.h +Removing arch/arm/mach-shmobile/intc.h +Removing arch/arm/mach-shmobile/console.c +Removing arch/arm/mach-shmobile/clock.h +Removing arch/arm/mach-shmobile/clock.c +Removing arch/arm/mach-shmobile/clock-r8a7778.c +Removing arch/arm/mach-shmobile/board-bockw.c +Removing arch/arm/mach-shmobile/board-bockw-reference.c +Removing arch/arm/mach-shmobile/Makefile.boot +Removing arch/arm/configs/bockw_defconfig +Removing arch/arm/boot/dts/r8a7778-bockw-reference.dts +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/apm/scu.txt | 17 + + .../bindings/arm/hisilicon/hisilicon.txt | 4 + + Documentation/devicetree/bindings/arm/pmu.txt | 1 + + Documentation/devicetree/bindings/arm/shmobile.txt | 6 - + MAINTAINERS | 9 +- + arch/arm/Kconfig | 26 +- + arch/arm/Kconfig.debug | 44 +- + arch/arm/arm-soc-for-next-contents.txt | 56 ++ + arch/arm/boot/dts/Makefile | 5 +- + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 61 ++ + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 2 +- + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 2 +- + arch/arm/boot/dts/at91-sama5d4ek.dts | 27 + + arch/arm/boot/dts/at91sam9m10g45ek.dts | 2 + + arch/arm/boot/dts/at91sam9n12ek.dts | 8 +- + arch/arm/boot/dts/at91sam9x5.dtsi | 3 +- + arch/arm/boot/dts/at91sam9x5ek.dtsi | 8 + + arch/arm/boot/dts/efm32gg-dk3750.dts | 8 +- + arch/arm/boot/dts/efm32gg.dtsi | 32 +- + arch/arm/boot/dts/exynos4412.dtsi | 1 + + arch/arm/boot/dts/exynos5250-smdk5250.dts | 1 + + arch/arm/boot/dts/exynos5420.dtsi | 2 +- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 1 - + arch/arm/boot/dts/imx53-qsrb.dts | 2 +- + arch/arm/boot/dts/imx53.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-rex.dtsi | 2 - + arch/arm/boot/dts/r8a7778-bockw-reference.dts | 139 ---- + arch/arm/boot/dts/r8a7790.dtsi | 1 + + arch/arm/boot/dts/r8a7791.dtsi | 1 + + arch/arm/boot/dts/sama5d2-pinfunc.h | 880 +++++++++++++++++++++ + arch/arm/boot/dts/sama5d3.dtsi | 3 +- + arch/arm/boot/dts/sama5d3xmb.dtsi | 2 + + arch/arm/boot/dts/sama5d4.dtsi | 17 +- + arch/arm/boot/dts/socfpga_arria10.dtsi | 8 + + arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 27 + + arch/arm/boot/dts/stih407-family.dtsi | 47 +- + arch/arm/boot/dts/stih407-pinctrl.dtsi | 386 ++++++++- + arch/arm/boot/dts/stih407.dtsi | 13 - + arch/arm/boot/dts/stih410-b2120.dts | 24 + + arch/arm/boot/dts/stih410.dtsi | 23 +- + arch/arm/boot/dts/stih418.dtsi | 6 + + arch/arm/boot/dts/stihxxx-b2120.dtsi | 8 + + arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- + arch/arm/configs/bockw_defconfig | 133 ---- + arch/arm/configs/multi_v7_defconfig | 24 +- + arch/arm/configs/shmobile_defconfig | 1 - + arch/arm/include/debug/at91.S | 18 +- + arch/arm/mach-exynos/mcpm-exynos.c | 27 +- + arch/arm/mach-exynos/regs-pmu.h | 6 + + arch/arm/mach-shmobile/Kconfig | 73 -- + arch/arm/mach-shmobile/Makefile | 14 +- + arch/arm/mach-shmobile/Makefile.boot | 12 - + arch/arm/mach-shmobile/board-bockw-reference.c | 86 -- + arch/arm/mach-shmobile/board-bockw.c | 737 ----------------- + arch/arm/mach-shmobile/clock-r8a7778.c | 342 -------- + arch/arm/mach-shmobile/clock.c | 47 -- + arch/arm/mach-shmobile/clock.h | 42 - + arch/arm/mach-shmobile/common.h | 5 - + arch/arm/mach-shmobile/console.c | 27 - + arch/arm/mach-shmobile/intc.h | 295 ------- + arch/arm/mach-shmobile/pm-rmobile.c | 35 +- + arch/arm/mach-shmobile/pm-rmobile.h | 9 - + arch/arm/mach-shmobile/r8a7778.h | 78 -- + arch/arm/mach-shmobile/r8a7779.h | 2 - + arch/arm/mach-shmobile/setup-r8a7778.c | 560 +------------ + arch/arm/mach-shmobile/sh-gpio.h | 29 - + arch/arm/mach-shmobile/timer.c | 21 - + arch/arm64/Kconfig.platforms | 5 + + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/altera/Makefile | 5 + + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 358 +++++++++ + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 39 + + arch/arm64/boot/dts/apm/Makefile | 1 + + arch/arm64/boot/dts/apm/apm-merlin.dts | 72 ++ + arch/arm64/boot/dts/apm/apm-mustang.dts | 12 + + arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 271 +++++++ + arch/arm64/boot/dts/apm/apm-storm.dtsi | 17 + + arch/arm64/boot/dts/hisilicon/Makefile | 2 +- + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 7 +- + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 43 +- + arch/arm64/boot/dts/hisilicon/hip05-d02.dts | 36 + + arch/arm64/boot/dts/hisilicon/hip05.dtsi | 271 +++++++ + arch/arm64/configs/defconfig | 1 + + drivers/bus/Kconfig | 1 - + drivers/clk/shmobile/clk-mstp.c | 4 + + include/linux/platform_data/atmel.h | 8 - + 86 files changed, 2838 insertions(+), 2857 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/apm/scu.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + delete mode 100644 arch/arm/boot/dts/r8a7778-bockw-reference.dts + create mode 100644 arch/arm/boot/dts/sama5d2-pinfunc.h + delete mode 100644 arch/arm/configs/bockw_defconfig + delete mode 100644 arch/arm/mach-shmobile/Makefile.boot + delete mode 100644 arch/arm/mach-shmobile/board-bockw-reference.c + delete mode 100644 arch/arm/mach-shmobile/board-bockw.c + delete mode 100644 arch/arm/mach-shmobile/clock-r8a7778.c + delete mode 100644 arch/arm/mach-shmobile/clock.c + delete mode 100644 arch/arm/mach-shmobile/clock.h + delete mode 100644 arch/arm/mach-shmobile/console.c + delete mode 100644 arch/arm/mach-shmobile/intc.h + delete mode 100644 arch/arm/mach-shmobile/r8a7778.h + delete mode 100644 arch/arm/mach-shmobile/sh-gpio.h + create mode 100644 arch/arm64/boot/dts/altera/Makefile + create mode 100644 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi + create mode 100644 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts + create mode 100644 arch/arm64/boot/dts/apm/apm-merlin.dts + create mode 100644 arch/arm64/boot/dts/apm/apm-shadowcat.dtsi + create mode 100644 arch/arm64/boot/dts/hisilicon/hip05-d02.dts + create mode 100644 arch/arm64/boot/dts/hisilicon/hip05.dtsi +Merging at91/at91-next (5ccea17e1ab3 Merge branch 'at91-4.4-defconfig' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + arch/arm/mach-at91/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging bcm2835/for-next (b2776bf7149b Linux 3.18) +$ git merge bcm2835/for-next +Already up-to-date. +Merging berlin/berlin/for-next (99c5d7234cf2 Merge branch 'berlin64/soc' into berlin/for-next) +$ git merge berlin/berlin/for-next +Auto-merging arch/arm64/Kconfig.platforms +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts | 3 +- + arch/arm/boot/dts/berlin2.dtsi | 23 +++++ + arch/arm/boot/dts/berlin2cd-google-chromecast.dts | 3 +- + arch/arm/boot/dts/berlin2cd.dtsi | 20 ++++ + arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 3 +- + arch/arm/boot/dts/berlin2q.dtsi | 29 +++++- + arch/arm/mach-berlin/berlin.c | 6 ++ + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/boot/dts/marvell/Makefile | 1 + + arch/arm64/boot/dts/marvell/berlin4ct-stb.dts | 66 ++++++++++++ + arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 120 ++++++++++++++++++++++ + drivers/clk/berlin/bg2.c | 1 - + drivers/clk/berlin/bg2q.c | 13 ++- + include/dt-bindings/clock/berlin2.h | 2 + + include/dt-bindings/clock/berlin2q.h | 3 + + 15 files changed, 280 insertions(+), 14 deletions(-) + create mode 100644 arch/arm64/boot/dts/marvell/berlin4ct-stb.dts +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 (e82731e47607 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/imx23.dtsi | 6 +- + arch/arm/boot/dts/imx28-evk.dts | 2 +- + arch/arm/boot/dts/imx28-m28evk.dts | 2 +- + arch/arm/boot/dts/imx28.dtsi | 6 +- + arch/arm/boot/dts/imx31.dtsi | 2 +- + arch/arm/boot/dts/imx35.dtsi | 2 +- + arch/arm/boot/dts/imx50-evk.dts | 2 +- + arch/arm/boot/dts/imx53-smd.dts | 2 +- + arch/arm/boot/dts/imx6dl-rex-basic.dts | 2 +- + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +- + arch/arm/boot/dts/imx6q-gw5400-a.dts | 2 +- + arch/arm/boot/dts/imx6q-rex-pro.dts | 2 +- + arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +- + arch/arm/boot/dts/imx6sl-evk.dts | 2 +- + arch/arm/boot/dts/imx6sl.dtsi | 5 +- + arch/arm/boot/dts/imx6sx-sdb-reva.dts | 4 +- + arch/arm/boot/dts/imx6sx-sdb.dts | 4 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 22 ++++ + arch/arm/boot/dts/imx6ul.dtsi | 29 +++++ + arch/arm/boot/dts/imx7d-pinfunc.h | 122 ++++++++++++++++++- + arch/arm/boot/dts/imx7d-sdb.dts | 100 +++++++++++++++- + arch/arm/boot/dts/imx7d.dtsi | 169 ++++++++++++++++++++++++++- + arch/arm/boot/dts/ls1021a-twr.dts | 13 +++ + arch/arm/boot/dts/ls1021a.dtsi | 43 +++++++ + arch/arm/boot/dts/vf500-colibri-eval-v3.dts | 5 + + arch/arm/boot/dts/vf500-colibri.dtsi | 47 ++++++++ + arch/arm/configs/imx_v6_v7_defconfig | 2 +- + arch/arm/mach-imx/common.h | 1 + + arch/arm/mach-imx/mach-imx6ul.c | 2 + + arch/arm/mach-imx/mach-imx7d.c | 74 ++++++++++++ + arch/arm/mach-imx/pm-imx6.c | 46 +++++++- + arch/arm/mach-imx/suspend-imx6.S | 3 + + drivers/clk/imx/clk-imx25.c | 12 ++ + drivers/clk/imx/clk-imx27.c | 13 +++ + drivers/clk/imx/clk-imx31.c | 35 ++++-- + drivers/clk/imx/clk-imx35.c | 59 ++++++---- + drivers/clk/imx/clk-imx51-imx53.c | 16 +++ + drivers/clk/imx/clk-imx6q.c | 8 ++ + drivers/clk/imx/clk-imx6sl.c | 8 ++ + drivers/clk/imx/clk-imx6sx.c | 8 ++ + drivers/clk/imx/clk-imx6ul.c | 18 +++ + drivers/clk/imx/clk-imx7d.c | 13 +++ + drivers/clk/imx/clk-vf610.c | 1 + + drivers/clk/imx/clk.c | 38 ++++++ + drivers/clk/imx/clk.h | 1 + + include/dt-bindings/clock/vf610-clock.h | 3 +- + include/linux/mfd/syscon/imx7-iomuxc-gpr.h | 47 ++++++++ + 54 files changed, 950 insertions(+), 71 deletions(-) + create mode 100644 include/linux/mfd/syscon/imx7-iomuxc-gpr.h +Merging keystone/next (afef8d3343d1 Merge branch 'for_4.4/dts' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/keystone/keystone.txt | 20 ++++++-- + .../bindings/soc/ti/keystone-navigator-qmss.txt | 20 +++++++- + arch/arm/boot/dts/k2e-evm.dts | 2 +- + arch/arm/boot/dts/k2e.dtsi | 3 ++ + arch/arm/boot/dts/k2hk-evm.dts | 2 +- + arch/arm/boot/dts/k2hk.dtsi | 3 ++ + arch/arm/boot/dts/k2l-evm.dts | 2 +- + arch/arm/boot/dts/k2l.dtsi | 3 ++ + arch/arm/boot/dts/keystone.dtsi | 7 +-- + arch/arm/configs/keystone_defconfig | 54 +++++++++++----------- + arch/arm/mach-keystone/keystone.c | 3 ++ + drivers/soc/ti/knav_qmss_acc.c | 4 ++ + drivers/soc/ti/knav_qmss_queue.c | 3 ++ + 13 files changed, 89 insertions(+), 37 deletions(-) +Merging mvebu/for-next (790f485f2afa Merge branch 'mvebu/dt' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/mvebu-cpu-config.txt | 20 ++++++++ + arch/arm/boot/dts/armada-370-db.dts | 3 +- + arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 3 +- + arch/arm/boot/dts/armada-370-mirabox.dts | 7 ++- + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 3 +- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 3 +- + arch/arm/boot/dts/armada-370-rd.dts | 3 +- + arch/arm/boot/dts/armada-370-synology-ds213j.dts | 3 +- + arch/arm/boot/dts/armada-370.dtsi | 37 +++++++++++++ + arch/arm/boot/dts/armada-375-db.dts | 4 +- + arch/arm/boot/dts/armada-375.dtsi | 33 ++++++++++++ + arch/arm/boot/dts/armada-385-db-ap.dts | 4 +- + arch/arm/boot/dts/armada-385-linksys.dtsi | 4 +- + arch/arm/boot/dts/armada-388-db.dts | 4 +- + arch/arm/boot/dts/armada-388-gp.dts | 4 +- + arch/arm/boot/dts/armada-388-rd.dts | 4 +- + arch/arm/boot/dts/armada-38x.dtsi | 33 ++++++++++++ + arch/arm/boot/dts/armada-xp-axpwifiap.dts | 4 +- + arch/arm/boot/dts/armada-xp-db.dts | 4 +- + arch/arm/boot/dts/armada-xp-gp.dts | 4 +- + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 4 +- + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 4 +- + arch/arm/boot/dts/armada-xp-matrix.dts | 4 +- + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 4 +- + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 4 +- + arch/arm/boot/dts/armada-xp-synology-ds414.dts | 4 +- + arch/arm/boot/dts/armada-xp.dtsi | 35 +++++++++++++ + arch/arm/boot/dts/dove.dtsi | 17 ++++-- + arch/arm/boot/dts/kirkwood.dtsi | 29 +++++++---- + arch/arm/boot/dts/orion5x.dtsi | 22 +++++--- + arch/arm/mach-mvebu/coherency.c | 60 ++++++++++++++++++++++ + arch/arm/mach-mvebu/pmsu.c | 4 +- + arch/arm/plat-orion/common.c | 2 +- + 33 files changed, 331 insertions(+), 46 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/mvebu-cpu-config.txt +Merging omap/for-next (9a5e3f27d1b8 ARM: dts: fix omap2+ address translation for pbias) +$ git merge omap/for-next +Already up-to-date. +Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) +$ git merge omap-pending/for-next +Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution. +Resolved 'arch/arm/mach-omap2/omap_hwmod_7xx_data.c' using previous resolution. +Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fba4418d8913] Merge remote-tracking branch 'omap-pending/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging qcom/qcom/for-next (16a066d6dce8 ARM: dts: msm8974: Add SCM firmware node) +$ git merge qcom/qcom/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/firmware/qcom,scm.txt | 25 ++ + .../devicetree/bindings/soc/qcom/qcom,smem.txt | 51 ++++ + arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 48 +++- + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 60 ++++- + arch/arm/boot/dts/qcom-apq8064.dtsi | 50 +++- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 72 +++++ + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 199 ++++++++++++++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 85 ++++++ + arch/arm/boot/dts/qcom-pm8941.dtsi | 3 +- + arch/arm/configs/qcom_defconfig | 8 +- + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 1 + + arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 31 ++- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 20 ++ + drivers/firmware/qcom_scm-32.c | 82 ++++++ + drivers/firmware/qcom_scm-64.c | 25 ++ + drivers/firmware/qcom_scm.c | 271 ++++++++++++++++++- + drivers/firmware/qcom_scm.h | 12 + + drivers/soc/qcom/Kconfig | 16 +- + drivers/soc/qcom/smd-rpm.c | 68 ++--- + drivers/soc/qcom/smd.c | 284 ++++++++++++-------- + drivers/soc/qcom/smem.c | 295 ++++++++++++--------- + include/linux/qcom_scm.h | 6 + + include/linux/soc/qcom/smd.h | 11 + + include/linux/soc/qcom/smem.h | 2 +- + 24 files changed, 1419 insertions(+), 306 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smem.txt + create mode 100644 arch/arm/boot/dts/qcom-ipq4019.dtsi +Merging renesas/next (fd4b8416a5dd Merge branch 'heads/dt-for-v4.4' into next) +$ git merge renesas/next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 4 + + .../renesas-memory-controllers.txt | 6 +- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/r8a7778.dtsi | 2 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 6 +- + arch/arm/boot/dts/r8a7790-lager.dts | 16 +- + arch/arm/boot/dts/r8a7790.dtsi | 2 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 9 +- + arch/arm/boot/dts/r8a7791-porter.dts | 156 ++++++++++ + arch/arm/boot/dts/r8a7791.dtsi | 2 +- + arch/arm/boot/dts/r8a7794-silk.dts | 114 +++++++ + arch/arm/boot/dts/r8a7794.dtsi | 326 ++++++++++++++++++++- + arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi | 41 +++ + arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +- + arch/arm/mach-shmobile/platsmp-apmu.c | 4 +- + arch/arm/mach-shmobile/pm-r8a7779.c | 99 ------- + arch/arm/mach-shmobile/r8a7779.h | 6 - + arch/arm/mach-shmobile/setup-r8a7778.c | 3 +- + 18 files changed, 671 insertions(+), 128 deletions(-) + create mode 100644 arch/arm/boot/dts/r8a7791-porter.dts + create mode 100644 arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi +Merging rockchip/for-next (906d30375289 Merge branch 'v4.4-armsoc/dts32' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/rockchip.txt | 11 + + .../bindings/soc/rockchip/power_domain.txt | 46 ++ + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 2 + + arch/arm/boot/dts/rk3066a-marsboard.dts | 8 + + arch/arm/boot/dts/rk3066a-rayeager.dts | 2 + + arch/arm/boot/dts/rk3188-radxarock.dts | 2 + + arch/arm/boot/dts/rk3288-firefly.dtsi | 55 ++- + arch/arm/boot/dts/rk3288-popmetal.dts | 85 +++- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 277 ++++++++++++ + arch/arm/boot/dts/rk3288-rock2-square.dts | 149 +++++++ + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 176 ++++++++ + arch/arm/boot/dts/rk3288-veyron.dtsi | 12 - + arch/arm/boot/dts/rk3288.dtsi | 113 ++++- + drivers/base/power/clock_ops.c | 6 +- + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/rockchip/Kconfig | 14 + + drivers/soc/rockchip/Makefile | 4 + + drivers/soc/rockchip/pm_domains.c | 490 +++++++++++++++++++++ + include/dt-bindings/power/rk3288-power.h | 31 ++ + 21 files changed, 1462 insertions(+), 26 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/rockchip/power_domain.txt + create mode 100644 arch/arm/boot/dts/rk3288-rock2-som.dtsi + create mode 100644 arch/arm/boot/dts/rk3288-rock2-square.dts + create mode 100644 arch/arm/boot/dts/rk3288-veyron-jaq.dts + create mode 100644 drivers/soc/rockchip/Kconfig + create mode 100644 drivers/soc/rockchip/Makefile + create mode 100644 drivers/soc/rockchip/pm_domains.c + create mode 100644 include/dt-bindings/power/rk3288-power.h +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (acf92fee9a9b Merge branch 'v4.4-next/dt-samsung' into for-next) +$ git merge samsung/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/pwm-fan.txt | 29 +- + Documentation/devicetree/bindings/mfd/s2mps11.txt | 4 + + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/exynos4412-odroidu3.dts | 43 ++ + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 684 +++++++++++++++++++++ + arch/arm/boot/dts/exynos5250-snow-rev5.dts | 47 ++ + arch/arm/boot/dts/exynos5250-snow.dts | 671 +------------------- + arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 61 ++ + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 98 +-- + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 51 ++ + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 51 ++ + arch/arm/boot/dts/exynos5422-odroidxu4.dts | 48 ++ + arch/arm/configs/exynos_defconfig | 4 + + drivers/cpufreq/s5pv210-cpufreq.c | 2 - + 14 files changed, 1028 insertions(+), 767 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos5250-snow-common.dtsi + create mode 100644 arch/arm/boot/dts/exynos5250-snow-rev5.dts + create mode 100644 arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi + create mode 100644 arch/arm/boot/dts/exynos5422-odroidxu4.dts +Merging samsung-krzk/for-next (52265cb1da16 Merge branch 'defconfig-for-next' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/exynos_defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4.dtsi | 8 ++ + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 12 +-- + arch/arm/boot/dts/exynos4412-trats2.dts | 105 ++++++++---------------- + arch/arm/boot/dts/exynos5250-arndale.dts | 8 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 16 ++-- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 7 +- + arch/arm/boot/dts/s3c2416.dtsi | 2 +- + arch/arm/configs/exynos_defconfig | 14 +++- + arch/arm/configs/multi_v7_defconfig | 3 + + arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 103 +++++++++++++++++++++++ + arch/arm64/boot/dts/exynos/exynos7.dtsi | 7 ++ + 11 files changed, 186 insertions(+), 99 deletions(-) +Merging sunxi/sunxi/for-next (88e817c8f647 Merge branches 'sunxi/dt-for-4.4' and 'sunxi/drivers-for-4.4' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/soc/sunxi/rsb.txt | 47 ++ + MAINTAINERS | 2 +- + arch/arm/boot/dts/Makefile | 15 +- + arch/arm/boot/dts/axp209.dtsi | 5 + + arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 12 + + arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 11 +- + arch/arm/boot/dts/sun4i-a10-inet1.dts | 226 ++++++ + arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 117 ++- + arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 227 ++++++ + arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 15 + + arch/arm/boot/dts/sun4i-a10-marsboard.dts | 19 + + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 12 + + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 35 +- + arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 159 +++++ + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 2 +- + arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 224 ++++++ + arch/arm/boot/dts/sun5i-a10s.dtsi | 20 + + arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts | 227 ++++++ + arch/arm/boot/dts/sun5i-a13-q8-tablet.dts | 60 ++ + arch/arm/boot/dts/sun5i-q8-common.dtsi | 170 +++++ + arch/arm/boot/dts/sun6i-a31-colombus.dts | 24 + + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 11 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 17 + + .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 134 ++++ + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 19 + + arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 198 ++++++ + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 12 + + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 47 ++ + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 6 + + arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 29 + + arch/arm/boot/dts/sun7i-a20-orangepi.dts | 29 + + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 54 +- + arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 33 +- + arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 226 ++++++ + arch/arm/boot/dts/sun7i-a20.dtsi | 8 + + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 61 +- + arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts | 145 ++++ + arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 76 +- + arch/arm/boot/dts/sun8i-a23.dtsi | 25 + + arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts | 134 +--- + arch/arm/boot/dts/sun8i-a33-q8-tablet.dts | 65 ++ + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 4 + + arch/arm/boot/dts/sun8i-a33.dtsi | 45 ++ + arch/arm/boot/dts/sun8i-q8-common.dtsi | 101 +++ + arch/arm/boot/dts/sunxi-q8-common.dtsi | 77 ++ + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/sunxi_defconfig | 4 + + drivers/clk/sunxi/clk-simple-gates.c | 2 + + drivers/soc/sunxi/Kconfig | 10 + + drivers/soc/sunxi/Makefile | 1 + + drivers/soc/sunxi/sunxi_rsb.c | 783 +++++++++++++++++++++ + include/linux/soc/sunxi/sunxi_rsb.h | 105 +++ + 52 files changed, 3833 insertions(+), 258 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/sunxi/rsb.txt + create mode 100644 arch/arm/boot/dts/sun4i-a10-inet1.dts + create mode 100644 arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts + create mode 100644 arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts + create mode 100644 arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts + create mode 100644 arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts + create mode 100644 arch/arm/boot/dts/sun5i-a13-q8-tablet.dts + create mode 100644 arch/arm/boot/dts/sun5i-q8-common.dtsi + create mode 100644 arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts + create mode 100644 arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts + mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts + create mode 100644 arch/arm/boot/dts/sun8i-a33-q8-tablet.dts + create mode 100644 arch/arm/boot/dts/sun8i-q8-common.dtsi + create mode 100644 arch/arm/boot/dts/sunxi-q8-common.dtsi + create mode 100644 drivers/soc/sunxi/sunxi_rsb.c + create mode 100644 include/linux/soc/sunxi/sunxi_rsb.h +Merging tegra/for-next (84529095fefd Merge branch for-4.4/defconfig into for-next) +$ git merge tegra/for-next +Auto-merging drivers/clk/tegra/clk-dfll.c +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/tegra124-nyan.dtsi | 15 +- + arch/arm/boot/dts/tegra124.dtsi | 2 +- + arch/arm/boot/dts/tegra20.dtsi | 4 +- + arch/arm/boot/dts/tegra30-apalis-eval.dts | 13 +- + arch/arm/boot/dts/tegra30-apalis.dtsi | 214 ++++++++++++++++---------- + arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 9 +- + arch/arm/boot/dts/tegra30-colibri.dtsi | 196 ++++++++++++++++------- + arch/arm/boot/dts/tegra30.dtsi | 10 +- + arch/arm/configs/tegra_defconfig | 10 +- + arch/arm/mach-tegra/board-paz00.c | 4 +- + drivers/clk/tegra/clk-dfll.c | 15 +- + drivers/clk/tegra/cvb.c | 7 - + 12 files changed, 326 insertions(+), 173 deletions(-) +Merging arm64/for-next/core (6ff33f3902c3 Linux 4.3-rc1) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Removing arch/c6x/include/asm/clkdev.h +Auto-merging arch/c6x/include/asm/Kbuild +Merge made by the 'recursive' strategy. + arch/c6x/include/asm/Kbuild | 1 + + arch/c6x/include/asm/clkdev.h | 22 ---------------------- + 2 files changed, 1 insertion(+), 22 deletions(-) + delete mode 100644 arch/c6x/include/asm/clkdev.h +Merging cris/for-next (d81a922cf21f CRIS: Drop code related to obsolete or unused kconfigs) +$ git merge cris/for-next +Removing arch/cris/include/arch-v32/arch/io.h +Removing arch/cris/arch-v32/mach-fs/io.c +Removing arch/cris/arch-v32/mach-a3/io.c +Removing arch/cris/arch-v32/drivers/mach-fs/gpio.c +Removing arch/cris/arch-v32/drivers/mach-a3/gpio.c +Removing arch/cris/arch-v32/drivers/i2c.h +Removing arch/cris/arch-v32/drivers/i2c.c +Merge made by the 'recursive' strategy. + arch/cris/Kconfig | 1 - + arch/cris/arch-v10/kernel/head.S | 106 --- + arch/cris/arch-v10/kernel/kgdb.c | 89 +-- + arch/cris/arch-v10/mm/init.c | 14 +- + arch/cris/arch-v32/Kconfig | 89 --- + arch/cris/arch-v32/drivers/Kconfig | 167 ----- + arch/cris/arch-v32/drivers/Makefile | 1 - + arch/cris/arch-v32/drivers/axisflashmap.c | 40 +- + arch/cris/arch-v32/drivers/i2c.c | 751 --------------------- + arch/cris/arch-v32/drivers/i2c.h | 16 - + arch/cris/arch-v32/drivers/mach-a3/Makefile | 1 - + arch/cris/arch-v32/drivers/mach-a3/gpio.c | 999 ---------------------------- + arch/cris/arch-v32/drivers/mach-fs/Makefile | 1 - + arch/cris/arch-v32/drivers/mach-fs/gpio.c | 978 --------------------------- + arch/cris/arch-v32/kernel/crisksyms.c | 3 - + arch/cris/arch-v32/kernel/debugport.c | 2 - + arch/cris/arch-v32/kernel/head.S | 4 - + arch/cris/arch-v32/kernel/irq.c | 6 +- + arch/cris/arch-v32/kernel/kgdb.c | 96 ++- + arch/cris/arch-v32/kernel/setup.c | 8 - + arch/cris/arch-v32/mach-a3/Makefile | 2 +- + arch/cris/arch-v32/mach-a3/io.c | 149 ----- + arch/cris/arch-v32/mach-fs/Kconfig | 19 - + arch/cris/arch-v32/mach-fs/Makefile | 2 +- + arch/cris/arch-v32/mach-fs/io.c | 191 ------ + arch/cris/boot/dts/artpec3.dtsi | 46 ++ + arch/cris/boot/dts/dev88.dts | 49 ++ + arch/cris/boot/dts/etraxfs.dtsi | 8 + + arch/cris/boot/dts/include/dt-bindings | 1 + + arch/cris/boot/dts/p1343.dts | 76 +++ + arch/cris/boot/rescue/head_v10.S | 3 - + arch/cris/include/arch-v32/arch/io.h | 140 ---- + arch/cris/include/arch-v32/arch/irq.h | 2 +- + arch/cris/include/asm/eshlibld.h | 3 +- + arch/cris/include/asm/io.h | 2 + + arch/cris/include/uapi/asm/etraxgpio.h | 157 ----- + arch/cris/kernel/time.c | 25 - + 37 files changed, 272 insertions(+), 3975 deletions(-) + delete mode 100644 arch/cris/arch-v32/drivers/i2c.c + delete mode 100644 arch/cris/arch-v32/drivers/i2c.h + delete mode 100644 arch/cris/arch-v32/drivers/mach-a3/gpio.c + delete mode 100644 arch/cris/arch-v32/drivers/mach-fs/gpio.c + delete mode 100644 arch/cris/arch-v32/mach-a3/io.c + delete mode 100644 arch/cris/arch-v32/mach-fs/io.c + create mode 100644 arch/cris/boot/dts/artpec3.dtsi + create mode 120000 arch/cris/boot/dts/include/dt-bindings + create mode 100644 arch/cris/boot/dts/p1343.dts + delete mode 100644 arch/cris/include/arch-v32/arch/io.h +Merging h8300/h8300-next (99bcfda85f66 Revert "asm-generic: {get,put}_user ptr argument evaluate only 1 time") +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/clock/renesas,h8300-div-clock.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (ae40b7e28752 Merge branch 'misc-4.2' into next) +$ git merge ia64/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging m68k/for-next (bab84fa9cc09 m68k/sun3: Use %pM format specifier to print ethernet address) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/sun3/idprom.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging m68knommu/for-next (a8dcf707ae27 fs/binfmt_elf_fdpic.c: fix brk area overlap with stack on NOMMU) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + fs/binfmt_elf_fdpic.c | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) +Merging metag/for-next (3fe6942f0486 Documentation/features/vm: Meta2 is capable of THP) +$ git merge metag/for-next +Merge made by the 'recursive' strategy. +Merging microblaze/next (b14132797d80 elf-em.h: move EM_MICROBLAZE to the common header) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (bdb232890472 Merge branch '4.3-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 21 ++- + arch/mips/Kconfig.debug | 72 +++++++++ + arch/mips/Makefile | 4 + + arch/mips/boot/dts/mti/malta.dts | 4 + + arch/mips/configs/bigsur_defconfig | 12 +- + arch/mips/configs/capcella_defconfig | 6 +- + arch/mips/configs/e55_defconfig | 6 +- + arch/mips/configs/fuloong2e_defconfig | 14 +- + arch/mips/configs/lasat_defconfig | 10 +- + arch/mips/configs/lemote2f_defconfig | 11 +- + arch/mips/configs/malta_defconfig | 6 +- + arch/mips/configs/malta_kvm_defconfig | 16 +- + arch/mips/configs/malta_kvm_guest_defconfig | 16 +- + arch/mips/configs/malta_qemu_32r6_defconfig | 11 +- + arch/mips/configs/maltaaprp_defconfig | 11 +- + arch/mips/configs/maltasmvp_eva_defconfig | 11 +- + arch/mips/configs/maltaup_defconfig | 11 +- + arch/mips/configs/maltaup_xpa_defconfig | 16 +- + arch/mips/configs/mpc30x_defconfig | 6 +- + arch/mips/include/asm/bcache.h | 27 ++++ + arch/mips/include/asm/cpu-features.h | 6 +- + arch/mips/include/asm/debug.h | 22 +++ + arch/mips/include/asm/fw/fw.h | 16 -- + arch/mips/include/asm/io.h | 1 + + arch/mips/include/asm/mach-malta/malta-dtshim.h | 29 ++++ + arch/mips/include/asm/mips-cm.h | 78 ++++++++- + arch/mips/include/asm/mips-cpc.h | 3 +- + arch/mips/include/asm/mipsregs.h | 15 +- + arch/mips/include/uapi/asm/swab.h | 19 +-- + arch/mips/jz4740/board-qi_lb60.c | 13 +- + arch/mips/kernel/Makefile | 1 + + arch/mips/kernel/cps-vec-ns16550.S | 202 ++++++++++++++++++++++++ + arch/mips/kernel/cps-vec.S | 44 +++++- + arch/mips/kernel/cpu-probe.c | 3 +- + arch/mips/kernel/idle.c | 11 +- + arch/mips/kernel/mips-cm.c | 114 +++++++++---- + arch/mips/kernel/mips-cpc.c | 6 + + arch/mips/kernel/mips-r2-to-r6-emul.c | 2 +- + arch/mips/kernel/segment.c | 2 +- + arch/mips/kernel/setup.c | 1 + + arch/mips/kernel/smp-cps.c | 35 +++- + arch/mips/kernel/smp-gic.c | 2 + + arch/mips/kernel/spinlock_test.c | 4 +- + arch/mips/kernel/traps.c | 9 +- + arch/mips/kernel/unaligned.c | 2 +- + arch/mips/lib/Makefile | 2 +- + arch/mips/lib/bswapdi.c | 15 ++ + arch/mips/lib/bswapsi.c | 11 ++ + arch/mips/math-emu/me-debugfs.c | 2 +- + arch/mips/mm/Makefile | 1 + + arch/mips/mm/sc-debugfs.c | 81 ++++++++++ + arch/mips/mm/sc-mips.c | 65 +++++++- + arch/mips/mm/tlbex.c | 97 ++++++++---- + arch/mips/mti-malta/Makefile | 15 +- + arch/mips/mti-malta/malta-dtshim.c | 162 +++++++++++++++++++ + arch/mips/mti-malta/malta-init.c | 1 + + arch/mips/mti-malta/malta-memory.c | 131 +-------------- + arch/mips/mti-malta/malta-setup.c | 5 +- + 58 files changed, 1142 insertions(+), 377 deletions(-) + create mode 100644 arch/mips/include/asm/debug.h + create mode 100644 arch/mips/include/asm/mach-malta/malta-dtshim.h + create mode 100644 arch/mips/kernel/cps-vec-ns16550.S + create mode 100644 arch/mips/lib/bswapdi.c + create mode 100644 arch/mips/lib/bswapsi.c + create mode 100644 arch/mips/mm/sc-debugfs.c + create mode 100644 arch/mips/mti-malta/malta-dtshim.c +Merging nios2/for-next (8840da98bfec nios2: Switch to generic __xchg()) +$ git merge nios2/for-next +Merge made by the 'recursive' strategy. + arch/nios2/include/asm/cmpxchg.h | 47 ---------------------------------------- + arch/nios2/kernel/setup.c | 2 +- + 2 files changed, 1 insertion(+), 48 deletions(-) +Merging parisc-hd/for-next (64291f7db5bd Linux 4.2) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (2adc48a69186 powerpc: Add ppc64le_defconfig) +$ git merge powerpc/next +Merge made by the 'recursive' strategy. + arch/powerpc/Makefile | 4 ++ + arch/powerpc/configs/ps3_defconfig | 5 --- + arch/powerpc/include/asm/page.h | 5 ++- + arch/powerpc/kernel/vdso32/Makefile | 2 +- + arch/powerpc/kernel/vdso32/datapage.S | 12 +++--- + arch/powerpc/kernel/vdso64/Makefile | 2 +- + arch/powerpc/kernel/vdso64/datapage.S | 12 +++--- + arch/powerpc/mm/slb.c | 49 ++++++++++++---------- + arch/powerpc/platforms/cell/Kconfig | 4 +- + arch/powerpc/platforms/maple/Kconfig | 2 +- + arch/powerpc/platforms/pasemi/Kconfig | 2 +- + arch/powerpc/platforms/powermac/Kconfig | 2 +- + arch/powerpc/platforms/ps3/Kconfig | 2 +- + drivers/ps3/ps3-lpm.c | 2 +- + drivers/ps3/ps3-vuart.c | 3 +- + scripts/kconfig/Makefile | 5 ++- + tools/testing/selftests/powerpc/Makefile | 2 +- + .../selftests/powerpc/benchmarks/.gitignore | 1 + + .../testing/selftests/powerpc/benchmarks/Makefile | 12 ++++++ + .../selftests/powerpc/benchmarks/gettimeofday.c | 31 ++++++++++++++ + 20 files changed, 107 insertions(+), 52 deletions(-) + create mode 100644 tools/testing/selftests/powerpc/benchmarks/.gitignore + create mode 100644 tools/testing/selftests/powerpc/benchmarks/Makefile + create mode 100644 tools/testing/selftests/powerpc/benchmarks/gettimeofday.c +Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (4524cd093fa8 powerpc/t1023rdb/dts: set ifc nand chip select from 2 to 1) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (2130eeefadb5 s390/sclp: avoid merged message output) +$ git merge s390/features +Auto-merging arch/s390/numa/mode_emu.c +Auto-merging arch/s390/kernel/entry.S +Auto-merging arch/s390/kernel/asm-offsets.c +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 1 + + arch/s390/hypfs/hypfs_diag.c | 10 +- + arch/s390/hypfs/hypfs_diag0c.c | 2 + + arch/s390/hypfs/hypfs_sprp.c | 9 +- + arch/s390/hypfs/hypfs_vm.c | 2 + + arch/s390/include/asm/appldata.h | 2 + + arch/s390/include/asm/atomic.h | 2 - + arch/s390/include/asm/barrier.h | 8 +- + arch/s390/include/asm/bitops.h | 24 +++- + arch/s390/include/asm/cio.h | 10 ++ + arch/s390/include/asm/cmb.h | 1 + + arch/s390/include/asm/ctl_reg.h | 2 - + arch/s390/include/asm/diag.h | 29 +++++ + arch/s390/include/asm/fpu-internal.h | 14 +-- + arch/s390/include/asm/kvm_para.h | 67 ++++++++-- + arch/s390/include/asm/nmi.h | 9 ++ + arch/s390/include/asm/pgtable.h | 66 +++++++++- + arch/s390/include/asm/processor.h | 2 + + arch/s390/include/asm/setup.h | 47 +++---- + arch/s390/include/asm/trace/diag.h | 43 +++++++ + arch/s390/kernel/Makefile | 2 + + arch/s390/kernel/asm-offsets.c | 1 - + arch/s390/kernel/compat_signal.c | 7 +- + arch/s390/kernel/cpcmd.c | 2 + + arch/s390/kernel/crash_dump.c | 16 +-- + arch/s390/kernel/diag.c | 134 +++++++++++++++++++- + arch/s390/kernel/early.c | 15 ++- + arch/s390/kernel/entry.S | 204 ++++++++++++------------------ + arch/s390/kernel/entry.h | 2 - + arch/s390/kernel/ipl.c | 9 +- + arch/s390/kernel/process.c | 36 +++--- + arch/s390/kernel/processor.c | 5 +- + arch/s390/kernel/ptrace.c | 44 +++---- + arch/s390/kernel/s390_ksyms.c | 1 - + arch/s390/kernel/signal.c | 7 +- + arch/s390/kernel/smp.c | 8 +- + arch/s390/kernel/trace.c | 29 +++++ + arch/s390/kernel/traps.c | 39 ------ + arch/s390/kernel/vdso.c | 2 +- + arch/s390/kvm/kvm-s390.c | 6 - + arch/s390/lib/spinlock.c | 4 +- + arch/s390/mm/extmem.c | 3 + + arch/s390/mm/fault.c | 3 + + arch/s390/mm/hugetlbpage.c | 2 + + arch/s390/numa/mode_emu.c | 10 +- + arch/x86/include/asm/pgtable.h | 10 ++ + drivers/s390/block/dasd.c | 1 + + drivers/s390/block/dasd_diag.c | 2 + + drivers/s390/block/dasd_eckd.c | 11 +- + drivers/s390/char/diag_ftp.c | 2 + + drivers/s390/char/sclp_rw.c | 136 ++++++++++---------- + drivers/s390/char/sclp_rw.h | 17 ++- + drivers/s390/char/sclp_tty.c | 8 +- + drivers/s390/cio/cmf.c | 220 ++++++++++++++++++++------------- + drivers/s390/cio/css.c | 1 + + drivers/s390/cio/device.c | 4 +- + drivers/s390/cio/device.h | 1 + + drivers/s390/cio/device_pgid.c | 4 +- + drivers/s390/crypto/zcrypt_api.c | 3 +- + drivers/s390/crypto/zcrypt_cca_key.h | 2 +- + drivers/s390/crypto/zcrypt_msgtype50.c | 2 +- + drivers/s390/crypto/zcrypt_pcica.c | 2 +- + drivers/s390/virtio/virtio_ccw.c | 15 ++- + drivers/watchdog/diag288_wdt.c | 4 + + fs/proc/task_mmu.c | 4 +- + include/asm-generic/pgtable.h | 10 ++ + 66 files changed, 898 insertions(+), 502 deletions(-) + create mode 100644 arch/s390/include/asm/trace/diag.h + create mode 100644 arch/s390/kernel/trace.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 (dfd51f97823e tile/jump_label: add jump label support for TILE-Gx) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/Kconfig | 1 + + arch/tile/include/asm/insn.h | 59 +++++++++++++++++++++++++++++++++++ + arch/tile/include/asm/jump_label.h | 58 ++++++++++++++++++++++++++++++++++ + arch/tile/include/asm/page.h | 10 ++++++ + arch/tile/kernel/Makefile | 1 + + arch/tile/kernel/ftrace.c | 13 ++------ + arch/tile/kernel/jump_label.c | 64 ++++++++++++++++++++++++++++++++++++++ + arch/tile/kernel/kgdb.c | 2 +- + arch/tile/kernel/kprobes.c | 4 +-- + 9 files changed, 198 insertions(+), 14 deletions(-) + create mode 100644 arch/tile/include/asm/insn.h + create mode 100644 arch/tile/include/asm/jump_label.h + create mode 100644 arch/tile/kernel/jump_label.c +Merging uml/linux-next (bdbac7d0e2b3 um: Fix kernel mode fault condition) +$ git merge uml/linux-next +Auto-merging arch/um/kernel/trap.c +Merge made by the 'recursive' strategy. + arch/um/Makefile | 4 ++-- + arch/um/kernel/trap.c | 2 +- + arch/um/os-Linux/helper.c | 6 +++--- + arch/x86/um/ldt.c | 5 ++++- + 4 files changed, 10 insertions(+), 7 deletions(-) +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (895fb3159280 xtensa: improve vmlinux.lds.S sed post-processing) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (3a9508b0221d btrfs: fix compile when block cgroups are not enabled) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (8dbd263de1cb ceph: improve readahead for file holes) +$ git merge ceph/master +Merge made by the 'recursive' strategy. +Merging cifs/for-next (c6fa8e6de3dc Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) +$ git merge cifs/for-next +Already up-to-date. +Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging ext3/for_next (d4eb6dee4712 ext4: Update EXT4_USE_FOR_EXT2 description) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext4/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ext4/dev (36086d43f657 ext4 crypto: fix bugs in ext4_encrypted_zeroout()) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. + fs/ext4/Makefile | 2 +- + fs/ext4/crypto.c | 52 +++--- + fs/ext4/crypto_fname.c | 2 - + fs/ext4/crypto_key.c | 16 +- + fs/ext4/crypto_policy.c | 3 +- + fs/ext4/ext4.h | 11 +- + fs/ext4/extents.c | 3 + + fs/ext4/extents_status.c | 60 +----- + fs/ext4/extents_status.h | 2 + + fs/ext4/inode.c | 17 +- + fs/ext4/mballoc.c | 9 +- + fs/ext4/page-io.c | 5 +- + fs/ext4/readpage.c | 2 +- + fs/ext4/super.c | 467 ++--------------------------------------------- + fs/ext4/sysfs.c | 446 ++++++++++++++++++++++++++++++++++++++++++++ + 15 files changed, 542 insertions(+), 555 deletions(-) + create mode 100644 fs/ext4/sysfs.c +Merging f2fs/dev (464c2b76e1a2 f2fs: introduce a periodic checkpoint flow) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 6 + + Documentation/filesystems/f2fs.txt | 3 +- + fs/f2fs/checkpoint.c | 16 ++- + fs/f2fs/data.c | 123 +++++++++++--------- + fs/f2fs/debug.c | 36 +++--- + fs/f2fs/dir.c | 13 ++- + fs/f2fs/extent_cache.c | 193 +++++++++++++------------------- + fs/f2fs/f2fs.h | 55 +++++++-- + fs/f2fs/file.c | 99 +++++++++------- + fs/f2fs/gc.c | 57 +++++++--- + fs/f2fs/gc.h | 6 - + fs/f2fs/inline.c | 6 +- + fs/f2fs/inode.c | 8 +- + fs/f2fs/namei.c | 10 +- + fs/f2fs/node.c | 20 ++-- + fs/f2fs/node.h | 1 - + fs/f2fs/recovery.c | 9 +- + fs/f2fs/segment.c | 38 ++++--- + fs/f2fs/segment.h | 8 +- + fs/f2fs/super.c | 33 +++++- + include/trace/events/f2fs.h | 43 ++++++- + 21 files changed, 456 insertions(+), 327 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. + fs/fscache/netfs.c | 38 ++++++++++++++++++-------------------- + 1 file changed, 18 insertions(+), 20 deletions(-) +Merging fuse/for-next (0a30f612d6cf fuse: update MAINTAINERS entry) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/for-next (491e94f79098 gfs2: Add missing else in trans_add_meta/data) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/file.c | 2 +- + fs/gfs2/ops_fstype.c | 4 +++- + fs/gfs2/trans.c | 4 ++++ + 3 files changed, 8 insertions(+), 2 deletions(-) +Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (c6fa8e6de3dc Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (be68fcecd492 lockd: get rid of reference-counted NSM RPC clients) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/lockd/host.c | 8 +- + fs/lockd/mon.c | 125 ++++++++++---------------------- + fs/lockd/netns.h | 4 +- + fs/lockd/svc.c | 2 +- + fs/lockd/svc4proc.c | 2 +- + fs/lockd/svcproc.c | 2 +- + fs/namei.c | 74 +++++++++++++++++++ + fs/nfsd/nfs3xdr.c | 6 +- + fs/nfsd/nfs4layouts.c | 34 ++++++--- + fs/nfsd/nfs4proc.c | 4 + + fs/nfsd/nfs4state.c | 67 ++++++++++++----- + fs/nfsd/nfs4xdr.c | 8 +- + fs/nfsd/nfscache.c | 6 +- + fs/nfsd/nfsfh.c | 5 +- + fs/nfsd/nfsfh.h | 20 ++--- + fs/nfsd/state.h | 43 +++++------ + fs/nfsd/vfs.c | 27 +++---- + fs/nfsd/vfs.h | 4 +- + fs/nfsd/xdr4.h | 2 +- + include/linux/lockd/lockd.h | 10 ++- + include/linux/namei.h | 1 + + net/sunrpc/svcsock.c | 2 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 6 +- + net/sunrpc/xprtsock.c | 4 +- + 24 files changed, 263 insertions(+), 203 deletions(-) +Merging orangefs/for-next (548049495cb4 Orangefs: fix some checkpatch.pl complaints that had creeped in.) +$ git merge orangefs/for-next +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-fs-orangefs | 87 ++ + Documentation/filesystems/orangefs.txt | 137 +++ + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/orangefs/Kconfig | 6 + + fs/orangefs/Makefile | 10 + + fs/orangefs/acl.c | 175 +++ + fs/orangefs/dcache.c | 142 +++ + fs/orangefs/devpvfs2-req.c | 1004 ++++++++++++++++ + fs/orangefs/dir.c | 345 ++++++ + fs/orangefs/downcall.h | 138 +++ + fs/orangefs/file.c | 1002 ++++++++++++++++ + fs/orangefs/inode.c | 469 ++++++++ + fs/orangefs/namei.c | 469 ++++++++ + fs/orangefs/protocol.h | 443 +++++++ + fs/orangefs/pvfs2-bufmap.c | 566 +++++++++ + fs/orangefs/pvfs2-bufmap.h | 61 + + fs/orangefs/pvfs2-cache.c | 260 ++++ + fs/orangefs/pvfs2-debug.h | 292 +++++ + fs/orangefs/pvfs2-debugfs.c | 458 +++++++ + fs/orangefs/pvfs2-debugfs.h | 3 + + fs/orangefs/pvfs2-dev-proto.h | 102 ++ + fs/orangefs/pvfs2-kernel.h | 861 ++++++++++++++ + fs/orangefs/pvfs2-mod.c | 315 +++++ + fs/orangefs/pvfs2-sysfs.c | 1787 ++++++++++++++++++++++++++++ + fs/orangefs/pvfs2-sysfs.h | 2 + + fs/orangefs/pvfs2-utils.c | 1165 ++++++++++++++++++ + fs/orangefs/super.c | 553 +++++++++ + fs/orangefs/symlink.c | 31 + + fs/orangefs/upcall.h | 255 ++++ + fs/orangefs/waitqueue.c | 529 ++++++++ + fs/orangefs/xattr.c | 530 +++++++++ + 32 files changed, 12199 insertions(+) + create mode 100644 Documentation/ABI/stable/sysfs-fs-orangefs + create mode 100644 Documentation/filesystems/orangefs.txt + create mode 100644 fs/orangefs/Kconfig + create mode 100644 fs/orangefs/Makefile + create mode 100644 fs/orangefs/acl.c + create mode 100644 fs/orangefs/dcache.c + create mode 100644 fs/orangefs/devpvfs2-req.c + create mode 100644 fs/orangefs/dir.c + create mode 100644 fs/orangefs/downcall.h + create mode 100644 fs/orangefs/file.c + create mode 100644 fs/orangefs/inode.c + create mode 100644 fs/orangefs/namei.c + create mode 100644 fs/orangefs/protocol.h + create mode 100644 fs/orangefs/pvfs2-bufmap.c + create mode 100644 fs/orangefs/pvfs2-bufmap.h + create mode 100644 fs/orangefs/pvfs2-cache.c + create mode 100644 fs/orangefs/pvfs2-debug.h + create mode 100644 fs/orangefs/pvfs2-debugfs.c + create mode 100644 fs/orangefs/pvfs2-debugfs.h + create mode 100644 fs/orangefs/pvfs2-dev-proto.h + create mode 100644 fs/orangefs/pvfs2-kernel.h + create mode 100644 fs/orangefs/pvfs2-mod.c + create mode 100644 fs/orangefs/pvfs2-sysfs.c + create mode 100644 fs/orangefs/pvfs2-sysfs.h + create mode 100644 fs/orangefs/pvfs2-utils.c + create mode 100644 fs/orangefs/super.c + create mode 100644 fs/orangefs/symlink.c + create mode 100644 fs/orangefs/upcall.h + create mode 100644 fs/orangefs/waitqueue.c + create mode 100644 fs/orangefs/xattr.c +Merging overlayfs/overlayfs-next (d9aa4e0bfb63 ovl: default permissions) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/overlayfs/super.c +Merge made by the 'recursive' strategy. + fs/overlayfs/copy_up.c | 11 +++++++---- + fs/overlayfs/inode.c | 23 +++++++++++++++++++++++ + fs/overlayfs/overlayfs.h | 3 +++ + fs/overlayfs/super.c | 28 ++++++++++++++++++++++++++++ + 4 files changed, 61 insertions(+), 4 deletions(-) +Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (46cfbe8e037a 9p: trans_fd, bail out if recv fcall if missing) +$ git merge v9fs/for-next +Merge made by the 'recursive' strategy. + net/9p/trans_fd.c | 88 +++++++++++++++++++++++++++------------------------ + net/9p/trans_virtio.c | 2 +- + 2 files changed, 47 insertions(+), 43 deletions(-) +Merging ubifs/linux-next (1cb8f9776c7d ubi: fastmap: Implement produce_free_peb()) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/attach.c | 4 +--- + drivers/mtd/ubi/eba.c | 2 +- + drivers/mtd/ubi/fastmap-wl.c | 29 +++++++++++++++++++++++++++++ + drivers/mtd/ubi/fastmap.c | 2 +- + drivers/mtd/ubi/gluebi.c | 4 ++-- + drivers/mtd/ubi/ubi-media.h | 2 +- + fs/ubifs/debug.c | 8 ++++---- + fs/ubifs/lpt.c | 6 ++---- + fs/ubifs/recovery.c | 2 +- + fs/ubifs/tnc.c | 3 +-- + fs/ubifs/ubifs.h | 4 ++-- + 11 files changed, 45 insertions(+), 21 deletions(-) +Merging xfs/for-next (1f93e4a96c91 Linux 4.3-rc2) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (128a37852234 fs: fix data races on inode->i_flctx) +$ git merge file-locks/linux-next +Merge made by the 'recursive' strategy. + fs/locks.c | 63 +++++++++++++++++++++++------------------ + include/trace/events/filelock.h | 38 +++++++++++++++++++++++-- + 2 files changed, 71 insertions(+), 30 deletions(-) +Merging vfs/for-next (397d425dc26d vfs: Test for and handle paths that are unreachable from their mnt_root) +$ git merge vfs/for-next +Already up-to-date. +Merging pci/next (ebfc4df6bfc8 Merge branches 'pci/host-designware', 'pci/host-generic', 'pci/host-imx6', 'pci/host-rcar' and 'pci/host-tegra' into next) +$ git merge pci/next +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/pci-driver.c +Auto-merging arch/powerpc/platforms/pseries/setup.c +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/amd/amd-overdrive.dts | 1 - + arch/powerpc/platforms/pseries/setup.c | 14 +----- + drivers/of/of_pci.c | 26 +++++++++++ + drivers/pci/host/Kconfig | 6 ++- + drivers/pci/host/pci-host-generic.c | 9 +--- + drivers/pci/host/pci-imx6.c | 8 ++-- + drivers/pci/host/pci-keystone-dw.c | 2 +- + drivers/pci/host/pci-keystone.h | 2 +- + drivers/pci/host/pci-tegra.c | 4 +- + drivers/pci/host/pcie-designware.c | 72 +++++++++++++++++++++++++------ + drivers/pci/host/pcie-designware.h | 2 +- + drivers/pci/msi.c | 3 ++ + drivers/pci/pci-driver.c | 8 ++-- + drivers/pci/pci.c | 9 +++- + drivers/pci/pcie/aer/aerdrv_core.c | 28 ++++++++++++ + drivers/pci/probe.c | 3 ++ + drivers/pci/quirks.c | 1 + + drivers/pci/setup-res.c | 7 +++ + include/linux/aer.h | 5 +++ + include/linux/msi.h | 2 + + include/linux/of_pci.h | 3 ++ + 21 files changed, 164 insertions(+), 51 deletions(-) +Merging hid/for-next (369032a61d65 Merge branch 'for-4.3/upstream-fixes' into for-next) +$ git merge hid/for-next +Auto-merging drivers/hid/hid-core.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-hid-corsair | 15 + + drivers/hid/Kconfig | 15 +- + drivers/hid/Makefile | 1 + + drivers/hid/hid-appleir.c | 4 +- + drivers/hid/hid-core.c | 9 +- + drivers/hid/hid-corsair.c | 673 +++++++++++++++++++++ + drivers/hid/hid-dr.c | 58 ++ + drivers/hid/hid-elo.c | 4 +- + drivers/hid/hid-ids.h | 7 + + drivers/hid/hid-input.c | 10 +- + drivers/hid/hid-lenovo.c | 4 +- + drivers/hid/hid-logitech-hidpp.c | 163 ++++- + drivers/hid/hid-magicmouse.c | 8 +- + drivers/hid/hid-microsoft.c | 2 + + drivers/hid/hid-multitouch.c | 23 +- + drivers/hid/hid-ntrig.c | 6 +- + drivers/hid/hid-rmi.c | 11 +- + drivers/hid/hid-saitek.c | 2 + + drivers/hid/hid-sensor-hub.c | 17 + + drivers/hid/hid-sony.c | 13 +- + drivers/hid/hid-uclogic.c | 6 +- + drivers/hid/i2c-hid/i2c-hid.c | 1 + + drivers/hid/usbhid/hid-quirks.c | 2 + + drivers/hid/wacom_sys.c | 60 +- + drivers/hid/wacom_wac.c | 128 ++-- + drivers/hid/wacom_wac.h | 6 +- + include/linux/hid.h | 4 +- + 27 files changed, 1153 insertions(+), 99 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-corsair + create mode 100644 drivers/hid/hid-corsair.c +Merging i2c/i2c/for-next (f5956abbe430 Merge branch 'i2c/for-4.3' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/i2c/busses/i2c-imx.c | 76 +++++++++++++++++++++++++++++++++++++------- + 1 file changed, 65 insertions(+), 11 deletions(-) +Merging jdelvare-hwmon/master (902fd32b7711 hwmon: (k10temp) Remove duplicate pci-id define) +$ git merge jdelvare-hwmon/master +Merge made by the 'recursive' strategy. + drivers/hwmon/k10temp.c | 1 - + 1 file changed, 1 deletion(-) +Merging dmi/master (1dc51b828800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge dmi/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (91cec9604f54 hwmon: (abx500) drop the use of IRQF_NO_SUSPEND) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/max31790 | 37 +++ + drivers/hwmon/Kconfig | 10 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/abx500.c | 2 +- + drivers/hwmon/max31790.c | 603 +++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 652 insertions(+), 1 deletion(-) + create mode 100644 Documentation/hwmon/max31790 + create mode 100644 drivers/hwmon/max31790.c +Merging v4l-dvb/master (41a8f406dacd Merge branch 'missed' into to_next) +$ git merge v4l-dvb/master +Resolved 'mm/Makefile' using previous resolution. +Auto-merging mm/Makefile +CONFLICT (content): Merge conflict in mm/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2416b1ba1a21] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. +Merging kbuild/for-next (a8503631df45 Merge branch 'kbuild/kbuild' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging lib/Kconfig.debug +Auto-merging init/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/lto-build | 173 +++++++++++++++++++++++++++++++++++++++++++++++ + Makefile | 19 +++++- + arch/x86/Kconfig | 2 +- + init/Kconfig | 73 ++++++++++++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.lto | 84 +++++++++++++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/link-vmlinux.sh | 2 +- + 9 files changed, 356 insertions(+), 8 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto +Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (75458f95afed Merge branch 'for-4.4' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/ahci-fsl-qoriq.txt | 21 ++ + .../devicetree/bindings/ata/ahci-platform.txt | 2 - + drivers/ata/Kconfig | 9 + + drivers/ata/Makefile | 1 + + drivers/ata/ahci.h | 2 + + drivers/ata/ahci_platform.c | 1 - + drivers/ata/ahci_qoriq.c | 272 +++++++++++++++++++++ + drivers/ata/libahci.c | 7 + + drivers/ata/libata-scsi.c | 26 +- + drivers/ata/pata_macio.c | 1 + + drivers/ata/pata_pxa.c | 171 +++++-------- + drivers/ata/pata_samsung_cf.c | 2 +- + include/linux/libata.h | 1 + + 13 files changed, 384 insertions(+), 132 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt + create mode 100644 drivers/ata/ahci_qoriq.c +Merging pm/linux-next (1f866e8d0ca2 Merge branches 'pm-cpufreq', 'pm-domains' and 'pm-sleep' into linux-next) +$ git merge pm/linux-next +Removing include/linux/irqchip/arm-gic-acpi.h +Removing include/linux/acpi_irq.h +Auto-merging drivers/clocksource/clksrc-probe.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-power | 12 + + arch/arm/kernel/time.c | 2 +- + arch/arm/mach-omap2/timer.c | 4 +- + arch/arm/mach-rockchip/rockchip.c | 2 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 2 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 +- + arch/arm/mach-spear/spear13xx.c | 2 +- + arch/arm/mach-sunxi/sunxi.c | 2 +- + arch/arm/mach-u300/core.c | 2 +- + arch/arm/mach-ux500/timer.c | 2 +- + arch/arm/mach-zynq/common.c | 2 +- + arch/arm64/include/asm/acpi.h | 9 - + arch/arm64/include/asm/irq.h | 13 - + arch/arm64/kernel/acpi.c | 25 -- + arch/arm64/kernel/smp.c | 2 - + arch/arm64/kernel/time.c | 8 +- + arch/ia64/kernel/acpi.c | 20 - + arch/microblaze/kernel/setup.c | 2 +- + arch/mips/pistachio/time.c | 2 +- + arch/mips/ralink/clk.c | 2 +- + arch/nios2/kernel/time.c | 2 +- + arch/x86/kernel/acpi/boot.c | 49 +-- + arch/xtensa/kernel/time.c | 2 +- + drivers/acpi/acpi_pnp.c | 4 +- + drivers/acpi/device_sysfs.c | 120 +++++- + drivers/acpi/ec.c | 115 ++++-- + drivers/acpi/glue.c | 5 +- + drivers/acpi/internal.h | 6 +- + drivers/acpi/proc.c | 4 +- + drivers/acpi/property.c | 420 +++++++++++++++++---- + drivers/acpi/scan.c | 67 ++-- + drivers/acpi/tables.c | 341 ++++++++++++++++- + drivers/base/power/domain.c | 226 ----------- + drivers/base/power/wakeup.c | 16 +- + drivers/base/property.c | 88 ++++- + drivers/clocksource/Kconfig | 9 + + drivers/clocksource/Makefile | 2 +- + drivers/clocksource/arm_arch_timer.c | 10 +- + .../clocksource/{clksrc-of.c => clksrc-probe.c} | 6 +- + drivers/cpufreq/cpufreq_conservative.c | 31 +- + drivers/cpufreq/cpufreq_governor.c | 12 +- + drivers/cpufreq/cpufreq_governor.h | 1 - + drivers/cpufreq/imx6q-cpufreq.c | 50 ++- + drivers/cpufreq/integrator-cpufreq.c | 2 + + drivers/cpufreq/powernv-cpufreq.c | 10 +- + drivers/cpufreq/tegra20-cpufreq.c | 2 - + drivers/devfreq/devfreq.c | 7 +- + drivers/dma/acpi-dma.c | 25 +- + drivers/gpio/gpiolib-acpi.c | 153 +++++--- + drivers/gpio/gpiolib.c | 3 +- + drivers/gpio/gpiolib.h | 10 +- + drivers/irqchip/irq-gic.c | 72 ++-- + drivers/irqchip/irqchip.c | 5 +- + drivers/pnp/pnpacpi/core.c | 4 +- + include/acpi/acpi_bus.h | 37 +- + include/asm-generic/vmlinux.lds.h | 12 + + include/linux/acpi.h | 155 ++++++-- + include/linux/acpi_irq.h | 10 - + include/linux/clocksource.h | 13 +- + include/linux/fwnode.h | 1 + + include/linux/irqchip.h | 17 + + include/linux/irqchip/arm-gic-acpi.h | 31 -- + include/linux/pm_domain.h | 55 --- + include/linux/property.h | 4 + + include/linux/suspend.h | 3 + + kernel/irq/pm.c | 2 +- + kernel/power/main.c | 17 + + 67 files changed, 1531 insertions(+), 822 deletions(-) + rename drivers/clocksource/{clksrc-of.c => clksrc-probe.c} (91%) + delete mode 100644 include/linux/acpi_irq.h + delete mode 100644 include/linux/irqchip/arm-gic-acpi.h +Merging idle/next (f05bd12f0e9c Merge branch 'cpuidle' into release) +$ git merge idle/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging thermal/next (97584d1838b7 thermal: power_allocator: exit early if there are no cooling devices) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (b840b6e65cbe thermal: ti-soc-thermal: add OMAP36xx support) +$ git merge thermal-soc/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/ti_soc_thermal.txt | 14 ++ + drivers/thermal/ti-soc-thermal/Kconfig | 15 ++ + drivers/thermal/ti-soc-thermal/Makefile | 1 + + .../thermal/ti-soc-thermal/omap3-thermal-data.c | 176 +++++++++++++++++++++ + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 14 ++ + drivers/thermal/ti-soc-thermal/ti-bandgap.h | 11 ++ + 6 files changed, 231 insertions(+) + create mode 100644 drivers/thermal/ti-soc-thermal/omap3-thermal-data.c +Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (b3a5bbfd780d dlm: print error from kernel_sendpage) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (9d99c7123c9a swiotlb: Enable it under x86 PAE) +$ git merge swiotlb/linux-next +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + arch/x86/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging slave-dma/next (e1ec9fcc7fa5 Merge branches 'topic/dw', 'topic/idma', 'topic/ioatdma' and 'topic/of' into next) +$ git merge slave-dma/next +Auto-merging drivers/dma/acpi-dma.c +Merge made by the 'recursive' strategy. + arch/avr32/mach-at32ap/at32ap700x.c | 9 +-- + drivers/dma/Kconfig | 2 +- + drivers/dma/Makefile | 2 +- + drivers/dma/acpi-dma.c | 11 ++-- + drivers/dma/at_xdmac.c | 106 ++++++++++++++++----------------- + drivers/dma/dmaengine.c | 6 +- + drivers/dma/dw/core.c | 12 ++-- + drivers/dma/dw/pci.c | 20 +++---- + drivers/dma/edma.c | 2 +- + drivers/dma/fsldma.c | 1 + + drivers/dma/idma64.c | 22 +++---- + drivers/dma/idma64.h | 14 ++--- + drivers/dma/ioat/dma.c | 3 +- + drivers/dma/ioat/dma.h | 6 +- + drivers/dma/ioat/init.c | 114 +++++++++++++++++++++++++++++++++++- + drivers/dma/ioat/prep.c | 34 +++++++++++ + drivers/dma/moxart-dma.c | 1 + + drivers/dma/mpc512x_dma.c | 1 + + drivers/dma/sirf-dma.c | 1 + + drivers/dma/sun6i-dma.c | 1 + + drivers/dma/xgene-dma.c | 4 +- + drivers/dma/xilinx/xilinx_vdma.c | 1 + + drivers/dma/zx296702_dma.c | 2 +- + include/linux/of_dma.h | 2 +- + 24 files changed, 255 insertions(+), 122 deletions(-) +Merging net-next/master (acb4a6bfc80d tcp: ensure prior synack rtx behavior with small backlogs) +$ git merge net-next/master +Resolved 'drivers/net/usb/asix_common.c' using previous resolution. +Resolved 'net/ipv4/inet_connection_sock.c' using previous resolution. +Resolved 'net/ipv6/xfrm6_output.c' using previous resolution. +Auto-merging net/openvswitch/flow_table.c +Auto-merging net/openvswitch/flow_netlink.c +Auto-merging net/openvswitch/flow.h +Auto-merging net/openvswitch/conntrack.c +Auto-merging net/openvswitch/actions.c +Auto-merging net/ipv6/xfrm6_policy.c +Auto-merging net/ipv6/xfrm6_output.c +CONFLICT (content): Merge conflict in net/ipv6/xfrm6_output.c +Auto-merging net/ipv4/inet_connection_sock.c +CONFLICT (content): Merge conflict in net/ipv4/inet_connection_sock.c +Auto-merging net/ipv4/arp.c +Auto-merging net/dsa/dsa.c +Auto-merging net/core/filter.c +Auto-merging include/uapi/linux/openvswitch.h +Removing include/net/vrf.h +Auto-merging drivers/net/wireless/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/usb/asix_common.c +CONFLICT (content): Merge conflict in drivers/net/usb/asix_common.c +Auto-merging drivers/net/ethernet/intel/i40evf/i40e_adminq.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_adminq.c +Removing drivers/net/ethernet/hisilicon/hip04_mdio.c +Auto-merging drivers/net/arcnet/com20020.h +Auto-merging drivers/net/arcnet/arcdevice.h +Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi +Auto-merging arch/arm/net/bpf_jit_32.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d2dc291ae5c9] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/net/can/sun4i_can.txt | 36 + + Documentation/devicetree/bindings/net/cpsw.txt | 7 + + .../devicetree/bindings/net/fsl-tsec-phy.txt | 4 + + .../bindings/net/hisilicon-hip04-net.txt | 4 +- + .../devicetree/bindings/net/hisilicon-hns-dsaf.txt | 49 + + .../devicetree/bindings/net/hisilicon-hns-mdio.txt | 22 + + .../devicetree/bindings/net/hisilicon-hns-nic.txt | 47 + + .../devicetree/bindings/net/renesas,ravb.txt | 69 +- + Documentation/networking/ieee802154.txt | 8 +- + Documentation/networking/ipvs-sysctl.txt | 10 + + Documentation/networking/l2tp.txt | 7 +- + Documentation/networking/switchdev.txt | 58 +- + MAINTAINERS | 9 +- + arch/arm/boot/dts/am4372.dtsi | 1 + + arch/arm/boot/dts/dra7.dtsi | 1 + + arch/arm/net/bpf_jit_32.c | 40 +- + arch/arm/net/bpf_jit_32.h | 5 + + arch/arm64/boot/dts/apm/apm-storm.dtsi | 28 + + arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi | 193 ++ + arch/arm64/net/bpf_jit_comp.c | 2 +- + arch/m68k/mac/psc.c | 1 + + arch/mips/net/bpf_jit.c | 2 +- + arch/powerpc/boot/dts/fsl/p1022si-post.dtsi | 2 + + arch/powerpc/net/bpf_jit_comp.c | 2 +- + arch/s390/net/bpf_jit_comp.c | 2 +- + arch/sparc/net/bpf_jit_comp.c | 2 +- + arch/x86/net/bpf_jit_comp.c | 2 +- + drivers/bluetooth/bt3c_cs.c | 12 +- + drivers/bluetooth/btintel.c | 46 + + drivers/bluetooth/btintel.h | 10 +- + drivers/bluetooth/btmrvl_main.c | 14 - + drivers/bluetooth/btusb.c | 51 +- + drivers/bluetooth/hci_bcm.c | 222 +- + drivers/bluetooth/hci_intel.c | 590 ++++- + drivers/bluetooth/hci_qca.c | 12 +- + drivers/irqchip/irq-armada-370-xp.c | 14 +- + drivers/isdn/hisax/hfc4s8s_l1.c | 10 +- + drivers/net/Kconfig | 1 + + drivers/net/arcnet/arc-rawmode.c | 142 +- + drivers/net/arcnet/arc-rimi.c | 145 +- + {include/linux => drivers/net/arcnet}/arcdevice.h | 152 +- + drivers/net/arcnet/arcnet.c | 601 +++-- + drivers/net/arcnet/capmode.c | 138 +- + drivers/net/arcnet/com20020-isa.c | 54 +- + drivers/net/arcnet/com20020-pci.c | 70 +- + drivers/net/arcnet/com20020.c | 234 +- + {include/linux => drivers/net/arcnet}/com20020.h | 75 +- + drivers/net/arcnet/com20020_cs.c | 325 ++- + drivers/net/arcnet/com9026.h | 17 + + drivers/net/arcnet/com90io.c | 209 +- + drivers/net/arcnet/com90xx.c | 323 +-- + drivers/net/arcnet/rfc1051.c | 77 +- + drivers/net/arcnet/rfc1201.c | 238 +- + drivers/net/bonding/bond_main.c | 4 + + drivers/net/can/Kconfig | 10 + + drivers/net/can/Makefile | 1 + + drivers/net/can/flexcan.c | 197 +- + drivers/net/can/sun4i_can.c | 857 +++++++ + drivers/net/dsa/mv88e6123_61_65.c | 1 - + drivers/net/dsa/mv88e6131.c | 1 - + drivers/net/dsa/mv88e6171.c | 1 - + drivers/net/dsa/mv88e6352.c | 1 - + drivers/net/dsa/mv88e6xxx.c | 221 +- + drivers/net/dsa/mv88e6xxx.h | 9 +- + drivers/net/ethernet/8390/Kconfig | 2 +- + drivers/net/ethernet/8390/mac8390.c | 32 +- + drivers/net/ethernet/amd/7990.c | 1 + + drivers/net/ethernet/amd/Kconfig | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 83 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 14 +- + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 106 +- + drivers/net/ethernet/amd/xgbe/xgbe-main.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 16 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 18 +- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 3 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 16 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 5 + + drivers/net/ethernet/apple/Kconfig | 2 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 149 ++ + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 9 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 4 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 21 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 15 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 30 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 36 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 1464 +++++++++--- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 5 + + drivers/net/ethernet/cisco/enic/enic.h | 1 + + drivers/net/ethernet/cisco/enic/enic_main.c | 50 +- + drivers/net/ethernet/cisco/enic/vnic_dev.c | 4 +- + drivers/net/ethernet/cisco/enic/vnic_dev.h | 2 + + drivers/net/ethernet/ethoc.c | 14 +- + drivers/net/ethernet/freescale/fec_main.c | 3 +- + drivers/net/ethernet/freescale/fec_ptp.c | 6 +- + drivers/net/ethernet/freescale/gianfar.c | 155 +- + drivers/net/ethernet/freescale/gianfar.h | 12 +- + drivers/net/ethernet/freescale/gianfar_ethtool.c | 43 +- + drivers/net/ethernet/hisilicon/Kconfig | 34 +- + drivers/net/ethernet/hisilicon/Makefile | 4 +- + drivers/net/ethernet/hisilicon/hip04_mdio.c | 185 -- + drivers/net/ethernet/hisilicon/hns/Makefile | 12 + + drivers/net/ethernet/hisilicon/hns/hnae.c | 507 ++++ + drivers/net/ethernet/hisilicon/hns/hnae.h | 583 +++++ + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 777 +++++++ + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 704 ++++++ + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.h | 45 + + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 900 +++++++ + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 456 ++++ + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 2445 ++++++++++++++++++++ + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 427 ++++ + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 317 +++ + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.h | 43 + + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 583 +++++ + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h | 105 + + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 1021 ++++++++ + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h | 137 ++ + drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 972 ++++++++ + .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 837 +++++++ + .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.h | 15 + + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 1629 +++++++++++++ + drivers/net/ethernet/hisilicon/hns/hns_enet.h | 84 + + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 1230 ++++++++++ + drivers/net/ethernet/hisilicon/hns_mdio.c | 520 +++++ + drivers/net/ethernet/ibm/emac/core.h | 2 +- + drivers/net/ethernet/intel/e1000/e1000_hw.c | 8 - + drivers/net/ethernet/intel/e1000e/netdev.c | 1 + + drivers/net/ethernet/intel/fm10k/fm10k.h | 19 + + drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c | 5 +- + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 216 +- + drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 8 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 27 +- + drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 48 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 39 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 198 +- + drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 105 +- + drivers/net/ethernet/intel/fm10k/fm10k_type.h | 7 +- + drivers/net/ethernet/intel/fm10k/fm10k_vf.c | 14 - + drivers/net/ethernet/intel/i40e/i40e.h | 7 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 65 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.h | 10 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 13 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 6 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 16 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 10 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 339 +-- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 386 ++- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 227 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 38 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 11 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 17 +- + drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 52 +- + drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 10 +- + drivers/net/ethernet/intel/i40evf/i40e_common.c | 1 + + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 99 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 8 - + drivers/net/ethernet/intel/i40evf/i40e_type.h | 11 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 9 +- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 2 + + drivers/net/ethernet/intel/igb/igb.h | 4 +- + drivers/net/ethernet/intel/igb/igb_main.c | 18 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 8 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 5 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 202 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 226 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 5 + + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c | 8 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 103 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 291 ++- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 35 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 9 + + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 102 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 492 +++- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 1 + + drivers/net/ethernet/marvell/mv643xx_eth.c | 43 +- + drivers/net/ethernet/marvell/mvneta.c | 316 ++- + drivers/net/ethernet/marvell/sky2.c | 12 + + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 2 + + drivers/net/ethernet/mellanox/mlx5/core/cq.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/health.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 341 +-- + drivers/net/ethernet/mellanox/mlx5/core/mr.c | 1 + + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 63 +- + drivers/net/ethernet/mellanox/mlx5/core/port.c | 35 +- + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/srq.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 2 +- + drivers/net/ethernet/realtek/8139cp.c | 24 +- + drivers/net/ethernet/renesas/ravb.h | 7 + + drivers/net/ethernet/renesas/ravb_main.c | 101 +- + drivers/net/ethernet/rocker/rocker.c | 440 ++-- + drivers/net/ethernet/smsc/smc91x.c | 29 +- + drivers/net/ethernet/smsc/smc91x.h | 99 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 +- + drivers/net/ethernet/ti/cpsw-common.c | 64 +- + drivers/net/ethernet/ti/cpsw.c | 20 +- + drivers/net/ethernet/ti/cpsw.h | 3 +- + drivers/net/ethernet/ti/davinci_emac.c | 52 +- + drivers/net/ethernet/xilinx/ll_temac_mdio.c | 9 +- + drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 5 +- + drivers/net/ieee802154/Kconfig | 7 + + drivers/net/ieee802154/at86rf230.c | 180 +- + drivers/net/ieee802154/at86rf230.h | 8 + + drivers/net/ieee802154/atusb.c | 13 +- + drivers/net/irda/pxaficp_ir.c | 370 +-- + drivers/net/phy/phy_device.c | 59 +- + drivers/net/usb/Kconfig | 4 +- + drivers/net/usb/asix.h | 2 +- + drivers/net/usb/asix_common.c | 114 +- + drivers/net/usb/cdc-phonet.c | 27 +- + drivers/net/usb/cdc_ether.c | 230 +- + drivers/net/usb/cdc_mbim.c | 2 +- + drivers/net/usb/cdc_ncm.c | 69 +- + drivers/net/usb/lan78xx.c | 672 +++--- + drivers/net/usb/lan78xx.h | 193 -- + drivers/net/usb/qmi_wwan.c | 66 +- + drivers/net/usb/smsc75xx.c | 5 - + drivers/net/usb/smsc95xx.c | 5 - + drivers/net/usb/usbnet.c | 138 ++ + drivers/net/vmxnet3/vmxnet3_ethtool.c | 118 +- + drivers/net/vmxnet3/vmxnet3_int.h | 4 +- + drivers/net/vrf.c | 135 +- + drivers/net/vxlan.c | 167 +- + drivers/net/wireless/ath/ath10k/mac.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 2 +- + drivers/net/wireless/ath/carl9170/main.c | 2 +- + drivers/net/wireless/ath/wcn36xx/main.c | 2 +- + .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 2 +- + drivers/net/wireless/brcm80211/brcmsmac/main.c | 2 +- + drivers/net/wireless/cw1200/sta.c | 2 +- + drivers/net/wireless/cw1200/sta.h | 2 +- + drivers/net/wireless/ipw2x00/libipw_rx.c | 2 - + drivers/net/wireless/iwlegacy/4965-mac.c | 2 +- + drivers/net/wireless/iwlegacy/4965.h | 2 +- + drivers/net/wireless/iwlwifi/dvm/mac80211.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 7 +- + drivers/net/wireless/mediatek/mt7601u/main.c | 3 +- + drivers/net/wireless/mwifiex/11n_aggr.c | 4 +- + drivers/net/wireless/mwifiex/11n_rxreorder.c | 4 +- + drivers/net/wireless/mwifiex/wmm.c | 15 +- + drivers/net/wireless/mwl8k.c | 2 +- + drivers/net/wireless/orinoco/cfg.c | 6 +- + drivers/net/wireless/rndis_wlan.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 4 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 2 +- + drivers/net/wireless/rt2x00/rt2800lib.h | 2 +- + drivers/net/wireless/rtlwifi/core.c | 2 +- + drivers/net/wireless/ti/wlcore/main.c | 2 +- + drivers/net/xen-netfront.c | 17 +- + drivers/s390/char/monreader.c | 4 +- + drivers/s390/char/vmlogrdr.c | 8 +- + drivers/s390/cio/qdio_main.c | 4 +- + drivers/s390/net/netiucv.c | 21 +- + drivers/s390/net/qeth_core.h | 30 +- + drivers/s390/net/qeth_core_main.c | 241 +- + drivers/s390/net/qeth_core_sys.c | 43 +- + drivers/s390/net/qeth_l2_main.c | 228 +- + drivers/s390/net/qeth_l2_sys.c | 2 +- + drivers/s390/net/qeth_l3_main.c | 158 +- + drivers/s390/net/smsgiucv.c | 5 +- + drivers/tty/hvc/hvc_iucv.c | 10 +- + include/linux/bpf.h | 1 - + include/linux/can/dev.h | 3 +- + include/linux/can/led.h | 1 + + include/linux/filter.h | 9 +- + include/linux/ieee80211.h | 4 +- + include/linux/ieee802154.h | 25 + + include/linux/if_bridge.h | 6 + + include/linux/igmp.h | 2 +- + include/linux/ipv6.h | 4 +- + include/linux/mlx5/device.h | 2 +- + include/linux/netdevice.h | 57 +- + include/linux/netfilter.h | 72 +- + include/linux/netfilter/x_tables.h | 3 +- + include/linux/netfilter_arp/arp_tables.h | 1 - + include/linux/netfilter_bridge.h | 2 +- + include/linux/netfilter_bridge/ebtables.h | 6 +- + include/linux/netfilter_ingress.h | 2 +- + include/linux/netfilter_ipv4.h | 2 +- + include/linux/netfilter_ipv4/ip_tables.h | 1 - + include/linux/netfilter_ipv6.h | 6 +- + include/linux/netfilter_ipv6/ip6_tables.h | 1 - + include/linux/phy.h | 1 + + include/linux/tcp.h | 25 +- + include/linux/usb/cdc.h | 51 + + include/net/6lowpan.h | 144 +- + include/net/addrconf.h | 3 +- + include/net/af_ieee802154.h | 2 +- + include/net/bluetooth/bluetooth.h | 11 + + include/net/bluetooth/hci_core.h | 1 + + include/net/cfg80211.h | 12 + + include/net/dn_neigh.h | 6 +- + include/net/dst.h | 15 +- + include/net/ethoc.h | 1 + + include/net/flow.h | 2 +- + include/net/genetlink.h | 5 +- + include/net/inet6_connection_sock.h | 13 +- + include/net/inet_connection_sock.h | 16 +- + include/net/inet_hashtables.h | 3 +- + include/net/inet_sock.h | 3 +- + include/net/ip.h | 23 +- + include/net/ip6_route.h | 4 +- + include/net/ip_fib.h | 16 +- + include/net/ip_vs.h | 299 ++- + include/net/ipv6.h | 6 +- + include/net/iucv/iucv.h | 20 +- + include/net/l3mdev.h | 176 ++ + include/net/mac80211.h | 31 +- + include/net/mac802154.h | 15 + + include/net/ndisc.h | 6 +- + include/net/netfilter/br_netfilter.h | 8 +- + include/net/netfilter/ipv4/nf_dup_ipv4.h | 2 +- + include/net/netfilter/ipv4/nf_reject.h | 2 +- + include/net/netfilter/ipv6/nf_dup_ipv6.h | 2 +- + include/net/netfilter/nf_conntrack.h | 3 +- + include/net/netfilter/nf_conntrack_core.h | 1 + + include/net/netfilter/nf_conntrack_l4proto.h | 2 +- + include/net/netfilter/nf_nat_core.h | 2 +- + include/net/netfilter/nf_nat_l3proto.h | 32 +- + include/net/netfilter/nf_tables.h | 14 +- + include/net/netfilter/nf_tables_ipv4.h | 3 +- + include/net/netfilter/nf_tables_ipv6.h | 3 +- + include/net/request_sock.h | 164 +- + include/net/route.h | 23 +- + include/net/rtnetlink.h | 3 +- + include/net/sch_generic.h | 3 +- + include/net/sock.h | 14 +- + include/net/switchdev.h | 144 +- + include/net/tc_act/tc_connmark.h | 1 + + include/net/tcp.h | 69 +- + include/net/vrf.h | 178 -- + include/net/vxlan.h | 14 +- + include/net/xfrm.h | 2 - + include/uapi/linux/atm_zatm.h | 6 - + include/uapi/linux/bpf.h | 16 + + include/uapi/linux/if_arcnet.h | 55 +- + include/uapi/linux/if_bridge.h | 1 + + include/uapi/linux/if_link.h | 49 + + include/uapi/linux/netlink.h | 1 + + include/uapi/linux/openvswitch.h | 2 + + include/uapi/linux/pkt_cls.h | 4 + + include/uapi/linux/rtnetlink.h | 2 + + include/uapi/linux/usb/cdc.h | 6 +- + kernel/bpf/arraymap.c | 1 + + kernel/bpf/core.c | 4 + + kernel/bpf/syscall.c | 6 +- + kernel/irq/manage.c | 9 +- + kernel/seccomp.c | 4 +- + net/6lowpan/iphc.c | 13 +- + net/6lowpan/nhc_udp.c | 13 +- + net/Kconfig | 1 + + net/Makefile | 3 + + net/bluetooth/hci_core.c | 5 +- + net/bluetooth/hci_event.c | 21 + + net/bluetooth/hci_sock.c | 11 +- + net/bluetooth/lib.c | 16 + + net/bluetooth/smp.c | 2 +- + net/bridge/br_device.c | 4 +- + net/bridge/br_fdb.c | 90 +- + net/bridge/br_forward.c | 31 +- + net/bridge/br_if.c | 3 +- + net/bridge/br_input.c | 35 +- + net/bridge/br_mdb.c | 24 +- + net/bridge/br_multicast.c | 4 +- + net/bridge/br_netfilter_hooks.c | 84 +- + net/bridge/br_netfilter_ipv6.c | 21 +- + net/bridge/br_netlink.c | 507 +++- + net/bridge/br_private.h | 182 +- + net/bridge/br_stp.c | 15 +- + net/bridge/br_stp_bpdu.c | 12 +- + net/bridge/br_vlan.c | 736 +++--- + net/bridge/netfilter/ebt_log.c | 2 +- + net/bridge/netfilter/ebt_nflog.c | 2 +- + net/bridge/netfilter/ebtable_broute.c | 8 +- + net/bridge/netfilter/ebtable_filter.c | 10 +- + net/bridge/netfilter/ebtable_nat.c | 10 +- + net/bridge/netfilter/ebtables.c | 14 +- + net/bridge/netfilter/nf_tables_bridge.c | 20 +- + net/bridge/netfilter/nft_reject_bridge.c | 19 +- + net/core/dev.c | 36 +- + net/core/filter.c | 110 +- + net/core/neighbour.c | 45 +- + net/core/net-sysfs.c | 11 +- + net/core/netpoll.c | 23 +- + net/core/request_sock.c | 88 +- + net/core/rtnetlink.c | 4 +- + net/core/sock.c | 2 +- + net/dccp/dccp.h | 8 +- + net/dccp/ipv4.c | 73 +- + net/dccp/ipv6.c | 100 +- + net/dccp/minisocks.c | 4 +- + net/dccp/output.c | 17 +- + net/decnet/dn_neigh.c | 23 +- + net/decnet/dn_nsp_in.c | 7 +- + net/decnet/dn_nsp_out.c | 4 +- + net/decnet/dn_route.c | 30 +- + net/decnet/netfilter/dn_rtmsg.c | 2 +- + net/dsa/dsa.c | 4 +- + net/dsa/slave.c | 124 +- + net/ethernet/eth.c | 2 +- + net/ieee802154/6lowpan/6lowpan_i.h | 14 +- + net/ieee802154/6lowpan/core.c | 116 +- + net/ieee802154/6lowpan/reassembly.c | 157 +- + net/ieee802154/6lowpan/rx.c | 352 ++- + net/ieee802154/6lowpan/tx.c | 51 +- + net/ipv4/af_inet.c | 30 +- + net/ipv4/arp.c | 20 +- + net/ipv4/devinet.c | 3 +- + net/ipv4/fib_frontend.c | 12 +- + net/ipv4/fib_semantics.c | 161 +- + net/ipv4/icmp.c | 27 +- + net/ipv4/igmp.c | 2 +- + net/ipv4/inet_connection_sock.c | 173 +- + net/ipv4/inet_diag.c | 96 +- + net/ipv4/inet_hashtables.c | 16 +- + net/ipv4/ip_forward.c | 19 +- + net/ipv4/ip_fragment.c | 6 +- + net/ipv4/ip_input.c | 39 +- + net/ipv4/ip_output.c | 110 +- + net/ipv4/ip_vti.c | 2 +- + net/ipv4/ipmr.c | 15 +- + net/ipv4/netfilter.c | 7 +- + net/ipv4/netfilter/arp_tables.c | 3 +- + net/ipv4/netfilter/arptable_filter.c | 7 +- + net/ipv4/netfilter/ip_tables.c | 11 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 4 +- + net/ipv4/netfilter/ipt_REJECT.c | 2 +- + net/ipv4/netfilter/ipt_SYNPROXY.c | 26 +- + net/ipv4/netfilter/ipt_rpfilter.c | 5 +- + net/ipv4/netfilter/iptable_filter.c | 9 +- + net/ipv4/netfilter/iptable_mangle.c | 19 +- + net/ipv4/netfilter/iptable_nat.c | 22 +- + net/ipv4/netfilter/iptable_raw.c | 9 +- + net/ipv4/netfilter/iptable_security.c | 10 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 12 +- + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 4 +- + net/ipv4/netfilter/nf_defrag_ipv4.c | 4 +- + net/ipv4/netfilter/nf_dup_ipv4.c | 23 +- + net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 44 +- + net/ipv4/netfilter/nf_reject_ipv4.c | 4 +- + net/ipv4/netfilter/nf_tables_arp.c | 6 +- + net/ipv4/netfilter/nf_tables_ipv4.c | 10 +- + net/ipv4/netfilter/nft_chain_nat_ipv4.c | 22 +- + net/ipv4/netfilter/nft_chain_route_ipv4.c | 8 +- + net/ipv4/netfilter/nft_dup_ipv4.c | 2 +- + net/ipv4/netfilter/nft_masq_ipv4.c | 2 +- + net/ipv4/netfilter/nft_redir_ipv4.c | 2 +- + net/ipv4/netfilter/nft_reject_ipv4.c | 5 +- + net/ipv4/raw.c | 13 +- + net/ipv4/route.c | 209 +- + net/ipv4/syncookies.c | 14 +- + net/ipv4/tcp.c | 38 +- + net/ipv4/tcp_cong.c | 12 +- + net/ipv4/tcp_fastopen.c | 71 +- + net/ipv4/tcp_input.c | 100 +- + net/ipv4/tcp_ipv4.c | 184 +- + net/ipv4/tcp_minisocks.c | 41 +- + net/ipv4/tcp_output.c | 78 +- + net/ipv4/udp.c | 22 +- + net/ipv4/xfrm4_input.c | 7 +- + net/ipv4/xfrm4_output.c | 11 +- + net/ipv4/xfrm4_policy.c | 9 +- + net/ipv6/addrconf.c | 15 +- + net/ipv6/datagram.c | 2 +- + net/ipv6/inet6_connection_sock.c | 77 +- + net/ipv6/ip6_input.c | 15 +- + net/ipv6/ip6_output.c | 80 +- + net/ipv6/ip6_vti.c | 2 +- + net/ipv6/ip6mr.c | 12 +- + net/ipv6/mcast.c | 9 +- + net/ipv6/mip6.c | 16 +- + net/ipv6/ndisc.c | 23 +- + net/ipv6/netfilter.c | 7 +- + net/ipv6/netfilter/ip6_tables.c | 11 +- + net/ipv6/netfilter/ip6t_REJECT.c | 2 +- + net/ipv6/netfilter/ip6t_SYNPROXY.c | 6 +- + net/ipv6/netfilter/ip6t_rpfilter.c | 6 +- + net/ipv6/netfilter/ip6table_filter.c | 6 +- + net/ipv6/netfilter/ip6table_mangle.c | 18 +- + net/ipv6/netfilter/ip6table_nat.c | 22 +- + net/ipv6/netfilter/ip6table_raw.c | 6 +- + net/ipv6/netfilter/ip6table_security.c | 7 +- + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 12 +- + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 3 +- + net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 6 +- + net/ipv6/netfilter/nf_dup_ipv6.c | 23 +- + net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 44 +- + net/ipv6/netfilter/nf_nat_masquerade_ipv6.c | 2 +- + net/ipv6/netfilter/nf_tables_ipv6.c | 10 +- + net/ipv6/netfilter/nft_chain_nat_ipv6.c | 22 +- + net/ipv6/netfilter/nft_chain_route_ipv6.c | 8 +- + net/ipv6/netfilter/nft_dup_ipv6.c | 2 +- + net/ipv6/netfilter/nft_redir_ipv6.c | 3 +- + net/ipv6/netfilter/nft_reject_ipv6.c | 7 +- + net/ipv6/output_core.c | 8 +- + net/ipv6/raw.c | 9 +- + net/ipv6/route.c | 34 +- + net/ipv6/syncookies.c | 9 +- + net/ipv6/tcp_ipv6.c | 169 +- + net/ipv6/xfrm6_input.c | 4 +- + net/ipv6/xfrm6_output.c | 22 +- + net/ipv6/xfrm6_policy.c | 8 +- + net/iucv/af_iucv.c | 9 +- + net/iucv/iucv.c | 12 +- + net/l2tp/l2tp_core.h | 3 + + net/l2tp/l2tp_eth.c | 1 + + net/l2tp/l2tp_ip.c | 1 + + net/l2tp/l2tp_ip6.c | 1 + + net/l2tp/l2tp_netlink.c | 7 + + net/l2tp/l2tp_ppp.c | 1 + + net/l3mdev/Kconfig | 10 + + net/l3mdev/Makefile | 5 + + net/l3mdev/l3mdev.c | 92 + + net/mac80211/agg-rx.c | 8 +- + net/mac80211/agg-tx.c | 15 +- + net/mac80211/cfg.c | 56 +- + net/mac80211/debugfs.c | 2 + + net/mac80211/debugfs_key.c | 51 +- + net/mac80211/debugfs_netdev.c | 41 +- + net/mac80211/driver-ops.c | 222 ++ + net/mac80211/driver-ops.h | 259 +-- + net/mac80211/ieee80211_i.h | 19 +- + net/mac80211/iface.c | 2 +- + net/mac80211/main.c | 3 +- + net/mac80211/mesh.c | 82 +- + net/mac80211/mesh.h | 10 +- + net/mac80211/mesh_plink.c | 9 +- + net/mac80211/mlme.c | 155 +- + net/mac80211/offchannel.c | 6 +- + net/mac80211/pm.c | 3 +- + net/mac80211/rate.c | 5 +- + net/mac80211/rc80211_minstrel_debugfs.c | 12 +- + net/mac80211/rc80211_minstrel_ht_debugfs.c | 12 +- + net/mac80211/sta_info.c | 8 +- + net/mac80211/sta_info.h | 2 + + net/mac80211/status.c | 108 +- + net/mac80211/tdls.c | 8 +- + net/mac80211/trace.h | 40 +- + net/mac80211/tx.c | 22 +- + net/mac80211/util.c | 11 +- + net/netfilter/core.c | 2 +- + net/netfilter/ipset/ip_set_core.c | 9 +- + net/netfilter/ipvs/ip_vs_app.c | 36 +- + net/netfilter/ipvs/ip_vs_conn.c | 84 +- + net/netfilter/ipvs/ip_vs_core.c | 521 +++-- + net/netfilter/ipvs/ip_vs_ctl.c | 291 +-- + net/netfilter/ipvs/ip_vs_est.c | 20 +- + net/netfilter/ipvs/ip_vs_ftp.c | 27 +- + net/netfilter/ipvs/ip_vs_lblc.c | 3 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 3 +- + net/netfilter/ipvs/ip_vs_nfct.c | 5 +- + net/netfilter/ipvs/ip_vs_pe_sip.c | 2 +- + net/netfilter/ipvs/ip_vs_proto.c | 33 +- + net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 32 +- + net/netfilter/ipvs/ip_vs_proto_sctp.c | 58 +- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 61 +- + net/netfilter/ipvs/ip_vs_proto_udp.c | 49 +- + net/netfilter/ipvs/ip_vs_sh.c | 45 +- + net/netfilter/ipvs/ip_vs_sync.c | 87 +- + net/netfilter/ipvs/ip_vs_xmit.c | 81 +- + net/netfilter/nf_conntrack_core.c | 10 +- + net/netfilter/nf_conntrack_proto_dccp.c | 2 +- + net/netfilter/nf_conntrack_proto_generic.c | 2 +- + net/netfilter/nf_conntrack_proto_gre.c | 3 +- + net/netfilter/nf_conntrack_proto_sctp.c | 2 +- + net/netfilter/nf_conntrack_proto_tcp.c | 2 +- + net/netfilter/nf_conntrack_proto_udp.c | 1 + + net/netfilter/nf_conntrack_proto_udplite.c | 1 + + net/netfilter/nf_nat_core.c | 4 +- + net/netfilter/nf_queue.c | 4 +- + net/netfilter/nf_tables_core.c | 10 +- + net/netfilter/nf_tables_netdev.c | 20 +- + net/netfilter/nfnetlink_log.c | 6 +- + net/netfilter/nfnetlink_queue_core.c | 3 +- + net/netfilter/nft_log.c | 3 +- + net/netfilter/nft_meta.c | 4 +- + net/netfilter/nft_queue.c | 2 +- + net/netfilter/nft_reject_inet.c | 19 +- + net/netfilter/xt_LOG.c | 2 +- + net/netfilter/xt_NFLOG.c | 2 +- + net/netfilter/xt_TCPMSS.c | 2 +- + net/netfilter/xt_TEE.c | 4 +- + net/netfilter/xt_TPROXY.c | 24 +- + net/netfilter/xt_addrtype.c | 4 +- + net/netfilter/xt_connlimit.c | 4 +- + net/netfilter/xt_ipvs.c | 5 +- + net/netfilter/xt_osf.c | 2 +- + net/netfilter/xt_recent.c | 2 +- + net/netfilter/xt_socket.c | 14 +- + net/netlink/genetlink.c | 12 +- + net/openvswitch/actions.c | 13 +- + net/openvswitch/conntrack.c | 2 +- + net/openvswitch/datapath.c | 3 +- + net/openvswitch/flow.c | 4 +- + net/openvswitch/flow.h | 1 + + net/openvswitch/flow_netlink.c | 129 +- + net/openvswitch/flow_table.c | 2 +- + net/openvswitch/vport-vxlan.c | 3 +- + net/packet/af_packet.c | 2 +- + net/rds/connection.c | 22 +- + net/rds/rds.h | 4 +- + net/rds/tcp.c | 16 +- + net/rds/tcp_listen.c | 22 +- + net/rds/tcp_send.c | 8 +- + net/rxrpc/ar-connection.c | 4 +- + net/rxrpc/ar-internal.h | 4 +- + net/rxrpc/ar-transport.c | 4 +- + net/sched/act_bpf.c | 1 + + net/sched/act_connmark.c | 5 +- + net/sched/act_ipt.c | 1 + + net/sched/cls_bpf.c | 82 +- + net/sched/em_ipset.c | 1 + + net/sched/sch_dsmark.c | 63 +- + net/sched/sch_fq.c | 12 +- + net/sctp/sm_make_chunk.c | 2 +- + net/sctp/sm_statefuns.c | 2 +- + net/switchdev/switchdev.c | 310 ++- + net/wireless/core.c | 1 + + net/wireless/nl80211.c | 209 +- + net/wireless/reg.c | 4 +- + net/xfrm/xfrm_output.c | 18 +- + net/xfrm/xfrm_policy.c | 10 +- + samples/bpf/bpf_helpers.h | 4 + + samples/bpf/tcbpf1_kern.c | 24 +- + security/selinux/hooks.c | 10 +- + security/smack/smack_netfilter.c | 4 +- + tools/net/bpf_jit_disasm.c | 4 +- + 634 files changed, 32028 insertions(+), 11078 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/can/sun4i_can.txt + create mode 100644 Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt + create mode 100644 Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt + create mode 100644 Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt + create mode 100644 arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi + rename {include/linux => drivers/net/arcnet}/arcdevice.h (79%) + rename {include/linux => drivers/net/arcnet}/com20020.h (61%) + create mode 100644 drivers/net/arcnet/com9026.h + create mode 100644 drivers/net/can/sun4i_can.c + delete mode 100644 drivers/net/ethernet/hisilicon/hip04_mdio.c + create mode 100644 drivers/net/ethernet/hisilicon/hns/Makefile + create mode 100644 drivers/net/ethernet/hisilicon/hns/hnae.c + create mode 100644 drivers/net/ethernet/hisilicon/hns/hnae.h + create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c + create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c + create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.h + create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c + create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h + create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c + create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h + create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c + create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.h + create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c + create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h + create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c + create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h + create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h + create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c + create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.h + create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_enet.c + create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_enet.h + create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c + create mode 100644 drivers/net/ethernet/hisilicon/hns_mdio.c + create mode 100644 include/linux/usb/cdc.h + create mode 100644 include/net/l3mdev.h + delete mode 100644 include/net/vrf.h + create mode 100644 net/l3mdev/Kconfig + create mode 100644 net/l3mdev/Makefile + create mode 100644 net/l3mdev/l3mdev.c +Merging ipsec-next/master (c386578f1cdb xfrm: Let the flowcache handle its size by default.) +$ git merge ipsec-next/master +Auto-merging net/ipv6/xfrm6_policy.c +Auto-merging net/ipv4/xfrm4_policy.c +Merge made by the 'recursive' strategy. + Documentation/networking/ip-sysctl.txt | 6 ++++-- + net/ipv4/xfrm4_policy.c | 2 +- + net/ipv6/xfrm6_policy.c | 2 +- + 3 files changed, 6 insertions(+), 4 deletions(-) +Merging ipvs-next/master (92240e8dc0d1 ipvs: Remove possibly unused variables from ip_vs_conn_net_{init,cleanup}) +$ git merge ipvs-next/master +Removing net/netfilter/nfnetlink_queue_ct.c +Auto-merging net/netfilter/nfnetlink_queue.c +Auto-merging net/netfilter/nfnetlink_log.c +Removing include/net/netfilter/nfnetlink_queue.h +Merge made by the 'recursive' strategy. + include/linux/netfilter.h | 16 +-- + include/net/netfilter/nf_conntrack.h | 4 - + include/net/netfilter/nfnetlink_queue.h | 51 ---------- + include/uapi/linux/netfilter/nfnetlink_log.h | 3 + + net/netfilter/Kconfig | 15 +-- + net/netfilter/Makefile | 2 - + net/netfilter/core.c | 9 +- + net/netfilter/ipvs/ip_vs_conn.c | 13 +-- + net/netfilter/ipvs/ip_vs_core.c | 5 +- + net/netfilter/nf_conntrack_netlink.c | 98 +++++++++++++----- + net/netfilter/nfnetlink_log.c | 37 ++++++- + .../{nfnetlink_queue_core.c => nfnetlink_queue.c} | 59 ++++++++--- + net/netfilter/nfnetlink_queue_ct.c | 113 --------------------- + 13 files changed, 181 insertions(+), 244 deletions(-) + delete mode 100644 include/net/netfilter/nfnetlink_queue.h + rename net/netfilter/{nfnetlink_queue_core.c => nfnetlink_queue.c} (96%) + delete mode 100644 net/netfilter/nfnetlink_queue_ct.c +Merging wireless-drivers-next/master (7e64e5e66af8 Merge tag 'iwlwifi-next-for-kalle-2015-10-05' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/mwifiex/wmm.c +Auto-merging drivers/net/wireless/mwifiex/11n_aggr.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/ops.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/mvm.h +Auto-merging drivers/net/wireless/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/fw.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/d3.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-7000.c +Auto-merging drivers/net/wireless/ath/ath9k/main.c +Auto-merging drivers/net/wireless/ath/ath9k/init.c +Auto-merging drivers/net/wireless/ath/ath10k/mac.c +Auto-merging drivers/net/wireless/ath/ath10k/hw.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/bcma/main.c | 9 +- + drivers/net/wireless/airo.c | 64 ++-- + drivers/net/wireless/ath/ath10k/core.c | 23 ++ + drivers/net/wireless/ath/ath10k/core.h | 5 + + drivers/net/wireless/ath/ath10k/htt.h | 3 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 47 ++- + drivers/net/wireless/ath/ath10k/htt_tx.c | 55 +++- + drivers/net/wireless/ath/ath10k/hw.h | 10 - + drivers/net/wireless/ath/ath10k/mac.c | 333 +++++++++++++++------ + drivers/net/wireless/ath/ath10k/pci.c | 18 +- + drivers/net/wireless/ath/ath10k/txrx.c | 14 +- + drivers/net/wireless/ath/ath10k/wmi.c | 76 ++++- + drivers/net/wireless/ath/ath10k/wmi.h | 1 + + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 6 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 1 + + drivers/net/wireless/ath/ath9k/debug.c | 4 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 106 +++++-- + drivers/net/wireless/ath/ath9k/hif_usb.h | 21 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 7 +- + drivers/net/wireless/ath/ath9k/hw.c | 1 + + drivers/net/wireless/ath/ath9k/init.c | 3 +- + drivers/net/wireless/ath/ath9k/main.c | 8 +- + drivers/net/wireless/ath/ath9k/recv.c | 2 +- + drivers/net/wireless/ath/carl9170/rx.c | 2 +- + drivers/net/wireless/ath/dfs_pattern_detector.c | 8 +- + drivers/net/wireless/ath/dfs_pattern_detector.h | 5 + + drivers/net/wireless/ath/dfs_pri_detector.c | 6 +- + drivers/net/wireless/brcm80211/brcmfmac/bcdc.c | 28 +- + drivers/net/wireless/brcm80211/brcmfmac/btcoex.c | 4 +- + drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 193 ++++-------- + drivers/net/wireless/brcm80211/brcmfmac/cfg80211.h | 3 +- + drivers/net/wireless/brcm80211/brcmfmac/chip.c | 129 +++++++- + drivers/net/wireless/brcm80211/brcmfmac/chip.h | 1 + + drivers/net/wireless/brcm80211/brcmfmac/core.c | 116 ++++--- + drivers/net/wireless/brcm80211/brcmfmac/core.h | 10 +- + drivers/net/wireless/brcm80211/brcmfmac/debug.h | 3 + + drivers/net/wireless/brcm80211/brcmfmac/feature.c | 15 +- + drivers/net/wireless/brcm80211/brcmfmac/flowring.c | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/flowring.h | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 39 ++- + drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 3 + + drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 57 ++-- + drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h | 3 +- + drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 18 +- + drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 92 +++--- + drivers/net/wireless/brcm80211/brcmfmac/p2p.h | 5 +- + drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 104 +++++-- + drivers/net/wireless/brcm80211/brcmfmac/proto.h | 18 +- + drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 6 +- + .../net/wireless/brcm80211/include/brcm_hw_ids.h | 11 + + drivers/net/wireless/iwlwifi/Kconfig | 1 + + drivers/net/wireless/iwlwifi/iwl-7000.c | 13 +- + drivers/net/wireless/iwlwifi/iwl-8000.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-config.h | 12 +- + drivers/net/wireless/iwlwifi/iwl-drv.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-fw-file.h | 32 +- + drivers/net/wireless/iwlwifi/iwl-fw.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-io.c | 23 ++ + drivers/net/wireless/iwlwifi/iwl-io.h | 21 +- + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 15 +- + drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-op-mode.h | 19 +- + drivers/net/wireless/iwlwifi/iwl-trans.c | 1 + + drivers/net/wireless/iwlwifi/iwl-trans.h | 5 + + drivers/net/wireless/iwlwifi/mvm/constants.h | 1 + + drivers/net/wireless/iwlwifi/mvm/d3.c | 3 + + drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 75 ++--- + drivers/net/wireless/iwlwifi/mvm/debugfs.c | 132 ++------ + drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 8 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-rx.h | 238 +++++++++++++++ + drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h | 41 +-- + drivers/net/wireless/iwlwifi/mvm/fw-api.h | 196 +----------- + drivers/net/wireless/iwlwifi/mvm/fw.c | 24 +- + drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 36 ++- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 26 +- + drivers/net/wireless/iwlwifi/mvm/mvm.h | 68 +++-- + drivers/net/wireless/iwlwifi/mvm/nvm.c | 7 +- + drivers/net/wireless/iwlwifi/mvm/ops.c | 178 +++++++---- + drivers/net/wireless/iwlwifi/mvm/power.c | 80 +++-- + drivers/net/wireless/iwlwifi/mvm/rs.c | 116 ++++++- + drivers/net/wireless/iwlwifi/mvm/rx.c | 67 ++--- + drivers/net/wireless/iwlwifi/mvm/scan.c | 2 - + drivers/net/wireless/iwlwifi/mvm/sta.c | 83 +++-- + drivers/net/wireless/iwlwifi/mvm/tof.c | 4 +- + drivers/net/wireless/iwlwifi/mvm/tof.h | 2 +- + drivers/net/wireless/iwlwifi/mvm/tt.c | 14 +- + drivers/net/wireless/iwlwifi/mvm/tx.c | 11 +- + drivers/net/wireless/iwlwifi/mvm/utils.c | 141 +++++++-- + drivers/net/wireless/mwifiex/11n_aggr.c | 8 +- + drivers/net/wireless/mwifiex/cfg80211.c | 12 +- + drivers/net/wireless/mwifiex/debugfs.c | 14 +- + drivers/net/wireless/mwifiex/fw.h | 18 ++ + drivers/net/wireless/mwifiex/init.c | 1 + + drivers/net/wireless/mwifiex/main.c | 80 ++++- + drivers/net/wireless/mwifiex/main.h | 25 +- + drivers/net/wireless/mwifiex/pcie.c | 1 - + drivers/net/wireless/mwifiex/scan.c | 22 +- + drivers/net/wireless/mwifiex/sdio.c | 29 +- + drivers/net/wireless/mwifiex/sta_cmd.c | 3 +- + drivers/net/wireless/mwifiex/sta_cmdresp.c | 11 + + drivers/net/wireless/mwifiex/sta_event.c | 78 ++++- + drivers/net/wireless/mwifiex/sta_tx.c | 7 +- + drivers/net/wireless/mwifiex/tdls.c | 12 + + drivers/net/wireless/mwifiex/txrx.c | 19 +- + drivers/net/wireless/mwifiex/uap_event.c | 4 +- + drivers/net/wireless/mwifiex/uap_txrx.c | 10 +- + drivers/net/wireless/mwifiex/usb.c | 224 +++++++++++--- + drivers/net/wireless/mwifiex/usb.h | 15 +- + drivers/net/wireless/mwifiex/wmm.c | 52 +++- + drivers/net/wireless/ti/wl18xx/main.c | 1 + + drivers/net/wireless/ti/wlcore/wlcore.h | 2 +- + drivers/ssb/main.c | 1 - + drivers/ssb/pcmcia.c | 3 +- + drivers/ssb/sdio.c | 2 +- + drivers/ssb/ssb_private.h | 18 -- + include/linux/bcma/bcma.h | 2 + + 117 files changed, 2677 insertions(+), 1410 deletions(-) + create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api-rx.h +Merging bluetooth/master (9bc63ca0904d Bluetooth: btbcm: Read the local name in setup stage) +$ git merge bluetooth/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/net/ieee802154/mrf24j40.txt | 20 + + MAINTAINERS | 1 + + drivers/bluetooth/Kconfig | 5 +- + drivers/bluetooth/bfusb.c | 11 - + drivers/bluetooth/bluecard_cs.c | 8 +- + drivers/bluetooth/bpa10x.c | 11 - + drivers/bluetooth/bt3c_cs.c | 8 +- + drivers/bluetooth/btbcm.c | 54 +- + drivers/bluetooth/btintel.c | 196 +++ + drivers/bluetooth/btintel.h | 9 + + drivers/bluetooth/btmrvl_main.c | 14 +- + drivers/bluetooth/btmrvl_sdio.c | 54 +- + drivers/bluetooth/btsdio.c | 14 +- + drivers/bluetooth/btuart_cs.c | 10 +- + drivers/bluetooth/btusb.c | 13 - + drivers/bluetooth/btwilink.c | 13 - + drivers/bluetooth/dtl1_cs.c | 5 - + drivers/bluetooth/hci_bcm.c | 198 ++- + drivers/bluetooth/hci_h5.c | 10 +- + drivers/bluetooth/hci_intel.c | 24 - + drivers/bluetooth/hci_ldisc.c | 17 +- + drivers/bluetooth/hci_qca.c | 4 +- + drivers/bluetooth/hci_uart.h | 1 - + drivers/bluetooth/hci_vhci.c | 8 - + drivers/net/ieee802154/Kconfig | 1 + + drivers/net/ieee802154/at86rf230.c | 211 ++- + drivers/net/ieee802154/mrf24j40.c | 1424 ++++++++++++++------ + include/linux/ieee802154.h | 22 +- + include/net/6lowpan.h | 8 + + include/net/bluetooth/bluetooth.h | 5 + + include/net/bluetooth/hci.h | 2 + + include/net/bluetooth/hci_core.h | 3 + + include/net/bluetooth/hci_mon.h | 2 + + include/net/cfg802154.h | 164 +++ + include/net/ieee802154_netdev.h | 86 +- + include/net/mac802154.h | 10 +- + include/net/netlink.h | 18 + + include/net/nl802154.h | 191 +++ + net/6lowpan/nhc.h | 2 - + net/bluetooth/hci_core.c | 33 + + net/bluetooth/hci_sock.c | 42 +- + net/bluetooth/lib.c | 16 + + net/ieee802154/6lowpan/core.c | 14 +- + net/ieee802154/6lowpan/rx.c | 2 + + net/ieee802154/6lowpan/tx.c | 49 +- + net/ieee802154/Kconfig | 5 + + net/ieee802154/core.c | 12 + + net/ieee802154/core.h | 1 + + net/ieee802154/header_ops.c | 20 +- + net/ieee802154/nl802154.c | 1321 ++++++++++++++++-- + net/ieee802154/rdev-ops.h | 109 ++ + net/ieee802154/socket.c | 8 +- + net/mac802154/cfg.c | 205 +++ + net/mac802154/iface.c | 118 +- + net/mac802154/llsec.c | 1 + + net/mac802154/rx.c | 4 + + net/mac802154/tx.c | 7 +- + 57 files changed, 3808 insertions(+), 1016 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt +Merging rdma/for-next (070b39972320 IB/mlx4: Report checksum offload cap for RAW QP when query device) +$ git merge rdma/for-next +error: cannot run gpg2: No such file or directory +error: could not run gpg. +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/mlx4/main.c | 2 ++ + include/rdma/ib_verbs.h | 3 ++- + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging mtd/master (e5a5d92d9dc3 mxc_nand: fix copy_spare) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (eb042ec35956 jffs2: fix a memleak in read_direntry()) +$ git merge l2-mtd/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/vf610-nfc.txt | 59 ++ + MAINTAINERS | 6 + + arch/sh/boards/mach-rsk/setup.c | 3 - + drivers/mtd/cmdlinepart.c | 28 +- + drivers/mtd/devices/m25p80.c | 15 +- + drivers/mtd/maps/pcmciamtd.c | 1 + + drivers/mtd/mtd_blkdevs.c | 2 +- + drivers/mtd/mtdchar.c | 42 +- + drivers/mtd/mtdcore.c | 1 + + drivers/mtd/mtdpart.c | 4 +- + drivers/mtd/nand/Kconfig | 11 + + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/brcmnand/bcm63138_nand.c | 18 +- + drivers/mtd/nand/brcmnand/brcmnand.c | 5 +- + drivers/mtd/nand/brcmnand/brcmnand.h | 2 - + drivers/mtd/nand/brcmnand/iproc_nand.c | 22 +- + drivers/mtd/nand/denali.c | 13 +- + drivers/mtd/nand/denali.h | 2 + + drivers/mtd/nand/fsl_elbc_nand.c | 1 + + drivers/mtd/nand/fsl_ifc_nand.c | 1 + + drivers/mtd/nand/fsmc_nand.c | 10 +- + drivers/mtd/nand/lpc32xx_slc.c | 27 +- + drivers/mtd/nand/mpc5121_nfc.c | 1 + + drivers/mtd/nand/mxc_nand.c | 1 + + drivers/mtd/nand/nand_base.c | 137 +++- + drivers/mtd/nand/nandsim.c | 3 +- + drivers/mtd/nand/orion_nand.c | 1 + + drivers/mtd/nand/pxa3xx_nand.c | 272 ++++--- + drivers/mtd/nand/sunxi_nand.c | 536 +++++++------ + drivers/mtd/nand/vf610_nfc.c | 886 +++++++++++++++++++++ + drivers/mtd/spi-nor/fsl-quadspi.c | 23 +- + drivers/mtd/spi-nor/nxp-spifi.c | 11 +- + drivers/mtd/spi-nor/spi-nor.c | 74 +- + fs/jffs2/dir.c | 3 - + fs/jffs2/malloc.c | 27 +- + fs/jffs2/readinode.c | 6 +- + fs/jffs2/wbuf.c | 1 - + include/linux/blkpg.h | 21 + + include/linux/mtd/nand.h | 15 +- + include/linux/mtd/spi-nor.h | 44 +- + include/linux/platform_data/mtd-nand-pxa3xx.h | 27 - + include/uapi/linux/blkpg.h | 6 +- + 42 files changed, 1760 insertions(+), 609 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/vf610-nfc.txt + create mode 100644 drivers/mtd/nand/vf610_nfc.c + create mode 100644 include/linux/blkpg.h +Merging crypto/master (9196d9676fe7 crypto: qat - remove unneeded variable) +$ git merge crypto/master +Auto-merging arch/arm/boot/dts/stih407-family.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/rng/st,rng.txt | 15 + + Documentation/hw_random.txt | 8 +- + MAINTAINERS | 1 + + arch/arm/boot/dts/stih407-family.dtsi | 14 + + arch/x86/Makefile | 6 +- + arch/x86/crypto/Makefile | 8 + + arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 2 +- + arch/x86/crypto/sha1_ni_asm.S | 302 +++++++++++++++++++ + arch/x86/crypto/sha1_ssse3_glue.c | 314 ++++++++++++++++---- + arch/x86/crypto/sha256_ni_asm.S | 353 +++++++++++++++++++++++ + arch/x86/crypto/sha256_ssse3_glue.c | 329 ++++++++++++++++++--- + arch/x86/crypto/sha512_ssse3_glue.c | 249 +++++++++++++--- + crypto/Kconfig | 10 +- + crypto/asymmetric_keys/x509_cert_parser.c | 6 +- + crypto/skcipher.c | 4 +- + crypto/tcrypt.c | 17 +- + crypto/testmgr.c | 16 - + drivers/char/hw_random/Kconfig | 12 +- + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/core.c | 2 +- + drivers/char/hw_random/mxc-rnga.c | 14 +- + drivers/char/hw_random/octeon-rng.c | 12 +- + drivers/char/hw_random/pasemi-rng.c | 1 + + drivers/char/hw_random/ppc4xx-rng.c | 1 + + drivers/char/hw_random/st-rng.c | 144 +++++++++ + drivers/crypto/Kconfig | 2 +- + drivers/crypto/amcc/crypto4xx_core.c | 23 +- + drivers/crypto/bfin_crc.c | 25 +- + drivers/crypto/caam/caamalg.c | 94 +++--- + drivers/crypto/caam/caamhash.c | 55 ++-- + drivers/crypto/caam/desc.h | 1 - + drivers/crypto/caam/sg_sw_sec4.h | 72 +---- + drivers/crypto/picoxcell_crypto.c | 1 + + drivers/crypto/qat/qat_common/adf_common_drv.h | 4 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 6 - + drivers/crypto/qat/qat_common/adf_init.c | 8 +- + drivers/crypto/qat/qat_common/adf_sriov.c | 7 +- + drivers/crypto/qat/qat_common/qat_algs.c | 178 ++++++++---- + drivers/crypto/qat/qat_common/qat_crypto.c | 61 ++-- + drivers/crypto/qat/qat_common/qat_hal.c | 5 +- + drivers/crypto/sahara.c | 96 +----- + drivers/crypto/talitos.c | 104 ++----- + drivers/crypto/ux500/cryp/cryp_core.c | 1 + + drivers/crypto/ux500/hash/hash_core.c | 1 + + 44 files changed, 1893 insertions(+), 692 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rng/st,rng.txt + create mode 100644 arch/x86/crypto/sha1_ni_asm.S + create mode 100644 arch/x86/crypto/sha256_ni_asm.S + create mode 100644 drivers/char/hw_random/st-rng.c +Merging drm/drm-next (d4070ff71363 Merge tag 'drm-intel-next-2015-09-11' of git://anongit.freedesktop.org/drm-intel into drm-next) +$ git merge drm/drm-next +Auto-merging include/drm/drm_dp_helper.h +Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.h +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_drv.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/drm.tmpl | 16 +- + Documentation/kernel-parameters.txt | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 3 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 4 +- + drivers/gpu/drm/drm_atomic.c | 28 +- + drivers/gpu/drm/drm_atomic_helper.c | 316 +++++--- + drivers/gpu/drm/drm_crtc.c | 34 +- + drivers/gpu/drm/drm_dp_helper.c | 44 +- + drivers/gpu/drm/drm_drv.c | 8 +- + drivers/gpu/drm/drm_edid.c | 8 +- + drivers/gpu/drm/drm_edid_load.c | 43 +- + drivers/gpu/drm/drm_fb_helper.c | 191 ++++- + drivers/gpu/drm/drm_internal.h | 2 +- + drivers/gpu/drm/drm_irq.c | 331 +++++---- + drivers/gpu/drm/drm_mm.c | 6 +- + drivers/gpu/drm/drm_modeset_lock.c | 2 + + drivers/gpu/drm/drm_plane_helper.c | 6 +- + drivers/gpu/drm/drm_sysfs.c | 49 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 - + drivers/gpu/drm/gma500/cdv_intel_dp.c | 1 - + drivers/gpu/drm/i2c/ch7006_drv.c | 6 +- + drivers/gpu/drm/i2c/ch7006_mode.c | 26 +- + drivers/gpu/drm/i2c/ch7006_priv.h | 12 +- + drivers/gpu/drm/i915/Makefile | 4 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 13 +- + drivers/gpu/drm/i915/i915_debugfs.c | 196 ++++- + drivers/gpu/drm/i915/i915_dma.c | 35 +- + drivers/gpu/drm/i915/i915_drv.c | 31 +- + drivers/gpu/drm/i915/i915_drv.h | 52 +- + drivers/gpu/drm/i915/i915_gem.c | 61 +- + drivers/gpu/drm/i915/i915_gem_context.c | 7 + + drivers/gpu/drm/i915/i915_gem_fence.c | 4 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 738 ++++++++++++++++--- + drivers/gpu/drm/i915/i915_gem_gtt.h | 66 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 4 - + drivers/gpu/drm/i915/i915_gpu_error.c | 41 +- + drivers/gpu/drm/i915/i915_guc_reg.h | 17 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 916 ++++++++++++++++++++++++ + drivers/gpu/drm/i915/i915_irq.c | 524 +++++++++----- + drivers/gpu/drm/i915/i915_params.c | 5 + + drivers/gpu/drm/i915/i915_reg.h | 152 ++-- + drivers/gpu/drm/i915/i915_trace.h | 32 +- + drivers/gpu/drm/i915/i915_vgpu.h | 34 +- + drivers/gpu/drm/i915/intel_atomic.c | 13 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 6 +- + drivers/gpu/drm/i915/intel_audio.c | 2 +- + drivers/gpu/drm/i915/intel_bios.c | 18 - + drivers/gpu/drm/i915/intel_bios.h | 1 - + drivers/gpu/drm/i915/intel_ddi.c | 39 +- + drivers/gpu/drm/i915/intel_display.c | 318 ++++---- + drivers/gpu/drm/i915/intel_dp.c | 761 +++++++++++++------- + drivers/gpu/drm/i915/intel_dp_mst.c | 21 +- + drivers/gpu/drm/i915/intel_drv.h | 64 +- + drivers/gpu/drm/i915/intel_dsi.c | 3 + + drivers/gpu/drm/i915/intel_dvo.c | 7 + + drivers/gpu/drm/i915/intel_fbdev.c | 4 +- + drivers/gpu/drm/i915/intel_guc.h | 122 ++++ + drivers/gpu/drm/i915/intel_guc_fwif.h | 20 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 606 ++++++++++++++++ + drivers/gpu/drm/i915/intel_hdmi.c | 207 ++++-- + drivers/gpu/drm/i915/intel_lrc.c | 247 ++++--- + drivers/gpu/drm/i915/intel_lrc.h | 8 + + drivers/gpu/drm/i915/intel_lvds.c | 17 +- + drivers/gpu/drm/i915/intel_panel.c | 234 +++++- + drivers/gpu/drm/i915/intel_pm.c | 27 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 89 ++- + drivers/gpu/drm/i915/intel_ringbuffer.h | 15 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 379 ++++++++-- + drivers/gpu/drm/i915/intel_sdvo.c | 6 +- + drivers/gpu/drm/i915/intel_sprite.c | 22 +- + drivers/gpu/drm/i915/intel_tv.c | 6 +- + drivers/gpu/drm/i915/intel_uncore.c | 10 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 10 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 10 +- + drivers/gpu/drm/msm/msm_atomic.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv17.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 3 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 4 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 10 +- + drivers/gpu/drm/radeon/atombios_dp.c | 1 + + drivers/gpu/drm/radeon/radeon_display.c | 14 +- + drivers/gpu/drm/radeon/radeon_drv.c | 5 +- + drivers/gpu/drm/radeon/radeon_kms.c | 2 +- + drivers/gpu/drm/radeon/radeon_mode.h | 5 +- + drivers/gpu/drm/radeon/radeon_pm.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 2 +- + drivers/gpu/drm/sti/sti_drv.c | 2 +- + drivers/gpu/drm/tegra/dc.c | 2 - + drivers/gpu/drm/tegra/dpaux.c | 3 +- + drivers/gpu/drm/tegra/drm.c | 2 +- + drivers/gpu/vga/vga_switcheroo.c | 304 +++++++- + include/drm/drmP.h | 11 +- + include/drm/drm_atomic_helper.h | 12 +- + include/drm/drm_crtc.h | 11 +- + include/drm/drm_dp_helper.h | 9 +- + include/drm/drm_edid.h | 5 +- + include/drm/drm_fb_helper.h | 31 +- + include/drm/drm_modeset_lock.h | 10 +- + include/drm/drm_plane_helper.h | 2 - + include/linux/fb.h | 2 +- + include/linux/vga_switcheroo.h | 89 ++- + include/uapi/drm/drm_mode.h | 42 +- + sound/pci/hda/hda_intel.c | 3 +- + 108 files changed, 6191 insertions(+), 1805 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_guc_submission.c + create mode 100644 drivers/gpu/drm/i915/intel_guc.h + create mode 100644 drivers/gpu/drm/i915/intel_guc_loader.c +$ git am -3 ../patches/0001-drm-fb-helper-merge-fix-for-Use-errno-return-in-rest.patch +Applying: drm/fb-helper: merge fix for "Use -errno return in restore_mode_unlocked" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/drm_fb_helper.c +$ git add -A . +$ git commit -v -a --amend +[master f911acc5b92a] Merge remote-tracking branch 'drm/drm-next' + Date: Thu Oct 8 11:38:59 2015 +1100 +Merging drm-panel/drm/panel/for-next (a33ee95f8f45 drm/bridge: Put Kconfig entries in a separate menu) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (4f91fc6d2c1d drm/i915: Hook up ring workaround writes at context creation time on Gen6-7.) +$ git merge drm-intel/for-linux-next +Resolved 'drivers/gpu/drm/i915/intel_lrc.c' using previous resolution. +Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.h +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/intel_hotplug.c +Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e4353b271d4c] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/drm.tmpl | 1 + + drivers/gpu/drm/i915/dvo.h | 4 +- + drivers/gpu/drm/i915/dvo_ch7017.c | 4 +- + drivers/gpu/drm/i915/dvo_ch7xxx.c | 4 +- + drivers/gpu/drm/i915/dvo_ivch.c | 12 +- + drivers/gpu/drm/i915/dvo_ns2501.c | 4 +- + drivers/gpu/drm/i915/dvo_sil164.c | 4 +- + drivers/gpu/drm/i915/dvo_tfp410.c | 4 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 6 +- + drivers/gpu/drm/i915/i915_debugfs.c | 69 +- + drivers/gpu/drm/i915/i915_dma.c | 113 +++- + drivers/gpu/drm/i915/i915_drv.c | 52 +- + drivers/gpu/drm/i915/i915_drv.h | 109 ++-- + drivers/gpu/drm/i915/i915_gem.c | 138 ++-- + drivers/gpu/drm/i915/i915_gem_context.c | 24 + + drivers/gpu/drm/i915/i915_gem_evict.c | 45 -- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 167 ++--- + drivers/gpu/drm/i915/i915_gem_fence.c | 41 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 94 ++- + drivers/gpu/drm/i915/i915_gem_gtt.h | 19 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 21 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 89 ++- + drivers/gpu/drm/i915/i915_gem_userptr.c | 329 +++++----- + drivers/gpu/drm/i915/i915_gpu_error.c | 49 +- + drivers/gpu/drm/i915/i915_guc_reg.h | 4 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 63 +- + drivers/gpu/drm/i915/i915_irq.c | 73 ++- + drivers/gpu/drm/i915/i915_params.c | 33 +- + drivers/gpu/drm/i915/i915_reg.h | 269 ++++++-- + drivers/gpu/drm/i915/i915_sysfs.c | 34 +- + drivers/gpu/drm/i915/i915_trace.h | 46 +- + drivers/gpu/drm/i915/intel_acpi.c | 2 +- + drivers/gpu/drm/i915/intel_atomic.c | 3 + + drivers/gpu/drm/i915/intel_audio.c | 208 +++++- + drivers/gpu/drm/i915/intel_bios.h | 2 - + drivers/gpu/drm/i915/intel_crt.c | 15 +- + drivers/gpu/drm/i915/intel_csr.c | 41 +- + drivers/gpu/drm/i915/intel_ddi.c | 143 +++-- + drivers/gpu/drm/i915/intel_display.c | 613 +++++++++++------- + drivers/gpu/drm/i915/intel_dp.c | 52 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 5 +- + drivers/gpu/drm/i915/intel_drv.h | 97 ++- + drivers/gpu/drm/i915/intel_dsi.c | 320 +++++++--- + drivers/gpu/drm/i915/intel_dsi.h | 7 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 243 ++++++- + drivers/gpu/drm/i915/intel_dvo.c | 59 +- + drivers/gpu/drm/i915/intel_fbc.c | 201 ++++-- + drivers/gpu/drm/i915/intel_fbdev.c | 9 +- + drivers/gpu/drm/i915/intel_guc.h | 2 + + drivers/gpu/drm/i915/intel_guc_fwif.h | 11 + + drivers/gpu/drm/i915/intel_guc_loader.c | 28 +- + drivers/gpu/drm/i915/intel_hdmi.c | 109 ++-- + drivers/gpu/drm/i915/intel_hotplug.c | 11 + + drivers/gpu/drm/i915/intel_lrc.c | 222 +++---- + drivers/gpu/drm/i915/intel_lrc.h | 10 +- + drivers/gpu/drm/i915/intel_lvds.c | 3 +- + drivers/gpu/drm/i915/intel_modes.c | 9 + + drivers/gpu/drm/i915/intel_opregion.c | 9 +- + drivers/gpu/drm/i915/intel_panel.c | 303 +++++---- + drivers/gpu/drm/i915/intel_pm.c | 992 +++++++++++++---------------- + drivers/gpu/drm/i915/intel_ringbuffer.c | 129 ++-- + drivers/gpu/drm/i915/intel_runtime_pm.c | 97 ++- + drivers/gpu/drm/i915/intel_sdvo.c | 46 +- + drivers/gpu/drm/i915/intel_sprite.c | 67 +- + drivers/gpu/drm/i915/intel_tv.c | 8 +- + drivers/gpu/drm/i915/intel_uncore.c | 12 +- + include/drm/i915_component.h | 64 +- + include/uapi/drm/i915_drm.h | 3 +- + sound/pci/hda/patch_hdmi.c | 19 + + 69 files changed, 3782 insertions(+), 2316 deletions(-) +Merging drm-tegra/drm/tegra/for-next (3fe2c7d4c85b gpu: host1x: Fix MLOCK's debug info) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/host1x/hw/debug_hw.c | 2 +- + drivers/gpu/host1x/hw/hw_host1x01_sync.h | 8 ++++---- + drivers/gpu/host1x/hw/hw_host1x02_sync.h | 8 ++++---- + drivers/gpu/host1x/hw/hw_host1x04_sync.h | 8 ++++---- + 4 files changed, 13 insertions(+), 13 deletions(-) +Merging drm-misc/topic/drm-misc (b44f84081b8d drm: Stop using drm_vblank_count() as the hw frame counter) +$ git merge drm-misc/topic/drm-misc +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_gem_fence.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_dma.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_drv.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_crtc.c +Auto-merging Documentation/DocBook/drm.tmpl +Merge made by the 'recursive' strategy. + Documentation/DocBook/drm.tmpl | 100 +++++------------------- + drivers/gpu/drm/Makefile | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 9 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 36 ++++----- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 9 +-- + drivers/gpu/drm/armada/armada_drv.c | 10 +-- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 8 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 2 +- + drivers/gpu/drm/drm_agpsupport.c | 4 - + drivers/gpu/drm/drm_bufs.c | 6 +- + drivers/gpu/drm/drm_crtc.c | 3 +- + drivers/gpu/drm/drm_drv.c | 55 ++++++++++++- + drivers/gpu/drm/drm_ioc32.c | 6 +- + drivers/gpu/drm/drm_ioctl.c | 83 ++++++++++++++------ + drivers/gpu/drm/drm_irq.c | 26 +++++- + drivers/gpu/drm/drm_memory.c | 6 +- + drivers/gpu/drm/drm_pci.c | 11 +++ + drivers/gpu/drm/drm_platform.c | 3 + + drivers/gpu/drm/drm_rect.c | 4 +- + drivers/gpu/drm/drm_vm.c | 8 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.h | 4 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 7 +- + drivers/gpu/drm/gma500/psb_drv.h | 6 +- + drivers/gpu/drm/gma500/psb_irq.c | 8 +- + drivers/gpu/drm/gma500/psb_irq.h | 6 +- + drivers/gpu/drm/i915/i915_debugfs.c | 1 - + drivers/gpu/drm/i915/i915_dma.c | 33 +------- + drivers/gpu/drm/i915/i915_drv.h | 1 - + drivers/gpu/drm/i915/i915_gem_fence.c | 2 +- + drivers/gpu/drm/i915/i915_irq.c | 34 ++++---- + drivers/gpu/drm/imx/imx-drm-core.c | 10 +-- + drivers/gpu/drm/mga/mga_dma.c | 4 +- + drivers/gpu/drm/mga/mga_drv.h | 6 +- + drivers/gpu/drm/mga/mga_irq.c | 20 ++--- + drivers/gpu/drm/msm/msm_drv.c | 14 ++-- + drivers/gpu/drm/nouveau/nouveau_bo.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 23 +++--- + drivers/gpu/drm/nouveau/nouveau_display.h | 12 +-- + drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 4 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 4 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 16 ++-- + drivers/gpu/drm/omapdrm/omap_plane.c | 2 +- + drivers/gpu/drm/qxl/qxl_drv.c | 7 +- + drivers/gpu/drm/r128/r128_cce.c | 12 +-- + drivers/gpu/drm/r128/r128_drv.h | 6 +- + drivers/gpu/drm/r128/r128_irq.c | 16 ++-- + drivers/gpu/drm/radeon/r600_cp.c | 14 ++-- + drivers/gpu/drm/radeon/radeon_agp.c | 8 +- + drivers/gpu/drm/radeon/radeon_cp.c | 16 ++-- + drivers/gpu/drm/radeon/radeon_display.c | 25 +++--- + drivers/gpu/drm/radeon/radeon_drv.c | 13 ++- + drivers/gpu/drm/radeon/radeon_drv.h | 6 +- + drivers/gpu/drm/radeon/radeon_irq.c | 38 ++++----- + drivers/gpu/drm/radeon/radeon_kms.c | 94 +++++++--------------- + drivers/gpu/drm/radeon/radeon_mode.h | 5 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 10 +-- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 10 +-- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 8 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 6 +- + drivers/gpu/drm/sti/sti_crtc.c | 16 ++-- + drivers/gpu/drm/sti/sti_crtc.h | 4 +- + drivers/gpu/drm/sti/sti_drv.c | 2 +- + drivers/gpu/drm/tegra/drm.c | 7 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 6 +- + drivers/gpu/drm/via/via_drv.h | 6 +- + drivers/gpu/drm/via/via_irq.c | 17 ++-- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 -- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 6 +- + drivers/gpu/vga/vga_switcheroo.c | 50 +++++++----- + drivers/gpu/vga/vgaarb.c | 4 +- + include/drm/drmP.h | 28 ++++--- + include/drm/drm_agpsupport.h | 57 +------------- + include/drm/drm_crtc.h | 2 + + 79 files changed, 550 insertions(+), 600 deletions(-) +Merging drm-exynos/exynos-drm/for-next (7d9071a09502 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (d248b61f6114 drm/msm/dsi: Introduce DSI configuration module) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging sound/for-next (a04267fd87b6 ALSA: hdac: Fix to check if stream not in use in release) +$ git merge sound/for-next +Auto-merging sound/soc/codecs/tlv320aic3x.c +Auto-merging sound/soc/codecs/rt5645.h +Auto-merging sound/soc/codecs/rt5645.c +Removing sound/soc/codecs/hdmi.c +Auto-merging sound/soc/au1x/db1200.c +Auto-merging sound/firewire/amdtp-stream.h +Auto-merging sound/firewire/amdtp-stream.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/ak4613.txt | 17 + + Documentation/devicetree/bindings/sound/ak4642.txt | 22 +- + .../devicetree/bindings/sound/renesas,rsnd.txt | 7 + + .../devicetree/bindings/sound/sun4i-codec.txt | 33 + + .../devicetree/bindings/sound/tdm-slot.txt | 11 +- + drivers/spi/spi-atmel.c | 21 +- + include/sound/hda_regmap.h | 4 +- + include/sound/pcm.h | 6 - + include/sound/rcar_snd.h | 1 - + include/sound/rt5645.h | 2 + + include/sound/simple_card.h | 2 + + include/sound/soc.h | 14 + + include/uapi/sound/asound.h | 4 +- + include/uapi/sound/firewire.h | 9 + + sound/core/pcm.c | 3 - + sound/core/pcm_native.c | 6 +- + sound/firewire/Kconfig | 27 + + sound/firewire/Makefile | 4 +- + sound/firewire/amdtp-am824.c | 465 +++++++++++++ + sound/firewire/amdtp-am824.h | 52 ++ + sound/firewire/{amdtp.c => amdtp-stream.c} | 377 ++--------- + sound/firewire/{amdtp.h => amdtp-stream.h} | 116 ++-- + sound/firewire/bebob/bebob.c | 7 +- + sound/firewire/bebob/bebob.h | 2 +- + sound/firewire/bebob/bebob_midi.c | 16 +- + sound/firewire/bebob/bebob_pcm.c | 14 +- + sound/firewire/bebob/bebob_stream.c | 34 +- + sound/firewire/dice/dice-midi.c | 12 +- + sound/firewire/dice/dice-pcm.c | 12 +- + sound/firewire/dice/dice-stream.c | 22 +- + sound/firewire/dice/dice.h | 2 +- + sound/firewire/digi00x/Makefile | 4 + + sound/firewire/digi00x/amdtp-dot.c | 330 ++++++++++ + sound/firewire/digi00x/digi00x-hwdep.c | 200 ++++++ + sound/firewire/digi00x/digi00x-pcm.c | 373 +++++++++++ + sound/firewire/digi00x/digi00x-proc.c | 99 +++ + sound/firewire/digi00x/digi00x-stream.c | 420 ++++++++++++ + sound/firewire/digi00x/digi00x-transaction.c | 81 +++ + sound/firewire/digi00x/digi00x.c | 167 +++++ + sound/firewire/digi00x/digi00x.h | 146 +++++ + sound/firewire/fcp.c | 2 +- + sound/firewire/fireworks/fireworks.c | 12 +- + sound/firewire/fireworks/fireworks.h | 2 +- + sound/firewire/fireworks/fireworks_midi.c | 12 +- + sound/firewire/fireworks/fireworks_pcm.c | 12 +- + sound/firewire/fireworks/fireworks_stream.c | 8 +- + sound/firewire/oxfw/oxfw-midi.c | 16 +- + sound/firewire/oxfw/oxfw-pcm.c | 10 +- + sound/firewire/oxfw/oxfw-stream.c | 16 +- + sound/firewire/oxfw/oxfw.c | 29 + + sound/firewire/oxfw/oxfw.h | 3 +- + sound/firewire/tascam/Makefile | 3 + + sound/firewire/tascam/amdtp-tascam.c | 243 +++++++ + sound/firewire/tascam/tascam-hwdep.c | 201 ++++++ + sound/firewire/tascam/tascam-pcm.c | 312 +++++++++ + sound/firewire/tascam/tascam-proc.c | 88 +++ + sound/firewire/tascam/tascam-stream.c | 496 ++++++++++++++ + sound/firewire/tascam/tascam.c | 213 ++++++ + sound/firewire/tascam/tascam.h | 117 ++++ + sound/hda/ext/hdac_ext_stream.c | 9 +- + sound/pci/rme9652/hdsp.c | 1 + + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/atmel/atmel_wm8904.c | 1 + + sound/soc/au1x/db1000.c | 10 +- + sound/soc/au1x/db1200.c | 10 +- + sound/soc/blackfin/bf5xx-ad1836.c | 11 +- + sound/soc/blackfin/bfin-eval-adau1373.c | 12 +- + sound/soc/blackfin/bfin-eval-adau1701.c | 12 +- + sound/soc/blackfin/bfin-eval-adav80x.c | 12 +- + sound/soc/codecs/Kconfig | 9 +- + sound/soc/codecs/Makefile | 4 +- + sound/soc/codecs/ak4613.c | 497 ++++++++++++++ + sound/soc/codecs/ak4642.c | 153 +++-- + sound/soc/codecs/arizona.c | 16 + + sound/soc/codecs/arizona.h | 2 + + sound/soc/codecs/hdmi.c | 109 ---- + sound/soc/codecs/rt5645.c | 35 +- + sound/soc/codecs/rt5645.h | 6 +- + sound/soc/codecs/tlv320aic3x.c | 30 +- + sound/soc/codecs/wm5110.c | 187 +++++- + sound/soc/davinci/davinci-mcasp.c | 305 ++++++--- + sound/soc/fsl/fsl-asoc-card.c | 1 + + sound/soc/fsl/fsl_sai.c | 1 + + sound/soc/generic/simple-card.c | 8 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 17 - + sound/soc/intel/boards/broadwell.c | 9 +- + sound/soc/intel/skylake/skl-pcm.c | 33 - + sound/soc/jz4740/jz4740-i2s.c | 1 + + sound/soc/kirkwood/armada-370-db.c | 1 + + sound/soc/mediatek/mt8173-max98090.c | 11 +- + sound/soc/mediatek/mt8173-rt5650-rt5676.c | 11 +- + sound/soc/mxs/mxs-sgtl5000.c | 6 +- + sound/soc/pxa/brownstone.c | 9 +- + sound/soc/pxa/corgi.c | 11 +- + sound/soc/pxa/e740_wm9705.c | 5 +- + sound/soc/pxa/e750_wm9705.c | 5 +- + sound/soc/pxa/e800_wm9712.c | 5 +- + sound/soc/pxa/hx4700.c | 4 +- + sound/soc/pxa/imote2.c | 11 +- + sound/soc/pxa/mioa701_wm9713.c | 11 +- + sound/soc/pxa/palm27x.c | 9 +- + sound/soc/pxa/poodle.c | 11 +- + sound/soc/pxa/pxa-ssp.c | 1 + + sound/soc/pxa/pxa2xx-pcm.c | 1 + + sound/soc/pxa/spitz.c | 5 +- + sound/soc/pxa/tosa.c | 5 +- + sound/soc/pxa/ttc-dkb.c | 12 +- + sound/soc/qcom/lpass-cpu.c | 3 +- + sound/soc/rockchip/Kconfig | 4 +- + sound/soc/sh/Kconfig | 1 + + sound/soc/sh/rcar/adg.c | 303 +++++++-- + sound/soc/sh/rcar/core.c | 12 + + sound/soc/sh/rcar/ctu.c | 6 +- + sound/soc/sh/rcar/dvc.c | 6 +- + sound/soc/sh/rcar/mix.c | 6 +- + sound/soc/sh/rcar/rsnd.h | 15 +- + sound/soc/sh/rcar/src.c | 17 +- + sound/soc/sh/rcar/ssi.c | 98 +-- + sound/soc/sh/siu_dai.c | 85 +-- + sound/soc/soc-core.c | 25 + + sound/soc/soc-pcm.c | 49 ++ + sound/soc/sunxi/Kconfig | 11 + + sound/soc/sunxi/Makefile | 2 + + sound/soc/sunxi/sun4i-codec.c | 719 +++++++++++++++++++++ + sound/soc/ux500/mop500.c | 1 + + sound/soc/ux500/ux500_msp_dai.c | 1 + + sound/usb/mixer_quirks.c | 2 +- + 128 files changed, 6676 insertions(+), 1266 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/ak4613.txt + create mode 100644 Documentation/devicetree/bindings/sound/sun4i-codec.txt + create mode 100644 sound/firewire/amdtp-am824.c + create mode 100644 sound/firewire/amdtp-am824.h + rename sound/firewire/{amdtp.c => amdtp-stream.c} (70%) + rename sound/firewire/{amdtp.h => amdtp-stream.h} (78%) + create mode 100644 sound/firewire/digi00x/Makefile + create mode 100644 sound/firewire/digi00x/amdtp-dot.c + create mode 100644 sound/firewire/digi00x/digi00x-hwdep.c + create mode 100644 sound/firewire/digi00x/digi00x-pcm.c + create mode 100644 sound/firewire/digi00x/digi00x-proc.c + create mode 100644 sound/firewire/digi00x/digi00x-stream.c + create mode 100644 sound/firewire/digi00x/digi00x-transaction.c + create mode 100644 sound/firewire/digi00x/digi00x.c + create mode 100644 sound/firewire/digi00x/digi00x.h + create mode 100644 sound/firewire/tascam/Makefile + create mode 100644 sound/firewire/tascam/amdtp-tascam.c + create mode 100644 sound/firewire/tascam/tascam-hwdep.c + create mode 100644 sound/firewire/tascam/tascam-pcm.c + create mode 100644 sound/firewire/tascam/tascam-proc.c + create mode 100644 sound/firewire/tascam/tascam-stream.c + create mode 100644 sound/firewire/tascam/tascam.c + create mode 100644 sound/firewire/tascam/tascam.h + create mode 100644 sound/soc/codecs/ak4613.c + delete mode 100644 sound/soc/codecs/hdmi.c + create mode 100644 sound/soc/sunxi/Kconfig + create mode 100644 sound/soc/sunxi/Makefile + create mode 100644 sound/soc/sunxi/sun4i-codec.c +Merging sound-asoc/for-next (5c89b11f0711 Merge remote-tracking branch 'asoc/topic/topology' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/da7213.txt | 41 + + Documentation/devicetree/bindings/sound/da7219.txt | 106 ++ + .../devicetree/bindings/sound/nau8825.txt | 102 + + .../devicetree/bindings/sound/sun4i-codec.txt | 6 - + MAINTAINERS | 1 + + include/sound/da7213.h | 3 - + include/sound/da7219-aad.h | 99 + + include/sound/da7219.h | 55 + + include/sound/designware_i2s.h | 2 + + include/sound/pxa2xx-lib.h | 1 - + include/sound/soc.h | 7 + + include/uapi/sound/asoc.h | 76 +- + sound/arm/pxa2xx-ac97.c | 13 +- + sound/arm/pxa2xx-pcm-lib.c | 201 +- + sound/arm/pxa2xx-pcm.c | 12 +- + sound/arm/pxa2xx-pcm.h | 2 - + sound/soc/codecs/Kconfig | 14 + + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/ad193x-i2c.c | 8 +- + sound/soc/codecs/ad193x-spi.c | 15 +- + sound/soc/codecs/ad193x.c | 122 +- + sound/soc/codecs/ad193x.h | 9 +- + sound/soc/codecs/arizona.c | 33 + + sound/soc/codecs/arizona.h | 12 +- + sound/soc/codecs/da7213.c | 190 +- + sound/soc/codecs/da7213.h | 8 +- + sound/soc/codecs/da7219-aad.c | 823 ++++++++ + sound/soc/codecs/da7219-aad.h | 212 +++ + sound/soc/codecs/da7219.c | 1955 ++++++++++++++++++++ + sound/soc/codecs/da7219.h | 820 ++++++++ + sound/soc/codecs/nau8825.c | 1106 +++++++++++ + sound/soc/codecs/nau8825.h | 323 ++++ + sound/soc/codecs/rl6347a.c | 19 +- + sound/soc/codecs/rl6347a.h | 2 + + sound/soc/codecs/rt286.c | 9 +- + sound/soc/codecs/rt298.c | 9 +- + sound/soc/codecs/rt5645.c | 16 +- + sound/soc/codecs/rt5645.h | 4 + + sound/soc/codecs/wm8998.c | 1430 ++++++++++++++ + sound/soc/codecs/wm8998.h | 23 + + sound/soc/dwc/designware_i2s.c | 92 +- + sound/soc/fsl/fsl_esai.c | 88 + + sound/soc/fsl/fsl_sai.c | 33 + + sound/soc/fsl/fsl_spdif.c | 73 + + sound/soc/fsl/fsl_ssi.c | 102 + + sound/soc/fsl/imx-spdif.c | 1 + + sound/soc/intel/Kconfig | 1 + + sound/soc/intel/common/sst-firmware.c | 10 +- + sound/soc/intel/skylake/Makefile | 3 +- + sound/soc/intel/skylake/skl-pcm.c | 141 +- + sound/soc/intel/skylake/skl-topology.c | 1238 +++++++++++++ + sound/soc/intel/skylake/skl-topology.h | 28 + + sound/soc/intel/skylake/skl-tplg-interface.h | 80 + + sound/soc/intel/skylake/skl.c | 29 +- + sound/soc/intel/skylake/skl.h | 11 + + sound/soc/pxa/pxa2xx-ac97.c | 49 +- + sound/soc/pxa/pxa2xx-i2s.c | 3 + + sound/soc/pxa/pxa2xx-pcm.c | 32 - + sound/soc/rockchip/Makefile | 4 +- + sound/soc/sh/rcar/core.c | 19 +- + {include/sound => sound/soc/sh/rcar}/rcar_snd.h | 0 + sound/soc/sh/rcar/rsnd.h | 3 +- + sound/soc/sh/rcar/ssi.c | 3 - + sound/soc/soc-topology.c | 4 +- + sound/soc/sunxi/sun4i-codec.c | 17 +- + 65 files changed, 9494 insertions(+), 465 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/da7213.txt + create mode 100644 Documentation/devicetree/bindings/sound/da7219.txt + create mode 100644 Documentation/devicetree/bindings/sound/nau8825.txt + create mode 100644 include/sound/da7219-aad.h + create mode 100644 include/sound/da7219.h + create mode 100644 sound/soc/codecs/da7219-aad.c + create mode 100644 sound/soc/codecs/da7219-aad.h + create mode 100644 sound/soc/codecs/da7219.c + create mode 100644 sound/soc/codecs/da7219.h + create mode 100644 sound/soc/codecs/nau8825.c + create mode 100644 sound/soc/codecs/nau8825.h + create mode 100644 sound/soc/codecs/wm8998.c + create mode 100644 sound/soc/codecs/wm8998.h + create mode 100644 sound/soc/intel/skylake/skl-topology.c + rename {include/sound => sound/soc/sh/rcar}/rcar_snd.h (100%) +Merging modules/modules-next (5cfb203a304d modpost: abort if a module symbol is too long) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + scripts/mod/modpost.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) +Merging input/next (726d0d407b9a Input: ft6236 - do not explicitly set driver's owner) +$ git merge input/next +Removing include/linux/input/edt-ft5x06.h +Auto-merging drivers/input/touchscreen/ads7846.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/da9062-onkey.txt | 32 + + .../bindings/input/touchscreen/edt-ft5x06.txt | 6 +- + .../input/touchscreen/focaltech-ft6236.txt | 35 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/am437x-sk-evm.dts | 2 +- + arch/arm/boot/dts/imx28-tx28.dts | 3 +- + arch/arm/boot/dts/imx53-tx53-x03x.dts | 3 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 3 +- + drivers/input/ff-core.c | 4 +- + drivers/input/joydev.c | 22 +- + drivers/input/joystick/db9.c | 113 +- + drivers/input/joystick/gamecon.c | 103 +- + drivers/input/joystick/turbografx.c | 104 +- + drivers/input/joystick/walkera0701.c | 64 +- + drivers/input/keyboard/Kconfig | 2 +- + drivers/input/keyboard/gpio_keys.c | 8 +- + drivers/input/misc/Kconfig | 8 +- + drivers/input/misc/ad714x-i2c.c | 10 - + drivers/input/misc/ad714x-spi.c | 10 - + drivers/input/misc/ad714x.c | 214 ++-- + drivers/input/misc/ad714x.h | 1 - + drivers/input/misc/da9063_onkey.c | 129 ++- + drivers/input/misc/kxtj9.c | 3 +- + drivers/input/serio/parkbd.c | 55 +- + drivers/input/touchscreen/Kconfig | 24 + + drivers/input/touchscreen/Makefile | 2 + + drivers/input/touchscreen/ads7846.c | 4 +- + drivers/input/touchscreen/auo-pixcir-ts.c | 7 +- + drivers/input/touchscreen/cyttsp4_i2c.c | 5 +- + drivers/input/touchscreen/edt-ft5x06.c | 191 +-- + drivers/input/touchscreen/ft6236.c | 326 ++++++ + drivers/input/touchscreen/rohm_bu21023.c | 1218 ++++++++++++++++++++ + drivers/input/touchscreen/tps6507x-ts.c | 9 +- + drivers/input/touchscreen/zforce_ts.c | 7 +- + include/linux/input/edt-ft5x06.h | 24 - + 35 files changed, 2154 insertions(+), 598 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/da9062-onkey.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt + create mode 100644 drivers/input/touchscreen/ft6236.c + create mode 100644 drivers/input/touchscreen/rohm_bu21023.c + delete mode 100644 include/linux/input/edt-ft5x06.h +Merging block/for-next (f7e7868b4743 cdrom: Random writing support for BD-RE media) +$ git merge block/for-next +Resolved 'drivers/block/loop.c' using previous resolution. +Auto-merging drivers/block/loop.c +CONFLICT (content): Merge conflict in drivers/block/loop.c +Auto-merging block/blk-mq.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5d0a835f3a71] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + block/blk-mq.c | 11 ++ + drivers/block/loop.c | 277 ++++++++++++++++++++++++++++++++++++---------- + drivers/block/loop.h | 13 ++- + drivers/cdrom/cdrom.c | 1 + + fs/direct-io.c | 9 +- + fs/mpage.c | 23 ++-- + include/uapi/linux/loop.h | 2 + + 7 files changed, 263 insertions(+), 73 deletions(-) +$ git am -3 ../patches/0001-blk-mq-merge-fix-for-fix-racy-updates-of-rq-errors.patch +Applying: blk-mq: merge fix for "fix racy updates of rq->errors" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/block/loop.c +$ git add -A . +$ git commit -v -a --amend +[master 49a395c907d5] Merge remote-tracking branch 'block/for-next' + Date: Thu Oct 8 11:48:50 2015 +1100 +Merging device-mapper/for-next (30c2a1faaeb3 dm ioctl: use kvfree() in free_params()) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-bufio.c | 18 +++++++----------- + drivers/md/dm-cache-policy-cleaner.c | 2 +- + drivers/md/dm-cache-policy-mq.c | 2 +- + drivers/md/dm-cache-policy-smq.c | 2 +- + drivers/md/dm-cache-target.c | 3 +-- + drivers/md/dm-crypt.c | 6 ++---- + drivers/md/dm-exception-store.c | 2 +- + drivers/md/dm-io.c | 3 +-- + drivers/md/dm-ioctl.c | 11 +---------- + drivers/md/dm-log-userspace-base.c | 3 +-- + drivers/md/dm-raid.c | 3 +-- + drivers/md/dm-region-hash.c | 6 ++---- + drivers/md/dm-snap-persistent.c | 2 +- + drivers/md/dm.c | 24 +++++++++--------------- + 14 files changed, 30 insertions(+), 57 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/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) +$ git merge mmc/mmc-next +Already up-to-date. +Merging mmc-uh/next (097cfc1cff29 mmc: sirf: fix the capbility to support DDR50) +$ git merge mmc-uh/next +Merge made by the 'recursive' strategy. + drivers/mmc/card/block.c | 199 +++++++++++++++++++++++++++----------- + drivers/mmc/core/core.c | 23 +++++ + drivers/mmc/core/debugfs.c | 25 +++++ + drivers/mmc/core/mmc_ops.c | 1 - + drivers/mmc/core/mmc_ops.h | 3 + + drivers/mmc/core/pwrseq_emmc.c | 2 +- + drivers/mmc/core/pwrseq_simple.c | 45 +++------ + drivers/mmc/core/sd.c | 22 ++++- + drivers/mmc/core/sdio.c | 20 +++- + drivers/mmc/core/sdio_ops.h | 7 ++ + drivers/mmc/host/mmc_spi.c | 1 + + drivers/mmc/host/moxart-mmc.c | 1 + + drivers/mmc/host/mtk-sd.c | 2 +- + drivers/mmc/host/omap.c | 1 + + drivers/mmc/host/omap_hsmmc.c | 14 ++- + drivers/mmc/host/sdhci-acpi.c | 1 + + drivers/mmc/host/sdhci-bcm-kona.c | 2 +- + drivers/mmc/host/sdhci-of-at91.c | 1 - + drivers/mmc/host/sdhci-of-esdhc.c | 3 +- + drivers/mmc/host/sdhci-pltfm.c | 6 +- + drivers/mmc/host/sdhci-sirf.c | 3 +- + drivers/mmc/host/sdhci.c | 29 +++--- + drivers/mmc/host/sunxi-mmc.c | 8 ++ + drivers/mmc/host/vub300.c | 6 +- + drivers/mmc/host/wbsd.c | 2 +- + include/linux/mmc/core.h | 2 - + include/uapi/linux/mmc/ioctl.h | 19 +++- + 27 files changed, 315 insertions(+), 133 deletions(-) +Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (6f5ac9a5bc8a md-cluster: send BITMAP_NEEDS_SYNC when node is leaving cluster) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/bitmap.c | 14 ++++----- + drivers/md/bitmap.h | 4 ++- + drivers/md/md-cluster.c | 68 +++++++++++++++++++----------------------- + drivers/md/md-cluster.h | 4 +-- + drivers/md/md.c | 11 ++----- + drivers/md/raid1.c | 26 +++++++++++++++- + drivers/md/raid1.h | 7 +++++ + drivers/md/raid10.c | 2 +- + drivers/md/raid5.c | 2 +- + include/uapi/linux/raid/md_p.h | 2 ++ + 10 files changed, 79 insertions(+), 61 deletions(-) +Merging mfd/for-mfd-next (006d2c2a7105 mfd: atmel-flexcom: Add a driver for Atmel Flexible Serial Communication Unit) +$ git merge mfd/for-mfd-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/atmel-flexcom.txt | 63 +++ + Documentation/devicetree/bindings/mfd/cros-ec.txt | 4 + + MAINTAINERS | 1 - + drivers/extcon/extcon-arizona.c | 106 ++++- + drivers/mfd/88pm80x.c | 2 + + drivers/mfd/Kconfig | 11 + + drivers/mfd/Makefile | 2 + + drivers/mfd/arizona-core.c | 4 +- + drivers/mfd/arizona-irq.c | 2 +- + drivers/mfd/atmel-flexcom.c | 104 +++++ + drivers/mfd/atmel-hlcdc.c | 1 + + drivers/mfd/bcm590xx.c | 1 - + drivers/mfd/cros_ec_i2c.c | 7 + + drivers/mfd/da903x.c | 6 +- + drivers/mfd/da9052-i2c.c | 6 +- + drivers/mfd/da9052-spi.c | 6 +- + drivers/mfd/hi6421-pmic-core.c | 1 + + drivers/mfd/htc-i2cpld.c | 3 +- + drivers/mfd/intel-lpss.c | 12 +- + drivers/mfd/intel_soc_pmic_bxtwc.c | 477 +++++++++++++++++++++ + drivers/mfd/kempld-core.c | 14 +- + drivers/mfd/lm3533-core.c | 12 +- + drivers/mfd/lpc_ich.c | 42 +- + drivers/mfd/max8997.c | 1 + + drivers/mfd/pcf50633-irq.c | 4 +- + drivers/mfd/qcom_rpm.c | 2 +- + drivers/mfd/rt5033.c | 1 - + drivers/mfd/rts5209.c | 6 +- + drivers/mfd/rts5227.c | 6 +- + drivers/mfd/rts5229.c | 6 +- + drivers/mfd/rts5249.c | 6 +- + drivers/mfd/rtsx_pcr.c | 6 +- + drivers/mfd/sec-core.c | 30 ++ + drivers/mfd/sm501.c | 1 + + drivers/mfd/stmpe.c | 1 + + drivers/mfd/tps6105x.c | 72 ++-- + drivers/mfd/tps65217.c | 4 + + drivers/mfd/twl6040.c | 2 + + drivers/mfd/wm5110-tables.c | 194 ++++++++- + drivers/mfd/wm831x-core.c | 4 +- + drivers/mfd/wm8998-tables.c | 10 +- + drivers/platform/x86/Kconfig | 1 + + include/dt-bindings/mfd/arizona.h | 2 + + include/dt-bindings/mfd/atmel-flexcom.h | 26 ++ + include/linux/mfd/88pm80x.h | 1 + + include/linux/mfd/arizona/pdata.h | 6 + + include/linux/mfd/arizona/registers.h | 84 +++- + include/linux/mfd/intel_bxtwc.h | 69 +++ + include/linux/mfd/intel_soc_pmic.h | 2 + + include/linux/mfd/samsung/core.h | 2 + + include/linux/mfd/samsung/s2mps11.h | 1 + + include/linux/regmap.h | 3 + + 52 files changed, 1273 insertions(+), 167 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/atmel-flexcom.txt + create mode 100644 drivers/mfd/atmel-flexcom.c + create mode 100644 drivers/mfd/intel_soc_pmic_bxtwc.c + create mode 100644 include/dt-bindings/mfd/atmel-flexcom.h + create mode 100644 include/linux/mfd/intel_bxtwc.h +Merging backlight/for-backlight-next (7111c6c672fc backlight: adp8870: Remove unnecessary MODULE_ALIAS()) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/adp8860_bl.c | 1 - + drivers/video/backlight/adp8870_bl.c | 1 - + drivers/video/backlight/lp855x_bl.c | 1 + + 3 files changed, 1 insertion(+), 2 deletions(-) +Merging battery/master (6169588f69f8 Documentation: power: bq24257: Document exported sysfs entries) +$ git merge battery/master +Removing include/linux/power/bq27x00_battery.h +Removing drivers/power/bq27x00_battery.c +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-power | 58 + + .../devicetree/bindings/power/bq24257.txt | 53 +- + .../bindings/power_supply/axp20x_usb_power.txt | 34 + + .../devicetree/bindings/power_supply/qcom_smbb.txt | 131 ++ + .../bindings/power_supply/tps65217_charger.txt | 12 + + MAINTAINERS | 4 +- + arch/arm/boot/dts/twl4030.dtsi | 2 + + arch/arm/configs/omap2plus_defconfig | 2 +- + arch/unicore32/Kconfig | 2 +- + drivers/power/88pm860x_battery.c | 37 +- + drivers/power/Kconfig | 53 +- + drivers/power/Makefile | 5 +- + drivers/power/axp20x_usb_power.c | 248 ++++ + drivers/power/bq2415x_charger.c | 2 +- + drivers/power/bq24190_charger.c | 1 - + drivers/power/bq24257_charger.c | 492 +++++-- + drivers/power/bq27x00_battery.c | 1129 ---------------- + drivers/power/bq27xxx_battery.c | 1374 ++++++++++++++++++++ + drivers/power/lp8727_charger.c | 31 +- + drivers/power/max17042_battery.c | 26 +- + drivers/power/max8903_charger.c | 93 +- + drivers/power/max8998_charger.c | 29 +- + drivers/power/pm2301_charger.c | 1 - + drivers/power/qcom_smbb.c | 951 ++++++++++++++ + drivers/power/reset/Kconfig | 4 +- + drivers/power/reset/at91-poweroff.c | 33 +- + drivers/power/reset/at91-reset.c | 69 +- + drivers/power/rt9455_charger.c | 1 - + drivers/power/smb347-charger.c | 1 - + drivers/power/tps65090-charger.c | 1 + + drivers/power/tps65217_charger.c | 264 ++++ + drivers/power/twl4030_charger.c | 39 +- + drivers/power/wm831x_power.c | 15 +- + drivers/w1/slaves/w1_bq27000.c | 5 +- + include/linux/mfd/axp20x.h | 24 + + include/linux/power/bq27x00_battery.h | 19 - + include/linux/power/bq27xxx_battery.h | 31 + + include/linux/power/charger-manager.h | 8 +- + 38 files changed, 3813 insertions(+), 1471 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power_supply/axp20x_usb_power.txt + create mode 100644 Documentation/devicetree/bindings/power_supply/qcom_smbb.txt + create mode 100644 Documentation/devicetree/bindings/power_supply/tps65217_charger.txt + create mode 100644 drivers/power/axp20x_usb_power.c + delete mode 100644 drivers/power/bq27x00_battery.c + create mode 100644 drivers/power/bq27xxx_battery.c + create mode 100644 drivers/power/qcom_smbb.c + create mode 100644 drivers/power/tps65217_charger.c + delete mode 100644 include/linux/power/bq27x00_battery.h + create mode 100644 include/linux/power/bq27xxx_battery.h +$ git reset --hard HEAD^ +HEAD is now at 8f88450ee2bd Merge remote-tracking branch 'backlight/for-backlight-next' +Merging next-20150925 version of battery +$ git merge -m next-20150925/battery 3636859b280ca595da4556274a509223f47e9a39 +Removing include/linux/power/bq27x00_battery.h +Removing drivers/power/bq27x00_battery.c +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/power_supply/axp20x_usb_power.txt | 34 + + .../devicetree/bindings/power_supply/qcom_smbb.txt | 131 ++ + .../bindings/power_supply/tps65217_charger.txt | 12 + + MAINTAINERS | 4 +- + arch/arm/configs/omap2plus_defconfig | 2 +- + arch/unicore32/Kconfig | 2 +- + drivers/power/88pm860x_battery.c | 37 +- + drivers/power/Kconfig | 48 +- + drivers/power/Makefile | 5 +- + drivers/power/axp20x_usb_power.c | 248 ++++ + drivers/power/bq2415x_charger.c | 2 +- + drivers/power/bq24190_charger.c | 1 - + drivers/power/bq27x00_battery.c | 1129 ---------------- + drivers/power/bq27xxx_battery.c | 1374 ++++++++++++++++++++ + drivers/power/lp8727_charger.c | 31 +- + drivers/power/max17042_battery.c | 26 +- + drivers/power/max8903_charger.c | 93 +- + drivers/power/max8998_charger.c | 29 +- + drivers/power/pm2301_charger.c | 1 - + drivers/power/qcom_smbb.c | 951 ++++++++++++++ + drivers/power/reset/Kconfig | 4 +- + drivers/power/reset/at91-poweroff.c | 33 +- + drivers/power/reset/at91-reset.c | 69 +- + drivers/power/rt9455_charger.c | 1 - + drivers/power/smb347-charger.c | 1 - + drivers/power/tps65090-charger.c | 1 + + drivers/power/tps65217_charger.c | 264 ++++ + drivers/power/wm831x_power.c | 9 +- + drivers/w1/slaves/w1_bq27000.c | 5 +- + include/linux/mfd/axp20x.h | 24 + + include/linux/power/bq27x00_battery.h | 19 - + include/linux/power/bq27xxx_battery.h | 31 + + include/linux/power/charger-manager.h | 8 +- + 33 files changed, 3257 insertions(+), 1372 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power_supply/axp20x_usb_power.txt + create mode 100644 Documentation/devicetree/bindings/power_supply/qcom_smbb.txt + create mode 100644 Documentation/devicetree/bindings/power_supply/tps65217_charger.txt + create mode 100644 drivers/power/axp20x_usb_power.c + delete mode 100644 drivers/power/bq27x00_battery.c + create mode 100644 drivers/power/bq27xxx_battery.c + create mode 100644 drivers/power/qcom_smbb.c + create mode 100644 drivers/power/tps65217_charger.c + delete mode 100644 include/linux/power/bq27x00_battery.h + create mode 100644 include/linux/power/bq27xxx_battery.h +Merging omap_dss2/for-next (6a5e3bd0c8bc tridentfb: Add DDC support) +$ git merge omap_dss2/for-next +Auto-merging drivers/video/fbdev/tridentfb.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/video/ssd1307fb.txt | 3 +- + drivers/video/fbdev/Kconfig | 2 + + drivers/video/fbdev/core/fb_ddc.c | 28 ++-- + drivers/video/fbdev/omap/omapfb_main.c | 5 - + drivers/video/fbdev/omap2/dss/hdmi.h | 9 +- + drivers/video/fbdev/omap2/dss/hdmi4.c | 66 ++++++-- + drivers/video/fbdev/omap2/dss/hdmi5.c | 75 +++++++-- + drivers/video/fbdev/ssd1307fb.c | 21 ++- + drivers/video/fbdev/tridentfb.c | 182 ++++++++++++++++++++- + 9 files changed, 338 insertions(+), 53 deletions(-) +Merging regulator/for-next (494fa9126950 Merge remote-tracking branches 'regulator/topic/qcom-smd', 'regulator/topic/supply', 'regulator/topic/tps6105x' and 'regulator/topic/tps65023' into regulator-next) +$ git merge regulator/for-next +Auto-merging drivers/mfd/tps6105x.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/axp20x.txt | 4 +- + .../bindings/regulator/act8865-regulator.txt | 3 + + .../devicetree/bindings/regulator/max77802.txt | 25 +- + .../devicetree/bindings/regulator/regulator.txt | 1 + + .../devicetree/bindings/regulator/tps65023.txt | 60 ++++ + drivers/mfd/tps6105x.c | 78 +---- + drivers/regulator/act8865-regulator.c | 24 +- + drivers/regulator/arizona-ldo1.c | 2 + + drivers/regulator/axp20x-regulator.c | 54 ++- + drivers/regulator/bcm590xx-regulator.c | 2 +- + drivers/regulator/core.c | 364 ++++++++++++++------- + drivers/regulator/da9063-regulator.c | 2 +- + drivers/regulator/of_regulator.c | 3 + + drivers/regulator/pwm-regulator.c | 35 +- + drivers/regulator/qcom_smd-regulator.c | 28 +- + drivers/regulator/tps6105x-regulator.c | 16 +- + drivers/regulator/tps65023-regulator.c | 282 ++++++---------- + include/linux/mfd/tps6105x.h | 10 +- + 18 files changed, 586 insertions(+), 407 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/tps65023.txt +Merging security/next (049e6dde7e57 Linux 4.3-rc4) +$ git merge security/next +Already up-to-date. +Merging integrity/next (24fd03c87695 ima: update builtin policies) +$ git merge integrity/next +Already up-to-date. +Merging selinux/next (db73b9d316b6 selinux: ioctl_has_perm should be static) +$ git merge selinux/next +Auto-merging security/selinux/selinuxfs.c +Auto-merging security/selinux/hooks.c +Merge made by the 'recursive' strategy. + security/selinux/Kconfig | 4 ++-- + security/selinux/hooks.c | 19 ++++++++----------- + security/selinux/include/security.h | 2 ++ + security/selinux/selinuxfs.c | 26 +++++++++----------------- + security/selinux/ss/services.c | 22 +++++++++------------- + 5 files changed, 30 insertions(+), 43 deletions(-) +Merging lblnet/next (b2776bf7149b Linux 3.18) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (55f1dfb398d9 watchdog: iTCO: Fix dependencies on I2C) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. +Merging iommu/next (eea87ff7bd44 Merge branches 'iommu/fixes', 'x86/amd' and 'x86/vt-d' into next) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + drivers/iommu/amd_iommu_init.c | 9 ++---- + drivers/iommu/intel-iommu.c | 63 ++++++++++++++++++++++++++++-------------- + 2 files changed, 46 insertions(+), 26 deletions(-) +Merging dwmw2-iommu/master (5dbaf90a6780 iommu/vt-d: Add initial shell of SVM support) +$ git merge dwmw2-iommu/master +Auto-merging include/linux/intel-iommu.h +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging drivers/iommu/Kconfig +Merge made by the 'recursive' strategy. + drivers/iommu/Kconfig | 8 +++++ + drivers/iommu/Makefile | 1 + + drivers/iommu/intel-iommu.c | 11 +++++++ + drivers/iommu/intel-svm.c | 71 +++++++++++++++++++++++++++++++++++++++++++++ + include/linux/intel-iommu.h | 15 ++++++++++ + 5 files changed, 106 insertions(+) + create mode 100644 drivers/iommu/intel-svm.c +Merging vfio/next (a714ea5fa416 MAINTAINERS: Add vfio-platform sub-maintainer) +$ git merge vfio/next +Already up-to-date. +Merging jc_docs/docs-next (b479bfd00e46 DocBook: Use a fixed encoding for output) +$ git merge jc_docs/docs-next +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/DMA-API-HOWTO.txt | 5 ++ + Documentation/DMA-API.txt | 6 +- + Documentation/DocBook/.gitignore | 2 + + Documentation/DocBook/Makefile | 6 ++ + Documentation/SubmittingPatches | 8 +- + Documentation/blockdev/zram.txt | 44 ++++++++++- + Documentation/cgroups/blkio-controller.txt | 2 +- + Documentation/cgroups/freezer-subsystem.txt | 2 +- + Documentation/cgroups/unified-hierarchy.txt | 2 +- + Documentation/filesystems/sysfs-tagging.txt | 14 ++-- + Documentation/filesystems/sysfs.txt | 9 ++- + Documentation/gpio/board.txt | 10 ++- + Documentation/kernel-parameters.txt | 10 ++- + Documentation/kselftest.txt | 16 ++++ + Documentation/locking/lockstat.txt | 2 +- + Documentation/misc-devices/apds990x.txt | 2 +- + Documentation/misc-devices/isl29003 | 2 +- + Documentation/misc-devices/max6875 | 2 +- + Documentation/networking/can.txt | 97 ++++++++++++++++++----- + Documentation/rbtree.txt | 2 +- + Documentation/zh_CN/filesystems/sysfs.txt | 2 +- + MAINTAINERS | 4 +- + Makefile | 2 +- + README | 2 +- + scripts/.gitignore | 1 + + scripts/Makefile | 7 +- + scripts/check-lc_ctype.c | 11 +++ + scripts/kernel-doc | 115 ++++++++++++++++------------ + 28 files changed, 277 insertions(+), 110 deletions(-) + create mode 100644 scripts/check-lc_ctype.c +Merging trivial/for-next (0c6cac7ab444 hwmon: applesmc: fix comment typos) +$ git merge trivial/for-next +Auto-merging net/openvswitch/datapath.c +Auto-merging mm/huge_memory.c +Auto-merging fs/namei.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/extents.c +Auto-merging drivers/scsi/Kconfig +Auto-merging drivers/net/ethernet/ti/netcp_core.c +Auto-merging drivers/block/pktcdvd.c +Merge made by the 'recursive' strategy. + drivers/base/class.c | 2 +- + drivers/block/pktcdvd.c | 3 +-- + drivers/hwmon/applesmc.c | 4 ++-- + drivers/misc/c2port/core.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 4 ++-- + drivers/scsi/Kconfig | 7 ------- + fs/cifs/readdir.c | 2 +- + fs/debugfs/inode.c | 6 ++++-- + fs/ecryptfs/inode.c | 2 +- + fs/ext4/extents.c | 6 +++--- + fs/ext4/namei.c | 2 +- + fs/namei.c | 4 ++-- + fs/ncpfs/dir.c | 2 +- + fs/nfs/objlayout/objio_osd.c | 2 +- + fs/proc/proc_sysctl.c | 2 +- + mm/huge_memory.c | 2 +- + net/openvswitch/datapath.c | 2 +- + net/sctp/socket.c | 2 +- + net/socket.c | 6 +++--- + 19 files changed, 28 insertions(+), 34 deletions(-) +Merging audit/next (fdccf5752869 audit: audit_tree_match can be boolean) +$ git merge audit/next +Auto-merging kernel/audit_tree.c +Auto-merging kernel/audit.h +Auto-merging kernel/audit.c +Merge made by the 'recursive' strategy. + include/linux/audit.h | 8 ++++---- + kernel/audit.c | 33 +++++++++++++++++++++++++-------- + kernel/audit.h | 2 +- + kernel/audit_tree.c | 6 +++--- + 4 files changed, 33 insertions(+), 16 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 (a13f18f59d26 Documentation: arm: Fix typo in the idle-states bindings examples) +$ git merge dt-rh/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (86e488adaab7 mailbox: arm_mhu: reduce txpoll_period from 10ms to 1 ms) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (637370041cec Merge remote-tracking branch 'spi/topic/txx9' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + .../bindings/spi/brcm,bcm2835-aux-spi.txt | 38 ++ + drivers/spi/Kconfig | 11 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-ath79.c | 11 +- + drivers/spi/spi-au1550.c | 11 +- + drivers/spi/spi-bcm2835aux.c | 493 +++++++++++++++++++++ + drivers/spi/spi-bcm53xx.c | 13 +- + drivers/spi/spi-bcm63xx.c | 24 +- + drivers/spi/spi-bfin-sport.c | 5 +- + drivers/spi/spi-bfin5xx.c | 6 +- + drivers/spi/spi-bitbang.c | 152 ++----- + drivers/spi/spi-dw.c | 46 +- + drivers/spi/spi-fsl-dspi.c | 3 - + drivers/spi/spi-mpc512x-psc.c | 8 +- + drivers/spi/spi-oc-tiny.c | 14 +- + drivers/spi/spi-octeon.c | 2 +- + drivers/spi/spi-omap-100k.c | 26 +- + drivers/spi/spi-omap-uwire.c | 7 +- + drivers/spi/spi-ppc4xx.c | 4 +- + drivers/spi/spi-pxa2xx-dma.c | 4 - + drivers/spi/spi-pxa2xx.c | 112 ++--- + drivers/spi/spi-pxa2xx.h | 9 - + drivers/spi/spi-s3c24xx.c | 4 +- + drivers/spi/spi-s3c64xx.c | 46 +- + drivers/spi/spi-txx9.c | 2 +- + drivers/spi/spi.c | 61 +++ + include/linux/spi/spi.h | 4 + + include/linux/spi/spi_bitbang.h | 2 +- + 28 files changed, 805 insertions(+), 314 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/brcm,bcm2835-aux-spi.txt + create mode 100644 drivers/spi/spi-bcm2835aux.c +Merging tip/auto-latest (32f01b56d7b6 Merge branch 'x86/platform') +$ git merge tip/auto-latest +Resolved 'arch/arm64/kernel/acpi.c' using previous resolution. +Auto-merging tools/perf/arch/x86/tests/rdpmc.c +Auto-merging tools/perf/arch/x86/tests/perf-time-to-tsc.c +Removing tools/lib/api/fs/tracefs.h +Removing tools/lib/api/fs/tracefs.c +Removing tools/lib/api/fs/findfs.h +Removing tools/lib/api/fs/findfs.c +Removing tools/lib/api/fs/debugfs.h +Removing tools/lib/api/fs/debugfs.c +Auto-merging kernel/irq/manage.c +Auto-merging drivers/irqchip/irq-gic.c +Auto-merging drivers/clocksource/Makefile +Auto-merging arch/x86/include/asm/pgtable.h +Removing arch/x86/entry/vdso/vdso32/sysenter.S +Removing arch/x86/entry/vdso/vdso32/syscall.S +Auto-merging arch/x86/crypto/sha512_ssse3_glue.c +Auto-merging arch/x86/crypto/sha256_ssse3_glue.c +Auto-merging arch/x86/crypto/sha1_ssse3_glue.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm64/kernel/acpi.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/acpi.c +Auto-merging arch/arm64/include/asm/acpi.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bec50e184d4a] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/atomic_ops.txt | 4 + + Documentation/devicetree/bindings/arm/gic.txt | 24 +- + .../bindings/interrupt-controller/renesas,irqc.txt | 1 + + Documentation/filesystems/proc.txt | 5 +- + Documentation/memory-barriers.txt | 17 +- + arch/alpha/include/asm/atomic.h | 8 +- + arch/arc/include/asm/atomic.h | 8 +- + arch/arm/include/asm/atomic.h | 4 +- + arch/arm64/Kconfig | 27 + + arch/arm64/include/asm/acpi.h | 5 + + arch/arm64/include/asm/atomic.h | 2 +- + arch/arm64/include/asm/cpufeature.h | 3 +- + arch/arm64/include/asm/cputype.h | 17 +- + arch/arm64/include/asm/memory.h | 1 + + arch/arm64/include/asm/pgtable.h | 2 + + arch/arm64/kernel/acpi.c | 29 + + arch/arm64/kernel/cpu_errata.c | 9 + + arch/arm64/mm/proc.S | 4 +- + arch/avr32/include/asm/atomic.h | 4 +- + arch/frv/include/asm/atomic.h | 4 +- + arch/h8300/include/asm/atomic.h | 4 +- + arch/hexagon/include/asm/atomic.h | 2 +- + arch/ia64/include/asm/atomic.h | 8 +- + arch/m32r/include/asm/atomic.h | 4 +- + arch/m68k/include/asm/atomic.h | 4 +- + arch/metag/include/asm/atomic_lnkget.h | 2 +- + arch/metag/include/asm/atomic_lock1.h | 2 +- + arch/mips/include/asm/atomic.h | 8 +- + arch/mn10300/include/asm/atomic.h | 4 +- + arch/parisc/include/asm/atomic.h | 2 +- + arch/powerpc/perf/core-book3s.c | 36 +- + arch/powerpc/perf/hv-24x7.c | 166 +++- + arch/s390/kernel/perf_cpum_cf.c | 35 +- + arch/sh/include/asm/atomic.h | 4 +- + arch/sparc/include/asm/atomic_64.h | 8 +- + arch/sparc/kernel/perf_event.c | 32 +- + arch/tile/include/asm/atomic.h | 2 +- + arch/tile/include/asm/atomic_64.h | 6 +- + arch/x86/Kconfig | 49 ++ + arch/x86/Kconfig.debug | 36 +- + arch/x86/boot/header.S | 2 +- + arch/x86/crypto/camellia_aesni_avx2_glue.c | 3 +- + arch/x86/crypto/camellia_aesni_avx_glue.c | 3 +- + arch/x86/crypto/cast5_avx_glue.c | 3 +- + arch/x86/crypto/cast6_avx_glue.c | 3 +- + arch/x86/crypto/chacha20_glue.c | 2 +- + arch/x86/crypto/poly1305_glue.c | 2 +- + arch/x86/crypto/serpent_avx2_glue.c | 3 +- + arch/x86/crypto/serpent_avx_glue.c | 3 +- + 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/crypto/twofish_avx_glue.c | 2 +- + arch/x86/entry/common.c | 2 + + arch/x86/entry/entry_32.S | 2 - + arch/x86/entry/entry_64.S | 1 - + arch/x86/entry/entry_64_compat.S | 48 +- + arch/x86/entry/vdso/Makefile | 35 +- + arch/x86/entry/vdso/vdso2c.c | 1 - + arch/x86/entry/vdso/vdso32-setup.c | 28 +- + arch/x86/entry/vdso/vdso32/syscall.S | 75 -- + arch/x86/entry/vdso/vdso32/sysenter.S | 116 --- + .../entry/vdso/vdso32/{int80.S => system_call.S} | 0 + arch/x86/entry/vdso/vdso32/vclock_gettime.c | 2 + + arch/x86/entry/vdso/vma.c | 13 +- + arch/x86/entry/vsyscall/vsyscall_64.c | 9 +- + arch/x86/ia32/ia32_signal.c | 12 +- + arch/x86/include/asm/acpi.h | 23 + + arch/x86/include/asm/apic.h | 110 +-- + arch/x86/include/asm/atomic.h | 4 +- + arch/x86/include/asm/atomic64_64.h | 4 +- + arch/x86/include/asm/elf.h | 2 +- + arch/x86/include/asm/fpu/signal.h | 2 +- + arch/x86/include/asm/fpu/types.h | 148 ++-- + arch/x86/include/asm/fpu/xstate.h | 15 +- + arch/x86/include/asm/ia32.h | 4 +- + arch/x86/include/asm/numachip/numachip.h | 1 + + arch/x86/include/asm/numachip/numachip_csr.h | 153 +--- + arch/x86/include/asm/page_64_types.h | 3 - + arch/x86/include/asm/page_types.h | 3 + + arch/x86/include/asm/pgtable.h | 25 +- + arch/x86/include/asm/pgtable_types.h | 40 +- + arch/x86/include/asm/preempt.h | 5 +- + arch/x86/include/asm/processor.h | 6 +- + arch/x86/include/asm/sigcontext.h | 75 +- + arch/x86/include/asm/sigframe.h | 8 +- + arch/x86/include/asm/signal.h | 2 +- + arch/x86/include/asm/switch_to.h | 12 +- + arch/x86/include/asm/thread_info.h | 2 - + arch/x86/include/asm/trace/mpx.h | 7 +- + arch/x86/include/asm/uaccess.h | 14 +- + arch/x86/include/asm/uv/uv_hub.h | 2 +- + arch/x86/include/asm/vdso.h | 9 +- + arch/x86/include/uapi/asm/sigcontext.h | 475 +++++++---- + arch/x86/include/uapi/asm/sigcontext32.h | 73 +- + arch/x86/kernel/apic/apic.c | 8 +- + arch/x86/kernel/apic/apic_numachip.c | 220 ++++-- + arch/x86/kernel/asm-offsets.c | 18 +- + arch/x86/kernel/cpu/Makefile | 1 + + arch/x86/kernel/cpu/intel_cacheinfo.c | 8 +- + arch/x86/kernel/cpu/mcheck/mce.c | 30 +- + arch/x86/kernel/cpu/perf_event.c | 39 +- + arch/x86/kernel/cpu/perf_event.h | 2 +- + arch/x86/kernel/cpu/perf_event_intel_bts.c | 13 + + arch/x86/kernel/cpu/perf_event_intel_cstate.c | 694 ++++++++++++++++ + arch/x86/kernel/cpu/perf_event_intel_ds.c | 40 +- + arch/x86/kernel/cpu/perf_event_intel_lbr.c | 4 +- + arch/x86/kernel/cpu/perf_event_intel_pt.c | 7 +- + arch/x86/kernel/cpu/perf_event_intel_uncore.c | 61 +- + arch/x86/kernel/cpu/perf_event_intel_uncore.h | 12 +- + arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c | 16 +- + .../x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 34 +- + arch/x86/kernel/e820.c | 2 +- + arch/x86/kernel/early_printk.c | 2 +- + arch/x86/kernel/fpu/init.c | 18 +- + arch/x86/kernel/fpu/regset.c | 4 +- + arch/x86/kernel/fpu/signal.c | 10 +- + arch/x86/kernel/fpu/xstate.c | 398 ++++++++-- + arch/x86/kernel/irq_64.c | 2 +- + arch/x86/kernel/kgdb.c | 17 +- + arch/x86/kernel/process_32.c | 8 - + arch/x86/kernel/process_64.c | 8 - + arch/x86/kernel/signal.c | 10 +- + arch/x86/kernel/traps.c | 4 +- + arch/x86/kernel/tsc.c | 24 +- + arch/x86/kvm/cpuid.c | 4 +- + arch/x86/kvm/x86.c | 27 +- + arch/x86/kvm/x86.h | 6 +- + arch/x86/lib/x86-opcode-map.txt | 24 +- + arch/x86/math-emu/fpu_aux.c | 70 ++ + arch/x86/math-emu/fpu_emu.h | 2 +- + arch/x86/math-emu/fpu_entry.c | 96 +-- + arch/x86/math-emu/fpu_proto.h | 12 + + arch/x86/math-emu/load_store.c | 63 +- + arch/x86/math-emu/reg_compare.c | 128 +++ + arch/x86/mm/Makefile | 2 +- + arch/x86/mm/dump_pagetables.c | 81 +- + arch/x86/mm/gup.c | 18 +- + arch/x86/mm/init_32.c | 2 + + arch/x86/mm/init_64.c | 2 + + arch/x86/mm/mpx.c | 15 +- + arch/x86/mm/pageattr.c | 79 +- + arch/x86/platform/efi/efi-bgrt.c | 9 +- + arch/x86/platform/efi/efi.c | 18 - + arch/x86/platform/intel-mid/sfi.c | 3 +- + arch/x86/platform/uv/uv_nmi.c | 53 +- + arch/x86/xen/setup.c | 13 +- + arch/xtensa/include/asm/atomic.h | 4 +- + drivers/acpi/apei/ghes.c | 10 +- + drivers/clocksource/Makefile | 1 + + drivers/clocksource/numachip.c | 95 +++ + drivers/firmware/efi/efi.c | 39 +- + drivers/irqchip/Kconfig | 1 + + drivers/irqchip/irq-atmel-aic5.c | 62 +- + drivers/irqchip/irq-gic-common.c | 11 + + drivers/irqchip/irq-gic-common.h | 9 + + drivers/irqchip/irq-gic-v3-its.c | 65 +- + drivers/irqchip/irq-gic-v3.c | 42 +- + drivers/irqchip/irq-gic.c | 1 + + drivers/irqchip/irq-i8259.c | 4 +- + drivers/irqchip/irq-renesas-intc-irqpin.c | 6 +- + drivers/irqchip/irq-renesas-irqc.c | 86 +- + drivers/net/ethernet/sfc/mcdi.c | 2 +- + drivers/phy/phy-rcar-gen2.c | 3 +- + drivers/staging/speakup/selection.c | 2 +- + fs/proc/array.c | 16 +- + fs/proc/base.c | 9 +- + include/asm-generic/atomic-long.h | 56 +- + include/asm-generic/atomic.h | 4 +- + include/asm-generic/mutex-dec.h | 8 +- + include/asm-generic/mutex-xchg.h | 10 +- + include/asm-generic/preempt.h | 2 +- + include/asm-generic/qrwlock_types.h | 4 +- + include/asm-generic/rwsem.h | 21 +- + include/linux/atomic.h | 118 ++- + include/linux/efi.h | 1 + + include/linux/interrupt.h | 2 + + include/linux/irq.h | 19 +- + include/linux/irqchip/arm-gic-v3.h | 1 + + include/linux/perf_event.h | 120 ++- + include/linux/preempt.h | 20 +- + include/linux/sched.h | 38 +- + include/linux/sched/deadline.h | 5 + + include/trace/events/sched.h | 22 +- + kernel/cpu.c | 8 +- + kernel/events/core.c | 224 ++++-- + kernel/exit.c | 4 +- + kernel/futex.c | 13 +- + kernel/irq/Kconfig | 4 + + kernel/irq/Makefile | 1 + + kernel/irq/chip.c | 2 +- + kernel/irq/cpuhotplug.c | 82 ++ + kernel/irq/handle.c | 7 +- + kernel/irq/internals.h | 2 +- + kernel/irq/manage.c | 158 +++- + kernel/locking/mcs_spinlock.h | 4 +- + kernel/locking/mutex.c | 9 +- + kernel/locking/osq_lock.c | 11 +- + kernel/locking/qrwlock.c | 8 +- + kernel/locking/qspinlock_paravirt.h | 6 +- + kernel/locking/rtmutex.c | 33 +- + kernel/locking/rwsem-xadd.c | 5 +- + kernel/sched/core.c | 185 +++-- + kernel/sched/cpudeadline.c | 5 - + kernel/sched/cpudeadline.h | 1 + + kernel/sched/fair.c | 421 +++++----- + kernel/sched/features.h | 21 +- + kernel/sched/rt.c | 22 +- + kernel/sched/sched.h | 60 +- + kernel/time/clocksource.c | 2 +- + kernel/time/hrtimer.c | 2 +- + kernel/time/timekeeping.c | 4 +- + kernel/time/timer.c | 11 +- + kernel/trace/ftrace.c | 2 +- + kernel/trace/trace_sched_switch.c | 3 +- + kernel/trace/trace_sched_wakeup.c | 2 +- + tools/build/Build | 1 + + tools/build/Build.include | 17 +- + tools/build/Documentation/Build.txt | 52 +- + tools/build/Makefile | 43 + + tools/build/Makefile.build | 7 + + tools/build/Makefile.feature | 9 +- + tools/build/Makefile.include | 6 + + tools/build/fixdep.c | 168 ++++ + tools/build/tests/ex/Build | 1 + + tools/build/tests/ex/Makefile | 13 +- + tools/build/tests/ex/ex.c | 2 + + tools/build/tests/ex/inc.c | 8 + + tools/build/tests/run.sh | 27 + + tools/include/linux/err.h | 49 ++ + tools/include/linux/filter.h | 231 ++++++ + tools/lib/api/Build | 1 + + tools/lib/api/Makefile | 6 +- + tools/lib/api/cpu.c | 18 + + tools/lib/api/cpu.h | 6 + + tools/lib/api/fs/Build | 4 +- + tools/lib/api/fs/debugfs.c | 129 --- + tools/lib/api/fs/debugfs.h | 23 - + tools/lib/api/fs/findfs.c | 63 -- + tools/lib/api/fs/findfs.h | 23 - + tools/lib/api/fs/fs.c | 165 +++- + tools/lib/api/fs/fs.h | 30 +- + tools/lib/api/fs/tracefs.c | 78 -- + tools/lib/api/fs/tracefs.h | 21 - + tools/lib/api/fs/tracing_path.c | 135 ++++ + tools/lib/api/fs/tracing_path.h | 16 + + tools/lib/bpf/Makefile | 11 +- + tools/lib/lockdep/Makefile | 6 +- + tools/lib/symbol/kallsyms.c | 6 + + tools/lib/symbol/kallsyms.h | 4 +- + tools/lib/traceevent/event-parse.c | 56 +- + tools/lib/traceevent/event-parse.h | 1 + + tools/perf/Documentation/intel-pt.txt | 44 ++ + tools/perf/Documentation/itrace.txt | 4 + + tools/perf/Documentation/perf-inject.txt | 3 + + tools/perf/Documentation/perf-list.txt | 3 + + tools/perf/Documentation/perf-report.txt | 10 +- + tools/perf/Documentation/perf-script.txt | 3 + + tools/perf/Documentation/perf-stat.txt | 5 +- + tools/perf/Documentation/perf.txt | 8 + + tools/perf/MANIFEST | 2 + + tools/perf/Makefile.perf | 34 +- + tools/perf/arch/common.c | 10 +- + tools/perf/arch/common.h | 4 +- + tools/perf/arch/x86/Build | 2 +- + tools/perf/arch/x86/Makefile | 1 + + tools/perf/arch/x86/include/arch-tests.h | 19 + + tools/perf/arch/x86/tests/Build | 10 +- + tools/perf/arch/x86/tests/arch-tests.c | 34 + + tools/perf/arch/x86/tests/dwarf-unwind.c | 1 + + tools/perf/arch/x86/tests/gen-insn-x86-dat.awk | 75 ++ + tools/perf/arch/x86/tests/gen-insn-x86-dat.sh | 43 + + tools/perf/arch/x86/tests/insn-x86-dat-32.c | 658 ++++++++++++++++ + tools/perf/arch/x86/tests/insn-x86-dat-64.c | 768 ++++++++++++++++++ + tools/perf/arch/x86/tests/insn-x86-dat-src.c | 877 +++++++++++++++++++++ + tools/perf/arch/x86/tests/insn-x86.c | 185 +++++ + tools/perf/arch/x86/tests/intel-cqm.c | 124 +++ + tools/perf/{ => arch/x86}/tests/perf-time-to-tsc.c | 4 +- + tools/perf/{ => arch/x86}/tests/rdpmc.c | 7 +- + tools/perf/arch/x86/util/dwarf-regs.c | 122 ++- + tools/perf/arch/x86/util/intel-pt.c | 55 +- + tools/perf/builtin-annotate.c | 2 +- + tools/perf/builtin-inject.c | 127 ++- + tools/perf/builtin-kmem.c | 2 +- + tools/perf/builtin-kvm.c | 1 - + tools/perf/builtin-list.c | 20 +- + tools/perf/builtin-probe.c | 127 ++- + tools/perf/builtin-record.c | 27 +- + tools/perf/builtin-report.c | 48 +- + tools/perf/builtin-script.c | 18 +- + tools/perf/builtin-stat.c | 15 +- + tools/perf/builtin-top.c | 29 +- + tools/perf/builtin-trace.c | 24 +- + tools/perf/config/Makefile | 4 + + tools/perf/perf.c | 28 +- + tools/perf/scripts/python/export-to-postgresql.py | 221 ++++++ + tools/perf/tests/Build | 4 +- + tools/perf/tests/builtin-test.c | 76 +- + tools/perf/tests/code-reading.c | 76 +- + tools/perf/tests/dwarf-unwind.c | 4 + + tools/perf/tests/evsel-tp-sched.c | 10 +- + tools/perf/tests/hists_filter.c | 55 +- + tools/perf/tests/mmap-basic.c | 3 +- + tools/perf/tests/openat-syscall-all-cpus.c | 13 +- + tools/perf/tests/openat-syscall-tp-fields.c | 3 +- + tools/perf/tests/openat-syscall.c | 13 +- + tools/perf/tests/parse-events.c | 35 +- + tools/perf/tests/tests.h | 10 +- + tools/perf/tests/topology.c | 115 +++ + tools/perf/tests/vmlinux-kallsyms.c | 4 +- + tools/perf/trace/strace/groups/file | 2 + + tools/perf/ui/browser.c | 14 + + tools/perf/ui/browser.h | 2 +- + tools/perf/ui/browsers/hists.c | 107 ++- + tools/perf/util/Build | 3 +- + tools/perf/util/annotate.h | 2 +- + tools/perf/util/auxtrace.c | 24 +- + tools/perf/util/auxtrace.h | 4 + + tools/perf/util/cpumap.c | 63 +- + tools/perf/util/cpumap.h | 2 + + tools/perf/util/env.c | 86 ++ + tools/perf/util/env.h | 44 ++ + tools/perf/util/event.c | 19 +- + tools/perf/util/event.h | 6 + + tools/perf/util/evlist.c | 47 +- + tools/perf/util/evlist.h | 5 + + tools/perf/util/evsel.c | 23 +- + tools/perf/util/evsel.h | 5 +- + tools/perf/util/header.c | 136 +++- + tools/perf/util/header.h | 27 +- + tools/perf/util/hist.c | 59 +- + tools/perf/util/hist.h | 8 +- + tools/perf/util/include/dwarf-regs.h | 8 + + tools/perf/util/intel-pt-decoder/Build | 13 +- + .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 4 +- + tools/perf/util/intel-pt-decoder/intel-pt-log.c | 21 +- + tools/perf/util/intel-pt-decoder/intel-pt-log.h | 38 +- + .../perf/util/intel-pt-decoder/x86-opcode-map.txt | 24 +- + tools/perf/util/intel-pt.c | 266 ++++++- + tools/perf/util/machine.c | 29 +- + tools/perf/util/machine.h | 9 +- + tools/perf/util/map.c | 21 +- + tools/perf/util/map.h | 2 + + tools/perf/util/parse-events.c | 241 +++++- + tools/perf/util/parse-events.h | 5 +- + tools/perf/util/parse-events.l | 4 +- + tools/perf/util/parse-events.y | 53 +- + tools/perf/util/parse-options.c | 2 +- + tools/perf/util/perf_regs.c | 2 + + tools/perf/util/perf_regs.h | 1 + + tools/perf/util/pmu.c | 42 +- + tools/perf/util/probe-event.c | 234 +++--- + tools/perf/util/probe-event.h | 11 + + tools/perf/util/probe-file.c | 56 +- + tools/perf/util/probe-file.h | 4 + + tools/perf/util/probe-finder.c | 58 +- + .../perf/util/scripting-engines/trace-event-perl.c | 1 + + .../util/scripting-engines/trace-event-python.c | 3 +- + tools/perf/util/session.c | 37 +- + tools/perf/util/session.h | 2 + + tools/perf/util/sort.c | 66 +- + tools/perf/util/sort.h | 4 + + tools/perf/util/srcline.c | 29 +- + tools/perf/util/symbol.c | 2 +- + tools/perf/util/symbol.h | 1 + + tools/perf/util/trace-event-info.c | 2 +- + tools/perf/util/trace-event.c | 16 +- + tools/perf/util/trace-event.h | 2 + + tools/perf/util/util.c | 74 +- + tools/perf/util/util.h | 11 +- + tools/testing/selftests/x86/Makefile | 9 +- + tools/testing/selftests/x86/ptrace_syscall.c | 294 +++++++ + .../testing/selftests/x86/raw_syscall_helper_32.S | 46 ++ + tools/testing/selftests/x86/test_FCMOV.c | 93 +++ + tools/testing/selftests/x86/test_FCOMI.c | 331 ++++++++ + tools/testing/selftests/x86/test_FISTTP.c | 137 ++++ + tools/testing/selftests/x86/test_syscall_vdso.c | 401 ++++++++++ + tools/testing/selftests/x86/thunks_32.S | 55 ++ + tools/testing/selftests/x86/unwind_vdso.c | 209 +++++ + tools/vm/page-types.c | 6 +- + 380 files changed, 12832 insertions(+), 3377 deletions(-) + delete mode 100644 arch/x86/entry/vdso/vdso32/syscall.S + delete mode 100644 arch/x86/entry/vdso/vdso32/sysenter.S + rename arch/x86/entry/vdso/vdso32/{int80.S => system_call.S} (100%) + create mode 100644 arch/x86/kernel/cpu/perf_event_intel_cstate.c + create mode 100644 drivers/clocksource/numachip.c + create mode 100644 kernel/irq/cpuhotplug.c + create mode 100644 tools/build/Build + create mode 100644 tools/build/Makefile + create mode 100644 tools/build/Makefile.include + create mode 100644 tools/build/fixdep.c + create mode 100644 tools/build/tests/ex/inc.c + create mode 100644 tools/include/linux/err.h + create mode 100644 tools/include/linux/filter.h + create mode 100644 tools/lib/api/cpu.c + create mode 100644 tools/lib/api/cpu.h + delete mode 100644 tools/lib/api/fs/debugfs.c + delete mode 100644 tools/lib/api/fs/debugfs.h + delete mode 100644 tools/lib/api/fs/findfs.c + delete mode 100644 tools/lib/api/fs/findfs.h + delete mode 100644 tools/lib/api/fs/tracefs.c + delete mode 100644 tools/lib/api/fs/tracefs.h + create mode 100644 tools/lib/api/fs/tracing_path.c + create mode 100644 tools/lib/api/fs/tracing_path.h + create mode 100644 tools/perf/arch/x86/include/arch-tests.h + create mode 100644 tools/perf/arch/x86/tests/arch-tests.c + create mode 100644 tools/perf/arch/x86/tests/gen-insn-x86-dat.awk + create mode 100755 tools/perf/arch/x86/tests/gen-insn-x86-dat.sh + create mode 100644 tools/perf/arch/x86/tests/insn-x86-dat-32.c + create mode 100644 tools/perf/arch/x86/tests/insn-x86-dat-64.c + create mode 100644 tools/perf/arch/x86/tests/insn-x86-dat-src.c + create mode 100644 tools/perf/arch/x86/tests/insn-x86.c + create mode 100644 tools/perf/arch/x86/tests/intel-cqm.c + rename tools/perf/{ => arch/x86}/tests/perf-time-to-tsc.c (98%) + rename tools/perf/{ => arch/x86}/tests/rdpmc.c (97%) + create mode 100644 tools/perf/tests/topology.c + create mode 100644 tools/perf/util/env.c + create mode 100644 tools/perf/util/env.h + create mode 100644 tools/testing/selftests/x86/ptrace_syscall.c + create mode 100644 tools/testing/selftests/x86/raw_syscall_helper_32.S + create mode 100644 tools/testing/selftests/x86/test_FCMOV.c + create mode 100644 tools/testing/selftests/x86/test_FCOMI.c + create mode 100644 tools/testing/selftests/x86/test_FISTTP.c + create mode 100644 tools/testing/selftests/x86/test_syscall_vdso.c + create mode 100644 tools/testing/selftests/x86/thunks_32.S + create mode 100644 tools/testing/selftests/x86/unwind_vdso.c +Merging clockevents/clockevents/next (0e4baaa9a11b clocksource/drivers/exynos_mct: Use container_of() instead of this_cpu_ptr()) +$ git merge clockevents/clockevents/next +Auto-merging drivers/clocksource/sh_cmt.c +Merge made by the 'recursive' strategy. + drivers/clocksource/em_sti.c | 2 -- + drivers/clocksource/exynos_mct.c | 12 ++++++++---- + drivers/clocksource/h8300_timer16.c | 1 - + drivers/clocksource/h8300_timer8.c | 1 - + drivers/clocksource/h8300_tpu.c | 1 - + drivers/clocksource/mtk_timer.c | 26 ++++++++++++++++---------- + drivers/clocksource/sh_cmt.c | 1 - + 7 files changed, 24 insertions(+), 20 deletions(-) +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 (df77345c5394 Merge branch 'edac-for-4.4' into for-next) +$ git merge edac-amd/for-next +Auto-merging arch/x86/kernel/cpu/mshyperv.c +Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi +Merge made by the 'recursive' strategy. + .../devicetree/bindings/edac/apm-xgene-edac.txt | 23 + + Documentation/edac.txt | 46 + + arch/arm64/boot/dts/apm/apm-storm.dtsi | 10 + + arch/x86/include/asm/microcode_amd.h | 1 + + arch/x86/kernel/cpu/microcode/amd.c | 52 +- + arch/x86/kernel/cpu/microcode/amd_early.c | 24 +- + arch/x86/kernel/cpu/mshyperv.c | 2 +- + arch/x86/ras/Kconfig | 4 +- + arch/x86/ras/mce_amd_inj.c | 103 +- + drivers/edac/Makefile | 2 + + drivers/edac/altera_edac.c | 20 +- + drivers/edac/altera_edac.h | 2 - + drivers/edac/amd64_edac.c | 35 +- + drivers/edac/amd64_edac.h | 58 +- + drivers/edac/debugfs.c | 163 +++ + drivers/edac/edac_core.h | 2 + + drivers/edac/edac_mc_sysfs.c | 148 +-- + drivers/edac/edac_module.h | 34 +- + drivers/edac/ghes_edac.c | 22 +- + drivers/edac/i5100_edac.c | 37 +- + drivers/edac/ppc4xx_edac.c | 1 + + drivers/edac/sb_edac.c | 8 +- + drivers/edac/xgene_edac.c | 1193 ++++++++++++++++---- + include/linux/edac.h | 2 - + 24 files changed, 1511 insertions(+), 481 deletions(-) + create mode 100644 drivers/edac/debugfs.c +Merging irqchip/irqchip/for-next (a8bcdc32fafb Merge branch 'irqchip/core' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) +$ git merge tiny/tiny/next +Already up-to-date. +Merging ftrace/for-next (37aea98b84c0 tracing: Add trace options for tracer options to instances) +$ git merge ftrace/for-next +Auto-merging kernel/trace/trace_sched_wakeup.c +Auto-merging kernel/trace/ftrace.c +Merge made by the 'recursive' strategy. + include/linux/trace_events.h | 13 +- + include/trace/perf.h | 258 ---------------------- + include/trace/trace_events.h | 258 ++++++++++++++++++++++ + kernel/trace/blktrace.c | 11 +- + kernel/trace/ftrace.c | 19 +- + kernel/trace/trace.c | 403 ++++++++++++++++++++++------------- + kernel/trace/trace.h | 154 ++++++++----- + kernel/trace/trace_events.c | 12 +- + kernel/trace/trace_functions_graph.c | 63 ++++-- + kernel/trace/trace_irqsoff.c | 98 +++++---- + kernel/trace/trace_kdb.c | 8 +- + kernel/trace/trace_mmiotrace.c | 4 +- + kernel/trace/trace_output.c | 97 ++++----- + kernel/trace/trace_output.h | 4 - + kernel/trace/trace_printk.c | 14 +- + kernel/trace/trace_probe.h | 8 +- + kernel/trace/trace_sched_wakeup.c | 112 +++++----- + kernel/trace/trace_syscalls.c | 3 +- + 18 files changed, 869 insertions(+), 670 deletions(-) +Merging rcu/rcu/next (7afa512b9fb6 rcutorture: Default grace period to three minutes, allow override) +$ git merge rcu/rcu/next +Auto-merging kernel/sched/core.c +Auto-merging kernel/exit.c +Auto-merging kernel/cpu.c +Auto-merging include/linux/sched.h +Auto-merging Documentation/memory-barriers.txt +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/RCU/stallwarn.txt | 7 + + Documentation/RCU/torture.txt | 39 +- + Documentation/RCU/trace.txt | 32 +- + Documentation/RCU/whatisRCU.txt | 6 +- + Documentation/kernel-parameters.txt | 9 +- + Documentation/locking/locktorture.txt | 3 + + Documentation/memory-barriers.txt | 12 +- + include/linux/cpu.h | 2 - + include/linux/list.h | 17 +- + include/linux/list_bl.h | 7 +- + include/linux/list_nulls.h | 5 +- + include/linux/percpu-rwsem.h | 3 +- + include/linux/rcu_sync.h | 86 ++++ + include/linux/rculist.h | 5 +- + include/linux/rcupdate.h | 59 +-- + include/linux/rcutiny.h | 3 +- + include/linux/rcutree.h | 2 +- + include/linux/sched.h | 10 +- + include/linux/srcu.h | 5 +- + kernel/cpu.c | 13 - + kernel/exit.c | 2 + + kernel/locking/locktorture.c | 164 ++++++- + kernel/locking/percpu-rwsem.c | 90 ++-- + kernel/rcu/Makefile | 2 +- + kernel/rcu/rcutorture.c | 16 +- + kernel/rcu/srcu.c | 4 +- + kernel/rcu/sync.c | 223 +++++++++ + kernel/rcu/tiny.c | 8 +- + kernel/rcu/tree.c | 546 ++++++++++++++++----- + kernel/rcu/tree.h | 79 +-- + kernel/rcu/tree_plugin.h | 467 ++++++++++-------- + kernel/rcu/tree_trace.c | 47 +- + kernel/rcu/update.c | 2 +- + kernel/sched/core.c | 1 + + kernel/torture.c | 1 + + lib/list_debug.c | 2 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 4 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 28 +- + .../selftests/rcutorture/configs/lock/CFLIST | 4 +- + .../selftests/rcutorture/configs/lock/LOCK05 | 6 + + .../selftests/rcutorture/configs/lock/LOCK05.boot | 1 + + .../selftests/rcutorture/configs/lock/LOCK06 | 6 + + .../selftests/rcutorture/configs/lock/LOCK06.boot | 1 + + 43 files changed, 1406 insertions(+), 623 deletions(-) + create mode 100644 include/linux/rcu_sync.h + create mode 100644 kernel/rcu/sync.c + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK05 + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK05.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK06 + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK06.boot +Merging kvm/linux-next (b7d2063177a5 iommu/vt-d: Add a command line parameter for VT-d posted-interrupts) +$ git merge kvm/linux-next +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 1 + + Documentation/virtual/kvm/api.txt | 52 +++- + Documentation/virtual/kvm/locking.txt | 12 + + MAINTAINERS | 7 + + Makefile | 10 +- + arch/x86/include/asm/irq_remapping.h | 10 +- + arch/x86/include/asm/kvm_host.h | 34 ++- + arch/x86/include/asm/vmx.h | 2 +- + arch/x86/include/uapi/asm/hyperv.h | 6 + + arch/x86/include/uapi/asm/vmx.h | 4 +- + arch/x86/kernel/kvmclock.c | 46 ++- + arch/x86/kvm/Kconfig | 2 + + arch/x86/kvm/cpuid.c | 2 +- + arch/x86/kvm/cpuid.h | 16 + + arch/x86/kvm/hyperv.c | 31 +- + arch/x86/kvm/i8254.c | 4 +- + arch/x86/kvm/ioapic.c | 27 +- + arch/x86/kvm/ioapic.h | 15 +- + arch/x86/kvm/irq.c | 40 ++- + arch/x86/kvm/irq.h | 27 +- + arch/x86/kvm/irq_comm.c | 83 ++++- + arch/x86/kvm/lapic.c | 123 ++++++-- + arch/x86/kvm/lapic.h | 7 +- + arch/x86/kvm/mmu.c | 2 +- + arch/x86/kvm/svm.c | 21 +- + arch/x86/kvm/trace.h | 51 ++++ + arch/x86/kvm/vmx.c | 557 ++++++++++++++++++++++++++++------ + arch/x86/kvm/x86.c | 215 ++++++++++--- + drivers/iommu/irq_remapping.c | 12 +- + drivers/vfio/Kconfig | 1 + + drivers/vfio/pci/Kconfig | 1 + + drivers/vfio/pci/vfio_pci_intrs.c | 9 + + drivers/vfio/pci/vfio_pci_private.h | 2 + + include/linux/irqbypass.h | 90 ++++++ + include/linux/kvm_host.h | 35 ++- + include/linux/kvm_irqfd.h | 71 +++++ + include/uapi/linux/kvm.h | 7 + + kernel/sched/cputime.c | 2 + + tools/lib/traceevent/plugin_kvm.c | 25 +- + virt/Makefile | 1 + + virt/kvm/Kconfig | 3 + + virt/kvm/eventfd.c | 145 +++++---- + virt/kvm/irqchip.c | 12 +- + virt/kvm/kvm_main.c | 8 +- + virt/lib/Kconfig | 2 + + virt/lib/Makefile | 1 + + virt/lib/irqbypass.c | 257 ++++++++++++++++ + 47 files changed, 1735 insertions(+), 356 deletions(-) + create mode 100644 include/linux/irqbypass.h + create mode 100644 include/linux/kvm_irqfd.h + create mode 100644 virt/Makefile + create mode 100644 virt/lib/Kconfig + create mode 100644 virt/lib/Makefile + create mode 100644 virt/lib/irqbypass.c +Merging kvm-arm/next (1f93e4a96c91 Linux 4.3-rc2) +$ 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 (3eb4ee682542 KVM: PPC: Book3S: Take the kvm->srcu lock in kvmppc_h_logical_ci_load/store()) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (feeb6eb53dad KVM: s390: switch to get_tod_clock() and fix STP sync races) +$ git merge kvms390/next +Auto-merging arch/s390/kvm/kvm-s390.c +Merge made by the 'recursive' strategy. + arch/s390/kvm/interrupt.c | 101 ++++++++++++++++++---------------------------- + arch/s390/kvm/kvm-s390.c | 18 ++------- + arch/s390/kvm/kvm-s390.h | 24 +++++++++-- + arch/s390/kvm/priv.c | 8 +--- + 4 files changed, 66 insertions(+), 85 deletions(-) +Merging xen-tip/linux-next (10e5d40c0b61 xen/balloon: Use the correct sizeof when declaring frame_list) +$ git merge xen-tip/linux-next +Resolved 'arch/x86/xen/p2m.c' using previous resolution. +Auto-merging drivers/net/xen-netfront.c +Auto-merging drivers/block/xen-blkfront.c +Auto-merging drivers/block/xen-blkback/xenbus.c +Auto-merging arch/x86/xen/setup.c +Auto-merging arch/x86/xen/p2m.c +CONFLICT (content): Merge conflict in arch/x86/xen/p2m.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5bbc7a548d38] Merge remote-tracking branch 'xen-tip/linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/include/asm/xen/page-coherent.h | 26 +- + arch/arm/include/asm/xen/page.h | 22 +- + arch/arm/xen/enlighten.c | 6 +- + arch/arm/xen/mm.c | 39 ++- + arch/arm/xen/p2m.c | 6 +- + arch/x86/include/asm/xen/page.h | 8 +- + arch/x86/xen/grant-table.c | 2 +- + arch/x86/xen/p2m.c | 19 +- + arch/x86/xen/setup.c | 7 +- + drivers/block/xen-blkback/blkback.c | 5 +- + drivers/block/xen-blkback/common.h | 17 +- + drivers/block/xen-blkback/xenbus.c | 9 +- + drivers/block/xen-blkfront.c | 552 ++++++++++++++++++++----------- + drivers/net/xen-netback/common.h | 16 +- + drivers/net/xen-netback/netback.c | 167 ++++++---- + drivers/net/xen-netfront.c | 122 +++++-- + drivers/tty/hvc/hvc_xen.c | 4 +- + drivers/xen/balloon.c | 341 ++++++++++++------- + drivers/xen/biomerge.c | 8 + + drivers/xen/events/events_base.c | 2 +- + drivers/xen/events/events_fifo.c | 2 +- + drivers/xen/grant-table.c | 34 +- + drivers/xen/privcmd.c | 10 +- + drivers/xen/swiotlb-xen.c | 43 ++- + drivers/xen/xenbus/xenbus_client.c | 9 +- + drivers/xen/xenbus/xenbus_probe.c | 3 +- + drivers/xen/xlate_mmu.c | 124 ++++--- + include/linux/memory_hotplug.h | 2 + + include/xen/balloon.h | 12 +- + include/xen/grant_table.h | 51 +++ + include/xen/page.h | 27 +- + mm/memory_hotplug.c | 28 +- + 32 files changed, 1157 insertions(+), 566 deletions(-) +Merging percpu/for-next (5a928541585b kernel: Remove unneeded return from void function) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + include/linux/percpu-refcount.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging workqueues/for-next (874bbfe600a6 workqueue: make sure delayed work run in local cpu) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging drivers-x86/for-next (9ffecb102835 Linux 4.3-rc3) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (01e7e432df74 platform/chrome: Support reading/writing the vboot context) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/Kconfig | 5 +- + drivers/platform/chrome/Makefile | 3 +- + drivers/platform/chrome/cros_ec_dev.c | 7 ++ + drivers/platform/chrome/cros_ec_lightbar.c | 31 ++++--- + drivers/platform/chrome/cros_ec_lpc.c | 21 ++--- + drivers/platform/chrome/cros_ec_vbc.c | 137 +++++++++++++++++++++++++++++ + include/linux/mfd/cros_ec.h | 1 + + 7 files changed, 176 insertions(+), 29 deletions(-) + create mode 100644 drivers/platform/chrome/cros_ec_vbc.c +$ git reset --hard HEAD^ +HEAD is now at 42d6960e37ea Merge remote-tracking branch 'workqueues/for-next' +Merging next-20151007 version of chrome-platform +$ git merge -m next-20151007/chrome-platform 1d95e6f10fd88b936815b669f51bba2685a61b5d +Merge made by the 'recursive' strategy. + drivers/platform/chrome/Kconfig | 5 +++-- + drivers/platform/chrome/cros_ec_dev.c | 6 ++++++ + drivers/platform/chrome/cros_ec_lightbar.c | 31 ++++++++++++++++-------------- + drivers/platform/chrome/cros_ec_lpc.c | 21 +++++++++----------- + 4 files changed, 35 insertions(+), 28 deletions(-) +Merging regmap/for-next (370f4455d3bb Merge remote-tracking branches 'regmap/topic/atomic', 'regmap/topic/debugfs', 'regmap/topic/irq', 'regmap/topic/irq-hdr' and 'regmap/topic/update-offload' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/internal.h | 3 +++ + drivers/base/regmap/regmap-debugfs.c | 23 +++++++++---------- + drivers/base/regmap/regmap-irq.c | 43 +++++++++++++++++++++++++++++++----- + drivers/base/regmap/regmap.c | 41 ++++++++++++++++++++++++---------- + include/linux/regmap.h | 8 +++++++ + 5 files changed, 88 insertions(+), 30 deletions(-) +Merging hsi/for-next (d9cb7d74c479 hsi: fix double kfree) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/clients/ssi_protocol.c | 2 +- + drivers/hsi/hsi.c | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging leds/for-next (654cf406e9a1 leds: core: Move LED core callbacks out of led-class.c) +$ git merge leds/for-next +Auto-merging drivers/leds/leds-sead3.c +Merge made by the 'recursive' strategy. + arch/mips/mti-sead3/Makefile | 2 - + drivers/leds/Kconfig | 10 +++ + drivers/leds/Makefile | 1 + + drivers/leds/led-class.c | 69 +------------------- + drivers/leds/led-core.c | 73 ++++++++++++++++++++++ + drivers/leds/leds-cobalt-qube.c | 23 +------ + drivers/leds/leds-hp6xx.c | 17 +---- + drivers/leds/leds-ipaq-micro.c | 27 +++----- + drivers/leds/leds-ot200.c | 21 +------ + {arch/mips/mti-sead3 => drivers/leds}/leds-sead3.c | 1 + + drivers/leds/leds.h | 1 + + 11 files changed, 102 insertions(+), 143 deletions(-) + rename {arch/mips/mti-sead3 => drivers/leds}/leds-sead3.c (99%) +Merging ipmi/for-next (f22b7d0682d3 char: ipmi: Move MODULE_DEVICE_TABLE() to follow struct) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_si_intf.c | 82 +++++++++++++++++++++++++--------------- + 1 file changed, 52 insertions(+), 30 deletions(-) +Merging driver-core/driver-core-next (dbe2256ddd8e driver-core: platform: Provide helpers for multi-driver modules) +$ git merge driver-core/driver-core-next +Auto-merging kernel/futex.c +Auto-merging include/linux/edac.h +Auto-merging drivers/net/wireless/iwlwifi/mvm/mvm.h +Auto-merging drivers/net/wireless/ath/ath9k/hw.c +Auto-merging drivers/net/wireless/ath/ath10k/core.h +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +Auto-merging drivers/iommu/amd_iommu_init.c +Auto-merging drivers/bluetooth/hci_qca.c +Auto-merging drivers/base/regmap/internal.h +Auto-merging drivers/acpi/internal.h +Auto-merging arch/arm64/kernel/debug-monitors.c +Merge made by the 'recursive' strategy. + Documentation/driver-model/platform.txt | 14 ++++++ + Documentation/filesystems/debugfs.txt | 2 +- + arch/arm64/kernel/debug-monitors.c | 4 +- + drivers/acpi/ec_sys.c | 2 +- + drivers/acpi/internal.h | 2 +- + drivers/base/dma-contiguous.c | 2 +- + drivers/base/node.c | 31 ++++++++++-- + drivers/base/platform.c | 80 ++++++++++++++++++++++++++---- + drivers/base/regmap/internal.h | 6 +-- + drivers/base/regmap/regcache-lzo.c | 4 +- + drivers/base/regmap/regcache.c | 24 ++++----- + drivers/base/soc.c | 21 ++------ + drivers/bluetooth/hci_qca.c | 4 +- + drivers/iommu/amd_iommu_init.c | 2 +- + drivers/iommu/amd_iommu_types.h | 2 +- + drivers/misc/mei/mei_dev.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 4 +- + drivers/net/wireless/ath/ath10k/core.h | 2 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 2 +- + drivers/net/wireless/ath/ath9k/hw.c | 2 +- + drivers/net/wireless/ath/ath9k/hw.h | 4 +- + drivers/net/wireless/b43/debugfs.c | 18 +++---- + drivers/net/wireless/b43/debugfs.h | 2 +- + drivers/net/wireless/b43legacy/debugfs.c | 10 ++-- + drivers/net/wireless/b43legacy/debugfs.h | 2 +- + drivers/net/wireless/iwlegacy/common.h | 6 +-- + drivers/net/wireless/iwlwifi/mvm/mvm.h | 6 +-- + drivers/scsi/snic/snic_trc.c | 4 +- + drivers/scsi/snic/snic_trc.h | 2 +- + drivers/uwb/uwb-debug.c | 2 +- + fs/debugfs/file.c | 6 +-- + fs/sysfs/file.c | 4 +- + include/linux/debugfs.h | 4 +- + include/linux/edac.h | 2 +- + include/linux/fault-inject.h | 2 +- + include/linux/kobject.h | 2 +- + include/linux/platform_device.h | 8 +++ + kernel/futex.c | 4 +- + lib/devres.c | 2 +- + lib/dma-debug.c | 2 +- + lib/kobject.c | 12 ++--- + mm/failslab.c | 8 +-- + mm/page_alloc.c | 8 +-- + sound/soc/codecs/wm_adsp.h | 2 +- + 44 files changed, 214 insertions(+), 120 deletions(-) +Merging tty/tty-next (1a76eb5b0406 Documentation: improve line discipline method descriptions) +$ git merge tty/tty-next +Auto-merging include/linux/platform_data/atmel.h +Auto-merging drivers/tty/serial/imx.c +Auto-merging drivers/tty/serial/atmel_serial.c +Auto-merging drivers/tty/serial/8250/8250_port.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/ingenic,uart.txt | 3 +- + .../devicetree/bindings/serial/qcom,msm-uartdm.txt | 6 + + .../bindings/serial/renesas,sci-serial.txt | 2 + + .../bindings/serial/snps-dw-apb-uart.txt | 3 + + Documentation/serial/driver | 10 +- + Documentation/serial/tty.txt | 60 +- + arch/arm64/include/asm/dcc.h | 55 + + drivers/tty/hvc/Kconfig | 2 +- + drivers/tty/hvc/hvc_console.c | 18 +- + drivers/tty/hvc/hvc_dcc.c | 15 +- + drivers/tty/mips_ejtag_fdc.c | 4 +- + drivers/tty/pty.c | 7 +- + drivers/tty/serial/68328serial.c | 4 +- + drivers/tty/serial/8250/8250_core.c | 26 +- + drivers/tty/serial/8250/8250_dma.c | 6 - + drivers/tty/serial/8250/8250_dw.c | 288 ++-- + drivers/tty/serial/8250/8250_early.c | 4 + + drivers/tty/serial/8250/8250_ingenic.c | 88 +- + drivers/tty/serial/8250/8250_omap.c | 7 +- + drivers/tty/serial/8250/8250_port.c | 86 +- + drivers/tty/serial/8250/Kconfig | 11 +- + drivers/tty/serial/Kconfig | 11 +- + drivers/tty/serial/altera_uart.c | 26 +- + drivers/tty/serial/apbuart.c | 1 + + drivers/tty/serial/atmel_serial.c | 20 +- + drivers/tty/serial/clps711x.c | 2 +- + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 1 + + drivers/tty/serial/imx.c | 175 ++- + drivers/tty/serial/lpc32xx_hs.c | 7 +- + drivers/tty/serial/mpc52xx_uart.c | 7 + + drivers/tty/serial/mpsc.c | 38 +- + drivers/tty/serial/msm_serial.c | 622 ++++++++- + drivers/tty/serial/msm_serial.h | 53 +- + drivers/tty/serial/mux.c | 9 +- + drivers/tty/serial/mxs-auart.c | 2 +- + drivers/tty/serial/of_serial.c | 5 + + drivers/tty/serial/omap-serial.c | 2 + + drivers/tty/serial/samsung.c | 66 +- + drivers/tty/serial/sc16is7xx.c | 7 +- + drivers/tty/serial/serial_core.c | 8 +- + drivers/tty/serial/serial_mctrl_gpio.c | 133 +- + drivers/tty/serial/serial_mctrl_gpio.h | 40 +- + drivers/tty/serial/sh-sci.c | 1460 ++++++++++---------- + drivers/tty/serial/sh-sci.h | 49 +- + drivers/tty/serial/sprd_serial.c | 1 + + drivers/tty/serial/st-asc.c | 2 +- + drivers/tty/serial/stm32-usart.c | 3 +- + drivers/tty/sysrq.c | 6 +- + include/linux/platform_data/atmel.h | 6 - + 49 files changed, 2177 insertions(+), 1290 deletions(-) + create mode 100644 arch/arm64/include/asm/dcc.h +Merging usb/usb-next (d5f9e73309b7 USB: u132-hcd: Fix seperate word in printk message) +$ git merge usb/usb-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-usb | 20 ++++ + Documentation/usb/authorization.txt | 31 ++++++ + drivers/usb/core/config.c | 4 + + drivers/usb/core/driver.c | 14 ++- + drivers/usb/core/hcd.c | 81 ++++++++++++-- + drivers/usb/core/hub.c | 87 ++++++++------- + drivers/usb/core/message.c | 41 ++++++- + drivers/usb/core/sysfs.c | 36 +++++++ + drivers/usb/core/usb.c | 2 +- + drivers/usb/core/usb.h | 2 + + drivers/usb/host/ehci-msm.c | 6 +- + drivers/usb/host/ehci-orion.c | 3 +- + drivers/usb/host/ehci-platform.c | 12 ++- + drivers/usb/host/ehci-spear.c | 1 + + drivers/usb/host/fotg210-hcd.c | 13 +-- + drivers/usb/host/fsl-mph-dr-of.c | 1 + + drivers/usb/host/fusbh200-hcd.c | 12 +-- + drivers/usb/host/ohci-spear.c | 1 + + drivers/usb/host/u132-hcd.c | 3 +- + drivers/usb/host/uhci-platform.c | 1 + + drivers/usb/host/whci/init.c | 3 +- + drivers/usb/host/xhci-dbg.c | 17 ++- + drivers/usb/host/xhci-hub.c | 185 ++++++++++++++++++++++++++------ + drivers/usb/host/xhci-mem.c | 50 +++++++-- + drivers/usb/host/xhci-pci.c | 6 +- + drivers/usb/host/xhci-ring.c | 16 +-- + drivers/usb/host/xhci.c | 17 ++- + drivers/usb/host/xhci.h | 56 +++++++++- + drivers/usb/storage/isd200.c | 30 +++--- + drivers/usb/storage/uas.c | 16 +-- + drivers/usb/usbip/vhci_hcd.c | 8 +- + include/linux/usb.h | 4 + + include/linux/usb/hcd.h | 26 +++-- + include/uapi/linux/usb/ch9.h | 29 +++++ + tools/usb/usbip/src/usbip_detach.c | 4 +- + 35 files changed, 659 insertions(+), 179 deletions(-) +Merging usb-gadget/next (ec1f9d9f0138 usb: dwc2: gadget: parity fix in isochronous mode) +$ git merge usb-gadget/next +Auto-merging include/linux/platform_data/atmel.h +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/usb/dwc3.txt | 3 + + arch/arm/mach-s3c64xx/mach-crag6410.c | 4 +- + arch/arm/mach-s3c64xx/mach-smartq.c | 4 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 4 +- + arch/arm/plat-samsung/devs.c | 6 +- + drivers/usb/chipidea/core.c | 4 +- + drivers/usb/common/common.c | 59 +- + drivers/usb/dwc2/core.c | 481 ++++----- + drivers/usb/dwc2/core.h | 84 +- + drivers/usb/dwc2/core_intr.c | 106 +- + drivers/usb/dwc2/debugfs.c | 72 +- + drivers/usb/dwc2/gadget.c | 1247 +++++++++++++----------- + drivers/usb/dwc2/hcd.c | 343 +++++-- + drivers/usb/dwc2/hcd.h | 15 +- + drivers/usb/dwc2/hcd_ddma.c | 10 +- + drivers/usb/dwc2/hcd_intr.c | 82 +- + drivers/usb/dwc2/hcd_queue.c | 21 +- + drivers/usb/dwc2/hw.h | 1 + + drivers/usb/dwc2/platform.c | 23 +- + drivers/usb/dwc3/core.c | 88 +- + drivers/usb/dwc3/core.h | 5 + + drivers/usb/dwc3/dwc3-pci.c | 1 + + drivers/usb/dwc3/dwc3-st.c | 12 +- + drivers/usb/dwc3/gadget.c | 68 +- + drivers/usb/dwc3/platform_data.h | 2 + + drivers/usb/gadget/Kconfig | 2 +- + drivers/usb/gadget/composite.c | 4 +- + drivers/usb/gadget/epautoconf.c | 25 +- + drivers/usb/gadget/function/f_acm.c | 23 +- + drivers/usb/gadget/function/f_ecm.c | 31 +- + drivers/usb/gadget/function/f_eem.c | 16 +- + drivers/usb/gadget/function/f_hid.c | 12 +- + drivers/usb/gadget/function/f_loopback.c | 9 +- + drivers/usb/gadget/function/f_mass_storage.c | 10 +- + drivers/usb/gadget/function/f_midi.c | 26 +- + drivers/usb/gadget/function/f_ncm.c | 29 +- + drivers/usb/gadget/function/f_obex.c | 10 +- + drivers/usb/gadget/function/f_phonet.c | 8 +- + drivers/usb/gadget/function/f_printer.c | 2 - + drivers/usb/gadget/function/f_rndis.c | 24 +- + drivers/usb/gadget/function/f_serial.c | 10 +- + drivers/usb/gadget/function/f_sourcesink.c | 47 +- + drivers/usb/gadget/function/f_subset.c | 10 +- + drivers/usb/gadget/function/f_uac1.c | 4 - + drivers/usb/gadget/function/f_uac2.c | 11 - + drivers/usb/gadget/function/f_uvc.c | 42 +- + drivers/usb/gadget/function/u_ether.c | 11 +- + drivers/usb/gadget/function/u_serial.c | 5 - + drivers/usb/gadget/legacy/dbgp.c | 18 +- + drivers/usb/gadget/legacy/tcm_usb_gadget.c | 18 - + drivers/usb/gadget/udc/Kconfig | 2 +- + drivers/usb/gadget/udc/amd5536udc.c | 609 ++++++------ + drivers/usb/gadget/udc/amd5536udc.h | 5 +- + drivers/usb/gadget/udc/at91_udc.h | 8 + + drivers/usb/gadget/udc/dummy_hcd.c | 6 +- + drivers/usb/gadget/udc/pch_udc.c | 8 +- + drivers/usb/misc/usbtest.c | 51 +- + drivers/usb/musb/musb_core.c | 16 +- + drivers/usb/musb/musb_dsps.c | 15 +- + drivers/usb/musb/sunxi.c | 2 +- + drivers/usb/phy/phy-msm-usb.c | 2 +- + drivers/usb/phy/phy-qcom-8x16-usb.c | 21 +- + drivers/usb/phy/phy-tegra-usb.c | 2 +- + include/linux/platform_data/atmel.h | 9 - + include/linux/platform_data/s3c-hsotg.h | 10 +- + include/linux/usb/ch9.h | 11 +- + include/linux/usb/gadget.h | 29 +- + include/linux/usb/musb.h | 2 +- + include/linux/usb/of.h | 12 - + include/linux/usb/otg.h | 9 + + include/linux/usb/phy.h | 8 +- + tools/usb/testusb.c | 10 +- + 72 files changed, 2136 insertions(+), 1863 deletions(-) +Merging usb-serial/usb-next (6ff33f3902c3 Linux 4.3-rc1) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging staging/staging-next (d3337eb1e113 vme: tsi148: silence uninitialized variable warning) +$ git merge staging/staging-next +Removing drivers/staging/wilc1000/wilc_platform.h +Removing drivers/staging/wilc1000/wilc_oswrapper.h +Removing drivers/staging/wilc1000/wilc_memory.h +Removing drivers/staging/wilc1000/wilc_memory.c +Removing drivers/staging/wilc1000/wilc_exported_buf.c +Removing drivers/staging/wilc1000/wilc_errorsupport.h +Removing drivers/staging/lustre/lustre/obdclass/dt_object.c +Removing drivers/staging/lustre/lustre/obdclass/capa.c +Removing drivers/staging/lustre/lustre/llite/llite_capa.c +Removing drivers/staging/lustre/lustre/include/lustre_capa.h +Removing drivers/staging/lustre/lustre/include/dt_object.h +Removing drivers/staging/comedi/drivers/unioxx5.c +Auto-merging drivers/iio/gyro/bmg160_core.c +Auto-merging drivers/iio/buffer/industrialio-buffer-cb.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-iio | 20 + + Documentation/ABI/testing/sysfs-bus-iio-adc-hi8435 | 43 + + .../ABI/testing/sysfs-bus-iio-chemical-vz89x | 7 + + .../ABI/testing/sysfs-bus-iio-humidity-hdc100x | 9 + + .../ABI/testing/sysfs-bus-iio-trigger-sysfs | 22 + + Documentation/DocBook/iio.tmpl | 2 +- + .../devicetree/bindings/i2c/trivial-devices.txt | 3 +- + .../devicetree/bindings/iio/accel/mma8452.txt | 24 + + .../devicetree/bindings/iio/adc/hi8435.txt | 21 + + .../devicetree/bindings/iio/light/apds9960.txt | 22 + + .../devicetree/bindings/iio/light/us5182d.txt | 34 + + .../devicetree/bindings/vendor-prefixes.txt | 4 + + MAINTAINERS | 11 +- + drivers/iio/Kconfig | 29 +- + drivers/iio/Makefile | 6 +- + drivers/iio/accel/Kconfig | 19 +- + drivers/iio/accel/Makefile | 2 + + drivers/iio/accel/mma8452.c | 356 ++- + drivers/iio/accel/mxc4005.c | 567 ++++ + drivers/iio/accel/st_accel_core.c | 1 + + drivers/iio/adc/Kconfig | 35 +- + drivers/iio/adc/Makefile | 3 +- + drivers/iio/adc/berlin2-adc.c | 91 +- + drivers/iio/adc/hi8435.c | 534 ++++ + drivers/iio/adc/max1027.c | 1 + + drivers/iio/adc/mcp320x.c | 1 + + drivers/iio/adc/ti-adc128s052.c | 8 + + drivers/iio/adc/twl6030-gpadc.c | 1 + + drivers/iio/adc/vf610_adc.c | 101 +- + drivers/iio/adc/xilinx-xadc-core.c | 37 +- + drivers/iio/adc/xilinx-xadc.h | 2 - + drivers/iio/amplifiers/ad8366.c | 1 + + drivers/iio/buffer/Kconfig | 24 + + drivers/iio/buffer/Makefile | 8 + + .../industrialio-buffer-cb.c} | 12 + + .../{ => buffer}/industrialio-triggered-buffer.c | 0 + drivers/iio/{ => buffer}/kfifo_buf.c | 0 + drivers/iio/chemical/Kconfig | 15 + + drivers/iio/chemical/Makefile | 6 + + drivers/iio/chemical/vz89x.c | 237 ++ + drivers/iio/common/st_sensors/st_sensors_core.c | 22 + + drivers/iio/dac/ad7303.c | 7 + + drivers/iio/dac/max5821.c | 1 + + drivers/iio/frequency/adf4350.c | 9 + + drivers/iio/gyro/Kconfig | 19 +- + drivers/iio/gyro/Makefile | 4 +- + drivers/iio/gyro/bmg160.h | 10 + + drivers/iio/gyro/{bmg160.c => bmg160_core.c} | 361 +-- + drivers/iio/gyro/bmg160_i2c.c | 71 + + drivers/iio/gyro/bmg160_spi.c | 57 + + drivers/iio/gyro/st_gyro_core.c | 1 + + drivers/iio/humidity/Kconfig | 10 + + drivers/iio/humidity/Makefile | 1 + + drivers/iio/humidity/hdc100x.c | 319 ++ + drivers/iio/humidity/si7020.c | 6 +- + drivers/iio/industrialio-core.c | 10 +- + drivers/iio/industrialio-trigger.c | 12 +- + drivers/iio/industrialio-triggered-event.c | 68 + + drivers/iio/light/Kconfig | 23 + + drivers/iio/light/Makefile | 2 + + drivers/iio/light/apds9960.c | 1130 +++++++ + drivers/iio/light/opt3001.c | 1 - + drivers/iio/light/stk3310.c | 75 +- + drivers/iio/light/tsl4531.c | 9 +- + drivers/iio/light/us5182d.c | 507 ++++ + drivers/iio/magnetometer/Kconfig | 33 +- + drivers/iio/magnetometer/Makefile | 3 +- + drivers/iio/magnetometer/st_magn_core.c | 1 + + drivers/iio/pressure/st_pressure_core.c | 1 + + drivers/iio/proximity/Kconfig | 12 + + drivers/iio/proximity/Makefile | 1 + + drivers/iio/proximity/as3935.c | 7 + + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 288 ++ + drivers/iio/temperature/mlx90614.c | 90 +- + drivers/staging/android/Kconfig | 2 +- + drivers/staging/android/ashmem.c | 24 +- + drivers/staging/android/ion/compat_ion.h | 1 - + drivers/staging/android/ion/ion.c | 46 +- + drivers/staging/android/ion/ion.h | 10 +- + drivers/staging/android/ion/ion_cma_heap.c | 6 +- + drivers/staging/android/ion/ion_priv.h | 3 +- + drivers/staging/android/ion/ion_system_heap.c | 7 +- + drivers/staging/android/lowmemorykiller.c | 12 +- + drivers/staging/android/sw_sync.c | 6 +- + drivers/staging/android/uapi/ion.h | 25 +- + drivers/staging/comedi/Kconfig | 9 +- + drivers/staging/comedi/comedi_buf.c | 106 +- + drivers/staging/comedi/comedi_fops.c | 93 +- + drivers/staging/comedi/comedi_pci.c | 108 +- + drivers/staging/comedi/comedi_pcmcia.c | 104 +- + drivers/staging/comedi/comedi_usb.c | 75 +- + drivers/staging/comedi/comedidev.h | 617 +++- + drivers/staging/comedi/drivers.c | 369 ++- + drivers/staging/comedi/drivers/8255.h | 12 +- + drivers/staging/comedi/drivers/Makefile | 1 - + drivers/staging/comedi/drivers/addi_apci_3120.c | 5 - + drivers/staging/comedi/drivers/mpc624.c | 30 +- + drivers/staging/comedi/drivers/ni_tiocmd.c | 6 - + drivers/staging/comedi/drivers/ni_usb6501.c | 16 +- + drivers/staging/comedi/drivers/rtd520.c | 369 +-- + drivers/staging/comedi/drivers/rti800.c | 28 +- + drivers/staging/comedi/drivers/s526.c | 560 ++-- + drivers/staging/comedi/drivers/serial2002.c | 51 +- + drivers/staging/comedi/drivers/ssv_dnp.c | 57 +- + drivers/staging/comedi/drivers/unioxx5.c | 506 ---- + drivers/staging/comedi/drivers/usbdux.c | 164 +- + drivers/staging/comedi/drivers/usbduxfast.c | 310 +- + drivers/staging/comedi/drivers/usbduxsigma.c | 142 +- + drivers/staging/comedi/drivers/vmk80xx.c | 127 +- + .../staging/comedi/kcomedilib/kcomedilib_main.c | 32 +- + drivers/staging/dgap/dgap.c | 76 +- + drivers/staging/dgnc/dgnc_cls.c | 19 +- + drivers/staging/dgnc/dgnc_driver.c | 27 +- + drivers/staging/dgnc/dgnc_driver.h | 1 + + drivers/staging/dgnc/dgnc_mgmt.c | 3 +- + drivers/staging/dgnc/dgnc_sysfs.c | 9 +- + drivers/staging/dgnc/dgnc_tty.c | 203 +- + drivers/staging/emxx_udc/emxx_udc.c | 134 +- + drivers/staging/emxx_udc/emxx_udc.h | 30 - + drivers/staging/fbtft/fb_agm1264k-fl.c | 13 +- + drivers/staging/fbtft/fb_bd663474.c | 11 +- + drivers/staging/fbtft/fb_hx8340bn.c | 16 +- + drivers/staging/fbtft/fb_hx8347d.c | 16 +- + drivers/staging/fbtft/fb_hx8353d.c | 21 +- + drivers/staging/fbtft/fb_hx8357d.c | 12 +- + drivers/staging/fbtft/fb_ili9163.c | 13 +- + drivers/staging/fbtft/fb_ili9320.c | 21 +- + drivers/staging/fbtft/fb_ili9325.c | 20 +- + drivers/staging/fbtft/fb_ili9340.c | 14 +- + drivers/staging/fbtft/fb_ili9341.c | 20 +- + drivers/staging/fbtft/fb_ili9481.c | 10 +- + drivers/staging/fbtft/fb_ili9486.c | 12 +- + drivers/staging/fbtft/fb_pcd8544.c | 23 +- + drivers/staging/fbtft/fb_ra8875.c | 36 +- + drivers/staging/fbtft/fb_s6d02a1.c | 16 +- + drivers/staging/fbtft/fb_s6d1121.c | 18 +- + drivers/staging/fbtft/fb_ssd1289.c | 20 +- + drivers/staging/fbtft/fb_ssd1306.c | 23 +- + drivers/staging/fbtft/fb_ssd1331.c | 9 - + drivers/staging/fbtft/fb_ssd1351.c | 27 +- + drivers/staging/fbtft/fb_st7735r.c | 22 +- + drivers/staging/fbtft/fb_tinylcd.c | 14 +- + drivers/staging/fbtft/fb_tls8204.c | 22 +- + drivers/staging/fbtft/fb_uc1611.c | 10 - + drivers/staging/fbtft/fb_uc1701.c | 23 +- + drivers/staging/fbtft/fb_upd161704.c | 11 +- + drivers/staging/fbtft/fb_watterott.c | 34 +- + drivers/staging/fbtft/fbtft-bus.c | 13 +- + drivers/staging/fbtft/fbtft-core.c | 99 +- + drivers/staging/fbtft/fbtft-sysfs.c | 6 +- + drivers/staging/fbtft/fbtft.h | 9 - + drivers/staging/fbtft/fbtft_device.c | 96 +- + drivers/staging/fbtft/flexfb.c | 10 - + drivers/staging/fsl-mc/bus/dpbp.c | 356 ++- + drivers/staging/fsl-mc/bus/dpmcp-cmd.h | 2 +- + drivers/staging/fsl-mc/bus/dpmcp.c | 316 +- + drivers/staging/fsl-mc/bus/dpmcp.h | 220 +- + drivers/staging/fsl-mc/bus/dpmng.c | 31 +- + drivers/staging/fsl-mc/bus/dprc-cmd.h | 7 +- + drivers/staging/fsl-mc/bus/dprc-driver.c | 10 +- + drivers/staging/fsl-mc/bus/dprc.c | 955 +++++- + drivers/staging/fsl-mc/bus/mc-allocator.c | 10 +- + drivers/staging/fsl-mc/bus/mc-bus.c | 134 +- + drivers/staging/fsl-mc/bus/mc-sys.c | 6 +- + drivers/staging/fsl-mc/include/dpbp-cmd.h | 2 +- + drivers/staging/fsl-mc/include/dpbp.h | 303 +- + drivers/staging/fsl-mc/include/dpcon-cmd.h | 2 +- + drivers/staging/fsl-mc/include/dpmng.h | 33 +- + drivers/staging/fsl-mc/include/dprc.h | 638 ++-- + drivers/staging/fsl-mc/include/mc-cmd.h | 52 +- + drivers/staging/fsl-mc/include/mc-private.h | 17 +- + drivers/staging/fsl-mc/include/mc-sys.h | 8 +- + drivers/staging/fsl-mc/include/mc.h | 18 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 19 +- + .../staging/ft1000/ft1000-usb/ft1000_download.c | 8 +- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 2 +- + drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 8 +- + drivers/staging/gdm72xx/gdm_qos.c | 2 +- + drivers/staging/gdm72xx/gdm_sdio.c | 20 +- + drivers/staging/gdm72xx/gdm_usb.c | 16 +- + drivers/staging/gdm72xx/gdm_wimax.c | 4 +- + drivers/staging/gdm72xx/sdio_boot.c | 4 +- + drivers/staging/gdm72xx/usb_boot.c | 8 +- + drivers/staging/goldfish/goldfish_nand.c | 4 +- + drivers/staging/goldfish/goldfish_nand_reg.h | 10 +- + drivers/staging/iio/accel/lis3l02dq_ring.c | 6 +- + drivers/staging/iio/adc/lpc32xx_adc.c | 4 +- + drivers/staging/iio/addac/adt7316.c | 14 +- + drivers/staging/iio/cdc/ad7150.c | 12 +- + drivers/staging/iio/cdc/ad7152.c | 12 +- + drivers/staging/iio/cdc/ad7746.c | 22 +- + drivers/staging/iio/iio_dummy_evgen.c | 26 +- + drivers/staging/iio/iio_simple_dummy.h | 1 + + drivers/staging/iio/iio_simple_dummy_events.c | 19 +- + drivers/staging/iio/light/isl29028.c | 11 +- + drivers/staging/iio/light/tsl2583.c | 10 +- + drivers/staging/iio/magnetometer/hmc5843.h | 2 +- + drivers/staging/iio/magnetometer/hmc5843_core.c | 4 +- + drivers/staging/iio/magnetometer/hmc5843_i2c.c | 2 +- + drivers/staging/iio/magnetometer/hmc5843_spi.c | 4 +- + drivers/staging/iio/meter/ade7753.c | 8 +- + drivers/staging/iio/meter/ade7754.c | 6 +- + drivers/staging/iio/meter/ade7758_core.c | 6 +- + drivers/staging/iio/meter/ade7759.c | 8 +- + drivers/staging/iio/meter/ade7854.c | 6 +- + drivers/staging/iio/resolver/ad2s90.c | 10 +- + .../staging/lustre/include/linux/libcfs/libcfs.h | 11 +- + .../lustre/include/linux/libcfs/libcfs_debug.h | 1 + + .../lustre/include/linux/libcfs/libcfs_prim.h | 13 - + .../lustre/include/linux/libcfs/libcfs_private.h | 2 +- + .../lustre/include/linux/libcfs/libcfs_time.h | 49 - + .../lustre/include/linux/libcfs/linux/linux-time.h | 35 +- + .../staging/lustre/include/linux/lnet/lib-lnet.h | 6 +- + .../staging/lustre/include/linux/lnet/lib-types.h | 2 +- + drivers/staging/lustre/include/linux/lnet/types.h | 2 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 16 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 287 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 60 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 53 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 6 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 16 +- + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 6 +- + drivers/staging/lustre/lnet/lnet/api-ni.c | 10 +- + drivers/staging/lustre/lnet/lnet/config.c | 2 +- + drivers/staging/lustre/lnet/lnet/lib-eq.c | 9 +- + drivers/staging/lustre/lnet/lnet/lib-move.c | 4 +- + drivers/staging/lustre/lnet/lnet/lib-ptl.c | 4 +- + drivers/staging/lustre/lnet/lnet/router.c | 12 +- + drivers/staging/lustre/lnet/lnet/router_proc.c | 45 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 6 +- + drivers/staging/lustre/lnet/selftest/conctl.c | 2 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 17 +- + drivers/staging/lustre/lnet/selftest/conrpc.h | 4 +- + drivers/staging/lustre/lnet/selftest/console.c | 18 +- + drivers/staging/lustre/lnet/selftest/console.h | 2 +- + drivers/staging/lustre/lnet/selftest/framework.c | 9 +- + drivers/staging/lustre/lnet/selftest/ping_test.c | 16 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 9 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 24 +- + drivers/staging/lustre/lnet/selftest/timer.c | 14 +- + drivers/staging/lustre/lnet/selftest/timer.h | 2 +- + drivers/staging/lustre/lustre/fid/fid_request.c | 132 +- + drivers/staging/lustre/lustre/fid/lproc_fid.c | 3 - + drivers/staging/lustre/lustre/fld/fld_cache.c | 3 +- + drivers/staging/lustre/lustre/fld/fld_internal.h | 3 - + drivers/staging/lustre/lustre/fld/fld_request.c | 1 - + drivers/staging/lustre/lustre/fld/lproc_fld.c | 1 - + drivers/staging/lustre/lustre/include/cl_object.h | 55 +- + drivers/staging/lustre/lustre/include/dt_object.h | 1496 ---------- + .../staging/lustre/lustre/include/interval_tree.h | 36 - + drivers/staging/lustre/lustre/include/lclient.h | 27 +- + .../lustre/lustre/include/linux/lustre_lite.h | 2 +- + .../staging/lustre/lustre/include/lprocfs_status.h | 40 +- + drivers/staging/lustre/lustre/include/lu_object.h | 52 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 72 +- + .../lustre/lustre/include/lustre/lustre_user.h | 9 +- + .../staging/lustre/lustre/include/lustre_capa.h | 305 -- + drivers/staging/lustre/lustre/include/lustre_cfg.h | 6 +- + .../staging/lustre/lustre/include/lustre_debug.h | 1 - + .../staging/lustre/lustre/include/lustre_disk.h | 153 +- + drivers/staging/lustre/lustre/include/lustre_dlm.h | 115 +- + .../lustre/lustre/include/lustre_dlm_flags.h | 228 +- + .../staging/lustre/lustre/include/lustre_eacl.h | 4 - + .../staging/lustre/lustre/include/lustre_export.h | 37 +- + drivers/staging/lustre/lustre/include/lustre_fid.h | 94 - + drivers/staging/lustre/lustre/include/lustre_fld.h | 4 - + .../staging/lustre/lustre/include/lustre_handles.h | 1 - + .../staging/lustre/lustre/include/lustre_import.h | 17 +- + drivers/staging/lustre/lustre/include/lustre_lib.h | 11 +- + drivers/staging/lustre/lustre/include/lustre_log.h | 74 +- + drivers/staging/lustre/lustre/include/lustre_mds.h | 5 - + drivers/staging/lustre/lustre/include/lustre_net.h | 142 +- + .../staging/lustre/lustre/include/lustre_param.h | 10 - + .../lustre/lustre/include/lustre_req_layout.h | 11 - + drivers/staging/lustre/lustre/include/lustre_sec.h | 34 +- + drivers/staging/lustre/lustre/include/obd.h | 186 +- + drivers/staging/lustre/lustre/include/obd_class.h | 107 +- + .../staging/lustre/lustre/include/obd_support.h | 204 +- + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 81 +- + drivers/staging/lustre/lustre/ldlm/interval_tree.c | 271 -- + drivers/staging/lustre/lustre/ldlm/l_lock.c | 7 +- + drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 22 +- + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 277 +- + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 36 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 37 - + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 382 +-- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 127 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 438 +-- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 379 +-- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 185 +- + drivers/staging/lustre/lustre/libcfs/debug.c | 4 +- + drivers/staging/lustre/lustre/libcfs/fail.c | 4 +- + drivers/staging/lustre/lustre/libcfs/hash.c | 18 +- + drivers/staging/lustre/lustre/libcfs/libcfs_lock.c | 6 +- + drivers/staging/lustre/lustre/libcfs/libcfs_mem.c | 10 +- + .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 3 +- + .../lustre/lustre/libcfs/linux/linux-crypto.c | 5 +- + .../lustre/lustre/libcfs/linux/linux-debug.c | 2 +- + .../lustre/lustre/libcfs/linux/linux-prim.c | 70 - + .../lustre/lustre/libcfs/linux/linux-tracefile.c | 32 +- + drivers/staging/lustre/lustre/libcfs/module.c | 185 +- + drivers/staging/lustre/lustre/libcfs/tracefile.c | 4 +- + drivers/staging/lustre/lustre/libcfs/workitem.c | 12 +- + drivers/staging/lustre/lustre/llite/Makefile | 2 +- + drivers/staging/lustre/lustre/llite/dir.c | 13 +- + drivers/staging/lustre/lustre/llite/file.c | 67 +- + drivers/staging/lustre/lustre/llite/llite_capa.c | 661 ----- + drivers/staging/lustre/lustre/llite/llite_close.c | 5 +- + .../staging/lustre/lustre/llite/llite_internal.h | 46 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 160 +- + drivers/staging/lustre/lustre/llite/llite_nfs.c | 5 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 29 +- + drivers/staging/lustre/lustre/llite/namei.c | 52 +- + drivers/staging/lustre/lustre/llite/remote_perm.c | 5 +- + drivers/staging/lustre/lustre/llite/rw.c | 38 +- + drivers/staging/lustre/lustre/llite/statahead.c | 36 +- + drivers/staging/lustre/lustre/llite/super25.c | 36 +- + drivers/staging/lustre/lustre/llite/vvp_io.c | 6 +- + drivers/staging/lustre/lustre/llite/vvp_object.c | 12 +- + drivers/staging/lustre/lustre/llite/xattr.c | 17 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 68 +- + .../staging/lustre/lustre/lov/lov_cl_internal.h | 3 - + drivers/staging/lustre/lustre/lov/lov_dev.c | 2 + + drivers/staging/lustre/lustre/lov/lov_internal.h | 2 - + drivers/staging/lustre/lustre/lov/lov_io.c | 4 +- + drivers/staging/lustre/lustre/lov/lov_obd.c | 30 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 13 +- + drivers/staging/lustre/lustre/lov/lov_pack.c | 20 - + drivers/staging/lustre/lustre/lov/lov_pool.c | 22 - + drivers/staging/lustre/lustre/lov/lov_request.c | 2 - + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 18 +- + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 48 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 43 +- + drivers/staging/lustre/lustre/mdc/mdc_reint.c | 24 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 255 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 46 +- + drivers/staging/lustre/lustre/obdclass/Makefile | 2 +- + drivers/staging/lustre/lustre/obdclass/acl.c | 119 - + drivers/staging/lustre/lustre/obdclass/capa.c | 421 --- + drivers/staging/lustre/lustre/obdclass/cl_io.c | 103 +- + drivers/staging/lustre/lustre/obdclass/cl_lock.c | 42 +- + drivers/staging/lustre/lustre/obdclass/cl_object.c | 52 +- + drivers/staging/lustre/lustre/obdclass/cl_page.c | 3 +- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 114 +- + drivers/staging/lustre/lustre/obdclass/debug.c | 10 - + drivers/staging/lustre/lustre/obdclass/dt_object.c | 1054 ------- + drivers/staging/lustre/lustre/obdclass/genops.c | 592 +--- + .../lustre/lustre/obdclass/linux/linux-module.c | 2 - + .../lustre/lustre/obdclass/linux/linux-obdo.c | 137 - + .../lustre/lustre/obdclass/linux/linux-sysctl.c | 4 - + drivers/staging/lustre/lustre/obdclass/llog.c | 548 +--- + drivers/staging/lustre/lustre/obdclass/llog_cat.c | 574 ---- + .../staging/lustre/lustre/obdclass/llog_internal.h | 19 - + drivers/staging/lustre/lustre/obdclass/llog_obd.c | 30 - + .../lustre/lustre/obdclass/lprocfs_counters.c | 9 - + .../lustre/lustre/obdclass/lprocfs_status.c | 368 +-- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 362 +-- + .../lustre/lustre/obdclass/lustre_handles.c | 19 +- + .../staging/lustre/lustre/obdclass/obd_config.c | 439 +-- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 149 +- + drivers/staging/lustre/lustre/obdclass/obdo.c | 170 -- + .../staging/lustre/lustre/obdclass/statfs_pack.c | 14 - + .../staging/lustre/lustre/obdecho/echo_client.c | 16 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 36 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 28 +- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 2 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 6 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 8 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 5 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 201 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 182 +- + drivers/staging/lustre/lustre/ptlrpc/events.c | 10 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 63 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 142 +- + drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 36 - + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 100 +- + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 21 +- + drivers/staging/lustre/lustre/ptlrpc/nrs.c | 127 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 305 +- + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 166 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 19 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 5 +- + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 740 +++-- + drivers/staging/lustre/lustre/ptlrpc/sec.c | 147 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 352 +-- + drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 75 +- + drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 21 +- + drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 2 + + drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 1 + + drivers/staging/lustre/lustre/ptlrpc/service.c | 508 +--- + drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 6 +- + drivers/staging/media/lirc/lirc_sasem.c | 10 +- + drivers/staging/most/aim-cdev/cdev.c | 58 +- + drivers/staging/most/aim-network/networking.c | 40 +- + drivers/staging/most/aim-sound/sound.c | 111 +- + drivers/staging/most/aim-v4l2/Makefile | 1 - + drivers/staging/most/aim-v4l2/video.c | 20 +- + drivers/staging/most/hdm-dim2/dim2_hal.c | 9 +- + drivers/staging/most/hdm-dim2/dim2_hal.h | 5 - + drivers/staging/most/hdm-dim2/dim2_hdm.c | 42 +- + drivers/staging/most/hdm-i2c/hdm_i2c.c | 24 +- + drivers/staging/most/hdm-usb/hdm_usb.c | 129 +- + drivers/staging/most/mostcore/core.c | 179 +- + drivers/staging/most/mostcore/mostcore.h | 11 +- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 1 + + drivers/staging/octeon-usb/octeon-hcd.c | 1 + + drivers/staging/octeon/ethernet-defines.h | 4 +- + drivers/staging/octeon/ethernet-rx.c | 10 +- + drivers/staging/octeon/ethernet-tx.c | 6 +- + drivers/staging/octeon/ethernet.c | 8 +- + drivers/staging/octeon/octeon-ethernet.h | 2 +- + drivers/staging/olpc_dcon/olpc_dcon.c | 27 +- + drivers/staging/olpc_dcon/olpc_dcon.h | 4 +- + drivers/staging/panel/panel.c | 83 +- + drivers/staging/rdma/Kconfig | 2 +- + drivers/staging/rdma/amso1100/c2_alloc.c | 2 +- + drivers/staging/rdma/amso1100/c2_mq.c | 1 + + drivers/staging/rdma/amso1100/c2_provider.c | 2 +- + drivers/staging/rdma/ehca/ehca_cq.c | 13 +- + drivers/staging/rdma/hfi1/device.c | 2 +- + drivers/staging/rdma/hfi1/file_ops.c | 9 +- + drivers/staging/rdma/hfi1/rc.c | 2 +- + drivers/staging/rdma/hfi1/sdma.c | 6 +- + drivers/staging/rdma/hfi1/user_sdma.c | 3 +- + drivers/staging/rdma/hfi1/verbs.c | 1 + + drivers/staging/rdma/ipath/ipath_driver.c | 19 +- + drivers/staging/rdma/ipath/ipath_file_ops.c | 12 +- + drivers/staging/rdma/ipath/ipath_iba6110.c | 7 +- + drivers/staging/rdma/ipath/ipath_init_chip.c | 10 +- + drivers/staging/rdma/ipath/ipath_intr.c | 7 +- + drivers/staging/rdma/ipath/ipath_sysfs.c | 7 +- + drivers/staging/rdma/ipath/ipath_user_sdma.c | 4 +- + drivers/staging/rdma/ipath/ipath_verbs.c | 4 +- + drivers/staging/rtl8188eu/Kconfig | 2 +- + drivers/staging/rtl8188eu/Makefile | 1 + + drivers/staging/rtl8188eu/core/rtw_cmd.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 80 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 14 + + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 15 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 6 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 4 + + .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | 14 +- + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 4 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 2 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 6 +- + drivers/staging/rtl8188eu/include/drv_types.h | 2 + + drivers/staging/rtl8188eu/include/ieee80211.h | 4 +- + drivers/staging/rtl8188eu/include/mon.h | 36 + + drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 4 - + drivers/staging/rtl8188eu/include/wifi.h | 12 - + drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 4 +- + drivers/staging/rtl8188eu/os_dep/mon.c | 195 ++ + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 5 + + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 2 +- + drivers/staging/rtl8188eu/os_dep/recv_linux.c | 2 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 10 + + drivers/staging/rtl8192e/dot11d.c | 4 - + drivers/staging/rtl8192e/dot11d.h | 4 - + drivers/staging/rtl8192e/rtl8192e/r8190P_def.h | 4 - + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h | 4 - + drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 4 - + drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h | 4 - + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 95 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 4 - + .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 31 +- + .../staging/rtl8192e/rtl8192e/r8192E_firmware.h | 4 - + drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 4 - + drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c | 4 - + drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h | 4 - + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 240 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 4 - + drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h | 4 - + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.h | 4 - + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 344 ++- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 4 - + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 309 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 4 - + drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c | 4 - + drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h | 4 - + drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c | 14 +- + drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/rtl_pci.h | 4 - + drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 4 - + drivers/staging/rtl8192e/rtl8192e/rtl_pm.h | 4 - + drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 31 +- + drivers/staging/rtl8192e/rtl8192e/rtl_ps.h | 4 - + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 349 ++- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.h | 4 - + drivers/staging/rtl8192e/rtl819x_BA.h | 4 - + drivers/staging/rtl8192e/rtl819x_BAProc.c | 8 +- + drivers/staging/rtl8192e/rtl819x_HT.h | 4 - + drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 - + drivers/staging/rtl8192e/rtl819x_Qos.h | 4 - + drivers/staging/rtl8192e/rtl819x_TS.h | 4 - + drivers/staging/rtl8192e/rtl819x_TSProc.c | 4 - + drivers/staging/rtl8192e/rtllib_debug.h | 4 - + drivers/staging/rtl8192e/rtllib_module.c | 4 - + drivers/staging/rtl8192e/rtllib_rx.c | 14 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 14 +- + drivers/staging/rtl8192e/rtllib_tx.c | 12 +- + drivers/staging/rtl8192e/rtllib_wx.c | 4 - + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 47 +- + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 2 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 3 +- + .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 102 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 2 +- + drivers/staging/rtl8192u/r8192U.h | 4 +- + drivers/staging/rtl8192u/r8192U_core.c | 1918 ++++++------ + drivers/staging/rtl8712/mlme_linux.c | 3 +- + drivers/staging/rtl8712/osdep_service.h | 4 - + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 28 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 2 +- + drivers/staging/rtl8712/usb_ops_linux.c | 2 +- + drivers/staging/rtl8712/wifi.h | 9 - + drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 7 +- + drivers/staging/rtl8723au/core/rtw_security.c | 17 +- + drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 46 +- + drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c | 55 +- + drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c | 48 +- + drivers/staging/rtl8723au/hal/usb_halinit.c | 5 +- + drivers/staging/rtl8723au/include/rtw_cmd.h | 2 - + drivers/staging/rts5208/rtsx_chip.c | 28 +- + drivers/staging/skein/skein_api.h | 48 +- + drivers/staging/slicoss/slicoss.c | 28 +- + drivers/staging/sm750fb/ddk750_chip.c | 191 +- + drivers/staging/sm750fb/ddk750_chip.h | 6 - + drivers/staging/sm750fb/ddk750_display.c | 33 - + drivers/staging/sm750fb/ddk750_display.h | 55 - + drivers/staging/sm750fb/ddk750_help.h | 9 +- + drivers/staging/sm750fb/ddk750_hwi2c.c | 109 +- + drivers/staging/sm750fb/ddk750_hwi2c.h | 9 +- + drivers/staging/sm750fb/ddk750_power.c | 63 +- + drivers/staging/sm750fb/ddk750_power.h | 17 - + drivers/staging/sm750fb/ddk750_reg.h | 244 -- + drivers/staging/sm750fb/ddk750_sii164.c | 8 +- + drivers/staging/sm750fb/ddk750_swi2c.c | 296 +- + drivers/staging/sm750fb/ddk750_swi2c.h | 47 +- + drivers/staging/sm750fb/sm750.c | 62 +- + drivers/staging/sm750fb/sm750.h | 11 - + drivers/staging/sm750fb/sm750_accel.c | 51 +- + drivers/staging/sm750fb/sm750_cursor.c | 74 +- + drivers/staging/sm750fb/sm750_help.h | 37 +- + drivers/staging/sm750fb/sm750_hw.c | 78 +- + drivers/staging/sm750fb/sm750_hw.h | 3 - + drivers/staging/speakup/devsynth.c | 4 +- + drivers/staging/speakup/kobjects.c | 16 +- + drivers/staging/speakup/serialio.c | 4 +- + drivers/staging/speakup/speakup_dectlk.c | 3 +- + drivers/staging/speakup/varhandlers.c | 18 +- + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 1 - + .../Documentation/ABI/sysfs-platform-visorchipset | 2 + + drivers/staging/unisys/Documentation/overview.txt | 458 ++- + drivers/staging/unisys/Kconfig | 2 + + drivers/staging/unisys/Makefile | 2 + + drivers/staging/unisys/TODO | 25 +- + drivers/staging/unisys/include/iochannel.h | 26 +- + drivers/staging/unisys/visorbus/periodic_work.c | 8 +- + drivers/staging/unisys/visorhba/Kconfig | 14 + + drivers/staging/unisys/visorhba/Makefile | 10 + + drivers/staging/unisys/visorhba/visorhba_main.c | 1241 ++++++++ + drivers/staging/unisys/visorinput/Kconfig | 10 + + drivers/staging/unisys/visorinput/Makefile | 7 + + .../staging/unisys/visorinput/ultrainputreport.h | 74 + + drivers/staging/unisys/visorinput/visorinput.c | 728 +++++ + drivers/staging/unisys/visornic/visornic_main.c | 42 - + drivers/staging/vt6655/baseband.c | 14 +- + drivers/staging/vt6655/card.c | 14 +- + drivers/staging/vt6655/desc.h | 58 +- + drivers/staging/vt6655/device.h | 26 +- + drivers/staging/vt6655/device_main.c | 842 +++--- + drivers/staging/vt6655/dpc.c | 8 +- + drivers/staging/vt6655/dpc.h | 2 +- + drivers/staging/vt6656/device.h | 2 + + drivers/staging/vt6656/int.c | 14 +- + drivers/staging/vt6656/main_usb.c | 28 +- + drivers/staging/vt6656/power.c | 2 +- + drivers/staging/vt6656/rxtx.c | 5 +- + drivers/staging/vt6656/usbpipe.c | 6 - + drivers/staging/wilc1000/Kconfig | 1 - + drivers/staging/wilc1000/Makefile | 11 +- + drivers/staging/wilc1000/coreconfigurator.c | 1520 +--------- + drivers/staging/wilc1000/coreconfigurator.h | 68 +- + drivers/staging/wilc1000/host_interface.c | 3084 ++++++++------------ + drivers/staging/wilc1000/host_interface.h | 270 +- + drivers/staging/wilc1000/linux_mon.c | 190 +- + drivers/staging/wilc1000/linux_wlan.c | 1102 ++----- + drivers/staging/wilc1000/linux_wlan_common.h | 22 +- + drivers/staging/wilc1000/linux_wlan_sdio.c | 10 +- + drivers/staging/wilc1000/linux_wlan_spi.c | 103 +- + drivers/staging/wilc1000/linux_wlan_spi.h | 4 +- + drivers/staging/wilc1000/wilc_errorsupport.h | 67 - + drivers/staging/wilc1000/wilc_exported_buf.c | 71 - + drivers/staging/wilc1000/wilc_memory.c | 16 - + drivers/staging/wilc1000/wilc_memory.h | 66 - + drivers/staging/wilc1000/wilc_msgqueue.c | 161 +- + drivers/staging/wilc1000/wilc_msgqueue.h | 27 +- + drivers/staging/wilc1000/wilc_oswrapper.h | 29 - + drivers/staging/wilc1000/wilc_platform.h | 48 - + drivers/staging/wilc1000/wilc_sdio.c | 136 +- + drivers/staging/wilc1000/wilc_spi.c | 383 +-- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 979 +++---- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 94 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 91 +- + drivers/staging/wilc1000/wilc_wlan.c | 763 ++--- + drivers/staging/wilc1000/wilc_wlan.h | 99 +- + drivers/staging/wilc1000/wilc_wlan_cfg.c | 187 +- + drivers/staging/wilc1000/wilc_wlan_cfg.h | 22 +- + drivers/staging/wilc1000/wilc_wlan_if.h | 1442 +++++---- + drivers/staging/wlan-ng/p80211conv.c | 50 +- + drivers/staging/wlan-ng/p80211conv.h | 7 +- + drivers/staging/wlan-ng/prism2fw.c | 13 +- + drivers/staging/wlan-ng/prism2sta.c | 1027 +++---- + drivers/staging/xgifb/vb_util.h | 4 +- + drivers/vme/bridges/vme_ca91cx42.c | 5 +- + drivers/vme/bridges/vme_tsi148.c | 172 +- + drivers/vme/vme.c | 90 + + drivers/vme/vme_bridge.h | 21 +- + include/linux/iio/common/st_sensors.h | 4 + + include/linux/iio/iio.h | 3 + + include/linux/iio/triggered_event.h | 11 + + include/uapi/linux/iio/types.h | 4 + + tools/iio/generic_buffer.c | 9 + + tools/iio/iio_event_monitor.c | 6 +- + 627 files changed, 22082 insertions(+), 32611 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-hi8435 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-chemical-vz89x + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-humidity-hdc100x + create mode 100644 Documentation/devicetree/bindings/iio/accel/mma8452.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/hi8435.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/apds9960.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/us5182d.txt + create mode 100644 drivers/iio/accel/mxc4005.c + create mode 100644 drivers/iio/adc/hi8435.c + create mode 100644 drivers/iio/buffer/Kconfig + create mode 100644 drivers/iio/buffer/Makefile + rename drivers/iio/{buffer_cb.c => buffer/industrialio-buffer-cb.c} (89%) + rename drivers/iio/{ => buffer}/industrialio-triggered-buffer.c (100%) + rename drivers/iio/{ => buffer}/kfifo_buf.c (100%) + create mode 100644 drivers/iio/chemical/Kconfig + create mode 100644 drivers/iio/chemical/Makefile + create mode 100644 drivers/iio/chemical/vz89x.c + create mode 100644 drivers/iio/gyro/bmg160.h + rename drivers/iio/gyro/{bmg160.c => bmg160_core.c} (75%) + create mode 100644 drivers/iio/gyro/bmg160_i2c.c + create mode 100644 drivers/iio/gyro/bmg160_spi.c + create mode 100644 drivers/iio/humidity/hdc100x.c + create mode 100644 drivers/iio/industrialio-triggered-event.c + create mode 100644 drivers/iio/light/apds9960.c + create mode 100644 drivers/iio/light/us5182d.c + create mode 100644 drivers/iio/proximity/pulsedlight-lidar-lite-v2.c + delete mode 100644 drivers/staging/comedi/drivers/unioxx5.c + delete mode 100644 drivers/staging/lustre/lustre/include/dt_object.h + delete mode 100644 drivers/staging/lustre/lustre/include/lustre_capa.h + delete mode 100644 drivers/staging/lustre/lustre/llite/llite_capa.c + delete mode 100644 drivers/staging/lustre/lustre/obdclass/capa.c + delete mode 100644 drivers/staging/lustre/lustre/obdclass/dt_object.c + create mode 100644 drivers/staging/rtl8188eu/include/mon.h + create mode 100644 drivers/staging/rtl8188eu/os_dep/mon.c + create mode 100644 drivers/staging/unisys/visorhba/Kconfig + create mode 100644 drivers/staging/unisys/visorhba/Makefile + create mode 100644 drivers/staging/unisys/visorhba/visorhba_main.c + create mode 100644 drivers/staging/unisys/visorinput/Kconfig + create mode 100644 drivers/staging/unisys/visorinput/Makefile + create mode 100644 drivers/staging/unisys/visorinput/ultrainputreport.h + create mode 100644 drivers/staging/unisys/visorinput/visorinput.c + delete mode 100644 drivers/staging/wilc1000/wilc_errorsupport.h + delete mode 100644 drivers/staging/wilc1000/wilc_exported_buf.c + delete mode 100644 drivers/staging/wilc1000/wilc_memory.c + delete mode 100644 drivers/staging/wilc1000/wilc_memory.h + delete mode 100644 drivers/staging/wilc1000/wilc_oswrapper.h + delete mode 100644 drivers/staging/wilc1000/wilc_platform.h + create mode 100644 include/linux/iio/triggered_event.h +Merging char-misc/char-misc-next (c39b7eef7d92 Merge 4.3-rc4 into char-misc-next) +$ git merge char-misc/char-misc-next +Removing drivers/misc/mic/host/mic_sysfs.c +Auto-merging drivers/misc/mei/mei_dev.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/configfs-stp-policy | 48 + + .../ABI/testing/sysfs-bus-intel_th-devices-gth | 49 + + .../ABI/testing/sysfs-bus-intel_th-devices-msc | 33 + + .../ABI/testing/sysfs-bus-intel_th-devices-pti | 24 + + .../ABI/testing/sysfs-bus-intel_th-output-devices | 13 + + Documentation/ABI/testing/sysfs-bus-mei | 7 + + Documentation/ABI/testing/sysfs-class-mic.txt | 29 +- + Documentation/ABI/testing/sysfs-class-stm | 14 + + Documentation/ABI/testing/sysfs-class-stm_source | 11 + + .../devicetree/bindings/nvmem/imx-ocotp.txt | 20 + + .../devicetree/bindings/nvmem/mxs-ocotp.txt | 25 + + .../devicetree/bindings/nvmem/rockchip-efuse.txt | 38 + + .../devicetree/bindings/nvmem/vf610-ocotp.txt | 19 + + Documentation/devicetree/bindings/w1/omap-hdq.txt | 7 +- + Documentation/ioctl/ioctl-number.txt | 3 + + Documentation/mic/mic_overview.txt | 31 +- + Documentation/mic/mpssd/mpss | 4 +- + Documentation/mic/mpssd/mpssd.c | 362 ++-- + Documentation/mic/mpssd/mpssd.h | 1 + + Documentation/trace/intel_th.txt | 99 + + Documentation/trace/stm.txt | 80 + + Documentation/w1/masters/omap-hdq | 6 + + MAINTAINERS | 14 + + drivers/Kconfig | 4 + + drivers/Makefile | 2 + + drivers/char/efirtc.c | 13 +- + drivers/char/hpet.c | 25 +- + drivers/char/snsc.c | 5 +- + drivers/dma/mic_x100_dma.c | 39 +- + drivers/hwtracing/intel_th/Kconfig | 72 + + drivers/hwtracing/intel_th/Makefile | 18 + + drivers/hwtracing/intel_th/core.c | 692 +++++++ + drivers/hwtracing/intel_th/debug.c | 36 + + drivers/hwtracing/intel_th/debug.h | 34 + + drivers/hwtracing/intel_th/gth.c | 706 +++++++ + drivers/hwtracing/intel_th/gth.h | 66 + + drivers/hwtracing/intel_th/intel_th.h | 244 +++ + drivers/hwtracing/intel_th/msu.c | 1509 +++++++++++++++ + drivers/hwtracing/intel_th/msu.h | 116 ++ + drivers/hwtracing/intel_th/pci.c | 86 + + drivers/hwtracing/intel_th/pti.c | 252 +++ + drivers/hwtracing/intel_th/pti.h | 29 + + drivers/hwtracing/intel_th/sth.c | 259 +++ + drivers/hwtracing/intel_th/sth.h | 42 + + drivers/hwtracing/stm/Kconfig | 25 + + drivers/hwtracing/stm/Makefile | 9 + + drivers/hwtracing/stm/console.c | 80 + + drivers/hwtracing/stm/core.c | 1029 ++++++++++ + drivers/hwtracing/stm/dummy_stm.c | 66 + + drivers/hwtracing/stm/policy.c | 529 ++++++ + drivers/hwtracing/stm/stm.h | 87 + + drivers/memory/fsl-corenet-cf.c | 1 + + drivers/memory/ti-aemif.c | 1 + + drivers/misc/Kconfig | 2 +- + drivers/misc/ad525x_dpot-i2c.c | 1 - + drivers/misc/genwqe/card_base.h | 2 +- + drivers/misc/genwqe/card_ddcb.c | 2 +- + drivers/misc/genwqe/card_dev.c | 4 +- + drivers/misc/genwqe/card_utils.c | 5 +- + drivers/misc/hpilo.c | 6 +- + drivers/misc/kgdbts.c | 10 +- + drivers/misc/mei/bus-fixup.c | 4 +- + drivers/misc/mei/bus.c | 184 +- + drivers/misc/mei/client.h | 12 + + drivers/misc/mei/hw-me.c | 4 +- + drivers/misc/mei/mei_dev.h | 2 +- + drivers/misc/mic/Kconfig | 25 +- + drivers/misc/mic/Makefile | 2 + + drivers/misc/mic/bus/Makefile | 1 + + drivers/misc/mic/bus/cosm_bus.c | 141 ++ + drivers/misc/mic/bus/cosm_bus.h | 134 ++ + drivers/misc/mic/bus/mic_bus.c | 22 +- + drivers/misc/mic/bus/scif_bus.c | 7 +- + drivers/misc/mic/bus/scif_bus.h | 6 +- + drivers/misc/mic/card/mic_device.c | 88 +- + drivers/misc/mic/card/mic_x100.c | 2 +- + drivers/misc/mic/common/mic_dev.h | 13 + + drivers/misc/mic/cosm/Makefile | 10 + + drivers/misc/mic/cosm/cosm_debugfs.c | 155 ++ + drivers/misc/mic/cosm/cosm_main.c | 388 ++++ + drivers/misc/mic/cosm/cosm_main.h | 70 + + drivers/misc/mic/cosm/cosm_scif_server.c | 405 ++++ + drivers/misc/mic/cosm/cosm_sysfs.c | 461 +++++ + drivers/misc/mic/cosm_client/Makefile | 7 + + drivers/misc/mic/cosm_client/cosm_scif_client.c | 275 +++ + drivers/misc/mic/host/Makefile | 1 - + drivers/misc/mic/host/mic_boot.c | 317 +--- + drivers/misc/mic/host/mic_debugfs.c | 114 +- + drivers/misc/mic/host/mic_device.h | 88 +- + drivers/misc/mic/host/mic_fops.c | 4 +- + drivers/misc/mic/host/mic_intr.c | 46 +- + drivers/misc/mic/host/mic_main.c | 223 +-- + drivers/misc/mic/host/mic_smpt.c | 30 +- + drivers/misc/mic/host/mic_sysfs.c | 459 ----- + drivers/misc/mic/host/mic_virtio.c | 17 +- + drivers/misc/mic/host/mic_virtio.h | 2 +- + drivers/misc/mic/host/mic_x100.c | 46 +- + drivers/misc/mic/scif/Makefile | 5 + + drivers/misc/mic/scif/scif_api.c | 234 ++- + drivers/misc/mic/scif/scif_debugfs.c | 85 +- + drivers/misc/mic/scif/scif_dma.c | 1979 ++++++++++++++++++++ + drivers/misc/mic/scif/scif_epd.c | 26 +- + drivers/misc/mic/scif/scif_epd.h | 50 + + drivers/misc/mic/scif/scif_fd.c | 178 +- + drivers/misc/mic/scif/scif_fence.c | 771 ++++++++ + drivers/misc/mic/scif/scif_main.c | 111 +- + drivers/misc/mic/scif/scif_main.h | 37 +- + drivers/misc/mic/scif/scif_map.h | 25 +- + drivers/misc/mic/scif/scif_mmap.c | 699 +++++++ + drivers/misc/mic/scif/scif_nm.c | 20 +- + drivers/misc/mic/scif/scif_nodeqp.c | 130 +- + drivers/misc/mic/scif/scif_nodeqp.h | 42 +- + drivers/misc/mic/scif/scif_peer_bus.c | 179 +- + drivers/misc/mic/scif/scif_peer_bus.h | 42 +- + drivers/misc/mic/scif/scif_rma.c | 1770 +++++++++++++++++ + drivers/misc/mic/scif/scif_rma.h | 464 +++++ + drivers/misc/mic/scif/scif_rma_list.c | 291 +++ + drivers/misc/mic/scif/scif_rma_list.h | 57 + + drivers/misc/sgi-gru/gruhandles.c | 6 - + drivers/misc/sgi-gru/gruhandles.h | 1 - + drivers/misc/sgi-gru/grukdump.c | 16 +- + drivers/misc/sgi-gru/grukservices.c | 15 +- + drivers/misc/sgi-gru/grumain.c | 4 +- + drivers/misc/sgi-gru/grutlbpurge.c | 25 +- + drivers/misc/ti-st/st_core.c | 18 +- + drivers/misc/vmw_balloon.c | 843 +++++++-- + drivers/misc/vmw_vmci/vmci_datagram.c | 3 +- + drivers/nfc/mei_phy.c | 31 +- + drivers/nfc/mei_phy.h | 4 +- + drivers/nfc/microread/mei.c | 14 +- + drivers/nfc/pn544/mei.c | 14 +- + drivers/nvmem/Kconfig | 42 + + drivers/nvmem/Makefile | 8 + + drivers/nvmem/imx-ocotp.c | 154 ++ + drivers/nvmem/mxs-ocotp.c | 257 +++ + drivers/nvmem/rockchip-efuse.c | 186 ++ + drivers/nvmem/vf610-ocotp.c | 302 +++ + drivers/pcmcia/ds.c | 4 +- + drivers/spmi/spmi-pmic-arb.c | 11 +- + drivers/spmi/spmi.c | 5 +- + drivers/uio/uio.c | 1 + + drivers/uio/uio_fsl_elbc_gpcm.c | 1 + + drivers/w1/masters/omap_hdq.c | 224 ++- + drivers/w1/w1_int.c | 3 +- + include/linux/dmaengine.h | 4 + + include/linux/mei_cl_bus.h | 40 +- + include/linux/mic_bus.h | 3 +- + include/linux/mod_devicetable.h | 7 +- + include/linux/scif.h | 366 +++- + include/linux/spmi.h | 4 +- + include/linux/stm.h | 126 ++ + include/linux/ti_wilink_st.h | 1 + + include/uapi/linux/mic_common.h | 16 +- + include/uapi/linux/scif_ioctl.h | 85 + + include/uapi/linux/stm.h | 50 + + scripts/mod/devicetable-offsets.c | 1 + + scripts/mod/file2alias.c | 12 +- + 157 files changed, 18772 insertions(+), 2140 deletions(-) + create mode 100644 Documentation/ABI/testing/configfs-stp-policy + create mode 100644 Documentation/ABI/testing/sysfs-bus-intel_th-devices-gth + create mode 100644 Documentation/ABI/testing/sysfs-bus-intel_th-devices-msc + create mode 100644 Documentation/ABI/testing/sysfs-bus-intel_th-devices-pti + create mode 100644 Documentation/ABI/testing/sysfs-bus-intel_th-output-devices + create mode 100644 Documentation/ABI/testing/sysfs-class-stm + create mode 100644 Documentation/ABI/testing/sysfs-class-stm_source + create mode 100644 Documentation/devicetree/bindings/nvmem/imx-ocotp.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/mxs-ocotp.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/vf610-ocotp.txt + create mode 100644 Documentation/trace/intel_th.txt + create mode 100644 Documentation/trace/stm.txt + create mode 100644 drivers/hwtracing/intel_th/Kconfig + create mode 100644 drivers/hwtracing/intel_th/Makefile + create mode 100644 drivers/hwtracing/intel_th/core.c + create mode 100644 drivers/hwtracing/intel_th/debug.c + create mode 100644 drivers/hwtracing/intel_th/debug.h + create mode 100644 drivers/hwtracing/intel_th/gth.c + create mode 100644 drivers/hwtracing/intel_th/gth.h + create mode 100644 drivers/hwtracing/intel_th/intel_th.h + create mode 100644 drivers/hwtracing/intel_th/msu.c + create mode 100644 drivers/hwtracing/intel_th/msu.h + create mode 100644 drivers/hwtracing/intel_th/pci.c + create mode 100644 drivers/hwtracing/intel_th/pti.c + create mode 100644 drivers/hwtracing/intel_th/pti.h + create mode 100644 drivers/hwtracing/intel_th/sth.c + create mode 100644 drivers/hwtracing/intel_th/sth.h + create mode 100644 drivers/hwtracing/stm/Kconfig + create mode 100644 drivers/hwtracing/stm/Makefile + create mode 100644 drivers/hwtracing/stm/console.c + create mode 100644 drivers/hwtracing/stm/core.c + create mode 100644 drivers/hwtracing/stm/dummy_stm.c + create mode 100644 drivers/hwtracing/stm/policy.c + create mode 100644 drivers/hwtracing/stm/stm.h + create mode 100644 drivers/misc/mic/bus/cosm_bus.c + create mode 100644 drivers/misc/mic/bus/cosm_bus.h + create mode 100644 drivers/misc/mic/cosm/Makefile + create mode 100644 drivers/misc/mic/cosm/cosm_debugfs.c + create mode 100644 drivers/misc/mic/cosm/cosm_main.c + create mode 100644 drivers/misc/mic/cosm/cosm_main.h + create mode 100644 drivers/misc/mic/cosm/cosm_scif_server.c + create mode 100644 drivers/misc/mic/cosm/cosm_sysfs.c + create mode 100644 drivers/misc/mic/cosm_client/Makefile + create mode 100644 drivers/misc/mic/cosm_client/cosm_scif_client.c + delete mode 100644 drivers/misc/mic/host/mic_sysfs.c + create mode 100644 drivers/misc/mic/scif/scif_dma.c + create mode 100644 drivers/misc/mic/scif/scif_fence.c + create mode 100644 drivers/misc/mic/scif/scif_mmap.c + create mode 100644 drivers/misc/mic/scif/scif_rma.c + create mode 100644 drivers/misc/mic/scif/scif_rma.h + create mode 100644 drivers/misc/mic/scif/scif_rma_list.c + create mode 100644 drivers/misc/mic/scif/scif_rma_list.h + create mode 100644 drivers/nvmem/imx-ocotp.c + create mode 100644 drivers/nvmem/mxs-ocotp.c + create mode 100644 drivers/nvmem/rockchip-efuse.c + create mode 100644 drivers/nvmem/vf610-ocotp.c + create mode 100644 include/linux/stm.h + create mode 100644 include/uapi/linux/stm.h +Merging extcon/extcon-next (de992acb93df extcon: gpio: Use descriptor-based GPIO interface instead of legacy gpio_* API) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-arizona.c | 40 ++++++++---- + drivers/extcon/extcon-axp288.c | 23 ++----- + drivers/extcon/extcon-gpio.c | 130 ++++++++++++++++++++----------------- + drivers/extcon/extcon-rt8973a.c | 3 +- + drivers/extcon/extcon-sm5502.c | 3 +- + include/linux/extcon/extcon-gpio.h | 24 ++----- + 6 files changed, 112 insertions(+), 111 deletions(-) +Merging kdbus/kdbus (fc87a0ace7e3 kdbus: create /sys/fs/kdbus with sysfs_create_mount_point()) +$ git merge kdbus/kdbus +Auto-merging init/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/ioctl/ioctl-number.txt +Merge made by the 'recursive' strategy. + Documentation/Makefile | 2 +- + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/kdbus/.gitignore | 2 + + Documentation/kdbus/Makefile | 44 + + Documentation/kdbus/kdbus.bus.xml | 344 ++++ + Documentation/kdbus/kdbus.connection.xml | 1244 ++++++++++++ + Documentation/kdbus/kdbus.endpoint.xml | 429 +++++ + Documentation/kdbus/kdbus.fs.xml | 124 ++ + Documentation/kdbus/kdbus.item.xml | 839 ++++++++ + Documentation/kdbus/kdbus.match.xml | 555 ++++++ + Documentation/kdbus/kdbus.message.xml | 1276 +++++++++++++ + Documentation/kdbus/kdbus.name.xml | 711 +++++++ + Documentation/kdbus/kdbus.policy.xml | 406 ++++ + Documentation/kdbus/kdbus.pool.xml | 326 ++++ + Documentation/kdbus/kdbus.xml | 1012 ++++++++++ + Documentation/kdbus/stylesheet.xsl | 16 + + MAINTAINERS | 13 + + Makefile | 1 + + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/kdbus.h | 984 ++++++++++ + include/uapi/linux/magic.h | 2 + + init/Kconfig | 13 + + ipc/Makefile | 2 +- + ipc/kdbus/Makefile | 33 + + ipc/kdbus/bus.c | 514 +++++ + ipc/kdbus/bus.h | 101 + + ipc/kdbus/connection.c | 2227 ++++++++++++++++++++++ + ipc/kdbus/connection.h | 260 +++ + ipc/kdbus/domain.c | 296 +++ + ipc/kdbus/domain.h | 77 + + ipc/kdbus/endpoint.c | 303 +++ + ipc/kdbus/endpoint.h | 70 + + ipc/kdbus/fs.c | 508 +++++ + ipc/kdbus/fs.h | 28 + + ipc/kdbus/handle.c | 691 +++++++ + ipc/kdbus/handle.h | 103 + + ipc/kdbus/item.c | 293 +++ + ipc/kdbus/item.h | 61 + + ipc/kdbus/limits.h | 61 + + ipc/kdbus/main.c | 111 ++ + ipc/kdbus/match.c | 546 ++++++ + ipc/kdbus/match.h | 35 + + ipc/kdbus/message.c | 1040 ++++++++++ + ipc/kdbus/message.h | 120 ++ + ipc/kdbus/metadata.c | 1347 +++++++++++++ + ipc/kdbus/metadata.h | 87 + + ipc/kdbus/names.c | 854 +++++++++ + ipc/kdbus/names.h | 105 + + ipc/kdbus/node.c | 897 +++++++++ + ipc/kdbus/node.h | 86 + + ipc/kdbus/notify.c | 204 ++ + ipc/kdbus/notify.h | 30 + + ipc/kdbus/policy.c | 489 +++++ + ipc/kdbus/policy.h | 51 + + ipc/kdbus/pool.c | 728 +++++++ + ipc/kdbus/pool.h | 46 + + ipc/kdbus/queue.c | 363 ++++ + ipc/kdbus/queue.h | 84 + + ipc/kdbus/reply.c | 252 +++ + ipc/kdbus/reply.h | 68 + + ipc/kdbus/util.c | 156 ++ + ipc/kdbus/util.h | 73 + + samples/Kconfig | 7 + + samples/Makefile | 3 +- + samples/kdbus/.gitignore | 1 + + samples/kdbus/Makefile | 9 + + samples/kdbus/kdbus-api.h | 114 ++ + samples/kdbus/kdbus-workers.c | 1346 +++++++++++++ + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/kdbus/.gitignore | 1 + + tools/testing/selftests/kdbus/Makefile | 49 + + tools/testing/selftests/kdbus/kdbus-enum.c | 94 + + tools/testing/selftests/kdbus/kdbus-enum.h | 15 + + tools/testing/selftests/kdbus/kdbus-test.c | 905 +++++++++ + tools/testing/selftests/kdbus/kdbus-test.h | 84 + + tools/testing/selftests/kdbus/kdbus-util.c | 1612 ++++++++++++++++ + tools/testing/selftests/kdbus/kdbus-util.h | 218 +++ + tools/testing/selftests/kdbus/test-activator.c | 321 ++++ + tools/testing/selftests/kdbus/test-benchmark.c | 451 +++++ + tools/testing/selftests/kdbus/test-bus.c | 175 ++ + tools/testing/selftests/kdbus/test-chat.c | 124 ++ + tools/testing/selftests/kdbus/test-connection.c | 597 ++++++ + tools/testing/selftests/kdbus/test-daemon.c | 65 + + tools/testing/selftests/kdbus/test-endpoint.c | 352 ++++ + tools/testing/selftests/kdbus/test-fd.c | 789 ++++++++ + tools/testing/selftests/kdbus/test-free.c | 64 + + tools/testing/selftests/kdbus/test-match.c | 441 +++++ + tools/testing/selftests/kdbus/test-message.c | 736 +++++++ + tools/testing/selftests/kdbus/test-metadata-ns.c | 500 +++++ + tools/testing/selftests/kdbus/test-monitor.c | 176 ++ + tools/testing/selftests/kdbus/test-names.c | 272 +++ + tools/testing/selftests/kdbus/test-policy-ns.c | 632 ++++++ + tools/testing/selftests/kdbus/test-policy-priv.c | 1285 +++++++++++++ + tools/testing/selftests/kdbus/test-policy.c | 80 + + tools/testing/selftests/kdbus/test-sync.c | 369 ++++ + tools/testing/selftests/kdbus/test-timeout.c | 99 + + 96 files changed, 33729 insertions(+), 3 deletions(-) + create mode 100644 Documentation/kdbus/.gitignore + create mode 100644 Documentation/kdbus/Makefile + create mode 100644 Documentation/kdbus/kdbus.bus.xml + create mode 100644 Documentation/kdbus/kdbus.connection.xml + create mode 100644 Documentation/kdbus/kdbus.endpoint.xml + create mode 100644 Documentation/kdbus/kdbus.fs.xml + create mode 100644 Documentation/kdbus/kdbus.item.xml + create mode 100644 Documentation/kdbus/kdbus.match.xml + create mode 100644 Documentation/kdbus/kdbus.message.xml + create mode 100644 Documentation/kdbus/kdbus.name.xml + create mode 100644 Documentation/kdbus/kdbus.policy.xml + create mode 100644 Documentation/kdbus/kdbus.pool.xml + create mode 100644 Documentation/kdbus/kdbus.xml + create mode 100644 Documentation/kdbus/stylesheet.xsl + create mode 100644 include/uapi/linux/kdbus.h + create mode 100644 ipc/kdbus/Makefile + create mode 100644 ipc/kdbus/bus.c + create mode 100644 ipc/kdbus/bus.h + create mode 100644 ipc/kdbus/connection.c + create mode 100644 ipc/kdbus/connection.h + create mode 100644 ipc/kdbus/domain.c + create mode 100644 ipc/kdbus/domain.h + create mode 100644 ipc/kdbus/endpoint.c + create mode 100644 ipc/kdbus/endpoint.h + create mode 100644 ipc/kdbus/fs.c + create mode 100644 ipc/kdbus/fs.h + create mode 100644 ipc/kdbus/handle.c + create mode 100644 ipc/kdbus/handle.h + create mode 100644 ipc/kdbus/item.c + create mode 100644 ipc/kdbus/item.h + create mode 100644 ipc/kdbus/limits.h + create mode 100644 ipc/kdbus/main.c + create mode 100644 ipc/kdbus/match.c + create mode 100644 ipc/kdbus/match.h + create mode 100644 ipc/kdbus/message.c + create mode 100644 ipc/kdbus/message.h + create mode 100644 ipc/kdbus/metadata.c + create mode 100644 ipc/kdbus/metadata.h + create mode 100644 ipc/kdbus/names.c + create mode 100644 ipc/kdbus/names.h + create mode 100644 ipc/kdbus/node.c + create mode 100644 ipc/kdbus/node.h + create mode 100644 ipc/kdbus/notify.c + create mode 100644 ipc/kdbus/notify.h + create mode 100644 ipc/kdbus/policy.c + create mode 100644 ipc/kdbus/policy.h + create mode 100644 ipc/kdbus/pool.c + create mode 100644 ipc/kdbus/pool.h + create mode 100644 ipc/kdbus/queue.c + create mode 100644 ipc/kdbus/queue.h + create mode 100644 ipc/kdbus/reply.c + create mode 100644 ipc/kdbus/reply.h + create mode 100644 ipc/kdbus/util.c + create mode 100644 ipc/kdbus/util.h + create mode 100644 samples/kdbus/.gitignore + create mode 100644 samples/kdbus/Makefile + create mode 100644 samples/kdbus/kdbus-api.h + create mode 100644 samples/kdbus/kdbus-workers.c + create mode 100644 tools/testing/selftests/kdbus/.gitignore + create mode 100644 tools/testing/selftests/kdbus/Makefile + create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.c + create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.h + create mode 100644 tools/testing/selftests/kdbus/kdbus-test.c + create mode 100644 tools/testing/selftests/kdbus/kdbus-test.h + create mode 100644 tools/testing/selftests/kdbus/kdbus-util.c + create mode 100644 tools/testing/selftests/kdbus/kdbus-util.h + create mode 100644 tools/testing/selftests/kdbus/test-activator.c + create mode 100644 tools/testing/selftests/kdbus/test-benchmark.c + create mode 100644 tools/testing/selftests/kdbus/test-bus.c + create mode 100644 tools/testing/selftests/kdbus/test-chat.c + create mode 100644 tools/testing/selftests/kdbus/test-connection.c + create mode 100644 tools/testing/selftests/kdbus/test-daemon.c + create mode 100644 tools/testing/selftests/kdbus/test-endpoint.c + create mode 100644 tools/testing/selftests/kdbus/test-fd.c + create mode 100644 tools/testing/selftests/kdbus/test-free.c + create mode 100644 tools/testing/selftests/kdbus/test-match.c + create mode 100644 tools/testing/selftests/kdbus/test-message.c + create mode 100644 tools/testing/selftests/kdbus/test-metadata-ns.c + create mode 100644 tools/testing/selftests/kdbus/test-monitor.c + create mode 100644 tools/testing/selftests/kdbus/test-names.c + create mode 100644 tools/testing/selftests/kdbus/test-policy-ns.c + create mode 100644 tools/testing/selftests/kdbus/test-policy-priv.c + create mode 100644 tools/testing/selftests/kdbus/test-policy.c + create mode 100644 tools/testing/selftests/kdbus/test-sync.c + create mode 100644 tools/testing/selftests/kdbus/test-timeout.c +Merging cgroup/for-next (a3e72739b7a7 cgroup: fix too early usage of static_branch_disable()) +$ git merge cgroup/for-next +Auto-merging mm/memcontrol.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/jump_label.h +Auto-merging Documentation/cgroups/unified-hierarchy.txt +Merge made by the 'recursive' strategy. + Documentation/cgroups/unified-hierarchy.txt | 15 +- + block/blk-throttle.c | 2 +- + block/cfq-iosched.c | 4 +- + include/linux/backing-dev.h | 5 +- + include/linux/cgroup-defs.h | 60 ++- + include/linux/cgroup.h | 114 ++-- + include/linux/hugetlb_cgroup.h | 4 +- + include/linux/init_task.h | 8 - + include/linux/jump_label.h | 18 +- + include/linux/memcontrol.h | 8 +- + include/linux/sched.h | 12 - + kernel/cgroup.c | 775 +++++++++++++++------------- + kernel/cpuset.c | 70 +-- + kernel/fork.c | 4 - + mm/memcontrol.c | 25 +- + 15 files changed, 608 insertions(+), 516 deletions(-) +$ git am -3 ../patches/vmscan-build-fix.patch +Applying: vmscan build fix +$ git reset HEAD^ +Unstaged changes after reset: +M mm/vmscan.c +$ git add -A . +$ git commit -v -a --amend +[master e8be3b70da76] Merge remote-tracking branch 'cgroup/for-next' + Date: Thu Oct 8 14:27:38 2015 +1100 +Merging scsi/for-next (15e3d5a285ab 3w-9xxx: don't unmap bounce buffered commands) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/3w-9xxx.c | 28 +++++++++++++++++++++------- + drivers/scsi/libiscsi.c | 17 +++++++++++------ + drivers/scsi/scsi_dh.c | 2 +- + 3 files changed, 33 insertions(+), 14 deletions(-) +Merging target-updates/for-next (f71933438300 configfs: remove old API) +$ git merge target-updates/for-next +Resolved 'samples/Makefile' using previous resolution. +Auto-merging samples/configfs/configfs_sample.c +Auto-merging samples/Makefile +CONFLICT (content): Merge conflict in samples/Makefile +Removing include/target/target_core_fabric_configfs.h +Auto-merging include/target/target_core_base.h +Removing include/target/configfs_macros.h +Auto-merging drivers/vhost/scsi.c +Auto-merging drivers/usb/gadget/legacy/tcm_usb_gadget.c +Auto-merging drivers/usb/gadget/function/f_uac2.c +Auto-merging drivers/usb/gadget/function/f_uac1.c +Auto-merging drivers/usb/gadget/function/f_subset.c +Auto-merging drivers/usb/gadget/function/f_sourcesink.c +Auto-merging drivers/usb/gadget/function/f_serial.c +Auto-merging drivers/usb/gadget/function/f_rndis.c +Auto-merging drivers/usb/gadget/function/f_printer.c +Auto-merging drivers/usb/gadget/function/f_phonet.c +Auto-merging drivers/usb/gadget/function/f_obex.c +Auto-merging drivers/usb/gadget/function/f_ncm.c +Auto-merging drivers/usb/gadget/function/f_midi.c +Auto-merging drivers/usb/gadget/function/f_mass_storage.c +Auto-merging drivers/usb/gadget/function/f_loopback.c +Auto-merging drivers/usb/gadget/function/f_hid.c +Auto-merging drivers/usb/gadget/function/f_eem.c +Auto-merging drivers/usb/gadget/function/f_ecm.c +Auto-merging drivers/usb/gadget/function/f_acm.c +Removing Documentation/filesystems/configfs/configfs_example_explicit.c +Removing Documentation/filesystems/configfs/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 69997a8884f0] Merge remote-tracking branch 'target-updates/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/Makefile | 2 - + Documentation/filesystems/configfs/Makefile | 3 - + Documentation/filesystems/configfs/configfs.txt | 43 +- + .../configfs/configfs_example_explicit.c | 483 -------- + Documentation/target/tcm_mod_builder.py | 17 - + drivers/infiniband/ulp/srpt/ib_srpt.c | 78 +- + drivers/misc/spear13xx_pcie_gadget.c | 216 ++-- + drivers/net/netconsole.c | 269 +++-- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 153 +-- + drivers/target/iscsi/iscsi_target_configfs.c | 791 +++++-------- + drivers/target/iscsi/iscsi_target_stat.c | 666 +++++------ + drivers/target/loopback/tcm_loop.c | 60 +- + drivers/target/sbp/sbp_target.c | 87 +- + drivers/target/target_core_configfs.c | 1209 +++++++------------- + drivers/target/target_core_fabric_configfs.c | 275 ++--- + drivers/target/target_core_internal.h | 3 + + drivers/target/target_core_stat.c | 918 ++++++--------- + drivers/target/tcm_fc/tfc_cmd.c | 1 - + drivers/target/tcm_fc/tfc_conf.c | 44 +- + drivers/target/tcm_fc/tfc_io.c | 1 - + drivers/target/tcm_fc/tfc_sess.c | 1 - + drivers/usb/gadget/configfs.c | 295 ++--- + drivers/usb/gadget/function/f_acm.c | 26 +- + drivers/usb/gadget/function/f_ecm.c | 8 +- + drivers/usb/gadget/function/f_eem.c | 8 +- + drivers/usb/gadget/function/f_hid.c | 34 +- + drivers/usb/gadget/function/f_loopback.c | 32 +- + drivers/usb/gadget/function/f_mass_storage.c | 123 +- + drivers/usb/gadget/function/f_midi.c | 37 +- + drivers/usb/gadget/function/f_ncm.c | 8 +- + drivers/usb/gadget/function/f_obex.c | 26 +- + drivers/usb/gadget/function/f_phonet.c | 25 +- + drivers/usb/gadget/function/f_printer.c | 31 +- + drivers/usb/gadget/function/f_rndis.c | 8 +- + drivers/usb/gadget/function/f_serial.c | 26 +- + drivers/usb/gadget/function/f_sourcesink.c | 88 +- + drivers/usb/gadget/function/f_subset.c | 8 +- + drivers/usb/gadget/function/f_uac1.c | 39 +- + drivers/usb/gadget/function/f_uac2.c | 28 +- + drivers/usb/gadget/function/u_ether_configfs.h | 44 +- + drivers/usb/gadget/function/uvc_configfs.c | 391 +++---- + drivers/usb/gadget/legacy/tcm_usb_gadget.c | 44 +- + drivers/vhost/scsi.c | 41 +- + drivers/xen/xen-scsiback.c | 32 +- + fs/configfs/file.c | 12 +- + fs/dlm/config.c | 288 ++--- + fs/ocfs2/cluster/heartbeat.c | 205 +--- + fs/ocfs2/cluster/nodemanager.c | 281 ++--- + include/linux/configfs.h | 97 +- + include/linux/usb/gadget_configfs.h | 19 +- + include/target/configfs_macros.h | 147 --- + include/target/target_core_base.h | 60 + + include/target/target_core_fabric_configfs.h | 122 -- + samples/Makefile | 2 +- + samples/configfs/Makefile | 2 + + .../configfs/configfs_sample.c | 140 +-- + 56 files changed, 2652 insertions(+), 5445 deletions(-) + delete mode 100644 Documentation/filesystems/configfs/Makefile + delete mode 100644 Documentation/filesystems/configfs/configfs_example_explicit.c + delete mode 100644 include/target/configfs_macros.h + delete mode 100644 include/target/target_core_fabric_configfs.h + create mode 100644 samples/configfs/Makefile + rename Documentation/filesystems/configfs/configfs_example_macros.c => samples/configfs/configfs_sample.c (74%) +$ git am -3 ../patches/stm-class--Use-per-attribute-show-and-store-methods-in-configfs-policy,patch +Applying: stm class: Use per-attribute show and store methods in configfs policy +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/hwtracing/stm/policy.c +$ git add -A . +$ git commit -v -a --amend +[master 81f98eda459b] Merge remote-tracking branch 'target-updates/for-next' + Date: Thu Oct 8 14:43:59 2015 +1100 +Merging target-merge/for-next-merge (8edb1554f7c2 mpt3sas: Fix unprotected list lookup in v4.3-rc0 changes) +$ git merge target-merge/for-next-merge +Merge made by the 'recursive' strategy. + drivers/scsi/mpt3sas/mpt3sas_base.h | 25 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 595 ++++++++++++++++++++++--------- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 18 +- + 3 files changed, 458 insertions(+), 180 deletions(-) +Merging pinctrl/for-next (0254cb138f0e Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 1 + + .../bindings/pinctrl/atmel,at91-pio4-pinctrl.txt | 90 + + .../bindings/pinctrl/fsl,imx7d-pinctrl.txt | 63 +- + .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 1 + + MAINTAINERS | 7 + + arch/arm/boot/dts/sama5d2.dtsi | 14 + + drivers/pinctrl/Kconfig | 13 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/freescale/pinctrl-imx.c | 36 +- + drivers/pinctrl/freescale/pinctrl-imx.h | 2 + + drivers/pinctrl/freescale/pinctrl-imx25.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imx7d.c | 30 + + drivers/pinctrl/freescale/pinctrl-mxs.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 4 +- + drivers/pinctrl/pinconf-generic.c | 35 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 1094 ++++++++ + drivers/pinctrl/pinctrl-rockchip.c | 17 + + drivers/pinctrl/pinctrl-tz1090-pdc.c | 4 +- + drivers/pinctrl/pinctrl-tz1090.c | 4 +- + drivers/pinctrl/samsung/pinctrl-exynos5440.c | 2 +- + drivers/pinctrl/sh-pfc/Kconfig | 5 + + drivers/pinctrl/sh-pfc/Makefile | 1 + + drivers/pinctrl/sh-pfc/core.c | 6 + + drivers/pinctrl/sh-pfc/core.h | 3 + + drivers/pinctrl/sh-pfc/gpio.c | 37 +- + drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 116 +- + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 64 +- + drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 420 +-- + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 1038 ++++---- + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 1076 ++++---- + drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 846 +++--- + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 2817 ++++++++++++++++++++ + drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 64 +- + drivers/pinctrl/sh-pfc/pfc-sh7734.c | 778 +++--- + drivers/pinctrl/sh-pfc/sh_pfc.h | 12 +- + drivers/pinctrl/sunxi/Kconfig | 4 + + drivers/pinctrl/sunxi/Makefile | 1 + + drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c | 603 +++++ + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 2 +- + drivers/pinctrl/uniphier/pinctrl-ph1-ld4.c | 5 + + drivers/pinctrl/uniphier/pinctrl-ph1-ld6b.c | 5 + + drivers/pinctrl/uniphier/pinctrl-ph1-pro4.c | 11 + + drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c | 5 + + drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c | 231 +- + drivers/pinctrl/uniphier/pinctrl-proxstream2.c | 5 + + include/linux/pinctrl/pinconf-generic.h | 64 +- + 47 files changed, 7230 insertions(+), 2415 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/atmel,at91-pio4-pinctrl.txt + create mode 100644 drivers/pinctrl/pinctrl-at91-pio4.c + create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7795.c + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c +Merging vhost/linux-next (d629f2b585cb virtio: introduce avail cache) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + drivers/virtio/virtio_ring.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) +Merging remoteproc/for-next (8de3dbd0895b remoteproc: fix !CONFIG_OF build breakage) +$ git merge remoteproc/for-next +Already up-to-date. +Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (2db8aba860c7 gpio: pca953x: Add TI TCA9539 support) +$ git merge gpio/for-next +Auto-merging drivers/gpio/gpiolib.h +Auto-merging drivers/gpio/gpiolib.c +Removing drivers/gpio/gpio-msm-v2.c +Removing drivers/gpio/gpio-it8761e.c +Auto-merging Documentation/devicetree/bindings/gpio/gpio.txt +Removing Documentation/devicetree/bindings/gpio/gpio-msm.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-msm.txt | 26 -- + .../devicetree/bindings/gpio/gpio-pca953x.txt | 1 + + Documentation/devicetree/bindings/gpio/gpio.txt | 17 +- + drivers/gpio/Kconfig | 22 +- + drivers/gpio/Makefile | 3 +- + drivers/gpio/gpio-altera.c | 15 +- + drivers/gpio/gpio-arizona.c | 2 + + drivers/gpio/gpio-ath79.c | 119 +++--- + drivers/gpio/gpio-etraxfs.c | 23 +- + drivers/gpio/gpio-it87.c | 411 +++++++++++++++++++ + drivers/gpio/gpio-it8761e.c | 230 ----------- + drivers/gpio/gpio-max730x.c | 1 - + drivers/gpio/gpio-msm-v2.c | 453 --------------------- + drivers/gpio/gpio-omap.c | 80 ++-- + drivers/gpio/gpio-pca953x.c | 9 +- + drivers/gpio/gpio-pl061.c | 55 ++- + drivers/gpio/gpio-sx150x.c | 31 +- + drivers/gpio/gpio-vf610.c | 29 +- + drivers/gpio/gpio-zynq.c | 32 +- + drivers/gpio/gpiolib-of.c | 20 +- + drivers/gpio/gpiolib-sysfs.c | 8 +- + drivers/gpio/gpiolib.c | 82 +++- + drivers/gpio/gpiolib.h | 3 + + include/dt-bindings/gpio/gpio.h | 12 + + include/linux/gpio/consumer.h | 1 + + 25 files changed, 781 insertions(+), 904 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-msm.txt + create mode 100644 drivers/gpio/gpio-it87.c + delete mode 100644 drivers/gpio/gpio-it8761e.c + delete mode 100644 drivers/gpio/gpio-msm-v2.c +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 (7e3b7dc76c41 pwm: Add MediaTek display PWM driver support) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/brcm,bcm7038-pwm.txt | 20 ++ + .../devicetree/bindings/pwm/pwm-berlin.txt | 17 + + .../devicetree/bindings/pwm/pwm-mtk-disp.txt | 42 +++ + .../devicetree/bindings/pwm/renesas,pwm-rcar.txt | 27 ++ + drivers/pwm/Kconfig | 47 ++- + drivers/pwm/Makefile | 4 + + drivers/pwm/pwm-atmel-hlcdc.c | 4 + + drivers/pwm/pwm-berlin.c | 219 +++++++++++++ + drivers/pwm/pwm-brcmstb.c | 343 +++++++++++++++++++++ + drivers/pwm/pwm-mtk-disp.c | 243 +++++++++++++++ + drivers/pwm/pwm-rcar.c | 274 ++++++++++++++++ + 11 files changed, 1237 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/brcm,bcm7038-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-berlin.txt + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-mtk-disp.txt + create mode 100644 Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.txt + create mode 100644 drivers/pwm/pwm-berlin.c + create mode 100644 drivers/pwm/pwm-brcmstb.c + create mode 100644 drivers/pwm/pwm-mtk-disp.c + create mode 100644 drivers/pwm/pwm-rcar.c +Merging dma-buf/for-next (86ea07ca846a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (4b75de861505 fs: Set the size of empty dirs to 0.) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (b953c0d234bc Linux 4.1) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (7866ca1a4ad9 drivers: clk: st: Correct the pll-type for A9 for stih418) +$ git merge clk/clk-next +Auto-merging drivers/tty/serial/8250/8250_dw.c +Auto-merging drivers/base/power/domain.c +Auto-merging arch/arm/mach-at91/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/arm/mediatek/mediatek,imgsys.txt | 22 + + .../bindings/arm/mediatek/mediatek,mmsys.txt | 22 + + .../bindings/arm/mediatek/mediatek,vdecsys.txt | 22 + + .../bindings/arm/mediatek/mediatek,vencltsys.txt | 22 + + .../bindings/arm/mediatek/mediatek,vencsys.txt | 22 + + .../devicetree/bindings/clock/at91-clock.txt | 35 ++ + .../bindings/clock/brcm,bcm2835-cprman.txt | 45 ++ + .../bindings/clock/renesas,cpg-div6-clocks.txt | 2 +- + .../devicetree/bindings/clock/silabs,si514.txt | 24 + + .../devicetree/bindings/clock/st/st,clkgen-pll.txt | 1 + + arch/arm/mach-at91/Kconfig | 3 + + drivers/base/power/domain.c | 2 + + drivers/clk/Kconfig | 11 + + drivers/clk/Makefile | 2 +- + drivers/clk/at91/Makefile | 1 + + drivers/clk/at91/clk-generated.c | 306 +++++++++++ + drivers/clk/at91/clk-peripheral.c | 24 +- + drivers/clk/at91/clk-system.c | 3 +- + drivers/clk/at91/clk-utmi.c | 4 +- + drivers/clk/at91/pmc.c | 21 + + drivers/clk/at91/pmc.h | 3 + + drivers/clk/bcm/Makefile | 1 + + drivers/clk/{ => bcm}/clk-bcm2835.c | 0 + drivers/clk/clk-divider.c | 20 +- + drivers/clk/clk-fractional-divider.c | 53 +- + drivers/clk/clk-si514.c | 379 ++++++++++++++ + drivers/clk/clk.c | 2 +- + drivers/clk/hisilicon/clk-hi6220-stub.c | 2 +- + drivers/clk/imx/clk-pllv2.c | 12 +- + drivers/clk/mediatek/Makefile | 2 +- + drivers/clk/mediatek/clk-apmixed.c | 107 ++++ + drivers/clk/mediatek/clk-gate.c | 2 +- + drivers/clk/mediatek/clk-mt8173.c | 347 ++++++++++++- + drivers/clk/mediatek/clk-mtk.c | 36 +- + drivers/clk/mediatek/clk-mtk.h | 24 +- + drivers/clk/mediatek/clk-pll.c | 7 +- + drivers/clk/mvebu/common.c | 2 +- + drivers/clk/mxs/clk-frac.c | 12 +- + drivers/clk/qcom/Kconfig | 9 + + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/clk-rcg.h | 5 +- + drivers/clk/qcom/clk-rcg2.c | 170 ++++++- + drivers/clk/qcom/common.c | 16 +- + drivers/clk/qcom/common.h | 2 + + drivers/clk/qcom/gcc-apq8084.c | 42 ++ + drivers/clk/qcom/gcc-msm8916.c | 562 ++++++++++++++++++++- + drivers/clk/qcom/gcc-msm8974.c | 15 + + drivers/clk/qcom/gdsc.c | 237 +++++++++ + drivers/clk/qcom/gdsc.h | 68 +++ + drivers/clk/qcom/mmcc-apq8084.c | 104 +++- + drivers/clk/qcom/mmcc-msm8974.c | 94 +++- + drivers/clk/rockchip/clk-mmc-phase.c | 11 + + drivers/clk/rockchip/clk-pll.c | 135 ++--- + drivers/clk/rockchip/clk.c | 6 +- + drivers/clk/samsung/clk-cpu.c | 10 +- + drivers/clk/samsung/clk-exynos7.c | 467 +++++++++++------ + drivers/clk/sirf/clk-atlas7.c | 358 +++++++------ + drivers/clk/st/clk-flexgen.c | 7 +- + drivers/clk/st/clkgen-mux.c | 3 + + drivers/clk/st/clkgen-pll.c | 469 ++++++++++++++++- + drivers/clk/st/clkgen.h | 2 + + drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 1 + + drivers/clk/sunxi/clk-sun6i-apb0.c | 1 + + drivers/clk/sunxi/clk-sun6i-ar100.c | 1 + + drivers/clk/sunxi/clk-sun8i-apb0.c | 1 + + drivers/clk/sunxi/clk-sun9i-mmc.c | 1 + + drivers/clk/ti/clk-3xxx.c | 2 +- + drivers/clk/ti/clk-7xx.c | 18 +- + drivers/clk/ti/clkt_dflt.c | 4 +- + drivers/tty/serial/8250/8250_dw.c | 4 - + include/dt-bindings/clock/at91.h | 1 + + include/dt-bindings/clock/bcm2835.h | 47 ++ + include/dt-bindings/clock/exynos7-clk.h | 43 +- + include/dt-bindings/clock/mt8173-clk.h | 104 +++- + include/dt-bindings/clock/qcom,gcc-apq8084.h | 6 + + include/dt-bindings/clock/qcom,gcc-msm8916.h | 30 ++ + include/dt-bindings/clock/qcom,gcc-msm8974.h | 3 + + include/dt-bindings/clock/qcom,mmcc-apq8084.h | 10 + + include/dt-bindings/clock/qcom,mmcc-msm8974.h | 8 + + include/linux/clk-provider.h | 3 +- + include/linux/clk/at91_pmc.h | 22 +- + 81 files changed, 4145 insertions(+), 563 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,imgsys.txt + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,vdecsys.txt + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,vencltsys.txt + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,vencsys.txt + create mode 100644 Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt + create mode 100644 Documentation/devicetree/bindings/clock/silabs,si514.txt + create mode 100644 drivers/clk/at91/clk-generated.c + rename drivers/clk/{ => bcm}/clk-bcm2835.c (100%) + create mode 100644 drivers/clk/clk-si514.c + create mode 100644 drivers/clk/mediatek/clk-apmixed.c + create mode 100644 drivers/clk/qcom/gdsc.c + create mode 100644 drivers/clk/qcom/gdsc.h + create mode 100644 include/dt-bindings/clock/bcm2835.h +Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) +$ git merge random/dev +Already up-to-date. +Merging aio/master (6ff33f3902c3 Linux 4.3-rc1) +$ git merge aio/master +Already up-to-date. +Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) +$ git merge llvmlinux/for-next +Merge made by the 'recursive' strategy. +Merging kselftest/next (e2343596c9d6 selftests/pstore: add pstore test scripts going with reboot) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 4 ++ + tools/testing/selftests/efivarfs/.gitignore | 2 + + tools/testing/selftests/pstore/Makefile | 15 ++++ + tools/testing/selftests/pstore/common_tests | 83 ++++++++++++++++++++++ + tools/testing/selftests/pstore/pstore_crash_test | 30 ++++++++ + .../selftests/pstore/pstore_post_reboot_tests | 77 ++++++++++++++++++++ + tools/testing/selftests/pstore/pstore_tests | 30 ++++++++ + 7 files changed, 241 insertions(+) + create mode 100644 tools/testing/selftests/efivarfs/.gitignore + create mode 100644 tools/testing/selftests/pstore/Makefile + create mode 100755 tools/testing/selftests/pstore/common_tests + create mode 100755 tools/testing/selftests/pstore/pstore_crash_test + create mode 100755 tools/testing/selftests/pstore/pstore_post_reboot_tests + create mode 100755 tools/testing/selftests/pstore/pstore_tests +Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump) +$ git merge y2038/y2038 +Resolved 'drivers/staging/media/lirc/lirc_parallel.c' using previous resolution. +Auto-merging kernel/cpuset.c +Auto-merging fs/coredump.c +Auto-merging drivers/staging/media/lirc/lirc_serial.c +Auto-merging drivers/staging/media/lirc/lirc_sasem.c +Auto-merging drivers/staging/media/lirc/lirc_parallel.c +CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c +Auto-merging drivers/staging/gdm72xx/gdm_sdio.c +Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 460a3c754392] Merge remote-tracking branch 'y2038/y2038' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 +- + drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 4 +- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 4 +- + drivers/staging/ft1000/ft1000.h | 4 +- + drivers/staging/gdm72xx/gdm_sdio.c | 13 +++--- + drivers/staging/gdm72xx/gdm_sdio.h | 4 +- + drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++---------- + drivers/staging/media/lirc/lirc_sasem.c | 20 +++++----- + drivers/staging/media/lirc/lirc_serial.c | 50 ++++++++---------------- + fs/coredump.c | 8 ++-- + kernel/cpuset.c | 12 ++++-- + 11 files changed, 68 insertions(+), 90 deletions(-) +Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux) +$ git merge luto-misc/next +Already up-to-date. +Merging access_once/linux-next (c231afa3ccf1 compiler.h: cast away attributes in WRITE_ONCE magic) +$ git merge access_once/linux-next +Merge made by the 'recursive' strategy. +Merging livepatching/for-next (07d42d41dfc4 Merge branch 'for-4.3/upstream' into for-next) +$ git merge livepatching/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging coresight/next (ce9478fdb6e0 coresight: etm3x: making error message unambiguous) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-coresight-devices-etm3x | 77 +++++++++++++-- + drivers/hwtracing/coresight/coresight-etm3x.c | 107 ++++++++++++--------- + drivers/hwtracing/coresight/coresight-etm4x.c | 22 +++-- + drivers/hwtracing/coresight/coresight.c | 5 + + include/linux/coresight.h | 2 +- + 5 files changed, 154 insertions(+), 59 deletions(-) +Merging rtc/rtc-next (0c155bd0c179 rtc: stmp3xxx: unify register access macros) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/dallas,ds1390.txt | 18 ++++++ + drivers/rtc/Kconfig | 4 +- + drivers/rtc/rtc-ab8500.c | 6 +- + drivers/rtc/rtc-da9063.c | 18 +++--- + drivers/rtc/rtc-ds1343.c | 9 ++- + drivers/rtc/rtc-ds1390.c | 65 +++++++++++++++++++++- + drivers/rtc/rtc-opal.c | 4 +- + drivers/rtc/rtc-pcf2127.c | 2 +- + drivers/rtc/rtc-pcf85063.c | 8 +-- + drivers/rtc/rtc-pl031.c | 13 +++-- + drivers/rtc/rtc-rx8025.c | 4 +- + drivers/rtc/rtc-stmp3xxx.c | 27 +++++---- + tools/testing/selftests/timers/rtctest.c | 2 +- + 13 files changed, 132 insertions(+), 48 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/dallas,ds1390.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 (ae4f97696889 mm: fix type cast in __pfn_to_phys()) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging akpm-current/current (c3a0c7301db7 ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Resolved 'drivers/usb/host/u132-hcd.c' using previous resolution. +Resolved 'mm/failslab.c' using previous resolution. +Resolved 'mm/page_alloc.c' using previous resolution. +Resolved 'tools/testing/selftests/Makefile' using previous resolution. +Auto-merging tools/testing/selftests/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/Makefile +Auto-merging net/rxrpc/ar-connection.c +Auto-merging net/openvswitch/flow.c +Auto-merging net/core/sock.c +Auto-merging mm/vmscan.c +Auto-merging mm/page_alloc.c +CONFLICT (content): Merge conflict in mm/page_alloc.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/memcontrol.c +Auto-merging mm/huge_memory.c +Auto-merging mm/filemap.c +Auto-merging mm/failslab.c +CONFLICT (content): Merge conflict in mm/failslab.c +Auto-merging lib/kobject.c +Auto-merging lib/dma-debug.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/fork.c +Auto-merging kernel/cpuset.c +Auto-merging kernel/cgroup.c +Auto-merging kernel/audit.c +Auto-merging include/net/sock.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/hugetlb_cgroup.h +Auto-merging include/drm/drmP.h +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/proc/array.c +Auto-merging fs/ocfs2/cluster/heartbeat.c +Auto-merging fs/namei.c +Auto-merging fs/mpage.c +Auto-merging fs/jffs2/wbuf.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/readpage.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/direct-io.c +Auto-merging fs/coredump.c +Auto-merging drivers/usb/host/u132-hcd.c +CONFLICT (content): Merge conflict in drivers/usb/host/u132-hcd.c +Auto-merging drivers/usb/gadget/function/f_mass_storage.c +Auto-merging drivers/staging/rdma/ipath/ipath_file_ops.c +Auto-merging drivers/staging/lustre/lustre/llite/dir.c +Auto-merging drivers/staging/lustre/include/linux/libcfs/libcfs_private.h +Auto-merging drivers/staging/android/ion/ion_system_heap.c +Auto-merging drivers/mtd/mtdcore.c +Auto-merging drivers/misc/vmw_balloon.c +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/block/pktcdvd.c +Auto-merging block/blk-mq.c +Auto-merging arch/x86/kernel/acpi/boot.c +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm/xen/mm.c +Auto-merging arch/arm/mm/dma-mapping.c +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/filesystems/proc.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7ddf1cd0a59a] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/proc.txt | 10 + + Documentation/filesystems/vfat.txt | 10 + + Documentation/kasan.txt | 43 +- + Documentation/kernel-parameters.txt | 5 + + Documentation/printk-formats.txt | 29 + + Documentation/sysctl/kernel.txt | 12 + + Documentation/vm/balance | 14 +- + Documentation/vm/split_page_table_lock | 4 +- + Documentation/vm/transhuge.txt | 10 + + MAINTAINERS | 1 + + arch/alpha/include/uapi/asm/mman.h | 4 + + arch/arm/include/asm/pgtable-3level.h | 1 + + arch/arm/mm/alignment.c | 2 +- + arch/arm/mm/dma-mapping.c | 6 +- + arch/arm/xen/mm.c | 2 +- + arch/arm64/include/asm/pgtable.h | 2 + + arch/arm64/mm/dma-mapping.c | 4 +- + arch/mips/include/uapi/asm/mman.h | 7 + + arch/parisc/include/uapi/asm/mman.h | 4 + + arch/powerpc/include/asm/pgtable-ppc64.h | 2 + + arch/powerpc/include/uapi/asm/mman.h | 1 + + arch/powerpc/mm/numa.c | 2 +- + arch/powerpc/sysdev/fsl_pci.c | 2 +- + arch/sparc/include/asm/pgtable_64.h | 9 + + arch/sparc/include/uapi/asm/mman.h | 1 + + arch/tile/include/uapi/asm/mman.h | 1 + + arch/x86/Kconfig | 3 + + arch/x86/boot/Makefile | 4 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/kdebug.h | 6 - + arch/x86/include/asm/pgtable.h | 5 + + arch/x86/kernel/acpi/boot.c | 9 +- + arch/x86/kernel/crash.c | 3 - + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/pci-dma.c | 2 +- + arch/x86/kernel/smpboot.c | 2 + + arch/x86/mm/kasan_init_64.c | 2 +- + arch/x86/mm/numa.c | 59 +- + arch/xtensa/configs/iss_defconfig | 1 - + arch/xtensa/include/uapi/asm/mman.h | 7 + + block/bio.c | 26 +- + block/blk-core.c | 16 +- + block/blk-ioc.c | 2 +- + block/blk-mq-tag.c | 2 +- + block/blk-mq.c | 8 +- + block/genhd.c | 2 +- + block/ioprio.c | 6 +- + block/scsi_ioctl.c | 6 +- + drivers/block/drbd/drbd_bitmap.c | 2 +- + drivers/block/drbd/drbd_receiver.c | 3 +- + drivers/block/mtip32xx/mtip32xx.c | 2 +- + drivers/block/nbd.c | 9 +- + drivers/block/nvme-core.c | 4 +- + drivers/block/osdblk.c | 2 +- + drivers/block/paride/pd.c | 2 +- + drivers/block/pktcdvd.c | 4 +- + drivers/block/zram/zram_drv.c | 10 +- + drivers/connector/connector.c | 3 +- + drivers/firewire/core-cdev.c | 2 +- + drivers/gpu/drm/drm_gem.c | 2 +- + drivers/gpu/drm/drm_lock.c | 41 - + drivers/gpu/drm/i915/i915_gem.c | 5 +- + drivers/ide/ide-atapi.c | 2 +- + drivers/ide/ide-cd.c | 2 +- + drivers/ide/ide-cd_ioctl.c | 2 +- + drivers/ide/ide-devsets.c | 2 +- + drivers/ide/ide-disk.c | 2 +- + drivers/ide/ide-ioctls.c | 4 +- + drivers/ide/ide-park.c | 2 +- + drivers/ide/ide-pm.c | 4 +- + drivers/ide/ide-tape.c | 4 +- + drivers/ide/ide-taskfile.c | 4 +- + drivers/infiniband/core/sa_query.c | 2 +- + drivers/infiniband/hw/qib/qib_init.c | 2 +- + drivers/iommu/amd_iommu.c | 2 +- + drivers/iommu/intel-iommu.c | 2 +- + drivers/md/dm-crypt.c | 6 +- + drivers/md/dm-kcopyd.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-v4l2.c | 2 +- + drivers/media/pci/tw68/tw68-video.c | 2 +- + drivers/misc/sgi-xp/xpc_uv.c | 2 +- + drivers/misc/vmw_balloon.c | 2 +- + drivers/mtd/mtdcore.c | 3 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +- + drivers/scsi/scsi_error.c | 2 +- + drivers/scsi/scsi_lib.c | 4 +- + drivers/staging/android/ion/ion_system_heap.c | 2 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 2 +- + drivers/staging/lustre/lustre/llite/dir.c | 2 +- + drivers/staging/rdma/hfi1/init.c | 2 +- + drivers/staging/rdma/ipath/ipath_file_ops.c | 2 +- + drivers/usb/gadget/function/f_mass_storage.c | 4 +- + drivers/usb/host/u132-hcd.c | 2 +- + drivers/video/fbdev/vermilion/vermilion.c | 2 +- + fs/9p/vfs_file.c | 3 +- + fs/btrfs/compression.c | 7 +- + fs/btrfs/ctree.h | 2 +- + fs/btrfs/disk-io.c | 2 +- + fs/btrfs/extent_io.c | 14 +- + fs/btrfs/free-space-cache.c | 4 +- + fs/btrfs/volumes.c | 4 +- + fs/buffer.c | 2 +- + fs/cachefiles/internal.h | 2 +- + fs/ceph/addr.c | 7 +- + fs/cifs/file.c | 14 +- + fs/coredump.c | 35 +- + fs/dax.c | 90 +- + fs/direct-io.c | 2 +- + fs/ext4/fsync.c | 5 +- + fs/ext4/inode.c | 2 +- + fs/ext4/readpage.c | 4 +- + fs/ext4/super.c | 2 +- + fs/fat/cache.c | 79 +- + fs/fat/dir.c | 2 +- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 61 ++ + fs/fat/inode.c | 75 +- + fs/fs-writeback.c | 7 +- + fs/fscache/cookie.c | 2 +- + fs/fscache/page.c | 6 +- + fs/jbd2/transaction.c | 4 +- + fs/jffs2/background.c | 7 +- + fs/jffs2/wbuf.c | 2 +- + fs/logfs/dev_bdev.c | 4 +- + fs/logfs/segment.c | 2 +- + fs/mpage.c | 15 +- + fs/namei.c | 2 +- + fs/nfs/file.c | 6 +- + fs/nilfs2/alloc.c | 305 ++++-- + fs/nilfs2/alloc.h | 1 + + fs/nilfs2/inode.c | 4 +- + fs/nilfs2/mdt.c | 6 + + fs/nilfs2/mdt.h | 2 +- + fs/nilfs2/segment.c | 104 +- + fs/nilfs2/segment.h | 3 +- + fs/nilfs2/sufile.c | 8 + + fs/nilfs2/super.c | 12 +- + fs/notify/fdinfo.c | 9 +- + fs/notify/inotify/inotify_user.c | 14 +- + fs/ntfs/file.c | 4 +- + fs/ocfs2/alloc.c | 105 +- + fs/ocfs2/aops.c | 1118 ++++++++++---------- + fs/ocfs2/aops.h | 11 +- + fs/ocfs2/cluster/heartbeat.c | 19 +- + fs/ocfs2/dlm/dlmconvert.c | 24 +- + fs/ocfs2/dlm/dlmrecovery.c | 1 - + fs/ocfs2/file.c | 138 +-- + fs/ocfs2/inode.c | 3 + + fs/ocfs2/inode.h | 5 + + fs/ocfs2/journal.c | 109 +- + fs/ocfs2/localalloc.c | 4 +- + fs/ocfs2/mmap.c | 4 +- + fs/ocfs2/namei.c | 2 - + fs/ocfs2/namei.h | 3 + + fs/ocfs2/ocfs2.h | 8 + + fs/ocfs2/ocfs2_trace.h | 16 +- + fs/ocfs2/quota_global.c | 2 +- + fs/ocfs2/resize.c | 2 +- + fs/ocfs2/suballoc.c | 5 +- + fs/ocfs2/super.c | 38 +- + fs/ocfs2/super.h | 2 - + fs/proc/array.c | 10 +- + fs/proc/task_mmu.c | 39 + + fs/ramfs/file-nommu.c | 5 +- + fs/seq_file.c | 51 +- + fs/splice.c | 2 +- + fs/sync.c | 7 +- + fs/xfs/xfs_qm.c | 2 +- + include/asm-generic/dma-mapping-common.h | 2 +- + include/drm/drmP.h | 1 - + include/linux/compaction.h | 3 +- + include/linux/compiler-gcc.h | 22 +- + include/linux/compiler.h | 8 + + include/linux/cpuset.h | 10 +- + include/linux/crc64_ecma.h | 56 + + include/linux/dma-debug.h | 6 +- + include/linux/dma-mapping.h | 18 +- + include/linux/fs.h | 1 + + include/linux/gfp.h | 287 +++-- + include/linux/huge_mm.h | 4 + + include/linux/hugetlb.h | 19 + + include/linux/hugetlb_cgroup.h | 4 +- + include/linux/kernel.h | 2 + + include/linux/kexec.h | 2 + + include/linux/memblock.h | 4 - + include/linux/memcontrol.h | 64 +- + include/linux/mm.h | 89 +- + include/linux/mm_types.h | 43 +- + include/linux/mmdebug.h | 6 + + include/linux/mmzone.h | 104 +- + include/linux/moduleparam.h | 1 + + include/linux/nmi.h | 1 + + include/linux/page-flags.h | 308 +++--- + include/linux/pageblock-flags.h | 2 +- + include/linux/pagemap.h | 32 +- + include/linux/poison.h | 9 +- + include/linux/rbtree.h | 12 +- + include/linux/rmap.h | 9 +- + include/linux/sched.h | 44 +- + include/linux/skbuff.h | 6 +- + include/linux/slab.h | 45 +- + include/linux/string.h | 1 + + include/linux/swap.h | 3 +- + include/linux/syscalls.h | 2 + + include/linux/tracehook.h | 3 + + include/linux/types.h | 16 +- + include/linux/uaccess.h | 40 +- + include/linux/vm_event_item.h | 1 + + include/linux/vmstat.h | 24 +- + include/linux/zpool.h | 8 +- + include/linux/zsmalloc.h | 2 +- + include/linux/zutil.h | 4 +- + include/net/sock.h | 2 +- + include/trace/events/compaction.h | 72 +- + include/trace/events/gfpflags.h | 5 +- + include/trace/events/huge_memory.h | 165 +++ + include/trace/events/nilfs2.h | 224 ++++ + include/uapi/asm-generic/mman-common.h | 6 + + include/uapi/asm-generic/mman.h | 1 + + include/uapi/asm-generic/unistd.h | 4 +- + ipc/msg.c | 5 +- + kernel/audit.c | 6 +- + kernel/cgroup.c | 2 +- + kernel/cpuset.c | 14 +- + kernel/fork.c | 3 +- + kernel/kexec.c | 2 + + kernel/kexec_core.c | 4 +- + kernel/kexec_file.c | 2 + + kernel/locking/lockdep.c | 2 +- + kernel/params.c | 3 +- + kernel/power/snapshot.c | 2 +- + kernel/power/swap.c | 16 +- + kernel/profile.c | 2 +- + kernel/signal.c | 53 +- + kernel/smp.c | 2 +- + kernel/sys.c | 4 +- + kernel/sys_ni.c | 1 + + kernel/sysctl.c | 9 + + kernel/watchdog.c | 99 +- + lib/Kconfig | 7 + + lib/Kconfig.debug | 21 + + lib/Makefile | 2 + + lib/crc64_ecma.c | 341 ++++++ + lib/dma-debug.c | 14 +- + lib/dynamic_debug.c | 8 +- + lib/halfmd4.c | 3 +- + lib/idr.c | 4 +- + lib/is_single_threaded.c | 5 +- + lib/kasprintf.c | 16 + + lib/kobject.c | 30 +- + lib/llist.c | 4 +- + lib/percpu_ida.c | 2 +- + lib/radix-tree.c | 10 +- + lib/test-string_helpers.c | 36 + + lib/test_kasan.c | 69 ++ + lib/test_printf.c | 362 +++++++ + lib/vsprintf.c | 80 +- + mm/Kconfig | 12 - + mm/backing-dev.c | 2 +- + mm/compaction.c | 46 +- + mm/debug.c | 6 +- + mm/dmapool.c | 2 +- + mm/early_ioremap.c | 6 +- + mm/failslab.c | 8 +- + mm/filemap.c | 96 +- + mm/frame_vector.c | 2 +- + mm/gup.c | 10 +- + mm/huge_memory.c | 290 ++++- + mm/hugetlb.c | 50 +- + mm/hugetlb_cgroup.c | 2 +- + mm/internal.h | 32 +- + mm/kasan/kasan.c | 38 +- + mm/kasan/kasan.h | 5 +- + mm/kasan/report.c | 112 +- + mm/kmemleak.c | 2 +- + mm/ksm.c | 2 +- + mm/list_lru.c | 34 +- + mm/maccess.c | 5 + + mm/madvise.c | 176 +++ + mm/memblock.c | 2 +- + mm/memcontrol.c | 142 +-- + mm/memory-failure.c | 43 +- + mm/memory.c | 6 +- + mm/memory_hotplug.c | 4 +- + mm/mempool.c | 10 +- + mm/migrate.c | 9 +- + mm/mincore.c | 2 +- + mm/mlock.c | 100 +- + mm/mmap.c | 61 +- + mm/mremap.c | 12 +- + mm/msync.c | 2 +- + mm/nommu.c | 18 +- + mm/oom_kill.c | 76 +- + mm/page_alloc.c | 724 +++++-------- + mm/percpu.c | 10 +- + mm/readahead.c | 22 +- + mm/rmap.c | 50 +- + mm/shmem.c | 6 +- + mm/slab.c | 122 ++- + mm/slab_common.c | 2 +- + mm/slub.c | 279 +++-- + mm/swap.c | 48 +- + mm/swap_state.c | 4 +- + mm/util.c | 42 +- + mm/vmalloc.c | 16 +- + mm/vmscan.c | 102 +- + mm/vmstat.c | 25 +- + mm/zbud.c | 2 +- + mm/zpool.c | 18 +- + mm/zsmalloc.c | 22 +- + mm/zswap.c | 87 +- + net/core/skbuff.c | 8 +- + net/core/sock.c | 6 +- + net/netlink/af_netlink.c | 2 +- + net/openvswitch/flow.c | 2 +- + net/rds/ib_recv.c | 4 +- + net/rxrpc/ar-connection.c | 2 +- + net/sctp/associola.c | 2 +- + scripts/package/builddeb | 4 +- + security/integrity/ima/ima_crypto.c | 2 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/lib/Makefile | 8 + + tools/testing/selftests/lib/printf.sh | 10 + + tools/testing/selftests/vm/Makefile | 2 + + tools/testing/selftests/vm/mlock2-tests.c | 737 +++++++++++++ + tools/testing/selftests/vm/on-fault-limit.c | 47 + + tools/testing/selftests/vm/run_vmtests | 22 + + 329 files changed, 6802 insertions(+), 3339 deletions(-) + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/trace/events/huge_memory.h + create mode 100644 include/trace/events/nilfs2.h + create mode 100644 lib/crc64_ecma.c + create mode 100644 lib/test_printf.c + create mode 100644 tools/testing/selftests/lib/Makefile + create mode 100644 tools/testing/selftests/lib/printf.sh + create mode 100644 tools/testing/selftests/vm/mlock2-tests.c + create mode 100644 tools/testing/selftests/vm/on-fault-limit.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: net/ipv4/route.c: prevent oops +Applying: mips: add entry for new mlock2 syscall +Applying: sparc/sparc64: allocate sys_membarrier system call number +Applying: kernel.h: make abs() work with 64-bit types +Applying: Remove abs64() +Applying: remove-abs64-fix +Applying: remove-abs64-fix-fix +Applying: Documentation/sysctl/vm.txt: fix misleading code reference of overcommit_memory +Applying: pcnet32: use pci_set_dma_mask insted of pci_dma_supported +Applying: tw68-core: use pci_set_dma_mask insted of pci_dma_supported +Applying: saa7164: use pci_set_dma_mask insted of pci_dma_supported +Applying: saa7134: use pci_set_dma_mask insted of pci_dma_supported +Applying: cx88: use pci_set_dma_mask insted of pci_dma_supported +Applying: cx25821: use pci_set_dma_mask insted of pci_dma_supported +Applying: cx23885: use pci_set_dma_mask insted of pci_dma_supported +Applying: netup_unidvb: use pci_set_dma_mask insted of pci_dma_supported +Applying: nouveau: don't call pci_dma_supported +Applying: sfc: don't call dma_supported +Applying: kaweth: remove ifdefed out call to dma_supported +Applying: usbnet: remove ifdefed out call to dma_supported +Applying: pci: remove pci_dma_supported +Applying: dma: remove external references to dma_supported +Applying: modpost: add flag -E for making section mismatches fatal +Applying: drivers/scsi/cxgbi: fix build with EXTRA_CFLAGS +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 8e3ee384efc2...723e82d551f6 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (723e82d551f6 drivers/scsi/cxgbi: fix build with EXTRA_CFLAGS) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/DMA-API.txt | 13 ------- + Documentation/sysctl/vm.txt | 2 +- + arch/mips/include/uapi/asm/unistd.h | 15 ++++---- + arch/mips/kernel/scall32-o32.S | 1 + + arch/mips/kernel/scall64-64.S | 1 + + arch/mips/kernel/scall64-n32.S | 1 + + arch/mips/kernel/scall64-o32.S | 1 + + arch/sparc/include/uapi/asm/unistd.h | 3 +- + arch/sparc/kernel/systbls_32.S | 2 +- + arch/sparc/kernel/systbls_64.S | 4 +-- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 7 ++-- + drivers/gpu/drm/tegra/sor.c | 4 +-- + drivers/input/joystick/walkera0701.c | 4 +-- + drivers/media/i2c/ov9650.c | 2 +- + drivers/media/pci/cx23885/cx23885-core.c | 2 +- + drivers/media/pci/cx25821/cx25821-core.c | 2 +- + drivers/media/pci/cx88/cx88-alsa.c | 2 +- + drivers/media/pci/cx88/cx88-mpeg.c | 2 +- + drivers/media/pci/cx88/cx88-video.c | 2 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 2 +- + drivers/media/pci/saa7134/saa7134-core.c | 2 +- + drivers/media/pci/saa7164/saa7164-core.c | 2 +- + drivers/media/pci/tw68/tw68-core.c | 2 +- + drivers/net/ethernet/amd/pcnet32.c | 2 +- + drivers/net/ethernet/sfc/efx.c | 8 ++--- + drivers/net/usb/kaweth.c | 6 ---- + drivers/net/usb/usbnet.c | 6 ---- + drivers/net/wireless/mac80211_hwsim.c | 2 +- + drivers/parisc/ccio-dma.c | 2 -- + drivers/scsi/cxgbi/cxgb3i/Kbuild | 2 +- + drivers/scsi/cxgbi/cxgb4i/Kbuild | 2 +- + drivers/thermal/power_allocator.c | 2 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/fotg210-hcd.c | 2 +- + drivers/usb/host/fusbh200-hcd.c | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 2 +- + fs/gfs2/lock_dlm.c | 2 +- + include/asm-generic/pci-dma-compat.h | 6 ---- + include/linux/kernel.h | 42 +++++++++++----------- + kernel/time/clocksource.c | 2 +- + kernel/time/timekeeping.c | 2 +- + lib/Kconfig.debug | 9 +++++ + lib/div64.c | 2 +- + net/ipv4/route.c | 2 ++ + net/sctp/transport.c | 2 +- + scripts/Makefile.modpost | 1 + + scripts/mod/modpost.c | 24 +++++++++---- + 47 files changed, 105 insertions(+), 107 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..feafe02b3052 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 4.2-rc2 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 1dc51b8288007753ad7cd7d08bb8fa930fc8bb10 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..de5c658c07d3 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20151008 |