diff options
| author | Mark Brown <broonie@kernel.org> | 2015-12-03 00:55:05 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-12-03 00:55:05 +0000 |
| commit | 9e3f658a54550c289f3a7295ce697ab5a2d7e41b (patch) | |
| tree | 31be98b0d178b4637b53c0883668839b586c3149 | |
| parent | 6ba8c039ff230ed2a4fd67054b4f81cc34c6278b (diff) | |
Add linux-next specific files for 20151202next-20151202
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | Next/SHA1s | 232 | ||||
| -rw-r--r-- | Next/Trees | 235 | ||||
| -rw-r--r-- | Next/merge.log | 7474 | ||||
| -rw-r--r-- | Next/quilt-import.log | 395 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 8337 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..da4ede808f62 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,232 @@ +Name SHA1 +---- ---- +origin 6a24e72d23a6a223687274a6cf61a01940a7d7c9 +fixes 25cb62b76430a91cc6195f902e61c2cb84ade622 +kbuild-current 3d1450d54a4fc277fc4598acf2335f74b66b08fc +arc-current 2e22502c080f27afeab5e6f11e618fb7bc7aea53 +arm-current aa7d5f18e54529ae58a494447ee9b610d379b8d2 +m68k-current 21d380e54c30b5b15aa4167e2458bfe4e4862427 +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-fixes 7f821fc9c77a9b01fe7b1d6e72717b33d8d64142 +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +sparc 2c302e7e41050dbc174d50b58ad42eedf5dbd6fa +net fbca9d2d35c6ef1b323fae75cc9545005ba25097 +ipsec a8a572a6b5f2a79280d6e302cb3c1cb1fbaeb3e8 +ipvs 8e662164abb4a8fde701a46e1431980f9e325742 +wireless-drivers eeec5d0ef7ee54a75e09e861c3cc44177b8752c7 +mac80211 3dc91fad5c22a3a76139dee1534cad32c6a146cb +sound-current bcdda2ec28c31fe62d5d85c8b603f202a2c85fac +pci-current 7c7a0e945349a3d0d497d7f32db6ed33d4031110 +driver-core.current 8005c49d9aea74d382f474ce11afbbc7d7130bec +tty.current 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 +usb.current 5377adb092664d336ac212499961cac5e8728794 +usb-gadget-fixes 62e345ae5b6ed977b02c24d1eaeaece062f9fb17 +usb-serial-fixes a0e80fbd56b4573de997c9a088a33abbc1121400 +usb-chipidea-fixes 6f51bc340d2a1c71a2409f80f3e60fe2c44e35ae +staging.current 9225c0b7b976dd9ceac2b80727a60d8fcb906a62 +char-misc.current e8c77bda05e5d93cce6f38cfdde4192307951dea +input-current 0c6da0733bff3bc7aaa1dcd63fefdbbca5a7a5f8 +crypto-current 79960943fdc114fd4583c9ab164b5c89da7aa601 +ide 1b1050cdc5cdde43177b375b5f22dc070d45d8f8 +devicetree-current f76502aa9140ec338a59487218bf70a9c9e92b8f +rr-fixes 275d7d44d802ef271a42dc87ac091a495ba72fc5 +vfio-fixes 4bc94d5dc95d3a2159d821b39277477e69507f67 +kselftest-fixes 2ce47b44b25d8fb0114ff117813742adbefec8ff +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 1b52e50f2a402a266f1ba2281f0a57e87637a047 +drm-intel-fixes bb6d19846d1cee7cc977ce3aa736ec60d7163d3a +asm-generic 79529173266361d8e82a64981c734b76c08c79b8 +arc 2e22502c080f27afeab5e6f11e618fb7bc7aea53 +arm fa6af083e893deed995c07aed4e838ed8d7dbe70 +arm-perf 8005c49d9aea74d382f474ce11afbbc7d7130bec +arm-soc e693492eca372dee95bdccc53ec4421cea072ab4 +at91 db4ce944d154a710a6babf7b3acdde930c76e275 +bcm2835 b2776bf7149bddd1f4161f14f79520f17fc1d71d +berlin a85dac7bd3c302a82b57155fb595e27ca191f934 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 922ef3e263f73d6dd5ae19cdca28ed45688e37cb +keystone 99d59777c0896a4b34cd4d10fc88a1c538fc0301 +mvebu 61edc845913795a3c2e1994f6343c524fe3368db +omap ffeaf25ceeb7e98bfa261c4069b5aa2ba5f53581 +omap-pending 30aa18d3bea5f9470af5aa48ab8df88bde97c795 +qcom 38efdf1edceba3c5af8967229dfe28854bae3a02 +renesas bb2951afbe2f20d8ccff8c22c786d29ec78823c0 +rockchip 73ab5e6b319a2341d3714eaeec90010aa7149aa4 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 8005c49d9aea74d382f474ce11afbbc7d7130bec +samsung-krzk 945028c273a7dbd7659b1a7f25a88e72f5e78c39 +sunxi 2eda61e3b9ef0a907cf8112f7236d54974e23c10 +tegra 3ba3a74b654503f81f945f370a4825df7bf4d77a +arm64 01b305a234943c25c336a6f2f77932a4eaf125fa +blackfin d91e14b3b9e1d8e1d552f4d6aff45551bbb410b1 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris 918fc2ee791ea26b95556bafab1f55aa25df5c6d +h8300 5aef14e91de2082bc3d0e42e0cdb6dd227839b75 +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 7e26e9ff0a9301398bd7cf8d896536da3a54aa9a +m68k 70bc53b473435f43dcf7d91304e28dd6e0ffda14 +m68knommu 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 +metag f23d0e2468bc538e8c33223af8963ef40b7515bf +microblaze b14132797d8041a42e03f4ffa1e722da1425adfb +mips 99a0c4654ac6a1b81f82d571e48a73a3a8f1cc17 +nios2 8e3d7c834ba0f79f200c155cf0647eacd39f2fbe +parisc-hd 6a13feb9c82803e2b815eca72fa7a9f5561d7861 +powerpc b4f8144559e172f792f7fa926e4f342fbdbaf6ee +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl e1f580e8ced56d7c0a2b096e00e8b8e861d13671 +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 419123f900dac58fb27ce5285b21074f5300095a +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile 09745f38a74eb2e5bb65dd49e7c225cd5180e932 +uml 2eb5f31bc4ea24bb293e82934cfa1cce9573304b +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa afaa7c542cc9c4d8a99ba252a8ea5e8bc7c897e2 +btrfs 3a9508b0221dfd290b95fb0ab199958fe078bbdf +ceph 583d0fef756a7615e50f0f68ea0892a497d03971 +cifs 6573b8564d379bcc0c3129d165f5ca2dff8dd66f +ecryptfs 933c32fe0e42b86d9bc5779401c3ce93d56bd231 +ext3 d4eb6dee471250661a5183a7336b18c85990e26d +ext4 1ae1929a935e5f786ea6191608f272298dc99d67 +f2fs 8005c49d9aea74d382f474ce11afbbc7d7130bec +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 0b5da8db145bfd44266ac964a2636a0cf8d7c286 +gfs2 5f63e3c3599d754dae6448a0e83e42a88809737f +jfs 26456955719b79cc4a011b18221aa68f599f6b6c +nfs 2255702db4014d1c69d6037ed7bdad2d2e271985 +nfsd d093ded79a89d03b12fa60bca97fa4705d510356 +orangefs 555fa0fa618b846c5b38406347b7d53ace320ac6 +overlayfs 257f871993474e2bde6c497b54022c362cf398e1 +squashfs 62421645bb702c077ee5a462815525106cb53bcf +v9fs 3053600ed4f71115631258f0d64eca0d10b11bdc +ubifs 8c1c5f263833ec2dc8fd716cf4281265c485d7ad +xfs 4e14e49a91e18098fd8ef30743972e0c3cb727c1 +file-locks 8ace5dfb983e89dbcfcb42ff25df6e4240c555bb +vfs 08afe6ef540523c515361396740a845009cf56c7 +pci 1ec218373b8ebda821aec00bb156a9c94fad9cd4 +hid 781289e4fd9bbf888105ef6351f9a80f3acb2484 +i2c 30381537988e6b81e5060ed15177f4baa905ec32 +jdelvare-hwmon c0453e633a6a73eb2e1847b81323ae2c1e51577c +dmi 77bb27fef9dc584cb869afc26da93d43dca893b2 +hwmon-staging 9a2adf56a412e3f2809a48a1ac6df1da42ca4f33 +v4l-dvb ca79e72cf39cbec0155ae78f6d0b6d2254a50f3e +kbuild f155d8e72ce4e202831cd49354e358a769a6069e +kconfig c0ddc8c745b7f89c50385fd7aa03c78dc543fa7a +libata 699519c47a1fda8fabe1221805a438f2ea5066db +pm d2b90233c1ca8fe5ab8648511322e732281be8b5 +idle 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +thermal 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 +thermal-soc 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 +ieee1394 100ceb66d5c40cc0c7018e06a9474302470be73c +dlm a6b1533e9a57d76cd3d9b7649d29ac604b1874b8 +swiotlb 9d99c7123c9af5f47a2037933a3ffaec3e37efad +slave-dma c280c9275de8cd8af12cf94aaec12a4767b6c540 +net-next 6cc568340148424e657508d82692ef787d6c4b2c +ipsec-next cb866e3298cd7412503fc7e2c265753c853fab9d +ipvs-next 4c50a8ce2b632ccbee9faa3edc9fc7f257ba5135 +wireless-drivers-next b31fa550241d1fdd62e298c843c8f08a55bd57ff +bluetooth 345467ea3ae66c762326c06de1f0dfe51724e11b +mac80211-next 096cc9502757631f4db7a0b14f5d15740d43780c +rdma db7489e07669073970358b6cacf6a9dd8dc9275e +mtd 1ddaa021b000220b5f2ad023e4f15ed44990974b +l2-mtd d121b66d25adfa8b631dc59511ebc1d600ad5111 +crypto c012a79d0ce95bd8488a5a44cd8c00c275774518 +drm 80d69009ef67d0753c1c30c62056a04275898531 +drm-panel caa602e71609a719c19052f521b05cf701581eae +drm-intel d965e7ac7a196c27e299c598bcb678ab71132dc1 +drm-tegra 2093588d9b43316ab305908c0db9ab9f5f604b99 +drm-misc 737292a3c0f251a93dcce4bedf7e4accb35335bc +drm-exynos 8eb90e2aae456e089e660b11df06953d470719e8 +drm-msm a9ee34b70e07ce942806eda154e48ea3f754a76f +sound e5241a8c4b22b678dd9b07527ba9f178f02e160e +sound-asoc d4fb6bce4565c8f6de96f8823cd63bde909788ec +modules b3212ec77dd1d267d0f2703ced3cef08108dca9f +input 5e0baca8b3247f459af50947eaafc68bb8168b33 +block 5eb4acb07a6ed650fe22b3f58b83336a0cd0b77a +device-mapper 2cd0ff3536f66abc4901105368c349e36d8089f7 +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh 222e0bfc1229865405ca7bbfe2c7be5fa6ad6e39 +kgdb 2d289f14f00a0da6bae7c8415fc8dd9d030458b8 +md 0ddf8219ca272c8308ff5b813e24347a97a5374e +mfd cc509d5ba2b74fea8d0598cc941f4b5e4052740a +backlight 6be3a5a9cd91c586744de0f9666f39ca896cfdac +battery 0fe69b960ae208e7f3c824226fa21712942f3f2f +omap_dss2 d890dccfae78950b43f76811b52930d9e0ca61a6 +regulator 9fd2c257f960a42cc588e562aa6854efc2f9328e +security ebd68df3f24b318d391d15c458d6f43f340ba36a +integrity e596de92e5f6d11e796de79b487450a5dac18dc3 +selinux 92f190d2a1ec647e7b8de088506304f6480cb1ca +lblnet b2776bf7149bddd1f4161f14f79520f17fc1d71d +watchdog 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 +iommu b67ad2f7c7514f94fe6bbd0cd86add445eb4e64a +dwmw2-iommu 0bdec95ce52d2705787f813e82c1ff2f1b29af17 +vfio 222e684ca762e9288108fcf852eb5d08cbe10ae3 +jc_docs 04bed3278abf6026f82093d80ad925e9d376998a +trivial 75021d28594d9b6fb4d05bbc41f77948a0db0e02 +audit 08b9fd158f1d93f2f940ba6969b0a9181b7319ee +devicetree 48a9b733e644ab4cc8e2a98950a36ddb12b8c54e +dt-rh 7c107b826a97c32c75f018cc83a50221fdabb76b +mailbox bfbcfa770b1c316396162f9354872dc00cd572fe +spi d7a5f372bc543db07310233f6d0bd44937b24a89 +tip d20d11249a9539cdb27f7e4e3f2a4a4fc8d3561f +clockevents 2527dfeb1f6490c957f84e523abdfdce251b09e6 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd e8f937da744fe13505720a2709c82b182f730fcf +irqchip 86e57ca735a72b44aab90a649157a678b7069a6d +tiny f114040e3ea6e07372334ade75d1ee0775c355e1 +ftrace 39daa7b9e89512f234b7fb5d55812a78318251fc +rcu 27cddb87da60da3990e50c92e7998d98669784ab +kvm bb11c6c96544737aede6a2eb92e5c6bc8b46534b +kvm-arm 26caea7693cb99833fe4ecc544c842289d6b3f69 +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus a3eaa8649e4c6a6afdafaa04b9114fb230617bb1 +kvms390 2f8a43d45d14ad62b105ed99151b453c12df7149 +xen-tip b9fcbcf55dc41e84bfa8b84c7ae59a9b2ae29a39 +percpu 18fc93fd64129c96432812cb44f59c963871889b +workqueues 4fcfc30131440b5e2c533fbdf34df7cfb360c4cb +drivers-x86 0ab19793ecc09a41afafbb8d9b378a6e7340c3f4 +chrome-platform ebaf31c46cce0dc8a6ed690b5456b295aa7586a6 +regmap 660d61d7be7bfc189ae342c7cab5d99e96937a47 +hsi 403c5c0650816375527a6feecfb255d9b494dda3 +leds 7d3b1770f6db1afcaf10c51b51a42d5716fe2180 +ipmi 4193fcd31624f0a830a415c7275a2732584347ef +driver-core 8005c49d9aea74d382f474ce11afbbc7d7130bec +tty 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 +usb 498378d9d2c12d97318028f1a648d98ee7568430 +usb-gadget 8005c49d9aea74d382f474ce11afbbc7d7130bec +usb-serial 6f923a0134d9868a71db19cca1fae551a27b46f5 +usb-chipidea-next 15af5aea51de8e483230e1e625c3c760ab161cfd +staging f3cf3fb7ec854c2b2429e5bb23186746e6511dae +char-misc 1ec218373b8ebda821aec00bb156a9c94fad9cd4 +extcon 5f01e6bc3336c27b9553494214f05ac439dbeb37 +cgroup 57fd592b749bd1c3a9a24082b3abbab76877ea4f +scsi 59ae1adaafff5458834170600a7d2f7934ead5bd +target-updates a2ba5920379108369ddd85daf61d33001056f8b8 +target-merge bc0195aad0daa2ad5b0d76cce22b167bc3435590 +pinctrl 55c21f12a8db88611855f9050591e3501b6c23f9 +vhost d629f2b585cb766ed9732008976d029cb5d5e584 +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg b1b9891441fa33fd0d49b5cb3aa7f04bca1cc1db +gpio 2567a40b22e5aa09432c8bb6842a81f6275356f7 +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm 5dcd7b42f1d06c62b5589441e69cc77c26c8b725 +dma-buf 86ea07ca846a7c352f39dd0b7d81f15f403c7db8 +userns f2ca379642d7a843be972ea4167abdd3c8c9e5d1 +ktest b953c0d234bc72e8489d3bf51a276c5c4ec85345 +clk b2523f1ff0a6f7d00d83afafd361bd1d8409cda8 +random 7185ad2672a7d50bc384de0e38d90b75d99f3d82 +aio 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f +llvmlinux 25d4aee23af28a6ef04d70a1028c012665384df1 +kselftest 4aaae2f2c74f44473f7f5915420c8da4a8f2f340 +y2038 8750343a6505287e6af3388262e2da87c3f11acb +luto-misc a6c5170d1edea97c538c81e377e56c7b5c5b7e63 +borntraeger fc7f9754db6ce0c12281da4055281f731d36bdee +livepatching 2184037e40ce3807df83a47b43a7f1674ee3027b +coresight a0aede15d4962b384b968f87b1f9ec9eb98f9152 +rtc 980dc707bca4d3dbe2f51340ca05f96a93b357e1 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 8de5dff8bae634497f4413bc3067389f2ed267da +akpm-current 7d182af8dd2051455c0a8fdedc6a9d3f504c2b55 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..bc3057ffea56 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,235 @@ +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 +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +devicetree-current git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/merge +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835 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://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +powerpc-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-denx-agust.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +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 +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +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 +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +rpmsg git git://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 +borntraeger git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +hwspinlock git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git#for-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..c67908df6908 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7474 @@ +$ date -R +Wed, 02 Dec 2015 09:18:11 +0000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 78c4a49a69e9 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs +Merging origin/master (6a24e72d23a6 Merge tag 'remoteproc-4.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc) +$ git merge origin/master +Updating 78c4a49a69e9..6a24e72d23a6 +Fast-forward + Documentation/arm/keystone/Overview.txt | 18 - + .../bindings/thermal/rockchip-thermal.txt | 4 +- + MAINTAINERS | 5 +- + Makefile | 2 +- + arch/arc/configs/axs101_defconfig | 2 +- + arch/arc/configs/axs103_defconfig | 2 +- + arch/arc/configs/axs103_smp_defconfig | 2 +- + arch/arc/configs/nsim_hs_defconfig | 2 +- + arch/arc/configs/nsim_hs_smp_defconfig | 2 +- + arch/arc/configs/nsimosci_hs_defconfig | 2 +- + arch/arc/configs/nsimosci_hs_smp_defconfig | 2 +- + arch/arc/configs/vdk_hs38_defconfig | 2 +- + arch/arc/configs/vdk_hs38_smp_defconfig | 2 +- + arch/arc/include/asm/irqflags-arcv2.h | 3 + + arch/arc/include/asm/irqflags-compact.h | 2 + + arch/arc/kernel/ctx_sw.c | 2 - + arch/arc/kernel/ctx_sw_asm.S | 3 - + arch/arc/kernel/process.c | 9 +- + arch/arc/kernel/unwind.c | 37 +- + arch/arc/mm/tlb.c | 4 +- + arch/arm/Kconfig | 4 +- + arch/arm/boot/dts/am57xx-beagle-x15.dts | 1 + + arch/arm/boot/dts/animeo_ip.dts | 6 +- + arch/arm/boot/dts/at91-foxg20.dts | 2 +- + arch/arm/boot/dts/at91-kizbox.dts | 13 +- + arch/arm/boot/dts/at91-kizbox2.dts | 6 +- + arch/arm/boot/dts/at91-kizboxmini.dts | 4 +- + arch/arm/boot/dts/at91-qil_a9260.dts | 2 +- + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 115 ++++- + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 2 +- + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 12 +- + arch/arm/boot/dts/at91-sama5d4ek.dts | 12 +- + arch/arm/boot/dts/at91rm9200ek.dts | 9 - + arch/arm/boot/dts/at91sam9261ek.dts | 19 +- + arch/arm/boot/dts/at91sam9263ek.dts | 13 +- + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 13 +- + arch/arm/boot/dts/at91sam9m10g45ek.dts | 13 +- + arch/arm/boot/dts/at91sam9n12ek.dts | 11 +- + arch/arm/boot/dts/at91sam9rlek.dts | 13 +- + arch/arm/boot/dts/at91sam9x5cm.dtsi | 11 - + arch/arm/boot/dts/dra7.dtsi | 4 +- + arch/arm/boot/dts/k2l-netcp.dtsi | 2 +- + arch/arm/boot/dts/kirkwood-ts219.dtsi | 2 +- + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 4 + + arch/arm/boot/dts/rk3288.dtsi | 10 +- + arch/arm/boot/dts/sama5d35ek.dts | 2 +- + arch/arm/boot/dts/sama5d4.dtsi | 2 +- + arch/arm/boot/dts/usb_a9260_common.dtsi | 2 +- + arch/arm/boot/dts/usb_a9263.dts | 2 +- + arch/arm/boot/dts/vfxxx.dtsi | 8 +- + arch/arm/configs/at91_dt_defconfig | 1 - + arch/arm/configs/sama5_defconfig | 1 - + arch/arm/include/asm/irq.h | 5 + + arch/arm/include/uapi/asm/unistd.h | 1 + + arch/arm/kernel/bios32.c | 19 +- + arch/arm/kernel/calls.S | 1 + + arch/arm/mach-dove/include/mach/entry-macro.S | 4 +- + arch/arm/mach-imx/gpc.c | 1 + + arch/arm/mach-omap2/omap-smp.c | 6 +- + arch/arm/mach-omap2/omap_hwmod.c | 66 +-- + arch/arm/mach-omap2/omap_hwmod.h | 3 + + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 56 +++ + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 3 + + arch/arm/mach-omap2/pdata-quirks.c | 29 -- + arch/arm/mach-omap2/pm34xx.c | 4 +- + arch/arm/mach-orion5x/include/mach/entry-macro.S | 2 +- + arch/arm/mach-pxa/palm27x.c | 2 +- + arch/arm/mach-pxa/palmtc.c | 2 +- + arch/arm/mach-shmobile/setup-r8a7793.c | 2 +- + arch/arm/mach-zx/Kconfig | 2 +- + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/cpufeature.h | 22 +- + arch/arm64/include/asm/hw_breakpoint.h | 6 +- + arch/arm64/include/asm/irq.h | 5 + + arch/arm64/kernel/cpufeature.c | 37 +- + arch/arm64/kernel/efi.c | 33 +- + arch/arm64/mm/context.c | 38 +- + arch/arm64/mm/fault.c | 28 +- + arch/arm64/mm/mmu.c | 77 +--- + arch/m68k/coldfire/m54xx.c | 2 +- + arch/m68k/include/asm/unistd.h | 2 +- + arch/m68k/include/uapi/asm/unistd.h | 1 + + arch/m68k/kernel/setup_no.c | 9 +- + arch/m68k/kernel/syscalltable.S | 1 + + arch/m68k/mm/motorola.c | 2 +- + arch/m68k/sun3/config.c | 4 +- + arch/mips/pci/pci-rt2880.c | 4 +- + arch/mips/pmcs-msp71xx/msp_setup.c | 4 +- + arch/mips/sni/reset.c | 6 +- + arch/mn10300/Kconfig | 4 +- + arch/nios2/mm/cacheflush.c | 24 +- + arch/powerpc/include/asm/reg.h | 1 + + arch/powerpc/kernel/process.c | 18 + + arch/powerpc/kernel/signal_32.c | 14 +- + arch/powerpc/kernel/signal_64.c | 4 + + drivers/bus/omap-ocp2scp.c | 2 +- + drivers/cpufreq/Kconfig.arm | 2 +- + drivers/cpufreq/cppc_cpufreq.c | 3 +- + drivers/cpufreq/cpufreq.c | 7 +- + drivers/cpufreq/intel_pstate.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 19 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 24 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 122 ++++-- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 5 +- + drivers/gpu/drm/amd/scheduler/sched_fence.c | 13 + + .../gpu/drm/nouveau/include/nvkm/subdev/instmem.h | 1 + + drivers/gpu/drm/nouveau/nouveau_acpi.c | 1 + + drivers/gpu/drm/nouveau/nouveau_drm.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_usif.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c | 16 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpc.fuc | 8 +- + .../drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h | 344 +++++++-------- + .../drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h | 344 +++++++-------- + .../drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h | 344 +++++++-------- + .../drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h | 308 ++++++------- + .../drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h | 474 ++++++++++----------- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c | 5 + + drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c | 2 +- + drivers/gpu/drm/radeon/rv730_dpm.c | 2 +- + drivers/gpu/drm/radeon/rv770_dpm.c | 4 +- + drivers/pci/host/pcie-designware.c | 1 - + drivers/pci/host/pcie-hisi.c | 4 +- + drivers/pci/pci-sysfs.c | 5 +- + drivers/pci/pci.h | 2 - + drivers/remoteproc/remoteproc_core.c | 2 + + drivers/remoteproc/remoteproc_debugfs.c | 2 +- + drivers/rtc/rtc-ds1307.c | 44 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 +- + drivers/soc/mediatek/Kconfig | 1 + + drivers/soc/ti/knav_qmss_queue.c | 8 +- + drivers/target/iscsi/iscsi_target.c | 13 +- + drivers/target/iscsi/iscsi_target_nego.c | 1 + + drivers/target/iscsi/iscsi_target_parameters.c | 10 +- + drivers/target/target_core_sbc.c | 17 +- + drivers/target/target_core_stat.c | 2 +- + drivers/target/target_core_tmr.c | 7 +- + drivers/target/target_core_transport.c | 26 +- + drivers/target/target_core_user.c | 4 +- + drivers/thermal/Kconfig | 2 +- + drivers/thermal/imx_thermal.c | 56 ++- + drivers/thermal/of-thermal.c | 2 +- + drivers/thermal/power_allocator.c | 24 +- + drivers/thermal/rcar_thermal.c | 49 +-- + drivers/thermal/rockchip_thermal.c | 328 ++++++++++---- + drivers/watchdog/Kconfig | 2 +- + drivers/watchdog/mtk_wdt.c | 1 + + drivers/watchdog/omap_wdt.c | 2 +- + drivers/watchdog/pnx4008_wdt.c | 8 +- + drivers/watchdog/tegra_wdt.c | 4 +- + drivers/watchdog/w83977f_wdt.c | 2 +- + drivers/xen/events/events_base.c | 5 +- + drivers/xen/evtchn.c | 123 +++++- + drivers/xen/gntdev.c | 2 +- + fs/btrfs/backref.c | 2 +- + fs/btrfs/ctree.h | 4 + + fs/btrfs/extent-tree.c | 123 +++++- + fs/btrfs/file.c | 10 +- + fs/btrfs/inode.c | 24 +- + fs/btrfs/qgroup.c | 5 +- + fs/btrfs/scrub.c | 62 ++- + fs/btrfs/tests/free-space-tests.c | 4 +- + fs/btrfs/transaction.c | 32 ++ + fs/btrfs/transaction.h | 4 + + fs/btrfs/volumes.c | 13 +- + fs/btrfs/volumes.h | 2 +- + fs/nfs/callback_xdr.c | 7 +- + fs/nfs/inode.c | 11 +- + fs/nfs/nfs42proc.c | 3 +- + fs/nfs/nfs4client.c | 2 +- + fs/nfs/nfs4file.c | 59 ++- + fs/nfs/nfs4proc.c | 2 +- + fs/nfs/nfs4xdr.c | 1 + + fs/nfs/pnfs.c | 56 +-- + include/linux/kref.h | 33 -- + include/linux/nfs_xdr.h | 1 + + include/linux/pci.h | 9 + + include/linux/scpi_protocol.h | 2 +- + include/linux/syscalls.h | 2 +- + include/linux/thermal.h | 3 +- + include/linux/types.h | 2 +- + include/target/target_core_base.h | 2 +- + include/uapi/linux/nfs.h | 11 - + kernel/trace/ring_buffer.c | 17 +- + net/sunrpc/backchannel_rqst.c | 8 + + net/sunrpc/svc.c | 1 + + security/keys/encrypted-keys/encrypted.c | 2 + + security/keys/trusted.c | 5 +- + security/keys/user_defined.c | 5 +- + security/selinux/ss/conditional.c | 4 +- + sound/firewire/dice/dice.c | 4 + + sound/pci/hda/hda_intel.c | 7 + + sound/pci/hda/patch_hdmi.c | 3 +- + sound/pci/hda/patch_realtek.c | 23 + + sound/pci/hda/patch_sigmatel.c | 45 +- + sound/usb/midi.c | 46 ++ + sound/usb/quirks-table.h | 11 + + sound/usb/quirks.c | 1 + + sound/usb/usbaudio.h | 1 + + 205 files changed, 2585 insertions(+), 1940 deletions(-) +Merging fixes/master (25cb62b76430 Linux 4.3-rc5) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (2e22502c080f ARC: dw2 unwind: Remove falllback linear search thru FDE entries) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (aa7d5f18e545 ARM: 8454/1: OF implies OF_FLATTREE) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (21d380e54c30 m68k: Wire up mlock2) +$ 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 (7f821fc9c77a powerpc/tm: Check for already reclaimed tasks) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (2c302e7e4105 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge sparc/master +Already up-to-date. +Merging net/master (fbca9d2d35c6 bpf, array: fix heap out-of-bounds access when updating elements) +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 +- + arch/arm64/net/bpf_jit_comp.c | 27 +- + crypto/algif_aead.c | 4 +- + crypto/algif_skcipher.c | 6 +- + drivers/isdn/hisax/config.c | 2 +- + drivers/isdn/hisax/hfc_pci.c | 2 +- + drivers/isdn/hisax/hfc_sx.c | 2 +- + drivers/isdn/hisax/q931.c | 6 +- + drivers/net/can/bfin_can.c | 2 - + drivers/net/can/c_can/c_can.c | 7 +- + drivers/net/can/cc770/cc770.c | 2 +- + drivers/net/can/flexcan.c | 4 +- + drivers/net/can/janz-ican3.c | 1 - + drivers/net/can/m_can/m_can.c | 7 +- + drivers/net/can/pch_can.c | 3 +- + drivers/net/can/rcar_can.c | 11 +- + drivers/net/can/sja1000/sja1000.c | 4 +- + drivers/net/can/sun4i_can.c | 1 - + drivers/net/can/ti_hecc.c | 7 +- + drivers/net/can/usb/ems_usb.c | 1 - + drivers/net/can/usb/esd_usb2.c | 1 - + drivers/net/can/usb/kvaser_usb.c | 5 +- + drivers/net/can/usb/usb_8dev.c | 4 +- + drivers/net/can/xilinx_can.c | 9 +- + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 31 +- + drivers/net/ethernet/atheros/alx/main.c | 2 + + drivers/net/ethernet/atheros/alx/reg.h | 1 + + drivers/net/ethernet/aurora/Kconfig | 20 + + drivers/net/ethernet/aurora/Makefile | 1 + + drivers/net/ethernet/aurora/nb8800.c | 1552 ++++++++++++++++++++ + drivers/net/ethernet/aurora/nb8800.h | 316 ++++ + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 +- + drivers/net/ethernet/cadence/macb.c | 4 + + drivers/net/ethernet/cadence/macb.h | 5 + + drivers/net/ethernet/dec/tulip/tulip_core.c | 9 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 2 +- + drivers/net/ethernet/freescale/Kconfig | 3 +- + drivers/net/ethernet/freescale/gianfar.c | 6 +- + drivers/net/ethernet/freescale/gianfar_ptp.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 4 +- + drivers/net/ethernet/renesas/ravb_main.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 13 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 28 +- + drivers/net/ethernet/ti/cpsw-common.c | 3 + + drivers/net/macvtap.c | 4 +- + drivers/net/phy/broadcom.c | 2 +- + drivers/net/tun.c | 4 +- + drivers/net/usb/cdc_ncm.c | 8 +- + drivers/net/usb/qmi_wwan.c | 1 + + drivers/net/vmxnet3/vmxnet3_drv.c | 71 +- + drivers/net/vrf.c | 11 +- + drivers/net/wan/hdlc_fr.c | 10 +- + drivers/net/wan/x25_asy.c | 6 +- + drivers/net/wireless/ath/ath10k/core.c | 49 +- + drivers/net/wireless/ath/ath10k/core.h | 1 + + drivers/net/wireless/ath/ath10k/hw.h | 17 +- + drivers/net/wireless/ath/ath10k/mac.c | 2 +- + drivers/net/wireless/ath/ath10k/pci.c | 53 +- + drivers/net/wireless/iwlwifi/iwl-7000.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-8000.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/d3.c | 8 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 11 +- + drivers/net/wireless/iwlwifi/mvm/sta.c | 88 +- + drivers/net/wireless/iwlwifi/mvm/sta.h | 4 +- + drivers/net/wireless/iwlwifi/pcie/drv.c | 19 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 2 +- + fs/dlm/lowcomms.c | 4 +- + include/linux/bpf.h | 5 +- + include/linux/dns_resolver.h | 2 +- + include/linux/net.h | 13 +- + include/linux/netdevice.h | 3 +- + include/net/af_unix.h | 1 + + include/net/ipv6.h | 1 + + include/net/ndisc.h | 3 +- + include/net/sock.h | 29 +- + kernel/bpf/arraymap.c | 2 +- + kernel/bpf/inode.c | 6 +- + kernel/bpf/syscall.c | 36 +- + kernel/bpf/verifier.c | 3 +- + net/bluetooth/af_bluetooth.c | 6 +- + net/caif/caif_socket.c | 4 +- + net/core/datagram.c | 2 +- + net/core/netclassid_cgroup.c | 26 +- + net/core/scm.c | 2 + + net/core/sock.c | 8 +- + net/core/stream.c | 6 +- + net/dccp/proto.c | 3 +- + net/decnet/af_decnet.c | 8 +- + net/dns_resolver/dns_query.c | 2 +- + net/hsr/hsr_device.c | 2 +- + net/ipv4/ipmr.c | 23 +- + net/ipv4/tcp.c | 7 +- + net/ipv4/tcp_input.c | 23 +- + net/ipv4/tcp_ipv4.c | 3 +- + net/ipv4/tcp_timer.c | 14 +- + net/ipv4/udp.c | 1 - + net/ipv6/addrconf.c | 2 +- + net/ipv6/ip6_tunnel.c | 2 +- + net/ipv6/ip6mr.c | 19 +- + net/ipv6/ndisc.c | 10 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 5 +- + net/ipv6/reassembly.c | 10 +- + net/ipv6/route.c | 2 +- + net/iucv/af_iucv.c | 2 +- + net/nfc/llcp_sock.c | 2 +- + net/openvswitch/vport.c | 4 +- + net/packet/af_packet.c | 4 +- + net/rds/connection.c | 6 - + net/rds/send.c | 4 +- + net/rxrpc/ar-ack.c | 4 +- + net/rxrpc/ar-output.c | 2 +- + net/sctp/socket.c | 26 +- + net/socket.c | 21 +- + net/sunrpc/xprtsock.c | 14 +- + net/tipc/link.c | 2 + + net/tipc/socket.c | 10 +- + net/tipc/udp_media.c | 7 +- + net/unix/af_unix.c | 268 +++- + 122 files changed, 2762 insertions(+), 436 deletions(-) + create mode 100644 drivers/net/ethernet/aurora/Kconfig + create mode 100644 drivers/net/ethernet/aurora/Makefile + create mode 100644 drivers/net/ethernet/aurora/nb8800.c + create mode 100644 drivers/net/ethernet/aurora/nb8800.h +Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops) +$ git merge ipsec/master +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/ipv6/xfrm6_policy.c +Auto-merging net/ipv4/xfrm4_policy.c +Merge made by the 'recursive' strategy. + net/ipv4/xfrm4_policy.c | 46 +++++++++++++++++++++++++++++++++--------- + net/ipv6/xfrm6_policy.c | 53 +++++++++++++++++++++++++++++++++++-------------- + net/xfrm/xfrm_policy.c | 38 ----------------------------------- + 3 files changed, 75 insertions(+), 62 deletions(-) +Merging ipvs/master (8e662164abb4 netfilter: nfnetlink_queue: avoid harmless unnitialized variable warnings) +$ git merge ipvs/master +Merge made by the 'recursive' strategy. + net/netfilter/nfnetlink_queue.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) +Merging wireless-drivers/master (eeec5d0ef7ee rtlwifi: rtl8821ae: Fix lockups on boot) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (3dc91fad5c22 mac80211: fix off-channel mgmt-tx uninitialized variable usage) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + include/net/mac80211.h | 6 ++++-- + net/mac80211/agg-tx.c | 3 ++- + net/mac80211/cfg.c | 8 ++++++-- + net/mac80211/iface.c | 5 +++-- + net/mac80211/main.c | 3 +-- + net/mac80211/mesh_pathtbl.c | 8 ++++---- + net/mac80211/scan.c | 9 +++++---- + 7 files changed, 25 insertions(+), 17 deletions(-) +Merging sound-current/for-linus (bcdda2ec28c3 ALSA: hda - Add Conexant CX8200 (14f1:2008) codec entry) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + include/sound/soc-dapm.h | 1 + + sound/pci/hda/patch_conexant.c | 5 +- + sound/pci/hda/patch_hdmi.c | 6 ++ + sound/soc/codecs/arizona.c | 16 ++---- + sound/soc/codecs/es8328.c | 16 +++--- + sound/soc/codecs/nau8825.c | 31 ++++++++++ + sound/soc/codecs/rl6231.c | 6 +- + sound/soc/codecs/rt5645.c | 61 ++++++++++++++++++-- + sound/soc/codecs/rt5670.h | 12 ++-- + sound/soc/codecs/rt5677.c | 100 ++++++++++++++++++++------------- + sound/soc/codecs/wm8960.c | 2 +- + sound/soc/codecs/wm8962.c | 4 +- + sound/soc/davinci/davinci-mcasp.c | 12 +++- + sound/soc/fsl/Kconfig | 2 + + sound/soc/fsl/fsl_sai.c | 3 +- + sound/soc/intel/Kconfig | 2 +- + sound/soc/intel/skylake/skl-topology.c | 1 + + sound/soc/rockchip/rockchip_spdif.c | 2 +- + sound/soc/rockchip/rockchip_spdif.h | 6 +- + sound/soc/sh/rcar/gen.c | 2 +- + sound/soc/sh/rcar/src.c | 7 +++ + sound/soc/soc-core.c | 6 +- + sound/soc/soc-dapm.c | 7 +++ + sound/soc/soc-ops.c | 2 +- + sound/soc/soc-topology.c | 3 +- + sound/soc/sti/uniperif_player.c | 9 ++- + sound/soc/sti/uniperif_reader.c | 3 +- + sound/soc/sunxi/sun4i-codec.c | 27 ++++----- + 28 files changed, 247 insertions(+), 107 deletions(-) +Merging pci-current/for-linus (7c7a0e945349 ARM/PCI: Move align_resource function pointer to pci_host_bridge structure) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (8005c49d9aea Linux 4.4-rc1) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (31ade3b83e18 Linux 4.4-rc3) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (5377adb09266 usb: Use the USB_SS_MULT() macro to decode burst multiplier for log message) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/hid/hid-ids.h | 5 --- + drivers/hid/usbhid/hid-quirks.c | 9 ++-- + drivers/usb/class/cdc-acm.c | 5 +++ + drivers/usb/core/config.c | 3 +- + drivers/usb/core/hub.c | 15 ++++--- + drivers/usb/core/quirks.c | 3 ++ + drivers/usb/dwc2/platform.c | 81 ++++++++++++++++++++++------------ + drivers/usb/gadget/function/f_fs.c | 6 +-- + drivers/usb/gadget/function/f_midi.c | 3 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 3 ++ + drivers/usb/host/whci/qset.c | 4 ++ + drivers/usb/musb/Kconfig | 2 +- + drivers/usb/phy/phy-mxs-usb.c | 5 +++ + drivers/usb/renesas_usbhs/mod_gadget.c | 11 ++++- + drivers/usb/serial/cp210x.c | 1 - + drivers/usb/serial/usb-serial-simple.c | 1 + + drivers/usb/storage/uas.c | 4 ++ + drivers/usb/storage/unusual_devs.h | 2 +- + drivers/usb/storage/unusual_uas.h | 2 +- + 19 files changed, 108 insertions(+), 57 deletions(-) +Merging usb-gadget-fixes/fixes (62e345ae5b6e usb: dwc3: gadget: don't prestart interrupt endpoints) +$ git merge usb-gadget-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/usb/dwc3/gadget.c | 1 + + 1 file changed, 1 insertion(+) +Merging usb-serial-fixes/usb-linus (a0e80fbd56b4 USB: serial: Another Infineon flash loader USB ID) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (6f51bc340d2a usb: chipidea: imx: fix a possible NULL dereference) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging staging.current/staging-linus (9225c0b7b976 staging: lustre: echo_copy.._lsm() dereferences userland pointers directly) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/iio/adc/qcom-spmi-vadc.c | 4 +++- + drivers/iio/industrialio-buffer.c | 2 +- + drivers/iio/industrialio-core.c | 2 +- + drivers/iio/light/apds9960.c | 1 + + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 6 +++--- + drivers/staging/iio/iio_simple_dummy_events.c | 2 +- + drivers/staging/lustre/lustre/obdecho/echo_client.c | 20 +++++++++++--------- + 7 files changed, 21 insertions(+), 16 deletions(-) +Merging char-misc.current/char-misc-linus (e8c77bda05e5 fpga manager: Fix firmware resource leak on error) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/fpga/fpga-mgr.c | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) +Merging input-current/for-linus (0c6da0733bff Input: parkbd - clear unused function pointers) +$ git merge input-current/for-linus +Auto-merging drivers/input/joystick/walkera0701.c +Merge made by the 'recursive' strategy. + drivers/input/joystick/db9.c | 1 + + drivers/input/joystick/gamecon.c | 1 + + drivers/input/joystick/turbografx.c | 1 + + drivers/input/joystick/walkera0701.c | 1 + + drivers/input/serio/parkbd.c | 1 + + 5 files changed, 5 insertions(+) +Merging crypto-current/master (79960943fdc1 crypto: talitos - Fix timing leak in ESP ICV verification) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + drivers/crypto/nx/nx-aes-ccm.c | 2 +- + drivers/crypto/nx/nx-aes-gcm.c | 3 ++- + drivers/crypto/talitos.c | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) +Merging ide/master (1b1050cdc5cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge ide/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (275d7d44d802 module: Fix locking in symbol_put_addr()) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (2ce47b44b25d selftests/seccomp: Get page size from sysconf) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (bb6d19846d1c drm/i915: Check the timeout passed to i915_wait_request) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_gem.c | 12 ++++++++++-- + drivers/gpu/drm/i915/i915_gem_fence.c | 36 ++++++++++++++++++++++++++--------- + drivers/gpu/drm/i915/intel_display.c | 1 - + drivers/gpu/drm/i915/intel_dp.c | 3 ++- + 4 files changed, 39 insertions(+), 13 deletions(-) +Merging asm-generic/master (795291732663 asm-generic: page.h: Remove useless get_user_page and free_user_page) +$ git merge asm-generic/master +Merge made by the 'recursive' strategy. + arch/arc/include/asm/page.h | 3 - + arch/arm/include/asm/div64.h | 283 ++++++++---------------- + arch/arm/include/asm/page-nommu.h | 3 - + arch/frv/include/asm/page.h | 3 - + arch/m68k/include/asm/page_mm.h | 3 - + arch/m68k/include/asm/page_no.h | 3 - + arch/openrisc/include/asm/page.h | 3 - + drivers/clk/imx/clk-pllv1.c | 14 +- + drivers/clk/imx/clk-pllv2.c | 9 +- + drivers/clk/tegra/clk-divider.c | 4 +- + drivers/clk/ti/clkt_dpll.c | 4 +- + drivers/clk/ti/fapll.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c | 3 +- + drivers/hid/hid-sensor-hub.c | 3 +- + drivers/mtd/sm_ftl.c | 3 +- + include/asm-generic/div64.h | 178 ++++++++++++++- + include/asm-generic/page.h | 3 - + lib/div64.c | 6 +- + 19 files changed, 298 insertions(+), 236 deletions(-) +Merging arc/for-next (2e22502c080f ARC: dw2 unwind: Remove falllback linear search thru FDE entries) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (fa6af083e893 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/l2cc.txt | 10 ++++++---- + arch/arm/kernel/entry-v7m.S | 2 +- + arch/arm/mm/cache-l2x0.c | 20 ++++++++++++++++++++ + arch/arm/mm/proc-v7m.S | 14 +++++--------- + 4 files changed, 32 insertions(+), 14 deletions(-) +Merging arm-perf/for-next/perf (8005c49d9aea Linux 4.4-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (e693492eca37 Merge branch 'next/defconfig' into for-next) +$ git merge arm-soc/for-next +Removing include/linux/clksrc-dbx500-prcmu.h +Auto-merging arch/arm/plat-samsung/gpio-samsung.c +Removing arch/arm/mach-ux500/timer.c +Removing arch/arm/mach-s3c64xx/include/mach/debug-macro.S +Auto-merging arch/arm/mach-realview/platform.h +Auto-merging arch/arm/mach-realview/irqs-pbx.h +Auto-merging arch/arm/mach-realview/irqs-pba8.h +Auto-merging arch/arm/mach-realview/irqs-pb11mp.h +Auto-merging arch/arm/mach-realview/irqs-pb1176.h +Auto-merging arch/arm/mach-realview/irqs-eb.h +Removing arch/arm/mach-realview/include/mach/uncompress.h +Removing arch/arm/mach-realview/include/mach/memory.h +Removing arch/arm/mach-realview/include/mach/irqs.h +Removing arch/arm/mach-realview/include/mach/barriers.h +Auto-merging arch/arm/mach-realview/hardware.h +Auto-merging arch/arm/mach-realview/board-pbx.h +Auto-merging arch/arm/mach-realview/board-pba8.h +Auto-merging arch/arm/mach-realview/board-pb11mp.h +Auto-merging arch/arm/mach-realview/board-pb1176.h +Auto-merging arch/arm/mach-realview/board-eb.h +Auto-merging arch/arm/mach-pxa/pxa930.h +Auto-merging arch/arm/mach-pxa/pxa320.h +Auto-merging arch/arm/mach-pxa/pxa300.h +Auto-merging arch/arm/mach-pxa/pxa27x.h +Auto-merging arch/arm/mach-pxa/pxa25x.h +Auto-merging arch/arm/mach-pxa/pcm990_baseboard.h +Auto-merging arch/arm/mach-pxa/pcm027.h +Auto-merging arch/arm/mach-pxa/palmt5.h +Auto-merging arch/arm/mach-pxa/mfp-pxa930.h +Auto-merging arch/arm/mach-pxa/mfp-pxa320.h +Auto-merging arch/arm/mach-pxa/mfp-pxa300.h +Auto-merging arch/arm/mach-pxa/mfp-pxa27x.h +Auto-merging arch/arm/mach-pxa/mfp-pxa25x.h +Auto-merging arch/arm/mach-pxa/idp.h +Auto-merging arch/arm/mach-pxa/h5000.h +Auto-merging arch/arm/mach-pxa/gumstix.h +Auto-merging arch/arm/mach-pxa/csb726.h +Removing arch/arm/mach-netx/include/mach/param.h +Auto-merging arch/arm/mach-mmp/teton_bga.h +Auto-merging arch/arm/mach-mmp/regs-timers.h +Auto-merging arch/arm/mach-mmp/regs-icu.h +Auto-merging arch/arm/mach-mmp/regs-apmu.h +Auto-merging arch/arm/mach-mmp/regs-apbc.h +Auto-merging arch/arm/mach-mmp/pxa910.h +Auto-merging arch/arm/mach-mmp/pxa168.h +Auto-merging arch/arm/mach-mmp/pm-mmp2.h +Auto-merging arch/arm/mach-mmp/mmp2.h +Auto-merging arch/arm/mach-mmp/mfp-pxa910.h +Auto-merging arch/arm/mach-mmp/mfp-pxa168.h +Auto-merging arch/arm/mach-mmp/mfp-mmp2.h +Removing arch/arm/mach-mmp/include/mach/uncompress.h +Removing arch/arm/mach-mmp/include/mach/regs-smc.h +Removing arch/arm/mach-mmp/include/mach/hardware.h +Removing arch/arm/mach-mmp/include/mach/dma.h +Auto-merging arch/arm/mach-mmp/addr-map.h +Removing arch/arm/mach-iop13xx/include/mach/pci.h +Merge made by the 'recursive' strategy. + Documentation/arm/pxa/mfp.txt | 26 +-- + .../devicetree/bindings/arm/samsung/exynos-adc.txt | 3 + + arch/arm/Kconfig | 61 +----- + arch/arm/Kconfig.debug | 19 +- + arch/arm/common/mcpm_platsmp.c | 2 +- + arch/arm/configs/multi_v7_defconfig | 7 + + arch/arm/configs/s3c6400_defconfig | 2 + + arch/arm/include/asm/cputype.h | 22 +- + arch/arm/include/asm/psci.h | 2 +- + arch/arm/kernel/psci_smp.c | 2 +- + arch/arm/kernel/xscale-cp0.c | 7 + + arch/arm/mach-alpine/Kconfig | 3 +- + arch/arm/mach-alpine/platsmp.c | 2 +- + arch/arm/mach-at91/Kconfig | 15 +- + arch/arm/mach-axxia/Kconfig | 3 +- + arch/arm/mach-axxia/platsmp.c | 2 +- + arch/arm/mach-bcm/Kconfig | 27 ++- + arch/arm/mach-bcm/bcm63xx_smp.c | 2 +- + arch/arm/mach-bcm/kona_smp.c | 2 +- + arch/arm/mach-bcm/platsmp-brcmstb.c | 2 +- + arch/arm/mach-berlin/Kconfig | 3 +- + arch/arm/mach-berlin/platsmp.c | 2 +- + arch/arm/mach-cns3xxx/Kconfig | 3 +- + arch/arm/mach-davinci/board-da830-evm.c | 2 +- + arch/arm/mach-davinci/board-da850-evm.c | 4 +- + arch/arm/mach-davinci/board-mityomapl138.c | 2 +- + arch/arm/mach-davinci/board-omapl138-hawk.c | 2 +- + arch/arm/mach-davinci/clock.c | 2 +- + arch/arm/mach-davinci/cp_intc.c | 2 +- + arch/arm/mach-davinci/{include/mach => }/cp_intc.h | 0 + arch/arm/mach-davinci/cpuidle.c | 4 +- + arch/arm/mach-davinci/{include/mach => }/cpuidle.h | 0 + arch/arm/mach-davinci/da830.c | 2 +- + arch/arm/mach-davinci/da850.c | 2 +- + arch/arm/mach-davinci/da8xx-dt.c | 2 +- + arch/arm/mach-davinci/{include/mach => }/ddr2.h | 0 + arch/arm/mach-davinci/devices-da8xx.c | 4 +- + arch/arm/mach-davinci/dm355.c | 2 +- + arch/arm/mach-davinci/dm365.c | 2 +- + arch/arm/mach-davinci/dm644x.c | 2 +- + arch/arm/mach-davinci/dm646x.c | 2 +- + arch/arm/mach-davinci/pm.c | 2 +- + arch/arm/mach-davinci/psc.c | 2 +- + arch/arm/mach-davinci/{include/mach => }/psc.h | 0 + arch/arm/mach-davinci/sleep.S | 4 +- + arch/arm/mach-davinci/sram.c | 2 +- + arch/arm/mach-davinci/{include/mach => }/sram.h | 0 + arch/arm/mach-exynos/Kconfig | 3 +- + arch/arm/mach-exynos/common.h | 2 +- + arch/arm/mach-exynos/platsmp.c | 2 +- + arch/arm/mach-highbank/Kconfig | 3 +- + arch/arm/mach-hisi/Kconfig | 12 +- + arch/arm/mach-hisi/core.h | 3 - + arch/arm/mach-hisi/platmcpm.c | 2 +- + arch/arm/mach-hisi/platsmp.c | 6 +- + arch/arm/mach-imx/Kconfig | 6 +- + arch/arm/mach-imx/common.h | 4 +- + arch/arm/mach-imx/platsmp.c | 4 +- + arch/arm/mach-integrator/Kconfig | 135 +++++++++++-- + arch/arm/mach-iop13xx/include/mach/pci.h | 57 ------ + arch/arm/mach-iop13xx/iq81340mc.c | 2 +- + arch/arm/mach-iop13xx/iq81340sc.c | 2 +- + arch/arm/mach-iop13xx/irq.c | 2 +- + arch/arm/mach-iop13xx/{include/mach => }/msi.h | 0 + arch/arm/mach-iop13xx/pci.c | 2 +- + arch/arm/mach-iop13xx/pci.h | 58 ++++++ + arch/arm/mach-ixp4xx/include/mach/io.h | 12 +- + arch/arm/mach-keystone/keystone.h | 2 +- + arch/arm/mach-keystone/platsmp.c | 2 +- + arch/arm/mach-ks8695/board-acs5k.c | 2 +- + arch/arm/mach-ks8695/board-dsm320.c | 2 +- + arch/arm/mach-ks8695/board-micrel.c | 2 +- + arch/arm/mach-ks8695/board-og.c | 2 +- + arch/arm/mach-ks8695/board-sg.c | 2 +- + arch/arm/mach-ks8695/cpu.c | 2 +- + arch/arm/mach-ks8695/devices.c | 6 +- + arch/arm/mach-ks8695/{include/mach => }/devices.h | 0 + arch/arm/mach-ks8695/pci.c | 4 +- + .../arm/mach-ks8695/{include/mach => }/regs-hpna.h | 0 + arch/arm/mach-ks8695/{include/mach => }/regs-lan.h | 0 + arch/arm/mach-ks8695/{include/mach => }/regs-mem.h | 0 + arch/arm/mach-ks8695/{include/mach => }/regs-pci.h | 0 + arch/arm/mach-ks8695/{include/mach => }/regs-sys.h | 0 + arch/arm/mach-ks8695/{include/mach => }/regs-wan.h | 0 + arch/arm/mach-mediatek/Kconfig | 3 +- + arch/arm/mach-mediatek/platsmp.c | 4 +- + arch/arm/mach-meson/Kconfig | 3 +- + arch/arm/mach-mmp/Kconfig | 34 +++- + arch/arm/mach-mmp/Makefile | 1 + + arch/arm/mach-mmp/{include/mach => }/addr-map.h | 2 - + arch/arm/mach-mmp/aspenite.c | 8 +- + arch/arm/mach-mmp/avengers_lite.c | 8 +- + arch/arm/mach-mmp/brownstone.c | 8 +- + arch/arm/mach-mmp/clock-mmp2.c | 6 +- + arch/arm/mach-mmp/clock-pxa168.c | 6 +- + arch/arm/mach-mmp/clock-pxa910.c | 6 +- + arch/arm/mach-mmp/clock.c | 2 +- + arch/arm/mach-mmp/clock.h | 2 - + arch/arm/mach-mmp/common.c | 4 +- + arch/arm/mach-mmp/common.h | 3 - + arch/arm/mach-mmp/{include/mach => }/cputype.h | 0 + arch/arm/mach-mmp/devices.c | 13 +- + arch/arm/mach-mmp/{include/mach => }/devices.h | 0 + arch/arm/mach-mmp/flint.c | 8 +- + arch/arm/mach-mmp/gplugd.c | 6 +- + arch/arm/mach-mmp/include/mach/dma.h | 13 -- + arch/arm/mach-mmp/include/mach/hardware.h | 4 - + arch/arm/mach-mmp/include/mach/regs-smc.h | 37 ---- + arch/arm/mach-mmp/include/mach/uncompress.h | 45 ----- + arch/arm/mach-mmp/{include/mach => }/irqs.h | 0 + arch/arm/mach-mmp/jasper.c | 8 +- + arch/arm/mach-mmp/{include/mach => }/mfp-mmp2.h | 2 +- + arch/arm/mach-mmp/{include/mach => }/mfp-pxa168.h | 2 +- + arch/arm/mach-mmp/{include/mach => }/mfp-pxa910.h | 2 +- + arch/arm/mach-mmp/{include/mach => }/mfp.h | 0 + arch/arm/mach-mmp/mmp2.c | 23 ++- + arch/arm/mach-mmp/{include/mach => }/mmp2.h | 3 +- + arch/arm/mach-mmp/pm-mmp2.c | 12 +- + arch/arm/mach-mmp/{include/mach => }/pm-mmp2.h | 2 +- + arch/arm/mach-mmp/pm-pxa910.c | 12 +- + arch/arm/mach-mmp/{include/mach => }/pm-pxa910.h | 0 + arch/arm/mach-mmp/pxa168.c | 29 +-- + arch/arm/mach-mmp/{include/mach => }/pxa168.h | 5 +- + arch/arm/mach-mmp/pxa910.c | 24 ++- + arch/arm/mach-mmp/{include/mach => }/pxa910.h | 3 +- + arch/arm/mach-mmp/{include/mach => }/regs-apbc.h | 4 +- + arch/arm/mach-mmp/{include/mach => }/regs-apmu.h | 4 +- + arch/arm/mach-mmp/{include/mach => }/regs-icu.h | 4 +- + arch/arm/mach-mmp/{include/mach => }/regs-timers.h | 4 +- + arch/arm/mach-mmp/{include/mach => }/regs-usb.h | 0 + arch/arm/mach-mmp/tavorevb.c | 8 +- + arch/arm/mach-mmp/teton_bga.c | 10 +- + arch/arm/mach-mmp/{include/mach => }/teton_bga.h | 2 - + arch/arm/mach-mmp/time.c | 11 +- + arch/arm/mach-mmp/ttc_dkb.c | 10 +- + arch/arm/mach-moxart/Kconfig | 3 +- + arch/arm/mach-mvebu/Kconfig | 24 ++- + arch/arm/mach-mvebu/armada-370-xp.h | 2 +- + arch/arm/mach-mvebu/platsmp-a9.c | 4 +- + arch/arm/mach-mvebu/platsmp.c | 2 +- + arch/arm/mach-netx/include/mach/param.h | 18 -- + arch/arm/mach-omap1/board-ams-delta.c | 2 +- + arch/arm/mach-omap1/board-fsample.c | 2 +- + arch/arm/mach-omap1/board-h2.c | 2 +- + arch/arm/mach-omap1/board-h3.c | 2 +- + arch/arm/mach-omap1/board-innovator.c | 2 +- + arch/arm/mach-omap1/board-osk.c | 2 +- + arch/arm/mach-omap1/board-palmte.c | 2 +- + arch/arm/mach-omap1/board-palmtt.c | 2 +- + arch/arm/mach-omap1/board-palmz71.c | 2 +- + arch/arm/mach-omap1/board-perseus2.c | 2 +- + arch/arm/mach-omap1/board-sx1-mmc.c | 2 +- + arch/arm/mach-omap1/board-sx1.c | 4 +- + arch/arm/mach-omap1/{include/mach => }/board-sx1.h | 0 + arch/arm/mach-omap1/{include/mach => }/camera.h | 0 + arch/arm/mach-omap1/devices.c | 2 +- + arch/arm/mach-omap1/flash.c | 2 +- + arch/arm/mach-omap1/{include/mach => }/flash.h | 0 + arch/arm/mach-omap2/common.h | 2 +- + arch/arm/mach-omap2/omap-smp.c | 2 +- + arch/arm/mach-picoxcell/Kconfig | 3 +- + arch/arm/mach-prima2/Kconfig | 3 +- + arch/arm/mach-prima2/common.h | 2 +- + arch/arm/mach-prima2/platsmp.c | 2 +- + arch/arm/mach-pxa/am200epd.c | 4 +- + arch/arm/mach-pxa/am300epd.c | 4 +- + arch/arm/mach-pxa/balloon3.c | 6 +- + arch/arm/mach-pxa/capc7117.c | 4 +- + arch/arm/mach-pxa/cm-x255.c | 2 +- + arch/arm/mach-pxa/cm-x270.c | 2 +- + arch/arm/mach-pxa/cm-x2xx.c | 4 +- + arch/arm/mach-pxa/cm-x300.c | 4 +- + arch/arm/mach-pxa/colibri-evalboard.c | 6 +- + arch/arm/mach-pxa/colibri-pxa270-income.c | 4 +- + arch/arm/mach-pxa/colibri-pxa270.c | 4 +- + arch/arm/mach-pxa/colibri-pxa300.c | 4 +- + arch/arm/mach-pxa/colibri-pxa320.c | 8 +- + arch/arm/mach-pxa/colibri-pxa3xx.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/colibri.h | 0 + arch/arm/mach-pxa/corgi.c | 6 +- + arch/arm/mach-pxa/corgi_pm.c | 2 +- + arch/arm/mach-pxa/csb726.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/csb726.h | 2 +- + arch/arm/mach-pxa/devices.c | 2 +- + arch/arm/mach-pxa/em-x270.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/eseries-irq.h | 0 + arch/arm/mach-pxa/eseries.c | 6 +- + arch/arm/mach-pxa/ezx.c | 2 +- + arch/arm/mach-pxa/gumstix.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/gumstix.h | 2 +- + arch/arm/mach-pxa/h5000.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/h5000.h | 2 +- + arch/arm/mach-pxa/himalaya.c | 2 +- + arch/arm/mach-pxa/hx4700.c | 2 +- + arch/arm/mach-pxa/icontrol.c | 4 +- + arch/arm/mach-pxa/idp.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/idp.h | 2 +- + arch/arm/mach-pxa/littleton.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/littleton.h | 0 + arch/arm/mach-pxa/lpd270.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/lpd270.h | 0 + arch/arm/mach-pxa/lubbock.c | 6 +- + arch/arm/mach-pxa/magician.c | 6 +- + arch/arm/mach-pxa/mainstone.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/mfp-pxa25x.h | 2 +- + arch/arm/mach-pxa/{include/mach => }/mfp-pxa27x.h | 2 +- + arch/arm/mach-pxa/mfp-pxa2xx.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/mfp-pxa2xx.h | 0 + arch/arm/mach-pxa/{include/mach => }/mfp-pxa300.h | 2 +- + arch/arm/mach-pxa/{include/mach => }/mfp-pxa320.h | 2 +- + arch/arm/mach-pxa/mfp-pxa3xx.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/mfp-pxa3xx.h | 0 + arch/arm/mach-pxa/{include/mach => }/mfp-pxa930.h | 2 +- + arch/arm/mach-pxa/mioa701.c | 10 +- + arch/arm/mach-pxa/{include/mach => }/mioa701.h | 0 + arch/arm/mach-pxa/mp900.c | 2 +- + arch/arm/mach-pxa/mxm8x10.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/mxm8x10.h | 0 + arch/arm/mach-pxa/palm27x.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/palm27x.h | 0 + arch/arm/mach-pxa/palmld.c | 4 +- + arch/arm/mach-pxa/palmt5.c | 8 +- + arch/arm/mach-pxa/{include/mach => }/palmt5.h | 2 +- + arch/arm/mach-pxa/palmtc.c | 4 +- + arch/arm/mach-pxa/palmte2.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/palmte2.h | 0 + arch/arm/mach-pxa/palmtreo.c | 10 +- + arch/arm/mach-pxa/{include/mach => }/palmtreo.h | 0 + arch/arm/mach-pxa/palmtx.c | 6 +- + arch/arm/mach-pxa/palmz72.c | 10 +- + arch/arm/mach-pxa/{include/mach => }/palmz72.h | 0 + arch/arm/mach-pxa/pcm027.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/pcm027.h | 2 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 4 +- + .../mach-pxa/{include/mach => }/pcm990_baseboard.h | 4 +- + arch/arm/mach-pxa/pm.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/pm.h | 0 + arch/arm/mach-pxa/poodle.c | 4 +- + arch/arm/mach-pxa/pxa25x.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/pxa25x.h | 2 +- + arch/arm/mach-pxa/{include/mach => }/pxa27x-udc.h | 0 + arch/arm/mach-pxa/pxa27x.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/pxa27x.h | 2 +- + arch/arm/mach-pxa/pxa2xx.c | 2 +- + arch/arm/mach-pxa/pxa300.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/pxa300.h | 4 +- + arch/arm/mach-pxa/pxa320.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/pxa320.h | 4 +- + arch/arm/mach-pxa/pxa3xx-ulpi.c | 2 +- + arch/arm/mach-pxa/pxa3xx.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/pxa3xx.h | 0 + arch/arm/mach-pxa/pxa930.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/pxa930.h | 4 +- + arch/arm/mach-pxa/raumfeld.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/regs-rtc.h | 0 + arch/arm/mach-pxa/{include/mach => }/regs-u2d.h | 0 + arch/arm/mach-pxa/saar.c | 2 +- + arch/arm/mach-pxa/sharpsl_pm.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/sharpsl_pm.h | 0 + arch/arm/mach-pxa/spitz.c | 6 +- + arch/arm/mach-pxa/spitz_pm.c | 4 +- + arch/arm/mach-pxa/stargate2.c | 6 +- + arch/arm/mach-pxa/tavorevb.c | 2 +- + arch/arm/mach-pxa/tosa-bt.c | 2 +- + arch/arm/mach-pxa/tosa.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/tosa_bt.h | 0 + arch/arm/mach-pxa/trizeps4.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/udc.h | 0 + arch/arm/mach-pxa/viper.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/viper.h | 0 + arch/arm/mach-pxa/vpac270.c | 6 +- + arch/arm/mach-pxa/xcep.c | 2 +- + arch/arm/mach-pxa/z2.c | 6 +- + arch/arm/mach-pxa/zeus.c | 10 +- + arch/arm/mach-pxa/{include/mach => }/zeus.h | 0 + arch/arm/mach-pxa/zylonite.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/zylonite.h | 0 + arch/arm/mach-pxa/zylonite_pxa300.c | 4 +- + arch/arm/mach-pxa/zylonite_pxa320.c | 4 +- + arch/arm/mach-qcom/Kconfig | 3 +- + arch/arm/mach-qcom/platsmp.c | 6 +- + arch/arm/mach-realview/Kconfig | 62 ++++-- + arch/arm/mach-realview/Makefile | 7 +- + .../mach-realview/{include/mach => }/board-eb.h | 4 +- + .../{include/mach => }/board-pb1176.h | 4 +- + .../{include/mach => }/board-pb11mp.h | 4 +- + .../mach-realview/{include/mach => }/board-pba8.h | 4 +- + .../mach-realview/{include/mach => }/board-pbx.h | 4 +- + arch/arm/mach-realview/core.c | 7 +- + arch/arm/mach-realview/core.h | 4 +- + .../mach-realview/{include/mach => }/hardware.h | 2 - + arch/arm/mach-realview/include/mach/barriers.h | 8 - + arch/arm/mach-realview/include/mach/irqs.h | 40 ---- + arch/arm/mach-realview/include/mach/memory.h | 64 ------ + arch/arm/mach-realview/include/mach/uncompress.h | 77 ------- + .../arm/mach-realview/{include/mach => }/irqs-eb.h | 20 +- + .../mach-realview/{include/mach => }/irqs-pb1176.h | 21 -- + .../mach-realview/{include/mach => }/irqs-pb11mp.h | 27 +-- + .../mach-realview/{include/mach => }/irqs-pba8.h | 23 --- + .../mach-realview/{include/mach => }/irqs-pbx.h | 24 +-- + .../mach-realview/{include/mach => }/platform.h | 2 - + arch/arm/mach-realview/platsmp.c | 10 +- + arch/arm/mach-realview/realview-dt.c | 1 - + arch/arm/mach-realview/realview_eb.c | 12 +- + arch/arm/mach-realview/realview_pb1176.c | 6 +- + arch/arm/mach-realview/realview_pb11mp.c | 11 +- + arch/arm/mach-realview/realview_pba8.c | 14 +- + arch/arm/mach-realview/realview_pbx.c | 14 +- + arch/arm/mach-rockchip/Kconfig | 3 +- + arch/arm/mach-rockchip/platsmp.c | 2 +- + arch/arm/mach-s3c64xx/Kconfig | 31 ++- + arch/arm/mach-s3c64xx/Makefile | 24 ++- + arch/arm/mach-s3c64xx/common.c | 5 +- + arch/arm/mach-s3c64xx/cpuidle.c | 5 +- + arch/arm/mach-s3c64xx/dev-uart.c | 1 + + arch/arm/mach-s3c64xx/include/mach/debug-macro.S | 38 ---- + arch/arm/mach-s3c64xx/include/mach/gpio-samsung.h | 3 + + arch/arm/mach-s3c64xx/include/mach/irqs.h | 20 +- + arch/arm/mach-s3c64xx/include/mach/pm-core.h | 1 + + arch/arm/mach-s3c64xx/irq-pm.c | 2 +- + arch/arm/mach-s3c64xx/mach-anw6410.c | 3 +- + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 6 + + arch/arm/mach-s3c64xx/mach-crag6410.c | 2 + + arch/arm/mach-s3c64xx/mach-hmt.c | 2 + + arch/arm/mach-s3c64xx/mach-mini6410.c | 5 +- + arch/arm/mach-s3c64xx/mach-ncp.c | 2 + + arch/arm/mach-s3c64xx/mach-real6410.c | 6 +- + arch/arm/mach-s3c64xx/mach-smartq.c | 16 +- + arch/arm/mach-s3c64xx/mach-smartq5.c | 2 + + arch/arm/mach-s3c64xx/mach-smartq7.c | 2 + + arch/arm/mach-s3c64xx/mach-smdk6400.c | 3 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 6 +- + arch/arm/mach-s3c64xx/pl080.c | 4 + + arch/arm/mach-s3c64xx/pm.c | 4 + + arch/arm/mach-s3c64xx/s3c6400.c | 2 +- + arch/arm/mach-s3c64xx/s3c6410.c | 2 +- + arch/arm/mach-s5pv210/Kconfig | 3 +- + arch/arm/mach-shmobile/Kconfig | 4 +- + arch/arm/mach-shmobile/r8a7779.h | 2 +- + arch/arm/mach-shmobile/r8a7790.h | 2 +- + arch/arm/mach-shmobile/r8a7791.h | 2 +- + arch/arm/mach-shmobile/setup-emev2.c | 2 +- + arch/arm/mach-shmobile/sh73a0.h | 2 +- + arch/arm/mach-shmobile/smp-emev2.c | 2 +- + arch/arm/mach-shmobile/smp-r8a7779.c | 2 +- + arch/arm/mach-shmobile/smp-r8a7790.c | 2 +- + arch/arm/mach-shmobile/smp-r8a7791.c | 2 +- + arch/arm/mach-shmobile/smp-sh73a0.c | 2 +- + arch/arm/mach-socfpga/Kconfig | 3 +- + arch/arm/mach-socfpga/platsmp.c | 4 +- + arch/arm/mach-spear/Kconfig | 3 +- + arch/arm/mach-spear/generic.h | 2 +- + arch/arm/mach-spear/platsmp.c | 2 +- + arch/arm/mach-sti/Kconfig | 3 +- + arch/arm/mach-sti/platsmp.c | 2 +- + arch/arm/mach-sti/smp.h | 2 +- + arch/arm/mach-sunxi/Kconfig | 3 +- + arch/arm/mach-sunxi/platsmp.c | 4 +- + arch/arm/mach-tegra/Kconfig | 3 +- + arch/arm/mach-tegra/common.h | 2 +- + arch/arm/mach-tegra/platsmp.c | 2 +- + arch/arm/mach-u300/Kconfig | 4 +- + arch/arm/mach-uniphier/platsmp.c | 2 +- + arch/arm/mach-ux500/Kconfig | 4 +- + arch/arm/mach-ux500/Makefile | 2 +- + arch/arm/mach-ux500/cpu-db8500.c | 2 - + arch/arm/mach-ux500/cpu.c | 1 - + arch/arm/mach-ux500/platsmp.c | 2 +- + arch/arm/mach-ux500/setup.h | 3 - + arch/arm/mach-ux500/timer.c | 48 ----- + arch/arm/mach-vexpress/Kconfig | 3 +- + arch/arm/mach-vexpress/core.h | 2 +- + arch/arm/mach-vexpress/platsmp.c | 2 +- + arch/arm/mach-w90x900/cpu.c | 4 +- + .../arm/mach-w90x900/{include/mach => }/regs-ebi.h | 0 + .../arm/mach-w90x900/{include/mach => }/regs-gcr.h | 0 + .../mach-w90x900/{include/mach => }/regs-timer.h | 0 + .../arm/mach-w90x900/{include/mach => }/regs-usb.h | 0 + arch/arm/mach-w90x900/time.c | 2 +- + arch/arm/mach-zx/Kconfig | 3 +- + arch/arm/mach-zx/platsmp.c | 2 +- + arch/arm/mach-zynq/Kconfig | 3 +- + arch/arm/mach-zynq/common.h | 2 +- + arch/arm/mach-zynq/platsmp.c | 2 +- + arch/arm/mm/Kconfig | 32 ++- + arch/arm/mm/idmap.c | 2 +- + arch/arm/mm/mmu.c | 2 +- + arch/arm/mm/proc-mohawk.S | 2 + + arch/arm/plat-pxa/Makefile | 3 +- + arch/arm/plat-pxa/ssp.c | 1 - + arch/arm/plat-samsung/Kconfig | 5 +- + arch/arm/plat-samsung/Makefile | 5 +- + arch/arm/plat-samsung/devs.c | 22 +- + .../gpio => arch/arm/plat-samsung}/gpio-samsung.c | 12 +- + arch/arm/plat-samsung/init.c | 5 + + arch/arm/plat-samsung/pm.c | 4 - + drivers/clk/mmp/clk-mmp2.c | 12 +- + drivers/clk/mmp/clk-pxa168.c | 12 +- + drivers/clk/mmp/clk-pxa910.c | 14 +- + drivers/clk/pxa/clk-pxa25x.c | 1 - + drivers/clk/versatile/clk-realview.c | 10 +- + drivers/clocksource/clksrc-dbx500-prcmu.c | 9 +- + drivers/gpio/Kconfig | 7 - + drivers/gpio/Makefile | 1 - + drivers/iio/adc/exynos_adc.c | 224 ++++++++++++++++++++- + drivers/input/touchscreen/Kconfig | 2 +- + drivers/irqchip/irq-versatile-fpga.c | 5 + + include/linux/clk/mmp.h | 17 ++ + include/linux/clksrc-dbx500-prcmu.h | 20 -- + include/linux/platform_data/touchscreen-s3c2410.h | 1 + + sound/soc/samsung/smartq_wm8987.c | 76 +++---- + 411 files changed, 1366 insertions(+), 1457 deletions(-) + rename arch/arm/mach-davinci/{include/mach => }/cp_intc.h (100%) + rename arch/arm/mach-davinci/{include/mach => }/cpuidle.h (100%) + rename arch/arm/mach-davinci/{include/mach => }/ddr2.h (100%) + rename arch/arm/mach-davinci/{include/mach => }/psc.h (100%) + rename arch/arm/mach-davinci/{include/mach => }/sram.h (100%) + delete mode 100644 arch/arm/mach-iop13xx/include/mach/pci.h + rename arch/arm/mach-iop13xx/{include/mach => }/msi.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/devices.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/regs-hpna.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/regs-lan.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/regs-mem.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/regs-pci.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/regs-sys.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/regs-wan.h (100%) + rename arch/arm/mach-mmp/{include/mach => }/addr-map.h (96%) + rename arch/arm/mach-mmp/{include/mach => }/cputype.h (100%) + rename arch/arm/mach-mmp/{include/mach => }/devices.h (100%) + delete mode 100644 arch/arm/mach-mmp/include/mach/dma.h + delete mode 100644 arch/arm/mach-mmp/include/mach/hardware.h + delete mode 100644 arch/arm/mach-mmp/include/mach/regs-smc.h + delete mode 100644 arch/arm/mach-mmp/include/mach/uncompress.h + rename arch/arm/mach-mmp/{include/mach => }/irqs.h (100%) + rename arch/arm/mach-mmp/{include/mach => }/mfp-mmp2.h (99%) + rename arch/arm/mach-mmp/{include/mach => }/mfp-pxa168.h (99%) + rename arch/arm/mach-mmp/{include/mach => }/mfp-pxa910.h (99%) + rename arch/arm/mach-mmp/{include/mach => }/mfp.h (100%) + rename arch/arm/mach-mmp/{include/mach => }/mmp2.h (99%) + rename arch/arm/mach-mmp/{include/mach => }/pm-mmp2.h (98%) + rename arch/arm/mach-mmp/{include/mach => }/pm-pxa910.h (100%) + rename arch/arm/mach-mmp/{include/mach => }/pxa168.h (98%) + rename arch/arm/mach-mmp/{include/mach => }/pxa910.h (98%) + rename arch/arm/mach-mmp/{include/mach => }/regs-apbc.h (88%) + rename arch/arm/mach-mmp/{include/mach => }/regs-apmu.h (91%) + rename arch/arm/mach-mmp/{include/mach => }/regs-icu.h (96%) + rename arch/arm/mach-mmp/{include/mach => }/regs-timers.h (93%) + rename arch/arm/mach-mmp/{include/mach => }/regs-usb.h (100%) + rename arch/arm/mach-mmp/{include/mach => }/teton_bga.h (92%) + delete mode 100644 arch/arm/mach-netx/include/mach/param.h + rename arch/arm/mach-omap1/{include/mach => }/board-sx1.h (100%) + rename arch/arm/mach-omap1/{include/mach => }/camera.h (100%) + rename arch/arm/mach-omap1/{include/mach => }/flash.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/colibri.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/csb726.h (93%) + rename arch/arm/mach-pxa/{include/mach => }/eseries-irq.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/gumstix.h (98%) + rename arch/arm/mach-pxa/{include/mach => }/h5000.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/idp.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/littleton.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/lpd270.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa25x.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa27x.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa2xx.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa300.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa320.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa3xx.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa930.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/mioa701.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/mxm8x10.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/palm27x.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/palmt5.h (98%) + rename arch/arm/mach-pxa/{include/mach => }/palmte2.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/palmtreo.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/palmz72.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/pcm027.h (98%) + rename arch/arm/mach-pxa/{include/mach => }/pcm990_baseboard.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/pm.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/pxa25x.h (84%) + rename arch/arm/mach-pxa/{include/mach => }/pxa27x-udc.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/pxa27x.h (97%) + rename arch/arm/mach-pxa/{include/mach => }/pxa300.h (59%) + rename arch/arm/mach-pxa/{include/mach => }/pxa320.h (59%) + rename arch/arm/mach-pxa/{include/mach => }/pxa3xx.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/pxa930.h (59%) + rename arch/arm/mach-pxa/{include/mach => }/regs-rtc.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/regs-u2d.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/sharpsl_pm.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/tosa_bt.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/udc.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/viper.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/zeus.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/zylonite.h (100%) + rename arch/arm/mach-realview/{include/mach => }/board-eb.h (97%) + rename arch/arm/mach-realview/{include/mach => }/board-pb1176.h (97%) + rename arch/arm/mach-realview/{include/mach => }/board-pb11mp.h (98%) + rename arch/arm/mach-realview/{include/mach => }/board-pba8.h (97%) + rename arch/arm/mach-realview/{include/mach => }/board-pbx.h (98%) + rename arch/arm/mach-realview/{include/mach => }/hardware.h (95%) + delete mode 100644 arch/arm/mach-realview/include/mach/barriers.h + delete mode 100644 arch/arm/mach-realview/include/mach/irqs.h + delete mode 100644 arch/arm/mach-realview/include/mach/memory.h + delete mode 100644 arch/arm/mach-realview/include/mach/uncompress.h + rename arch/arm/mach-realview/{include/mach => }/irqs-eb.h (91%) + rename arch/arm/mach-realview/{include/mach => }/irqs-pb1176.h (88%) + rename arch/arm/mach-realview/{include/mach => }/irqs-pb11mp.h (90%) + rename arch/arm/mach-realview/{include/mach => }/irqs-pba8.h (87%) + rename arch/arm/mach-realview/{include/mach => }/irqs-pbx.h (90%) + rename arch/arm/mach-realview/{include/mach => }/platform.h (99%) + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-ux500/timer.c + rename arch/arm/mach-w90x900/{include/mach => }/regs-ebi.h (100%) + rename arch/arm/mach-w90x900/{include/mach => }/regs-gcr.h (100%) + rename arch/arm/mach-w90x900/{include/mach => }/regs-timer.h (100%) + rename arch/arm/mach-w90x900/{include/mach => }/regs-usb.h (100%) + rename {drivers/gpio => arch/arm/plat-samsung}/gpio-samsung.c (99%) + create mode 100644 include/linux/clk/mmp.h + delete mode 100644 include/linux/clksrc-dbx500-prcmu.h +Merging at91/at91-next (db4ce944d154 Merge branch 'at91-4.4-fixes' into at91-next) +$ git merge at91/at91-next +Auto-merging arch/arm/mach-at91/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 1 + + arch/arm/mach-at91/Kconfig | 1 + + 2 files changed, 2 insertions(+) +Merging bcm2835/for-next (b2776bf7149b Linux 3.18) +$ git merge bcm2835/for-next +Already up-to-date. +Merging berlin/berlin/for-next (a85dac7bd3c3 Merge branches 'berlin64/dt', 'berlin/dt' and 'berlin64/soc' into berlin/for-next) +$ git merge berlin/berlin/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/berlin2.dtsi | 23 +++++++++++++++ + arch/arm/boot/dts/berlin2cd.dtsi | 23 +++++++++++++++ + arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 1 - + arch/arm/boot/dts/berlin2q.dtsi | 29 ++++++++++++++---- + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 47 +++++++++++++++++++++++++++++- + 6 files changed, 116 insertions(+), 8 deletions(-) +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 (922ef3e263f7 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/imx25-pinfunc.h | 3 ++ + arch/arm/boot/dts/imx25.dtsi | 4 ++ + arch/arm/boot/dts/imx6dl.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 36 ++++++++++++++ + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 48 +++++++++++++++++++ + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 33 ++++++++++++- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 47 +++++++++++++++++- + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 24 ++++++++++ + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 24 ++++++++++ + arch/arm/boot/dts/imx6qdl.dtsi | 12 +++++ + arch/arm/boot/dts/imx6sl.dtsi | 9 ++++ + arch/arm/boot/dts/imx6sx.dtsi | 13 +++++ + arch/arm/boot/dts/imx6ul.dtsi | 18 +++++++ + arch/arm/boot/dts/vf610m4-cosmic.dts | 90 +++++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/vfxxx.dtsi | 24 ++++++++++ + arch/arm/configs/imx_v6_v7_defconfig | 4 +- + arch/arm/mach-imx/mach-imx6ul.c | 2 +- + drivers/clk/imx/clk-imx25.c | 18 +------ + drivers/clk/imx/clk-imx6q.c | 3 +- + drivers/clk/imx/clk-pllv3.c | 14 ++++++ + 21 files changed, 407 insertions(+), 22 deletions(-) + create mode 100644 arch/arm/boot/dts/vf610m4-cosmic.dts +Merging keystone/next (99d59777c089 Merge branch 'for_4.4-rcx/drivers-soc' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (61edc8459137 Merge branch 'mvebu/cleanup' into mvebu/for-next) +$ git merge mvebu/for-next +Recorded preimage for 'arch/arm/Kconfig' +Auto-merging arch/arm/mach-orion5x/orion5x.h +Auto-merging arch/arm/mach-orion5x/irqs.h +Removing arch/arm/mach-orion5x/include/mach/uncompress.h +Removing arch/arm/mach-orion5x/include/mach/hardware.h +Removing arch/arm/mach-orion5x/include/mach/entry-macro.S +Auto-merging arch/arm/mach-orion5x/bridge-regs.h +Removing arch/arm/mach-mvebu/include/mach/gpio.h +Auto-merging arch/arm/mach-mv78xx0/mv78xx0.h +Auto-merging arch/arm/mach-mv78xx0/irqs.h +Removing arch/arm/mach-mv78xx0/include/mach/uncompress.h +Removing arch/arm/mach-mv78xx0/include/mach/hardware.h +Removing arch/arm/mach-mv78xx0/include/mach/entry-macro.S +Auto-merging arch/arm/mach-mv78xx0/bridge-regs.h +Auto-merging arch/arm/mach-dove/pm.h +Auto-merging arch/arm/mach-dove/irqs.h +Removing arch/arm/mach-dove/include/mach/uncompress.h +Removing arch/arm/mach-dove/include/mach/hardware.h +Removing arch/arm/mach-dove/include/mach/entry-macro.S +Auto-merging arch/arm/mach-dove/dove.h +Auto-merging arch/arm/mach-dove/bridge-regs.h +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/Kconfig'. +[master 1d4d1afdeb7d] Merge remote-tracking branch 'mvebu/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 40 ------------ + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 72 +++++++++++----------- + arch/arm/configs/dove_defconfig | 2 + + arch/arm/configs/mv78xx0_defconfig | 3 + + arch/arm/configs/mvebu_v5_defconfig | 13 +--- + arch/arm/configs/orion5x_defconfig | 3 + + arch/arm/mach-dove/Kconfig | 15 +++-- + arch/arm/mach-dove/Makefile | 2 + + .../arm/mach-dove/{include/mach => }/bridge-regs.h | 4 +- + arch/arm/mach-dove/cm-a510.c | 4 +- + arch/arm/mach-dove/common.c | 4 +- + arch/arm/mach-dove/dove-db-setup.c | 3 +- + arch/arm/mach-dove/{include/mach => }/dove.h | 4 +- + arch/arm/mach-dove/include/mach/entry-macro.S | 33 ---------- + arch/arm/mach-dove/include/mach/hardware.h | 19 ------ + arch/arm/mach-dove/include/mach/uncompress.h | 36 ----------- + arch/arm/mach-dove/irq.c | 22 +++---- + arch/arm/mach-dove/{include/mach => }/irqs.h | 4 +- + arch/arm/mach-dove/mpp.c | 2 +- + arch/arm/mach-dove/pcie.c | 4 +- + arch/arm/mach-dove/{include/mach => }/pm.h | 6 +- + arch/arm/mach-mv78xx0/Kconfig | 15 +++-- + arch/arm/mach-mv78xx0/Makefile | 2 + + .../mach-mv78xx0/{include/mach => }/bridge-regs.h | 4 +- + arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 3 +- + arch/arm/mach-mv78xx0/common.c | 4 +- + arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 3 +- + arch/arm/mach-mv78xx0/include/mach/entry-macro.S | 41 ------------ + arch/arm/mach-mv78xx0/include/mach/hardware.h | 14 ----- + arch/arm/mach-mv78xx0/include/mach/uncompress.h | 46 -------------- + arch/arm/mach-mv78xx0/irq.c | 35 ++++++++++- + arch/arm/mach-mv78xx0/{include/mach => }/irqs.h | 4 +- + arch/arm/mach-mv78xx0/mpp.c | 2 +- + arch/arm/mach-mv78xx0/{include/mach => }/mv78xx0.h | 4 +- + arch/arm/mach-mv78xx0/pcie.c | 2 +- + arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 3 +- + arch/arm/mach-mvebu/include/mach/gpio.h | 1 - + arch/arm/mach-orion5x/Kconfig | 18 ++++-- + arch/arm/mach-orion5x/Makefile | 2 + + arch/arm/mach-orion5x/board-d2net.c | 2 +- + arch/arm/mach-orion5x/board-dt.c | 4 +- + arch/arm/mach-orion5x/board-mss2.c | 4 +- + arch/arm/mach-orion5x/board-rd88f5182.c | 2 +- + .../mach-orion5x/{include/mach => }/bridge-regs.h | 4 +- + arch/arm/mach-orion5x/common.c | 20 ++++-- + arch/arm/mach-orion5x/db88f5281-setup.c | 3 +- + arch/arm/mach-orion5x/dns323-setup.c | 3 +- + arch/arm/mach-orion5x/include/mach/entry-macro.S | 25 -------- + arch/arm/mach-orion5x/include/mach/hardware.h | 14 ----- + arch/arm/mach-orion5x/include/mach/uncompress.h | 48 --------------- + arch/arm/mach-orion5x/irq.c | 13 +--- + arch/arm/mach-orion5x/{include/mach => }/irqs.h | 4 +- + arch/arm/mach-orion5x/kurobox_pro-setup.c | 4 +- + arch/arm/mach-orion5x/ls-chl-setup.c | 3 +- + arch/arm/mach-orion5x/ls_hgl-setup.c | 3 +- + arch/arm/mach-orion5x/mpp.c | 2 +- + arch/arm/mach-orion5x/mv2120-setup.c | 3 +- + arch/arm/mach-orion5x/net2big-setup.c | 3 +- + arch/arm/mach-orion5x/{include/mach => }/orion5x.h | 4 +- + arch/arm/mach-orion5x/pci.c | 2 +- + arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 3 +- + arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 3 +- + arch/arm/mach-orion5x/rd88f5182-setup.c | 3 +- + arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 3 +- + arch/arm/mach-orion5x/terastation_pro2-setup.c | 3 +- + arch/arm/mach-orion5x/ts209-setup.c | 3 +- + arch/arm/mach-orion5x/ts409-setup.c | 3 +- + arch/arm/mach-orion5x/ts78xx-setup.c | 3 +- + arch/arm/mach-orion5x/tsx09-common.c | 2 +- + arch/arm/mach-orion5x/wnr854t-setup.c | 3 +- + arch/arm/mach-orion5x/wrt350n-v2-setup.c | 3 +- + arch/arm/plat-orion/common.c | 21 ------- + arch/arm/plat-orion/include/plat/common.h | 2 - + arch/arm/plat-orion/irq.c | 1 - + arch/arm/plat-orion/mpp.c | 1 - + 75 files changed, 224 insertions(+), 501 deletions(-) + rename arch/arm/mach-dove/{include/mach => }/bridge-regs.h (96%) + rename arch/arm/mach-dove/{include/mach => }/dove.h (99%) + delete mode 100644 arch/arm/mach-dove/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-dove/include/mach/hardware.h + delete mode 100644 arch/arm/mach-dove/include/mach/uncompress.h + rename arch/arm/mach-dove/{include/mach => }/irqs.h (96%) + rename arch/arm/mach-dove/{include/mach => }/pm.h (95%) + rename arch/arm/mach-mv78xx0/{include/mach => }/bridge-regs.h (92%) + delete mode 100644 arch/arm/mach-mv78xx0/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-mv78xx0/include/mach/hardware.h + delete mode 100644 arch/arm/mach-mv78xx0/include/mach/uncompress.h + rename arch/arm/mach-mv78xx0/{include/mach => }/irqs.h (95%) + rename arch/arm/mach-mv78xx0/{include/mach => }/mv78xx0.h (98%) + delete mode 100644 arch/arm/mach-mvebu/include/mach/gpio.h + rename arch/arm/mach-orion5x/{include/mach => }/bridge-regs.h (92%) + delete mode 100644 arch/arm/mach-orion5x/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-orion5x/include/mach/hardware.h + delete mode 100644 arch/arm/mach-orion5x/include/mach/uncompress.h + rename arch/arm/mach-orion5x/{include/mach => }/irqs.h (94%) + rename arch/arm/mach-orion5x/{include/mach => }/orion5x.h (99%) +Merging omap/for-next (ffeaf25ceeb7 Merge branch 'omap-for-v4.5/dt' into for-next) +$ git merge omap/for-next +Removing arch/arm/mach-omap2/omap-iommu.c +Removing arch/arm/boot/dts/tps65217.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/omap/omap.txt | 3 + + .../devicetree/bindings/regulator/tps65217.txt | 10 + + arch/arm/boot/dts/Makefile | 8 +- + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 186 ++++--- + arch/arm/boot/dts/am335x-bone-common.dtsi | 118 +++-- + arch/arm/boot/dts/am335x-boneblack.dts | 44 +- + arch/arm/boot/dts/am335x-bonegreen.dts | 4 +- + arch/arm/boot/dts/am335x-chiliboard.dts | 20 +- + arch/arm/boot/dts/am335x-chilisom.dtsi | 94 ++-- + arch/arm/boot/dts/am335x-cm-t335.dts | 347 +++++++++++++ + arch/arm/boot/dts/am335x-evm.dts | 220 ++++---- + arch/arm/boot/dts/am335x-evmsk.dts | 278 +++++----- + arch/arm/boot/dts/am335x-lxm.dts | 120 ++--- + arch/arm/boot/dts/am335x-nano.dts | 154 +++--- + arch/arm/boot/dts/am335x-pepper.dts | 214 ++++---- + arch/arm/boot/dts/am335x-phycore-som.dtsi | 60 +-- + arch/arm/boot/dts/am335x-shc.dts | 577 +++++++++++++++++++++ + arch/arm/boot/dts/am335x-sl50.dts | 13 +- + arch/arm/boot/dts/am335x-wega.dtsi | 58 +-- + arch/arm/boot/dts/am33xx.dtsi | 2 + + arch/arm/boot/dts/am3517-craneboard.dts | 2 +- + arch/arm/boot/dts/am4372.dtsi | 3 + + arch/arm/boot/dts/am437x-gp-evm.dts | 380 +++++++------- + arch/arm/boot/dts/am437x-idk-evm.dts | 128 ++--- + arch/arm/boot/dts/am437x-sk-evm.dts | 298 +++++------ + arch/arm/boot/dts/am43x-epos-evm.dts | 246 ++++----- + arch/arm/boot/dts/am57xx-beagle-x15.dts | 198 +++---- + arch/arm/boot/dts/dm816x.dtsi | 22 +- + arch/arm/boot/dts/dra7-evm.dts | 254 ++++----- + arch/arm/boot/dts/dra7.dtsi | 1 + + arch/arm/boot/dts/dra72-evm.dts | 202 ++++---- + arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 30 ++ + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 44 ++ + arch/arm/boot/dts/omap3-beagle-xm.dts | 18 +- + arch/arm/boot/dts/omap3-beagle.dts | 64 +-- + arch/arm/boot/dts/omap3-evm-37xx.dts | 54 +- + arch/arm/boot/dts/omap3-ldp.dts | 42 +- + arch/arm/boot/dts/omap3-n900.dts | 106 ++-- + arch/arm/boot/dts/omap3-n950-n9.dtsi | 12 +- + arch/arm/boot/dts/omap3-zoom3.dts | 60 +-- + arch/arm/boot/dts/omap3.dtsi | 2 + + arch/arm/boot/dts/omap4-panda-a4.dts | 6 +- + arch/arm/boot/dts/omap4-panda-common.dtsi | 164 +++--- + arch/arm/boot/dts/omap4-panda-es.dts | 10 +- + arch/arm/boot/dts/omap4-sdp-es23plus.dts | 6 +- + arch/arm/boot/dts/omap4-sdp.dts | 110 ++-- + arch/arm/boot/dts/omap4.dtsi | 10 + + arch/arm/boot/dts/omap5-board-common.dtsi | 94 ++-- + arch/arm/boot/dts/omap5-cm-t54.dts | 2 +- + arch/arm/boot/dts/omap5-uevm.dts | 4 +- + arch/arm/boot/dts/omap5.dtsi | 2 + + arch/arm/boot/dts/tps65217.dtsi | 56 -- + arch/arm/boot/dts/twl4030_omap3.dtsi | 2 +- + arch/arm/boot/dts/twl6030_omap4.dtsi | 4 +- + arch/arm/mach-omap2/Kconfig | 2 +- + arch/arm/mach-omap2/Makefile | 2 - + arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +- + arch/arm/mach-omap2/omap-iommu.c | 66 --- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 42 -- + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 41 -- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 35 ++ + arch/arm/mach-omap2/pdata-quirks.c | 2 +- + arch/arm/mach-omap2/timer.c | 6 +- + arch/arm/plat-omap/dmtimer.c | 42 +- + include/dt-bindings/pinctrl/am43xx.h | 6 + + include/dt-bindings/pinctrl/dra.h | 6 + + include/dt-bindings/pinctrl/omap.h | 2 - + include/linux/platform_data/iommu-omap.h | 9 - + 69 files changed, 3197 insertions(+), 2234 deletions(-) + create mode 100644 arch/arm/boot/dts/am335x-cm-t335.dts + create mode 100644 arch/arm/boot/dts/am335x-shc.dts + delete mode 100644 arch/arm/boot/dts/tps65217.dtsi + delete mode 100644 arch/arm/mach-omap2/omap-iommu.c +Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) +$ git merge omap-pending/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 6057 and retry the command. +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 5c21e2f26615] Merge remote-tracking branch 'omap-pending/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging qcom/for-next (38efdf1edceb ARM: multi_v7_defconfig: Enable required QCOM SPMI/PMIC drivers) +$ git merge qcom/for-next +Auto-merging drivers/tty/serial/Kconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/firmware/qcom,scm.txt | 25 + + .../devicetree/bindings/soc/qcom/qcom,smp2p.txt | 104 ++++ + .../devicetree/bindings/soc/qcom/qcom,smsm.txt | 104 ++++ + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 16 +- + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 20 +- + .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts | 436 ++++++++++++++ + arch/arm/boot/dts/qcom-apq8064.dtsi | 104 ++++ + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 369 ++++++++++++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 11 + + arch/arm/configs/qcom_defconfig | 8 +- + arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 13 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 + + 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 | 26 + + drivers/soc/qcom/Makefile | 4 + + drivers/soc/qcom/smem_state.c | 201 +++++++ + drivers/soc/qcom/smp2p.c | 578 +++++++++++++++++++ + drivers/soc/qcom/smsm.c | 625 +++++++++++++++++++++ + drivers/soc/qcom/wcnss_ctrl.c | 272 +++++++++ + drivers/tty/serial/Kconfig | 2 +- + include/linux/qcom_scm.h | 6 + + include/linux/soc/qcom/smem_state.h | 18 + + 26 files changed, 3305 insertions(+), 32 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smp2p.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smsm.txt + create mode 100644 arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts + create mode 100644 drivers/soc/qcom/smem_state.c + create mode 100644 drivers/soc/qcom/smp2p.c + create mode 100644 drivers/soc/qcom/smsm.c + create mode 100644 drivers/soc/qcom/wcnss_ctrl.c + create mode 100644 include/linux/soc/qcom/smem_state.h +Merging renesas/next (bb2951afbe2f Merge branches 'heads/dt-for-v4.5' and 'heads/arm64-dt-for-v4.5' into next) +$ git merge renesas/next +Recorded preimage for 'arch/arm/mach-shmobile/Kconfig' +Auto-merging arch/arm64/Kconfig.platforms +Removing arch/arm/mach-shmobile/irqs.h +Removing arch/arm/mach-shmobile/include/mach/irqs.h +Auto-merging arch/arm/mach-shmobile/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Removing arch/arm/boot/dts/r8a7791-henninger.dts +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/mach-shmobile/Kconfig'. +[master 60ab347173a4] Merge remote-tracking branch 'renesas/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/shmobile.txt | 4 + + MAINTAINERS | 10 +- + arch/arm/boot/dts/Makefile | 1 - + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +- + arch/arm/boot/dts/r8a7740.dtsi | 13 + + arch/arm/boot/dts/r8a7778-bockw.dts | 23 +- + arch/arm/boot/dts/r8a7790-lager.dts | 55 +- + arch/arm/boot/dts/r8a7790.dtsi | 12 +- + arch/arm/boot/dts/r8a7791-henninger.dts | 320 --------- + arch/arm/boot/dts/r8a7791-koelsch.dts | 57 +- + arch/arm/boot/dts/r8a7791-porter.dts | 53 +- + arch/arm/boot/dts/r8a7791.dtsi | 19 +- + arch/arm/boot/dts/r8a7793-gose.dts | 74 +++ + arch/arm/boot/dts/r8a7793.dtsi | 324 +++++++++ + arch/arm/boot/dts/r8a7794-alt.dts | 138 ++++ + arch/arm/boot/dts/r8a7794-silk.dts | 73 ++- + arch/arm/boot/dts/r8a7794.dtsi | 50 +- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +- + arch/arm/boot/dts/sh73a0.dtsi | 86 ++- + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm/configs/shmobile_defconfig | 2 +- + arch/arm/mach-shmobile/Kconfig | 10 +- + arch/arm/mach-shmobile/include/mach/irqs.h | 10 - + arch/arm/mach-shmobile/irqs.h | 15 - + arch/arm/mach-shmobile/setup-r8a7778.c | 1 - + arch/arm64/Kconfig.platforms | 17 + + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/renesas/Makefile | 4 + + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 247 +++++++ + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 727 +++++++++++++++++++++ + arch/arm64/configs/defconfig | 16 + + drivers/sh/clk/core.c | 100 +-- + include/dt-bindings/clock/r8a7794-clock.h | 1 + + include/dt-bindings/clock/sh73a0-clock.h | 6 +- + include/linux/sh_clk.h | 4 - + 36 files changed, 1895 insertions(+), 586 deletions(-) + delete mode 100644 arch/arm/boot/dts/r8a7791-henninger.dts + delete mode 100644 arch/arm/mach-shmobile/include/mach/irqs.h + delete mode 100644 arch/arm/mach-shmobile/irqs.h + create mode 100644 arch/arm64/boot/dts/renesas/Makefile + create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a7795.dtsi +Merging rockchip/for-next (73ab5e6b319a Merge branch 'v4.5-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Recorded preimage for 'arch/arm/mach-rockchip/platsmp.c' +Auto-merging arch/arm/mach-rockchip/platsmp.c +CONFLICT (content): Merge conflict in arch/arm/mach-rockchip/platsmp.c +Auto-merging arch/arm/boot/dts/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/mach-rockchip/platsmp.c'. +[master 0d02588b0a56] Merge remote-tracking branch 'rockchip/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + Documentation/devicetree/bindings/arm/rockchip.txt | 4 + + .../bindings/clock/rockchip,rk3036-cru.txt | 56 +++ + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/rk3036-evb.dts | 64 +++ + arch/arm/boot/dts/rk3036.dtsi | 554 +++++++++++++++++++++ + arch/arm/boot/dts/rk3066a.dtsi | 6 + + arch/arm/boot/dts/rk3188.dtsi | 2 + + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 1 + + arch/arm/boot/dts/rk3288-rock2-square.dts | 13 + + arch/arm/boot/dts/rk3288-thermal.dtsi | 14 +- + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 8 + + arch/arm/boot/dts/rk3288.dtsi | 15 + + arch/arm/boot/dts/rk3xxx.dtsi | 1 + + arch/arm/mach-rockchip/platsmp.c | 45 +- + arch/arm/mach-rockchip/rockchip.c | 44 +- + arch/arm64/boot/dts/rockchip/Makefile | 1 + + .../arm64/boot/dts/rockchip/rk3368-evb-act8846.dts | 176 +++++++ + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 281 +++++++++++ + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 6 + + arch/arm64/boot/dts/rockchip/rk3368-thermal.dtsi | 112 +++++ + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 97 ++++ + drivers/clk/rockchip/Makefile | 1 + + drivers/clk/rockchip/clk-pll.c | 258 +++++++++- + drivers/clk/rockchip/clk-rk3036.c | 478 ++++++++++++++++++ + drivers/clk/rockchip/clk-rk3288.c | 36 +- + drivers/clk/rockchip/clk-rk3368.c | 5 + + drivers/clk/rockchip/clk.h | 32 +- + include/dt-bindings/clock/rk3036-cru.h | 193 +++++++ + include/dt-bindings/clock/rk3288-cru.h | 2 + + 30 files changed, 2454 insertions(+), 53 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt + create mode 100644 arch/arm/boot/dts/rk3036-evb.dts + create mode 100644 arch/arm/boot/dts/rk3036.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-evb-act8846.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-thermal.dtsi + create mode 100644 drivers/clk/rockchip/clk-rk3036.c + create mode 100644 include/dt-bindings/clock/rk3036-cru.h +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (8005c49d9aea Linux 4.4-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (945028c273a7 Merge branch 'next/defconfig' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm/mach-exynos/Kconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + .../bindings/display/exynos/exynos_hdmi.txt | 7 +- + .../bindings/pinctrl/samsung-pinctrl.txt | 1 + + arch/arm/boot/dts/exynos3250.dtsi | 14 + + arch/arm/boot/dts/exynos4.dtsi | 32 +- + arch/arm/boot/dts/exynos4210-origen.dts | 4 - + arch/arm/boot/dts/exynos4210-smdkv310.dts | 4 - + arch/arm/boot/dts/exynos4210-universal_c210.dts | 8 + + arch/arm/boot/dts/exynos4210.dtsi | 14 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 4 - + arch/arm/boot/dts/exynos4412-odroidu3.dts | 1 - + arch/arm/boot/dts/exynos4412-origen.dts | 4 - + arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 - + arch/arm/boot/dts/exynos4412-trats2.dts | 4 + + arch/arm/boot/dts/exynos4x12.dtsi | 5 +- + arch/arm/boot/dts/exynos5.dtsi | 14 + + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 6 +- + arch/arm/boot/dts/exynos5250.dtsi | 9 + + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 406 +++++++++++++++++++++ + arch/arm/boot/dts/exynos5410.dtsi | 50 +++ + arch/arm/boot/dts/exynos5420-peach-pit.dts | 5 +- + arch/arm/boot/dts/exynos5420.dtsi | 19 + + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 5 - + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 2 +- + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 2 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 5 +- + arch/arm/configs/exynos_defconfig | 18 +- + arch/arm/configs/multi_v7_defconfig | 15 +- + arch/arm/mach-exynos/Kconfig | 3 + + arch/arm/mach-exynos/pmu.c | 51 +-- + arch/arm/mach-exynos/regs-pmu.h | 9 - + arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c | 2 +- + arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c | 2 +- + arch/arm64/Kconfig.platforms | 11 +- + arch/arm64/boot/dts/exynos/Makefile | 2 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 282 +++++++++++++- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 7 + + arch/arm64/configs/defconfig | 2 +- + drivers/clk/samsung/Kconfig | 6 + + drivers/clk/samsung/Makefile | 4 +- + drivers/clk/samsung/clk-exynos4.c | 1 + + drivers/cpufreq/s3c24xx-cpufreq.c | 2 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 103 ++++++ + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 + + drivers/pinctrl/samsung/pinctrl-samsung.h | 1 + + include/dt-bindings/clock/exynos4.h | 1 + + 45 files changed, 1031 insertions(+), 122 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos5410-pinctrl.dtsi +Merging sunxi/sunxi/for-next (2eda61e3b9ef Merge branches 'sunxi/clocks-for-4.5' and 'sunxi/dt-for-4.5' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Resolved 'arch/arm/configs/multi_v7_defconfig' using previous resolution. +Auto-merging arch/arm/configs/multi_v7_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8d297d33fd68] Merge remote-tracking branch 'sunxi/sunxi/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/clock/sunxi.txt | 3 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 42 +++- + arch/arm/boot/dts/sun4i-a10-inet1.dts | 48 +++++ + arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 164 ++++++++++++++ + arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 47 ++++ + arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 14 ++ + arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 16 ++ + arch/arm/boot/dts/sun6i-a31s-primo81.dts | 1 + + .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 85 +++++++- + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 4 + + arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 169 +++++++++++++++ + arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 4 + + arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 4 + + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 4 + + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 4 + + arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 4 + + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 2 +- + arch/arm/boot/dts/sun9i-a80-optimus.dts | 24 ++- + arch/arm/boot/dts/sun9i-a80.dtsi | 151 ++++++++++++- + arch/arm/configs/multi_v7_defconfig | 11 +- + arch/arm/configs/sunxi_defconfig | 14 +- + drivers/bus/sunxi-rsb.c | 4 +- + drivers/clk/sunxi/Makefile | 2 + + drivers/clk/sunxi/clk-simple-gates.c | 2 + + drivers/clk/sunxi/clk-sun9i-cpus.c | 240 +++++++++++++++++++++ + drivers/clk/sunxi/clk-usb.c | 12 ++ + 27 files changed, 1047 insertions(+), 29 deletions(-) + create mode 100644 arch/arm/boot/dts/sun7i-a20-icnova-swac.dts + create mode 100644 drivers/clk/sunxi/clk-sun9i-cpus.c +Merging tegra/for-next (3ba3a74b6545 Merge branch for-4.5/defconfig into for-next) +$ git merge tegra/for-next +Recorded preimage for 'arch/arm/mach-tegra/Kconfig' +Resolved 'arch/arm64/configs/defconfig' using previous resolution. +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Auto-merging arch/arm64/boot/dts/Makefile +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm/mach-tegra/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-tegra/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/mach-tegra/Kconfig'. +[master cad309bccd6a] Merge remote-tracking branch 'tegra/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/clock/nvidia,tegra210-car.txt | 56 + + arch/arm/mach-tegra/Kconfig | 54 +- + arch/arm/mach-tegra/sleep-tegra20.S | 3 + + arch/arm/mach-tegra/sleep-tegra30.S | 3 + + arch/arm64/Kconfig.platforms | 12 - + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/nvidia/Makefile | 7 + + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 1130 ++++++++ + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 990 +++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 45 + + arch/arm64/boot/dts/nvidia/tegra210-p2371-0000.dts | 9 + + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 9 + + arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi | 50 + + arch/arm64/boot/dts/nvidia/tegra210-p2571.dts | 1302 +++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi | 1272 +++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 1270 +++++++++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 805 ++++++ + arch/arm64/configs/defconfig | 8 +- + drivers/amba/Kconfig | 2 +- + drivers/clk/tegra/Makefile | 1 + + drivers/clk/tegra/clk-id.h | 75 +- + drivers/clk/tegra/clk-pll.c | 838 ++++-- + drivers/clk/tegra/clk-tegra-periph.c | 371 ++- + drivers/clk/tegra/clk-tegra-super-gen4.c | 142 +- + drivers/clk/tegra/clk-tegra114.c | 339 +-- + drivers/clk/tegra/clk-tegra124.c | 453 ++-- + drivers/clk/tegra/clk-tegra20.c | 314 ++- + drivers/clk/tegra/clk-tegra210.c | 2852 ++++++++++++++++++++ + drivers/clk/tegra/clk-tegra30.c | 426 +-- + drivers/clk/tegra/clk.h | 101 +- + drivers/mmc/host/sdhci-tegra.c | 23 +- + drivers/soc/Kconfig | 1 + + drivers/soc/tegra/Kconfig | 83 + + drivers/usb/host/Kconfig | 2 + + include/dt-bindings/clock/tegra210-car.h | 401 +++ + 35 files changed, 12449 insertions(+), 1001 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra210-car.txt + create mode 100644 arch/arm64/boot/dts/nvidia/Makefile + create mode 100644 arch/arm64/boot/dts/nvidia/tegra132-norrin.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra132.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2371-0000.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2571.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210.dtsi + create mode 100644 drivers/clk/tegra/clk-tegra210.c + create mode 100644 drivers/soc/tegra/Kconfig + create mode 100644 include/dt-bindings/clock/tegra210-car.h +Merging arm64/for-next/core (01b305a23494 arm64: suspend: make hw_breakpoint_restore static) +$ 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 (918fc2ee791e cris: Drop reference to get_cmos_time()) +$ git merge cris/for-next +Merge made by the 'recursive' strategy. +Merging h8300/h8300-next (5aef14e91de2 clk: h8300: Remove "sh73a0-" part from compatible value) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/clock/renesas,h8300-div-clock.txt | 2 +- + arch/h8300/boot/compressed/vmlinux.lds | 1 + + 2 files changed, 2 insertions(+), 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 (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted()) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (70bc53b47343 m68k/mac: Kill psc_present) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/include/asm/mac_psc.h | 1 - + arch/m68k/mac/macints.c | 6 +++--- + arch/m68k/mac/psc.c | 7 +++---- + 3 files changed, 6 insertions(+), 8 deletions(-) +Merging m68knommu/for-next (31ade3b83e18 Linux 4.4-rc3) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (f23d0e2468bc MAINTAINERS: Change Meta arch port status to Odd Fixes) +$ git merge metag/for-next +Already up-to-date. +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 (99a0c4654ac6 Merge branch '4.4-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/phy-ath79-usb.txt | 18 +++++++ + arch/mips/ath79/common.h | 1 - + arch/mips/ath79/irq.c | 61 ++++++++++------------ + arch/mips/ath79/setup.c | 11 +--- + arch/mips/boot/dts/qca/ar9132.dtsi | 26 +++++++++ + arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 8 +++ + arch/mips/include/asm/mach-ath79/ath79.h | 1 + + 7 files changed, 82 insertions(+), 44 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/phy-ath79-usb.txt +Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency) +$ git merge nios2/for-next +Already up-to-date. +Merging parisc-hd/for-next (6a13feb9c828 Linux 4.3) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (b4f8144559e1 powerpc/axonram: Fix module autoload for OF platform driver) +$ git merge powerpc/next +Merge made by the 'recursive' strategy. + arch/powerpc/boot/wrapper | 2 +- + arch/powerpc/include/asm/unistd.h | 3 +-- + arch/powerpc/include/asm/vdso_datapage.h | 2 +- + arch/powerpc/kernel/ptrace.c | 1 + + arch/powerpc/kernel/systbl_chk.c | 2 +- + arch/powerpc/kernel/systbl_chk.sh | 2 +- + arch/powerpc/kernel/traps.c | 7 ------- + arch/powerpc/kernel/vdso.c | 2 +- + arch/powerpc/kernel/vdso32/datapage.S | 2 +- + arch/powerpc/kernel/vdso64/datapage.S | 2 +- + arch/powerpc/platforms/cell/spufs/run.c | 2 +- + arch/powerpc/platforms/powermac/pic.c | 3 ++- + arch/powerpc/platforms/powernv/opal-prd.c | 1 - + arch/powerpc/sysdev/axonram.c | 1 + + drivers/macintosh/rack-meter.c | 1 + + drivers/macintosh/via-pmu.c | 5 +++-- + drivers/misc/cxl/api.c | 4 ---- + drivers/misc/cxl/context.c | 9 +++++++++ + drivers/misc/cxl/cxl.h | 12 ++++++++++++ + drivers/misc/cxl/file.c | 19 +++++++++++-------- + drivers/misc/cxl/vphb.c | 2 +- + 21 files changed, 50 insertions(+), 34 deletions(-) +Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (e1f580e8ced5 powerpc/e6500: hw tablewalk: make sure we invalidate and write to the same tlb entry) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (419123f900da s390/spinlock: do not yield to a CPU in udelay/mdelay) +$ git merge s390/features +Removing drivers/s390/char/sclp_cpi.c +Merge made by the 'recursive' strategy. + Documentation/s390/zfcpdump.txt | 22 +- + arch/s390/Makefile | 4 + + arch/s390/include/asm/compat.h | 2 +- + arch/s390/include/asm/elf.h | 11 +- + arch/s390/include/asm/fpu/internal.h | 10 +- + arch/s390/include/asm/ipl.h | 14 +- + arch/s390/include/asm/lowcore.h | 21 -- + arch/s390/include/asm/os_info.h | 2 +- + arch/s390/include/asm/pci_dma.h | 2 + + arch/s390/include/asm/processor.h | 12 + + arch/s390/include/asm/reset.h | 3 +- + arch/s390/include/asm/sclp.h | 5 +- + arch/s390/include/asm/smp.h | 2 +- + arch/s390/include/asm/thread_info.h | 2 - + arch/s390/kernel/asm-offsets.c | 2 +- + arch/s390/kernel/crash_dump.c | 454 +++++++++++++++------------------- + arch/s390/kernel/dis.c | 4 +- + arch/s390/kernel/early.c | 9 + + arch/s390/kernel/entry.S | 2 + + arch/s390/kernel/ipl.c | 17 +- + arch/s390/kernel/machine_kexec.c | 110 +++++---- + arch/s390/kernel/os_info.c | 7 +- + arch/s390/kernel/reipl.S | 94 +++---- + arch/s390/kernel/sclp.c | 65 +++-- + arch/s390/kernel/setup.c | 17 +- + arch/s390/kernel/smp.c | 143 ++++++----- + arch/s390/kvm/kvm-s390.c | 30 +-- + arch/s390/lib/spinlock.c | 45 +++- + arch/s390/mm/gup.c | 1 + + arch/s390/pci/pci.c | 3 +- + arch/s390/pci/pci_dma.c | 19 +- + drivers/s390/char/Kconfig | 21 +- + drivers/s390/char/Makefile | 5 +- + drivers/s390/char/sclp_config.c | 102 +++++++- + drivers/s390/char/sclp_cpi.c | 40 --- + drivers/s390/char/zcore.c | 461 ++++------------------------------- + drivers/s390/cio/chsc_sch.c | 3 +- + drivers/s390/cio/cio.c | 11 +- + drivers/s390/cio/qdio_debug.c | 6 +- + drivers/s390/crypto/ap_bus.c | 4 +- + drivers/s390/crypto/zcrypt_api.c | 6 +- + 41 files changed, 738 insertions(+), 1055 deletions(-) + delete mode 100644 drivers/s390/char/sclp_cpi.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 (09745f38a74e arch/tile: turn off timer tick for oneshot_stopped state) +$ 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/include/asm/processor.h | 2 +- + arch/tile/include/asm/thread_info.h | 8 +++- + arch/tile/kernel/Makefile | 1 + + arch/tile/kernel/ftrace.c | 13 +----- + arch/tile/kernel/intvec_32.S | 46 +++++++-------------- + arch/tile/kernel/intvec_64.S | 49 +++++++---------------- + arch/tile/kernel/jump_label.c | 64 ++++++++++++++++++++++++++++++ + arch/tile/kernel/kgdb.c | 2 +- + arch/tile/kernel/kprobes.c | 4 +- + arch/tile/kernel/process.c | 79 +++++++++++++++++++------------------ + arch/tile/kernel/time.c | 1 + + 15 files changed, 276 insertions(+), 121 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 (2eb5f31bc4ea um: Switch clocksource to hrtimers) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (afaa7c542cc9 Merge tag 'xtensa-for-next-20151109' of git://github.com/jcmvbkbc/linux-xtensa) +$ 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 (583d0fef756a libceph: clear msg->con in ceph_msg_release() only) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (6573b8564d37 update signing code) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_debug.c | 2 +- + fs/cifs/cifs_debug.h | 9 ++--- + fs/cifs/cifsglob.h | 8 +++- + fs/cifs/cifsproto.h | 5 ++- + fs/cifs/connect.c | 9 +++-- + fs/cifs/misc.c | 2 +- + fs/cifs/smb2misc.c | 36 ++++++++++++++--- + fs/cifs/smb2ops.c | 13 ++++-- + fs/cifs/smb2pdu.c | 10 ++--- + fs/cifs/smb2pdu.h | 8 ++-- + fs/cifs/smb2proto.h | 3 +- + fs/cifs/smb2transport.c | 102 +++++++++++++++++++++++++++++++++++++++++++++--- + 12 files changed, 166 insertions(+), 41 deletions(-) +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 +Already up-to-date. +Merging ext4/dev (1ae1929a935e ext4: add "static" to ext4_seq_##name##_fops struct) +$ git merge ext4/dev +Auto-merging fs/jbd2/transaction.c +Merge made by the 'recursive' strategy. + fs/ext4/crypto.c | 2 +- + fs/ext4/ext4.h | 51 ++++++++++++++++++++++++++++++++++++++++++++------- + fs/ext4/symlink.c | 2 +- + fs/ext4/sysfs.c | 2 +- + fs/jbd2/transaction.c | 2 ++ + 5 files changed, 49 insertions(+), 10 deletions(-) +Merging f2fs/dev (8005c49d9aea Linux 4.4-rc1) +$ git merge f2fs/dev +Already up-to-date. +Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) +$ git merge fscache/fscache +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 4908 and retry the command. +Merge made by the 'recursive' strategy. +Merging fuse/for-next (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek) +$ git merge fuse/for-next +Auto-merging fs/fuse/file.c +Merge made by the 'recursive' strategy. + fs/fuse/cuse.c | 2 ++ + fs/fuse/file.c | 75 +++++++++++++++++++++++++++++++++++++++++------ + fs/fuse/fuse_i.h | 3 ++ + include/uapi/linux/fuse.h | 17 ++++++++++- + 4 files changed, 87 insertions(+), 10 deletions(-) +Merging gfs2/for-next (5f63e3c3599d GFS2: Reintroduce a timeout in function gfs2_gl_hash_clear) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/xattr.c +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 2 +- + fs/gfs2/bmap.c | 13 ++---- + fs/gfs2/dir.c | 15 +++++-- + fs/gfs2/file.c | 29 ++++++------- + fs/gfs2/glock.c | 18 ++++---- + fs/gfs2/glock.h | 26 ++++++------ + fs/gfs2/incore.h | 20 +++++---- + fs/gfs2/inode.c | 28 ++++++------ + fs/gfs2/main.c | 16 ++++--- + fs/gfs2/meta_io.c | 82 +++++++++++++++++++++++++++++++++--- + fs/gfs2/meta_io.h | 2 +- + fs/gfs2/ops_fstype.c | 3 +- + fs/gfs2/quota.c | 117 +++++++++++++++++++++++++++++++++------------------ + fs/gfs2/quota.h | 2 + + fs/gfs2/rgrp.c | 61 ++++++++++----------------- + fs/gfs2/rgrp.h | 6 +-- + fs/gfs2/super.c | 15 ++++--- + fs/gfs2/util.c | 2 +- + fs/gfs2/util.h | 2 +- + fs/gfs2/xattr.c | 10 ++--- + 20 files changed, 282 insertions(+), 187 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 (2255702db401 Merge tag 'mn10300-for-linus-v4.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (d093ded79a89 nfsd: don't base cl_cb_status on stale information) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/namei.c | 74 +++++++++++++++++++++++++++++++++++ + fs/nfsd/netns.h | 2 +- + fs/nfsd/nfs3xdr.c | 2 +- + fs/nfsd/nfs4callback.c | 6 ++- + fs/nfsd/nfs4layouts.c | 4 +- + fs/nfsd/nfs4recover.c | 6 +-- + fs/nfsd/nfs4state.c | 62 +++++++++++++++++++++-------- + fs/nfsd/nfs4xdr.c | 8 ++-- + fs/nfsd/state.h | 4 +- + fs/nfsd/vfs.c | 23 +++++------ + include/linux/namei.h | 1 + + include/linux/sunrpc/svcauth.h | 9 ++++- + net/sunrpc/auth_gss/gss_rpc_upcall.c | 3 ++ + net/sunrpc/svcauth.c | 2 + + net/sunrpc/svcauth_unix.c | 8 ---- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 7 ++++ + 16 files changed, 168 insertions(+), 53 deletions(-) +Merging orangefs/for-next (555fa0fa618b fs: out of bounds on stack in iov_iter_advance) +$ git merge orangefs/for-next +Auto-merging fs/Kconfig +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 | 984 +++++++++++++++ + fs/orangefs/dir.c | 373 ++++++ + fs/orangefs/downcall.h | 133 +++ + fs/orangefs/file.c | 712 +++++++++++ + fs/orangefs/inode.c | 466 ++++++++ + fs/orangefs/namei.c | 446 +++++++ + fs/orangefs/protocol.h | 443 +++++++ + fs/orangefs/pvfs2-bufmap.c | 558 +++++++++ + fs/orangefs/pvfs2-bufmap.h | 62 + + fs/orangefs/pvfs2-cache.c | 246 ++++ + fs/orangefs/pvfs2-debug.h | 292 +++++ + fs/orangefs/pvfs2-debugfs.c | 458 +++++++ + fs/orangefs/pvfs2-debugfs.h | 3 + + fs/orangefs/pvfs2-dev-proto.h | 85 ++ + fs/orangefs/pvfs2-kernel.h | 819 +++++++++++++ + fs/orangefs/pvfs2-mod.c | 315 +++++ + fs/orangefs/pvfs2-sysfs.c | 1787 ++++++++++++++++++++++++++++ + fs/orangefs/pvfs2-sysfs.h | 2 + + fs/orangefs/pvfs2-utils.c | 1156 ++++++++++++++++++ + fs/orangefs/super.c | 541 +++++++++ + fs/orangefs/symlink.c | 31 + + fs/orangefs/upcall.h | 246 ++++ + fs/orangefs/waitqueue.c | 529 ++++++++ + fs/orangefs/xattr.c | 530 +++++++++ + 32 files changed, 11776 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 (257f87199347 ovl: move super block magic number to magic.h) +$ git merge overlayfs/overlayfs-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2251 and retry the command. +Auto-merging include/uapi/linux/magic.h +Auto-merging fs/overlayfs/super.c +Merge made by the 'recursive' strategy. + fs/overlayfs/copy_up.c | 41 ++++++++++++++++++++++++++--------------- + fs/overlayfs/inode.c | 23 +++++++++++++++++++++++ + fs/overlayfs/overlayfs.h | 3 +++ + fs/overlayfs/super.c | 30 ++++++++++++++++++++++++++++-- + include/uapi/linux/magic.h | 1 + + 5 files changed, 81 insertions(+), 17 deletions(-) +Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (3053600ed4f7 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 (8c1c5f263833 ubifs: introduce UBIFS_ATIME_SUPPORT to ubifs) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (4e14e49a91e1 Merge branch 'xfs-misc-fixes-for-4.4-3' into for-next) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (8ace5dfb983e locks: use list_first_entry_or_null()) +$ git merge file-locks/linux-next +Auto-merging fs/Kconfig +Merge made by the 'recursive' strategy. + fs/Kconfig | 10 ++++++++ + fs/locks.c | 12 ++++----- + fs/namespace.c | 10 ++++++++ + include/linux/fs.h | 74 +++++++++++++++++++++++++++++------------------------- + 4 files changed, 66 insertions(+), 40 deletions(-) +Merging vfs/for-next (08afe6ef5405 Merge branches 'work.misc' and 'work.copy_file_range' into for-next) +$ git merge vfs/for-next +Auto-merging net/9p/trans_virtio.c +Auto-merging include/linux/fs.h +Auto-merging fs/namespace.c +Merge made by the 'recursive' strategy. + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + drivers/staging/lustre/lustre/llite/file.c | 2 +- + .../staging/lustre/lustre/llite/llite_internal.h | 4 +- + drivers/staging/lustre/lustre/llite/symlink.c | 2 +- + fs/adfs/adfs.h | 6 +- + fs/adfs/dir.c | 6 +- + fs/adfs/dir_f.c | 2 +- + fs/adfs/dir_fplus.c | 2 +- + fs/bad_inode.c | 2 +- + fs/btrfs/ctree.h | 3 + + fs/btrfs/file.c | 1 + + fs/btrfs/ioctl.c | 91 ++++++++------- + fs/coredump.c | 8 +- + fs/dcache.c | 14 +-- + fs/file.c | 6 +- + fs/namespace.c | 4 +- + fs/proc_namespace.c | 27 ++--- + fs/read_write.c | 125 +++++++++++++++++++++ + include/linux/fs.h | 15 ++- + include/linux/syscalls.h | 3 + + include/uapi/asm-generic/unistd.h | 4 +- + kernel/sys_ni.c | 1 + + net/9p/trans_virtio.c | 12 +- + 24 files changed, 247 insertions(+), 95 deletions(-) +Merging pci/next (1ec218373b8e Linux 4.4-rc2) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (781289e4fd9b Merge branch 'for-4.5/core' into for-next) +$ git merge hid/for-next +Auto-merging drivers/hid/usbhid/hid-quirks.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + drivers/hid/hid-core.c | 24 ++-- + drivers/hid/hid-debug.c | 4 +- + drivers/hid/hid-ids.h | 2 + + drivers/hid/hid-input.c | 4 + + drivers/hid/hid-logitech-hidpp.c | 288 +++++++++++++++++++++++++++++++++++---- + drivers/hid/hid-multitouch.c | 5 + + drivers/hid/hid-sony.c | 101 +++++++++++--- + drivers/hid/i2c-hid/i2c-hid.c | 1 - + drivers/hid/usbhid/hid-core.c | 6 +- + drivers/hid/usbhid/hid-quirks.c | 1 + + drivers/hid/wacom_sys.c | 3 +- + drivers/input/joystick/xpad.c | 16 +++ + include/linux/hid.h | 2 + + 14 files changed, 396 insertions(+), 63 deletions(-) +Merging i2c/i2c/for-next (30381537988e Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/i2c/algos/i2c-algo-bit.c | 6 + + drivers/i2c/busses/i2c-bcm2835.c | 10 ++ + drivers/i2c/busses/i2c-cadence.c | 73 ++++++----- + drivers/i2c/busses/i2c-davinci.c | 11 +- + drivers/i2c/busses/i2c-mv64xxx.c | 27 +++-- + drivers/i2c/busses/i2c-piix4.c | 198 +++++++++++++++++++++++++----- + drivers/i2c/busses/i2c-rcar.c | 249 ++++++++++++++++---------------------- + drivers/i2c/busses/i2c-rk3x.c | 2 +- + drivers/i2c/busses/i2c-taos-evm.c | 8 +- + drivers/i2c/busses/i2c-xiic.c | 12 +- + include/linux/i2c.h | 16 +++ + 11 files changed, 394 insertions(+), 218 deletions(-) +Merging jdelvare-hwmon/master (c0453e633a6a hwmon: (k10temp) Remove duplicate pci-id define) +$ git merge jdelvare-hwmon/master +Merge made by the 'recursive' strategy. +Merging dmi/master (77bb27fef9dc firmware: dmi_scan: Save SMBIOS Type 9 System Slots) +$ git merge dmi/master +Merge made by the 'recursive' strategy. + drivers/firmware/dmi_scan.c | 62 ++++++++++++++++++++++++++++++--------------- + include/linux/dmi.h | 1 + + 2 files changed, 43 insertions(+), 20 deletions(-) +Merging hwmon-staging/hwmon-next (9a2adf56a412 hwmon: (pmbus) Add client driver for LTC3815) +$ git merge hwmon-staging/hwmon-next +Removing drivers/hwmon/htu21.c +Removing Documentation/hwmon/htu21 +Merge made by the 'recursive' strategy. + Documentation/hwmon/htu21 | 46 --------- + Documentation/hwmon/ltc3815 | 61 ++++++++++++ + drivers/hwmon/Kconfig | 10 -- + drivers/hwmon/Makefile | 1 - + drivers/hwmon/htu21.c | 174 ---------------------------------- + drivers/hwmon/pmbus/Kconfig | 10 ++ + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/ltc3815.c | 215 ++++++++++++++++++++++++++++++++++++++++++ + 8 files changed, 287 insertions(+), 231 deletions(-) + delete mode 100644 Documentation/hwmon/htu21 + create mode 100644 Documentation/hwmon/ltc3815 + delete mode 100644 drivers/hwmon/htu21.c + create mode 100644 drivers/hwmon/pmbus/ltc3815.c +Merging v4l-dvb/master (ca79e72cf39c Merge branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Recorded preimage for 'arch/arm/mach-pxa/mioa701.c' +Recorded preimage for 'arch/arm/mach-pxa/palmtreo.c' +Recorded preimage for 'arch/arm/mach-pxa/palmz72.c' +Auto-merging include/media/i2c/tvp5150.h +Auto-merging include/media/i2c/smiapp.h +Auto-merging include/media/i2c/saa7127.h +Auto-merging include/media/i2c/saa7115.h +Auto-merging include/media/i2c/lm3646.h +Auto-merging include/media/i2c/lm3560.h +Auto-merging include/media/i2c/as3645a.h +Auto-merging include/media/i2c/adp1653.h +Auto-merging include/media/drv-intf/si476x.h +Auto-merging include/media/drv-intf/saa7146_vv.h +Auto-merging include/media/drv-intf/msp3400.h +Auto-merging include/linux/platform_data/media/si4713.h +Auto-merging include/linux/platform_data/media/s5p_hdmi.h +Auto-merging include/linux/platform_data/media/gpio-ir-recv.h +Removing include/linux/platform_data/camera-rcar.h +Auto-merging drivers/media/pci/cx88/cx88-video.c +Auto-merging drivers/media/pci/cx88/cx88-alsa.c +Auto-merging arch/arm/plat-samsung/devs.c +Auto-merging arch/arm/mach-pxa/pcm990-baseboard.c +Auto-merging arch/arm/mach-pxa/palmz72.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/palmz72.c +Auto-merging arch/arm/mach-pxa/palmtreo.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/palmtreo.c +Auto-merging arch/arm/mach-pxa/mioa701.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/mioa701.c +Auto-merging arch/arm/mach-pxa/ezx.c +Auto-merging arch/arm/mach-pxa/em-x270.c +Auto-merging arch/arm/mach-pxa/devices.c +Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c +Auto-merging arch/arm/mach-omap1/camera.h +Auto-merging arch/arm/mach-davinci/board-da850-evm.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/mach-pxa/mioa701.c'. +Recorded resolution for 'arch/arm/mach-pxa/palmtreo.c'. +Recorded resolution for 'arch/arm/mach-pxa/palmz72.c'. +[master 5b184e706d08] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/device-drivers.tmpl | 84 ++------ + Documentation/DocBook/media/Makefile | 6 +- + Documentation/DocBook/media/v4l/io.xml | 10 +- + Documentation/DocBook/media/v4l/v4l2.xml | 10 + + .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml | 28 ++- + .../bindings/media/stih407-c8sectpfe.txt | 20 +- + Documentation/video4linux/CARDLIST.em28xx | 4 +- + Documentation/video4linux/omap4_camera.txt | 2 +- + Documentation/video4linux/si4713.txt | 2 +- + MAINTAINERS | 25 +-- + arch/arm/boot/dts/stihxxx-b2120.dtsi | 46 ++++- + arch/arm/mach-davinci/board-da850-evm.c | 4 +- + arch/arm/mach-davinci/board-dm355-evm.c | 2 +- + arch/arm/mach-davinci/board-dm365-evm.c | 4 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 4 +- + arch/arm/mach-imx/devices/devices-common.h | 4 +- + arch/arm/mach-omap1/camera.h | 2 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 4 +- + arch/arm/mach-pxa/devices.c | 2 +- + arch/arm/mach-pxa/em-x270.c | 2 +- + arch/arm/mach-pxa/ezx.c | 2 +- + arch/arm/mach-pxa/mioa701.c | 2 +- + arch/arm/mach-pxa/palmtreo.c | 2 +- + arch/arm/mach-pxa/palmz72.c | 2 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 4 +- + arch/arm/plat-samsung/devs.c | 2 +- + arch/blackfin/mach-bf561/boards/ezkit.c | 2 +- + arch/blackfin/mach-bf609/boards/ezkit.c | 6 +- + arch/sh/boards/mach-ap325rxa/setup.c | 6 +- + arch/sh/boards/mach-ecovec24/setup.c | 10 +- + arch/sh/boards/mach-kfr2r09/setup.c | 4 +- + arch/sh/boards/mach-migor/setup.c | 6 +- + arch/sh/boards/mach-se/7724/setup.c | 6 +- + drivers/media/common/cx2341x.c | 2 +- + drivers/media/common/saa7146/saa7146_core.c | 2 +- + drivers/media/common/saa7146/saa7146_fops.c | 2 +- + drivers/media/common/saa7146/saa7146_hlp.c | 2 +- + drivers/media/common/saa7146/saa7146_i2c.c | 2 +- + drivers/media/common/saa7146/saa7146_vbi.c | 2 +- + drivers/media/common/saa7146/saa7146_video.c | 2 +- + drivers/media/common/siano/smsir.h | 2 - + drivers/media/dvb-core/demux.h | 67 ++++++- + drivers/media/dvb-core/dvb-usb-ids.h | 1 + + drivers/media/dvb-core/dvb_frontend.c | 27 ++- + drivers/media/dvb-core/dvb_frontend.h | 221 ++++++++++++++++----- + drivers/media/dvb-frontends/si2165.c | 69 ++++--- + drivers/media/dvb-frontends/stb6100.c | 76 ++----- + drivers/media/dvb-frontends/stb6100.h | 1 - + drivers/media/dvb-frontends/stb6100_cfg.h | 37 ++-- + drivers/media/dvb-frontends/stb6100_proc.h | 43 ++-- + drivers/media/dvb-frontends/tda665x.c | 183 ++++++++--------- + drivers/media/dvb-frontends/tda8261.c | 125 +++++------- + drivers/media/dvb-frontends/tda8261_cfg.h | 37 +--- + drivers/media/i2c/ad9389b.c | 2 +- + drivers/media/i2c/adp1653.c | 2 +- + drivers/media/i2c/adv7180.c | 2 +- + drivers/media/i2c/adv7183.c | 2 +- + drivers/media/i2c/adv7343.c | 2 +- + drivers/media/i2c/adv7393.c | 2 +- + drivers/media/i2c/adv7511.c | 4 +- + drivers/media/i2c/adv7604.c | 2 +- + drivers/media/i2c/adv7842.c | 2 +- + drivers/media/i2c/ak881x.c | 2 +- + drivers/media/i2c/as3645a.c | 2 +- + drivers/media/i2c/bt819.c | 2 +- + drivers/media/i2c/cx25840/cx25840-audio.c | 2 +- + drivers/media/i2c/cx25840/cx25840-core.c | 2 +- + drivers/media/i2c/cx25840/cx25840-firmware.c | 2 +- + drivers/media/i2c/cx25840/cx25840-ir.c | 2 +- + drivers/media/i2c/cx25840/cx25840-vbi.c | 2 +- + drivers/media/i2c/ir-kbd-i2c.c | 2 +- + drivers/media/i2c/lm3560.c | 2 +- + drivers/media/i2c/lm3646.c | 2 +- + drivers/media/i2c/m52790.c | 2 +- + drivers/media/i2c/m5mols/m5mols_capture.c | 4 +- + drivers/media/i2c/m5mols/m5mols_core.c | 2 +- + drivers/media/i2c/msp3400-driver.c | 4 +- + drivers/media/i2c/msp3400-driver.h | 2 +- + drivers/media/i2c/msp3400-kthreads.c | 2 +- + drivers/media/i2c/mt9m032.c | 4 +- + drivers/media/i2c/mt9p031.c | 4 +- + drivers/media/i2c/mt9t001.c | 4 +- + drivers/media/i2c/mt9v011.c | 4 +- + drivers/media/i2c/mt9v032.c | 4 +- + drivers/media/i2c/noon010pc30.c | 2 +- + drivers/media/i2c/ov2659.c | 4 +- + drivers/media/i2c/ov7670.c | 2 +- + drivers/media/i2c/ov9650.c | 2 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +- + drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c | 2 +- + drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 1 + + drivers/media/i2c/s5c73m3/s5c73m3.h | 2 +- + drivers/media/i2c/s5k4ecgx.c | 2 +- + drivers/media/i2c/s5k6aa.c | 2 +- + drivers/media/i2c/saa6588.c | 2 +- + drivers/media/i2c/saa7115.c | 2 +- + drivers/media/i2c/saa7127.c | 2 +- + drivers/media/i2c/smiapp/smiapp.h | 2 +- + drivers/media/i2c/soc_camera/mt9m001.c | 2 +- + drivers/media/i2c/soc_camera/mt9t112.c | 2 +- + drivers/media/i2c/soc_camera/mt9v022.c | 4 +- + drivers/media/i2c/soc_camera/ov772x.c | 2 +- + drivers/media/i2c/soc_camera/rj54n1cb0c.c | 2 +- + drivers/media/i2c/soc_camera/tw9910.c | 2 +- + drivers/media/i2c/sr030pc30.c | 2 +- + drivers/media/i2c/tc358743.c | 2 +- + drivers/media/i2c/ths7303.c | 2 +- + drivers/media/i2c/tvaudio.c | 2 +- + drivers/media/i2c/tvp514x.c | 2 +- + drivers/media/i2c/tvp5150.c | 2 +- + drivers/media/i2c/tvp7002.c | 2 +- + drivers/media/i2c/uda1342.c | 2 +- + drivers/media/i2c/upd64031a.c | 2 +- + drivers/media/i2c/upd64083.c | 2 +- + drivers/media/i2c/wm8775.c | 2 +- + drivers/media/pci/bt8xx/bttv-cards.c | 2 +- + drivers/media/pci/bt8xx/bttv-driver.c | 6 +- + drivers/media/pci/bt8xx/bttvp.h | 4 +- + drivers/media/pci/cobalt/cobalt-driver.c | 6 +- + drivers/media/pci/cobalt/cobalt-irq.c | 2 +- + drivers/media/pci/cobalt/cobalt-v4l2.c | 4 +- + drivers/media/pci/cx18/cx18-cards.c | 2 +- + drivers/media/pci/cx18/cx18-driver.h | 2 +- + drivers/media/pci/cx18/cx23418.h | 2 +- + drivers/media/pci/cx23885/cx23885-417.c | 2 +- + drivers/media/pci/cx23885/cx23885-cards.c | 2 +- + drivers/media/pci/cx23885/cx23885-input.c | 2 +- + drivers/media/pci/cx23885/cx23885-video.c | 2 +- + drivers/media/pci/cx23885/cx23885.h | 2 +- + drivers/media/pci/cx88/cx88-alsa.c | 2 +- + drivers/media/pci/cx88/cx88-blackbird.c | 2 +- + drivers/media/pci/cx88/cx88-video.c | 2 +- + drivers/media/pci/cx88/cx88.h | 6 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 4 +- + drivers/media/pci/ivtv/ivtv-cards.c | 12 +- + drivers/media/pci/ivtv/ivtv-driver.c | 8 +- + drivers/media/pci/ivtv/ivtv-driver.h | 4 +- + drivers/media/pci/ivtv/ivtv-fileops.c | 2 +- + drivers/media/pci/ivtv/ivtv-firmware.c | 2 +- + drivers/media/pci/ivtv/ivtv-i2c.c | 2 +- + drivers/media/pci/ivtv/ivtv-ioctl.c | 2 +- + drivers/media/pci/ivtv/ivtv-routing.c | 8 +- + drivers/media/pci/saa7134/saa7134-video.c | 2 +- + drivers/media/pci/saa7134/saa7134.h | 2 +- + drivers/media/pci/saa7146/hexium_gemini.c | 2 +- + drivers/media/pci/saa7146/hexium_orion.c | 2 +- + drivers/media/pci/saa7146/mxb.c | 4 +- + drivers/media/pci/ttpci/av7110.h | 2 +- + drivers/media/pci/ttpci/av7110_av.c | 9 +- + drivers/media/pci/ttpci/av7110_av.h | 3 +- + drivers/media/pci/ttpci/budget-av.c | 2 +- + drivers/media/pci/ttpci/budget.h | 2 +- + drivers/media/pci/zoran/zoran_card.c | 2 +- + drivers/media/platform/Kconfig | 2 +- + drivers/media/platform/coda/coda-common.c | 2 +- + drivers/media/platform/davinci/Kconfig | 6 + + drivers/media/platform/exynos4-is/common.c | 2 +- + drivers/media/platform/exynos4-is/fimc-core.h | 2 +- + drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 +- + drivers/media/platform/exynos4-is/fimc-isp.h | 2 +- + drivers/media/platform/exynos4-is/fimc-lite-reg.c | 2 +- + drivers/media/platform/exynos4-is/fimc-lite.c | 2 +- + drivers/media/platform/exynos4-is/fimc-lite.h | 2 +- + drivers/media/platform/exynos4-is/fimc-reg.c | 2 +- + drivers/media/platform/exynos4-is/media-dev.c | 2 +- + drivers/media/platform/exynos4-is/media-dev.h | 2 +- + drivers/media/platform/exynos4-is/mipi-csis.c | 2 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 2 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 2 +- + drivers/media/platform/omap/omap_vout_vrfb.c | 10 +- + drivers/media/platform/rcar_jpu.c | 13 +- + drivers/media/platform/s3c-camif/camif-core.h | 2 +- + drivers/media/platform/s3c-camif/camif-regs.h | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 2 +- + drivers/media/platform/s5p-tv/hdmi_drv.c | 2 +- + drivers/media/platform/s5p-tv/sii9234_drv.c | 2 +- + drivers/media/platform/sh_vou.c | 2 +- + drivers/media/platform/soc_camera/atmel-isi.c | 164 +++++++++++---- + drivers/media/platform/soc_camera/atmel-isi.h | 10 + + drivers/media/platform/soc_camera/mx2_camera.c | 4 +- + drivers/media/platform/soc_camera/mx3_camera.c | 4 +- + drivers/media/platform/soc_camera/omap1_camera.c | 4 +- + drivers/media/platform/soc_camera/pxa_camera.c | 4 +- + drivers/media/platform/soc_camera/rcar_vin.c | 77 +++---- + .../platform/soc_camera/sh_mobile_ceu_camera.c | 6 +- + drivers/media/platform/soc_camera/sh_mobile_csi2.c | 6 +- + drivers/media/platform/soc_camera/soc_camera.c | 25 +-- + .../platform/soc_camera/soc_camera_platform.c | 2 +- + drivers/media/platform/soc_camera/soc_mediabus.c | 2 +- + .../platform/sti/c8sectpfe/c8sectpfe-common.c | 16 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 2 +- + drivers/media/platform/timblogiw.c | 2 +- + drivers/media/platform/via-camera.c | 2 +- + drivers/media/platform/vivid/vivid-core.h | 1 + + drivers/media/platform/vivid/vivid-ctrls.c | 21 +- + drivers/media/platform/vivid/vivid-vid-cap.c | 10 +- + drivers/media/platform/vivid/vivid-vid-out.c | 9 +- + drivers/media/platform/xilinx/xilinx-tpg.c | 2 + + drivers/media/platform/xilinx/xilinx-vipp.c | 4 +- + drivers/media/radio/radio-maxiradio.c | 2 +- + drivers/media/radio/radio-sf16fmr2.c | 2 +- + drivers/media/radio/radio-shark.c | 2 +- + drivers/media/radio/radio-shark2.c | 2 +- + drivers/media/radio/radio-si476x.c | 2 +- + drivers/media/radio/radio-tea5777.h | 2 +- + drivers/media/radio/radio-timb.c | 2 +- + drivers/media/radio/si4713/radio-usb-si4713.c | 2 +- + drivers/media/radio/si4713/si4713.h | 2 +- + drivers/media/radio/tea575x.c | 2 +- + drivers/media/rc/Kconfig | 3 +- + drivers/media/rc/gpio-ir-recv.c | 24 ++- + drivers/media/rc/ir-jvc-decoder.c | 3 - + drivers/media/rc/ir-mce_kbd-decoder.c | 3 - + drivers/media/rc/ir-nec-decoder.c | 3 - + drivers/media/rc/ir-rc5-decoder.c | 3 - + drivers/media/rc/ir-rc6-decoder.c | 5 - + drivers/media/rc/ir-rx51.c | 2 +- + drivers/media/rc/ir-sanyo-decoder.c | 3 - + drivers/media/rc/ir-sharp-decoder.c | 7 +- + drivers/media/rc/ir-sony-decoder.c | 4 - + drivers/media/rc/ir-xmp-decoder.c | 3 - + drivers/media/rc/nuvoton-cir.c | 156 +++++++-------- + drivers/media/rc/nuvoton-cir.h | 28 +-- + drivers/media/rc/rc-core-priv.h | 64 ------ + drivers/media/rc/rc-ir-raw.c | 31 +-- + drivers/media/rc/rc-main.c | 84 ++++++-- + drivers/media/rc/st_rc.c | 14 +- + drivers/media/rc/streamzap.c | 19 +- + drivers/media/tuners/max2165.c | 2 +- + drivers/media/tuners/mt2063.c | 1 - + drivers/media/tuners/si2157.c | 1 + + drivers/media/usb/airspy/airspy.c | 2 +- + drivers/media/usb/as102/as102_fw.c | 1 + + drivers/media/usb/cpia2/cpia2_usb.c | 3 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-cards.c | 10 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 15 +- + drivers/media/usb/cx231xx/cx231xx-dvb.c | 8 +- + drivers/media/usb/cx231xx/cx231xx-vbi.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 2 +- + drivers/media/usb/cx231xx/cx231xx.h | 4 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c | 4 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h | 4 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.c | 6 +- + drivers/media/usb/em28xx/em28xx-camera.c | 4 +- + drivers/media/usb/em28xx/em28xx-cards.c | 18 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 15 ++ + drivers/media/usb/em28xx/em28xx-video.c | 2 +- + drivers/media/usb/em28xx/em28xx.h | 2 +- + drivers/media/usb/go7007/go7007-usb.c | 6 +- + drivers/media/usb/go7007/go7007-v4l2.c | 2 +- + drivers/media/usb/gspca/ov534.c | 9 +- + drivers/media/usb/gspca/topro.c | 6 +- + drivers/media/usb/hackrf/hackrf.c | 13 +- + drivers/media/usb/hdpvr/hdpvr.h | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-audio.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h | 4 +- + drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 16 +- + drivers/media/usb/pvrusb2/pvrusb2-video-v4l.c | 2 +- + drivers/media/usb/stk1160/stk1160-core.c | 2 +- + drivers/media/usb/stk1160/stk1160-v4l.c | 2 +- + drivers/media/usb/tm6000/tm6000-cards.c | 2 +- + drivers/media/usb/ttusb-dec/ttusb_dec.c | 2 +- + drivers/media/usb/usbvision/usbvision-core.c | 2 +- + drivers/media/usb/usbvision/usbvision-video.c | 25 ++- + drivers/media/usb/uvc/uvc_driver.c | 3 +- + drivers/media/usb/uvc/uvc_v4l2.c | 20 ++ + drivers/media/v4l2-core/v4l2-clk.c | 9 + + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 6 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 77 ++++--- + drivers/media/v4l2-core/v4l2-device.c | 21 +- + drivers/media/v4l2-core/v4l2-dv-timings.c | 7 + + drivers/media/v4l2-core/v4l2-ioctl.c | 14 +- + drivers/media/v4l2-core/videobuf2-v4l2.c | 8 +- + drivers/mfd/timberdale.c | 4 +- + drivers/staging/media/davinci_vpfe/Kconfig | 2 + + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 5 +- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 2 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 7 +- + .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 2 +- + drivers/staging/media/lirc/lirc_imon.c | 2 + + drivers/staging/media/omap4iss/Kconfig | 2 +- + drivers/staging/media/omap4iss/iss.c | 4 +- + drivers/staging/media/omap4iss/iss.h | 2 +- + drivers/staging/media/omap4iss/iss_csi2.c | 6 +- + drivers/staging/media/omap4iss/iss_csiphy.h | 2 +- + drivers/staging/media/omap4iss/iss_resizer.c | 4 +- + include/linux/platform_data/camera-rcar.h | 25 --- + .../linux/platform_data/{ => media}/camera-mx2.h | 0 + .../linux/platform_data/{ => media}/camera-mx3.h | 0 + .../linux/platform_data/{ => media}/camera-pxa.h | 0 + include/linux/platform_data/{ => media}/coda.h | 0 + .../{ => linux/platform_data}/media/gpio-ir-recv.h | 1 - + include/{ => linux/platform_data}/media/ir-rx51.h | 0 + .../{ => linux/platform_data}/media/mmp-camera.h | 0 + .../{ => linux/platform_data}/media/omap1_camera.h | 0 + include/{ => linux/platform_data}/media/omap4iss.h | 0 + include/{ => linux/platform_data}/media/s5p_hdmi.h | 1 - + include/{ => linux/platform_data}/media/si4713.h | 2 +- + include/{ => linux/platform_data}/media/sii9234.h | 0 + .../platform_data}/media/soc_camera_platform.h | 0 + .../{ => linux/platform_data}/media/timb_radio.h | 0 + .../{ => linux/platform_data}/media/timb_video.h | 0 + include/media/{ => drv-intf}/cx2341x.h | 0 + include/media/{ => drv-intf}/cx25840.h | 0 + include/media/{ => drv-intf}/exynos-fimc.h | 0 + include/media/{ => drv-intf}/msp3400.h | 1 - + include/media/{ => drv-intf}/s3c_camif.h | 0 + include/media/{ => drv-intf}/saa7146.h | 0 + include/media/{ => drv-intf}/saa7146_vv.h | 2 +- + include/media/{ => drv-intf}/sh_mobile_ceu.h | 0 + include/media/{ => drv-intf}/sh_mobile_csi2.h | 0 + include/media/{ => drv-intf}/sh_vou.h | 0 + include/media/{ => drv-intf}/si476x.h | 2 +- + include/media/{ => drv-intf}/soc_mediabus.h | 0 + include/media/{ => drv-intf}/tea575x.h | 0 + include/media/{ => i2c}/ad9389b.h | 0 + include/media/{ => i2c}/adp1653.h | 2 +- + include/media/{ => i2c}/adv7183.h | 0 + include/media/{ => i2c}/adv7343.h | 0 + include/media/{ => i2c}/adv7393.h | 0 + include/media/{ => i2c}/adv7511.h | 0 + include/media/{ => i2c}/adv7604.h | 0 + include/media/{ => i2c}/adv7842.h | 0 + include/media/{ => i2c}/ak881x.h | 0 + include/media/{ => i2c}/as3645a.h | 2 +- + include/media/{ => i2c}/bt819.h | 0 + include/media/{ => i2c}/cs5345.h | 0 + include/media/{ => i2c}/cs53l32a.h | 0 + include/media/{ => i2c}/ir-kbd-i2c.h | 0 + include/media/{ => i2c}/lm3560.h | 2 +- + include/media/{ => i2c}/lm3646.h | 2 +- + include/media/{ => i2c}/m52790.h | 0 + include/media/{ => i2c}/m5mols.h | 0 + include/media/{ => i2c}/mt9m032.h | 0 + include/media/{ => i2c}/mt9p031.h | 0 + include/media/{ => i2c}/mt9t001.h | 0 + include/media/{ => i2c}/mt9t112.h | 0 + include/media/{ => i2c}/mt9v011.h | 0 + include/media/{ => i2c}/mt9v022.h | 0 + include/media/{ => i2c}/mt9v032.h | 0 + include/media/{ => i2c}/noon010pc30.h | 0 + include/media/{ => i2c}/ov2659.h | 0 + include/media/{ => i2c}/ov7670.h | 0 + include/media/{ => i2c}/ov772x.h | 0 + include/media/{ => i2c}/ov9650.h | 0 + include/media/{ => i2c}/rj54n1cb0c.h | 0 + include/media/{ => i2c}/s5c73m3.h | 0 + include/media/{ => i2c}/s5k4ecgx.h | 0 + include/media/{ => i2c}/s5k6aa.h | 0 + include/media/{ => i2c}/saa6588.h | 0 + include/media/{ => i2c}/saa7115.h | 1 - + include/media/{ => i2c}/saa7127.h | 1 - + include/media/{ => i2c}/smiapp.h | 2 +- + include/media/{ => i2c}/sr030pc30.h | 0 + include/media/{ => i2c}/tc358743.h | 0 + include/media/{ => i2c}/ths7303.h | 0 + include/media/{ => i2c}/tvaudio.h | 0 + include/media/{ => i2c}/tvp514x.h | 0 + include/media/{ => i2c}/tvp5150.h | 1 - + include/media/{ => i2c}/tvp7002.h | 0 + include/media/{ => i2c}/tw9910.h | 0 + include/media/{ => i2c}/uda1342.h | 0 + include/media/{ => i2c}/upd64031a.h | 0 + include/media/{ => i2c}/upd64083.h | 0 + include/media/{ => i2c}/wm8775.h | 0 + include/media/lirc.h | 169 +--------------- + include/media/rc-core.h | 1 + + include/media/rc-map.h | 40 ++-- + include/media/v4l2-clk.h | 5 + + include/media/v4l2-dv-timings.h | 21 ++ + include/uapi/linux/dvb/video.h | 1 - + include/uapi/linux/lirc.h | 168 ++++++++++++++++ + include/uapi/linux/usb/video.h | 1 + + include/uapi/linux/v4l2-controls.h | 6 +- + include/uapi/linux/videodev2.h | 12 +- + sound/pci/es1968.c | 2 +- + sound/pci/fm801.c | 2 +- + 382 files changed, 1861 insertions(+), 1456 deletions(-) + delete mode 100644 include/linux/platform_data/camera-rcar.h + rename include/linux/platform_data/{ => media}/camera-mx2.h (100%) + rename include/linux/platform_data/{ => media}/camera-mx3.h (100%) + rename include/linux/platform_data/{ => media}/camera-pxa.h (100%) + rename include/linux/platform_data/{ => media}/coda.h (100%) + rename include/{ => linux/platform_data}/media/gpio-ir-recv.h (99%) + rename include/{ => linux/platform_data}/media/ir-rx51.h (100%) + rename include/{ => linux/platform_data}/media/mmp-camera.h (100%) + rename include/{ => linux/platform_data}/media/omap1_camera.h (100%) + rename include/{ => linux/platform_data}/media/omap4iss.h (100%) + rename include/{ => linux/platform_data}/media/s5p_hdmi.h (99%) + rename include/{ => linux/platform_data}/media/si4713.h (96%) + rename include/{ => linux/platform_data}/media/sii9234.h (100%) + rename include/{ => linux/platform_data}/media/soc_camera_platform.h (100%) + rename include/{ => linux/platform_data}/media/timb_radio.h (100%) + rename include/{ => linux/platform_data}/media/timb_video.h (100%) + rename include/media/{ => drv-intf}/cx2341x.h (100%) + rename include/media/{ => drv-intf}/cx25840.h (100%) + rename include/media/{ => drv-intf}/exynos-fimc.h (100%) + rename include/media/{ => drv-intf}/msp3400.h (99%) + rename include/media/{ => drv-intf}/s3c_camif.h (100%) + rename include/media/{ => drv-intf}/saa7146.h (100%) + rename include/media/{ => drv-intf}/saa7146_vv.h (99%) + rename include/media/{ => drv-intf}/sh_mobile_ceu.h (100%) + rename include/media/{ => drv-intf}/sh_mobile_csi2.h (100%) + rename include/media/{ => drv-intf}/sh_vou.h (100%) + rename include/media/{ => drv-intf}/si476x.h (94%) + rename include/media/{ => drv-intf}/soc_mediabus.h (100%) + rename include/media/{ => drv-intf}/tea575x.h (100%) + rename include/media/{ => i2c}/ad9389b.h (100%) + rename include/media/{ => i2c}/adp1653.h (99%) + rename include/media/{ => i2c}/adv7183.h (100%) + rename include/media/{ => i2c}/adv7343.h (100%) + rename include/media/{ => i2c}/adv7393.h (100%) + rename include/media/{ => i2c}/adv7511.h (100%) + rename include/media/{ => i2c}/adv7604.h (100%) + rename include/media/{ => i2c}/adv7842.h (100%) + rename include/media/{ => i2c}/ak881x.h (100%) + rename include/media/{ => i2c}/as3645a.h (98%) + rename include/media/{ => i2c}/bt819.h (100%) + rename include/media/{ => i2c}/cs5345.h (100%) + rename include/media/{ => i2c}/cs53l32a.h (100%) + rename include/media/{ => i2c}/ir-kbd-i2c.h (100%) + rename include/media/{ => i2c}/lm3560.h (98%) + rename include/media/{ => i2c}/lm3646.h (98%) + rename include/media/{ => i2c}/m52790.h (100%) + rename include/media/{ => i2c}/m5mols.h (100%) + rename include/media/{ => i2c}/mt9m032.h (100%) + rename include/media/{ => i2c}/mt9p031.h (100%) + rename include/media/{ => i2c}/mt9t001.h (100%) + rename include/media/{ => i2c}/mt9t112.h (100%) + rename include/media/{ => i2c}/mt9v011.h (100%) + rename include/media/{ => i2c}/mt9v022.h (100%) + rename include/media/{ => i2c}/mt9v032.h (100%) + rename include/media/{ => i2c}/noon010pc30.h (100%) + rename include/media/{ => i2c}/ov2659.h (100%) + rename include/media/{ => i2c}/ov7670.h (100%) + rename include/media/{ => i2c}/ov772x.h (100%) + rename include/media/{ => i2c}/ov9650.h (100%) + rename include/media/{ => i2c}/rj54n1cb0c.h (100%) + rename include/media/{ => i2c}/s5c73m3.h (100%) + rename include/media/{ => i2c}/s5k4ecgx.h (100%) + rename include/media/{ => i2c}/s5k6aa.h (100%) + rename include/media/{ => i2c}/saa6588.h (100%) + rename include/media/{ => i2c}/saa7115.h (99%) + rename include/media/{ => i2c}/saa7127.h (99%) + rename include/media/{ => i2c}/smiapp.h (98%) + rename include/media/{ => i2c}/sr030pc30.h (100%) + rename include/media/{ => i2c}/tc358743.h (100%) + rename include/media/{ => i2c}/ths7303.h (100%) + rename include/media/{ => i2c}/tvaudio.h (100%) + rename include/media/{ => i2c}/tvp514x.h (100%) + rename include/media/{ => i2c}/tvp5150.h (99%) + rename include/media/{ => i2c}/tvp7002.h (100%) + rename include/media/{ => i2c}/tw9910.h (100%) + rename include/media/{ => i2c}/uda1342.h (100%) + rename include/media/{ => i2c}/upd64031a.h (100%) + rename include/media/{ => i2c}/upd64083.h (100%) + rename include/media/{ => i2c}/wm8775.h (100%) + create mode 100644 include/uapi/linux/lirc.h +Merging kbuild/for-next (f155d8e72ce4 Merge branch 'kbuild/kbuild' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/lto-build | 173 ++++++++++++++++++++++++++++++ + Makefile | 19 +++- + arch/x86/Kconfig | 2 +- + drivers/gpu/drm/Makefile | 2 - + drivers/misc/ibmasm/ibmasm.h | 2 +- + drivers/net/wireless/ath/ath10k/thermal.h | 2 +- + drivers/staging/iio/adc/Kconfig | 4 +- + drivers/staging/iio/adc/Makefile | 7 +- + drivers/staging/iio/adc/ad7606_core.c | 4 + + drivers/usb/chipidea/otg_fsm.h | 2 +- + fs/logfs/logfs.h | 2 +- + init/Kconfig | 73 +++++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.build | 8 +- + scripts/Makefile.lib | 4 +- + scripts/Makefile.lto | 84 +++++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/link-vmlinux.sh | 2 +- + scripts/package/Makefile | 4 +- + scripts/tags.sh | 1 + + 21 files changed, 380 insertions(+), 26 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 (699519c47a1f Merge branch 'for-4.4-fixes' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/sata_rcar.txt | 1 + + drivers/ata/ahci.c | 89 ++++++++++++++-------- + drivers/ata/ahci.h | 3 +- + drivers/ata/ahci_brcmstb.c | 22 +++++- + drivers/ata/ahci_mvebu.c | 5 ++ + drivers/ata/libahci.c | 60 +++++++-------- + drivers/ata/sata_rcar.c | 19 ++--- + drivers/ata/sata_sil.c | 3 + + 8 files changed, 125 insertions(+), 77 deletions(-) +Merging pm/linux-next (d2b90233c1ca Merge branches 'pm-sleep' and 'pm-runtime' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/opp/opp.txt | 132 +++++++++++----- + arch/arm/boot/dts/exynos4412.dtsi | 28 ++-- + arch/x86/pci/bus_numa.c | 13 +- + drivers/acpi/Kconfig | 4 +- + drivers/acpi/pci_root.c | 7 + + drivers/acpi/scan.c | 2 +- + drivers/base/base.h | 2 + + drivers/base/dd.c | 50 +++++- + drivers/base/power/main.c | 17 ++ + drivers/base/power/opp/Makefile | 1 + + drivers/base/power/opp/core.c | 21 ++- + drivers/base/power/opp/debugfs.c | 219 ++++++++++++++++++++++++++ + drivers/base/power/opp/opp.h | 46 +++++- + drivers/base/power/power.h | 2 + + drivers/base/power/runtime.c | 26 ++- + drivers/cpuidle/governors/menu.c | 6 +- + 16 files changed, 497 insertions(+), 79 deletions(-) + create mode 100644 drivers/base/power/opp/debugfs.c +Merging idle/next (31ade3b83e18 Linux 4.4-rc3) +$ git merge idle/next +Already up-to-date. +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging thermal/next (31ade3b83e18 Linux 4.4-rc3) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (31ade3b83e18 Linux 4.4-rc3) +$ git merge thermal-soc/next +Already up-to-date. +Merging ieee1394/for-next (100ceb66d5c4 firewire: ohci: fix JMicron JMB38x IT context discovery) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (9d99c7123c9a swiotlb: Enable it under x86 PAE) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (c280c9275de8 Merge branch 'topic/ti-xbar' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 13 +- + .../devicetree/bindings/dma/stm32-dma.txt | 82 ++ + .../devicetree/bindings/dma/ti-dma-crossbar.txt | 6 + + Documentation/dmaengine/client.txt | 38 +- + Documentation/dmaengine/provider.txt | 20 +- + arch/arm/configs/stm32_defconfig | 2 + + drivers/dca/dca-core.c | 3 +- + drivers/dma/Kconfig | 12 + + drivers/dma/Makefile | 1 + + drivers/dma/dma-axi-dmac.c | 8 + + drivers/dma/dmaengine.c | 6 +- + drivers/dma/ioat/dca.c | 2 +- + drivers/dma/ioat/dma.h | 34 +- + drivers/dma/ioat/registers.h | 16 +- + drivers/dma/pxa_dma.c | 1 + + drivers/dma/stm32-dma.c | 1141 ++++++++++++++++++++ + drivers/dma/ti-dma-crossbar.c | 81 +- + drivers/dma/virt-dma.c | 46 +- + drivers/dma/virt-dma.h | 25 + + include/linux/dca.h | 5 +- + include/linux/dmaengine.h | 92 ++ + sound/core/pcm_dmaengine.c | 9 +- + 22 files changed, 1565 insertions(+), 78 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/stm32-dma.txt + create mode 100644 drivers/dma/stm32-dma.c +Merging net-next/master (6cc568340148 isdn: remove spellcaster driver) +$ git merge net-next/master +Resolved 'kernel/bpf/syscall.c' using previous resolution. +Resolved 'net/ipv4/ipmr.c' using previous resolution. +Auto-merging net/unix/af_unix.c +Auto-merging net/tipc/udp_media.c +Auto-merging net/tipc/socket.c +Auto-merging net/tipc/link.c +Auto-merging net/sctp/socket.c +Auto-merging net/iucv/af_iucv.c +Auto-merging net/ipv6/route.c +Auto-merging net/ipv4/ipmr.c +CONFLICT (content): Merge conflict in net/ipv4/ipmr.c +Auto-merging net/core/stream.c +Auto-merging net/core/sock.c +Auto-merging net/bluetooth/af_bluetooth.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/bpf/syscall.c +CONFLICT (content): Merge conflict in kernel/bpf/syscall.c +Auto-merging include/net/sock.h +Auto-merging include/linux/netdevice.h +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile +Auto-merging drivers/net/vrf.c +Auto-merging drivers/net/ethernet/renesas/ravb_main.c +Auto-merging drivers/net/ethernet/freescale/gianfar.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +Auto-merging drivers/net/ethernet/apm/xgene/xgene_enet_main.c +Auto-merging drivers/net/can/xilinx_can.c +Removing drivers/isdn/sc/timer.c +Removing drivers/isdn/sc/shmem.c +Removing drivers/isdn/sc/scioc.h +Removing drivers/isdn/sc/packet.c +Removing drivers/isdn/sc/message.h +Removing drivers/isdn/sc/message.c +Removing drivers/isdn/sc/ioctl.c +Removing drivers/isdn/sc/interrupt.c +Removing drivers/isdn/sc/init.c +Removing drivers/isdn/sc/includes.h +Removing drivers/isdn/sc/hardware.h +Removing drivers/isdn/sc/event.c +Removing drivers/isdn/sc/command.c +Removing drivers/isdn/sc/card.h +Removing drivers/isdn/sc/Makefile +Removing drivers/isdn/sc/Kconfig +Auto-merging crypto/algif_skcipher.c +Auto-merging crypto/algif_aead.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 78382abe0f83] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/net/dsa/dsa.txt | 3 + + .../devicetree/bindings/net/hisilicon-hns-mdio.txt | 7 +- + .../fault-injection/notifier-error-inject.txt | 24 + + MAINTAINERS | 46 +- + crypto/algif_aead.c | 4 +- + crypto/algif_skcipher.c | 4 +- + drivers/bluetooth/bfusb.c | 9 +- + drivers/bluetooth/bluecard_cs.c | 25 +- + drivers/bluetooth/bpa10x.c | 4 +- + drivers/bluetooth/bt3c_cs.c | 11 +- + drivers/bluetooth/btmrvl_main.c | 8 +- + drivers/bluetooth/btmrvl_sdio.c | 4 +- + drivers/bluetooth/btsdio.c | 6 +- + drivers/bluetooth/btuart_cs.c | 11 +- + drivers/bluetooth/btusb.c | 48 +- + drivers/bluetooth/btwilink.c | 8 +- + drivers/bluetooth/dtl1_cs.c | 11 +- + drivers/bluetooth/hci_ath.c | 6 +- + drivers/bluetooth/hci_bcm.c | 2 +- + drivers/bluetooth/hci_bcsp.c | 25 +- + drivers/bluetooth/hci_h4.c | 16 +- + drivers/bluetooth/hci_h5.c | 18 +- + drivers/bluetooth/hci_intel.c | 14 +- + drivers/bluetooth/hci_ldisc.c | 5 +- + drivers/bluetooth/hci_ll.c | 4 +- + drivers/bluetooth/hci_qca.c | 4 +- + drivers/bluetooth/hci_vhci.c | 8 +- + drivers/isdn/Makefile | 1 - + drivers/isdn/i4l/Kconfig | 2 - + drivers/isdn/sc/Kconfig | 8 - + drivers/isdn/sc/Makefile | 10 - + drivers/isdn/sc/card.h | 131 --- + drivers/isdn/sc/command.c | 363 --------- + drivers/isdn/sc/event.c | 68 -- + drivers/isdn/sc/hardware.h | 110 --- + drivers/isdn/sc/includes.h | 16 - + drivers/isdn/sc/init.c | 549 ------------- + drivers/isdn/sc/interrupt.c | 247 ------ + drivers/isdn/sc/ioctl.c | 582 -------------- + drivers/isdn/sc/message.c | 230 ------ + drivers/isdn/sc/message.h | 245 ------ + drivers/isdn/sc/packet.c | 204 ----- + drivers/isdn/sc/scioc.h | 110 --- + drivers/isdn/sc/shmem.c | 138 ---- + drivers/isdn/sc/timer.c | 122 --- + drivers/net/can/xilinx_can.c | 176 ++-- + drivers/net/dsa/mv88e6xxx.c | 10 + + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 1 - + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 25 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 113 --- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 50 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 7 - + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 9 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 43 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 - + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 - + drivers/net/ethernet/cisco/enic/enic_main.c | 2 - + drivers/net/ethernet/dlink/dl2k.c | 314 +++++--- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 6 +- + drivers/net/ethernet/emulex/benet/be_main.c | 2 - + drivers/net/ethernet/freescale/fec_main.c | 9 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- + drivers/net/ethernet/freescale/gianfar.c | 9 +- + drivers/net/ethernet/intel/fm10k/fm10k.h | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 4 + + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_type.h | 1 + + drivers/net/ethernet/intel/fm10k/fm10k_vf.c | 7 +- + drivers/net/ethernet/intel/i40e/i40e.h | 4 + + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 2 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 24 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 76 +- + drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 2 - + drivers/net/ethernet/intel/i40e/i40e_main.c | 255 ++++-- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 16 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 21 +- + .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 2 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 13 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 1 + + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 7 +- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 58 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 1 - + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 21 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 165 ++-- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 2 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 3 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 26 +- + drivers/net/ethernet/intel/ixgbevf/vf.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_cq.c | 10 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 17 - + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 40 - + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 18 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 126 --- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 + + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 15 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 11 +- + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 8 + + drivers/net/ethernet/mellanox/mlxsw/Makefile | 1 + + drivers/net/ethernet/mellanox/mlxsw/core.c | 8 + + drivers/net/ethernet/mellanox/mlxsw/core.h | 24 + + drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 342 ++++++++ + drivers/net/ethernet/mellanox/mlxsw/reg.h | 290 +++++++ + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 24 + + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 129 +-- + drivers/net/ethernet/microchip/encx24j600.c | 24 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 3 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 6 + + drivers/net/ethernet/qlogic/qed/qed_main.c | 18 + + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 27 + + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 13 + + drivers/net/ethernet/qlogic/qede/qede.h | 5 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 211 +++++ + drivers/net/ethernet/qlogic/qede/qede_main.c | 7 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 4 +- + drivers/net/ethernet/renesas/ravb.h | 3 + + drivers/net/ethernet/renesas/ravb_main.c | 38 +- + drivers/net/ethernet/renesas/sh_eth.c | 213 +++-- + drivers/net/ethernet/rocker/rocker.c | 2 +- + drivers/net/ethernet/sfc/ef10.c | 13 +- + drivers/net/ethernet/sfc/efx.c | 7 +- + drivers/net/ethernet/sfc/net_driver.h | 2 + + drivers/net/ethernet/sfc/rx.c | 1 - + drivers/net/ethernet/sfc/tx.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 26 + + drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 42 + + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 75 ++ + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 30 + + drivers/net/ethernet/ti/cpsw.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/hyperv/hyperv_net.h | 14 +- + drivers/net/hyperv/netvsc_drv.c | 142 ++-- + drivers/net/phy/bcm7xxx.c | 14 + + drivers/net/ppp/pppoe.c | 26 +- + drivers/net/ppp/pppox.c | 2 +- + drivers/net/virtio_net.c | 3 - + drivers/net/vrf.c | 68 +- + drivers/net/wireless/Kconfig | 238 +----- + drivers/net/wireless/Makefile | 65 +- + drivers/net/wireless/admtek/Kconfig | 41 + + drivers/net/wireless/admtek/Makefile | 1 + + drivers/net/wireless/{ => admtek}/adm8211.c | 0 + drivers/net/wireless/{ => admtek}/adm8211.h | 0 + drivers/net/wireless/ath/Kconfig | 17 +- + drivers/net/wireless/ath/wil6210/netdev.c | 2 +- + drivers/net/wireless/atmel/Kconfig | 57 ++ + drivers/net/wireless/atmel/Makefile | 5 + + drivers/net/wireless/{ => atmel}/at76c50x-usb.c | 0 + drivers/net/wireless/{ => atmel}/at76c50x-usb.h | 0 + drivers/net/wireless/{ => atmel}/atmel.c | 0 + drivers/net/wireless/{ => atmel}/atmel.h | 0 + drivers/net/wireless/{ => atmel}/atmel_cs.c | 0 + drivers/net/wireless/{ => atmel}/atmel_pci.c | 0 + drivers/net/wireless/broadcom/Kconfig | 18 + + drivers/net/wireless/broadcom/Makefile | 5 + + drivers/net/wireless/{ => broadcom}/b43/Kconfig | 0 + drivers/net/wireless/{ => broadcom}/b43/Makefile | 0 + drivers/net/wireless/{ => broadcom}/b43/b43.h | 0 + drivers/net/wireless/{ => broadcom}/b43/bus.c | 0 + drivers/net/wireless/{ => broadcom}/b43/bus.h | 0 + drivers/net/wireless/{ => broadcom}/b43/debugfs.c | 0 + drivers/net/wireless/{ => broadcom}/b43/debugfs.h | 0 + drivers/net/wireless/{ => broadcom}/b43/dma.c | 0 + drivers/net/wireless/{ => broadcom}/b43/dma.h | 0 + drivers/net/wireless/{ => broadcom}/b43/leds.c | 0 + drivers/net/wireless/{ => broadcom}/b43/leds.h | 0 + drivers/net/wireless/{ => broadcom}/b43/lo.c | 0 + drivers/net/wireless/{ => broadcom}/b43/lo.h | 0 + drivers/net/wireless/{ => broadcom}/b43/main.c | 0 + drivers/net/wireless/{ => broadcom}/b43/main.h | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_a.c | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_a.h | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_ac.c | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_ac.h | 0 + .../net/wireless/{ => broadcom}/b43/phy_common.c | 0 + .../net/wireless/{ => broadcom}/b43/phy_common.h | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_g.c | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_g.h | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_ht.c | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_ht.h | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_lcn.c | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_lcn.h | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_lp.c | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_lp.h | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_n.c | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_n.h | 0 + drivers/net/wireless/{ => broadcom}/b43/pio.c | 0 + drivers/net/wireless/{ => broadcom}/b43/pio.h | 0 + drivers/net/wireless/{ => broadcom}/b43/ppr.c | 0 + drivers/net/wireless/{ => broadcom}/b43/ppr.h | 0 + .../net/wireless/{ => broadcom}/b43/radio_2055.c | 0 + .../net/wireless/{ => broadcom}/b43/radio_2055.h | 0 + .../net/wireless/{ => broadcom}/b43/radio_2056.c | 0 + .../net/wireless/{ => broadcom}/b43/radio_2056.h | 0 + .../net/wireless/{ => broadcom}/b43/radio_2057.c | 0 + .../net/wireless/{ => broadcom}/b43/radio_2057.h | 0 + .../net/wireless/{ => broadcom}/b43/radio_2059.c | 0 + .../net/wireless/{ => broadcom}/b43/radio_2059.h | 0 + drivers/net/wireless/{ => broadcom}/b43/rfkill.c | 0 + drivers/net/wireless/{ => broadcom}/b43/rfkill.h | 0 + drivers/net/wireless/{ => broadcom}/b43/sdio.c | 0 + drivers/net/wireless/{ => broadcom}/b43/sdio.h | 0 + drivers/net/wireless/{ => broadcom}/b43/sysfs.c | 0 + drivers/net/wireless/{ => broadcom}/b43/sysfs.h | 0 + drivers/net/wireless/{ => broadcom}/b43/tables.c | 0 + drivers/net/wireless/{ => broadcom}/b43/tables.h | 0 + .../net/wireless/{ => broadcom}/b43/tables_lpphy.c | 0 + .../net/wireless/{ => broadcom}/b43/tables_lpphy.h | 0 + .../net/wireless/{ => broadcom}/b43/tables_nphy.c | 0 + .../net/wireless/{ => broadcom}/b43/tables_nphy.h | 0 + .../wireless/{ => broadcom}/b43/tables_phy_ht.c | 0 + .../wireless/{ => broadcom}/b43/tables_phy_ht.h | 0 + .../wireless/{ => broadcom}/b43/tables_phy_lcn.c | 0 + .../wireless/{ => broadcom}/b43/tables_phy_lcn.h | 0 + drivers/net/wireless/{ => broadcom}/b43/wa.c | 0 + drivers/net/wireless/{ => broadcom}/b43/wa.h | 0 + drivers/net/wireless/{ => broadcom}/b43/xmit.c | 0 + drivers/net/wireless/{ => broadcom}/b43/xmit.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/Kconfig | 0 + .../net/wireless/{ => broadcom}/b43legacy/Makefile | 0 + .../wireless/{ => broadcom}/b43legacy/b43legacy.h | 0 + .../wireless/{ => broadcom}/b43legacy/debugfs.c | 0 + .../wireless/{ => broadcom}/b43legacy/debugfs.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/dma.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/dma.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/ilt.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/ilt.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/leds.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/leds.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/main.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/main.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/phy.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/phy.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/pio.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/pio.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/radio.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/radio.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/rfkill.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/rfkill.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/sysfs.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/sysfs.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/xmit.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/xmit.h | 0 + .../net/wireless/{ => broadcom}/brcm80211/Kconfig | 0 + .../net/wireless/{ => broadcom}/brcm80211/Makefile | 0 + .../{ => broadcom}/brcm80211/brcmfmac/Makefile | 4 +- + .../{ => broadcom}/brcm80211/brcmfmac/bcdc.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/bcdc.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/bcmsdh.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/btcoex.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/btcoex.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/bus.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/cfg80211.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/cfg80211.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/chip.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/chip.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/common.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/common.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/commonring.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/commonring.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/core.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/core.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/debug.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/debug.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/feature.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/feature.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/firmware.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/firmware.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/flowring.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/flowring.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/fweh.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/fweh.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/fwil.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/fwil.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/fwil_types.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/fwsignal.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/fwsignal.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/msgbuf.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/msgbuf.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/of.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/of.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/p2p.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/p2p.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/pcie.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/pcie.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/proto.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/proto.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/sdio.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/sdio.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/tracepoint.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/tracepoint.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/usb.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/usb.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/vendor.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/vendor.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/Makefile | 6 +- + .../{ => broadcom}/brcm80211/brcmsmac/aiutils.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/aiutils.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/ampdu.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/ampdu.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/antsel.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/antsel.h | 0 + .../brcm80211/brcmsmac/brcms_trace_brcmsmac.h | 0 + .../brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h | 0 + .../brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h | 0 + .../brcm80211/brcmsmac/brcms_trace_events.c | 0 + .../brcm80211/brcmsmac/brcms_trace_events.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/channel.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/channel.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/d11.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/debug.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/debug.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/dma.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/dma.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/led.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/led.h | 0 + .../brcm80211/brcmsmac/mac80211_if.c | 0 + .../brcm80211/brcmsmac/mac80211_if.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/main.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/main.h | 0 + .../brcm80211/brcmsmac/phy/phy_cmn.c | 0 + .../brcm80211/brcmsmac/phy/phy_hal.h | 0 + .../brcm80211/brcmsmac/phy/phy_int.h | 0 + .../brcm80211/brcmsmac/phy/phy_lcn.c | 0 + .../brcm80211/brcmsmac/phy/phy_lcn.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/phy/phy_n.c | 0 + .../brcm80211/brcmsmac/phy/phy_qmath.c | 0 + .../brcm80211/brcmsmac/phy/phy_qmath.h | 0 + .../brcm80211/brcmsmac/phy/phy_radio.h | 0 + .../brcm80211/brcmsmac/phy/phyreg_n.h | 0 + .../brcm80211/brcmsmac/phy/phytbl_lcn.c | 0 + .../brcm80211/brcmsmac/phy/phytbl_lcn.h | 0 + .../brcm80211/brcmsmac/phy/phytbl_n.c | 0 + .../brcm80211/brcmsmac/phy/phytbl_n.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/phy_shim.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/phy_shim.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/pmu.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/pmu.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/pub.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/rate.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/rate.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/scb.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/stf.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/stf.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/types.h | 0 + .../brcm80211/brcmsmac/ucode_loader.c | 0 + .../brcm80211/brcmsmac/ucode_loader.h | 0 + .../{ => broadcom}/brcm80211/brcmutil/Makefile | 4 +- + .../{ => broadcom}/brcm80211/brcmutil/d11.c | 0 + .../{ => broadcom}/brcm80211/brcmutil/utils.c | 0 + .../{ => broadcom}/brcm80211/include/brcm_hw_ids.h | 0 + .../{ => broadcom}/brcm80211/include/brcmu_d11.h | 0 + .../{ => broadcom}/brcm80211/include/brcmu_utils.h | 0 + .../{ => broadcom}/brcm80211/include/brcmu_wifi.h | 0 + .../{ => broadcom}/brcm80211/include/chipcommon.h | 0 + .../{ => broadcom}/brcm80211/include/defs.h | 0 + .../{ => broadcom}/brcm80211/include/soc.h | 0 + drivers/net/wireless/cisco/Kconfig | 56 ++ + drivers/net/wireless/cisco/Makefile | 2 + + drivers/net/wireless/{ => cisco}/airo.c | 0 + drivers/net/wireless/{ => cisco}/airo.h | 0 + drivers/net/wireless/{ => cisco}/airo_cs.c | 0 + drivers/net/wireless/intel/Kconfig | 18 + + drivers/net/wireless/intel/Makefile | 6 + + drivers/net/wireless/{ => intel}/ipw2x00/Kconfig | 0 + drivers/net/wireless/{ => intel}/ipw2x00/Makefile | 0 + drivers/net/wireless/{ => intel}/ipw2x00/ipw.h | 0 + drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.c | 0 + drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.h | 0 + drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.c | 0 + drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.h | 0 + drivers/net/wireless/{ => intel}/ipw2x00/libipw.h | 0 + .../net/wireless/{ => intel}/ipw2x00/libipw_geo.c | 0 + .../wireless/{ => intel}/ipw2x00/libipw_module.c | 0 + .../net/wireless/{ => intel}/ipw2x00/libipw_rx.c | 0 + .../net/wireless/{ => intel}/ipw2x00/libipw_tx.c | 0 + .../net/wireless/{ => intel}/ipw2x00/libipw_wx.c | 0 + .../net/wireless/{ => intel}/iwlegacy/3945-debug.c | 0 + .../net/wireless/{ => intel}/iwlegacy/3945-mac.c | 0 + .../net/wireless/{ => intel}/iwlegacy/3945-rs.c | 0 + drivers/net/wireless/{ => intel}/iwlegacy/3945.c | 0 + drivers/net/wireless/{ => intel}/iwlegacy/3945.h | 0 + .../net/wireless/{ => intel}/iwlegacy/4965-calib.c | 0 + .../net/wireless/{ => intel}/iwlegacy/4965-debug.c | 0 + .../net/wireless/{ => intel}/iwlegacy/4965-mac.c | 0 + .../net/wireless/{ => intel}/iwlegacy/4965-rs.c | 0 + drivers/net/wireless/{ => intel}/iwlegacy/4965.c | 0 + drivers/net/wireless/{ => intel}/iwlegacy/4965.h | 0 + drivers/net/wireless/{ => intel}/iwlegacy/Kconfig | 0 + drivers/net/wireless/{ => intel}/iwlegacy/Makefile | 0 + .../net/wireless/{ => intel}/iwlegacy/commands.h | 0 + drivers/net/wireless/{ => intel}/iwlegacy/common.c | 0 + drivers/net/wireless/{ => intel}/iwlegacy/common.h | 0 + drivers/net/wireless/{ => intel}/iwlegacy/csr.h | 0 + drivers/net/wireless/{ => intel}/iwlegacy/debug.c | 0 + .../wireless/{ => intel}/iwlegacy/iwl-spectrum.h | 0 + drivers/net/wireless/{ => intel}/iwlegacy/prph.h | 0 + drivers/net/wireless/{ => intel}/iwlwifi/Kconfig | 0 + drivers/net/wireless/{ => intel}/iwlwifi/Makefile | 0 + .../net/wireless/{ => intel}/iwlwifi/dvm/Makefile | 0 + drivers/net/wireless/{ => intel}/iwlwifi/dvm/agn.h | 0 + .../net/wireless/{ => intel}/iwlwifi/dvm/calib.c | 0 + .../net/wireless/{ => intel}/iwlwifi/dvm/calib.h | 0 + .../wireless/{ => intel}/iwlwifi/dvm/commands.h | 0 + .../net/wireless/{ => intel}/iwlwifi/dvm/debugfs.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/dvm/dev.h | 0 + .../net/wireless/{ => intel}/iwlwifi/dvm/devices.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/dvm/led.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/dvm/led.h | 0 + drivers/net/wireless/{ => intel}/iwlwifi/dvm/lib.c | 0 + .../wireless/{ => intel}/iwlwifi/dvm/mac80211.c | 0 + .../net/wireless/{ => intel}/iwlwifi/dvm/main.c | 0 + .../net/wireless/{ => intel}/iwlwifi/dvm/power.c | 0 + .../net/wireless/{ => intel}/iwlwifi/dvm/power.h | 0 + drivers/net/wireless/{ => intel}/iwlwifi/dvm/rs.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/dvm/rs.h | 0 + drivers/net/wireless/{ => intel}/iwlwifi/dvm/rx.c | 0 + .../net/wireless/{ => intel}/iwlwifi/dvm/rxon.c | 0 + .../net/wireless/{ => intel}/iwlwifi/dvm/scan.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/dvm/sta.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/dvm/tt.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/dvm/tt.h | 0 + drivers/net/wireless/{ => intel}/iwlwifi/dvm/tx.c | 0 + .../net/wireless/{ => intel}/iwlwifi/dvm/ucode.c | 0 + .../net/wireless/{ => intel}/iwlwifi/iwl-1000.c | 0 + .../net/wireless/{ => intel}/iwlwifi/iwl-2000.c | 0 + .../net/wireless/{ => intel}/iwlwifi/iwl-5000.c | 0 + .../net/wireless/{ => intel}/iwlwifi/iwl-6000.c | 0 + .../net/wireless/{ => intel}/iwlwifi/iwl-7000.c | 0 + .../net/wireless/{ => intel}/iwlwifi/iwl-8000.c | 0 + .../net/wireless/{ => intel}/iwlwifi/iwl-agn-hw.h | 0 + .../net/wireless/{ => intel}/iwlwifi/iwl-config.h | 0 + drivers/net/wireless/{ => intel}/iwlwifi/iwl-csr.h | 0 + .../net/wireless/{ => intel}/iwlwifi/iwl-debug.c | 0 + .../net/wireless/{ => intel}/iwlwifi/iwl-debug.h | 0 + .../{ => intel}/iwlwifi/iwl-devtrace-data.h | 0 + .../wireless/{ => intel}/iwlwifi/iwl-devtrace-io.h | 0 + .../{ => intel}/iwlwifi/iwl-devtrace-iwlwifi.h | 0 + .../{ => intel}/iwlwifi/iwl-devtrace-msg.h | 0 + .../{ => intel}/iwlwifi/iwl-devtrace-ucode.h | 0 + .../wireless/{ => intel}/iwlwifi/iwl-devtrace.c | 0 + .../wireless/{ => intel}/iwlwifi/iwl-devtrace.h | 0 + drivers/net/wireless/{ => intel}/iwlwifi/iwl-drv.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/iwl-drv.h | 0 + .../{ => intel}/iwlwifi/iwl-eeprom-parse.c | 0 + .../{ => intel}/iwlwifi/iwl-eeprom-parse.h | 0 + .../wireless/{ => intel}/iwlwifi/iwl-eeprom-read.c | 0 + .../wireless/{ => intel}/iwlwifi/iwl-eeprom-read.h | 0 + drivers/net/wireless/{ => intel}/iwlwifi/iwl-fh.h | 0 + .../{ => intel}/iwlwifi/iwl-fw-error-dump.h | 0 + .../net/wireless/{ => intel}/iwlwifi/iwl-fw-file.h | 0 + drivers/net/wireless/{ => intel}/iwlwifi/iwl-fw.h | 0 + drivers/net/wireless/{ => intel}/iwlwifi/iwl-io.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/iwl-io.h | 0 + .../wireless/{ => intel}/iwlwifi/iwl-modparams.h | 0 + .../wireless/{ => intel}/iwlwifi/iwl-notif-wait.c | 0 + .../wireless/{ => intel}/iwlwifi/iwl-notif-wait.h | 0 + .../wireless/{ => intel}/iwlwifi/iwl-nvm-parse.c | 0 + .../wireless/{ => intel}/iwlwifi/iwl-nvm-parse.h | 0 + .../net/wireless/{ => intel}/iwlwifi/iwl-op-mode.h | 0 + .../net/wireless/{ => intel}/iwlwifi/iwl-phy-db.c | 0 + .../net/wireless/{ => intel}/iwlwifi/iwl-phy-db.h | 0 + .../net/wireless/{ => intel}/iwlwifi/iwl-prph.h | 0 + drivers/net/wireless/{ => intel}/iwlwifi/iwl-scd.h | 0 + .../net/wireless/{ => intel}/iwlwifi/iwl-trans.c | 0 + .../net/wireless/{ => intel}/iwlwifi/iwl-trans.h | 0 + .../net/wireless/{ => intel}/iwlwifi/mvm/Makefile | 0 + .../net/wireless/{ => intel}/iwlwifi/mvm/binding.c | 0 + .../net/wireless/{ => intel}/iwlwifi/mvm/coex.c | 0 + .../wireless/{ => intel}/iwlwifi/mvm/coex_legacy.c | 0 + .../wireless/{ => intel}/iwlwifi/mvm/constants.h | 0 + drivers/net/wireless/{ => intel}/iwlwifi/mvm/d3.c | 0 + .../wireless/{ => intel}/iwlwifi/mvm/debugfs-vif.c | 0 + .../net/wireless/{ => intel}/iwlwifi/mvm/debugfs.c | 0 + .../net/wireless/{ => intel}/iwlwifi/mvm/debugfs.h | 0 + .../wireless/{ => intel}/iwlwifi/mvm/fw-api-coex.h | 0 + .../wireless/{ => intel}/iwlwifi/mvm/fw-api-d3.h | 0 + .../wireless/{ => intel}/iwlwifi/mvm/fw-api-mac.h | 0 + .../{ => intel}/iwlwifi/mvm/fw-api-power.h | 0 + .../wireless/{ => intel}/iwlwifi/mvm/fw-api-rs.h | 0 + .../wireless/{ => intel}/iwlwifi/mvm/fw-api-rx.h | 0 + .../wireless/{ => intel}/iwlwifi/mvm/fw-api-scan.h | 0 + .../wireless/{ => intel}/iwlwifi/mvm/fw-api-sta.h | 0 + .../{ => intel}/iwlwifi/mvm/fw-api-stats.h | 0 + .../wireless/{ => intel}/iwlwifi/mvm/fw-api-tof.h | 0 + .../wireless/{ => intel}/iwlwifi/mvm/fw-api-tx.h | 0 + .../net/wireless/{ => intel}/iwlwifi/mvm/fw-api.h | 0 + drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/mvm/led.c | 0 + .../wireless/{ => intel}/iwlwifi/mvm/mac-ctxt.c | 0 + .../wireless/{ => intel}/iwlwifi/mvm/mac80211.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/mvm/mvm.h | 0 + drivers/net/wireless/{ => intel}/iwlwifi/mvm/nvm.c | 0 + .../wireless/{ => intel}/iwlwifi/mvm/offloading.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/mvm/ops.c | 0 + .../wireless/{ => intel}/iwlwifi/mvm/phy-ctxt.c | 0 + .../net/wireless/{ => intel}/iwlwifi/mvm/power.c | 0 + .../net/wireless/{ => intel}/iwlwifi/mvm/quota.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/mvm/rs.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/mvm/rs.h | 0 + drivers/net/wireless/{ => intel}/iwlwifi/mvm/rx.c | 0 + .../net/wireless/{ => intel}/iwlwifi/mvm/scan.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/mvm/sf.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/mvm/sta.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/mvm/sta.h | 0 + .../net/wireless/{ => intel}/iwlwifi/mvm/tdls.c | 0 + .../wireless/{ => intel}/iwlwifi/mvm/testmode.h | 0 + .../wireless/{ => intel}/iwlwifi/mvm/time-event.c | 0 + .../wireless/{ => intel}/iwlwifi/mvm/time-event.h | 0 + drivers/net/wireless/{ => intel}/iwlwifi/mvm/tof.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/mvm/tof.h | 0 + drivers/net/wireless/{ => intel}/iwlwifi/mvm/tt.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/mvm/tx.c | 0 + .../net/wireless/{ => intel}/iwlwifi/mvm/utils.c | 0 + .../net/wireless/{ => intel}/iwlwifi/pcie/drv.c | 0 + .../wireless/{ => intel}/iwlwifi/pcie/internal.h | 0 + drivers/net/wireless/{ => intel}/iwlwifi/pcie/rx.c | 0 + .../net/wireless/{ => intel}/iwlwifi/pcie/trans.c | 0 + drivers/net/wireless/{ => intel}/iwlwifi/pcie/tx.c | 0 + drivers/net/wireless/intersil/Kconfig | 38 + + drivers/net/wireless/intersil/Makefile | 4 + + drivers/net/wireless/{ => intersil}/hostap/Kconfig | 0 + .../net/wireless/{ => intersil}/hostap/Makefile | 0 + .../net/wireless/{ => intersil}/hostap/hostap.h | 0 + .../wireless/{ => intersil}/hostap/hostap_80211.h | 0 + .../{ => intersil}/hostap/hostap_80211_rx.c | 0 + .../{ => intersil}/hostap/hostap_80211_tx.c | 0 + .../net/wireless/{ => intersil}/hostap/hostap_ap.c | 0 + .../net/wireless/{ => intersil}/hostap/hostap_ap.h | 0 + .../wireless/{ => intersil}/hostap/hostap_common.h | 0 + .../wireless/{ => intersil}/hostap/hostap_config.h | 0 + .../net/wireless/{ => intersil}/hostap/hostap_cs.c | 0 + .../{ => intersil}/hostap/hostap_download.c | 0 + .../net/wireless/{ => intersil}/hostap/hostap_hw.c | 0 + .../wireless/{ => intersil}/hostap/hostap_info.c | 0 + .../wireless/{ => intersil}/hostap/hostap_ioctl.c | 0 + .../wireless/{ => intersil}/hostap/hostap_main.c | 0 + .../wireless/{ => intersil}/hostap/hostap_pci.c | 0 + .../wireless/{ => intersil}/hostap/hostap_plx.c | 0 + .../wireless/{ => intersil}/hostap/hostap_proc.c | 0 + .../wireless/{ => intersil}/hostap/hostap_wlan.h | 0 + .../net/wireless/{ => intersil}/orinoco/Kconfig | 0 + .../net/wireless/{ => intersil}/orinoco/Makefile | 0 + .../net/wireless/{ => intersil}/orinoco/airport.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/cfg.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/cfg.h | 0 + drivers/net/wireless/{ => intersil}/orinoco/fw.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/fw.h | 0 + .../net/wireless/{ => intersil}/orinoco/hermes.c | 0 + .../net/wireless/{ => intersil}/orinoco/hermes.h | 0 + .../wireless/{ => intersil}/orinoco/hermes_dld.c | 0 + .../wireless/{ => intersil}/orinoco/hermes_dld.h | 0 + .../wireless/{ => intersil}/orinoco/hermes_rid.h | 0 + drivers/net/wireless/{ => intersil}/orinoco/hw.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/hw.h | 0 + drivers/net/wireless/{ => intersil}/orinoco/main.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/main.h | 0 + drivers/net/wireless/{ => intersil}/orinoco/mic.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/mic.h | 0 + .../net/wireless/{ => intersil}/orinoco/orinoco.h | 0 + .../wireless/{ => intersil}/orinoco/orinoco_cs.c | 0 + .../{ => intersil}/orinoco/orinoco_nortel.c | 0 + .../wireless/{ => intersil}/orinoco/orinoco_pci.c | 0 + .../wireless/{ => intersil}/orinoco/orinoco_pci.h | 0 + .../wireless/{ => intersil}/orinoco/orinoco_plx.c | 0 + .../wireless/{ => intersil}/orinoco/orinoco_tmd.c | 0 + .../wireless/{ => intersil}/orinoco/orinoco_usb.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/scan.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/scan.h | 0 + .../wireless/{ => intersil}/orinoco/spectrum_cs.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/wext.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/wext.h | 0 + drivers/net/wireless/{ => intersil}/p54/Kconfig | 0 + drivers/net/wireless/{ => intersil}/p54/Makefile | 0 + drivers/net/wireless/{ => intersil}/p54/eeprom.c | 0 + drivers/net/wireless/{ => intersil}/p54/eeprom.h | 0 + drivers/net/wireless/{ => intersil}/p54/fwio.c | 0 + drivers/net/wireless/{ => intersil}/p54/led.c | 0 + drivers/net/wireless/{ => intersil}/p54/lmac.h | 0 + drivers/net/wireless/{ => intersil}/p54/main.c | 0 + drivers/net/wireless/{ => intersil}/p54/p54.h | 0 + drivers/net/wireless/{ => intersil}/p54/p54pci.c | 0 + drivers/net/wireless/{ => intersil}/p54/p54pci.h | 0 + drivers/net/wireless/{ => intersil}/p54/p54spi.c | 0 + drivers/net/wireless/{ => intersil}/p54/p54spi.h | 0 + .../wireless/{ => intersil}/p54/p54spi_eeprom.h | 0 + drivers/net/wireless/{ => intersil}/p54/p54usb.c | 0 + drivers/net/wireless/{ => intersil}/p54/p54usb.h | 0 + drivers/net/wireless/{ => intersil}/p54/txrx.c | 0 + .../net/wireless/{ => intersil}/prism54/Makefile | 0 + .../net/wireless/{ => intersil}/prism54/isl_38xx.c | 0 + .../net/wireless/{ => intersil}/prism54/isl_38xx.h | 0 + .../wireless/{ => intersil}/prism54/isl_ioctl.c | 0 + .../wireless/{ => intersil}/prism54/isl_ioctl.h | 0 + .../net/wireless/{ => intersil}/prism54/isl_oid.h | 0 + .../wireless/{ => intersil}/prism54/islpci_dev.c | 0 + .../wireless/{ => intersil}/prism54/islpci_dev.h | 0 + .../wireless/{ => intersil}/prism54/islpci_eth.c | 0 + .../wireless/{ => intersil}/prism54/islpci_eth.h | 0 + .../{ => intersil}/prism54/islpci_hotplug.c | 0 + .../wireless/{ => intersil}/prism54/islpci_mgt.c | 0 + .../wireless/{ => intersil}/prism54/islpci_mgt.h | 0 + .../net/wireless/{ => intersil}/prism54/oid_mgt.c | 0 + .../net/wireless/{ => intersil}/prism54/oid_mgt.h | 0 + .../wireless/{ => intersil}/prism54/prismcompat.h | 0 + drivers/net/wireless/marvell/Kconfig | 27 + + drivers/net/wireless/marvell/Makefile | 6 + + .../net/wireless/{ => marvell}/libertas/Kconfig | 0 + .../net/wireless/{ => marvell}/libertas/LICENSE | 0 + .../net/wireless/{ => marvell}/libertas/Makefile | 0 + drivers/net/wireless/{ => marvell}/libertas/README | 0 + drivers/net/wireless/{ => marvell}/libertas/cfg.c | 0 + drivers/net/wireless/{ => marvell}/libertas/cfg.h | 0 + drivers/net/wireless/{ => marvell}/libertas/cmd.c | 0 + drivers/net/wireless/{ => marvell}/libertas/cmd.h | 0 + .../net/wireless/{ => marvell}/libertas/cmdresp.c | 0 + .../net/wireless/{ => marvell}/libertas/debugfs.c | 0 + .../net/wireless/{ => marvell}/libertas/debugfs.h | 0 + drivers/net/wireless/{ => marvell}/libertas/decl.h | 0 + drivers/net/wireless/{ => marvell}/libertas/defs.h | 0 + drivers/net/wireless/{ => marvell}/libertas/dev.h | 0 + .../net/wireless/{ => marvell}/libertas/ethtool.c | 0 + .../net/wireless/{ => marvell}/libertas/firmware.c | 0 + drivers/net/wireless/{ => marvell}/libertas/host.h | 0 + .../net/wireless/{ => marvell}/libertas/if_cs.c | 0 + .../net/wireless/{ => marvell}/libertas/if_sdio.c | 0 + .../net/wireless/{ => marvell}/libertas/if_sdio.h | 0 + .../net/wireless/{ => marvell}/libertas/if_spi.c | 0 + .../net/wireless/{ => marvell}/libertas/if_spi.h | 0 + .../net/wireless/{ => marvell}/libertas/if_usb.c | 0 + .../net/wireless/{ => marvell}/libertas/if_usb.h | 0 + drivers/net/wireless/{ => marvell}/libertas/main.c | 0 + drivers/net/wireless/{ => marvell}/libertas/mesh.c | 0 + drivers/net/wireless/{ => marvell}/libertas/mesh.h | 0 + .../net/wireless/{ => marvell}/libertas/radiotap.h | 0 + drivers/net/wireless/{ => marvell}/libertas/rx.c | 0 + drivers/net/wireless/{ => marvell}/libertas/tx.c | 0 + .../net/wireless/{ => marvell}/libertas/types.h | 0 + drivers/net/wireless/marvell/libertas_tf/Kconfig | 18 + + .../wireless/{ => marvell}/libertas_tf/Makefile | 0 + .../net/wireless/{ => marvell}/libertas_tf/cmd.c | 0 + .../wireless/{ => marvell}/libertas_tf/deb_defs.h | 0 + .../wireless/{ => marvell}/libertas_tf/if_usb.c | 0 + .../wireless/{ => marvell}/libertas_tf/if_usb.h | 0 + .../{ => marvell}/libertas_tf/libertas_tf.h | 0 + .../net/wireless/{ => marvell}/libertas_tf/main.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/11ac.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/11ac.h | 0 + drivers/net/wireless/{ => marvell}/mwifiex/11h.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/11n.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/11n.h | 0 + .../net/wireless/{ => marvell}/mwifiex/11n_aggr.c | 0 + .../net/wireless/{ => marvell}/mwifiex/11n_aggr.h | 0 + .../wireless/{ => marvell}/mwifiex/11n_rxreorder.c | 0 + .../wireless/{ => marvell}/mwifiex/11n_rxreorder.h | 0 + drivers/net/wireless/{ => marvell}/mwifiex/Kconfig | 0 + .../net/wireless/{ => marvell}/mwifiex/Makefile | 0 + drivers/net/wireless/{ => marvell}/mwifiex/README | 0 + .../net/wireless/{ => marvell}/mwifiex/cfg80211.c | 0 + .../net/wireless/{ => marvell}/mwifiex/cfg80211.h | 0 + drivers/net/wireless/{ => marvell}/mwifiex/cfp.c | 0 + .../net/wireless/{ => marvell}/mwifiex/cmdevt.c | 0 + .../net/wireless/{ => marvell}/mwifiex/debugfs.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/decl.h | 0 + .../net/wireless/{ => marvell}/mwifiex/ethtool.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/fw.h | 0 + drivers/net/wireless/{ => marvell}/mwifiex/ie.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/init.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/ioctl.h | 0 + drivers/net/wireless/{ => marvell}/mwifiex/join.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/main.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/main.h | 0 + drivers/net/wireless/{ => marvell}/mwifiex/pcie.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/pcie.h | 0 + drivers/net/wireless/{ => marvell}/mwifiex/scan.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/sdio.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/sdio.h | 0 + .../net/wireless/{ => marvell}/mwifiex/sta_cmd.c | 0 + .../wireless/{ => marvell}/mwifiex/sta_cmdresp.c | 0 + .../net/wireless/{ => marvell}/mwifiex/sta_event.c | 0 + .../net/wireless/{ => marvell}/mwifiex/sta_ioctl.c | 0 + .../net/wireless/{ => marvell}/mwifiex/sta_rx.c | 0 + .../net/wireless/{ => marvell}/mwifiex/sta_tx.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/tdls.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/txrx.c | 0 + .../net/wireless/{ => marvell}/mwifiex/uap_cmd.c | 0 + .../net/wireless/{ => marvell}/mwifiex/uap_event.c | 0 + .../net/wireless/{ => marvell}/mwifiex/uap_txrx.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/usb.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/usb.h | 0 + drivers/net/wireless/{ => marvell}/mwifiex/util.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/util.h | 0 + drivers/net/wireless/{ => marvell}/mwifiex/wmm.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/wmm.h | 0 + drivers/net/wireless/{ => marvell}/mwl8k.c | 0 + drivers/net/wireless/mediatek/Kconfig | 16 +- + drivers/net/wireless/ralink/Kconfig | 16 + + drivers/net/wireless/ralink/Makefile | 1 + + drivers/net/wireless/{ => ralink}/rt2x00/Kconfig | 0 + drivers/net/wireless/{ => ralink}/rt2x00/Makefile | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2400pci.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2400pci.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2500pci.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2500pci.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2500usb.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2500usb.h | 0 + drivers/net/wireless/{ => ralink}/rt2x00/rt2800.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2800lib.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2800lib.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2800mmio.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2800mmio.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2800pci.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2800pci.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2800soc.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2800usb.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2800usb.h | 0 + drivers/net/wireless/{ => ralink}/rt2x00/rt2x00.h | 0 + .../wireless/{ => ralink}/rt2x00/rt2x00config.c | 0 + .../wireless/{ => ralink}/rt2x00/rt2x00crypto.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00debug.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00debug.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00dev.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00dump.h | 0 + .../wireless/{ => ralink}/rt2x00/rt2x00firmware.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00leds.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00leds.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00lib.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00link.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00mac.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00mmio.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00mmio.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00pci.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00pci.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00queue.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00queue.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00reg.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00soc.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00soc.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00usb.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00usb.h | 0 + drivers/net/wireless/{ => ralink}/rt2x00/rt61pci.c | 0 + drivers/net/wireless/{ => ralink}/rt2x00/rt61pci.h | 0 + drivers/net/wireless/{ => ralink}/rt2x00/rt73usb.c | 0 + drivers/net/wireless/{ => ralink}/rt2x00/rt73usb.h | 0 + drivers/net/wireless/realtek/Kconfig | 18 + + drivers/net/wireless/rsi/Kconfig | 15 + + drivers/net/wireless/st/Kconfig | 16 + + drivers/net/wireless/st/Makefile | 1 + + drivers/net/wireless/{ => st}/cw1200/Kconfig | 0 + drivers/net/wireless/{ => st}/cw1200/Makefile | 0 + drivers/net/wireless/{ => st}/cw1200/bh.c | 0 + drivers/net/wireless/{ => st}/cw1200/bh.h | 0 + drivers/net/wireless/{ => st}/cw1200/cw1200.h | 0 + drivers/net/wireless/{ => st}/cw1200/cw1200_sdio.c | 0 + drivers/net/wireless/{ => st}/cw1200/cw1200_spi.c | 0 + drivers/net/wireless/{ => st}/cw1200/debug.c | 0 + drivers/net/wireless/{ => st}/cw1200/debug.h | 0 + drivers/net/wireless/{ => st}/cw1200/fwio.c | 0 + drivers/net/wireless/{ => st}/cw1200/fwio.h | 0 + drivers/net/wireless/{ => st}/cw1200/hwbus.h | 0 + drivers/net/wireless/{ => st}/cw1200/hwio.c | 0 + drivers/net/wireless/{ => st}/cw1200/hwio.h | 0 + drivers/net/wireless/{ => st}/cw1200/main.c | 0 + drivers/net/wireless/{ => st}/cw1200/pm.c | 0 + drivers/net/wireless/{ => st}/cw1200/pm.h | 0 + drivers/net/wireless/{ => st}/cw1200/queue.c | 0 + drivers/net/wireless/{ => st}/cw1200/queue.h | 0 + drivers/net/wireless/{ => st}/cw1200/scan.c | 0 + drivers/net/wireless/{ => st}/cw1200/scan.h | 0 + drivers/net/wireless/{ => st}/cw1200/sta.c | 0 + drivers/net/wireless/{ => st}/cw1200/sta.h | 0 + drivers/net/wireless/{ => st}/cw1200/txrx.c | 0 + drivers/net/wireless/{ => st}/cw1200/txrx.h | 0 + drivers/net/wireless/{ => st}/cw1200/wsm.c | 0 + drivers/net/wireless/{ => st}/cw1200/wsm.h | 0 + drivers/net/wireless/ti/Kconfig | 18 +- + drivers/net/wireless/ti/wl1251/Kconfig | 2 +- + drivers/net/wireless/ti/wlcore/Kconfig | 2 +- + drivers/net/wireless/zydas/Kconfig | 35 + + drivers/net/wireless/zydas/Makefile | 3 + + drivers/net/wireless/{ => zydas}/zd1201.c | 0 + drivers/net/wireless/{ => zydas}/zd1201.h | 0 + drivers/net/wireless/{ => zydas}/zd1211rw/Kconfig | 0 + drivers/net/wireless/{ => zydas}/zd1211rw/Makefile | 0 + .../net/wireless/{ => zydas}/zd1211rw/zd_chip.c | 0 + .../net/wireless/{ => zydas}/zd1211rw/zd_chip.h | 0 + drivers/net/wireless/{ => zydas}/zd1211rw/zd_def.h | 0 + drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.c | 0 + drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.h | 0 + drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.c | 0 + drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.h | 0 + .../wireless/{ => zydas}/zd1211rw/zd_rf_al2230.c | 0 + .../wireless/{ => zydas}/zd1211rw/zd_rf_al7230b.c | 0 + .../wireless/{ => zydas}/zd1211rw/zd_rf_rf2959.c | 0 + .../wireless/{ => zydas}/zd1211rw/zd_rf_uw2453.c | 0 + drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.c | 0 + drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.h | 0 + include/linux/brcmphy.h | 1 + + include/linux/hashtable.h | 4 + + include/linux/if_pppox.h | 1 - + include/linux/mroute.h | 76 +- + include/linux/netdevice.h | 44 +- + include/linux/pim.h | 5 + + include/linux/qed/qed_if.h | 17 + + include/linux/skbuff.h | 3 - + include/linux/wait.h | 21 + + include/net/bluetooth/bluetooth.h | 25 +- + include/net/bluetooth/hci.h | 3 +- + include/net/bluetooth/hci_core.h | 13 +- + include/net/bluetooth/hci_mon.h | 2 + + include/net/bluetooth/hci_sock.h | 1 + + include/net/bluetooth/mgmt.h | 13 + + include/net/busy_poll.h | 45 +- + include/net/dsa.h | 8 + + include/net/sock.h | 15 +- + include/trace/events/fib6.h | 76 ++ + include/uapi/linux/mroute.h | 59 +- + kernel/bpf/syscall.c | 22 +- + lib/Kconfig.debug | 23 + + lib/Makefile | 1 + + lib/netdev-notifier-error-inject.c | 54 ++ + lib/test_rhashtable.c | 76 +- + net/atm/common.c | 4 +- + net/atm/mpc.h | 4 +- + net/atm/mpoa_caches.c | 4 +- + net/bluetooth/af_bluetooth.c | 12 +- + net/bluetooth/cmtp/core.c | 3 +- + net/bluetooth/hci_conn.c | 103 +-- + net/bluetooth/hci_core.c | 576 ++++---------- + net/bluetooth/hci_request.c | 682 +++++++++++++++- + net/bluetooth/hci_request.h | 25 +- + net/bluetooth/hci_sock.c | 200 ++++- + net/bluetooth/l2cap_core.c | 19 +- + net/bluetooth/mgmt.c | 616 +++++--------- + net/core/dev.c | 120 ++- + net/core/net-traces.c | 4 + + net/core/sock.c | 8 +- + net/core/stream.c | 2 +- + net/dccp/output.c | 2 +- + net/dsa/dsa.c | 18 + + net/ipv4/ip_gre.c | 1 - + net/ipv4/ip_output.c | 1 - + net/ipv4/ip_tunnel.c | 1 - + net/ipv4/ip_tunnel_core.c | 1 - + net/ipv4/ip_vti.c | 1 - + net/ipv4/ipconfig.c | 62 +- + net/ipv4/ipip.c | 1 - + net/ipv4/ipmr.c | 741 +++++++++-------- + net/ipv4/netfilter/arp_tables.c | 6 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 +- + net/ipv4/netfilter/nf_nat_snmp_basic.c | 22 +- + net/ipv6/ip6_gre.c | 1 - + net/ipv6/route.c | 10 + + net/iucv/af_iucv.c | 2 +- + net/mac802154/rx.c | 3 +- + net/rxrpc/af_rxrpc.c | 2 +- + net/sctp/socket.c | 2 +- + net/tipc/bcast.c | 126 +-- + net/tipc/bcast.h | 1 + + net/tipc/bearer.c | 140 ++-- + net/tipc/bearer.h | 8 +- + net/tipc/core.h | 5 + + net/tipc/discover.c | 38 +- + net/tipc/link.c | 626 +++++++-------- + net/tipc/link.h | 175 +--- + net/tipc/name_distr.c | 68 +- + net/tipc/name_distr.h | 1 - + net/tipc/name_table.c | 5 +- + net/tipc/netlink.c | 8 +- + net/tipc/netlink_compat.c | 8 +- + net/tipc/node.c | 884 ++++++++++++++++----- + net/tipc/node.h | 127 +-- + net/tipc/socket.c | 4 +- + net/tipc/udp_media.c | 5 - + net/unix/af_unix.c | 8 +- + net/vmw_vsock/vmci_transport.h | 2 +- + net/vmw_vsock/vmci_transport_notify.c | 2 +- + net/vmw_vsock/vmci_transport_notify.h | 5 +- + net/vmw_vsock/vmci_transport_notify_qstate.c | 2 +- + 884 files changed, 6402 insertions(+), 7602 deletions(-) + delete mode 100644 drivers/isdn/sc/Kconfig + delete mode 100644 drivers/isdn/sc/Makefile + delete mode 100644 drivers/isdn/sc/card.h + delete mode 100644 drivers/isdn/sc/command.c + delete mode 100644 drivers/isdn/sc/event.c + delete mode 100644 drivers/isdn/sc/hardware.h + delete mode 100644 drivers/isdn/sc/includes.h + delete mode 100644 drivers/isdn/sc/init.c + delete mode 100644 drivers/isdn/sc/interrupt.c + delete mode 100644 drivers/isdn/sc/ioctl.c + delete mode 100644 drivers/isdn/sc/message.c + delete mode 100644 drivers/isdn/sc/message.h + delete mode 100644 drivers/isdn/sc/packet.c + delete mode 100644 drivers/isdn/sc/scioc.h + delete mode 100644 drivers/isdn/sc/shmem.c + delete mode 100644 drivers/isdn/sc/timer.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c + create mode 100644 drivers/net/wireless/admtek/Kconfig + create mode 100644 drivers/net/wireless/admtek/Makefile + rename drivers/net/wireless/{ => admtek}/adm8211.c (100%) + rename drivers/net/wireless/{ => admtek}/adm8211.h (100%) + create mode 100644 drivers/net/wireless/atmel/Kconfig + create mode 100644 drivers/net/wireless/atmel/Makefile + rename drivers/net/wireless/{ => atmel}/at76c50x-usb.c (100%) + rename drivers/net/wireless/{ => atmel}/at76c50x-usb.h (100%) + rename drivers/net/wireless/{ => atmel}/atmel.c (100%) + rename drivers/net/wireless/{ => atmel}/atmel.h (100%) + rename drivers/net/wireless/{ => atmel}/atmel_cs.c (100%) + rename drivers/net/wireless/{ => atmel}/atmel_pci.c (100%) + create mode 100644 drivers/net/wireless/broadcom/Kconfig + create mode 100644 drivers/net/wireless/broadcom/Makefile + rename drivers/net/wireless/{ => broadcom}/b43/Kconfig (100%) + rename drivers/net/wireless/{ => broadcom}/b43/Makefile (100%) + rename drivers/net/wireless/{ => broadcom}/b43/b43.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/bus.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/bus.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/debugfs.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/debugfs.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/dma.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/dma.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/leds.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/leds.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/lo.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/lo.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/main.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/main.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_a.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_a.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_ac.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_ac.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_common.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_common.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_g.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_g.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_ht.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_ht.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_lcn.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_lcn.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_lp.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_lp.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_n.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_n.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/pio.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/pio.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/ppr.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/ppr.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/radio_2055.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/radio_2055.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/radio_2056.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/radio_2056.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/radio_2057.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/radio_2057.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/radio_2059.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/radio_2059.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/rfkill.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/rfkill.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/sdio.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/sdio.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/sysfs.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/sysfs.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables_lpphy.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables_lpphy.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables_nphy.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables_nphy.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables_phy_ht.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables_phy_ht.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables_phy_lcn.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables_phy_lcn.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/wa.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/wa.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/xmit.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/xmit.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/Kconfig (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/Makefile (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/b43legacy.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/debugfs.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/debugfs.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/dma.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/dma.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/ilt.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/ilt.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/leds.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/leds.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/main.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/main.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/phy.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/phy.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/pio.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/pio.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/radio.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/radio.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/rfkill.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/rfkill.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/sysfs.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/sysfs.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/xmit.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/xmit.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/Kconfig (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/Makefile (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/Makefile (93%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/bcdc.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/bcdc.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/bcmsdh.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/btcoex.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/btcoex.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/bus.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/cfg80211.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/cfg80211.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/chip.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/chip.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/common.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/common.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/commonring.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/commonring.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/core.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/core.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/debug.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/debug.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/feature.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/feature.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/firmware.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/firmware.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/flowring.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/flowring.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fweh.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fweh.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwil.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwil.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwil_types.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwsignal.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwsignal.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/msgbuf.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/msgbuf.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/of.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/of.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/p2p.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/p2p.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/pcie.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/pcie.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/proto.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/proto.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/sdio.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/sdio.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/tracepoint.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/tracepoint.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/usb.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/usb.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/vendor.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/vendor.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/Makefile (88%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/aiutils.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/aiutils.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/ampdu.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/ampdu.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/antsel.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/antsel.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_brcmsmac.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_events.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_events.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/channel.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/channel.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/d11.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/debug.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/debug.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/dma.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/dma.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/led.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/led.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/mac80211_if.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/mac80211_if.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/main.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/main.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_cmn.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_hal.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_int.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_lcn.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_lcn.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_n.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_qmath.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_qmath.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_radio.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phyreg_n.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_lcn.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_lcn.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_n.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_n.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy_shim.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy_shim.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/pmu.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/pmu.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/pub.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/rate.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/rate.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/scb.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/stf.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/stf.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/types.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/ucode_loader.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/ucode_loader.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmutil/Makefile (89%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmutil/d11.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmutil/utils.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/include/brcm_hw_ids.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/include/brcmu_d11.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/include/brcmu_utils.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/include/brcmu_wifi.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/include/chipcommon.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/include/defs.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/include/soc.h (100%) + create mode 100644 drivers/net/wireless/cisco/Kconfig + create mode 100644 drivers/net/wireless/cisco/Makefile + rename drivers/net/wireless/{ => cisco}/airo.c (100%) + rename drivers/net/wireless/{ => cisco}/airo.h (100%) + rename drivers/net/wireless/{ => cisco}/airo_cs.c (100%) + create mode 100644 drivers/net/wireless/intel/Kconfig + create mode 100644 drivers/net/wireless/intel/Makefile + rename drivers/net/wireless/{ => intel}/ipw2x00/Kconfig (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/Makefile (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/ipw.h (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.c (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.h (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.c (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.h (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/libipw.h (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_geo.c (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_module.c (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_rx.c (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_tx.c (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_wx.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/3945-debug.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/3945-mac.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/3945-rs.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/3945.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/3945.h (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/4965-calib.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/4965-debug.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/4965-mac.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/4965-rs.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/4965.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/4965.h (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/Kconfig (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/Makefile (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/commands.h (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/common.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/common.h (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/csr.h (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/debug.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/iwl-spectrum.h (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/prph.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/Kconfig (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/Makefile (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/Makefile (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/agn.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/calib.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/calib.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/commands.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/debugfs.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/dev.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/devices.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/led.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/led.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/lib.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/mac80211.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/main.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/power.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/power.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/rs.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/rs.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/rx.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/rxon.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/scan.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/sta.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/tt.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/tt.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/tx.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/ucode.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-1000.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-2000.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-5000.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-6000.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-7000.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-8000.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-agn-hw.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-config.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-csr.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-debug.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-debug.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-data.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-io.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-iwlwifi.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-msg.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-ucode.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-drv.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-drv.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-parse.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-parse.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-read.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-read.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-fh.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-fw-error-dump.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-fw-file.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-fw.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-io.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-io.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-modparams.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-notif-wait.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-notif-wait.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-nvm-parse.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-nvm-parse.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-op-mode.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-phy-db.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-phy-db.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-prph.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-scd.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-trans.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-trans.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/Makefile (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/binding.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/coex.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/coex_legacy.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/constants.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/d3.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/debugfs-vif.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/debugfs.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/debugfs.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-coex.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-d3.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-mac.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-power.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-rs.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-rx.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-scan.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-sta.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-stats.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-tof.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-tx.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/led.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/mac-ctxt.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/mac80211.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/mvm.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/nvm.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/offloading.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/ops.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/phy-ctxt.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/power.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/quota.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/rs.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/rs.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/rx.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/scan.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/sf.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/sta.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/sta.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tdls.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/testmode.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/time-event.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/time-event.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tof.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tof.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tt.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tx.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/utils.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/drv.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/internal.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/rx.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/trans.c (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/tx.c (100%) + create mode 100644 drivers/net/wireless/intersil/Kconfig + create mode 100644 drivers/net/wireless/intersil/Makefile + rename drivers/net/wireless/{ => intersil}/hostap/Kconfig (100%) + rename drivers/net/wireless/{ => intersil}/hostap/Makefile (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap.h (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_80211.h (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_80211_rx.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_80211_tx.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_ap.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_ap.h (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_common.h (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_config.h (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_cs.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_download.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_hw.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_info.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_ioctl.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_main.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_pci.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_plx.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_proc.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_wlan.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/Kconfig (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/Makefile (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/airport.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/cfg.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/cfg.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/fw.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/fw.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/hermes.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/hermes.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/hermes_dld.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/hermes_dld.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/hermes_rid.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/hw.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/hw.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/main.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/main.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/mic.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/mic.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/orinoco.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_cs.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_nortel.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_pci.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_pci.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_plx.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_tmd.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_usb.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/scan.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/scan.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/spectrum_cs.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/wext.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/wext.h (100%) + rename drivers/net/wireless/{ => intersil}/p54/Kconfig (100%) + rename drivers/net/wireless/{ => intersil}/p54/Makefile (100%) + rename drivers/net/wireless/{ => intersil}/p54/eeprom.c (100%) + rename drivers/net/wireless/{ => intersil}/p54/eeprom.h (100%) + rename drivers/net/wireless/{ => intersil}/p54/fwio.c (100%) + rename drivers/net/wireless/{ => intersil}/p54/led.c (100%) + rename drivers/net/wireless/{ => intersil}/p54/lmac.h (100%) + rename drivers/net/wireless/{ => intersil}/p54/main.c (100%) + rename drivers/net/wireless/{ => intersil}/p54/p54.h (100%) + rename drivers/net/wireless/{ => intersil}/p54/p54pci.c (100%) + rename drivers/net/wireless/{ => intersil}/p54/p54pci.h (100%) + rename drivers/net/wireless/{ => intersil}/p54/p54spi.c (100%) + rename drivers/net/wireless/{ => intersil}/p54/p54spi.h (100%) + rename drivers/net/wireless/{ => intersil}/p54/p54spi_eeprom.h (100%) + rename drivers/net/wireless/{ => intersil}/p54/p54usb.c (100%) + rename drivers/net/wireless/{ => intersil}/p54/p54usb.h (100%) + rename drivers/net/wireless/{ => intersil}/p54/txrx.c (100%) + rename drivers/net/wireless/{ => intersil}/prism54/Makefile (100%) + rename drivers/net/wireless/{ => intersil}/prism54/isl_38xx.c (100%) + rename drivers/net/wireless/{ => intersil}/prism54/isl_38xx.h (100%) + rename drivers/net/wireless/{ => intersil}/prism54/isl_ioctl.c (100%) + rename drivers/net/wireless/{ => intersil}/prism54/isl_ioctl.h (100%) + rename drivers/net/wireless/{ => intersil}/prism54/isl_oid.h (100%) + rename drivers/net/wireless/{ => intersil}/prism54/islpci_dev.c (100%) + rename drivers/net/wireless/{ => intersil}/prism54/islpci_dev.h (100%) + rename drivers/net/wireless/{ => intersil}/prism54/islpci_eth.c (100%) + rename drivers/net/wireless/{ => intersil}/prism54/islpci_eth.h (100%) + rename drivers/net/wireless/{ => intersil}/prism54/islpci_hotplug.c (100%) + rename drivers/net/wireless/{ => intersil}/prism54/islpci_mgt.c (100%) + rename drivers/net/wireless/{ => intersil}/prism54/islpci_mgt.h (100%) + rename drivers/net/wireless/{ => intersil}/prism54/oid_mgt.c (100%) + rename drivers/net/wireless/{ => intersil}/prism54/oid_mgt.h (100%) + rename drivers/net/wireless/{ => intersil}/prism54/prismcompat.h (100%) + create mode 100644 drivers/net/wireless/marvell/Kconfig + create mode 100644 drivers/net/wireless/marvell/Makefile + rename drivers/net/wireless/{ => marvell}/libertas/Kconfig (100%) + rename drivers/net/wireless/{ => marvell}/libertas/LICENSE (100%) + rename drivers/net/wireless/{ => marvell}/libertas/Makefile (100%) + rename drivers/net/wireless/{ => marvell}/libertas/README (100%) + rename drivers/net/wireless/{ => marvell}/libertas/cfg.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/cfg.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/cmd.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/cmd.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/cmdresp.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/debugfs.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/debugfs.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/decl.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/defs.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/dev.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/ethtool.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/firmware.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/host.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/if_cs.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/if_sdio.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/if_sdio.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/if_spi.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/if_spi.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/if_usb.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/if_usb.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/main.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/mesh.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/mesh.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/radiotap.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/rx.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/tx.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/types.h (100%) + create mode 100644 drivers/net/wireless/marvell/libertas_tf/Kconfig + rename drivers/net/wireless/{ => marvell}/libertas_tf/Makefile (100%) + rename drivers/net/wireless/{ => marvell}/libertas_tf/cmd.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas_tf/deb_defs.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas_tf/if_usb.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas_tf/if_usb.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas_tf/libertas_tf.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas_tf/main.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/11ac.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/11ac.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/11h.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/11n.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/11n.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/11n_aggr.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/11n_aggr.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/11n_rxreorder.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/11n_rxreorder.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/Kconfig (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/Makefile (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/README (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/cfg80211.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/cfg80211.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/cfp.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/cmdevt.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/debugfs.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/decl.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/ethtool.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/fw.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/ie.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/init.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/ioctl.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/join.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/main.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/main.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/pcie.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/pcie.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/scan.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/sdio.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/sdio.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/sta_cmd.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/sta_cmdresp.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/sta_event.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/sta_ioctl.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/sta_rx.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/sta_tx.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/tdls.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/txrx.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/uap_cmd.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/uap_event.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/uap_txrx.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/usb.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/usb.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/util.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/util.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/wmm.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/wmm.h (100%) + rename drivers/net/wireless/{ => marvell}/mwl8k.c (100%) + create mode 100644 drivers/net/wireless/ralink/Kconfig + create mode 100644 drivers/net/wireless/ralink/Makefile + rename drivers/net/wireless/{ => ralink}/rt2x00/Kconfig (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/Makefile (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2400pci.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2400pci.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500pci.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500pci.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500usb.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500usb.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800lib.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800lib.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800mmio.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800mmio.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800pci.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800pci.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800soc.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800usb.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800usb.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00config.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00crypto.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00debug.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00debug.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00dev.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00dump.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00firmware.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00leds.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00leds.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00lib.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00link.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00mac.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00mmio.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00mmio.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00pci.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00pci.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00queue.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00queue.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00reg.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00soc.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00soc.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00usb.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00usb.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt61pci.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt61pci.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt73usb.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt73usb.h (100%) + create mode 100644 drivers/net/wireless/realtek/Kconfig + create mode 100644 drivers/net/wireless/st/Kconfig + create mode 100644 drivers/net/wireless/st/Makefile + rename drivers/net/wireless/{ => st}/cw1200/Kconfig (100%) + rename drivers/net/wireless/{ => st}/cw1200/Makefile (100%) + rename drivers/net/wireless/{ => st}/cw1200/bh.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/bh.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/cw1200.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/cw1200_sdio.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/cw1200_spi.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/debug.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/debug.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/fwio.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/fwio.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/hwbus.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/hwio.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/hwio.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/main.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/pm.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/pm.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/queue.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/queue.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/scan.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/scan.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/sta.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/sta.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/txrx.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/txrx.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/wsm.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/wsm.h (100%) + create mode 100644 drivers/net/wireless/zydas/Kconfig + create mode 100644 drivers/net/wireless/zydas/Makefile + rename drivers/net/wireless/{ => zydas}/zd1201.c (100%) + rename drivers/net/wireless/{ => zydas}/zd1201.h (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/Kconfig (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/Makefile (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_chip.c (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_chip.h (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_def.h (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.c (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.h (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.c (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.h (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_al2230.c (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_al7230b.c (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_rf2959.c (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_uw2453.c (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.c (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.h (100%) + create mode 100644 include/trace/events/fib6.h + create mode 100644 lib/netdev-notifier-error-inject.c +Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error) +$ git merge ipsec-next/master +Already up-to-date. +Merging ipvs-next/master (4c50a8ce2b63 netfilter: ipvs: avoid unused variable warning) +$ git merge ipvs-next/master +Resolved 'net/ipv6/netfilter/nf_conntrack_reasm.c' using previous resolution. +Auto-merging net/ipv6/netfilter/nf_conntrack_reasm.c +CONFLICT (content): Merge conflict in net/ipv6/netfilter/nf_conntrack_reasm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0d611750abfd] Merge remote-tracking branch 'ipvs-next/master' +$ git diff -M --stat --summary HEAD^.. + include/linux/netfilter/nf_conntrack_sctp.h | 13 ++ + include/net/netfilter/ipv6/nf_defrag_ipv6.h | 3 +- + include/net/netfilter/nf_tables.h | 2 - + include/net/netfilter/nf_tables_core.h | 9 ++ + include/uapi/linux/netfilter/ipset/ip_set_bitmap.h | 2 + + include/uapi/linux/netfilter/ipset/ip_set_hash.h | 2 + + include/uapi/linux/netfilter/ipset/ip_set_list.h | 2 + + include/uapi/linux/netfilter/nf_conntrack_sctp.h | 12 +- + .../linux/netfilter/nf_conntrack_tuple_common.h | 3 + + include/uapi/linux/netfilter/nf_tables.h | 17 +++ + include/uapi/linux/netfilter/xt_HMARK.h | 1 + + include/uapi/linux/netfilter/xt_RATEEST.h | 1 + + include/uapi/linux/netfilter/xt_TEE.h | 2 + + include/uapi/linux/netfilter/xt_TPROXY.h | 1 + + include/uapi/linux/netfilter/xt_hashlimit.h | 1 + + include/uapi/linux/netfilter/xt_ipvs.h | 1 + + include/uapi/linux/netfilter/xt_mac.h | 2 + + include/uapi/linux/netfilter/xt_osf.h | 2 + + include/uapi/linux/netfilter/xt_physdev.h | 2 +- + include/uapi/linux/netfilter/xt_policy.h | 2 + + include/uapi/linux/netfilter/xt_rateest.h | 1 + + include/uapi/linux/netfilter/xt_recent.h | 1 + + include/uapi/linux/netfilter/xt_sctp.h | 12 +- + include/uapi/linux/netfilter_arp/arp_tables.h | 1 + + include/uapi/linux/netfilter_bridge.h | 1 + + include/uapi/linux/netfilter_bridge/ebt_arp.h | 1 + + include/uapi/linux/netfilter_bridge/ebt_arpreply.h | 2 + + include/uapi/linux/netfilter_bridge/ebt_ip6.h | 1 + + include/uapi/linux/netfilter_bridge/ebt_nat.h | 2 + + include/uapi/linux/netfilter_bridge/ebtables.h | 6 +- + include/uapi/linux/netfilter_ipv4/ip_tables.h | 1 + + include/uapi/linux/netfilter_ipv6/ip6_tables.h | 1 + + include/uapi/linux/netfilter_ipv6/ip6t_rt.h | 2 +- + net/bridge/netfilter/ebt_ip6.c | 4 +- + net/bridge/netfilter/ebt_log.c | 9 +- + net/bridge/netfilter/ebt_stp.c | 2 +- + net/bridge/netfilter/ebt_vlan.c | 15 +- + net/bridge/netfilter/ebtable_filter.c | 2 +- + net/bridge/netfilter/ebtable_nat.c | 2 +- + net/bridge/netfilter/ebtables.c | 139 ++++++++--------- + net/ipv4/netfilter/nf_reject_ipv4.c | 1 - + net/ipv6/netfilter/nf_conntrack_reasm.c | 164 +++++++++------------ + net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 20 +-- + net/ipv6/netfilter/nf_reject_ipv6.c | 1 - + net/netfilter/ipvs/ip_vs_app.c | 4 +- + net/netfilter/nf_conntrack_expect.c | 7 + + net/netfilter/nf_conntrack_standalone.c | 7 + + net/netfilter/nfnetlink_log.c | 15 +- + net/netfilter/nft_payload.c | 135 ++++++++++++++++- + net/netfilter/x_tables.c | 12 ++ + net/openvswitch/conntrack.c | 25 +--- + 51 files changed, 424 insertions(+), 252 deletions(-) + create mode 100644 include/linux/netfilter/nf_conntrack_sctp.h +Merging wireless-drivers-next/master (b31fa550241d wireless: airo: re-use mac_pton()) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath9k/htc_hst.c | 2 +- + drivers/net/wireless/ath/wcn36xx/hal.h | 2 + + drivers/net/wireless/ath/wcn36xx/smd.c | 27 ++- + drivers/net/wireless/ath/wcn36xx/smd.h | 9 + + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 10 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 2 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 211 ++++++++++++------ + .../broadcom/brcm80211/brcmfmac/cfg80211.h | 10 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 24 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 114 +++++----- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 8 +- + .../wireless/broadcom/brcm80211/brcmfmac/debug.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/debug.h | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 5 +- + .../broadcom/brcm80211/brcmfmac/firmware.c | 47 +++- + .../broadcom/brcm80211/brcmfmac/firmware.h | 46 +++- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 8 +- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.h | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/fwil.c | 31 +-- + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 26 ++- + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 4 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 39 ++-- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.h | 2 - + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 243 ++++++--------------- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 198 ++++------------- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.h | 4 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 89 +++----- + .../broadcom/brcm80211/include/brcm_hw_ids.h | 2 + + drivers/net/wireless/cisco/airo.c | 18 +- + drivers/net/wireless/marvell/libertas/cfg.c | 3 +- + drivers/net/wireless/marvell/libertas/if_sdio.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2500usb.c | 5 +- + .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c | 23 +- + .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 21 +- + .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | 22 +- + .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 23 +- + .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c | 21 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 3 +- + .../realtek/rtlwifi/rtl8723com/fw_common.c | 4 +- + 41 files changed, 597 insertions(+), 719 deletions(-) +Merging bluetooth/master (345467ea3ae6 Bluetooth: hci_intel: Use shorter timeout for HCI commands) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/hci_h5.c | 8 +- + drivers/bluetooth/hci_intel.c | 8 +- + drivers/bluetooth/hci_ldisc.c | 8 +- + include/net/bluetooth/hci.h | 1 - + include/net/bluetooth/hci_core.h | 18 +- + net/bluetooth/hci_conn.c | 2 +- + net/bluetooth/hci_core.c | 63 +- + net/bluetooth/hci_event.c | 8 +- + net/bluetooth/hci_request.c | 1233 ++++++++++++++++++++++++++++++++---- + net/bluetooth/hci_request.h | 28 +- + net/bluetooth/mgmt.c | 1285 ++++---------------------------------- + 11 files changed, 1292 insertions(+), 1370 deletions(-) +Merging mac80211-next/master (096cc9502757 mac80211: reject zero cookie in mgmt-tx/roc cancel) +$ git merge mac80211-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 69 ++- + include/net/cfg80211.h | 10 +- + include/net/mac80211.h | 56 +++ + include/uapi/linux/nl80211.h | 11 +- + net/mac80211/cfg.c | 532 ++-------------------- + net/mac80211/debugfs.c | 1 + + net/mac80211/ibss.c | 1 + + net/mac80211/ieee80211_i.h | 25 +- + net/mac80211/key.c | 56 ++- + net/mac80211/main.c | 4 +- + net/mac80211/mesh_pathtbl.c | 4 +- + net/mac80211/mlme.c | 6 +- + net/mac80211/offchannel.c | 825 +++++++++++++++++++++++++++------- + net/mac80211/rx.c | 3 +- + net/mac80211/sta_info.c | 163 +++++-- + net/mac80211/sta_info.h | 2 + + net/mac80211/trace.h | 25 ++ + net/mac80211/tx.c | 2 +- + net/mac80211/util.c | 7 +- + net/wireless/core.h | 7 - + net/wireless/lib80211_crypt_ccmp.c | 4 +- + net/wireless/lib80211_crypt_tkip.c | 4 +- + net/wireless/nl80211.c | 62 ++- + net/wireless/ocb.c | 3 + + net/wireless/rdev-ops.h | 51 +++ + net/wireless/reg.c | 98 ++-- + net/wireless/trace.h | 103 +++++ + net/wireless/util.c | 121 ----- + 28 files changed, 1302 insertions(+), 953 deletions(-) +Merging rdma/for-next (db7489e07669 IB/core, cma: Make __attribute_const__ declarations sparse-friendly) +$ git merge rdma/for-next +Already up-to-date. +Merging mtd/master (1ddaa021b000 MAINTAINERS: brcmnand: Add co-maintainer for Broadcom SoCs) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (d121b66d25ad mtd: brcmnand: drop brcmnand_host::of_node field) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + Documentation/DocBook/mtdnand.tmpl | 4 +- + .../devicetree/bindings/mtd/jedec,spi-nor.txt | 56 ++- + .../devicetree/bindings/mtd/mtk-quadspi.txt | 41 ++ + .../devicetree/bindings/mtd/partition.txt | 2 + + Documentation/mtd/nand_ecc.txt | 58 +-- + drivers/mtd/Kconfig | 2 +- + drivers/mtd/afs.c | 80 ++-- + drivers/mtd/ar7part.c | 16 +- + drivers/mtd/bcm47xxpart.c | 16 +- + drivers/mtd/bcm63xxpart.c | 16 +- + drivers/mtd/chips/Kconfig | 4 + + drivers/mtd/cmdlinepart.c | 1 - + drivers/mtd/devices/m25p80.c | 44 +- + drivers/mtd/devices/mtd_dataflash.c | 5 +- + drivers/mtd/devices/spear_smi.c | 6 +- + drivers/mtd/devices/st_spi_fsm.c | 5 +- + drivers/mtd/maps/lantiq-flash.c | 5 +- + drivers/mtd/maps/physmap_of.c | 6 +- + drivers/mtd/mtdcore.c | 4 + + drivers/mtd/mtdpart.c | 11 +- + drivers/mtd/nand/atmel_nand.c | 13 +- + drivers/mtd/nand/brcmnand/brcmnand.c | 48 +- + drivers/mtd/nand/cafe_nand.c | 34 +- + drivers/mtd/nand/davinci_nand.c | 10 +- + drivers/mtd/nand/fsl_elbc_nand.c | 5 +- + drivers/mtd/nand/fsl_ifc_nand.c | 5 +- + drivers/mtd/nand/fsl_upm.c | 5 +- + drivers/mtd/nand/fsmc_nand.c | 9 +- + drivers/mtd/nand/gpio.c | 8 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 5 +- + drivers/mtd/nand/hisi504_nand.c | 5 +- + drivers/mtd/nand/lpc32xx_mlc.c | 7 +- + drivers/mtd/nand/lpc32xx_slc.c | 7 +- + drivers/mtd/nand/mpc5121_nfc.c | 5 +- + drivers/mtd/nand/mxc_nand.c | 8 +- + drivers/mtd/nand/nand_base.c | 7 +- + drivers/mtd/nand/ndfc.c | 5 +- + drivers/mtd/nand/omap2.c | 6 +- + drivers/mtd/nand/orion_nand.c | 6 +- + drivers/mtd/nand/plat_nand.c | 5 +- + drivers/mtd/nand/pxa3xx_nand.c | 141 +++--- + drivers/mtd/nand/sh_flctl.c | 6 +- + drivers/mtd/nand/socrates_nand.c | 5 +- + drivers/mtd/nand/sunxi_nand.c | 10 +- + drivers/mtd/nand/vf610_nfc.c | 14 +- + drivers/mtd/ofpart.c | 14 +- + drivers/mtd/onenand/omap2.c | 8 +- + drivers/mtd/redboot.c | 17 +- + drivers/mtd/spi-nor/Kconfig | 7 + + drivers/mtd/spi-nor/Makefile | 1 + + drivers/mtd/spi-nor/fsl-quadspi.c | 14 +- + drivers/mtd/spi-nor/mtk-quadspi.c | 486 +++++++++++++++++++++ + drivers/mtd/spi-nor/nxp-spifi.c | 6 +- + drivers/mtd/spi-nor/spi-nor.c | 47 +- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 5 +- + include/linux/mtd/map.h | 2 + + include/linux/mtd/mtd.h | 11 + + include/linux/mtd/nand.h | 24 +- + include/linux/mtd/partitions.h | 17 +- + include/linux/mtd/spi-nor.h | 19 +- + 60 files changed, 987 insertions(+), 452 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/mtk-quadspi.txt + create mode 100644 drivers/mtd/spi-nor/mtk-quadspi.c +Merging crypto/master (c012a79d0ce9 crypto: cryptod - use crypto_skcipher_type() for getting skcipher type) +$ git merge crypto/master +Auto-merging drivers/crypto/qat/qat_common/adf_ctl_drv.c +Auto-merging crypto/algif_skcipher.c +Auto-merging crypto/algif_aead.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/crypto/rockchip-crypto.txt | 29 ++ + crypto/algapi.c | 9 +- + crypto/algif_aead.c | 6 +- + crypto/algif_skcipher.c | 10 +- + crypto/cryptd.c | 3 +- + crypto/mcryptd.c | 8 +- + crypto/rsa.c | 24 - + crypto/tcrypt.c | 2 +- + drivers/char/hw_random/omap3-rom-rng.c | 13 +- + drivers/crypto/Kconfig | 14 +- + drivers/crypto/Makefile | 1 + + drivers/crypto/amcc/crypto4xx_core.c | 4 + + drivers/crypto/atmel-aes.c | 12 +- + drivers/crypto/caam/caamhash.c | 24 + + drivers/crypto/hifn_795x.c | 508 +++++++++------------ + drivers/crypto/ixp4xx_crypto.c | 6 +- + drivers/crypto/marvell/cipher.c | 8 + + drivers/crypto/marvell/hash.c | 4 + + drivers/crypto/nx/nx-842-powernv.c | 11 +- + drivers/crypto/padlock-aes.c | 4 +- + drivers/crypto/picoxcell_crypto.c | 53 ++- + drivers/crypto/qat/qat_common/Makefile | 2 +- + drivers/crypto/qat/qat_common/adf_aer.c | 2 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 2 +- + drivers/crypto/qat/qat_common/qat_crypto.c | 22 +- + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 8 +- + drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 9 +- + drivers/crypto/qce/ablkcipher.c | 8 + + drivers/crypto/qce/sha.c | 5 + + drivers/crypto/rockchip/Makefile | 3 + + drivers/crypto/rockchip/rk3288_crypto.c | 393 ++++++++++++++++ + drivers/crypto/rockchip/rk3288_crypto.h | 216 +++++++++ + drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c | 503 ++++++++++++++++++++ + drivers/crypto/sahara.c | 16 +- + drivers/crypto/sunxi-ss/sun4i-ss-core.c | 2 + + drivers/crypto/talitos.c | 41 +- + lib/mpi/mpicoder.c | 21 +- + 37 files changed, 1572 insertions(+), 434 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/rockchip-crypto.txt + create mode 100644 drivers/crypto/rockchip/Makefile + create mode 100644 drivers/crypto/rockchip/rk3288_crypto.c + create mode 100644 drivers/crypto/rockchip/rk3288_crypto.h + create mode 100644 drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c +Merging drm/drm-next (80d69009ef67 Merge tag 'drm-intel-next-2015-11-20-merged' of git://anongit.freedesktop.org/drm-intel into drm-next) +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_gem_fence.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/gpu.tmpl | 60 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 +- + drivers/gpu/drm/armada/armada_fb.c | 4 +- + drivers/gpu/drm/armada/armada_fb.h | 2 +- + drivers/gpu/drm/ast/ast_drv.h | 3 +- + drivers/gpu/drm/ast/ast_fb.c | 2 +- + drivers/gpu/drm/ast/ast_main.c | 4 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- + drivers/gpu/drm/bochs/bochs.h | 2 +- + drivers/gpu/drm/bochs/bochs_fbdev.c | 2 +- + drivers/gpu/drm/bochs/bochs_mm.c | 4 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 3 +- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 2 +- + drivers/gpu/drm/cirrus/cirrus_main.c | 4 +- + drivers/gpu/drm/drm_atomic.c | 11 +- + drivers/gpu/drm/drm_atomic_helper.c | 19 +- + drivers/gpu/drm/drm_crtc.c | 4 +- + drivers/gpu/drm/drm_crtc_helper.c | 2 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 4 +- + drivers/gpu/drm/drm_gem.c | 35 +- + drivers/gpu/drm/drm_modes.c | 16 +- + drivers/gpu/drm/drm_plane_helper.c | 4 + + drivers/gpu/drm/drm_probe_helper.c | 46 +- + drivers/gpu/drm/drm_rect.c | 7 +- + drivers/gpu/drm/drm_sysfs.c | 54 +- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_fb.h | 2 +- + drivers/gpu/drm/gma500/framebuffer.c | 6 +- + drivers/gpu/drm/i915/Kconfig | 1 + + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/dvo.h | 3 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 37 +- + drivers/gpu/drm/i915/i915_debugfs.c | 246 ++- + drivers/gpu/drm/i915/i915_dma.c | 26 +- + drivers/gpu/drm/i915/i915_drv.c | 170 +- + drivers/gpu/drm/i915/i915_drv.h | 187 +- + drivers/gpu/drm/i915/i915_gem.c | 73 +- + drivers/gpu/drm/i915/i915_gem_context.c | 12 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 +- + drivers/gpu/drm/i915/i915_gem_fence.c | 2 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 58 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 7 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 3 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 4 + + drivers/gpu/drm/i915/i915_gpu_error.c | 40 +- + drivers/gpu/drm/i915/i915_guc_reg.h | 53 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 16 +- + drivers/gpu/drm/i915/i915_irq.c | 117 +- + drivers/gpu/drm/i915/i915_params.c | 10 +- + drivers/gpu/drm/i915/i915_reg.h | 2742 ++++++++++++------------- + drivers/gpu/drm/i915/i915_sysfs.c | 3 +- + drivers/gpu/drm/i915/i915_trace.h | 4 +- + drivers/gpu/drm/i915/i915_vgpu.c | 6 +- + drivers/gpu/drm/i915/i915_vgpu.h | 14 +- + drivers/gpu/drm/i915/intel_atomic.c | 3 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 2 + + drivers/gpu/drm/i915/intel_audio.c | 23 +- + drivers/gpu/drm/i915/intel_crt.c | 14 +- + drivers/gpu/drm/i915/intel_csr.c | 284 ++- + drivers/gpu/drm/i915/intel_ddi.c | 141 +- + drivers/gpu/drm/i915/intel_display.c | 853 +++++--- + drivers/gpu/drm/i915/intel_dp.c | 1087 ++++------ + drivers/gpu/drm/i915/intel_dp_link_training.c | 323 +++ + drivers/gpu/drm/i915/intel_dp_mst.c | 18 +- + drivers/gpu/drm/i915/intel_drv.h | 161 +- + drivers/gpu/drm/i915/intel_dsi.c | 45 +- + drivers/gpu/drm/i915/intel_dsi.h | 2 +- + drivers/gpu/drm/i915/intel_dvo.c | 27 +- + drivers/gpu/drm/i915/intel_fbc.c | 196 +- + drivers/gpu/drm/i915/intel_fbdev.c | 50 +- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 127 +- + drivers/gpu/drm/i915/intel_guc.h | 8 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 72 + + drivers/gpu/drm/i915/intel_guc_loader.c | 105 +- + drivers/gpu/drm/i915/intel_hdmi.c | 83 +- + drivers/gpu/drm/i915/intel_i2c.c | 37 +- + drivers/gpu/drm/i915/intel_lrc.c | 148 +- + drivers/gpu/drm/i915/intel_lrc.h | 19 +- + drivers/gpu/drm/i915/intel_lvds.c | 11 +- + drivers/gpu/drm/i915/intel_mocs.c | 61 +- + drivers/gpu/drm/i915/intel_opregion.c | 2 +- + drivers/gpu/drm/i915/intel_overlay.c | 2 +- + drivers/gpu/drm/i915/intel_pm.c | 637 +++--- + drivers/gpu/drm/i915/intel_psr.c | 77 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 156 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 9 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 510 ++--- + drivers/gpu/drm/i915/intel_sdvo.c | 61 +- + drivers/gpu/drm/i915/intel_sprite.c | 28 +- + drivers/gpu/drm/i915/intel_uncore.c | 261 ++- + drivers/gpu/drm/imx/Kconfig | 9 - + drivers/gpu/drm/imx/imx-drm-core.c | 12 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 2 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 4 +- + drivers/gpu/drm/msm/msm_drv.h | 4 +- + drivers/gpu/drm/msm/msm_fb.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.h | 1 - + drivers/gpu/drm/omapdrm/omap_drv.h | 6 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 4 +- + drivers/gpu/drm/qxl/qxl_display.c | 4 +- + drivers/gpu/drm/qxl/qxl_drv.h | 2 +- + drivers/gpu/drm/qxl/qxl_fb.c | 3 +- + drivers/gpu/drm/radeon/radeon_display.c | 4 +- + drivers/gpu/drm/radeon/radeon_fb.c | 1 - + drivers/gpu/drm/radeon/radeon_mode.h | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 6 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.h | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_kms.c | 2 +- + drivers/gpu/drm/tegra/Kconfig | 12 - + drivers/gpu/drm/tegra/drm.c | 4 +- + drivers/gpu/drm/tegra/drm.h | 8 +- + drivers/gpu/drm/tegra/fb.c | 16 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- + drivers/gpu/drm/udl/udl_drv.h | 2 +- + drivers/gpu/drm/udl/udl_fb.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- + drivers/gpu/drm/virtio/virtgpu_fb.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +- + drivers/pci/quirks.c | 4 +- + include/drm/drmP.h | 3 + + include/drm/drm_atomic.h | 6 +- + include/drm/drm_crtc.h | 12 +- + include/drm/drm_crtc_helper.h | 2 +- + include/drm/drm_dp_helper.h | 36 + + include/drm/drm_fb_cma_helper.h | 2 +- + include/drm/drm_gem.h | 106 +- + include/drm/drm_mm.h | 26 +- + include/drm/drm_rect.h | 3 +- + include/drm/i915_component.h | 69 +- + include/drm/i915_pciids.h | 36 + + include/uapi/drm/i915_drm.h | 11 +- + kernel/async.c | 1 + + 140 files changed, 5647 insertions(+), 4608 deletions(-) + create mode 100644 drivers/gpu/drm/i915/intel_dp_link_training.c +Merging drm-panel/drm/panel/for-next (caa602e71609 drm/bridge: Remove gratuitous blank line) +$ git merge drm-panel/drm/panel/for-next +Auto-merging drivers/gpu/drm/bridge/dw-hdmi.c +Auto-merging drivers/gpu/drm/bridge/dw-hdmi-ahb-audio.c +Merge made by the 'recursive' strategy. + .../bindings/display/panel/boe,tv080wum-nl0.txt | 7 + + .../bindings/display/panel/innolux,g121x1-l03.txt | 7 + + .../bindings/display/panel/sharp,ls043t1le01.txt | 22 ++ + .../bindings/panel/panasonic,vvx10f034n00.txt | 20 ++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/gpu/drm/bridge/Kconfig | 1 - + drivers/gpu/drm/bridge/Makefile | 4 +- + .../{dw_hdmi-ahb-audio.c => dw-hdmi-ahb-audio.c} | 2 +- + .../bridge/{dw_hdmi-audio.h => dw-hdmi-audio.h} | 0 + drivers/gpu/drm/bridge/{dw_hdmi.c => dw-hdmi.c} | 4 +- + drivers/gpu/drm/bridge/{dw_hdmi.h => dw-hdmi.h} | 0 + drivers/gpu/drm/drm_mipi_dsi.c | 38 ++ + drivers/gpu/drm/panel/Kconfig | 19 + + drivers/gpu/drm/panel/Makefile | 2 + + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 334 ++++++++++++++++++ + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 387 +++++++++++++++++++++ + drivers/gpu/drm/panel/panel-simple.c | 65 ++++ + include/drm/drm_mipi_dsi.h | 27 ++ + 18 files changed, 934 insertions(+), 6 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/boe,tv080wum-nl0.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,g121x1-l03.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ls043t1le01.txt + create mode 100644 Documentation/devicetree/bindings/panel/panasonic,vvx10f034n00.txt + rename drivers/gpu/drm/bridge/{dw_hdmi-ahb-audio.c => dw-hdmi-ahb-audio.c} (99%) + rename drivers/gpu/drm/bridge/{dw_hdmi-audio.h => dw-hdmi-audio.h} (100%) + rename drivers/gpu/drm/bridge/{dw_hdmi.c => dw-hdmi.c} (99%) + rename drivers/gpu/drm/bridge/{dw_hdmi.h => dw-hdmi.h} (100%) + create mode 100644 drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c + create mode 100644 drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c +Merging drm-intel/for-linux-next (d965e7ac7a19 drm/i915/bxt: backlight clock gating workaround) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_debugfs.c | 110 ++++++--------------------- + drivers/gpu/drm/i915/i915_drv.c | 47 +++++++++--- + drivers/gpu/drm/i915/i915_drv.h | 48 ++++++++++-- + drivers/gpu/drm/i915/i915_gem_context.c | 2 - + drivers/gpu/drm/i915/i915_guc_submission.c | 2 +- + drivers/gpu/drm/i915/i915_irq.c | 117 ++++++++++++++++++----------- + drivers/gpu/drm/i915/i915_reg.h | 7 ++ + drivers/gpu/drm/i915/intel_crt.c | 33 ++++++-- + drivers/gpu/drm/i915/intel_ddi.c | 2 +- + drivers/gpu/drm/i915/intel_display.c | 96 ++++++++++++----------- + drivers/gpu/drm/i915/intel_dp.c | 12 +++ + drivers/gpu/drm/i915/intel_drv.h | 8 +- + drivers/gpu/drm/i915/intel_dsi.c | 24 +++--- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 16 ++-- + drivers/gpu/drm/i915/intel_hdmi.c | 47 ++++++------ + drivers/gpu/drm/i915/intel_panel.c | 25 ++++-- + drivers/gpu/drm/i915/intel_pm.c | 8 ++ + drivers/gpu/drm/i915/intel_psr.c | 38 ++++------ + drivers/gpu/drm/i915/intel_runtime_pm.c | 76 ++++++++++++++++++- + 19 files changed, 431 insertions(+), 287 deletions(-) +Merging drm-tegra/drm/tegra/for-next (2093588d9b43 drm/tegra: Use drm_gem_object_unreference_unlocked()) +$ git merge drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/drm.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/drm.c | 14 ++++++-------- + drivers/gpu/drm/tegra/gem.c | 15 ++------------- + 2 files changed, 8 insertions(+), 21 deletions(-) +Merging drm-misc/topic/drm-misc (737292a3c0f2 drm/gma500: Add driver private mutex for the fault handler) +$ git merge drm-misc/topic/drm-misc +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_atomic_helper.c | 43 +++++++++++++++++++++++++ + drivers/gpu/drm/drm_edid.c | 62 ++++++++++++++++++++++++++++++++++-- + drivers/gpu/drm/drm_fops.c | 58 +++++++++++++++++++++------------ + drivers/gpu/drm/drm_modes.c | 19 ++++++++++- + drivers/gpu/drm/gma500/framebuffer.c | 12 ++----- + drivers/gpu/drm/gma500/gem.c | 19 ++++------- + drivers/gpu/drm/gma500/gma_display.c | 13 ++------ + drivers/gpu/drm/gma500/gtt.c | 1 + + drivers/gpu/drm/gma500/psb_drv.h | 2 ++ + include/drm/drmP.h | 2 ++ + include/drm/drm_atomic_helper.h | 2 ++ + include/drm/drm_modes.h | 2 ++ + 12 files changed, 178 insertions(+), 57 deletions(-) +Merging drm-exynos/exynos-drm/for-next (8eb90e2aae45 drm/exynos: dp: fix wrong return type) +$ git merge drm-exynos/exynos-drm/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 54 +++++--- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 93 +++++++------ + drivers/gpu/drm/exynos/exynos_dp_core.c | 185 ++++++++++++++++++++------ + drivers/gpu/drm/exynos/exynos_dp_core.h | 1 + + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 147 +++++++++++--------- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 54 +++++--- + drivers/gpu/drm/exynos/exynos_hdmi.c | 49 +++++-- + drivers/gpu/drm/exynos/exynos_mixer.c | 106 +++++++++------ + 8 files changed, 465 insertions(+), 224 deletions(-) +Merging drm-msm/msm-next (a9ee34b70e07 drm/msm: Remove local fbdev emulation Kconfig option) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging sound/for-next (e5241a8c4b22 ALSA: compress: Pass id string to snd_compress_new) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + include/sound/compress_driver.h | 7 +++- + include/sound/i2c.h | 2 +- + include/sound/rawmidi.h | 2 +- + sound/core/compress_offload.c | 86 ++++++++++++++++++++++++++++++++++++++++- + sound/core/pcm_native.c | 26 ++++++------- + sound/core/seq/seq_virmidi.c | 2 +- + sound/i2c/i2c.c | 2 +- + sound/pci/azt3328.c | 2 - + sound/pci/ice1712/delta.c | 2 +- + sound/soc/soc-compress.c | 8 +++- + sound/usb/midi.c | 2 +- + sound/usb/misc/ua101.c | 4 +- + 12 files changed, 118 insertions(+), 27 deletions(-) +Merging sound-asoc/for-next (d4fb6bce4565 Merge remote-tracking branches 'asoc/topic/sti', 'asoc/topic/topology', 'asoc/topic/wm8904', 'asoc/topic/wm8962' and 'asoc/topic/wm9713' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/sh/rcar/rcar_snd.h +Auto-merging drivers/dma/Kconfig +Auto-merging arch/arm/plat-samsung/devs.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/ak4613.txt | 10 + + .../devicetree/bindings/sound/atmel-classd.txt | 6 + + Documentation/devicetree/bindings/sound/da7218.txt | 104 + + .../devicetree/bindings/sound/fsl,asrc.txt | 5 + + .../devicetree/bindings/sound/fsl,esai.txt | 5 + + .../devicetree/bindings/sound/fsl,spdif.txt | 5 + + .../devicetree/bindings/sound/img,i2s-in.txt | 47 + + .../devicetree/bindings/sound/img,i2s-out.txt | 51 + + .../devicetree/bindings/sound/img,parallel-out.txt | 44 + + .../devicetree/bindings/sound/img,spdif-in.txt | 41 + + .../devicetree/bindings/sound/img,spdif-out.txt | 44 + + .../devicetree/bindings/sound/inno-rk3036.txt | 20 + + .../devicetree/bindings/sound/renesas,rsnd.txt | 5 + + .../bindings/sound/renesas,rsrc-card.txt | 4 +- + .../devicetree/bindings/sound/rockchip-i2s.txt | 2 + + Documentation/devicetree/bindings/sound/rt5659.txt | 75 + + Documentation/devicetree/bindings/sound/rt5677.txt | 2 +- + Documentation/sound/alsa/img,spdif-in.txt | 49 + + arch/arm/mach-s3c64xx/dev-audio.c | 47 +- + arch/arm/mach-s3c64xx/include/mach/dma.h | 52 +- + arch/arm/plat-samsung/devs.c | 23 +- + drivers/dma/Kconfig | 2 +- + include/linux/platform_data/asoc-s3c.h | 8 + + include/sound/ac97_codec.h | 3 + + include/sound/da7218.h | 109 + + include/sound/hdaudio_ext.h | 6 + + include/sound/rt5659.h | 49 + + include/sound/soc-dapm.h | 4 + + include/sound/soc-topology.h | 6 +- + include/sound/soc.h | 14 +- + include/uapi/sound/asoc.h | 2 +- + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/atmel/atmel-classd.c | 12 +- + sound/soc/codecs/Kconfig | 29 + + sound/soc/codecs/Makefile | 10 + + sound/soc/codecs/ak4613.c | 118 +- + sound/soc/codecs/arizona.c | 119 + + sound/soc/codecs/arizona.h | 7 + + sound/soc/codecs/cs47l24.c | 1148 ++++++ + sound/soc/codecs/cs47l24.h | 23 + + sound/soc/codecs/da7218.c | 3305 +++++++++++++++ + sound/soc/codecs/da7218.h | 1414 +++++++ + sound/soc/codecs/da7219.c | 2 +- + sound/soc/codecs/hdac_hdmi.c | 658 +++ + sound/soc/codecs/inno_rk3036.c | 490 +++ + sound/soc/codecs/inno_rk3036.h | 123 + + sound/soc/codecs/rt286.c | 6 + + sound/soc/codecs/rt298.c | 2 - + sound/soc/codecs/rt5645.c | 292 +- + sound/soc/codecs/rt5659.c | 4223 ++++++++++++++++++++ + sound/soc/codecs/rt5659.h | 1819 +++++++++ + sound/soc/codecs/rt5677.c | 8 +- + sound/soc/codecs/wm5110.c | 136 + + sound/soc/codecs/wm8904.c | 2 +- + sound/soc/codecs/wm8962.c | 3 +- + sound/soc/codecs/wm8998.c | 46 +- + sound/soc/codecs/wm9713.c | 296 +- + sound/soc/codecs/wm_adsp.c | 49 +- + sound/soc/fsl/fsl-asoc-card.c | 11 +- + sound/soc/fsl/fsl_asrc.c | 16 +- + sound/soc/fsl/fsl_asrc.h | 2 + + sound/soc/fsl/fsl_esai.c | 63 +- + sound/soc/fsl/fsl_sai.c | 98 +- + sound/soc/fsl/fsl_sai.h | 3 + + sound/soc/fsl/fsl_spdif.c | 35 +- + sound/soc/fsl/fsl_ssi.c | 25 +- + sound/soc/fsl/imx-wm8962.c | 10 +- + sound/soc/generic/simple-card.c | 12 +- + sound/soc/img/Kconfig | 44 + + sound/soc/img/Makefile | 5 + + sound/soc/img/img-i2s-in.c | 516 +++ + sound/soc/img/img-i2s-out.c | 565 +++ + sound/soc/img/img-parallel-out.c | 327 ++ + sound/soc/img/img-spdif-in.c | 806 ++++ + sound/soc/img/img-spdif-out.c | 441 ++ + sound/soc/intel/Kconfig | 23 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 12 +- + sound/soc/intel/atom/sst/sst_acpi.c | 67 +- + sound/soc/intel/atom/sst/sst_stream.c | 2 +- + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 7 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 7 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 7 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 366 ++ + sound/soc/intel/boards/skl_rt286.c | 55 +- + sound/soc/intel/common/Makefile | 7 +- + sound/soc/intel/common/sst-acpi.c | 41 +- + sound/soc/intel/common/sst-acpi.h | 33 + + sound/soc/intel/common/sst-dsp-priv.h | 8 +- + sound/soc/intel/common/sst-dsp.c | 2 +- + sound/soc/intel/common/sst-dsp.h | 2 +- + sound/soc/intel/common/sst-firmware.c | 4 +- + sound/soc/intel/common/sst-match-acpi.c | 43 + + sound/soc/intel/haswell/sst-haswell-dsp.c | 2 +- + sound/soc/intel/skylake/skl-messages.c | 191 +- + sound/soc/intel/skylake/skl-nhlt.c | 19 +- + sound/soc/intel/skylake/skl-pcm.c | 206 +- + sound/soc/intel/skylake/skl-sst-cldma.c | 61 +- + sound/soc/intel/skylake/skl-sst-dsp.h | 3 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 2 +- + sound/soc/intel/skylake/skl-sst.c | 42 +- + sound/soc/intel/skylake/skl-topology.c | 411 +- + sound/soc/intel/skylake/skl-topology.h | 35 +- + sound/soc/intel/skylake/skl-tplg-interface.h | 90 +- + sound/soc/intel/skylake/skl.c | 134 +- + sound/soc/intel/skylake/skl.h | 4 +- + sound/soc/mediatek/mtk-afe-pcm.c | 13 +- + sound/soc/pxa/brownstone.c | 3 +- + sound/soc/pxa/mioa701_wm9713.c | 6 +- + sound/soc/qcom/lpass-cpu.c | 1 + + sound/soc/rockchip/rockchip_i2s.c | 43 +- + sound/soc/rockchip/rockchip_max98090.c | 6 + + sound/soc/rockchip/rockchip_rt5645.c | 6 + + sound/soc/samsung/Kconfig | 2 - + sound/soc/samsung/ac97.c | 29 +- + sound/soc/samsung/bells.c | 40 +- + sound/soc/samsung/dma.h | 6 +- + sound/soc/samsung/dmaengine.c | 20 +- + sound/soc/samsung/i2s.c | 31 +- + sound/soc/samsung/littlemill.c | 32 +- + sound/soc/samsung/odroidx2_max98090.c | 9 +- + sound/soc/samsung/pcm.c | 25 +- + sound/soc/samsung/s3c2412-i2s.c | 16 +- + sound/soc/samsung/s3c24xx-i2s.c | 16 +- + sound/soc/samsung/snow.c | 9 +- + sound/soc/samsung/spdif.c | 17 +- + sound/soc/samsung/speyside.c | 12 +- + sound/soc/samsung/tobermory.c | 21 +- + sound/soc/sh/Kconfig | 1 - + sound/soc/sh/fsi.c | 11 +- + sound/soc/sh/rcar/Makefile | 2 +- + sound/soc/sh/rcar/adg.c | 88 +- + sound/soc/sh/rcar/cmd.c | 170 + + sound/soc/sh/rcar/core.c | 479 +-- + sound/soc/sh/rcar/ctu.c | 98 +- + sound/soc/sh/rcar/dma.c | 245 +- + sound/soc/sh/rcar/dvc.c | 247 +- + sound/soc/sh/rcar/gen.c | 118 +- + sound/soc/sh/rcar/mix.c | 145 +- + sound/soc/sh/rcar/rcar_snd.h | 117 - + sound/soc/sh/rcar/rsnd.h | 281 +- + sound/soc/sh/rcar/rsrc-card.c | 6 +- + sound/soc/sh/rcar/src.c | 894 +---- + sound/soc/sh/rcar/ssi.c | 577 ++- + sound/soc/sh/rcar/ssiu.c | 178 + + sound/soc/soc-ac97.c | 125 + + sound/soc/soc-core.c | 476 ++- + sound/soc/soc-dapm.c | 12 +- + sound/soc/soc-ops.c | 4 +- + sound/soc/soc-pcm.c | 25 +- + sound/soc/sti/uniperif_player.c | 3 +- + sound/soc/tegra/tegra_wm8903.c | 3 +- + 153 files changed, 21145 insertions(+), 3576 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/da7218.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,i2s-in.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,i2s-out.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,parallel-out.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,spdif-in.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,spdif-out.txt + create mode 100644 Documentation/devicetree/bindings/sound/inno-rk3036.txt + create mode 100644 Documentation/devicetree/bindings/sound/rt5659.txt + create mode 100644 Documentation/sound/alsa/img,spdif-in.txt + create mode 100644 include/sound/da7218.h + create mode 100644 include/sound/rt5659.h + create mode 100644 sound/soc/codecs/cs47l24.c + create mode 100644 sound/soc/codecs/cs47l24.h + create mode 100644 sound/soc/codecs/da7218.c + create mode 100644 sound/soc/codecs/da7218.h + create mode 100644 sound/soc/codecs/hdac_hdmi.c + create mode 100644 sound/soc/codecs/inno_rk3036.c + create mode 100644 sound/soc/codecs/inno_rk3036.h + create mode 100644 sound/soc/codecs/rt5659.c + create mode 100644 sound/soc/codecs/rt5659.h + create mode 100644 sound/soc/img/Kconfig + create mode 100644 sound/soc/img/Makefile + create mode 100644 sound/soc/img/img-i2s-in.c + create mode 100644 sound/soc/img/img-i2s-out.c + create mode 100644 sound/soc/img/img-parallel-out.c + create mode 100644 sound/soc/img/img-spdif-in.c + create mode 100644 sound/soc/img/img-spdif-out.c + create mode 100644 sound/soc/intel/boards/skl_nau88l25_ssm4567.c + create mode 100644 sound/soc/intel/common/sst-acpi.h + create mode 100644 sound/soc/intel/common/sst-match-acpi.c + create mode 100644 sound/soc/sh/rcar/cmd.c + delete mode 100644 sound/soc/sh/rcar/rcar_snd.h + create mode 100644 sound/soc/sh/rcar/ssiu.c +Merging modules/modules-next (b3212ec77dd1 module: keep percpu symbols in module's symtab) +$ git merge modules/modules-next +Auto-merging arch/arc/kernel/unwind.c +Merge made by the 'recursive' strategy. + arch/alpha/kernel/module.c | 2 +- + arch/arc/kernel/unwind.c | 4 +- + arch/arm/kernel/module-plts.c | 2 +- + arch/avr32/kernel/module.c | 12 +- + arch/ia64/kernel/module.c | 14 +- + arch/metag/kernel/module.c | 4 +- + arch/mips/kernel/vpe.c | 6 +- + arch/parisc/kernel/module.c | 32 ++-- + arch/powerpc/kernel/module_32.c | 6 +- + arch/s390/kernel/module.c | 22 +-- + arch/x86/kernel/livepatch.c | 6 +- + include/linux/module.h | 68 ++++---- + kernel/debug/kdb/kdb_main.c | 4 +- + kernel/gcov/base.c | 7 +- + kernel/module.c | 349 +++++++++++++++++++--------------------- + 15 files changed, 256 insertions(+), 282 deletions(-) +Merging input/next (5e0baca8b324 Input: parkbd - drop bogus __init from parkbd_allocate_serio()) +$ git merge input/next +Already up-to-date. +Merging block/for-next (5eb4acb07a6e Merge branch 'for-4.5/nvme' into for-next) +$ git merge block/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 11 +- + block/bio.c | 4 +- + block/blk-core.c | 15 +- + block/blk-mq-tag.c | 11 +- + block/blk-mq.c | 20 +- + block/blk-mq.h | 11 +- + block/blk-timeout.c | 6 + + block/genhd.c | 2 +- + drivers/block/drbd/drbd_actlog.c | 323 ++++--- + drivers/block/drbd/drbd_bitmap.c | 22 +- + drivers/block/drbd/drbd_debugfs.c | 10 + + drivers/block/drbd/drbd_int.h | 111 ++- + drivers/block/drbd/drbd_main.c | 74 +- + drivers/block/drbd/drbd_nl.c | 1361 +++++++++++++++++++++++--- + drivers/block/drbd/drbd_proc.c | 6 +- + drivers/block/drbd/drbd_protocol.h | 2 +- + drivers/block/drbd/drbd_receiver.c | 254 ++--- + drivers/block/drbd/drbd_req.c | 147 ++- + drivers/block/drbd/drbd_req.h | 17 +- + drivers/block/drbd/drbd_state.c | 428 ++++++++- + drivers/block/drbd/drbd_state.h | 6 +- + drivers/block/drbd/drbd_state_change.h | 63 ++ + drivers/block/drbd/drbd_worker.c | 105 +- + drivers/block/mtip32xx/mtip32xx.c | 2 +- + drivers/block/null_blk.c | 2 +- + drivers/nvme/host/Makefile | 2 +- + drivers/nvme/host/core.c | 1247 ++++++++++++++++++++++++ + drivers/nvme/host/lightnvm.c | 2 +- + drivers/nvme/host/nvme.h | 209 +++- + drivers/nvme/host/pci.c | 1646 ++++++-------------------------- + drivers/nvme/host/scsi.c | 212 ++-- + fs/block_dev.c | 4 +- + include/linux/blk-mq.h | 8 +- + include/linux/blkdev.h | 2 +- + include/linux/drbd.h | 26 +- + include/linux/drbd_genl.h | 149 +++ + include/linux/idr.h | 14 + + include/linux/lru_cache.h | 2 +- + include/linux/nvme.h | 27 +- + lib/lru_cache.c | 4 +- + 40 files changed, 4443 insertions(+), 2124 deletions(-) + create mode 100644 drivers/block/drbd/drbd_state_change.h + create mode 100644 drivers/nvme/host/core.c +Merging device-mapper/for-next (2cd0ff3536f6 dm thin metadata: speed up discard of partially mapped volumes) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-thin-metadata.c | 66 +++++++++++++++++----------- + drivers/md/persistent-data/dm-btree.c | 81 +++++++++++++++++++++++++++++++++++ + drivers/md/persistent-data/dm-btree.h | 7 +++ + 3 files changed, 129 insertions(+), 25 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 (222e0bfc1229 mmc: sdhci: Fix sdhci_runtime_pm_bus_on/off()) +$ git merge mmc-uh/next +Auto-merging lib/Kconfig.debug +Removing include/linux/platform_data/mmc-mvsdio.h +Removing drivers/mmc/host/atmel-mci-regs.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/renesas,mmcif.txt | 1 + + MAINTAINERS | 1 - + drivers/mmc/card/block.c | 4 +- + drivers/mmc/core/core.c | 54 ++++--- + drivers/mmc/core/core.h | 8 + + drivers/mmc/core/host.c | 11 +- + drivers/mmc/core/mmc.c | 21 +-- + drivers/mmc/core/pwrseq.h | 2 +- + drivers/mmc/core/pwrseq_emmc.c | 2 +- + drivers/mmc/core/pwrseq_simple.c | 2 +- + drivers/mmc/core/sd.c | 15 +- + drivers/mmc/core/sdio.c | 2 +- + drivers/mmc/host/Kconfig | 1 + + drivers/mmc/host/atmel-mci-regs.h | 171 --------------------- + drivers/mmc/host/atmel-mci.c | 165 +++++++++++++++++++- + drivers/mmc/host/dw_mmc-rockchip.c | 8 - + drivers/mmc/host/mtk-sd.c | 1 - + drivers/mmc/host/mvsdio.c | 58 ++----- + drivers/mmc/host/omap_hsmmc.c | 6 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 7 +- + drivers/mmc/host/sdhci-of-at91.c | 75 ++++++++- + drivers/mmc/host/sdhci-of-esdhc.c | 10 ++ + drivers/mmc/host/sdhci-pci-core.c | 2 +- + drivers/mmc/host/sdhci-pltfm.c | 3 +- + drivers/mmc/host/sdhci.c | 105 ++++++------- + drivers/mmc/host/sdhci.h | 21 +-- + drivers/mmc/host/sh_mmcif.c | 84 +++++----- + include/linux/mmc/host.h | 6 +- + include/linux/platform_data/mmc-mvsdio.h | 18 --- + lib/Kconfig.debug | 3 +- + 30 files changed, 430 insertions(+), 437 deletions(-) + delete mode 100644 drivers/mmc/host/atmel-mci-regs.h + delete mode 100644 include/linux/platform_data/mmc-mvsdio.h +Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 5261 and retry the command. +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (0ddf8219ca27 md-cluster: Protect communication with mutexes) +$ git merge md/for-next +Auto-merging drivers/md/md.c +Merge made by the 'recursive' strategy. + Documentation/md-cluster.txt | 314 +++++++++++++++++++++++++++++++------------ + drivers/md/md-cluster.c | 151 +++++++++++++++++++-- + drivers/md/md-cluster.h | 2 + + drivers/md/md.c | 39 ++++-- + drivers/md/md.h | 5 + + drivers/md/raid5.c | 2 - + 6 files changed, 402 insertions(+), 111 deletions(-) +Merging mfd/for-mfd-next (cc509d5ba2b7 mfd: wm8994: Ensure that the whole MFD is built into a single module) +$ git merge mfd/for-mfd-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/snps-dwapb-gpio.txt | 2 +- + Documentation/devicetree/bindings/mfd/arizona.txt | 2 +- + Documentation/devicetree/bindings/mfd/palmas.txt | 2 +- + Documentation/devicetree/bindings/sound/wm8994.txt | 2 +- + drivers/mfd/Makefile | 3 +- + drivers/mfd/lpc_ich.c | 15 ++ + drivers/mfd/sec-core.c | 39 ++++- + drivers/mfd/sec-irq.c | 8 ++ + drivers/regulator/Kconfig | 4 +- + drivers/regulator/s2mps11.c | 143 ++++++++++++++++++- + drivers/rtc/rtc-s5m.c | 37 ++++- + include/linux/mfd/samsung/core.h | 1 + + include/linux/mfd/samsung/rtc.h | 2 + + include/linux/mfd/samsung/s2mps15.h | 158 +++++++++++++++++++++ + 14 files changed, 398 insertions(+), 20 deletions(-) + create mode 100644 include/linux/mfd/samsung/s2mps15.h +Merging backlight/for-backlight-next (6be3a5a9cd91 backlight: adp88x0: Fix uninitialized variable use) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/adp8860_bl.c | 10 ++++++---- + drivers/video/backlight/adp8870_bl.c | 10 ++++++---- + 2 files changed, 12 insertions(+), 8 deletions(-) +Merging battery/master (0fe69b960ae2 power: bq27xxx_battery: Add I2C module check dependency in Kconfig) +$ git merge battery/master +Merge made by the 'recursive' strategy. + drivers/power/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging omap_dss2/for-next (d890dccfae78 video: omapdss: delete unneeded of_node_put) +$ git merge omap_dss2/for-next +Merge made by the 'recursive' strategy. + .../bindings/display/simple-framebuffer.txt | 13 ++- + drivers/video/fbdev/geode/display_gx1.c | 2 +- + drivers/video/fbdev/geode/display_gx1.h | 2 +- + drivers/video/fbdev/geode/geodefb.h | 4 +- + drivers/video/fbdev/geode/video_cs5530.c | 2 +- + drivers/video/fbdev/geode/video_cs5530.h | 2 +- + drivers/video/fbdev/i740fb.c | 8 +- + drivers/video/fbdev/omap2/dss/dispc-compat.c | 6 +- + drivers/video/fbdev/omap2/dss/dispc.c | 6 +- + drivers/video/fbdev/omap2/dss/dsi.c | 2 +- + drivers/video/fbdev/omap2/dss/manager.c | 2 +- + drivers/video/fbdev/omap2/dss/omapdss-boot-init.c | 4 +- + drivers/video/fbdev/simplefb.c | 120 ++++++++++++++++++++- + 13 files changed, 146 insertions(+), 27 deletions(-) +Merging regulator/for-next (9fd2c257f960 Merge remote-tracking branch 'regulator/topic/tps65218' into regulator-next) +$ git merge regulator/for-next +Auto-merging drivers/regulator/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/regulator/lm363x-regulator.txt | 34 ++ + .../devicetree/bindings/regulator/pv88060.txt | 124 ++++++ + drivers/regulator/Kconfig | 25 ++ + drivers/regulator/Makefile | 3 + + drivers/regulator/core.c | 6 +- + drivers/regulator/devres.c | 7 +- + drivers/regulator/lm363x-regulator.c | 291 ++++++++++++++ + drivers/regulator/pv88060-regulator.c | 437 +++++++++++++++++++++ + drivers/regulator/pv88060-regulator.h | 69 ++++ + drivers/regulator/tps6105x-regulator.c | 95 +---- + drivers/regulator/tps65086-regulator.c | 250 ++++++++++++ + drivers/regulator/tps65218-regulator.c | 137 +++++-- + include/linux/mfd/tps65218.h | 7 +- + include/linux/regulator/consumer.h | 3 + + include/linux/regulator/driver.h | 2 + + 15 files changed, 1372 insertions(+), 118 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/lm363x-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/pv88060.txt + create mode 100644 drivers/regulator/lm363x-regulator.c + create mode 100644 drivers/regulator/pv88060-regulator.c + create mode 100644 drivers/regulator/pv88060-regulator.h + create mode 100644 drivers/regulator/tps65086-regulator.c +Merging security/next (ebd68df3f24b Sync to Linus v4.4-rc2 for LSM developers.) +$ git merge security/next +Merge made by the 'recursive' strategy. + include/linux/capability.h | 22 ++++++++-------------- + 1 file changed, 8 insertions(+), 14 deletions(-) +Merging integrity/next (e596de92e5f6 evm: EVM_LOAD_X509 depends on EVM) +$ git merge integrity/next +Merge made by the 'recursive' strategy. + include/linux/evm.h | 7 +++++ + security/integrity/Kconfig | 11 ++++++++ + security/integrity/digsig.c | 14 ++++++++-- + security/integrity/evm/Kconfig | 17 ++++++++++++ + security/integrity/evm/evm.h | 3 +++ + security/integrity/evm/evm_crypto.c | 54 ++++++++++++++++++++++++++++++++----- + security/integrity/evm/evm_main.c | 32 +++++++++++++++++++--- + security/integrity/evm/evm_secfs.c | 12 +++------ + security/integrity/iint.c | 1 + + security/integrity/ima/Kconfig | 5 +++- + security/integrity/ima/ima.h | 12 --------- + security/integrity/ima/ima_init.c | 2 +- + security/integrity/integrity.h | 13 ++++++--- + 13 files changed, 146 insertions(+), 37 deletions(-) +Merging selinux/next (92f190d2a1ec selinux: rate-limit netlink message warnings in selinux_nlmsg_perm()) +$ git merge selinux/next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1611 and retry the command. +Auto-merging security/selinux/hooks.c +Auto-merging kernel/audit.h +Auto-merging kernel/audit.c +Auto-merging include/linux/audit.h +Auto-merging fs/gfs2/glops.c +Merge made by the 'recursive' strategy. + fs/gfs2/glops.c | 2 + + include/linux/audit.h | 8 +- + include/linux/lsm_hooks.h | 10 +- + include/linux/security.h | 13 ++- + kernel/audit.c | 2 +- + kernel/audit.h | 2 +- + kernel/auditsc.c | 6 +- + security/security.c | 12 ++- + security/selinux/hooks.c | 206 +++++++++++++++++++++++++----------- + security/selinux/include/classmap.h | 2 +- + security/selinux/include/objsec.h | 6 ++ + security/selinux/include/security.h | 3 + + security/selinux/selinuxfs.c | 80 ++++++++++++++ + security/selinux/ss/services.c | 34 ++++-- + security/smack/smack_lsm.c | 4 +- + 15 files changed, 302 insertions(+), 88 deletions(-) +Merging lblnet/next (b2776bf7149b Linux 3.18) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (31ade3b83e18 Linux 4.4-rc3) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (b67ad2f7c751 Merge branches 'x86/vt-d', 'arm/omap', 'arm/smmu', 's390', 'core' and 'x86/amd' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (0bdec95ce52d iommu/vt-d: Fix rwxp flags in SVM device fault callback) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (222e684ca762 vfio/pci: make an array larger) +$ git merge vfio/next +Already up-to-date. +Merging jc_docs/docs-next (04bed3278abf Merge branch 'doc/4.5' into docs-next) +$ git merge jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/DocBook/Makefile | 10 +++++++--- + Documentation/DocBook/iio.tmpl | 2 +- + Documentation/arm/Marvell/README | 22 +++++++++++++--------- + Documentation/gpio/consumer.txt | 2 +- + Documentation/gpio/driver.txt | 6 +++--- + Documentation/gpio/drivers-on-gpio.txt | 6 +++--- + Documentation/ioctl/botching-up-ioctls.txt | 6 +++--- + Documentation/stable_kernel_rules.txt | 2 +- + scripts/kernel-doc | 5 ++++- + 9 files changed, 36 insertions(+), 25 deletions(-) +Merging trivial/for-next (75021d28594d Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (08b9fd158f1d audit: force seccomp event logging to honor the audit_enabled flag) +$ git merge audit/next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1611 and retry the command. +Resolved 'kernel/audit.c' using previous resolution. +Auto-merging kernel/audit.c +CONFLICT (content): Merge conflict in kernel/audit.c +Auto-merging include/linux/audit.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8e56dbd4ab16] Merge remote-tracking branch 'audit/next' +$ git diff -M --stat --summary HEAD^.. + include/linux/audit.h | 204 +++++++++++++++++++++++++------------------------- + kernel/audit.c | 17 ++--- + 2 files changed, 111 insertions(+), 110 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 (7c107b826a97 Merge branch 'dt/linus' into for-next) +$ git merge dt-rh/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/sram/sunxi-sram.txt +Auto-merging Documentation/devicetree/bindings/sram/samsung-sram.txt +Auto-merging Documentation/devicetree/bindings/sram/rockchip-smp-sram.txt +Auto-merging Documentation/devicetree/bindings/arm/cpus.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/arm,scpi.txt | 2 +- + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + Documentation/devicetree/bindings/arm/secure.txt | 53 ++++++++++++++++++ + .../devicetree/bindings/mtd/fsl-quadspi.txt | 3 +- + .../pmu-sram.txt => sram/rockchip-pmu-sram.txt} | 0 + .../smp-sram.txt => sram/rockchip-smp-sram.txt} | 2 +- + .../smp-sysram.txt => sram/samsung-sram.txt} | 2 +- + .../devicetree/bindings/{misc => sram}/sram.txt | 0 + .../{soc/sunxi/sram.txt => sram/sunxi-sram.txt} | 2 +- + .../devicetree/bindings/usb/octeon-usb.txt | 62 ++++++++++++++++++++++ + Documentation/devicetree/bindings/usb/usb3503.txt | 5 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/of/address.c | 5 +- + drivers/of/fdt.c | 2 +- + drivers/of/of_reserved_mem.c | 8 ++- + 15 files changed, 138 insertions(+), 10 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/secure.txt + rename Documentation/devicetree/bindings/{arm/rockchip/pmu-sram.txt => sram/rockchip-pmu-sram.txt} (100%) + rename Documentation/devicetree/bindings/{arm/rockchip/smp-sram.txt => sram/rockchip-smp-sram.txt} (92%) + rename Documentation/devicetree/bindings/{arm/exynos/smp-sysram.txt => sram/samsung-sram.txt} (95%) + rename Documentation/devicetree/bindings/{misc => sram}/sram.txt (100%) + rename Documentation/devicetree/bindings/{soc/sunxi/sram.txt => sram/sunxi-sram.txt} (97%) + create mode 100644 Documentation/devicetree/bindings/usb/octeon-usb.txt +Merging mailbox/mailbox-for-next (bfbcfa770b1c mailbox: constify mbox_chan_ops structure) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + drivers/mailbox/mailbox-sti.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging spi/for-next (d7a5f372bc54 Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/spidev' and 'spi/topic/sun4i' into spi-next) +$ git merge spi/for-next +Auto-merging tools/spi/spidev_test.c +Auto-merging arch/arm/plat-samsung/devs.c +Removing Documentation/spi/Makefile +Merge made by the 'recursive' strategy. + Documentation/Makefile | 2 +- + .../devicetree/bindings/spi/spi-mt65xx.txt | 4 +- + Documentation/spi/00-INDEX | 4 - + Documentation/spi/Makefile | 8 -- + arch/arm/plat-samsung/devs.c | 19 ++-- + drivers/spi/spi-bcm63xx.c | 11 +- + drivers/spi/spi-dw-mid.c | 2 +- + drivers/spi/spi-dw.h | 2 +- + drivers/spi/spi-mt65xx.c | 40 ++++--- + drivers/spi/spi-omap2-mcspi.c | 12 ++- + drivers/spi/spi-pl022.c | 28 +++-- + drivers/spi/spi-pxa2xx.c | 3 - + drivers/spi/spi-s3c64xx.c | 27 ++--- + drivers/spi/spi-sun4i.c | 8 +- + drivers/spi/spi-sun6i.c | 8 +- + drivers/spi/spi.c | 2 + + include/linux/platform_data/spi-s3c64xx.h | 2 + + tools/Makefile | 7 +- + {Documentation => tools}/spi/.gitignore | 0 + tools/spi/Makefile | 4 + + {Documentation => tools}/spi/spidev_fdx.c | 0 + {Documentation => tools}/spi/spidev_test.c | 119 +++++++++++++++++---- + 22 files changed, 204 insertions(+), 108 deletions(-) + delete mode 100644 Documentation/spi/Makefile + rename {Documentation => tools}/spi/.gitignore (100%) + create mode 100644 tools/spi/Makefile + rename {Documentation => tools}/spi/spidev_fdx.c (100%) + rename {Documentation => tools}/spi/spidev_test.c (75%) +Merging tip/auto-latest (d20d11249a95 Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Removing tools/perf/util/include/linux/string.h +Auto-merging tools/Makefile +Auto-merging include/linux/wait.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/x86/x86_64/mm.txt | 12 +- + MAINTAINERS | 2 +- + arch/blackfin/kernel/perf_event.c | 2 +- + arch/sh/kernel/perf_event.c | 2 +- + arch/sparc/kernel/perf_event.c | 2 +- + arch/tile/kernel/perf_event.c | 2 +- + arch/x86/Kconfig.debug | 2 +- + arch/x86/entry/calling.h | 15 + + arch/x86/entry/entry_32.S | 13 +- + arch/x86/entry/entry_64.S | 27 +- + arch/x86/entry/entry_64_compat.S | 20 +- + arch/x86/include/asm/apic.h | 1 + + arch/x86/include/asm/calgary.h | 2 +- + arch/x86/include/asm/cpu.h | 3 + + arch/x86/include/asm/cpufeature.h | 1 + + arch/x86/include/asm/efi.h | 26 ++ + arch/x86/include/asm/fpu/internal.h | 173 +++++----- + arch/x86/include/asm/intel_pt.h | 10 + + arch/x86/include/asm/ipi.h | 2 + + arch/x86/include/asm/jump_label.h | 63 +++- + arch/x86/include/asm/microcode.h | 39 +-- + arch/x86/include/asm/msr-index.h | 1 + + arch/x86/include/asm/msr.h | 12 +- + arch/x86/include/asm/paravirt.h | 38 --- + arch/x86/include/asm/paravirt_types.h | 35 --- + arch/x86/include/asm/pgtable.h | 15 +- + arch/x86/include/asm/qspinlock_paravirt.h | 59 ++++ + arch/x86/include/asm/smp.h | 12 - + arch/x86/include/asm/suspend_32.h | 1 + + arch/x86/include/asm/suspend_64.h | 1 + + arch/x86/include/asm/uaccess.h | 9 + + arch/x86/include/asm/x86_init.h | 2 - + arch/x86/include/uapi/asm/mce.h | 2 +- + arch/x86/kernel/apic/apic.c | 11 +- + arch/x86/kernel/apic/apic_flat_64.c | 19 +- + arch/x86/kernel/apic/apic_noop.c | 2 + + arch/x86/kernel/apic/apic_numachip.c | 2 + + arch/x86/kernel/apic/bigsmp_32.c | 10 +- + arch/x86/kernel/apic/ipi.c | 18 ++ + arch/x86/kernel/apic/probe_32.c | 1 + + arch/x86/kernel/apic/x2apic_cluster.c | 9 + + arch/x86/kernel/apic/x2apic_phys.c | 9 + + arch/x86/kernel/apic/x2apic_uv_x.c | 1 + + arch/x86/kernel/asm-offsets.c | 3 - + arch/x86/kernel/asm-offsets_64.c | 1 - + arch/x86/kernel/cpu/amd.c | 4 +- + arch/x86/kernel/cpu/common.c | 13 +- + arch/x86/kernel/cpu/mcheck/mce.c | 82 ++--- + arch/x86/kernel/cpu/microcode/core.c | 13 +- + arch/x86/kernel/cpu/microcode/intel.c | 16 +- + arch/x86/kernel/cpu/perf_event.c | 24 +- + arch/x86/kernel/cpu/perf_event.h | 7 +- + arch/x86/kernel/cpu/perf_event_intel.c | 2 +- + arch/x86/kernel/cpu/perf_event_intel_cqm.c | 2 +- + arch/x86/kernel/cpu/perf_event_intel_lbr.c | 23 +- + arch/x86/kernel/cpu/perf_event_intel_pt.c | 9 + + arch/x86/kernel/cpu/rdrand.c | 25 +- + arch/x86/kernel/crash.c | 11 + + arch/x86/kernel/fpu/init.c | 4 +- + arch/x86/kernel/fpu/xstate.c | 4 +- + arch/x86/kernel/irq_work.c | 2 +- + arch/x86/kernel/paravirt.c | 36 +-- + arch/x86/kernel/paravirt_patch_32.c | 2 - + arch/x86/kernel/paravirt_patch_64.c | 3 - + arch/x86/kernel/pci-calgary_64.c | 4 +- + arch/x86/kernel/setup.c | 2 - + arch/x86/kernel/smp.c | 4 +- + arch/x86/kernel/smpboot.c | 16 +- + arch/x86/kernel/tsc.c | 2 - + arch/x86/kernel/vmlinux.lds.S | 1 + + arch/x86/kernel/x86_init.c | 1 - + arch/x86/kvm/cpuid.h | 34 ++ + arch/x86/kvm/svm.c | 17 + + arch/x86/lguest/boot.c | 1 - + arch/x86/lib/Makefile | 2 +- + arch/x86/lib/cpu.c | 35 +++ + arch/x86/mm/Makefile | 1 + + arch/x86/mm/debug_pagetables.c | 46 +++ + arch/x86/mm/dump_pagetables.c | 34 +- + arch/x86/mm/pageattr.c | 17 +- + arch/x86/mm/pgtable.c | 7 +- + arch/x86/platform/efi/efi.c | 39 +-- + arch/x86/platform/efi/efi_32.c | 5 + + arch/x86/platform/efi/efi_64.c | 157 +++++++-- + arch/x86/platform/efi/efi_stub_64.S | 43 --- + arch/x86/power/cpu.c | 92 ++++++ + arch/x86/xen/enlighten.c | 14 +- + arch/x86/xen/mmu.c | 1 - + arch/x86/xen/xen-asm_32.S | 14 - + arch/x86/xen/xen-asm_64.S | 19 -- + arch/x86/xen/xen-ops.h | 3 - + include/asm-generic/qspinlock.h | 9 +- + include/asm-generic/tlb.h | 2 +- + include/linux/clocksource.h | 16 +- + include/linux/context_tracking_state.h | 4 +- + include/linux/jump_label.h | 2 +- + include/linux/lockdep.h | 2 +- + include/linux/perf_event.h | 6 +- + include/linux/proportions.h | 2 +- + include/linux/sched.h | 4 +- + include/linux/stop_machine.h | 7 +- + include/linux/uprobes.h | 2 +- + include/linux/wait.h | 30 ++ + include/uapi/linux/perf_event.h | 6 + + kernel/context_tracking.c | 4 +- + kernel/events/callchain.c | 2 +- + kernel/events/core.c | 33 +- + kernel/events/ring_buffer.c | 2 +- + kernel/events/uprobes.c | 2 +- + kernel/irq/chip.c | 8 +- + kernel/irq_work.c | 2 +- + kernel/jump_label.c | 2 +- + kernel/locking/lockdep.c | 2 +- + kernel/locking/lockdep_proc.c | 2 +- + kernel/locking/qspinlock.c | 48 ++- + kernel/locking/qspinlock_paravirt.h | 43 ++- + kernel/sched/clock.c | 2 +- + kernel/sched/core.c | 17 +- + kernel/sched/fair.c | 218 ++++++++----- + kernel/sched/idle_task.c | 1 - + kernel/sched/rt.c | 2 +- + kernel/sched/sched.h | 8 - + kernel/stop_machine.c | 84 +++-- + kernel/time/tick-sched.c | 28 +- + kernel/trace/trace_event_perf.c | 2 +- + lib/atomic64_test.c | 120 ++++--- + lib/btree.c | 2 +- + lib/proportions.c | 2 +- + mm/page-writeback.c | 2 +- + tools/Makefile | 2 +- + tools/build/Makefile | 2 +- + tools/build/Makefile.include | 2 +- + tools/include/linux/string.h | 11 + + tools/lib/bpf/Makefile | 10 + + tools/lib/bpf/bpf.c | 14 + + tools/lib/bpf/bpf.h | 2 + + tools/lib/bpf/libbpf.c | 398 ++++++++++++++++++----- + tools/lib/bpf/libbpf.h | 88 ++++++ + tools/lib/string.c | 62 ++++ + tools/lib/traceevent/event-parse.c | 5 +- + tools/perf/Build | 1 + + tools/perf/Documentation/perf-config.txt | 103 ++++++ + tools/perf/Documentation/perf-report.txt | 14 +- + tools/perf/MANIFEST | 2 + + tools/perf/Makefile.perf | 2 +- + tools/perf/arch/x86/include/arch-tests.h | 8 +- + tools/perf/arch/x86/tests/insn-x86.c | 2 +- + tools/perf/arch/x86/tests/intel-cqm.c | 2 +- + tools/perf/arch/x86/tests/perf-time-to-tsc.c | 2 +- + tools/perf/arch/x86/tests/rdpmc.c | 2 +- + tools/perf/arch/x86/util/Build | 1 + + tools/perf/builtin-config.c | 66 ++++ + tools/perf/builtin-report.c | 23 +- + tools/perf/builtin-script.c | 67 ++-- + tools/perf/builtin-stat.c | 7 + + tools/perf/builtin.h | 1 + + tools/perf/command-list.txt | 1 + + tools/perf/config/Makefile | 12 + + tools/perf/perf.c | 1 + + tools/perf/tests/.gitignore | 1 + + tools/perf/tests/Build | 9 +- + tools/perf/tests/attr.c | 2 +- + tools/perf/tests/bp_signal.c | 2 +- + tools/perf/tests/bp_signal_overflow.c | 2 +- + tools/perf/tests/bpf-script-test-prologue.c | 35 +++ + tools/perf/tests/bpf.c | 93 ++++-- + tools/perf/tests/builtin-test.c | 112 ++++++- + tools/perf/tests/code-reading.c | 2 +- + tools/perf/tests/dso-data.c | 6 +- + tools/perf/tests/dwarf-unwind.c | 29 +- + tools/perf/tests/evsel-roundtrip-name.c | 2 +- + tools/perf/tests/evsel-tp-sched.c | 2 +- + tools/perf/tests/fdarray.c | 4 +- + tools/perf/tests/hists_cumulate.c | 2 +- + tools/perf/tests/hists_filter.c | 2 +- + tools/perf/tests/hists_link.c | 2 +- + tools/perf/tests/hists_output.c | 2 +- + tools/perf/tests/keep-tracking.c | 2 +- + tools/perf/tests/kmod-path.c | 2 +- + tools/perf/tests/llvm.c | 75 +++-- + tools/perf/tests/llvm.h | 2 + + tools/perf/tests/mmap-basic.c | 2 +- + tools/perf/tests/mmap-thread-lookup.c | 2 +- + tools/perf/tests/openat-syscall-all-cpus.c | 2 +- + tools/perf/tests/openat-syscall-tp-fields.c | 2 +- + tools/perf/tests/openat-syscall.c | 2 +- + tools/perf/tests/parse-events.c | 2 +- + tools/perf/tests/parse-no-sample-id-all.c | 2 +- + tools/perf/tests/perf-record.c | 2 +- + tools/perf/tests/pmu.c | 2 +- + tools/perf/tests/python-use.c | 3 +- + tools/perf/tests/sample-parsing.c | 2 +- + tools/perf/tests/sw-clock.c | 2 +- + tools/perf/tests/switch-tracking.c | 2 +- + tools/perf/tests/task-exit.c | 2 +- + tools/perf/tests/tests.h | 89 +++--- + tools/perf/tests/thread-map.c | 2 +- + tools/perf/tests/thread-mg-share.c | 2 +- + tools/perf/tests/topology.c | 2 +- + tools/perf/tests/vmlinux-kallsyms.c | 2 +- + tools/perf/ui/browsers/hists.c | 320 +++++++++++++++++-- + tools/perf/ui/gtk/hists.c | 148 ++++++++- + tools/perf/ui/stdio/hist.c | 94 +++++- + tools/perf/util/Build | 7 + + tools/perf/util/bpf-loader.c | 433 ++++++++++++++++++++++++- + tools/perf/util/bpf-loader.h | 4 + + tools/perf/util/bpf-prologue.c | 455 +++++++++++++++++++++++++++ + tools/perf/util/bpf-prologue.h | 34 ++ + tools/perf/util/build-id.c | 2 +- + tools/perf/util/callchain.c | 136 +++++++- + tools/perf/util/callchain.h | 29 +- + tools/perf/util/dso.c | 2 + + tools/perf/util/evsel.c | 1 + + tools/perf/util/exec_cmd.c | 21 +- + tools/perf/util/exec_cmd.h | 5 +- + tools/perf/util/help.c | 6 +- + tools/perf/util/hist.c | 6 - + tools/perf/util/include/linux/string.h | 3 - + tools/perf/util/machine.c | 49 ++- + tools/perf/util/map.c | 4 +- + tools/perf/util/parse-events.c | 6 +- + tools/perf/util/probe-event.c | 7 +- + tools/perf/util/probe-finder.c | 6 +- + tools/perf/util/string.c | 16 - + tools/perf/util/symbol-elf.c | 2 + + tools/perf/util/symbol.c | 65 ++-- + tools/perf/util/symbol.h | 3 +- + tools/perf/util/unwind-libdw.c | 53 +++- + tools/perf/util/unwind-libdw.h | 2 + + tools/perf/util/unwind-libunwind.c | 60 ++-- + tools/perf/util/util.c | 3 +- + 231 files changed, 4320 insertions(+), 1406 deletions(-) + create mode 100644 arch/x86/include/asm/intel_pt.h + create mode 100644 arch/x86/lib/cpu.c + create mode 100644 arch/x86/mm/debug_pagetables.c + create mode 100644 tools/include/linux/string.h + create mode 100644 tools/lib/string.c + create mode 100644 tools/perf/Documentation/perf-config.txt + create mode 100644 tools/perf/builtin-config.c + create mode 100644 tools/perf/tests/bpf-script-test-prologue.c + create mode 100644 tools/perf/util/bpf-prologue.c + create mode 100644 tools/perf/util/bpf-prologue.h + delete mode 100644 tools/perf/util/include/linux/string.h +Merging clockevents/clockevents/next (2527dfeb1f64 clocksource/drivers/tango-xtal: Replace code by clocksource_mmio_init) +$ git merge clockevents/clockevents/next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1621 and retry the command. +Resolved 'arch/arm/mach-exynos/Kconfig' using previous resolution. +Resolved 'arch/h8300/Kconfig' using previous resolution. +Resolved 'arch/h8300/include/asm/io.h' using previous resolution. +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Auto-merging arch/h8300/kernel/setup.c +Auto-merging arch/h8300/include/asm/io.h +CONFLICT (content): Merge conflict in arch/h8300/include/asm/io.h +Auto-merging arch/h8300/Kconfig +CONFLICT (content): Merge conflict in arch/h8300/Kconfig +Auto-merging arch/arm/mach-ux500/Kconfig +Auto-merging arch/arm/mach-sti/Kconfig +Auto-merging arch/arm/mach-exynos/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig +Auto-merging arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0323149d7bf2] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 3 + + arch/arm/mach-exynos/Kconfig | 7 +- + arch/arm/mach-sti/Kconfig | 1 + + arch/arm/mach-ux500/Kconfig | 1 + + arch/h8300/Kconfig | 1 + + arch/h8300/include/asm/io.h | 39 +++--- + arch/h8300/kernel/setup.c | 8 +- + drivers/clocksource/Kconfig | 132 +++++++++++++----- + drivers/clocksource/Makefile | 2 +- + drivers/clocksource/dw_apb_timer_of.c | 16 +++ + drivers/clocksource/h8300_timer16.c | 201 ++++++++++------------------ + drivers/clocksource/h8300_timer8.c | 243 ++++++++++++---------------------- + drivers/clocksource/h8300_tpu.c | 159 ++++++++-------------- + drivers/clocksource/mtk_timer.c | 20 +-- + drivers/clocksource/rockchip_timer.c | 23 ++-- + drivers/clocksource/tango_xtal.c | 18 +-- + drivers/clocksource/tegra20_timer.c | 3 +- + drivers/clocksource/timer-sun5i.c | 16 +-- + drivers/clocksource/vt8500_timer.c | 1 - + drivers/irqchip/irq-renesas-h8300h.c | 8 +- + include/linux/sched_clock.h | 12 +- + 21 files changed, 399 insertions(+), 515 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 (e8f937da744f EDAC, pci: Remove old disabled code) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + drivers/edac/edac_pci.c | 35 ----------------------------------- + 1 file changed, 35 deletions(-) +Merging irqchip/irqchip/for-next (86e57ca735a7 irqchip/renesas-intc-irqpin: Improve clock error handling and reporting) +$ git merge irqchip/irqchip/for-next +Removing include/linux/platform_data/irq-renesas-intc-irqpin.h +Merge made by the 'recursive' strategy. + drivers/irqchip/irq-renesas-intc-irqpin.c | 96 ++++++++++++---------- + .../linux/platform_data/irq-renesas-intc-irqpin.h | 29 ------- + 2 files changed, 51 insertions(+), 74 deletions(-) + delete mode 100644 include/linux/platform_data/irq-renesas-intc-irqpin.h +Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) +$ git merge tiny/tiny/next +Already up-to-date. +Merging ftrace/for-next (39daa7b9e895 ftrace: Show all tramps registered to a record on ftrace_bug()) +$ git merge ftrace/for-next +Merge made by the 'recursive' strategy. + arch/x86/kernel/ftrace.c | 9 +++ + include/linux/ftrace.h | 15 ++++ + kernel/trace/ftrace.c | 92 +++++++++++++++++++--- + kernel/trace/ring_buffer.c | 57 ++++++-------- + kernel/trace/trace_events_trigger.c | 10 ++- + .../selftests/ftrace/test.d/instances/instance.tc | 90 +++++++++++++++++++++ + 6 files changed, 226 insertions(+), 47 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/test.d/instances/instance.tc +Merging rcu/rcu/next (27cddb87da60 rcu: Print symbolic name for ->gp_state) +$ git merge rcu/rcu/next +Auto-merging kernel/sched/core.c +Merge made by the 'recursive' strategy. + .../RCU/Design/Requirements/2013-08-is-it-dead.png | Bin 0 -> 100825 bytes + .../Design/Requirements/GPpartitionReaders1.svg | 374 +++ + .../RCU/Design/Requirements/RCUApplicability.svg | 237 ++ + .../Design/Requirements/ReadersPartitionGP1.svg | 639 +++++ + .../RCU/Design/Requirements/Requirements.html | 2897 ++++++++++++++++++++ + .../RCU/Design/Requirements/Requirements.htmlx | 2741 ++++++++++++++++++ + Documentation/RCU/Design/htmlqqz.sh | 108 + + Documentation/circular-buffers.txt | 4 +- + include/linux/list.h | 14 +- + include/linux/list_bl.h | 2 +- + include/linux/list_nulls.h | 2 +- + include/linux/rculist.h | 69 +- + include/linux/rcupdate.h | 6 +- + include/linux/rcutiny.h | 8 + + include/linux/rcutree.h | 4 +- + include/linux/tracepoint.h | 4 +- + kernel/rcu/rcutorture.c | 24 +- + kernel/rcu/tree.c | 307 ++- + kernel/rcu/tree.h | 58 +- + kernel/rcu/tree_plugin.h | 60 +- + kernel/rcu/tree_trace.c | 39 +- + kernel/sched/core.c | 6 +- + lib/list_debug.c | 2 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 4 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 22 +- + .../testing/selftests/rcutorture/doc/TINY_RCU.txt | 1 - + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 4 - + 27 files changed, 7372 insertions(+), 264 deletions(-) + create mode 100644 Documentation/RCU/Design/Requirements/2013-08-is-it-dead.png + create mode 100644 Documentation/RCU/Design/Requirements/GPpartitionReaders1.svg + create mode 100644 Documentation/RCU/Design/Requirements/RCUApplicability.svg + create mode 100644 Documentation/RCU/Design/Requirements/ReadersPartitionGP1.svg + create mode 100644 Documentation/RCU/Design/Requirements/Requirements.html + create mode 100644 Documentation/RCU/Design/Requirements/Requirements.htmlx + create mode 100755 Documentation/RCU/Design/htmlqqz.sh +Merging kvm/linux-next (bb11c6c96544 KVM: x86: MMU: Remove unused parameter parent_pte from kvm_mmu_get_page()) +$ git merge kvm/linux-next +Auto-merging arch/x86/kvm/svm.c +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 41 +++++ + Documentation/virtual/kvm/mmu.txt | 4 +- + arch/powerpc/kvm/book3s_pr.c | 4 +- + arch/x86/include/asm/kvm_host.h | 34 +++- + arch/x86/kvm/hyperv.c | 335 +++++++++++++++++++++++++++++++++ + arch/x86/kvm/hyperv.h | 23 +++ + arch/x86/kvm/ioapic.c | 4 +- + arch/x86/kvm/ioapic.h | 7 +- + arch/x86/kvm/irq.c | 2 +- + arch/x86/kvm/irq_comm.c | 41 ++++- + arch/x86/kvm/lapic.c | 40 ++-- + arch/x86/kvm/lapic.h | 9 +- + arch/x86/kvm/mmu.c | 377 ++++++++++++++++++-------------------- + arch/x86/kvm/mmu_audit.c | 15 +- + arch/x86/kvm/paging_tmpl.h | 20 +- + arch/x86/kvm/svm.c | 37 +++- + arch/x86/kvm/trace.h | 2 +- + arch/x86/kvm/vmx.c | 48 ++--- + arch/x86/kvm/x86.c | 77 ++++++-- + include/linux/kvm_host.h | 14 +- + include/linux/kvm_para.h | 6 +- + include/uapi/linux/kvm.h | 25 +++ + virt/kvm/async_pf.c | 3 +- + virt/kvm/irqchip.c | 7 +- + virt/kvm/kvm_main.c | 6 +- + 25 files changed, 865 insertions(+), 316 deletions(-) +Merging kvm-arm/next (26caea7693cb KVM: arm/arm64: Merge vgic_set_lr() and vgic_sync_lr_elrsr()) +$ 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 (a3eaa8649e4c KVM: VMX: Fix commit which broke PML) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (2f8a43d45d14 KVM: s390: remove redudant assigment of error code) +$ git merge kvms390/next +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/kernel/setup.c +Auto-merging arch/s390/include/asm/sclp.h +Auto-merging arch/s390/include/asm/elf.h +Merge made by the 'recursive' strategy. + arch/powerpc/kvm/book3s_hv.c | 10 +- + arch/s390/include/asm/elf.h | 7 ++ + arch/s390/include/asm/kvm_host.h | 49 +++++++- + arch/s390/include/asm/sclp.h | 8 +- + arch/s390/kernel/processor.c | 6 + + arch/s390/kernel/setup.c | 9 ++ + arch/s390/kvm/diag.c | 11 +- + arch/s390/kvm/gaccess.c | 38 +++++-- + arch/s390/kvm/intercept.c | 7 +- + arch/s390/kvm/interrupt.c | 133 +++++++++++++++++----- + arch/s390/kvm/kvm-s390.c | 237 +++++++++++++++++++++++++++------------ + arch/s390/kvm/kvm-s390.h | 7 ++ + drivers/s390/char/sclp_early.c | 8 +- + include/linux/kvm_host.h | 6 +- + virt/kvm/kvm_main.c | 30 ++--- + 15 files changed, 407 insertions(+), 159 deletions(-) +Merging xen-tip/linux-next (b9fcbcf55dc4 xen/time: use READ_ONCE) +$ git merge xen-tip/linux-next +Auto-merging arch/x86/xen/enlighten.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 20 ++++++ + arch/arm/include/asm/paravirt.h | 20 ++++++ + arch/arm/include/asm/xen/hypercall.h | 7 +++ + arch/arm/include/asm/xen/interface.h | 3 + + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/paravirt.c | 25 ++++++++ + arch/arm/xen/enlighten.c | 95 +++++++++++++++++++++++++++++ + arch/arm/xen/hypercall.S | 1 + + arch/arm64/Kconfig | 20 ++++++ + arch/arm64/include/asm/paravirt.h | 20 ++++++ + arch/arm64/kernel/Makefile | 1 + + arch/arm64/kernel/paravirt.c | 25 ++++++++ + arch/arm64/xen/hypercall.S | 1 + + arch/x86/include/asm/xen/hypercall.h | 6 +- + arch/x86/xen/apic.c | 2 +- + arch/x86/xen/enlighten.c | 8 +-- + arch/x86/xen/time.c | 115 ++++++++++------------------------- + drivers/xen/Makefile | 2 +- + drivers/xen/acpi.c | 2 +- + drivers/xen/efi.c | 30 ++++----- + drivers/xen/pcpu.c | 8 +-- + drivers/xen/time.c | 88 +++++++++++++++++++++++++++ + drivers/xen/xen-acpi-cpuhotplug.c | 2 +- + drivers/xen/xen-acpi-pad.c | 4 +- + drivers/xen/xen-acpi-processor.c | 8 +-- + drivers/xen/xenfs/xensyms.c | 4 +- + include/xen/interface/platform.h | 18 ++++-- + include/xen/interface/xen.h | 2 +- + include/xen/xen-ops.h | 5 ++ + kernel/sched/cputime.c | 3 + + 30 files changed, 419 insertions(+), 127 deletions(-) + create mode 100644 arch/arm/include/asm/paravirt.h + create mode 100644 arch/arm/kernel/paravirt.c + create mode 100644 arch/arm64/include/asm/paravirt.h + create mode 100644 arch/arm64/kernel/paravirt.c + create mode 100644 drivers/xen/time.c +Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + arch/ia64/include/asm/percpu.h | 2 -- + include/linux/percpu-refcount.h | 2 +- + include/linux/percpu.h | 6 ------ + 3 files changed, 1 insertion(+), 9 deletions(-) +Merging workqueues/for-next (4fcfc3013144 Merge branch 'for-4.4' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (0ab19793ecc0 apple-gmux: Assign apple_gmux_data before registering) +$ git merge drivers-x86/for-next +Merge made by the 'recursive' strategy. + drivers/platform/x86/apple-gmux.c | 10 +- + drivers/platform/x86/dell-wmi.c | 61 +++++--- + drivers/platform/x86/toshiba_acpi.c | 246 ++++++++++++++++++++++++++++++- + drivers/platform/x86/toshiba_bluetooth.c | 2 +- + 4 files changed, 285 insertions(+), 34 deletions(-) +Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name) +$ git merge chrome-platform/for-next +Already up-to-date. +Merging regmap/for-next (660d61d7be7b Merge remote-tracking branches 'regmap/topic/mmio' and 'regmap/topic/rbtree' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + arch/mips/boot/dts/brcm/bcm6328.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7125.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7346.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7358.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7360.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7362.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7420.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7425.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7435.dtsi | 1 - + drivers/base/regmap/regcache-flat.c | 2 +- + drivers/base/regmap/regcache-lzo.c | 6 +++--- + drivers/base/regmap/regcache-rbtree.c | 18 ++++++++++++------ + drivers/base/regmap/regmap-irq.c | 13 +++++++------ + drivers/base/regmap/regmap-mmio.c | 16 ++++++++-------- + 14 files changed, 31 insertions(+), 33 deletions(-) +Merging hsi/for-next (403c5c065081 HSI: Remove struct hsi_client private fields from kernel-doc) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + include/linux/hsi/hsi.h | 3 --- + 1 file changed, 3 deletions(-) +Merging leds/for-next (7d3b1770f6db leds: max77693: Add missing of_node_put) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + Documentation/leds/leds-class.txt | 13 +++ + drivers/leds/led-class-flash.c | 8 +- + drivers/leds/led-class.c | 11 ++- + drivers/leds/led-core.c | 120 ++++++++++++++++++------- + drivers/leds/leds-88pm860x.c | 23 ++--- + drivers/leds/leds-aat1290.c | 59 ++++-------- + drivers/leds/leds-adp5520.c | 26 ++---- + drivers/leds/leds-bcm6328.c | 20 ++--- + drivers/leds/leds-bd2802.c | 39 +++----- + drivers/leds/leds-blinkm.c | 87 ++++-------------- + drivers/leds/leds-da903x.c | 46 ++++------ + drivers/leds/leds-da9052.c | 39 +++----- + drivers/leds/leds-dac124s085.c | 38 +++----- + drivers/leds/leds-gpio.c | 62 +++++-------- + drivers/leds/leds-ipaq-micro.c | 6 +- + drivers/leds/leds-ktd2692.c | 50 +++-------- + drivers/leds/leds-lm3533.c | 30 ++----- + drivers/leds/leds-lm355x.c | 85 ++++++------------ + drivers/leds/leds-lm3642.c | 73 +++++---------- + drivers/leds/leds-lp3944.c | 32 ++----- + drivers/leds/leds-lp5521.c | 11 +-- + drivers/leds/leds-lp5523.c | 10 +-- + drivers/leds/leds-lp5562.c | 11 +-- + drivers/leds/leds-lp55xx-common.c | 12 ++- + drivers/leds/leds-lp55xx-common.h | 6 +- + drivers/leds/leds-lp8501.c | 11 +-- + drivers/leds/leds-lp8788.c | 48 +++++----- + drivers/leds/leds-lp8860.c | 27 ++---- + drivers/leds/leds-lt3593.c | 33 +++---- + drivers/leds/leds-max77693.c | 58 +++--------- + drivers/leds/leds-max8997.c | 1 - + drivers/leds/leds-mc13783.c | 35 ++------ + drivers/leds/leds-ns2.c | 31 +++---- + drivers/leds/leds-pca9532.c | 28 +++--- + drivers/leds/leds-pca955x.c | 39 ++------ + drivers/leds/leds-pca963x.c | 80 +++++------------ + drivers/leds/leds-powernv.c | 18 ++-- + drivers/leds/leds-pwm.c | 39 ++++---- + drivers/leds/leds-regulator.c | 46 +++------- + drivers/leds/leds-tlc591xx.c | 31 ++----- + drivers/leds/leds-wm831x-status.c | 25 ++---- + drivers/leds/leds-wm8350.c | 64 ++++++------- + drivers/leds/leds.h | 27 +----- + drivers/leds/trigger/ledtrig-backlight.c | 8 +- + drivers/leds/trigger/ledtrig-default-on.c | 2 +- + drivers/leds/trigger/ledtrig-gpio.c | 6 +- + drivers/leds/trigger/ledtrig-heartbeat.c | 4 +- + drivers/leds/trigger/ledtrig-oneshot.c | 6 +- + drivers/leds/trigger/ledtrig-transient.c | 10 +-- + drivers/media/v4l2-core/v4l2-flash-led-class.c | 8 +- + include/linux/leds.h | 27 ++++-- + include/linux/mfd/wm8350/pmic.h | 1 - + 52 files changed, 588 insertions(+), 1042 deletions(-) +Merging ipmi/for-next (4193fcd31624 ipmi: Remove unnecessary pci_disable_device.) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 7 ++++--- + drivers/char/ipmi/ipmi_si_intf.c | 28 ++++++++++++++++------------ + drivers/char/ipmi/ipmi_ssif.c | 1 - + 3 files changed, 20 insertions(+), 16 deletions(-) +Merging driver-core/driver-core-next (8005c49d9aea Linux 4.4-rc1) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (31ade3b83e18 Linux 4.4-rc3) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (498378d9d2c1 usb: core: lpm: remove usb3_lpm_enabled in usb_device) +$ git merge usb/usb-next +Auto-merging drivers/usb/storage/uas.c +Auto-merging drivers/usb/host/whci/qset.c +Auto-merging drivers/usb/host/Kconfig +Auto-merging drivers/usb/core/hub.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-usb | 27 +- + .../devicetree/bindings/usb/mt8173-xhci.txt | 51 ++ + Documentation/devicetree/bindings/usb/usb-xhci.txt | 4 +- + Documentation/kernel-parameters.txt | 4 + + Documentation/usb/power-management.txt | 11 +- + arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 16 + + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 42 ++ + drivers/usb/chipidea/ci_hdrc_msm.c | 3 +- + drivers/usb/chipidea/udc.c | 3 +- + drivers/usb/core/devio.c | 25 +- + drivers/usb/core/hcd.c | 4 +- + drivers/usb/core/hub.c | 52 +- + drivers/usb/core/hub.h | 5 +- + drivers/usb/core/port.c | 89 ++- + drivers/usb/core/sysfs.c | 31 +- + drivers/usb/gadget/udc/gr_udc.c | 3 +- + drivers/usb/host/Kconfig | 9 + + drivers/usb/host/Makefile | 4 + + drivers/usb/host/bcma-hcd.c | 21 +- + drivers/usb/host/ehci-dbg.c | 15 +- + drivers/usb/host/ehci-mem.c | 18 +- + drivers/usb/host/ehci-msm.c | 4 +- + drivers/usb/host/ehci-q.c | 9 +- + drivers/usb/host/ehci.h | 1 + + drivers/usb/host/ohci-pxa27x.c | 14 +- + drivers/usb/host/pci-quirks.c | 25 +- + drivers/usb/host/uhci-q.c | 3 +- + drivers/usb/host/whci/qset.c | 3 +- + drivers/usb/host/xhci-ext-caps.h | 83 +-- + drivers/usb/host/xhci-hub.c | 2 +- + drivers/usb/host/xhci-mem.c | 81 +-- + drivers/usb/host/xhci-mtk-sch.c | 415 +++++++++++ + drivers/usb/host/xhci-mtk.c | 763 +++++++++++++++++++++ + drivers/usb/host/xhci-mtk.h | 162 +++++ + drivers/usb/host/xhci-pci.c | 1 - + drivers/usb/host/xhci-plat.c | 88 ++- + drivers/usb/host/xhci-plat.h | 39 ++ + drivers/usb/host/xhci-rcar.c | 44 +- + drivers/usb/host/xhci-rcar.h | 3 + + drivers/usb/host/xhci-ring.c | 16 +- + drivers/usb/host/xhci.c | 21 +- + drivers/usb/host/xhci.h | 4 + + drivers/usb/misc/usbtest.c | 233 ++++--- + drivers/usb/mon/mon_bin.c | 17 +- + drivers/usb/mon/mon_main.c | 2 +- + drivers/usb/mon/mon_text.c | 9 +- + drivers/usb/storage/uas.c | 48 +- + drivers/uwb/uwbd.c | 1 - + include/linux/usb.h | 6 +- + include/linux/usb/hcd.h | 4 +- + 50 files changed, 2156 insertions(+), 382 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/mt8173-xhci.txt + create mode 100644 drivers/usb/host/xhci-mtk-sch.c + create mode 100644 drivers/usb/host/xhci-mtk.c + create mode 100644 drivers/usb/host/xhci-mtk.h + create mode 100644 drivers/usb/host/xhci-plat.h +Merging usb-gadget/next (8005c49d9aea Linux 4.4-rc1) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (6f923a0134d9 USB: cp210x: add tx_empty()) +$ git merge usb-serial/usb-next +Auto-merging drivers/usb/serial/cp210x.c +Merge made by the 'recursive' strategy. + drivers/usb/serial/cp210x.c | 186 ++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 162 insertions(+), 24 deletions(-) +Merging usb-chipidea-next/ci-for-usb-next (15af5aea51de usb: chipidea: removing of_find_property) +$ git merge usb-chipidea-next/ci-for-usb-next +Auto-merging drivers/usb/chipidea/udc.c +Removing drivers/usb/chipidea/debug.h +Auto-merging drivers/usb/chipidea/debug.c +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +Merge made by the 'recursive' strategy. + Documentation/usb/chipidea.txt | 4 +-- + drivers/usb/chipidea/Kconfig | 5 ---- + drivers/usb/chipidea/Makefile | 5 +--- + drivers/usb/chipidea/ci.h | 3 ++ + drivers/usb/chipidea/ci_hdrc_imx.c | 6 ++++ + drivers/usb/chipidea/core.c | 59 ++++++++++++++------------------------ + drivers/usb/chipidea/debug.c | 1 - + drivers/usb/chipidea/debug.h | 30 ------------------- + drivers/usb/chipidea/udc.c | 28 ++++++++++++------ + 9 files changed, 54 insertions(+), 87 deletions(-) + delete mode 100644 drivers/usb/chipidea/debug.h +Merging staging/staging-next (f3cf3fb7ec85 Merge tag 'iio-for-4.5a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next) +$ git merge staging/staging-next +Removing drivers/staging/sm750fb/modedb.h +Auto-merging drivers/staging/lustre/lustre/obdecho/echo_client.c +Auto-merging drivers/staging/lustre/lustre/llite/llite_internal.h +Removing drivers/staging/iio/adc/ad7780.h +Auto-merging drivers/iio/proximity/pulsedlight-lidar-lite-v2.c +Auto-merging drivers/iio/industrialio-core.c +Auto-merging drivers/iio/industrialio-buffer.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/iio/accel/mma8452.txt | 6 + + .../devicetree/bindings/iio/adc/mcp320x.txt | 30 +- + .../devicetree/bindings/iio/adc/palmas-gpadc.txt | 48 + + .../devicetree/bindings/iio/adc/ti-ads8688.txt | 20 + + .../devicetree/bindings/iio/st-sensors.txt | 1 + + drivers/iio/Kconfig | 1 + + drivers/iio/Makefile | 1 + + drivers/iio/accel/Kconfig | 42 +- + drivers/iio/accel/Makefile | 6 + + drivers/iio/accel/bmc150-accel-core.c | 20 +- + drivers/iio/accel/kxcjk-1013.c | 20 +- + drivers/iio/accel/mma7455.h | 19 + + drivers/iio/accel/mma7455_core.c | 311 ++++++ + drivers/iio/accel/mma7455_i2c.c | 56 + + drivers/iio/accel/mma7455_spi.c | 52 + + drivers/iio/accel/mma8452.c | 21 +- + drivers/iio/accel/mma9551.c | 19 +- + drivers/iio/accel/mma9553.c | 20 +- + drivers/iio/accel/mxc6255.c | 198 ++++ + drivers/iio/accel/st_accel.h | 1 + + drivers/iio/accel/st_accel_core.c | 1 + + drivers/iio/accel/st_accel_i2c.c | 5 + + drivers/iio/accel/st_accel_spi.c | 1 + + drivers/iio/adc/Kconfig | 18 + + drivers/iio/adc/Makefile | 2 + + drivers/iio/adc/ad7793.c | 5 +- + drivers/iio/adc/at91_adc.c | 2 +- + drivers/iio/adc/mcp320x.c | 28 + + drivers/iio/adc/palmas_gpadc.c | 859 +++++++++++++++ + drivers/iio/adc/ti-ads8688.c | 486 +++++++++ + drivers/iio/adc/xilinx-xadc-core.c | 2 +- + drivers/iio/buffer/Kconfig | 20 + + drivers/iio/buffer/Makefile | 2 + + drivers/iio/buffer/industrialio-buffer-dma.c | 683 ++++++++++++ + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 213 ++++ + drivers/iio/dummy/Kconfig | 35 + + drivers/iio/dummy/Makefile | 10 + + .../{staging/iio => iio/dummy}/iio_dummy_evgen.c | 0 + .../{staging/iio => iio/dummy}/iio_dummy_evgen.h | 0 + .../{staging/iio => iio/dummy}/iio_simple_dummy.c | 0 + .../{staging/iio => iio/dummy}/iio_simple_dummy.h | 0 + .../iio => iio/dummy}/iio_simple_dummy_buffer.c | 0 + .../iio => iio/dummy}/iio_simple_dummy_events.c | 0 + drivers/iio/gyro/adis16136.c | 4 +- + drivers/iio/gyro/bmg160_core.c | 19 +- + drivers/iio/imu/adis16400_core.c | 6 +- + drivers/iio/imu/adis16480.c | 4 +- + drivers/iio/imu/kmx61.c | 24 +- + drivers/iio/industrialio-buffer.c | 58 +- + drivers/iio/industrialio-core.c | 9 + + drivers/iio/light/lm3533-als.c | 4 +- + drivers/iio/light/pa12203001.c | 16 +- + drivers/iio/light/rpr0521.c | 14 +- + drivers/iio/magnetometer/bmc150_magn.c | 20 +- + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 56 +- + drivers/staging/android/ion/compat_ion.c | 6 +- + drivers/staging/android/lowmemorykiller.c | 6 +- + drivers/staging/android/sync.c | 22 +- + drivers/staging/android/timed_gpio.c | 11 +- + drivers/staging/comedi/Kconfig | 12 +- + drivers/staging/comedi/drivers/Makefile | 1 + + drivers/staging/comedi/drivers/adl_pci9118.c | 3 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 109 +- + drivers/staging/comedi/drivers/adv_pci1720.c | 195 ++++ + drivers/staging/comedi/drivers/das16.c | 3 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 18 +- + drivers/staging/dgnc/dgnc_utils.c | 1 - + drivers/staging/fwserial/fwserial.c | 3 +- + drivers/staging/fwserial/fwserial.h | 10 - + drivers/staging/gdm724x/gdm_lte.c | 2 +- + drivers/staging/gdm724x/netlink_k.c | 5 - + drivers/staging/gdm724x/netlink_k.h | 1 - + drivers/staging/gdm72xx/gdm_qos.c | 52 +- + drivers/staging/gdm72xx/gdm_wimax.c | 9 +- + drivers/staging/iio/Kconfig | 29 - + drivers/staging/iio/Makefile | 7 - + drivers/staging/iio/adc/ad7780.c | 36 +- + drivers/staging/iio/adc/ad7780.h | 30 - + drivers/staging/iio/adc/mxs-lradc.c | 2 +- + .../lustre/include/linux/libcfs/libcfs_hash.h | 154 ++- + .../include/linux/libcfs/libcfs_kernelcomm.h | 2 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 2 - + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 2 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 11 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 3 + + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 2 - + drivers/staging/lustre/lnet/lnet/api-ni.c | 16 +- + drivers/staging/lustre/lnet/lnet/config.c | 24 +- + drivers/staging/lustre/lnet/lnet/module.c | 2 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 4 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 4 +- + drivers/staging/lustre/lnet/selftest/console.c | 88 +- + drivers/staging/lustre/lnet/selftest/framework.c | 8 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 23 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 16 +- + drivers/staging/lustre/lustre/fid/fid_internal.h | 2 - + drivers/staging/lustre/lustre/fid/fid_request.c | 23 +- + drivers/staging/lustre/lustre/fld/fld_cache.c | 34 +- + drivers/staging/lustre/lustre/fld/fld_internal.h | 9 - + drivers/staging/lustre/lustre/fld/fld_request.c | 2 +- + .../staging/lustre/lustre/include/lprocfs_status.h | 3 - + .../staging/lustre/lustre/include/lustre_disk.h | 1 + + drivers/staging/lustre/lustre/include/lustre_dlm.h | 2 - + drivers/staging/lustre/lustre/include/obd.h | 322 +++--- + drivers/staging/lustre/lustre/include/obd_cksum.h | 23 - + drivers/staging/lustre/lustre/include/obd_class.h | 16 +- + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 4 +- + drivers/staging/lustre/lustre/ldlm/interval_tree.c | 16 +- + drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 47 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 2 - + drivers/staging/lustre/lustre/libcfs/debug.c | 16 +- + drivers/staging/lustre/lustre/libcfs/fail.c | 2 +- + drivers/staging/lustre/lustre/libcfs/hash.c | 380 ++++--- + .../lustre/lustre/libcfs/kernel_user_comm.c | 3 +- + drivers/staging/lustre/lustre/libcfs/libcfs_mem.c | 2 - + .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 30 +- + .../lustre/libcfs/linux/linux-crypto-adler.c | 9 +- + .../lustre/lustre/libcfs/linux/linux-debug.c | 1 - + drivers/staging/lustre/lustre/libcfs/module.c | 6 +- + drivers/staging/lustre/lustre/libcfs/tracefile.c | 27 +- + drivers/staging/lustre/lustre/libcfs/tracefile.h | 15 - + drivers/staging/lustre/lustre/libcfs/workitem.c | 10 +- + drivers/staging/lustre/lustre/llite/dir.c | 11 +- + .../staging/lustre/lustre/llite/llite_internal.h | 10 - + drivers/staging/lustre/lustre/llite/lloop.c | 2 +- + drivers/staging/lustre/lustre/llite/super25.c | 2 +- + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 21 +- + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 14 - + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 94 +- + drivers/staging/lustre/lustre/lov/lov_internal.h | 15 - + drivers/staging/lustre/lustre/lov/lov_obd.c | 60 +- + drivers/staging/lustre/lustre/lov/lov_pool.c | 3 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 16 +- + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 15 - + drivers/staging/lustre/lustre/mdc/mdc_request.c | 116 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 32 +- + drivers/staging/lustre/lustre/obdclass/cl_lock.c | 3 +- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 2 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 6 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 21 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 10 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 10 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 6 - + drivers/staging/lustre/lustre/osc/osc_request.c | 69 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 6 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 3 - + .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 1 + + drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 3 +- + drivers/staging/media/bcm2048/radio-bcm2048.c | 393 ++++--- + drivers/staging/most/aim-network/networking.h | 2 - + drivers/staging/most/hdm-dim2/dim2_errors.h | 2 - + drivers/staging/most/hdm-dim2/dim2_hal.c | 133 +-- + drivers/staging/most/hdm-dim2/dim2_hal.h | 53 +- + drivers/staging/most/hdm-dim2/dim2_hdm.c | 60 +- + drivers/staging/most/hdm-dim2/dim2_reg.h | 5 +- + drivers/staging/most/hdm-dim2/dim2_sysfs.h | 3 - + drivers/staging/most/mostcore/core.c | 3 +- + drivers/staging/most/mostcore/mostcore.h | 2 - + drivers/staging/nvec/README | 2 +- + drivers/staging/nvec/nvec.c | 20 +- + drivers/staging/octeon/ethernet-defines.h | 2 +- + drivers/staging/rdma/amso1100/c2.c | 17 +- + drivers/staging/rdma/amso1100/c2.h | 80 +- + drivers/staging/rdma/amso1100/c2_mq.h | 14 +- + drivers/staging/rdma/amso1100/c2_provider.c | 10 +- + drivers/staging/rdma/amso1100/c2_rnic.c | 5 +- + drivers/staging/rdma/amso1100/c2_vq.h | 20 +- + drivers/staging/rdma/ehca/ehca_av.c | 3 + + drivers/staging/rdma/hfi1/chip.c | 164 +-- + drivers/staging/rdma/hfi1/chip.h | 1 + + drivers/staging/rdma/hfi1/common.h | 15 +- + drivers/staging/rdma/hfi1/diag.c | 27 +- + drivers/staging/rdma/hfi1/driver.c | 213 ++-- + drivers/staging/rdma/hfi1/file_ops.c | 178 ++-- + drivers/staging/rdma/hfi1/firmware.c | 2 +- + drivers/staging/rdma/hfi1/hfi.h | 58 +- + drivers/staging/rdma/hfi1/init.c | 81 +- + drivers/staging/rdma/hfi1/iowait.h | 6 +- + drivers/staging/rdma/hfi1/mad.c | 4 +- + drivers/staging/rdma/hfi1/pcie.c | 32 +- + drivers/staging/rdma/hfi1/pio.c | 19 +- + drivers/staging/rdma/hfi1/qp.c | 48 +- + drivers/staging/rdma/hfi1/qp.h | 38 +- + drivers/staging/rdma/hfi1/qsfp.c | 5 +- + drivers/staging/rdma/hfi1/rc.c | 81 +- + drivers/staging/rdma/hfi1/ruc.c | 45 +- + drivers/staging/rdma/hfi1/sdma.c | 48 +- + drivers/staging/rdma/hfi1/sdma.h | 8 +- + drivers/staging/rdma/hfi1/uc.c | 15 +- + drivers/staging/rdma/hfi1/ud.c | 1 + + drivers/staging/rdma/hfi1/user_exp_rcv.h | 74 ++ + drivers/staging/rdma/hfi1/user_sdma.c | 44 +- + drivers/staging/rdma/hfi1/user_sdma.h | 10 +- + drivers/staging/rdma/hfi1/verbs.c | 130 +-- + drivers/staging/rdma/hfi1/verbs.h | 48 +- + drivers/staging/rdma/ipath/ipath_file_ops.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 54 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 100 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 7 - + drivers/staging/rtl8188eu/core/rtw_mlme.c | 22 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 84 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 14 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 11 +- + drivers/staging/rtl8188eu/hal/fw.c | 40 +- + drivers/staging/rtl8188eu/hal/hal_com.c | 14 +- + drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 2 +- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 7 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 34 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 10 +- + drivers/staging/rtl8188eu/include/HalVerDef.h | 33 - + drivers/staging/rtl8188eu/include/osdep_service.h | 2 - + drivers/staging/rtl8188eu/include/rtw_xmit.h | 1 - + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 10 +- + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 6 - + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 5 +- + drivers/staging/rtl8192u/r8192U_core.c | 15 - + drivers/staging/rtl8192u/r819xU_phy.c | 25 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 8 +- + drivers/staging/rtl8723au/core/rtw_efuse.c | 45 +- + drivers/staging/sm750fb/modedb.h | 233 ---- + drivers/staging/sm750fb/sm750.c | 2 - + drivers/staging/unisys/include/channel.h | 114 +- + drivers/staging/unisys/include/iochannel.h | 157 ++- + drivers/staging/unisys/include/vbushelper.h | 3 +- + drivers/staging/unisys/include/visorbus.h | 4 +- + drivers/staging/unisys/visorbus/Kconfig | 7 +- + .../unisys/visorbus/controlvmcompletionstatus.h | 24 +- + drivers/staging/unisys/visorbus/periodic_work.c | 11 +- + drivers/staging/unisys/visorbus/vbuschannel.h | 9 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 15 +- + drivers/staging/unisys/visorbus/visorchannel.c | 4 +- + drivers/staging/unisys/visorbus/vmcallinterface.h | 34 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 16 +- + drivers/staging/unisys/visorinput/Kconfig | 7 +- + drivers/staging/unisys/visorinput/visorinput.c | 4 +- + drivers/staging/unisys/visornic/visornic_main.c | 1 - + drivers/staging/vme/devices/vme_pio2_cntr.c | 2 +- + drivers/staging/vme/devices/vme_pio2_core.c | 22 +- + drivers/staging/vme/devices/vme_pio2_gpio.c | 32 +- + drivers/staging/vme/devices/vme_user.c | 22 +- + drivers/staging/vme/devices/vme_user.h | 2 - + drivers/staging/vt6656/baseband.c | 4 - + drivers/staging/vt6656/baseband.h | 4 - + drivers/staging/vt6656/card.c | 3 - + drivers/staging/vt6656/card.h | 3 - + drivers/staging/vt6656/channel.c | 4 - + drivers/staging/vt6656/channel.h | 4 - + drivers/staging/vt6656/desc.h | 3 - + drivers/staging/vt6656/device.h | 3 - + drivers/staging/vt6656/dpc.c | 3 - + drivers/staging/vt6656/dpc.h | 3 - + drivers/staging/vt6656/firmware.c | 4 - + drivers/staging/vt6656/firmware.h | 4 - + drivers/staging/vt6656/int.c | 4 - + drivers/staging/vt6656/int.h | 4 - + drivers/staging/vt6656/key.c | 5 - + drivers/staging/vt6656/key.h | 4 - + drivers/staging/vt6656/mac.c | 4 - + drivers/staging/vt6656/mac.h | 4 - + drivers/staging/vt6656/main_usb.c | 3 - + drivers/staging/vt6656/power.c | 4 - + drivers/staging/vt6656/power.h | 3 - + drivers/staging/vt6656/rf.c | 4 - + drivers/staging/vt6656/rf.h | 4 - + drivers/staging/vt6656/rxtx.c | 3 - + drivers/staging/vt6656/rxtx.h | 3 - + drivers/staging/vt6656/usbpipe.c | 4 - + drivers/staging/vt6656/usbpipe.h | 4 - + drivers/staging/vt6656/wcmd.c | 3 - + drivers/staging/vt6656/wcmd.h | 3 - + drivers/staging/wilc1000/Makefile | 6 +- + drivers/staging/wilc1000/coreconfigurator.c | 1 - + drivers/staging/wilc1000/coreconfigurator.h | 2 +- + drivers/staging/wilc1000/host_interface.c | 1120 ++++++++++---------- + drivers/staging/wilc1000/host_interface.h | 998 +++-------------- + drivers/staging/wilc1000/linux_mon.c | 2 +- + drivers/staging/wilc1000/linux_wlan.c | 622 ++++------- + drivers/staging/wilc1000/linux_wlan_sdio.c | 4 +- + drivers/staging/wilc1000/linux_wlan_sdio.h | 2 +- + drivers/staging/wilc1000/linux_wlan_spi.c | 2 +- + drivers/staging/wilc1000/linux_wlan_spi.h | 2 +- + drivers/staging/wilc1000/wilc_sdio.c | 91 +- + drivers/staging/wilc1000/wilc_spi.c | 164 ++- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 194 ++-- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 2 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 6 +- + drivers/staging/wilc1000/wilc_wlan.c | 835 +++++---------- + drivers/staging/wilc1000/wilc_wlan.h | 324 +++--- + drivers/staging/wilc1000/wilc_wlan_cfg.c | 2 +- + drivers/staging/wilc1000/wilc_wlan_cfg.h | 2 +- + drivers/staging/wilc1000/wilc_wlan_if.h | 26 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 34 +- + drivers/staging/wlan-ng/p80211netdev.h | 1 - + drivers/staging/wlan-ng/prism2mgmt.h | 1 - + drivers/staging/wlan-ng/prism2mib.c | 5 +- + drivers/staging/wlan-ng/prism2sta.c | 21 - + include/linux/iio/buffer-dma.h | 152 +++ + include/linux/iio/buffer-dmaengine.h | 18 + + include/linux/iio/buffer.h | 16 + + include/linux/mfd/palmas.h | 75 +- + include/uapi/rdma/hfi/hfi1_user.h | 26 +- + 305 files changed, 7968 insertions(+), 6405 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/palmas-gpadc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti-ads8688.txt + create mode 100644 drivers/iio/accel/mma7455.h + create mode 100644 drivers/iio/accel/mma7455_core.c + create mode 100644 drivers/iio/accel/mma7455_i2c.c + create mode 100644 drivers/iio/accel/mma7455_spi.c + create mode 100644 drivers/iio/accel/mxc6255.c + create mode 100644 drivers/iio/adc/palmas_gpadc.c + create mode 100644 drivers/iio/adc/ti-ads8688.c + create mode 100644 drivers/iio/buffer/industrialio-buffer-dma.c + create mode 100644 drivers/iio/buffer/industrialio-buffer-dmaengine.c + create mode 100644 drivers/iio/dummy/Kconfig + create mode 100644 drivers/iio/dummy/Makefile + rename drivers/{staging/iio => iio/dummy}/iio_dummy_evgen.c (100%) + rename drivers/{staging/iio => iio/dummy}/iio_dummy_evgen.h (100%) + rename drivers/{staging/iio => iio/dummy}/iio_simple_dummy.c (100%) + rename drivers/{staging/iio => iio/dummy}/iio_simple_dummy.h (100%) + rename drivers/{staging/iio => iio/dummy}/iio_simple_dummy_buffer.c (100%) + rename drivers/{staging/iio => iio/dummy}/iio_simple_dummy_events.c (100%) + create mode 100644 drivers/staging/comedi/drivers/adv_pci1720.c + delete mode 100644 drivers/staging/iio/adc/ad7780.h + create mode 100644 drivers/staging/rdma/hfi1/user_exp_rcv.h + delete mode 100644 drivers/staging/sm750fb/modedb.h + create mode 100644 include/linux/iio/buffer-dma.h + create mode 100644 include/linux/iio/buffer-dmaengine.h +$ git am -3 ../patches/0001-staging-rtl8188eu-using-unique-names-is-good.patch +Applying: staging: rtl8188eu: using unique names is good +Using index info to reconstruct a base tree... +A drivers/staging/rtl8188eu/hal/HalHWImg8188E_BB.c +A drivers/staging/rtl8188eu/hal/HalHWImg8188E_MAC.c +A drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c +M drivers/staging/rtl8188eu/hal/fw.c +M drivers/staging/rtl8188eu/hal/usb_halinit.c +M drivers/staging/rtl8188eu/include/fw.h +M drivers/staging/rtl8188eu/include/phy.h +Recorded preimage for 'drivers/staging/rtl8188eu/include/phy.h' +error: Failed to merge in the changes. +Falling back to patching base and 3-way merge... +Auto-merging drivers/staging/rtl8188eu/include/phy.h +CONFLICT (content): Merge conflict in drivers/staging/rtl8188eu/include/phy.h +Patch failed at 0001 staging: rtl8188eu: using unique names is good +The copy of the patch that failed is found in: .git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +Merging char-misc/char-misc-next (1ec218373b8e Linux 4.4-rc2) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (5f01e6bc3336 extcon: rt8973: Add IRQF_ONESHOT to interrupt flags) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/extcon/extcon-arizona.txt | 26 ++++++++++++++++++++++ + drivers/extcon/extcon-arizona.c | 15 ++++++++++++- + drivers/extcon/extcon-rt8973a.c | 2 +- + 3 files changed, 41 insertions(+), 2 deletions(-) +Merging cgroup/for-next (57fd592b749b Merge branch 'for-4.4-fixes' into for-next) +$ git merge cgroup/for-next +Auto-merging include/uapi/linux/magic.h +Removing Documentation/cgroups/unified-hierarchy.txt +Auto-merging Documentation/cgroup-legacy/blkio-controller.txt +Merge made by the 'recursive' strategy. + Documentation/{cgroups => cgroup-legacy}/00-INDEX | 0 + .../blkio-controller.txt | 79 -- + .../{cgroups => cgroup-legacy}/cgroups.txt | 0 + .../{cgroups => cgroup-legacy}/cpuacct.txt | 0 + .../{cgroups => cgroup-legacy}/cpusets.txt | 0 + .../{cgroups => cgroup-legacy}/devices.txt | 0 + .../freezer-subsystem.txt | 0 + .../{cgroups => cgroup-legacy}/hugetlb.txt | 0 + .../{cgroups => cgroup-legacy}/memcg_test.txt | 0 + .../{cgroups => cgroup-legacy}/memory.txt | 0 + .../{cgroups => cgroup-legacy}/net_cls.txt | 0 + .../{cgroups => cgroup-legacy}/net_prio.txt | 0 + Documentation/{cgroups => cgroup-legacy}/pids.txt | 0 + Documentation/cgroup.txt | 1293 ++++++++++++++++++++ + Documentation/cgroups/unified-hierarchy.txt | 647 ---------- + include/linux/cgroup-defs.h | 5 - + include/linux/cgroup.h | 14 +- + include/uapi/linux/magic.h | 1 + + kernel/cgroup.c | 103 +- + kernel/cgroup_pids.c | 54 +- + kernel/cpuset.c | 12 +- + kernel/fork.c | 9 +- + 22 files changed, 1381 insertions(+), 836 deletions(-) + rename Documentation/{cgroups => cgroup-legacy}/00-INDEX (100%) + rename Documentation/{cgroups => cgroup-legacy}/blkio-controller.txt (81%) + rename Documentation/{cgroups => cgroup-legacy}/cgroups.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/cpuacct.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/cpusets.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/devices.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/freezer-subsystem.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/hugetlb.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/memcg_test.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/memory.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/net_cls.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/net_prio.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/pids.txt (100%) + create mode 100644 Documentation/cgroup.txt + delete mode 100644 Documentation/cgroups/unified-hierarchy.txt +Merging scsi/for-next (59ae1adaafff Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/Kconfig | 2 ++ + drivers/scsi/advansys.c | 2 +- + drivers/scsi/hpsa.c | 2 +- + drivers/scsi/initio.c | 16 ---------------- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 3 +-- + drivers/scsi/mvsas/mv_init.c | 4 ++-- + drivers/scsi/qla2xxx/Kconfig | 3 --- + drivers/scsi/qla2xxx/qla_nx.c | 3 ++- + drivers/scsi/qla2xxx/qla_os.c | 3 --- + drivers/scsi/scsi_scan.c | 9 ++++++--- + drivers/scsi/scsi_sysfs.c | 8 ++++++++ + drivers/scsi/st.c | 5 +++-- + drivers/scsi/st.h | 2 -- + include/scsi/scsi_host.h | 3 +++ + 14 files changed, 29 insertions(+), 36 deletions(-) +Merging target-updates/for-next (a2ba59203791 target: use offset_in_page macro) +$ git merge target-updates/for-next +Auto-merging include/target/target_core_base.h +Auto-merging drivers/usb/gadget/function/tcm.h +Auto-merging drivers/target/target_core_user.c +Auto-merging drivers/target/target_core_transport.c +Auto-merging drivers/target/target_core_tmr.c +Auto-merging drivers/target/target_core_sbc.c +Auto-merging drivers/target/iscsi/iscsi_target_parameters.c +Auto-merging drivers/target/iscsi/iscsi_target.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/configfs-usb-gadget-tcm | 6 + + drivers/target/iscsi/iscsi_target.c | 5 +- + drivers/target/iscsi/iscsi_target_erl1.c | 7 +- + drivers/target/iscsi/iscsi_target_parameters.c | 2 +- + drivers/target/iscsi/iscsi_target_tmr.c | 2 +- + drivers/target/loopback/tcm_loop.c | 14 + + drivers/target/sbp/sbp_target.c | 2 - + drivers/target/target_core_configfs.c | 41 +- + drivers/target/target_core_device.c | 2 + + drivers/target/target_core_iblock.c | 2 + + drivers/target/target_core_pr.c | 11 +- + drivers/target/target_core_sbc.c | 10 +- + drivers/target/target_core_spc.c | 12 + + drivers/target/target_core_tmr.c | 2 +- + drivers/target/target_core_transport.c | 2 +- + drivers/target/target_core_user.c | 2 +- + drivers/target/tcm_fc/tfc_io.c | 8 +- + drivers/usb/gadget/Kconfig | 17 + + drivers/usb/gadget/function/Makefile | 2 + + drivers/usb/gadget/function/f_tcm.c | 2408 ++++++++++++++++++++ + .../{legacy/tcm_usb_gadget.h => function/tcm.h} | 9 +- + drivers/usb/gadget/function/u_tcm.h | 50 + + drivers/usb/gadget/legacy/Kconfig | 1 + + drivers/usb/gadget/legacy/tcm_usb_gadget.c | 2165 +----------------- + fs/configfs/dir.c | 150 +- + fs/ocfs2/cluster/nodemanager.c | 2 +- + include/linux/configfs.h | 21 +- + include/target/target_core_base.h | 3 + + 28 files changed, 2774 insertions(+), 2184 deletions(-) + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-tcm + create mode 100644 drivers/usb/gadget/function/f_tcm.c + rename drivers/usb/gadget/{legacy/tcm_usb_gadget.h => function/tcm.h} (95%) + create mode 100644 drivers/usb/gadget/function/u_tcm.h +Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging pinctrl/for-next (55c21f12a8db Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/Kconfig | 4 --- + drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c | 3 +-- + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 8 ++++-- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 38 +++++++++++++++------------ + drivers/pinctrl/pinctrl-single.c | 5 +--- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 2 +- + 7 files changed, 31 insertions(+), 31 deletions(-) +Merging vhost/linux-next (d629f2b585cb virtio: introduce avail cache) +$ git merge vhost/linux-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2624 and retry the command. +Merge made by the 'recursive' strategy. + drivers/virtio/virtio_ring.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) +Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias) +$ git merge remoteproc/for-next +Auto-merging drivers/remoteproc/remoteproc_core.c +Merge made by the 'recursive' strategy. + drivers/remoteproc/remoteproc_core.c | 4 +++- + drivers/remoteproc/wkup_m3_rproc.c | 1 + + 2 files changed, 4 insertions(+), 1 deletion(-) +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 (2567a40b22e5 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging sound/soc/codecs/wm8962.c +Auto-merging sound/soc/codecs/rt5677.c +Auto-merging drivers/pinctrl/samsung/pinctrl-samsung.c +Auto-merging drivers/pinctrl/samsung/pinctrl-exynos.c +Auto-merging drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c +Auto-merging drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c +Auto-merging drivers/pinctrl/mediatek/pinctrl-mtk-common.c +Auto-merging drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c +Auto-merging drivers/leds/leds-pca9532.c +Auto-merging drivers/gpio/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-tps65086.txt | 16 +++ + MAINTAINERS | 3 +- + arch/avr32/mach-at32ap/pio.c | 2 +- + drivers/bcma/driver_gpio.c | 2 +- + drivers/gpio/Kconfig | 6 +- + drivers/gpio/gpio-104-idio-16.c | 145 ++++++++++++++++++--- + drivers/gpio/gpio-74x164.c | 4 +- + drivers/gpio/gpio-74xx-mmio.c | 7 +- + drivers/gpio/gpio-adnp.c | 19 +-- + drivers/gpio/gpio-altera.c | 2 +- + drivers/gpio/gpio-amd8111.c | 2 +- + drivers/gpio/gpio-amdpt.c | 18 +-- + drivers/gpio/gpio-arizona.c | 2 +- + drivers/gpio/gpio-ath79.c | 2 +- + drivers/gpio/gpio-bcm-kona.c | 6 +- + drivers/gpio/gpio-crystalcove.c | 2 +- + drivers/gpio/gpio-davinci.c | 4 +- + drivers/gpio/gpio-dln2.c | 10 +- + drivers/gpio/gpio-em.c | 4 +- + drivers/gpio/gpio-f7188x.c | 2 +- + drivers/gpio/gpio-generic.c | 2 +- + drivers/gpio/gpio-ich.c | 2 +- + drivers/gpio/gpio-intel-mid.c | 2 +- + drivers/gpio/gpio-janz-ttl.c | 6 +- + drivers/gpio/gpio-kempld.c | 2 +- + drivers/gpio/gpio-lp3943.c | 2 +- + drivers/gpio/gpio-lpc18xx.c | 2 +- + drivers/gpio/gpio-lynxpoint.c | 2 +- + drivers/gpio/gpio-max730x.c | 2 +- + drivers/gpio/gpio-max732x.c | 4 +- + drivers/gpio/gpio-mb86s7x.c | 2 +- + drivers/gpio/gpio-mc33880.c | 2 +- + drivers/gpio/gpio-mc9s08dz60.c | 2 +- + drivers/gpio/gpio-mcp23s08.c | 16 ++- + drivers/gpio/gpio-moxart.c | 2 +- + drivers/gpio/gpio-msic.c | 2 +- + drivers/gpio/gpio-mvebu.c | 2 +- + drivers/gpio/gpio-octeon.c | 2 +- + drivers/gpio/gpio-omap.c | 4 +- + drivers/gpio/gpio-palmas.c | 16 ++- + drivers/gpio/gpio-pca953x.c | 2 +- + drivers/gpio/gpio-pcf857x.c | 2 +- + drivers/gpio/gpio-pch.c | 2 +- + drivers/gpio/gpio-pl061.c | 12 +- + drivers/gpio/gpio-pxa.c | 16 ++- + drivers/gpio/gpio-rc5t583.c | 2 +- + drivers/gpio/gpio-rcar.c | 2 +- + drivers/gpio/gpio-sch.c | 2 +- + drivers/gpio/gpio-sch311x.c | 4 +- + drivers/gpio/gpio-spear-spics.c | 2 +- + drivers/gpio/gpio-stmpe.c | 2 +- + drivers/gpio/gpio-stp-xway.c | 4 +- + drivers/gpio/gpio-sx150x.c | 2 +- + drivers/gpio/gpio-syscon.c | 10 +- + drivers/gpio/gpio-tb10x.c | 2 +- + drivers/gpio/gpio-tc3589x.c | 2 +- + drivers/gpio/gpio-tegra.c | 105 ++++++++------- + drivers/gpio/gpio-timberdale.c | 2 +- + drivers/gpio/gpio-tps6586x.c | 2 +- + drivers/gpio/gpio-tps65910.c | 2 +- + drivers/gpio/gpio-tps65912.c | 2 +- + drivers/gpio/gpio-ts5500.c | 5 +- + drivers/gpio/gpio-twl4030.c | 4 +- + drivers/gpio/gpio-twl6040.c | 6 +- + drivers/gpio/gpio-tz1090-pdc.c | 2 +- + drivers/gpio/gpio-tz1090.c | 2 +- + drivers/gpio/gpio-vf610.c | 2 +- + drivers/gpio/gpio-viperboard.c | 16 +-- + drivers/gpio/gpio-vr41xx.c | 4 +- + drivers/gpio/gpio-wm831x.c | 2 +- + drivers/gpio/gpio-wm8350.c | 2 +- + drivers/gpio/gpio-wm8994.c | 2 +- + drivers/gpio/gpio-xgene.c | 2 +- + drivers/gpio/gpio-xilinx.c | 2 +- + drivers/gpio/gpio-xlp.c | 2 +- + drivers/gpio/gpio-zevio.c | 4 +- + drivers/gpio/gpio-zx.c | 2 +- + drivers/gpio/gpio-zynq.c | 6 +- + drivers/gpio/gpiolib-acpi.c | 90 +++++++++---- + drivers/gpio/gpiolib-of.c | 4 +- + drivers/gpio/gpiolib-sysfs.c | 5 +- + drivers/gpio/gpiolib.c | 87 ++++++++----- + drivers/gpio/gpiolib.h | 8 ++ + drivers/hid/hid-cp2112.c | 2 +- + drivers/input/touchscreen/ad7879.c | 2 +- + drivers/leds/leds-pca9532.c | 6 +- + drivers/leds/leds-tca6507.c | 2 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 2 +- + drivers/mfd/dm355evm_msp.c | 2 +- + drivers/mfd/htc-egpio.c | 2 +- + drivers/mfd/htc-i2cpld.c | 4 +- + drivers/mfd/tps65010.c | 2 +- + drivers/mfd/ucb1x00-core.c | 2 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 8 +- + drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c | 2 +- + drivers/pinctrl/intel/pinctrl-baytrail.c | 2 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 2 +- + drivers/pinctrl/intel/pinctrl-intel.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 12 +- + drivers/pinctrl/meson/pinctrl-meson.c | 2 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 7 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 8 +- + drivers/pinctrl/pinctrl-amd.c | 2 +- + drivers/pinctrl/pinctrl-as3722.c | 2 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 12 +- + drivers/pinctrl/pinctrl-at91.c | 2 +- + drivers/pinctrl/pinctrl-coh901.c | 2 +- + drivers/pinctrl/pinctrl-digicolor.c | 2 +- + drivers/pinctrl/pinctrl-pistachio.c | 2 +- + drivers/pinctrl/pinctrl-rockchip.c | 2 +- + drivers/pinctrl/pinctrl-st.c | 2 +- + drivers/pinctrl/pinctrl-xway.c | 10 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 2 +- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 +- + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 2 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 3 +- + drivers/pinctrl/samsung/pinctrl-exynos5440.c | 12 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 +- + drivers/pinctrl/sh-pfc/gpio.c | 2 +- + drivers/pinctrl/sirf/pinctrl-atlas7.c | 2 +- + drivers/pinctrl/sirf/pinctrl-sirf.c | 2 +- + drivers/pinctrl/spear/pinctrl-plgpio.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 10 +- + drivers/pinctrl/vt8500/pinctrl-wmt.c | 8 +- + drivers/platform/x86/intel_pmic_gpio.c | 4 +- + drivers/tty/serial/max310x.c | 2 +- + drivers/tty/serial/sc16is7xx.c | 2 +- + include/linux/gpio/driver.h | 4 +- + sound/soc/codecs/rt5677.c | 2 +- + sound/soc/codecs/wm5100.c | 2 +- + sound/soc/codecs/wm8903.c | 2 +- + sound/soc/codecs/wm8962.c | 2 +- + sound/soc/codecs/wm8996.c | 2 +- + 135 files changed, 603 insertions(+), 355 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-tps65086.txt +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 (5dcd7b42f1d0 pwm: sunxi: Fix whitespace issue) +$ git merge pwm/for-next +Already up-to-date. +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 (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns) +$ 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 (b2523f1ff0a6 Merge branch 'clk-msm8996' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../bindings/clock/brcm,iproc-clocks.txt | 5 + + .../devicetree/bindings/clock/cs2000-cp.txt | 22 + + .../devicetree/bindings/clock/qcom,gcc.txt | 1 + + .../devicetree/bindings/clock/qcom,mmcc.txt | 1 + + .../devicetree/bindings/clock/tango4-clock.txt | 23 + + arch/arm/mach-omap2/clock.c | 4 + + drivers/clk/Kconfig | 6 + + drivers/clk/Makefile | 2 + + drivers/clk/at91/clk-slow.c | 29 - + drivers/clk/bcm/Kconfig | 10 + + drivers/clk/bcm/Makefile | 1 + + drivers/clk/bcm/clk-bcm63xx.c | 22 + + drivers/clk/clk-cs2000-cp.c | 510 +++ + drivers/clk/clk-divider.c | 9 +- + drivers/clk/clk-si5351.c | 7 + + drivers/clk/clk-tango4.c | 61 + + drivers/clk/clk-xgene.c | 3 +- + drivers/clk/clk.c | 17 +- + drivers/clk/qcom/Kconfig | 17 + + drivers/clk/qcom/Makefile | 3 + + drivers/clk/qcom/clk-alpha-pll.c | 355 ++ + drivers/clk/qcom/clk-alpha-pll.h | 57 + + drivers/clk/qcom/clk-rcg.h | 1 + + drivers/clk/qcom/clk-rcg2.c | 87 + + drivers/clk/qcom/common.c | 87 + + drivers/clk/qcom/common.h | 4 + + drivers/clk/qcom/gcc-apq8084.c | 17 +- + drivers/clk/qcom/gcc-ipq806x.c | 15 +- + drivers/clk/qcom/gcc-msm8660.c | 16 +- + drivers/clk/qcom/gcc-msm8916.c | 17 +- + drivers/clk/qcom/gcc-msm8960.c | 16 +- + drivers/clk/qcom/gcc-msm8974.c | 18 +- + drivers/clk/qcom/gcc-msm8996.c | 3422 ++++++++++++++++++++ + drivers/clk/qcom/lcc-ipq806x.c | 1 + + drivers/clk/qcom/lcc-msm8960.c | 1 + + drivers/clk/qcom/mmcc-apq8084.c | 1 + + drivers/clk/qcom/mmcc-msm8960.c | 2 + + drivers/clk/qcom/mmcc-msm8974.c | 1 + + drivers/clk/qcom/mmcc-msm8996.c | 3217 ++++++++++++++++++ + drivers/clk/shmobile/clk-rcar-gen2.c | 4 +- + drivers/clk/st/clkgen-fsyn.c | 17 +- + drivers/clk/ti/apll.c | 2 +- + drivers/clk/ti/dpll3xxx.c | 25 +- + drivers/clk/versatile/clk-sp810.c | 5 +- + include/dt-bindings/clock/qcom,gcc-msm8996.h | 339 ++ + include/dt-bindings/clock/qcom,mmcc-msm8996.h | 285 ++ + include/linux/clk-provider.h | 8 +- + include/linux/clk/ti.h | 1 + + 48 files changed, 8659 insertions(+), 115 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/cs2000-cp.txt + create mode 100644 Documentation/devicetree/bindings/clock/tango4-clock.txt + create mode 100644 drivers/clk/bcm/clk-bcm63xx.c + create mode 100644 drivers/clk/clk-cs2000-cp.c + create mode 100644 drivers/clk/clk-tango4.c + create mode 100644 drivers/clk/qcom/clk-alpha-pll.c + create mode 100644 drivers/clk/qcom/clk-alpha-pll.h + create mode 100644 drivers/clk/qcom/gcc-msm8996.c + create mode 100644 drivers/clk/qcom/mmcc-msm8996.c + create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8996.h + create mode 100644 include/dt-bindings/clock/qcom,mmcc-msm8996.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 +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 7475 and retry the command. +Merge made by the 'recursive' strategy. +Merging kselftest/next (4aaae2f2c74f scripts/kconfig/Makefile: add kselftest-mergeconfig) +$ git merge kselftest/next +Merge made by the 'recursive' strategy. + scripts/kconfig/Makefile | 9 ++ + tools/testing/selftests/Makefile | 2 + + tools/testing/selftests/capabilities/Makefile | 21 ++--- + tools/testing/selftests/cpu-hotplug/config | 2 + + tools/testing/selftests/firmware/config | 1 + + tools/testing/selftests/ftrace/config | 1 + + tools/testing/selftests/intel_pstate/Makefile | 15 ++++ + tools/testing/selftests/intel_pstate/aperf.c | 80 ++++++++++++++++++ + tools/testing/selftests/intel_pstate/msr.c | 39 +++++++++ + tools/testing/selftests/intel_pstate/run.sh | 113 ++++++++++++++++++++++++++ + tools/testing/selftests/ipc/config | 2 + + tools/testing/selftests/memory-hotplug/config | 4 + + tools/testing/selftests/mount/config | 2 + + tools/testing/selftests/net/config | 3 + + tools/testing/selftests/pstore/config | 4 + + tools/testing/selftests/seccomp/config | 2 + + tools/testing/selftests/static_keys/config | 1 + + tools/testing/selftests/user/config | 1 + + tools/testing/selftests/vm/config | 1 + + tools/testing/selftests/zram/config | 2 + + 20 files changed, 293 insertions(+), 12 deletions(-) + create mode 100644 tools/testing/selftests/cpu-hotplug/config + create mode 100644 tools/testing/selftests/firmware/config + create mode 100644 tools/testing/selftests/ftrace/config + create mode 100644 tools/testing/selftests/intel_pstate/Makefile + create mode 100644 tools/testing/selftests/intel_pstate/aperf.c + create mode 100644 tools/testing/selftests/intel_pstate/msr.c + create mode 100755 tools/testing/selftests/intel_pstate/run.sh + create mode 100644 tools/testing/selftests/ipc/config + create mode 100644 tools/testing/selftests/memory-hotplug/config + create mode 100644 tools/testing/selftests/mount/config + create mode 100644 tools/testing/selftests/net/config + create mode 100644 tools/testing/selftests/pstore/config + create mode 100644 tools/testing/selftests/seccomp/config + create mode 100644 tools/testing/selftests/static_keys/config + create mode 100644 tools/testing/selftests/user/config + create mode 100644 tools/testing/selftests/vm/config + create mode 100644 tools/testing/selftests/zram/config +Merging y2038/y2038 (8750343a6505 coredump: Use 64bit time for unix time of coredump) +$ git merge y2038/y2038 +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1646 and retry the command. +Auto-merging drivers/staging/media/lirc/lirc_serial.c +Auto-merging drivers/staging/media/lirc/lirc_sasem.c +Auto-merging drivers/staging/gdm72xx/gdm_sdio.c +Merge made by the 'recursive' strategy. + 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 ++++++++++-------------------- + 5 files changed, 49 insertions(+), 73 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 borntraeger/linux-next (fc7f9754db6c s390/dma: Allow per device dma ops) +$ git merge borntraeger/linux-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1646 and retry the command. +Auto-merging lib/Makefile +Auto-merging include/linux/dma-mapping.h +Auto-merging arch/s390/pci/pci_dma.c +Auto-merging arch/s390/pci/pci.c +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/alpha/kernel/pci-noop.c | 46 ++--------------------- + arch/s390/Kconfig | 7 +--- + arch/s390/include/asm/device.h | 6 ++- + arch/s390/include/asm/dma-mapping.h | 6 ++- + arch/s390/pci/pci.c | 1 + + arch/s390/pci/pci_dma.c | 4 +- + include/linux/dma-mapping.h | 2 + + lib/Makefile | 1 + + lib/dma-noop.c | 75 +++++++++++++++++++++++++++++++++++++ + 9 files changed, 96 insertions(+), 52 deletions(-) + create mode 100644 lib/dma-noop.c +Merging livepatching/for-next (2184037e40ce Merge branch 'for-4.4/upstream-fixes' into for-next) +$ git merge livepatching/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging coresight/next (a0aede15d496 coresight: checking for NULL string in coresight_name_match()) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rtc/rtc-next (980dc707bca4 rtc: imxdi: fix spelling mistake in warning message) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-da9063.c | 23 +++++------------ + drivers/rtc/rtc-ds1305.c | 8 ++---- + drivers/rtc/rtc-ds1307.c | 17 +++--------- + drivers/rtc/rtc-ds1685.c | 22 +++++++--------- + drivers/rtc/rtc-efi.c | 66 ++++++++++++++++++++++++++++++++++++++++++++--- + drivers/rtc/rtc-gemini.c | 1 - + drivers/rtc/rtc-imxdi.c | 2 +- + drivers/rtc/rtc-pcf8523.c | 11 ++++++++ + drivers/rtc/rtc-proc.c | 8 +++--- + drivers/rtc/rtc-sunxi.c | 18 ++++++------- + 10 files changed, 108 insertions(+), 68 deletions(-) +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 (8de5dff8bae6 libnvdimm: documentation clarifications) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging akpm-current/current (7d182af8dd20 ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'arch/x86/mm/pgtable.c' +Resolved 'fs/adfs/adfs.h' using previous resolution. +Auto-merging scripts/tags.sh +Auto-merging net/socket.c +Auto-merging lib/test_hexdump.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/stop_machine.c +Auto-merging kernel/fork.c +Auto-merging kernel/events/uprobes.c +Auto-merging init/Kconfig +Auto-merging include/linux/stop_machine.h +Auto-merging fs/sysv/inode.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/gfs2/main.c +Auto-merging fs/file.c +Auto-merging fs/ecryptfs/main.c +Auto-merging fs/dcache.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/adfs/adfs.h +CONFLICT (content): Merge conflict in fs/adfs/adfs.h +Auto-merging drivers/staging/lustre/lustre/llite/super25.c +Auto-merging drivers/staging/lustre/include/linux/libcfs/libcfs_private.h +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/calib.c +Auto-merging drivers/iio/industrialio-core.c +Auto-merging drivers/block/drbd/drbd_int.h +Auto-merging drivers/block/drbd/drbd_bitmap.c +Auto-merging block/genhd.c +Auto-merging arch/x86/mm/pgtable.c +CONFLICT (content): Merge conflict in arch/x86/mm/pgtable.c +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/mm/gup.c +Auto-merging arch/s390/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Removing Documentation/features/vm/pmdp_splitting_flush/arch-support.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/mm/pgtable.c'. +[master 6ba8c039ff23] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .../vm/pmdp_splitting_flush/arch-support.txt | 40 - + Documentation/filesystems/proc.txt | 21 +- + Documentation/filesystems/vfat.txt | 10 + + Documentation/sysctl/vm.txt | 29 + + Documentation/vm/page_owner.txt | 9 +- + Documentation/vm/transhuge.txt | 151 +- + arch/Kconfig | 64 + + arch/arc/Kconfig | 3 - + arch/arc/mm/cache.c | 4 +- + arch/arm/Kconfig | 15 +- + arch/arm/include/asm/pgtable-3level.h | 9 - + arch/arm/lib/uaccess_with_memcpy.c | 5 +- + arch/arm/mm/dma-mapping.c | 11 +- + arch/arm/mm/flush.c | 17 +- + arch/arm/mm/mmap.c | 3 +- + arch/arm64/Kconfig | 23 + + arch/arm64/include/asm/pgtable.h | 8 - + arch/arm64/mm/flush.c | 16 - + arch/arm64/mm/mmap.c | 6 +- + arch/frv/include/asm/io.h | 17 +- + arch/metag/Kconfig | 3 - + arch/microblaze/Kconfig | 3 - + arch/mips/include/asm/pgtable-bits.h | 10 +- + arch/mips/include/asm/pgtable.h | 18 - + arch/mips/mm/c-r4k.c | 3 +- + arch/mips/mm/cache.c | 2 +- + arch/mips/mm/gup.c | 17 +- + arch/mips/mm/init.c | 6 +- + arch/mips/mm/pgtable-64.c | 14 - + arch/mips/mm/tlbex.c | 1 - + arch/parisc/Kconfig | 3 - + arch/powerpc/Kconfig | 3 - + arch/powerpc/include/asm/fadump.h | 2 +- + arch/powerpc/include/asm/pgtable-ppc64.h | 27 +- + arch/powerpc/kernel/fadump.c | 4 +- + arch/powerpc/mm/hugepage-hash64.c | 3 - + arch/powerpc/mm/hugetlbpage.c | 17 +- + arch/powerpc/mm/pgtable_64.c | 49 - + arch/powerpc/mm/subpage-prot.c | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 2 +- + arch/s390/Kconfig | 3 - + arch/s390/include/asm/pgtable.h | 16 +- + arch/s390/mm/gup.c | 24 +- + arch/s390/mm/pgtable.c | 21 +- + arch/sh/Kconfig | 3 - + arch/sh/mm/cache-sh4.c | 2 +- + arch/sh/mm/cache.c | 8 +- + arch/sparc/Kconfig | 4 - + arch/sparc/include/asm/pgtable_64.h | 16 - + arch/sparc/mm/fault_64.c | 3 - + arch/sparc/mm/gup.c | 16 +- + arch/tile/include/asm/pgtable.h | 10 - + arch/unicore32/Kconfig | 3 - + arch/x86/Kconfig | 19 +- + arch/x86/include/asm/pgtable.h | 9 - + arch/x86/include/asm/pgtable_types.h | 2 - + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/vm86_32.c | 6 +- + arch/x86/mm/gup.c | 17 +- + arch/x86/mm/mmap.c | 12 +- + arch/x86/mm/pgtable.c | 13 - + arch/xtensa/mm/tlb.c | 2 +- + block/genhd.c | 2 +- + drivers/acpi/apei/erst.c | 6 +- + drivers/base/cpu.c | 10 +- + drivers/block/drbd/drbd_bitmap.c | 26 +- + drivers/block/drbd/drbd_int.h | 3 - + drivers/char/mspec.c | 15 +- + drivers/firmware/broadcom/bcm47xx_nvram.c | 11 +- + drivers/gpu/drm/drm_hashtab.c | 5 +- + drivers/iio/industrialio-core.c | 9 +- + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 2 +- + drivers/soc/qcom/smd.c | 13 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 8 +- + drivers/staging/lustre/lustre/llite/super25.c | 3 +- + fs/9p/v9fs.c | 2 +- + fs/adfs/adfs.h | 28 +- + fs/adfs/super.c | 2 +- + fs/affs/super.c | 2 +- + fs/afs/super.c | 2 +- + fs/befs/linuxvfs.c | 2 +- + fs/bfs/inode.c | 2 +- + fs/block_dev.c | 4 +- + fs/btrfs/inode.c | 3 +- + fs/ceph/super.c | 4 +- + fs/cifs/cifsfs.c | 2 +- + fs/cifs/file.c | 8 +- + fs/coda/coda_linux.h | 3 +- + fs/coda/inode.c | 6 +- + fs/dcache.c | 5 +- + fs/ecryptfs/main.c | 6 +- + fs/efs/super.c | 6 +- + fs/exofs/inode.c | 5 +- + fs/exofs/super.c | 4 +- + fs/ext2/super.c | 2 +- + fs/ext4/fsync.c | 5 +- + fs/ext4/super.c | 2 +- + fs/f2fs/super.c | 5 +- + fs/fat/cache.c | 79 +- + fs/fat/dir.c | 2 +- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 61 + + fs/fat/inode.c | 77 +- + fs/file.c | 7 +- + fs/fuse/inode.c | 4 +- + fs/gfs2/main.c | 3 +- + fs/hfs/super.c | 4 +- + fs/hfsplus/super.c | 2 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hpfs/super.c | 2 +- + fs/hugetlbfs/inode.c | 4 +- + fs/inode.c | 2 +- + fs/isofs/inode.c | 2 +- + fs/jffs2/build.c | 8 +- + fs/jffs2/fs.c | 5 +- + fs/jffs2/super.c | 7 +- + fs/jfs/super.c | 2 +- + fs/kernfs/dir.c | 9 +- + fs/logfs/inode.c | 3 +- + fs/minix/inode.c | 2 +- + fs/ncpfs/inode.c | 2 +- + fs/nfs/inode.c | 2 +- + fs/nfs/objlayout/objio_osd.c | 5 +- + fs/nilfs2/super.c | 3 +- + fs/notify/inode_mark.c | 3 +- + fs/notify/mark.c | 66 +- + fs/ntfs/super.c | 4 +- + fs/ocfs2/alloc.c | 105 +- + fs/ocfs2/aops.c | 1138 ++++++++------- + fs/ocfs2/aops.h | 18 +- + fs/ocfs2/cluster/heartbeat.c | 4 +- + fs/ocfs2/dlm/dlmconvert.c | 24 +- + fs/ocfs2/dlm/dlmrecovery.c | 1 - + fs/ocfs2/dlmfs/dlmfs.c | 2 +- + fs/ocfs2/file.c | 173 +-- + fs/ocfs2/inode.c | 3 + + fs/ocfs2/inode.h | 6 +- + fs/ocfs2/journal.c | 8 +- + fs/ocfs2/localalloc.c | 23 +- + fs/ocfs2/localalloc.h | 2 +- + fs/ocfs2/mmap.c | 4 +- + fs/ocfs2/ocfs2.h | 8 + + fs/ocfs2/ocfs2_trace.h | 16 +- + fs/ocfs2/quota_global.c | 2 +- + fs/ocfs2/resize.c | 2 +- + fs/ocfs2/super.c | 66 +- + fs/ocfs2/super.h | 2 - + fs/openpromfs/inode.c | 2 +- + fs/proc/inode.c | 3 +- + fs/proc/page.c | 4 +- + fs/proc/task_mmu.c | 125 +- + fs/qnx4/inode.c | 2 +- + fs/qnx6/inode.c | 2 +- + fs/reiserfs/super.c | 3 +- + fs/romfs/super.c | 4 +- + fs/squashfs/super.c | 3 +- + fs/stat.c | 2 +- + fs/sysv/inode.c | 2 +- + fs/ubifs/super.c | 4 +- + fs/udf/super.c | 10 +- + fs/ufs/super.c | 2 +- + fs/xattr.c | 33 +- + fs/xfs/kmem.h | 1 + + fs/xfs/xfs_super.c | 4 +- + include/asm-generic/memory_model.h | 4 +- + include/asm-generic/pgtable.h | 9 - + include/asm-generic/sections.h | 65 + + include/linux/cpumask.h | 55 +- + include/linux/crc64_ecma.h | 56 + + include/linux/fsnotify_backend.h | 5 +- + include/linux/gfp.h | 20 +- + include/linux/huge_mm.h | 61 +- + include/linux/hugetlb.h | 10 +- + include/linux/io.h | 1 + + include/linux/kdev_t.h | 5 - + include/linux/kernel.h | 36 +- + include/linux/kexec.h | 2 + + include/linux/lz4.h | 4 +- + include/linux/memblock.h | 4 +- + include/linux/memcontrol.h | 43 +- + include/linux/mempolicy.h | 4 +- + include/linux/migrate.h | 6 +- + include/linux/mm.h | 148 +- + include/linux/mm_types.h | 27 +- + include/linux/mmdebug.h | 7 + + include/linux/mmzone.h | 34 +- + include/linux/page-flags.h | 286 ++-- + include/linux/page_ext.h | 1 + + include/linux/page_owner.h | 50 +- + include/linux/pagemap.h | 38 +- + include/linux/pfn.h | 1 + + include/linux/poison.h | 6 +- + include/linux/rmap.h | 35 +- + include/linux/shm.h | 6 +- + include/linux/shmem_fs.h | 4 + + include/linux/slab.h | 5 + + include/linux/stop_machine.h | 6 +- + include/linux/string.h | 1 + + include/linux/swap.h | 5 +- + include/linux/thread_info.h | 5 +- + include/linux/vm_event_item.h | 4 +- + include/linux/vmalloc.h | 1 - + include/trace/events/gfpflags.h | 14 +- + include/trace/events/huge_memory.h | 166 +++ + include/trace/events/page_isolation.h | 38 + + include/trace/events/vmscan.h | 21 +- + init/Kconfig | 7 - + init/do_mounts.h | 4 +- + init/do_mounts_initrd.c | 6 +- + init/main.c | 10 +- + ipc/mqueue.c | 2 +- + ipc/msg.c | 5 +- + ipc/sem.c | 2 +- + ipc/shm.c | 2 +- + ipc/util.c | 11 +- + ipc/util.h | 2 +- + kernel/cpu.c | 64 +- + kernel/cred.c | 4 +- + kernel/delayacct.c | 2 +- + kernel/events/uprobes.c | 13 +- + kernel/exit.c | 3 +- + kernel/fork.c | 22 +- + kernel/futex.c | 63 +- + kernel/pid.c | 2 +- + kernel/printk/printk.c | 26 +- + kernel/ptrace.c | 10 +- + kernel/stop_machine.c | 4 +- + kernel/sysctl.c | 22 + + lib/Kconfig | 7 + + lib/Kconfig.debug | 9 +- + lib/Makefile | 3 +- + lib/crc64_ecma.c | 341 +++++ + lib/iomap_copy.c | 21 + + lib/string_helpers.c | 63 +- + lib/{test-hexdump.c => test_hexdump.c} | 120 +- + mm/backing-dev.c | 19 +- + mm/compaction.c | 5 +- + mm/debug.c | 52 +- + mm/filemap.c | 25 +- + mm/gup.c | 114 +- + mm/huge_memory.c | 1465 ++++++++++++-------- + mm/hugetlb.c | 17 +- + mm/internal.h | 74 +- + mm/kmemleak.c | 3 +- + mm/ksm.c | 63 +- + mm/memblock.c | 4 +- + mm/memcontrol.c | 96 +- + mm/memory-failure.c | 77 +- + mm/memory.c | 107 +- + mm/mempolicy.c | 70 +- + mm/migrate.c | 44 +- + mm/mincore.c | 2 +- + mm/mlock.c | 14 +- + mm/mmap.c | 24 +- + mm/mmzone.c | 8 +- + mm/mprotect.c | 2 +- + mm/mremap.c | 15 +- + mm/nommu.c | 2 +- + mm/oom_kill.c | 15 +- + mm/page_alloc.c | 129 +- + mm/page_idle.c | 27 +- + mm/page_isolation.c | 18 +- + mm/page_owner.c | 82 +- + mm/pagewalk.c | 2 +- + mm/percpu.c | 18 +- + mm/pgtable-generic.c | 21 +- + mm/rmap.c | 314 +++-- + mm/shmem.c | 108 +- + mm/slab.h | 5 +- + mm/slab_common.c | 3 +- + mm/slub.c | 4 + + mm/swap.c | 274 +--- + mm/swap_state.c | 4 +- + mm/swapfile.c | 16 +- + mm/userfaultfd.c | 8 +- + mm/util.c | 54 +- + mm/vmalloc.c | 23 +- + mm/vmpressure.c | 2 +- + mm/vmscan.c | 29 +- + mm/vmstat.c | 25 +- + net/ipv4/fib_trie.c | 4 +- + net/ipv4/tcp_memcontrol.c | 17 +- + net/socket.c | 2 +- + net/sunrpc/rpc_pipe.c | 2 +- + scripts/checkpatch.pl | 49 +- + scripts/tags.sh | 2 - + 286 files changed, 5078 insertions(+), 3904 deletions(-) + delete mode 100644 Documentation/features/vm/pmdp_splitting_flush/arch-support.txt + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/trace/events/huge_memory.h + create mode 100644 include/trace/events/page_isolation.h + create mode 100644 lib/crc64_ecma.c + rename lib/{test-hexdump.c => test_hexdump.c} (57%) +$ git am -3 ../patches/prctl-pr_set_mm-introduce-pr_set_mm_map-operation-v4-fix.patch +Applying: headers: prctl.h -- Add missing linux/types.h +fatal: sha1 information is lacking or useless (include/uapi/linux/prctl.h). +error: could not build fake ancestor +Patch failed at 0001 headers: prctl.h -- Add missing linux/types.h +The copy of the patch that failed is found in: .git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git am -3 ../patches/common-dma-mapping-introduce-common-remapping-functions-fix.patch +Applying: common: dma-mapping: Swap function order +fatal: sha1 information is lacking or useless (drivers/base/dma-mapping.c). +error: could not build fake ancestor +Patch failed at 0001 common: dma-mapping: Swap function order +The copy of the patch that failed is found in: .git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git am -3 ../patches/common-dma-mapping-introduce-common-remapping-functions-fix-2.patch +Applying: common: dma-mapping: Protect remapping functions with CONFIG_MMU +fatal: sha1 information is lacking or useless (drivers/base/dma-mapping.c). +error: could not build fake ancestor +Patch failed at 0001 common: dma-mapping: Protect remapping functions with CONFIG_MMU +The copy of the patch that failed is found in: .git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..fdff46aa2a90 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,395 @@ +Importing jdelvare-hwmon based on 3.15-rc7 +Unknown BASE +Importing rd-docs based on 3.17-rc1 +Unknown BASE +Importing jdelvare-hwmon based on 3.15-rc7 +Unknown BASE +Importing rd-docs based on 3.17-rc1 +Unknown BASE +Importing jdelvare-hwmon based on 3.15-rc7 +Unknown BASE +Importing rd-docs based on 3.17-rc1 +Unknown BASE +Importing jdelvare-hwmon based on 3.15-rc7 +Unknown BASE +Importing rd-docs based on 3.17-rc1 +Unknown BASE +Importing jdelvare-hwmon based on 3.15-rc7 +Unknown BASE +Importing rd-docs based on 3.17-rc1 +Unknown BASE +Importing jdelvare-hwmon based on 3.15-rc7 +Unknown BASE +Importing rd-docs based on 3.17-rc1 +Unknown BASE +Importing jdelvare-hwmon based on 3.14-rc3 +Unknown BASE +Importing jdelvare-hwmon based on 3.14-rc3 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.14-rc3 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.14-rc3 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.14-rc3 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 +HEAD is now at 6d0abeca3242 Linux 3.14-rc3 +$ git am ../quilt/jdelvare-hwmon/hwmon-f71805f-fix-author-address.patch +Applying: hwmon: (f71805f) Fix author's address +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-01-add-additional-sysfs-group-for-temp2_type-attribute.patch +Applying: hwmon: (lm63) Add additional sysfs group for temp2_type attribute +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-02-introduce-dev-variable-to-point-to-client-dev.patch +Applying: hwmon: (lm63) Introduce 'dev' variable to point to client->dev +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-03-create-all-sysfs-groups-in-one-call.patch +Applying: hwmon: (lm63) Create all sysfs groups in one call +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-04-convert-to-use-devm_hwmon_device_register_with_groups.patch +Applying: hwmon: (lm63) Convert to use devm_hwmon_device_register_with_groups +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-05-avoid-double-initialization.patch +Applying: hwmon: (lm63) Avoid initializing the same field twice +$ git am ../quilt/jdelvare-hwmon/hwmon-adm1021-convert-to-use-devm_hwmon_device_register_with_groups.patch +Applying: hwmon: (adm1021) Convert to use devm_hwmon_device_register_with_groups +$ git am ../quilt/jdelvare-hwmon/hwmon-lm80-convert-to-use-devm_hwmon_device_register_with_groups.patch +Applying: hwmon: (lm80) Convert to use devm_hwmon_device_register_with_groups +$ git am ../quilt/jdelvare-hwmon/hwmon-pc87360-avoid-double-initializations.patch +Applying: hwmon: (pc87360) Avoid initializing the same field twice +$ git am ../quilt/jdelvare-hwmon/hwmon-avoid-double-initializations.patch +Applying: hwmon: Avoid initializing the same field twice +$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-01-create-most-optional.patch +Applying: hwmon: (lm90) Create most optional attributes with sysfs_create_group +$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-02-always-use-the-dev.patch +Applying: hwmon: (lm90) Always use the dev variable in the probe function +$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-03-create-all-sysfs-groups.patch +Applying: hwmon: (lm90) Create all sysfs groups in one call +$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-04-convert-to-use.patch +Applying: hwmon: (lm90) Convert to use hwmon_device_register_with_groups +$ cd /home/broonie/git/next/sfr/next +$ git fetch -f ../quilt-tmp master:jdelvare-hwmon/master +From ../quilt-tmp + + c7208164e66f...3a3583e25e63 master -> jdelvare-hwmon/master (forced update) +Importing jdelvare-hwmon based on 3.14-rc3 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.14-rc3 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.14-rc3 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.14-rc3 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.14-rc3 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.17-rc1 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +HEAD is now at 7d1311b93e58 Linux 3.17-rc1 +$ git am ../quilt/jdelvare-hwmon/hwmon-f71805f-fix-author-address.patch +Applying: hwmon: (f71805f) Fix author's address +error: patch failed: drivers/hwmon/f71805f.c:1648 +error: drivers/hwmon/f71805f.c: patch does not apply +Patch failed at 0001 hwmon: (f71805f) Fix author's address +The copy of the patch that failed is found in: + /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-01-add-additional-sysfs-group-for-temp2_type-attribute.patch +Applying: hwmon: (lm63) Add additional sysfs group for temp2_type attribute +error: patch failed: drivers/hwmon/lm63.c:915 +error: drivers/hwmon/lm63.c: patch does not apply +Patch failed at 0001 hwmon: (lm63) Add additional sysfs group for temp2_type attribute +The copy of the patch that failed is found in: + /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-02-introduce-dev-variable-to-point-to-client-dev.patch +Applying: hwmon: (lm63) Introduce 'dev' variable to point to client->dev +error: patch failed: drivers/hwmon/lm63.c:1038 +error: drivers/hwmon/lm63.c: patch does not apply +Patch failed at 0001 hwmon: (lm63) Introduce 'dev' variable to point to client->dev +The copy of the patch that failed is found in: + /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-03-create-all-sysfs-groups-in-one-call.patch +Applying: hwmon: (lm63) Create all sysfs groups in one call +error: patch failed: drivers/hwmon/lm63.c:157 +error: drivers/hwmon/lm63.c: patch does not apply +Patch failed at 0001 hwmon: (lm63) Create all sysfs groups in one call +The copy of the patch that failed is found in: + /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-04-convert-to-use-devm_hwmon_device_register_with_groups.patch +Applying: hwmon: (lm63) Convert to use devm_hwmon_device_register_with_groups +error: patch failed: drivers/hwmon/lm63.c:155 +error: drivers/hwmon/lm63.c: patch does not apply +Patch failed at 0001 hwmon: (lm63) Convert to use devm_hwmon_device_register_with_groups +The copy of the patch that failed is found in: + /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +Importing jdelvare-hwmon based on 3.17-rc1 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +HEAD is now at 7d1311b93e58 Linux 3.17-rc1 +$ git am ../quilt/jdelvare-hwmon/hwmon-f71805f-fix-author-address.patch +Applying: hwmon: (f71805f) Fix author's address +error: patch failed: drivers/hwmon/f71805f.c:1648 +error: drivers/hwmon/f71805f.c: patch does not apply +Patch failed at 0001 hwmon: (f71805f) Fix author's address +The copy of the patch that failed is found in: + /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-01-add-additional-sysfs-group-for-temp2_type-attribute.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-02-introduce-dev-variable-to-point-to-client-dev.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-03-create-all-sysfs-groups-in-one-call.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-04-convert-to-use-devm_hwmon_device_register_with_groups.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-05-avoid-double-initialization.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-adm1021-convert-to-use-devm_hwmon_device_register_with_groups.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-lm80-convert-to-use-devm_hwmon_device_register_with_groups.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-pc87360-avoid-double-initializations.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-avoid-double-initializations.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-01-create-most-optional.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-02-always-use-the-dev.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-03-create-all-sysfs-groups.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-04-convert-to-use.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ cd /home/broonie/git/next/sfr/next +$ git fetch -f ../quilt-tmp master:jdelvare-hwmon/master +From ../quilt-tmp + + 3a3583e...7d1311b master -> jdelvare-hwmon/master (forced update) +Importing jdelvare-hwmon based on 3.17-rc1 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.17-rc1 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.17-rc1 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.15-rc7 + quilt series is empty +$ git branch -f jdelvare-hwmon/master c7208164e66f63e3ec1759b98087849286410741 +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.17-rc1 +Unchanged quilt series rd-docs +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.17-rc1 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +HEAD is now at 7d1311b93e58 Linux 3.17-rc1 +$ git am ../quilt/rd-docs/001-docum-use-subdiry-avoid-builtin.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/002-docum-add-make-more-targets.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/003-docum-funcs-static.patch +Applying: Documentation: make functions static to avoid prototype warnings +$ git am ../quilt/rd-docs/004-docum-misc-warnings.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/docum-submit-patches-add-gregkh-page.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/media-v4l2-pci-skel-dep-pci.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/docum-i2c-fix-interface-example.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/docum-fs-seq-open-release-private.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/docum-misc-devices-freefall.patch +Patch format detection failed. +$ cd /home/broonie/git/next/sfr/next +$ git fetch -f ../quilt-tmp master:rd-docs/master +From ../quilt-tmp + + 1f65b1aaaa0a...330261642606 master -> rd-docs/master (forced update) +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.17-rc1 +Unchanged quilt series rd-docs +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.17-rc1 +Unchanged quilt series rd-docs +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.17-rc1 +Unchanged quilt series rd-docs +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.17-rc1 +Unchanged quilt series rd-docs +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.17-rc1 +$ git branch rd-docs/master 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +HEAD is now at 7d1311b93e58 Linux 3.17-rc1 +$ git am ../quilt/rd-docs/001-docum-use-subdiry-avoid-builtin.patch +Patch format detection failed. +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.17-rc1 +Unchanged quilt series rd-docs +$ git am ../quilt/rd-docs/002-docum-add-make-more-targets.patch +sh: 0: getcwd() failed: No such file or directory +fatal: Unable to read current working directory: No such file or directory +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.17-rc1 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +HEAD is now at 7d1311b93e58 Linux 3.17-rc1 +$ git am ../quilt/rd-docs/001-docum-use-subdiry-avoid-builtin.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/002-docum-add-make-more-targets.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/003-docum-funcs-static.patch +Applying: Documentation: make functions static to avoid prototype warnings +$ git am ../quilt/rd-docs/004-docum-misc-warnings.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/docum-submit-patches-add-gregkh-page.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/media-v4l2-pci-skel-dep-pci.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/docum-i2c-fix-interface-example.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/docum-fs-seq-open-release-private.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/docum-misc-devices-freefall.patch +Patch format detection failed. +$ cd /home/broonie/git/next/sfr/next +$ git fetch -f ../quilt-tmp master:rd-docs/master +From ../quilt-tmp + + 330261642606...8f3f7fc4140b master -> rd-docs/master (forced update) +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.17-rc1 +Unchanged quilt series rd-docs +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.17-rc1 +Unchanged quilt series rd-docs +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.17-rc1 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +HEAD is now at 7d1311b93e58 Linux 3.17-rc1 +$ git am ../quilt/rd-docs/001-docum-use-subdiry-avoid-builtin.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/002-docum-add-make-more-targets.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/003-docum-funcs-static.patch +Applying: Documentation: make functions static to avoid prototype warnings +error: patch failed: Documentation/arm/SH-Mobile/vrl4.c:77 +error: Documentation/arm/SH-Mobile/vrl4.c: patch does not apply +error: patch failed: Documentation/prctl/disable-tsc-ctxt-sw-stress-test.c:27 +error: Documentation/prctl/disable-tsc-ctxt-sw-stress-test.c: patch does not apply +error: patch failed: Documentation/prctl/disable-tsc-on-off-stress-test.c:29 +error: Documentation/prctl/disable-tsc-on-off-stress-test.c: patch does not apply +error: patch failed: Documentation/prctl/disable-tsc-test.c:29 +error: Documentation/prctl/disable-tsc-test.c: patch does not apply +Patch failed at 0001 Documentation: make functions static to avoid prototype warnings +The copy of the patch that failed is found in: + /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git am ../quilt/rd-docs/004-docum-misc-warnings.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/rd-docs/docum-submit-patches-add-gregkh-page.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/rd-docs/media-v4l2-pci-skel-dep-pci.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/docum-i2c-fix-interface-example.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/docum-fs-seq-open-release-private.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/docum-misc-devices-freefall.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/docum-nfs-rdma-sep-symbols.patch +Applying: NFS/RDMA: Document separate Kconfig symbols +$ cd /home/broonie/git/next/sfr/next +$ git fetch -f ../quilt-tmp master:rd-docs/master +From ../quilt-tmp + 8f3f7fc4140b..294e6c50f834 master -> rd-docs/master +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.17-rc1 +Unchanged quilt series rd-docs +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on origin/master +$ git branch dmi/master 2255702db4014d1c69d6037ed7bdad2d2e271985 + quilt series is empty +$ git branch -f dmi/master 2255702db4014d1c69d6037ed7bdad2d2e271985 +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on origin/master +Unchanged quilt series dmi +Importing jdelvare-hwmon based on 4.3 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 6a13feb9c82803e2b815eca72fa7a9f5561d7861 +HEAD is now at 6a13feb9c828 Linux 4.3 +$ git am --patch-format=mbox ../quilt/jdelvare-hwmon/hwmon-k10temp-remove-duplicate-pci-id-define.patch +Applying: hwmon: (k10temp) Remove duplicate pci-id define +$ cd /home/broonie/git/next/sfr/next +$ git fetch -f ../quilt-tmp master:jdelvare-hwmon/master +From ../quilt-tmp + + 69bb8a38c5a9...c0453e633a6a master -> jdelvare-hwmon/master (forced update) +Importing dmi based on 4.3 +$ cd ../quilt-tmp +$ git reset --hard 6a13feb9c82803e2b815eca72fa7a9f5561d7861 +HEAD is now at 6a13feb9c828 Linux 4.3 +$ git am --patch-format=mbox ../quilt/dmi/firmware-dmi_scan-01-optimize-dmi_save_extended_devices.patch +Applying: firmware: dmi_scan: Optimize dmi_save_extended_devices +$ git am --patch-format=mbox ../quilt/dmi/firmware-dmi_scan-02-clarify-dmi_save_extended_devices.patch +Applying: firmware: dmi_scan: Clarify dmi_save_extended_devices +$ git am --patch-format=mbox ../quilt/dmi/firmware-dmi_scan-03-fix-dmi_find_device-description.patch +Applying: firmware: dmi_scan: Fix dmi_find_device description +$ git am --patch-format=mbox ../quilt/dmi/firmware-dmi_scan-04-save-type-9-system-slots.patch +Applying: firmware: dmi_scan: Save SMBIOS Type 9 System Slots +$ cd /home/broonie/git/next/sfr/next +$ git fetch -f ../quilt-tmp master:dmi/master +From ../quilt-tmp + 1dc51b828800..77bb27fef9dc master -> dmi/master +Importing jdelvare-hwmon based on 4.3 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.3 +Unchanged quilt series dmi +Importing jdelvare-hwmon based on 4.3 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.3 +Unchanged quilt series dmi +Importing jdelvare-hwmon based on 4.3 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.3 +Unchanged quilt series dmi +Importing jdelvare-hwmon based on 4.3 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.3 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..200010d91335 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20151202 |