diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-01-05 14:37:57 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-01-05 14:37:57 +1100 |
| commit | 35393dcb2ed331e8698a548fbba8042457f5fd32 (patch) | |
| tree | fb815bfee6c1f456f803b435d65b1ae30347d525 | |
| parent | 1d53f8c2b30dc79b6f75138ef81d94c08861347d (diff) | |
Add linux-next specific files for 20150105next-20150105
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 238 | ||||
| -rw-r--r-- | Next/Trees | 240 | ||||
| -rw-r--r-- | Next/merge.log | 2204 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 2685 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..f7739b889fee --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,238 @@ +Name SHA1 +---- ---- +origin 693a30b8f19a964087a3762d09fb2e1cbad6b0d4 +fixes b94d525e58dc9638dd3f98094cb468bcfb262039 +kbuild-current a16c5f99a28c9945165c46da27fff8e6f26f8736 +arc-current 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd +arm-current 3f4aa45ceea5789a4aade536acc27f2e0d3da5e1 +m68k-current f0b99a643e9613beb28af43333bbfa90d4bf85cc +metag-fixes ffe6902b66aaa4ca6694bc19639259c16d84ddb1 +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-merge 31345e1a071e4e5f2fa8b6be5ca7d1cbce20cfca +powerpc-merge-mpe 1be6f10f6f9caade3a053938cb80a2eed237e262 +sparc 66d0f7ec9f1038452178b1993fc07fd96d30fd38 +net 9dac6232e2ee2bc85dc71f464f19f047afc9422c +ipsec f855691975bb06373a98711e4cfe2c224244b536 +sound-current 62f64a880af2e82d1b41cb02cb43b88d30413993 +pci-current 97bf6af1f928216fd6c5a66e8a57bfa95a659672 +wireless 97bf6af1f928216fd6c5a66e8a57bfa95a659672 +wireless-drivers eb46e2215fc6bdaaf8eda3a6c7c0dd033d171cad +driver-core.current b7392d2247cfe6771f95d256374f1a8e6a6f48d6 +tty.current 68ed7e1c3d236e9e1e60ed6cae22f2c1c4ba2952 +usb.current b3ee8bdcd243b8ae2143dda2cf9157bc9bfb26ea +usb-gadget-fixes 6785a1034461c2d2c205215f63a50a740896e55b +usb-serial-fixes b5122236bba8d7ef62153da5b55cc65d0944c61e +staging.current b7392d2247cfe6771f95d256374f1a8e6a6f48d6 +char-misc.current b7392d2247cfe6771f95d256374f1a8e6a6f48d6 +input-current cceeb872d60f77f9305d9e138c7d0acee1d60038 +md-current d47648fcf0611812286f68131b40251c6fa54f5e +crypto-current 7e77bdebff5cb1e9876c561f69710b9ab8fa1f7e +ide f96fe225677b3efb74346ebd56fafe3997b02afa +dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5 +devicetree-current 094cb98179f19b75acf9ff471daabf3948ce98e6 +rr-fixes 3438cf549d2f3ee8e52c82acc8e2a9710ac21a5b +vfio-fixes 239a87020b263fe7e70adc5803cb157955023d3c +kselftest-fixes 6898b627aab6ba553e6d8b40a0b1ddc43c48d42f +drm-intel-fixes f465245df91172f325e9ac1ad235a4996fabf5aa +asm-generic cb61f6769b8836081940ba26249f1b756400c7df +arc 97bf6af1f928216fd6c5a66e8a57bfa95a659672 +arm e9f2d6d66037cdf97487491e04053f411abc5d16 +arm-perf cac7f2429872d3733dc3f9915857b1691da2eb2f +arm-soc d6ad36913083d683aad4e02e53580c995f1a6ede +bcm2835 b2776bf7149bddd1f4161f14f79520f17fc1d71d +berlin 97bf6af1f928216fd6c5a66e8a57bfa95a659672 +cortex-m e799b6f37e6ccd7b97e3e2df62a30f1c5b211290 +ep93xx bfb0709fd17b13498d99592bbe12c91130e35a55 +imx-mxs 8a73e870fc56150d19eb33fd225ae4660469385a +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +keystone b17275a4a6cc61e0b7da40558ff5c7250fb80917 +msm 81cf1e061d001fab44dbaa85fc4fbfb6da6713a1 +mvebu 10fbc6c4d046162434fe9664fa846fe73712bdc9 +renesas 340337ad530dfb0e13e96e56bf1e5fdc5e67adc3 +samsung 1eeec807bf644a0e691026b2fd0572f8f5aed1a1 +sunxi ad01dbad562646056ebfc5e06c2bb18a2e44c63d +tegra fa047e01365d4fe309ec56ff6521edd10ca5d0c5 +arm64 fb59d007a0e44e2304e4fc8cf5c20b6fda7890f3 +blackfin 275f5a8573e7832d0cf344a1b29da357c7038870 +c6x ae72758f1dd93bd367dc7719702f24a9bfb3bad9 +cris 21bd887cd7c485214bbdbf6a52ce9a74ac85c844 +hexagon 8914d7e857807e1e60975000cba3750c9b2643e8 +ia64 0fd2468fd035039c7493d28b60664ab7276f5005 +m68k f0b99a643e9613beb28af43333bbfa90d4bf85cc +m68knommu afdc830bf9ce19d810ca2984aaf20f2c1e5685c9 +metag f93125ae17d1d259b5aba84016db260903822194 +microblaze 3a8e3265179b7e6394d7aab4d6df5651b49e7243 +mips 4ea2902491f41724897b6c489123038b7add7d00 +nios2 1b0f44923e186b2f9383b3260f6b5fbfc77b9e4a +openrisc 548dafe880ad84d0accc0a5596c26e3348b103e1 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd b2776bf7149bddd1f4161f14f79520f17fc1d71d +powerpc d557b09800dab5dd6804e5b79324069abcf0be11 +powerpc-mpe d70a54e2d08510a99b1f10eceeae6f2f7086e226 +fsl 76f3e2929bb6b476fb02b519ad953e2e29ee7bd5 +mpc5xxx 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025 +s390 fa0d0b064d550675b80df1e648888a9c97e313d3 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile c47b15c4928c46b889a1ea2e9b54f4110514e1c3 +uml 989e59fa41c5464ab77bf0bf82f32f721430544e +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa 1f2fdbd0078cb2ad4251768e8c0e0bb652a2cbd6 +btrfs 1edb647bb95439d90c0017e9ca23c4ecf00a0409 +ceph 388cfdc9bc19cc189b86770dba55910018e8e0fc +cifs 0891605dd763cfbd61cf83b94dd690e994dc77ad +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 942080643bce061c3dd9d5718d3b745dcb39a8bc +ext3 3ee3039c5b4d121d56dc6b7deeeee3ba4150a260 +ext4 363307e6e561cde78572fd22e7fd00cd3e5adb02 +f2fs 987b52e6570910ac4693b3ac915e52b1cf19e396 +fscache 1a8ed18fb7db48c916c2ccd484e04bd4dd737834 +fuse 1c68271cf1bfe7f3664b6dbf4ffd5fe11130be5c +gfs2 ec7d879c457611e540cb465c25f3040facbd1185 +jfs e1f1fe798d2f2eab904624125ba924d08205f960 +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs b7392d2247cfe6771f95d256374f1a8e6a6f48d6 +nfsd 3c0aeb6da065c616653e6573016715f65640c27a +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +overlayfs 2b7a8f36f092a7855f6438cd42d6990394f450fa +squashfs 62421645bb702c077ee5a462815525106cb53bcf +v9fs f15844e0777fec936f87a87f97394f83911dacd3 +ubifs f38aed975c0c3645bbdfc5ebe35726e64caaf588 +xfs efdca7aa3c41bce7a092019b3f675fbaa3b8d23f +file-locks 1b2b32dcdb3df28dd103033c73cac2417fa05845 +vfs 88174fd2c8fbf06e06ccbc008e8e7e0947aa974f +pci 75f30c3d9949aab82d5d63bc9b32665cb2e5df7c +hid 3bc80f8b09bd453f81f4305a0bd8aaa291fedc29 +i2c 523c5b89640e147abc7c70466f55327df8559d0a +jdelvare-hwmon ae530d4403e9a22363c275a82b46ecd95f939a04 +hwmon-staging 907a6d5824599d09e986105a5a880d119a996c4b +v4l-dvb 2ea3258b238cc194173fe4ed000c87f47267bada +kbuild 45d5415f3b180fb9e5e3eaa6cc312054b0207f4d +kconfig 95edca5c523c4b404dd60baa0a1bea0e4c38fd72 +libata d325a876e2b357c67f1d0bf7a47fccf382db9c8b +pm df90dcd1007bc498927afea18ccfaae02e361707 +idle f7c0e22f2d14b9ad8400ee17061822e33c1d5e2f +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal 7429b1e0d00e62426c74a45195ba72149cb9ad64 +thermal-soc d8c3cd75e77d8033b29470525781befc11b6bf7d +ieee1394 d737d7da8e7e931360282199341f44ac0803c837 +dlm 2ab4bd8ea3a6954bc79a9bbeb291cd6c2d6213a7 +swiotlb 8e0629c1d4ce86ce7d98ca8756f42769bb17a3c8 +slave-dma 3e8ec65e62df9ea72d23043723b78f0e0fcbc190 +net-next 7beceebf5b9d14e333ab6025a6feccdc8e765225 +ipsec-next fbe68ee87522f6eaa10f9076c0a7117e1613f2f7 +wireless-next 97bf6af1f928216fd6c5a66e8a57bfa95a659672 +wireless-drivers-next 354f473ee2c5d01c1cf90f747f95218ee3e73e95 +bluetooth 661cf88acd84875c275820ed01e42b25c4e9a1e2 +infiniband a7cfef21e3d066343bec14d3113a9f9c92d1c2a8 +mtd 97bf6af1f928216fd6c5a66e8a57bfa95a659672 +l2-mtd ed0215cc3b5292fc0f4af70e29dc61fa2d0aa76c +crypto 2f3755381da8d592656f1ef6868fa9f96c450ba9 +drm 4e0cd68115620bc3236ff4e58e4c073948629b41 +drm-panel 54cbc4e298ea68035618b46894aed1e439121e56 +drm-intel 5d77d9c5e177d2182df5d9fd61ba986facb64415 +drm-tegra 7e0180e3570cc791e95e6b6cd5fbeb0aedc62776 +drm-misc 6cadd306033e70b4edb136815807060e168cac67 +sound ff6defa6a8fae12205d64f55db395b1fcf35af8e +sound-asoc e0495d6d6aee5581f1d6364b1ece9f3e569032c5 +modules b0a65b0cccd477b2fd8b7adad0ac39433df54829 +virtio c91c2a63913b7ead21163fd8f0d1432031055920 +input aa104b1aaaa3bd132106daccf7fb10eed806d325 +input-mt 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 +block 177ccd2f8f3976b2a591988dfc9bc5327f169ec0 +device-mapper af66c8489d6dc69a356897b3b85c1e9a8480184f +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh 6fcbdd5bb524f0f152a5f545b73f973a4d65d198 +kgdb 0f16996cf2ed7c368dd95b4c517ce572b96a10f5 +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md f851b60db0fd83a10034c5cc9d9e58c758457b1c +mfd a3b63979f8a32af9e975a793fd0f612d42072740 +backlight 3d6969a641d01cc9b6aa199a6f01eb1802522baf +battery 02088e3ed79f0639d71caeb3dd49d42f88746c88 +fbdev 718b90ac4c21c81f42b6db062ca0867f3cac7648 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 574d54112fdac339627939ca94851a09f0fe0cfa +regulator 70f56625cae811ff512354654c022ea9d5272e19 +security b2d1965dcea148100ffc4e7199470bf5fad13871 +integrity 63a0eb7891bdf3ef32ecb6b01eb09106df646c10 +selinux 566075875a84e90e262ecab5996719a09d822fc4 +lblnet d8ec26d7f8287f5788a494f56e8814210f0e64be +watchdog e0c3e00f40456259441dbec519f9790edc1f5f30 +iommu 76771c938e95ce4106c6e8092f4f614d4d1e0ecc +dwmw2-iommu 1860e379875dfe7271c649058aeddffe5afd9d0d +vfio 5e9f36c59a4883c6d8db4a3c097e4fc2234742de +osd 1fa3a002b2546c42c343c77c144871285896ced5 +jc_docs 174236285cf849f85a31b3da875c2e939d7cdb15 +trivial 231821d4c3fa72de8fd9981e608323529ac9ad70 +audit 0f7e94ee40d06f7a04e039392dfee8244bd8a7e0 +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +devicetree c46ca3c8310b61d253a39ff1375ea97912794cd1 +dt-rh a0e27f51ba8a04125c22a95c4d3e98297a7191de +mailbox 9f3e3cacb2ffdefe28c7cf490bf543e4dcb2770a +spi a8eb27814016bd22c089e0e33ded202b440a547b +tip caa523dc22421c0dfa283da019782c69b7e6f77b +clockevents b0ad5917960ca80f96baeb427ec64a12c57f0c36 +edac fec53af531dd040e41fe358abe00b33747af2688 +edac-amd 775c503f65679c46647c9414b218738b7062b215 +irqchip 97bf6af1f928216fd6c5a66e8a57bfa95a659672 +tiny f114040e3ea6e07372334ade75d1ee0775c355e1 +ftrace d716ff71dd12bc6328f84a9ec1c3647daf01c827 +rcu 940c6c7fb5ecef57c1fea82facf52c0856bdbeda +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm 2c4aa55a6af070262cca425745e8e54310e96b8d +kvm-arm 05971120fca43e0357789a14b3386bb56eef2201 +kvm-ppc 476ce5ef09b21a76e74d07ff9d723ba0de49b53b +oprofile 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen-tip 2e917175e1ef147a527a9158b9f09773ec94c0bd +percpu bfaa047a9415d37efaf44fefefa377735d97598c +workqueues 008847f66c38712f2819cd956969519006ebc11d +drivers-x86 200db647112d9a0f1dce273604f949f916bd2426 +chrome-platform 5502486a2077e4280c618b82e8a77ed35932956f +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap 270ded427d7b70972e492501d64ad42e09da5ea5 +hsi 67e9a2ce6e070b1e5db2dfe9c61890fc30ae954d +leds d5a570782795aa2ed706bb0564b12acd6f97f770 +ipmi 1421c935df159c8b893e82dd81b329b8977c4e86 +driver-core b7392d2247cfe6771f95d256374f1a8e6a6f48d6 +tty b7392d2247cfe6771f95d256374f1a8e6a6f48d6 +usb b7392d2247cfe6771f95d256374f1a8e6a6f48d6 +usb-gadget b7392d2247cfe6771f95d256374f1a8e6a6f48d6 +usb-serial b7392d2247cfe6771f95d256374f1a8e6a6f48d6 +staging b7392d2247cfe6771f95d256374f1a8e6a6f48d6 +char-misc b7392d2247cfe6771f95d256374f1a8e6a6f48d6 +cgroup eeecbd1971517103e06f11750dd1a9a1dc37e4e6 +scsi 6bf850aa7ff62e911b18a6c085879f43e0cbb7bb +target-updates ae450e246e8540300699480a3780a420a028b73f +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +writeback f9b0e058cbd04ada76b13afffa7e1df830543c24 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl 96dfdff694aeeb8f2ab4858bb81400c8b30daf53 +vhost 5d9a07b0de512b77bf28d2401e5fe3351f00a240 +remoteproc 9a3c4145af32125c5ee39c0272662b47307a8323 +rpmsg b1b9891441fa33fd0d49b5cb3aa7f04bca1cc1db +gpio 170680abd1eb98a9773ed068435fef9a6402a10f +dma-mapping dda02fd6278d9e995850b3c1dba484f17cbe4de4 +pwm 39e046f2c1dd0742976d7ee6e464744cf2122f41 +dma-buf 101e31050bf174e5bcca72bdb9d0bd392aa4f966 +userns db86da7cb76f797a1a8b445166a15cb922c6ff85 +ktest 17150fef4ab1f48d838008657cdaa168453a9fa6 +signal 20b4fb485227404329e41ad15588afad3df23050 +clk f1e9203e2366164b832d8a6ce10134de8c575178 +random 7185ad2672a7d50bc384de0e38d90b75d99f3d82 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +aio 5f785de588735306ec4d7c875caf9d28481c8b21 +llvmlinux 25d4aee23af28a6ef04d70a1028c012665384df1 +documentation 0415447aa3b4decc2c05dfc45a0aa34a5eb4fc54 +kselftest 97bf6af1f928216fd6c5a66e8a57bfa95a659672 +y2038 45446a99cef65aba81c0e59279f100bdb5624acd +luto-misc bced35b65aefe53a6f77a9ed0ce1aea86e9d65a2 +access_once 5de72a2247ac05bde7c89039631b3d0c6186fafb +omap b2776bf7149bddd1f4161f14f79520f17fc1d71d +omap-pending b2776bf7149bddd1f4161f14f79520f17fc1d71d +livepatching 700a3048aaa394b2a6d1468430f892151ce04a01 +akpm-current 350b61c87ab5b359da2269d02be4ca0fe5f81c97 +akpm 0f32ca56bddb8dd185f39ac7a16cf3db7b29349a diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..1aeab03324ff --- /dev/null +++ b/Next/Trees @@ -0,0 +1,240 @@ +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-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +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 +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#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 +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.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 +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 +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 +ep93xx git git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +ixp4xx git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.git#next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +msm git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git#for-next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.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 +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.rocketboards.org/linux-socfpga-next.git#nios2-next +openrisc git git://openrisc.net/jonas/linux#for-upstream +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.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/benh/powerpc.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#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 +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-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/steve/gfs2-3.0-nmw.git#master +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +logfs git git://github.com/prasad-joshi/logfs_upstream.git#master +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 +omfs git git://github.com/bcopeland/omfs.git#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-3/jdelvare-hwmon/ +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 +cpupowerutils git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master +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 +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-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 +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.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/core-stuff +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 +virtio git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +input-mt git git://github.com/rydberg/linux.git#for-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 +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +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 +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-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 +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git#for-next +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +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 +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.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 +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-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 +uprobes git git://github.com/srikard/linux.git#for-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 +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +fw-nohz git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#nohz/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 +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl.git#master +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/cooloney/linux-leds.git#for-next +ipmi git git://git.code.sf.net/p/openipmi/linux-ipmi#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +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 +writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next +hwspinlock git git://github.com/ohadbc/hwspinlock-next.git#linux-next +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 +signal git git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git#for-next +clk git git://git.linaro.org/people/mturquette/linux.git#clk-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +lzo-update git git://github.com/markus-oberhumer/linux.git#lzo-update +aio git git://git.kvack.org/~bcrl/aio-next.git#master +llvmlinux git git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next +documentation git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/doc.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +access_once git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +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 +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#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..a69cfd11c841 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2204 @@ +$ date +Monday 5 January 10:37:05 AEDT 2015 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 5e0f872c7d7e Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit +Merging origin/master (693a30b8f19a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml) +$ git merge origin/master +Updating 5e0f872c7d7e..693a30b8f19a +Fast-forward + arch/arm/kernel/setup.c | 9 +++++++ + arch/arm/kernel/smp.c | 12 +++++++++ + arch/um/Kconfig.common | 1 + + arch/x86/um/sys_call_table_32.c | 2 +- + arch/x86/um/sys_call_table_64.c | 2 +- + drivers/scsi/fnic/fnic.h | 2 +- + drivers/scsi/fnic/fnic_scsi.c | 15 ++++++++++++ + drivers/scsi/scsi_error.c | 4 +-- + drivers/scsi/sd.c | 5 ++-- + drivers/vhost/vhost.c | 10 +++++--- + include/sound/pcm.h | 10 ++++---- + include/uapi/linux/virtio_ring.h | 7 ++++++ + sound/soc/codecs/rt5677.c | 9 ++++--- + sound/soc/dwc/designware_i2s.c | 49 +++++++++++++++++++++++-------------- + sound/soc/intel/Kconfig | 4 +-- + sound/soc/intel/bytcr_dpcm_rt5640.c | 2 +- + sound/soc/intel/sst-firmware.c | 6 ++++- + sound/soc/intel/sst/sst_acpi.c | 2 +- + sound/soc/rockchip/rockchip_i2s.c | 4 +-- + sound/soc/rockchip/rockchip_i2s.h | 2 +- + sound/soc/soc-core.c | 14 ++++------- + 21 files changed, 116 insertions(+), 55 deletions(-) +Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (a16c5f99a28c kbuild: Fix removal of the debian/ directory) +$ git merge kbuild-current/rc-fixes +Merge made by the 'recursive' strategy. + scripts/Makefile.clean | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) +Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (3f4aa45ceea5 ARM: 8226/1: cacheflush: get rid of restarting block) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (f0b99a643e96 m68k/mm: Eliminate memset after alloc_bootmem_pages) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) +$ 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-merge/merge (31345e1a071e powerpc/pci: Remove unused force_32bit_msi quirk) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging powerpc-merge-mpe/fixes (1be6f10f6f9c Revert "powerpc: Secondary CPUs must set cpu_callin_map after setting active and online") +$ git merge powerpc-merge-mpe/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/kexec.h | 10 ++++++++++ + arch/powerpc/include/asm/systbl.h | 1 + + arch/powerpc/include/asm/unistd.h | 2 +- + arch/powerpc/include/uapi/asm/unistd.h | 1 + + arch/powerpc/kernel/machine_kexec_64.c | 2 +- + arch/powerpc/kernel/smp.c | 9 +-------- + arch/powerpc/platforms/pseries/lpar.c | 8 +++++++- + 7 files changed, 22 insertions(+), 11 deletions(-) +Merging sparc/master (66d0f7ec9f10 sparc32: destroy_context() and switch_mm() needs to disable interrupts.) +$ git merge sparc/master +Already up-to-date. +Merging net/master (9dac6232e2ee enic: free all rq buffs when allocation fails) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/allwinner/sun4i-emac.c | 4 +++- + drivers/net/ethernet/altera/altera_tse_main.c | 15 ++++++--------- + drivers/net/ethernet/cisco/enic/enic_main.c | 6 ++++-- + drivers/net/ethernet/intel/e100.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 4 +++- + drivers/net/ethernet/intel/igb/e1000_82575.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 13 ++++--------- + drivers/net/ethernet/mellanox/mlx4/mr.c | 9 +++++---- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 4 +++- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 + + drivers/net/ethernet/xilinx/ll_temac_main.c | 2 ++ + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 ++ + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 1 + + drivers/net/usb/qmi_wwan.c | 10 +++++++--- + net/ipv4/tcp_output.c | 4 ++-- + net/openvswitch/flow.c | 5 +++-- + net/openvswitch/vport.c | 2 +- + 17 files changed, 49 insertions(+), 37 deletions(-) +Merging ipsec/master (f855691975bb xfrm6: Fix the nexthdr offset in _decode_session6.) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv6/xfrm6_policy.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging sound-current/for-linus (62f64a880af2 ALSA: pcm: Fix kerneldoc for params_*() functions) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (97bf6af1f928 Linux 3.19-rc1) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless/master (97bf6af1f928 Linux 3.19-rc1) +$ git merge wireless/master +Already up-to-date. +Merging wireless-drivers/master (eb46e2215fc6 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge wireless-drivers/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (b7392d2247cf Linux 3.19-rc2) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (68ed7e1c3d23 serial: fix parisc boot hang) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/serial/serial_core.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging usb.current/usb-linus (b3ee8bdcd243 Merge tag 'fixes-for-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/dwc2/gadget.c | 10 +++++++--- + drivers/usb/dwc3/dwc3-pci.c | 4 ++++ + drivers/usb/gadget/function/f_hid.c | 5 +++-- + drivers/usb/gadget/function/f_midi.c | 2 +- + drivers/usb/gadget/function/f_uac1.c | 2 +- + drivers/usb/gadget/legacy/inode.c | 1 + + drivers/usb/gadget/udc/atmel_usba_udc.c | 7 +++---- + drivers/usb/musb/Kconfig | 4 ++++ + drivers/usb/musb/blackfin.c | 2 +- + drivers/usb/musb/musb_cppi41.c | 4 ++-- + drivers/usb/musb/musb_debugfs.c | 34 +++++++++++++++++---------------- + drivers/usb/musb/musb_host.c | 1 - + 12 files changed, 45 insertions(+), 31 deletions(-) +Merging usb-gadget-fixes/fixes (6785a1034461 usb: gadget: udc: atmel: fix possible IN hang issue) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (b5122236bba8 USB: keyspan: fix null-deref at probe) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/cp210x.c | 2 +- + drivers/usb/serial/keyspan.c | 20 +++++++++++++++----- + 2 files changed, 16 insertions(+), 6 deletions(-) +Merging staging.current/staging-linus (b7392d2247cf Linux 3.19-rc2) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (b7392d2247cf Linux 3.19-rc2) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (cceeb872d60f Input: hil_kbd - fix incorrect use of init_completion) +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) +$ git merge md-current/for-linus +Already up-to-date. +Merging crypto-current/master (7e77bdebff5c crypto: af_alg - fix backlog handling) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge ide/master +Already up-to-date. +Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) +$ git merge dwmw2/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (094cb98179f1 of/fdt: memblock_reserve /memreserve/ regions in the case of partial overlap) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (3438cf549d2f param: fix crash on bad kernel arguments) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (6898b627aab6 selftests/exec: Use %zu to format size_t) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (f465245df911 drm/i915: vlv: sanitize RPS interrupt mask during GPU idling) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_irq.c | 20 ++++++++++++++++++-- + drivers/gpu/drm/i915/intel_drv.h | 1 + + drivers/gpu/drm/i915/intel_pm.c | 14 +++----------- + 3 files changed, 22 insertions(+), 13 deletions(-) +Merging asm-generic/master (cb61f6769b88 ARM64: use GENERIC_PCI_IOMAP) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (97bf6af1f928 Linux 3.19-rc1) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (e9f2d6d66037 Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Already up-to-date. +Merging arm-perf/for-next/perf (cac7f2429872 Linux 3.18-rc2) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (d6ad36913083 clocksource: arch_timer: Only use the virtual counter (CNTVCT) on arm64) +$ git merge arm-soc/for-next +Already up-to-date. +Merging bcm2835/for-next (b2776bf7149b Linux 3.18) +$ git merge bcm2835/for-next +Already up-to-date. +Merging berlin/berlin/for-next (97bf6af1f928 Linux 3.19-rc1) +$ git merge berlin/berlin/for-next +Already up-to-date. +Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M) +$ git merge cortex-m/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/head.S | 33 +++++++++++++++++++++++++++------ + arch/arm/include/asm/unified.h | 8 ++++++++ + 2 files changed, 35 insertions(+), 6 deletions(-) +Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) +$ git merge ep93xx/ep93xx-for-next +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (8a73e870fc56 Merge tag 'imx-dt-3.19' into for-next) +$ git merge imx-mxs/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ixp4xx/next (19f949f52599 Linux 3.8) +$ git merge ixp4xx/next +Already up-to-date. +Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) +$ git merge msm/for-next +Already up-to-date. +Merging mvebu/for-next (10fbc6c4d046 Merge branch 'mvebu/dt' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/kirkwood-6192.dtsi | 2 ++ + arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 8 ++++++-- + arch/arm/configs/mvebu_v7_defconfig | 1 + + drivers/leds/leds-netxbig.c | 12 ++++++------ + 4 files changed, 15 insertions(+), 8 deletions(-) +Merging renesas/next (340337ad530d Merge branches 'heads/soc-fixes-for-v3.19', 'heads/defconfig-for-v3.20', 'heads/soc-for-v3.20', 'heads/dt-for-v3.20', 'heads/dt-cleanups-for-v3.20', 'heads/sh-drivers-for-v3.20', 'heads/lager-board-removal-for-v3.20' and 'heads/sh73a0-ccf-for-v3.20' into next) +$ git merge renesas/next +Removing arch/arm/mach-shmobile/clock-r8a7790.c +Removing arch/arm/mach-shmobile/board-lager.c +Removing arch/arm/mach-shmobile/board-lager-reference.c +Removing arch/arm/configs/lager_defconfig +Merge made by the 'recursive' strategy. + .../bindings/clock/renesas,sh73a0-cpg-clocks.txt | 35 + + .../bindings/power/renesas,sysc-rmobile.txt | 98 +++ + MAINTAINERS | 1 - + arch/arm/boot/dts/Makefile | 2 +- + arch/arm/boot/dts/r7s72100-genmai.dts | 2 +- + arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 2 +- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 173 ++++- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 4 +- + arch/arm/boot/dts/r8a7740.dtsi | 109 ++- + arch/arm/boot/dts/r8a7779.dtsi | 39 +- + arch/arm/boot/dts/r8a7790-lager.dts | 20 +- + arch/arm/boot/dts/r8a7790.dtsi | 33 +- + arch/arm/boot/dts/r8a7791-henninger.dts | 4 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 22 +- + arch/arm/boot/dts/r8a7791.dtsi | 40 +- + arch/arm/boot/dts/r8a7794-alt.dts | 4 +- + arch/arm/boot/dts/r8a7794.dtsi | 82 +- + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 6 +- + arch/arm/boot/dts/sh73a0.dtsi | 358 +++++++++ + arch/arm/configs/kzm9g_defconfig | 2 +- + arch/arm/configs/lager_defconfig | 150 ---- + arch/arm/configs/shmobile_defconfig | 31 +- + arch/arm/mach-shmobile/Kconfig | 28 +- + arch/arm/mach-shmobile/Makefile | 3 - + arch/arm/mach-shmobile/Makefile.boot | 1 - + arch/arm/mach-shmobile/board-lager-reference.c | 39 - + arch/arm/mach-shmobile/board-lager.c | 827 --------------------- + arch/arm/mach-shmobile/clock-r8a7790.c | 459 ------------ + arch/arm/mach-shmobile/clock-sh73a0.c | 10 + + arch/arm/mach-shmobile/pm-r8a7740.c | 14 + + arch/arm/mach-shmobile/pm-rmobile.c | 273 ++++++- + arch/arm/mach-shmobile/pm-rmobile.h | 3 +- + arch/arm/mach-shmobile/pm-sh7372.c | 11 + + arch/arm/mach-shmobile/r8a7790.h | 28 - + arch/arm/mach-shmobile/setup-r8a7740.c | 7 + + arch/arm/mach-shmobile/setup-r8a7790.c | 284 +------ + arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 5 +- + arch/arm/mach-shmobile/smp-r8a7779.c | 2 +- + drivers/clk/shmobile/Makefile | 1 + + drivers/clk/shmobile/clk-sh73a0.c | 218 ++++++ + drivers/sh/pm_runtime.c | 2 + + include/dt-bindings/clock/r8a7790-clock.h | 1 + + include/dt-bindings/clock/r8a7791-clock.h | 2 + + include/dt-bindings/clock/r8a7794-clock.h | 17 + + include/dt-bindings/clock/sh73a0-clock.h | 79 ++ + 46 files changed, 1580 insertions(+), 1955 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/renesas,sh73a0-cpg-clocks.txt + create mode 100644 Documentation/devicetree/bindings/power/renesas,sysc-rmobile.txt + delete mode 100644 arch/arm/configs/lager_defconfig + delete mode 100644 arch/arm/mach-shmobile/board-lager-reference.c + delete mode 100644 arch/arm/mach-shmobile/board-lager.c + delete mode 100644 arch/arm/mach-shmobile/clock-r8a7790.c + create mode 100644 drivers/clk/shmobile/clk-sh73a0.c + create mode 100644 include/dt-bindings/clock/sh73a0-clock.h +Merging samsung/for-next (1eeec807bf64 Merge branch 'v3.20-next/dt-samsung-64' into for-next) +$ git merge samsung/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/samsung/pmu.txt | 1 + + arch/arm/configs/exynos_defconfig | 3 +- + arch/arm/plat-samsung/cpu.c | 4 + + arch/arm64/Kconfig | 17 + + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/exynos/Makefile | 5 + + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 84 +++ + arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 588 +++++++++++++++++++++ + arch/arm64/boot/dts/exynos/exynos7.dtsi | 530 +++++++++++++++++++ + 9 files changed, 1232 insertions(+), 1 deletion(-) + create mode 100644 arch/arm64/boot/dts/exynos/Makefile + create mode 100644 arch/arm64/boot/dts/exynos/exynos7-espresso.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos7.dtsi +Merging sunxi/sunxi/for-next (ad01dbad5626 Merge branch 'sunxi/clocks-for-3.19' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. +Merging tegra/for-next (fa047e01365d Merge branch for-3.19/soc into for-next) +$ git merge tegra/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (fb59d007a0e4 arm64: mm: dump: don't skip final region) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP) +$ git merge blackfin/for-linus +Merge made by the 'recursive' strategy. + arch/blackfin/configs/BF518F-EZBRD_defconfig | 1 - + arch/blackfin/configs/BF527-TLL6527M_defconfig | 1 - + arch/blackfin/configs/BF533-EZKIT_defconfig | 1 - + arch/blackfin/configs/BF533-STAMP_defconfig | 1 - + arch/blackfin/configs/BF537-STAMP_defconfig | 3 ++- + arch/blackfin/configs/BF538-EZKIT_defconfig | 1 - + arch/blackfin/configs/BF561-ACVILON_defconfig | 1 - + arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 1 - + arch/blackfin/configs/BF561-EZKIT_defconfig | 1 - + arch/blackfin/configs/CM-BF527_defconfig | 1 - + arch/blackfin/configs/CM-BF533_defconfig | 1 - + arch/blackfin/configs/CM-BF537E_defconfig | 1 - + arch/blackfin/configs/CM-BF537U_defconfig | 1 - + arch/blackfin/configs/CM-BF548_defconfig | 1 - + arch/blackfin/configs/CM-BF561_defconfig | 1 - + arch/blackfin/configs/DNP5370_defconfig | 1 - + arch/blackfin/configs/IP0X_defconfig | 1 - + arch/blackfin/configs/PNAV-10_defconfig | 1 - + arch/blackfin/configs/SRV1_defconfig | 1 - + arch/blackfin/configs/TCM-BF518_defconfig | 1 - + arch/blackfin/configs/TCM-BF537_defconfig | 1 - + arch/blackfin/kernel/kgdb.c | 12 ++++-------- + arch/blackfin/mach-bf609/boards/ezkit.c | 8 ++++---- + 23 files changed, 10 insertions(+), 33 deletions(-) +Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (21bd887cd7c4 CRISv32: Remove last remnants of ETRAX_SPI_MMC_BOARD) +$ git merge cris/for-next +Merge made by the 'recursive' strategy. +Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (0fd2468fd035 Merge branch 'misc-3.19' into next) +$ git merge ia64/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging m68k/for-next (f0b99a643e96 m68k/mm: Eliminate memset after alloc_bootmem_pages) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (afdc830bf9ce m68knommu: fix irq handler types in 68360/commproc.c) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/68360/commproc.c | 8 ++++---- + arch/m68k/include/asm/commproc.h | 24 +----------------------- + 2 files changed, 5 insertions(+), 27 deletions(-) +Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (3a8e3265179b microblaze: Fix mmap for cache coherent memory) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (4ea2902491f4 Merge branch '3.19-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 22 ++++++++----------- + arch/mips/configs/malta_defconfig | 16 ++++---------- + arch/mips/fw/arc/misc.c | 26 +++++++++++++--------- + arch/mips/include/asm/checksum.h | 40 ++++++++++++---------------------- + arch/mips/include/asm/fpu.h | 43 ++++++++++++++++++++++--------------- + arch/mips/include/asm/sgialib.h | 8 +++++-- + arch/mips/include/uapi/asm/unistd.h | 15 +++++++------ + arch/mips/jz4740/irq.c | 3 +++ + arch/mips/kernel/scall32-o32.S | 1 + + arch/mips/kernel/scall64-64.S | 1 + + arch/mips/kernel/scall64-n32.S | 1 + + arch/mips/kernel/scall64-o32.S | 1 + + arch/mips/sgi-ip27/ip27-reset.c | 7 +++--- + arch/mips/sgi-ip32/ip32-reset.c | 7 +++--- + 14 files changed, 99 insertions(+), 92 deletions(-) +Merging nios2/nios2-next (1b0f44923e18 nios2: Use preempt_schedule_irq) +$ git merge nios2/nios2-next +Already up-to-date. +Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done()) +$ git merge openrisc/for-upstream +Already up-to-date. +Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) +$ git merge parisc/for-next +Already up-to-date. +Merging parisc-hd/for-next (b2776bf7149b Linux 3.18) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (d557b09800da powerpc/mm/thp: Use tlbiel if possible) +$ git merge powerpc/next +Already up-to-date. +Merging powerpc-mpe/next (d70a54e2d085 powerpc/powernv: Ignore smt-enabled on Power8 and later) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (76f3e2929bb6 powerpc/config: Enable memory driver) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (fa0d0b064d55 s390/signal: add sys_sigreturn and sys_rt_sigreturn declarations) +$ git merge s390/features +Auto-merging arch/s390/mm/pgtable.c +Merge made by the 'recursive' strategy. + arch/s390/kernel/dis.c | 1 - + arch/s390/kernel/entry.h | 4 +- + arch/s390/kernel/ftrace.c | 95 +++++++++++++++++++++++--------------------- + arch/s390/kernel/vtime.c | 2 - + arch/s390/mm/pgtable.c | 6 +-- + arch/s390/pci/pci_mmio.c | 4 +- + drivers/s390/crypto/ap_bus.c | 10 +++-- + 7 files changed, 64 insertions(+), 58 deletions(-) +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (c47b15c4928c arch/tile: update MAINTAINERS email to EZchip) +$ git merge tile/master +Already up-to-date. +Merging uml/next (989e59fa41c5 um: Include generic barrier.h) +$ git merge uml/next +Resolved 'arch/um/include/asm/Kbuild' using previous resolution. +Removing arch/x86/um/shared/sysdep/skas_ptrace.h +Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h +Removing arch/um/sys-ia64/sysdep/skas_ptrace.h +Auto-merging arch/um/os-Linux/skas/process.c +Auto-merging arch/um/kernel/um_arch.c +Auto-merging arch/um/kernel/trap.c +Auto-merging arch/um/kernel/ptrace.c +Removing arch/um/include/shared/skas_ptrace.h +Removing arch/um/include/shared/skas/proc_mm.h +Auto-merging arch/um/include/shared/os.h +Auto-merging arch/um/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1e42b3111b86] Merge remote-tracking branch 'uml/next' +$ git diff -M --stat --summary HEAD^.. + arch/um/include/shared/os.h | 2 - + arch/um/include/shared/skas/proc_mm.h | 44 ------ + arch/um/include/shared/skas/skas.h | 3 - + arch/um/include/shared/skas_ptrace.h | 14 -- + arch/um/kernel/ptrace.c | 32 ---- + arch/um/kernel/reboot.c | 35 ++--- + arch/um/kernel/skas/mmu.c | 68 +++------ + arch/um/kernel/skas/process.c | 27 ---- + arch/um/kernel/trap.c | 2 +- + arch/um/kernel/um_arch.c | 10 -- + arch/um/os-Linux/process.c | 16 -- + arch/um/os-Linux/skas/mem.c | 100 ++---------- + arch/um/os-Linux/skas/process.c | 200 ++++++------------------ + arch/um/os-Linux/start_up.c | 154 ------------------- + arch/um/sys-ia64/sysdep/skas_ptrace.h | 22 --- + arch/um/sys-ppc/shared/sysdep/skas_ptrace.h | 22 --- + arch/x86/um/ldt.c | 227 ++++++---------------------- + arch/x86/um/shared/sysdep/faultinfo_32.h | 3 - + arch/x86/um/shared/sysdep/faultinfo_64.h | 3 - + arch/x86/um/shared/sysdep/skas_ptrace.h | 22 --- + 20 files changed, 148 insertions(+), 858 deletions(-) + delete mode 100644 arch/um/include/shared/skas/proc_mm.h + delete mode 100644 arch/um/include/shared/skas_ptrace.h + delete mode 100644 arch/um/sys-ia64/sysdep/skas_ptrace.h + delete mode 100644 arch/um/sys-ppc/shared/sysdep/skas_ptrace.h + delete mode 100644 arch/x86/um/shared/sysdep/skas_ptrace.h +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (1f2fdbd0078c xtensa: disable link optimization) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (1edb647bb954 Btrfs: remove non-sense btrfs_error_discard_extent() function) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (388cfdc9bc19 libceph: require cephx message signature by default) +$ git merge ceph/master +Resolved 'fs/ceph/snap.c' using previous resolution. +Resolved 'fs/ceph/super.c' using previous resolution. +Resolved 'fs/ceph/super.h' using previous resolution. +Resolved 'net/ceph/auth_x.c' using previous resolution. +Auto-merging net/ceph/auth_x.c +CONFLICT (content): Merge conflict in net/ceph/auth_x.c +Auto-merging fs/ceph/super.h +CONFLICT (content): Merge conflict in fs/ceph/super.h +Auto-merging fs/ceph/super.c +CONFLICT (content): Merge conflict in fs/ceph/super.c +Auto-merging fs/ceph/snap.c +CONFLICT (content): Merge conflict in fs/ceph/snap.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9f4328f52798] Merge remote-tracking branch 'ceph/master' +$ git diff -M --stat --summary HEAD^.. +Merging cifs/for-next (0891605dd763 Initialize salt value for negotiate context) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/Kconfig | 9 ++++++++ + fs/cifs/cifsglob.h | 7 ++++++ + fs/cifs/connect.c | 10 +++++++++ + fs/cifs/smb2ops.c | 22 +++++++++++++++++++ + fs/cifs/smb2pdu.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++--- + fs/cifs/smb2pdu.h | 50 +++++++++++++++++++++++++++++++++++------- + 6 files changed, 151 insertions(+), 11 deletions(-) +Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next (942080643bce eCryptfs: Remove buggy and unnecessary write in file name decode routine) +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next (3ee3039c5b4d udf: Reduce repeated dereferences) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (363307e6e561 ext4: remove spurious KERN_INFO from ext4_warning call) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +Merge made by the 'recursive' strategy. + fs/ext4/extents.c | 4 +- + fs/ext4/file.c | 220 ++++++++++++++++++++++++++++-------------------------- + fs/ext4/resize.c | 24 +++--- + fs/ext4/super.c | 2 +- + 4 files changed, 129 insertions(+), 121 deletions(-) +Merging f2fs/dev (987b52e65709 f2fs: reuse inode_entry_slab in gc procedure for using slab more effectively) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/Kconfig | 10 ++++ + fs/f2fs/Makefile | 1 + + fs/f2fs/acl.c | 4 +- + fs/f2fs/checkpoint.c | 47 +++++++++------- + fs/f2fs/data.c | 85 +++++++++++++++++----------- + fs/f2fs/debug.c | 6 +- + fs/f2fs/dir.c | 3 +- + fs/f2fs/f2fs.h | 45 ++++++++++----- + fs/f2fs/file.c | 79 ++++++++++++++++++++++---- + fs/f2fs/gc.c | 20 +------ + fs/f2fs/gc.h | 7 +-- + fs/f2fs/inline.c | 7 +-- + fs/f2fs/inode.c | 2 +- + fs/f2fs/node.c | 90 ++++++++++------------------- + fs/f2fs/node.h | 44 +++++++++++---- + fs/f2fs/segment.c | 116 ++++++++++++++++++++------------------ + fs/f2fs/super.c | 10 +--- + fs/f2fs/trace.c | 110 ++++++++++++++++++++++++++++++++++++ + fs/f2fs/trace.h | 42 ++++++++++++++ + include/linux/f2fs_fs.h | 2 + + include/trace/events/f2fs.h | 134 ++++++++++++++++++++------------------------ + 21 files changed, 546 insertions(+), 318 deletions(-) + create mode 100644 fs/f2fs/trace.c + create mode 100644 fs/f2fs/trace.h +Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.) +$ git merge fscache/fscache +Resolved 'fs/fscache/object.c' using previous resolution. +Auto-merging fs/fscache/object.c +CONFLICT (content): Merge conflict in fs/fscache/object.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 76d48a93de79] Merge remote-tracking branch 'fscache/fscache' +$ git diff -M --stat --summary HEAD^.. +Merging fuse/for-next (1c68271cf1bf fuse: use file_inode() in fuse_file_fallocate()) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master (ec7d879c4576 GFS2: gfs2_atomic_open(): simplify the use of finish_no_open()) +$ git merge gfs2/master +Already up-to-date. +Merging jfs/jfs-next (e1f1fe798d2f jfs: get rid of homegrown endianness helpers) +$ git merge jfs/jfs-next +Removing fs/jfs/endian24.h +Merge made by the 'recursive' strategy. + fs/jfs/endian24.h | 49 ------------------------------------------------ + fs/jfs/jfs_dtree.c | 4 ++-- + fs/jfs/jfs_types.h | 55 ++++++++++++++++++++++++++++++++---------------------- + fs/jfs/jfs_xtree.h | 25 +++++++++---------------- + 4 files changed, 44 insertions(+), 89 deletions(-) + delete mode 100644 fs/jfs/endian24.h +Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found) +$ git merge logfs/master +Auto-merging fs/logfs/super.c +Merge made by the 'recursive' strategy. + fs/logfs/dev_mtd.c | 2 +- + fs/logfs/super.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (b7392d2247cf Linux 3.19-rc2) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (3c0aeb6da065 nfsd: fi_delegees doesn't need to be an atomic_t) +$ git merge nfsd/nfsd-next +Auto-merging fs/nfsd/nfs4state.c +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4state.c | 8 ++++---- + fs/nfsd/state.h | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (2b7a8f36f092 ovl: add testsuite to docs) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/overlayfs/readdir.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.txt | 24 ++ + fs/overlayfs/copy_up.c | 5 +- + fs/overlayfs/dir.c | 28 +- + fs/overlayfs/inode.c | 12 +- + fs/overlayfs/overlayfs.h | 18 +- + fs/overlayfs/readdir.c | 145 ++++----- + fs/overlayfs/super.c | 546 +++++++++++++++++++++----------- + 7 files changed, 482 insertions(+), 296 deletions(-) +Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (f38aed975c0c UBI: Fix invalid vfree()) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (efdca7aa3c41 Merge branch 'xfs-misc-fixes-for-3.20-1' into for-next) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_format.h | 10 ++-- + fs/xfs/xfs_buf_item.c | 2 +- + fs/xfs/xfs_inode.c | 134 ++++++++++++++++++++++++++++++++++++++++++++- + fs/xfs/xfs_inode.h | 2 +- + fs/xfs/xfs_iops.c | 21 +++++-- + fs/xfs/xfs_log.c | 10 ++-- + fs/xfs/xfs_mount.c | 5 +- + fs/xfs/xfs_super.c | 2 +- + 8 files changed, 163 insertions(+), 23 deletions(-) +Merging file-locks/linux-next (1b2b32dcdb3d locks: fix fcntl_setlease/getlease return when !CONFIG_FILE_LOCKING) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (88174fd2c8fb kill d_validate()) +$ git merge vfs/for-next +Merge made by the 'recursive' strategy. + fs/dcache.c | 31 -------------- + fs/ncpfs/dir.c | 98 +++++++++++++++++++++++--------------------- + fs/ncpfs/ncp_fs_i.h | 1 + + fs/ncpfs/ncplib_kernel.h | 30 -------------- + include/linux/dcache.h | 3 -- + security/selinux/selinuxfs.c | 52 ++--------------------- + 6 files changed, 55 insertions(+), 160 deletions(-) +Merging pci/next (75f30c3d9949 Merge branches 'pci/host-keystone', 'pci/host-layerscape', 'pci/host-rcar' and 'pci/host-tegra' into next) +$ git merge pci/next +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 3 ++ + arch/arm/include/asm/mach/pci.h | 6 ---- + arch/arm/include/asm/pci.h | 7 ----- + arch/arm/kernel/bios32.c | 3 -- + arch/arm/mach-cns3xxx/pcie.c | 40 ++++++++++++--------------- + arch/arm64/kernel/pci.c | 22 --------------- + drivers/pci/host/pci-keystone.c | 2 +- + drivers/pci/host/pci-layerscape.c | 1 - + drivers/pci/host/pci-mvebu.c | 15 ++-------- + drivers/pci/host/pci-tegra.c | 13 --------- + drivers/pci/host/pcie-designware.c | 3 -- + drivers/pci/host/pcie-rcar.c | 7 ++--- + drivers/pci/hotplug/cpci_hotplug_core.c | 3 +- + drivers/pci/pci.c | 49 +++++++++++++++++++++++++++++++++ + 14 files changed, 75 insertions(+), 99 deletions(-) +Merging hid/for-next (3bc80f8b09bd Merge branch 'for-3.20/betop' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 10 +++ + drivers/hid/Makefile | 1 + + drivers/hid/hid-betopff.c | 160 +++++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-core.c | 26 +++++-- + drivers/hid/hid-ids.h | 5 ++ + drivers/hid/hid-lenovo.c | 79 ++++++++++++++++++- + drivers/hid/hid-logitech-hidpp.c | 84 ++++++++++++++++---- + drivers/hid/hid-rmi.c | 93 ++++++++++++++++++----- + include/linux/hid.h | 4 +- + 9 files changed, 423 insertions(+), 39 deletions(-) + create mode 100644 drivers/hid/hid-betopff.c +Merging i2c/i2c/for-next (523c5b89640e i2c: Remove support for legacy PM) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/i2c/i2c-core.c | 118 ------------------------------------------------- + include/linux/i2c.h | 4 -- + 2 files changed, 122 deletions(-) +Merging jdelvare-hwmon/master (ae530d4403e9 hwmon: (i5500_temp) Convert to use ATTRIBUTE_GROUPS macro) +$ git merge jdelvare-hwmon/master +Auto-merging drivers/hwmon/Makefile +Auto-merging drivers/hwmon/Kconfig +Merge made by the 'recursive' strategy. + drivers/hwmon/Kconfig | 10 +++ + drivers/hwmon/Makefile | 1 + + drivers/hwmon/i5500_temp.c | 149 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 160 insertions(+) + create mode 100644 drivers/hwmon/i5500_temp.c +Merging hwmon-staging/hwmon-next (907a6d582459 hwmon: (tmp401) Detect TMP435 on all addresses it supports) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (2ea3258b238c Merge branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kbuild/for-next (45d5415f3b18 Merge branch 'kbuild/misc' 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 +- + init/Kconfig | 73 ++++++++++++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.clean | 3 - + scripts/Makefile.lto | 84 +++++++++++++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/link-vmlinux.sh | 2 +- + scripts/package/builddeb | 4 +- + 11 files changed, 358 insertions(+), 13 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto +Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (d325a876e2b3 Merge branch 'for-3.18-fixes' into for-next) +$ git merge libata/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging pm/linux-next (df90dcd1007b Merge tag 'pm+acpi-3.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge pm/linux-next +Already up-to-date. +Merging idle/next (f7c0e22f2d14 Merge branch 'turbostat' into release) +$ git merge idle/next +Resolved 'arch/x86/include/uapi/asm/msr-index.h' using previous resolution. +Auto-merging drivers/cpufreq/Makefile +Auto-merging arch/x86/include/uapi/asm/msr-index.h +CONFLICT (content): Merge conflict in arch/x86/include/uapi/asm/msr-index.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b0d51352b75e] Merge remote-tracking branch 'idle/next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/uapi/asm/msr-index.h | 5 + + drivers/cpufreq/Kconfig.x86 | 10 ++ + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/sfi-cpufreq.c | 136 ++++++++++++++++++++++++++ + drivers/sfi/sfi_core.c | 4 +- + tools/power/x86/turbostat/turbostat.c | 179 +++++++++++++++++++++++++++++++--- + 6 files changed, 321 insertions(+), 14 deletions(-) + create mode 100644 drivers/cpufreq/sfi-cpufreq.c +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) +$ git merge cpupowerutils/master +Already up-to-date. +Merging thermal/next (7429b1e0d00e Merge branches 'thermal-core', 'thermal-soc' and 'thermal-int340x' of .git into next) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (d8c3cd75e77d Merge branch 'work-fixes' into work-next) +$ git merge thermal-soc/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ieee1394/for-next (d737d7da8e7e firewire: sbp2: replace card lock by target lock) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (3e8ec65e62df Merge branch 'topic/rcar' into next) +$ git merge slave-dma/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 3 - + Documentation/dmaengine/provider.txt | 97 +- + MAINTAINERS | 2 +- + drivers/crypto/ux500/cryp/cryp_core.c | 4 +- + drivers/crypto/ux500/hash/hash_core.c | 2 +- + drivers/dma/Makefile | 2 +- + drivers/dma/amba-pl08x.c | 156 +- + drivers/dma/at_hdmac.c | 121 +- + drivers/dma/at_hdmac_regs.h | 3 +- + drivers/dma/at_xdmac.c | 127 +- + drivers/dma/bcm2835-dma.c | 46 +- + drivers/dma/coh901318.c | 137 +- + drivers/dma/cppi41.c | 30 +- + drivers/dma/dma-jz4740.c | 20 +- + drivers/dma/dmaengine.c | 51 +- + drivers/dma/dw/core.c | 82 +- + drivers/dma/dw/regs.h | 2 +- + drivers/dma/edma.c | 70 +- + drivers/dma/ep93xx_dma.c | 43 +- + drivers/dma/fsl-edma.c | 123 +- + drivers/dma/fsldma.c | 91 +- + drivers/dma/imx-dma.c | 108 +- + drivers/dma/imx-sdma.c | 84 +- + drivers/dma/intel_mid_dma.c | 25 +- + drivers/dma/ioat/dma_v3.c | 11 + + drivers/dma/ipu/ipu_idmac.c | 96 +- + drivers/dma/k3dma.c | 197 ++- + drivers/dma/mmp_pdma.c | 109 +- + drivers/dma/mmp_tdma.c | 82 +- + drivers/dma/moxart-dma.c | 25 +- + drivers/dma/mpc512x_dma.c | 111 +- + drivers/dma/mv_xor.c | 9 - + drivers/dma/mxs-dma.c | 61 +- + drivers/dma/nbpfaxi.c | 112 +- + drivers/dma/omap-dma.c | 69 +- + drivers/dma/pch_dma.c | 8 +- + drivers/dma/pl330.c | 134 +- + drivers/dma/qcom_bam_dma.c | 85 +- + drivers/dma/s3c24xx-dma.c | 75 +- + drivers/dma/sa11x0-dma.c | 158 +- + drivers/dma/sh/Kconfig | 14 +- + drivers/dma/sh/Makefile | 1 + + drivers/dma/sh/rcar-dmac.c | 1747 ++++++++++++++++++++ + drivers/dma/sh/shdma-base.c | 72 +- + drivers/dma/sirf-dma.c | 59 +- + drivers/dma/ste_dma40.c | 63 +- + drivers/dma/sun6i-dma.c | 160 +- + drivers/dma/tegra20-apb-dma.c | 27 +- + drivers/dma/timb_dma.c | 8 +- + drivers/dma/txx9dmac.c | 9 +- + drivers/dma/xilinx/xilinx_vdma.c | 29 +- + drivers/rapidio/devices/tsi721_dma.c | 8 +- + include/linux/dmaengine.h | 124 +- + sound/soc/soc-generic-dmaengine-pcm.c | 2 +- + 54 files changed, 3315 insertions(+), 1779 deletions(-) + create mode 100644 drivers/dma/sh/rcar-dmac.c +Merging net-next/master (7beceebf5b9d Merge branch 'rhashtable-next') +$ git merge net-next/master +Auto-merging drivers/net/ethernet/cisco/enic/enic_main.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/net/fsl-fec.txt | 2 + + .../devicetree/bindings/net/rockchip-dwmac.txt | 67 + + MAINTAINERS | 3 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 1 + + arch/arm/boot/dts/rk3288-evb-rk808.dts | 23 + + arch/arm/boot/dts/rk3288-evb.dtsi | 17 + + arch/arm/boot/dts/rk3288.dtsi | 54 + + arch/arm/mach-imx/mach-imx6q.c | 41 +- + arch/arm/mach-imx/mach-imx6sx.c | 50 + + arch/arm/mach-sa1100/assabet.c | 2 +- + arch/arm/mach-sa1100/collie.c | 2 +- + arch/arm/mach-sa1100/h3100.c | 2 +- + arch/arm/mach-sa1100/h3600.c | 2 +- + arch/microblaze/kernel/timer.c | 1 + + drivers/bluetooth/bfusb.c | 2 + + drivers/bluetooth/btusb.c | 34 +- + drivers/clk/rockchip/clk-rk3288.c | 14 +- + drivers/isdn/hisax/hfc4s8s_l1.c | 21 - + drivers/net/ethernet/amd/xgbe/xgbe-ptp.c | 8 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 2 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 5 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 10 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 8 +- + drivers/net/ethernet/chelsio/cxgb3/mc5.c | 16 - + drivers/net/ethernet/cisco/enic/enic.h | 14 + + drivers/net/ethernet/cisco/enic/enic_dev.c | 56 - + drivers/net/ethernet/cisco/enic/enic_dev.h | 5 - + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 19 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 152 +- + drivers/net/ethernet/cisco/enic/vnic_stats.h | 5 + + drivers/net/ethernet/cisco/enic/vnic_wq.c | 3 + + drivers/net/ethernet/cisco/enic/vnic_wq.h | 1 + + drivers/net/ethernet/freescale/fec.h | 3 + + drivers/net/ethernet/freescale/fec_main.c | 104 +- + drivers/net/ethernet/freescale/fec_ptp.c | 16 +- + drivers/net/ethernet/freescale/gianfar.c | 11 +- + drivers/net/ethernet/freescale/gianfar.h | 2 +- + drivers/net/ethernet/freescale/xgmac_mdio.c | 36 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 2 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- + drivers/net/ethernet/intel/e1000e/ptp.c | 5 +- + drivers/net/ethernet/intel/igb/igb.h | 2 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 11 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 13 +- + drivers/net/ethernet/mellanox/mlx4/en_clock.c | 10 +- + drivers/net/ethernet/micrel/ksz884x.c | 4 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 10 +- + drivers/net/ethernet/stmicro/stmmac/Makefile | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 459 +++++ + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 + + .../net/ethernet/stmicro/stmmac/stmmac_platform.h | 1 + + drivers/net/ethernet/ti/cpts.c | 5 +- + drivers/net/ethernet/ti/cpts.h | 1 + + drivers/net/fddi/skfp/smt.c | 12 - + drivers/net/ieee802154/at86rf230.c | 80 +- + drivers/net/ieee802154/cc2520.c | 27 +- + drivers/net/ieee802154/mrf24j40.c | 6 +- + drivers/net/irda/sa1100_ir.c | 2 +- + drivers/net/tun.c | 4 +- + drivers/net/virtio_net.c | 2 + + drivers/net/vxlan.c | 53 +- + drivers/net/wireless/ath/ath9k/debug.c | 71 + + drivers/net/wireless/ath/ath9k/hw.c | 3 + + drivers/net/wireless/ath/ath9k/xmit.c | 2 +- + drivers/net/wireless/ath/dfs_pattern_detector.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 4 +- + drivers/net/wireless/rtlwifi/base.c | 156 +- + drivers/net/wireless/rtlwifi/base.h | 4 +- + drivers/net/wireless/rtlwifi/core.c | 24 +- + drivers/net/wireless/rtlwifi/core.h | 1 + + drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | 162 +- + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h | 1 + + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 165 +- + drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 5 +- + drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 30 +- + drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 13 +- + drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 4 +- + drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 28 +- + drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 20 +- + drivers/net/wireless/rtlwifi/rtl8192de/fw.c | 17 - + drivers/net/wireless/rtlwifi/rtl8192de/fw.h | 1 - + drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 30 +- + drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 27 +- + drivers/net/wireless/rtlwifi/rtl8192ee/trx.c | 196 +- + drivers/net/wireless/rtlwifi/rtl8192ee/trx.h | 9 +- + drivers/net/wireless/rtlwifi/rtl8192se/def.h | 8 +- + drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 30 +- + drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 23 +- + drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 162 +- + drivers/net/wireless/rtlwifi/rtl8723be/phy.c | 25 - + drivers/net/wireless/rtlwifi/rtl8723be/phy.h | 2 - + drivers/net/wireless/rtlwifi/rtl8723be/trx.c | 162 +- + drivers/net/wireless/rtlwifi/rtl8821ae/def.h | 54 - + drivers/net/wireless/rtlwifi/rtl8821ae/pwrseq.h | 4 +- + drivers/net/wireless/rtlwifi/rtl8821ae/sw.c | 74 +- + drivers/net/wireless/rtlwifi/rtl8821ae/trx.c | 232 +-- + drivers/net/wireless/rtlwifi/wifi.h | 96 +- + include/clocksource/arm_arch_timer.h | 2 +- + include/dt-bindings/clock/rk3288-cru.h | 3 + + include/linux/clocksource.h | 102 -- + include/linux/etherdevice.h | 4 + + include/linux/fec.h | 1 + + include/linux/list_nulls.h | 3 +- + include/linux/mlx4/device.h | 2 +- + .../linux/platform_data/irda-sa11x0.h | 0 + include/linux/rhashtable.h | 258 ++- + include/linux/spinlock.h | 8 + + include/linux/spinlock_api_smp.h | 2 + + include/linux/spinlock_api_up.h | 1 + + include/linux/timecounter.h | 139 ++ + include/linux/types.h | 3 + + include/net/bluetooth/hci.h | 53 + + include/net/bluetooth/hci_core.h | 35 +- + include/net/bluetooth/l2cap.h | 1 + + include/net/bluetooth/rfcomm.h | 2 - + include/net/cfg802154.h | 10 +- + include/net/ieee802154_netdev.h | 4 +- + include/net/ip_fib.h | 50 +- + include/net/mac802154.h | 5 +- + include/net/nl802154.h | 45 +- + include/uapi/linux/l2tp.h | 1 + + kernel/locking/spinlock.c | 8 + + kernel/time/Makefile | 2 +- + kernel/time/clocksource.c | 76 - + kernel/time/timecounter.c | 112 ++ + lib/rhashtable.c | 607 +++++-- + net/bluetooth/Kconfig | 27 + + net/bluetooth/Makefile | 4 +- + net/bluetooth/af_bluetooth.c | 6 + + net/bluetooth/hci_conn.c | 4 + + net/bluetooth/hci_core.c | 1640 +---------------- + net/bluetooth/hci_debugfs.c | 1076 +++++++++++ + net/bluetooth/hci_debugfs.h | 26 + + net/bluetooth/hci_event.c | 71 +- + net/bluetooth/hci_request.c | 555 ++++++ + net/bluetooth/hci_request.h | 54 + + net/bluetooth/mgmt.c | 265 ++- + net/bluetooth/rfcomm/core.c | 4 +- + net/bluetooth/selftest.c | 244 +++ + net/bluetooth/selftest.h | 45 + + net/bluetooth/smp.c | 335 +++- + net/bluetooth/smp.h | 13 + + net/core/skbuff.c | 7 - + net/ethernet/eth.c | 92 + + net/ieee802154/nl-mac.c | 4 +- + net/ieee802154/nl802154.c | 46 +- + net/ieee802154/rdev-ops.h | 7 + + net/ieee802154/sysfs.c | 2 +- + net/ipv4/fib_frontend.c | 29 +- + net/ipv4/fib_rules.c | 22 +- + net/ipv4/fib_trie.c | 1916 +++++++++----------- + net/ipv4/geneve.c | 97 +- + net/ipv4/ip_gre.c | 1 + + net/l2tp/l2tp_netlink.c | 101 +- + net/mac802154/cfg.c | 21 + + net/mac802154/driver-ops.h | 5 +- + net/mac802154/iface.c | 100 +- + net/mac802154/mac_cmd.c | 6 +- + net/netfilter/nft_hash.c | 92 +- + net/netlink/af_netlink.c | 64 +- + net/netlink/af_netlink.h | 1 + + net/netlink/diag.c | 4 +- + net/tipc/link.c | 2 +- + sound/pci/hda/hda_priv.h | 2 +- + virt/kvm/arm/arch_timer.c | 3 +- + 168 files changed, 6797 insertions(+), 5115 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/rockchip-dwmac.txt + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c + rename arch/arm/include/asm/mach/irda.h => include/linux/platform_data/irda-sa11x0.h (100%) + create mode 100644 include/linux/timecounter.h + create mode 100644 kernel/time/timecounter.c + create mode 100644 net/bluetooth/hci_debugfs.c + create mode 100644 net/bluetooth/hci_debugfs.h + create mode 100644 net/bluetooth/hci_request.c + create mode 100644 net/bluetooth/hci_request.h + create mode 100644 net/bluetooth/selftest.c + create mode 100644 net/bluetooth/selftest.h +Merging ipsec-next/master (fbe68ee87522 vti6: Add a lookup method for tunnels with wildcard endpoints.) +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-next/master (97bf6af1f928 Linux 3.19-rc1) +$ git merge wireless-next/master +Already up-to-date. +Merging wireless-drivers-next/master (354f473ee2c5 ath9k: fix typo) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (661cf88acd84 Bluetooth: Use HCI_QUIRK_FIXUP_INQUIRY_MODE for Silicon Wave devices) +$ git merge bluetooth/master +Removing net/ieee802154/raw.c +Removing net/ieee802154/dgram.c +Removing net/ieee802154/af_ieee802154.c +Removing net/ieee802154/af802154.h +Merge made by the 'recursive' strategy. + drivers/bluetooth/btusb.c | 11 +- + include/net/bluetooth/hci.h | 15 +- + include/net/bluetooth/hci_core.h | 3 +- + net/bluetooth/hci_core.c | 67 +-- + net/bluetooth/hci_debugfs.c | 143 +---- + net/bluetooth/l2cap_core.c | 2 +- + net/bluetooth/mgmt.c | 11 +- + net/bluetooth/smp.c | 80 ++- + net/ieee802154/Kconfig | 16 +- + net/ieee802154/Makefile | 5 +- + net/ieee802154/af802154.h | 33 -- + net/ieee802154/af_ieee802154.c | 369 ------------- + net/ieee802154/dgram.c | 549 ------------------- + net/ieee802154/raw.c | 270 --------- + net/ieee802154/socket.c | 1125 ++++++++++++++++++++++++++++++++++++++ + net/mac802154/cfg.c | 5 +- + 16 files changed, 1293 insertions(+), 1411 deletions(-) + delete mode 100644 net/ieee802154/af802154.h + delete mode 100644 net/ieee802154/af_ieee802154.c + delete mode 100644 net/ieee802154/dgram.c + delete mode 100644 net/ieee802154/raw.c + create mode 100644 net/ieee802154/socket.c +Merging infiniband/for-next (a7cfef21e3d0 Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'mlx4', 'ocrdma', 'odp' and 'srp' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging mtd/master (97bf6af1f928 Linux 3.19-rc1) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (ed0215cc3b52 mtd: gpmi: Remove "We support only one NAND chip" from bindings doc) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mtd/gpmi-nand.txt | 2 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 9 --------- + 2 files changed, 1 insertion(+), 10 deletions(-) +Merging crypto/master (2f3755381da8 crypto: algif_rng - enable RNG interface compilation) +$ git merge crypto/master +Auto-merging drivers/crypto/ux500/cryp/cryp_core.c +Merge made by the 'recursive' strategy. + arch/mips/cavium-octeon/Makefile | 1 + + arch/mips/cavium-octeon/crypto/Makefile | 7 + + arch/mips/cavium-octeon/crypto/octeon-crypto.c | 66 +++ + arch/mips/cavium-octeon/crypto/octeon-crypto.h | 75 +++ + arch/mips/cavium-octeon/crypto/octeon-md5.c | 216 ++++++++ + arch/mips/cavium-octeon/executive/octeon-model.c | 6 + + arch/mips/include/asm/octeon/octeon-feature.h | 17 +- + arch/mips/include/asm/octeon/octeon.h | 5 - + crypto/Kconfig | 18 + + crypto/Makefile | 1 + + crypto/ablkcipher.c | 8 +- + crypto/aead.c | 3 +- + crypto/af_alg.c | 11 +- + crypto/ahash.c | 1 + + crypto/algapi.c | 1 + + crypto/algif_rng.c | 192 +++++++ + crypto/algif_skcipher.c | 8 + + crypto/drbg.c | 11 +- + drivers/char/hw_random/core.c | 215 +++++--- + drivers/crypto/atmel-sha.c | 50 +- + drivers/crypto/qat/qat_common/icp_qat_hw.h | 2 +- + drivers/crypto/qat/qat_common/qat_algs.c | 610 +++++++++++++++++------ + drivers/crypto/qat/qat_common/qat_crypto.h | 16 +- + drivers/crypto/ux500/cryp/cryp_core.c | 8 +- + include/crypto/if_alg.h | 1 + + include/linux/hw_random.h | 4 + + 26 files changed, 1271 insertions(+), 282 deletions(-) + create mode 100644 arch/mips/cavium-octeon/crypto/Makefile + create mode 100644 arch/mips/cavium-octeon/crypto/octeon-crypto.c + create mode 100644 arch/mips/cavium-octeon/crypto/octeon-crypto.h + create mode 100644 arch/mips/cavium-octeon/crypto/octeon-md5.c + create mode 100644 crypto/algif_rng.c +Merging drm/drm-next (4e0cd6811562 drm: sti: fix module compilation issue) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (54cbc4e298ea drm/mipi-dsi: Avoid potential NULL pointer dereference) +$ git merge drm-panel/drm/panel/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_mipi_dsi.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging drm-intel/for-linux-next (5d77d9c5e177 drm/i915: add missing rpm ref to i915_gem_pwrite_ioctl) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_drv.h | 2 -- + drivers/gpu/drm/i915/i915_gem.c | 8 +++++++- + drivers/gpu/drm/i915/i915_irq.c | 6 ++---- + drivers/gpu/drm/i915/intel_display.c | 8 +------- + drivers/gpu/drm/i915/intel_runtime_pm.c | 27 --------------------------- + 5 files changed, 10 insertions(+), 41 deletions(-) +Merging drm-tegra/drm/tegra/for-next (7e0180e3570c drm/tegra: gem: Check before freeing CMA memory) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/core-stuff (6cadd306033e drm/fb-helper: Propagate errors from initial config failure) +$ git merge drm-misc/topic/core-stuff +Auto-merging include/drm/drm_fb_helper.h +Auto-merging include/drm/drm_crtc.h +Auto-merging include/drm/drmP.h +Auto-merging drivers/gpu/drm/tegra/dc.c +Auto-merging drivers/gpu/drm/sti/sti_drm_crtc.c +Auto-merging drivers/gpu/drm/radeon/radeon_fb.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_fbcon.c +Auto-merging drivers/gpu/drm/msm/msm_fbdev.c +Auto-merging drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +Auto-merging drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c +Auto-merging drivers/gpu/drm/drm_irq.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/drm_crtc.c +Auto-merging Documentation/DocBook/drm.tmpl +Merge made by the 'recursive' strategy. + Documentation/DocBook/drm.tmpl | 3 +- + drivers/gpu/drm/armada/armada_crtc.c | 5 -- + drivers/gpu/drm/ast/ast_fb.c | 21 +++++-- + drivers/gpu/drm/bochs/bochs_fbdev.c | 14 ++++- + drivers/gpu/drm/bochs/bochs_kms.c | 5 -- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 12 ++-- + drivers/gpu/drm/drm_cache.c | 13 ++-- + drivers/gpu/drm/drm_crtc.c | 103 ++++++++++++++++--------------- + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/gpu/drm/drm_info.c | 24 ------- + drivers/gpu/drm/drm_internal.h | 1 - + drivers/gpu/drm/drm_irq.c | 11 ++-- + drivers/gpu/drm/drm_modes.c | 56 +++++++++++++---- + drivers/gpu/drm/drm_plane_helper.c | 16 +++-- + drivers/gpu/drm/drm_probe_helper.c | 43 +++++++------ + drivers/gpu/drm/gma500/framebuffer.c | 22 +++++-- + drivers/gpu/drm/mgag200/mgag200_fb.c | 12 +++- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 5 -- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 5 -- + drivers/gpu/drm/msm/msm_fbdev.c | 10 ++- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 21 +++++-- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 10 ++- + drivers/gpu/drm/qxl/qxl_fb.c | 22 +++++-- + drivers/gpu/drm/radeon/radeon_fb.c | 21 +++++-- + drivers/gpu/drm/sti/sti_drm_crtc.c | 6 -- + drivers/gpu/drm/tegra/dc.c | 5 -- + drivers/gpu/drm/udl/udl_fb.c | 22 ++++--- + include/drm/drmP.h | 4 +- + include/drm/drm_crtc.h | 2 +- + include/drm/drm_crtc_helper.h | 32 ++++++++-- + include/drm/drm_fb_helper.h | 2 +- + include/drm/drm_modes.h | 6 +- + include/uapi/drm/drm_mode.h | 8 +-- + 33 files changed, 319 insertions(+), 225 deletions(-) +Merging sound/for-next (ff6defa6a8fa ALSA: Deletion of checks before the function call "iounmap") +$ git merge sound/for-next +Removing sound/isa/gus/gus_instr.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/pcm512x.txt | 3 +- + include/sound/ad1816a.h | 5 +- + include/sound/emu10k1.h | 14 +- + include/sound/es1688.h | 3 +- + include/sound/gus.h | 4 +- + include/sound/pcm.h | 11 +- + include/sound/pcm_params.h | 96 +++++----- + include/sound/sb.h | 6 +- + include/sound/soc-dapm.h | 1 - + include/sound/wss.h | 6 +- + include/uapi/sound/asound.h | 1 + + sound/aoa/soundbus/i2sbus/core.c | 19 +- + sound/arm/aaci.c | 4 +- + sound/atmel/ac97c.c | 6 +- + sound/core/oss/pcm_oss.c | 6 +- + sound/core/pcm_lib.c | 15 +- + sound/core/pcm_native.c | 10 +- + sound/core/seq/oss/seq_oss_midi.c | 6 +- + sound/core/seq/seq_midi.c | 3 +- + sound/drivers/ml403-ac97cr.c | 12 +- + sound/isa/ad1816a/ad1816a.c | 5 +- + sound/isa/ad1816a/ad1816a_lib.c | 9 +- + sound/isa/ad1848/ad1848.c | 7 +- + sound/isa/als100.c | 2 +- + sound/isa/azt2320.c | 4 +- + sound/isa/cmi8328.c | 4 +- + sound/isa/cs423x/cs4231.c | 9 +- + sound/isa/cs423x/cs4236.c | 13 +- + sound/isa/cs423x/cs4236_lib.c | 9 +- + sound/isa/es1688/es1688.c | 7 +- + sound/isa/es1688/es1688_lib.c | 6 +- + sound/isa/es18xx.c | 10 +- + sound/isa/galaxy/galaxy.c | 4 +- + sound/isa/gus/gus_instr.c | 172 ------------------ + sound/isa/gus/gus_pcm.c | 6 +- + sound/isa/gus/gus_uart.c | 6 +- + sound/isa/gus/gusclassic.c | 4 +- + sound/isa/gus/gusextreme.c | 4 +- + sound/isa/gus/gusmax.c | 8 +- + sound/isa/gus/interwave.c | 14 +- + sound/isa/msnd/msnd.c | 6 +- + sound/isa/msnd/msnd.h | 2 +- + sound/isa/msnd/msnd_pinnacle.c | 5 +- + sound/isa/opl3sa2.c | 4 +- + sound/isa/opti9xx/miro.c | 12 +- + sound/isa/opti9xx/opti92x-ad1848.c | 13 +- + sound/isa/sb/emu8000_synth.c | 3 +- + sound/isa/sb/jazz16.c | 2 +- + sound/isa/sb/sb16.c | 2 +- + sound/isa/sb/sb16_main.c | 8 +- + sound/isa/sb/sb8.c | 4 +- + sound/isa/sb/sb8_main.c | 6 +- + sound/isa/sb/sb8_midi.c | 6 +- + sound/isa/sc6000.c | 2 +- + sound/isa/sscape.c | 5 +- + sound/isa/wavefront/wavefront.c | 4 +- + sound/isa/wss/wss_lib.c | 8 +- + sound/oss/pss.c | 2 +- + sound/oss/trix.c | 2 +- + sound/parisc/harmony.c | 4 +- + sound/pci/ad1889.c | 15 +- + sound/pci/asihpi/asihpi.c | 9 +- + sound/pci/asihpi/hpi6000.c | 7 +- + sound/pci/asihpi/hpioctl.c | 8 +- + sound/pci/atiixp.c | 3 +- + sound/pci/atiixp_modem.c | 3 +- + sound/pci/aw2/aw2-alsa.c | 4 +- + sound/pci/bt87x.c | 3 +- + sound/pci/cs4281.c | 24 +-- + sound/pci/cs46xx/cs46xx.c | 10 +- + sound/pci/cs46xx/cs46xx.h | 10 +- + sound/pci/cs46xx/cs46xx_lib.c | 44 +---- + sound/pci/cs5530.c | 2 +- + sound/pci/ctxfi/cthw20k1.c | 5 +- + sound/pci/ctxfi/cthw20k2.c | 5 +- + sound/pci/echoaudio/echoaudio.c | 6 +- + sound/pci/emu10k1/emu10k1.c | 12 +- + sound/pci/emu10k1/emu10k1x.c | 19 +- + sound/pci/emu10k1/emufx.c | 7 +- + sound/pci/emu10k1/emupcm.c | 33 +--- + sound/pci/emu10k1/p16v.c | 14 +- + sound/pci/ens1370.c | 37 +--- + sound/pci/fm801.c | 14 +- + sound/pci/hda/hda_intel.c | 3 +- + sound/pci/hda/patch_analog.c | 33 ---- + sound/pci/ice1712/ice1712.c | 26 +-- + sound/pci/ice1712/wm8776.c | 15 -- + sound/pci/ice1712/wm8776.h | 3 - + sound/pci/lola/lola.c | 6 +- + sound/pci/mixart/mixart.c | 7 +- + sound/pci/nm256/nm256.c | 6 +- + sound/pci/oxygen/oxygen_lib.c | 3 +- + sound/pci/oxygen/oxygen_pcm.c | 8 - + sound/pci/riptide/riptide.c | 9 +- + sound/pci/rme9652/hdsp.c | 4 +- + sound/pci/rme9652/hdspm.c | 4 +- + sound/pci/rme9652/rme9652.c | 3 +- + sound/pci/sis7019.c | 5 +- + sound/pci/sonicvibes.c | 7 +- + sound/pci/trident/trident.c | 6 +- + sound/pci/trident/trident.h | 6 +- + sound/pci/trident/trident_main.c | 21 +-- + sound/pci/ymfpci/ymfpci.c | 8 +- + sound/pci/ymfpci/ymfpci.h | 8 +- + sound/pci/ymfpci/ymfpci_main.c | 41 +---- + sound/ppc/pmac.c | 15 +- + sound/ppc/snd_ps3.c | 4 +- + sound/soc/codecs/pcm512x-i2c.c | 4 + + sound/soc/codecs/pcm512x-spi.c | 4 + + sound/soc/codecs/rt5670.c | 38 ++++ + sound/soc/codecs/rt5677.c | 195 +++++++++++++++++++-- + sound/soc/codecs/wm8750.c | 2 +- + sound/soc/dwc/designware_i2s.c | 86 +++++---- + sound/soc/intel/Kconfig | 4 +- + sound/soc/intel/bytcr_dpcm_rt5640.c | 1 - + sound/soc/intel/cht_bsw_rt5672.c | 1 - + sound/soc/intel/sst-firmware.c | 1 + + sound/soc/intel/sst/sst_acpi.c | 5 +- + sound/soc/omap/omap-hdmi-audio.c | 1 - + sound/soc/pxa/spitz.c | 1 - + sound/soc/rockchip/rockchip_i2s.c | 4 + + sound/soc/samsung/arndale_rt5631.c | 1 - + sound/soc/soc-core.c | 3 - + sound/soc/soc-dapm.c | 105 ++--------- + sound/soc/soc-pcm.c | 33 +--- + sound/synth/emux/emux.c | 6 +- + 126 files changed, 628 insertions(+), 1046 deletions(-) + delete mode 100644 sound/isa/gus/gus_instr.c +Merging sound-asoc/for-next (e0495d6d6aee Merge remote-tracking branch 'asoc/topic/mxs-saif' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/designware-i2s.txt | 31 +++ + sound/soc/davinci/davinci-mcasp.c | 30 +++ + sound/soc/dwc/Kconfig | 1 + + sound/soc/dwc/designware_i2s.c | 283 +++++++++++++++++---- + sound/soc/fsl/fsl_asrc.c | 3 +- + sound/soc/fsl/fsl_asrc.h | 3 - + sound/soc/fsl/fsl_spdif.c | 15 +- + sound/soc/mxs/mxs-saif.c | 10 +- + sound/soc/mxs/mxs-saif.h | 1 - + 9 files changed, 302 insertions(+), 75 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/designware-i2s.txt +Merging modules/modules-next (b0a65b0cccd4 param: do not set store func without write perm) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (c91c2a63913b mic/host: initial virtio 1.0 support) +$ git merge virtio/virtio-next +Resolved 'drivers/virtio/virtio_pci_common.c' using previous resolution. +Auto-merging drivers/virtio/virtio_pci_common.c +CONFLICT (content): Merge conflict in drivers/virtio/virtio_pci_common.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bd6327e236e9] Merge remote-tracking branch 'virtio/virtio-next' +$ git diff -M --stat --summary HEAD^.. + drivers/virtio/virtio_pci_common.c | 5 ----- + 1 file changed, 5 deletions(-) +Merging input/next (aa104b1aaaa3 Input: synaptics - remove duplicated code) +$ git merge input/next +Auto-merging drivers/input/mouse/synaptics.c +Auto-merging drivers/input/mouse/psmouse-base.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/regulator-haptic.txt | 21 + + .../devicetree/bindings/input/sun4i-lradc-keys.txt | 62 +++ + .../bindings/input/tps65218-pwrbutton.txt | 17 + + MAINTAINERS | 7 + + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/sun4i-lradc-keys.c | 286 ++++++++++++++ + drivers/input/misc/Kconfig | 22 ++ + drivers/input/misc/Makefile | 2 + + drivers/input/misc/regulator-haptic.c | 279 +++++++++++++ + drivers/input/misc/tps65218-pwrbutton.c | 126 ++++++ + drivers/input/mouse/Kconfig | 10 + + drivers/input/mouse/focaltech.c | 408 ++++++++++++++++++- + drivers/input/mouse/focaltech.h | 2 + + drivers/input/mouse/psmouse-base.c | 32 +- + drivers/input/mouse/psmouse.h | 1 + + drivers/input/mouse/synaptics.c | 435 ++------------------- + drivers/input/mouse/synaptics.h | 18 +- + drivers/input/touchscreen/elants_i2c.c | 2 - + include/linux/platform_data/regulator-haptic.h | 29 ++ + 20 files changed, 1333 insertions(+), 437 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/regulator-haptic.txt + create mode 100644 Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt + create mode 100644 Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt + create mode 100644 drivers/input/keyboard/sun4i-lradc-keys.c + create mode 100644 drivers/input/misc/regulator-haptic.c + create mode 100644 drivers/input/misc/tps65218-pwrbutton.c + create mode 100644 include/linux/platform_data/regulator-haptic.h +Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) +$ git merge input-mt/for-next +Already up-to-date. +Merging block/for-next (177ccd2f8f39 Merge branch 'for-3.20/drivers' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + block/blk-core.c | 21 ++- + block/blk-mq-tag.c | 14 +- + block/blk-mq-tag.h | 1 + + block/blk-mq.c | 21 ++- + block/blk-mq.h | 1 + + drivers/block/loop.c | 416 ++++++++++++++++++++++----------------------- + drivers/block/loop.h | 18 +- + drivers/block/null_blk.c | 2 +- + drivers/block/nvme-core.c | 19 ++- + drivers/block/virtio_blk.c | 2 +- + include/linux/blk-mq.h | 3 + + 11 files changed, 284 insertions(+), 234 deletions(-) +Merging device-mapper/for-next (af66c8489d6d dm table: train hybrid target type detection to select blk-mq if appropriate) +$ git merge device-mapper/for-next +Auto-merging block/blk-mq.c +Auto-merging block/blk-core.c +Merge made by the 'recursive' strategy. + block/blk-core.c | 9 +- + block/blk-mq.c | 1 + + drivers/md/dm-mpath.c | 62 ++++++-- + drivers/md/dm-table.c | 59 +++++-- + drivers/md/dm-target.c | 15 +- + drivers/md/dm.c | 346 +++++++++++++++++++++++++++++------------- + drivers/md/dm.h | 11 +- + include/linux/blkdev.h | 1 + + include/linux/device-mapper.h | 10 +- + include/uapi/linux/dm-ioctl.h | 4 +- + 10 files changed, 370 insertions(+), 148 deletions(-) +Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence) +$ git merge embedded/master +Already up-to-date. +Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3) +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage) +$ 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 (6fcbdd5bb524 mmc: Add SDIO function devicetree subnode parsing) +$ git merge mmc-uh/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/mmc.txt | 48 ++- + arch/arm/mach-omap2/board-omap3pandora.c | 14 +- + drivers/mmc/core/bus.c | 4 + + drivers/mmc/core/core.c | 28 ++ + drivers/mmc/core/core.h | 3 + + drivers/mmc/core/host.c | 61 ++- + drivers/mmc/core/mmc.c | 38 +- + drivers/mmc/core/mmc_ops.c | 30 ++ + drivers/mmc/core/sd.c | 7 +- + drivers/mmc/core/sdio_bus.c | 11 + + drivers/mmc/core/slot-gpio.c | 164 ++------ + drivers/mmc/core/slot-gpio.h | 13 + + drivers/mmc/host/dw_mmc-exynos.c | 111 +----- + drivers/mmc/host/dw_mmc-exynos.h | 56 +++ + drivers/mmc/host/dw_mmc.c | 114 +++--- + drivers/mmc/host/dw_mmc.h | 9 +- + drivers/mmc/host/mmci.c | 2 +- + drivers/mmc/host/moxart-mmc.c | 4 +- + drivers/mmc/host/mvsdio.c | 10 - + drivers/mmc/host/mxs-mmc.c | 3 +- + drivers/mmc/host/omap_hsmmc.c | 50 --- + drivers/mmc/host/rtsx_pci_sdmmc.c | 522 ++++++++++++++------------ + drivers/mmc/host/sdhci-acpi.c | 7 +- + drivers/mmc/host/sdhci-bcm-kona.c | 4 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 17 +- + drivers/mmc/host/sdhci-of-esdhc.c | 20 +- + drivers/mmc/host/sdhci-pci.c | 7 +- + drivers/mmc/host/sdhci-pxav3.c | 15 +- + drivers/mmc/host/sdhci-s3c.c | 4 +- + drivers/mmc/host/sdhci-sirf.c | 74 +++- + drivers/mmc/host/sdhci-st.c | 4 +- + drivers/mmc/host/sdhci.c | 169 +++++++-- + drivers/mmc/host/sunxi-mmc.c | 29 +- + drivers/mmc/host/toshsd.c | 17 +- + include/linux/mmc/dw_mmc.h | 6 + + include/linux/mmc/host.h | 2 - + include/linux/mmc/mmc.h | 5 - + include/linux/mmc/sdhci.h | 7 + + include/linux/mmc/slot-gpio.h | 3 - + include/linux/platform_data/mmc-omap.h | 4 - + 40 files changed, 898 insertions(+), 798 deletions(-) + create mode 100644 drivers/mmc/core/slot-gpio.h + create mode 100644 drivers/mmc/host/dw_mmc-exynos.h +Merging kgdb/kgdb-next (0f16996cf2ed kernel/debug/debug_core.c: Logging clean-up) +$ git merge kgdb/kgdb-next +Auto-merging kernel/trace/trace_kdb.c +Merge made by the 'recursive' strategy. + include/linux/kdb.h | 62 ++++++++-- + kernel/debug/debug_core.c | 52 ++++---- + kernel/debug/kdb/kdb_bp.c | 37 +++--- + kernel/debug/kdb/kdb_debugger.c | 4 + + kernel/debug/kdb/kdb_main.c | 267 +++++++++++++++++++++++++--------------- + kernel/debug/kdb/kdb_private.h | 3 +- + kernel/trace/trace_kdb.c | 4 +- + lib/Kconfig.kgdb | 25 ++++ + 8 files changed, 306 insertions(+), 148 deletions(-) +Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (f851b60db0fd md: Check MD_RECOVERY_RUNNING as well as ->sync_thread.) +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-mfd-next (a3b63979f8a3 mfd: rtsx: Add func to split u32 into register) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (3d6969a641d0 MAINTAINERS: Remove my name from Backlight subsystem) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (02088e3ed79f power: reset: augment versatile driver for integrator) +$ git merge battery/master +Merge made by the 'recursive' strategy. + drivers/power/reset/arm-versatile-reboot.c | 32 +++++++++++++++++++++++++++--- + 1 file changed, 29 insertions(+), 3 deletions(-) +Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path) +$ git merge fbdev/for-next +Already up-to-date. +Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par) +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (574d54112fda Merge branches '3.19/omapdss' and '3.19/simplefb' into for-next) +$ git merge omap_dss2/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging regulator/for-next (70f56625cae8 Merge remote-tracking branch 'regulator/topic/rt5033' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/isl9305.txt | 4 +- + .../bindings/regulator/mt6397-regulator.txt | 217 ++++++++++++++ + drivers/regulator/Kconfig | 9 + + drivers/regulator/Makefile | 1 + + drivers/regulator/core.c | 6 +- + drivers/regulator/isl9305.c | 6 +- + drivers/regulator/max14577.c | 62 +--- + drivers/regulator/mt6397-regulator.c | 332 +++++++++++++++++++++ + drivers/regulator/rk808-regulator.c | 6 +- + drivers/regulator/rt5033-regulator.c | 8 +- + include/linux/regulator/mt6397-regulator.h | 49 +++ + 11 files changed, 641 insertions(+), 59 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/mt6397-regulator.txt + create mode 100644 drivers/regulator/mt6397-regulator.c + create mode 100644 include/linux/regulator/mt6397-regulator.h +Merging security/next (b2d1965dcea1 Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next) +$ git merge security/next +Already up-to-date. +Merging integrity/next (63a0eb7891bd ima: Fix build failure on powerpc when TCG_IBMVTPM dependencies are not met) +$ git merge integrity/next +Already up-to-date. +Merging selinux/next (566075875a84 selinux: Remove unused function avc_sidcmp()) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + security/selinux/avc.c | 5 ----- + 1 file changed, 5 deletions(-) +Merging lblnet/next (d8ec26d7f828 Linux 3.13) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (e0c3e00f4045 watchdog: drop owner assignment from platform_drivers) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + drivers/watchdog/cadence_wdt.c | 1 - + drivers/watchdog/imx2_wdt.c | 40 +++++++++++++++++++++++++++++++--------- + drivers/watchdog/meson_wdt.c | 1 - + 3 files changed, 31 insertions(+), 11 deletions(-) +Merging iommu/next (76771c938e95 Merge branches 'arm/omap', 'arm/msm', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (1860e379875d Linux 3.15) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (5e9f36c59a48 drivers/vfio: allow type-1 IOMMU instantiation on top of an ARM SMMU) +$ git merge vfio/next +Already up-to-date. +Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation) +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (174236285cf8 Merge branch 'doc/sp-update' into docs-next) +$ git merge jc_docs/docs-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/00-INDEX | 28 +-- + Documentation/Changes | 6 +- + Documentation/SubmittingPatches | 438 ++++++++++++++++----------------- + Documentation/arm/00-INDEX | 12 +- + Documentation/cgroups/00-INDEX | 2 + + Documentation/dmaengine/00-INDEX | 8 + + Documentation/driver-model/bus.txt | 2 +- + Documentation/filesystems/seq_file.txt | 12 +- + Documentation/locking/00-INDEX | 16 ++ + Documentation/networking/00-INDEX | 8 +- + MAINTAINERS | 1 + + 11 files changed, 277 insertions(+), 256 deletions(-) + create mode 100644 Documentation/dmaengine/00-INDEX + create mode 100644 Documentation/locking/00-INDEX +Merging trivial/for-next (231821d4c3fa dynamic_debug: fix comment) +$ git merge trivial/for-next +Auto-merging lib/dynamic_debug.c +Auto-merging arch/x86/mm/init.c +Merge made by the 'recursive' strategy. + Documentation/usb/usbmon.txt | 2 +- + arch/x86/mm/init.c | 2 +- + lib/dynamic_debug.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging audit/next (0f7e94ee40d0 Merge branch 'next' into upstream for v3.19) +$ git merge audit/next +Already up-to-date. +Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging devicetree/devicetree/next (c46ca3c8310b of: Delete unnecessary check before calling "of_node_put()") +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (a0e27f51ba8a documentation: pinctrl bindings: Fix trivial typo 'abitrary') +$ git merge dt-rh/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (a8eb27814016 Merge remote-tracking branch 'spi/topic/st-ssc' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/sh-msiof.txt | 16 + + .../devicetree/bindings/spi/spi-st-ssc.txt | 40 + + drivers/spi/Kconfig | 17 + + drivers/spi/Makefile | 2 + + drivers/spi/spi-au1550.c | 4 - + drivers/spi/spi-bcm2835.c | 4 - + drivers/spi/spi-bcm63xx.c | 4 - + drivers/spi/spi-bitbang.c | 4 - + drivers/spi/spi-butterfly.c | 4 - + drivers/spi/spi-coldfire-qspi.c | 5 - + drivers/spi/spi-davinci.c | 4 - + drivers/spi/spi-dln2.c | 890 +++++++++++++++++++++ + drivers/spi/spi-falcon.c | 12 - + drivers/spi/spi-fsl-lib.c | 2 - + drivers/spi/spi-gpio.c | 4 - + drivers/spi/spi-img-spfi.c | 49 +- + drivers/spi/spi-imx.c | 13 +- + drivers/spi/spi-lm70llp.c | 4 - + drivers/spi/spi-omap-100k.c | 5 - + drivers/spi/spi-omap-uwire.c | 4 - + drivers/spi/spi-omap2-mcspi.c | 5 - + drivers/spi/spi-pxa2xx-dma.c | 17 +- + drivers/spi/spi-pxa2xx-pxadma.c | 33 +- + drivers/spi/spi-pxa2xx.c | 206 ++--- + drivers/spi/spi-pxa2xx.h | 34 +- + drivers/spi/spi-qup.c | 11 +- + drivers/spi/spi-rspi.c | 5 - + drivers/spi/spi-s3c64xx.c | 4 - + drivers/spi/spi-sc18is602.c | 4 - + drivers/spi/spi-sh-hspi.c | 5 - + drivers/spi/spi-sh-msiof.c | 47 ++ + drivers/spi/spi-sh.c | 5 - + drivers/spi/spi-st-ssc4.c | 510 ++++++++++++ + drivers/spi/spi-topcliff-pch.c | 4 - + drivers/spi/spi.c | 118 ++- + drivers/spi/spidev.c | 4 - + include/linux/pxa2xx_ssp.h | 1 + + include/linux/spi/at86rf230.h | 4 - + include/linux/spi/l4f00242t03.h | 4 - + include/linux/spi/lms283gf05.h | 4 - + include/linux/spi/mxs-spi.h | 4 - + include/linux/spi/pxa2xx_spi.h | 4 - + include/linux/spi/rspi.h | 5 - + include/linux/spi/sh_hspi.h | 4 - + include/linux/spi/sh_msiof.h | 2 + + include/linux/spi/spi.h | 6 +- + include/linux/spi/tle62x0.h | 4 - + include/linux/spi/tsc2005.h | 5 - + 48 files changed, 1781 insertions(+), 365 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/spi-st-ssc.txt + create mode 100644 drivers/spi/spi-dln2.c + create mode 100644 drivers/spi/spi-st-ssc4.c +Merging tip/auto-latest (caa523dc2242 Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging arch/x86/include/uapi/asm/msr-index.h +Merge made by the 'recursive' strategy. + arch/x86/include/asm/cpufeature.h | 2 ++ + arch/x86/include/asm/debugreg.h | 5 +++ + arch/x86/include/asm/hw_breakpoint.h | 1 + + arch/x86/include/uapi/asm/msr-index.h | 4 +++ + arch/x86/kernel/cpu/amd.c | 19 +++++++++++ + arch/x86/kernel/hw_breakpoint.c | 45 ++++++++++--------------- + arch/x86/vdso/vma.c | 45 ++++++++++++++++--------- + tools/perf/Documentation/perf-record.txt | 7 ++-- + tools/perf/tests/parse-events.c | 58 ++++++++++++++++++++++++++++++++ + tools/perf/util/parse-events.c | 21 ++++++------ + tools/perf/util/parse-events.h | 2 +- + tools/perf/util/parse-events.l | 1 + + tools/perf/util/parse-events.y | 26 ++++++++++++-- + 13 files changed, 177 insertions(+), 59 deletions(-) +Merging clockevents/clockevents/next (b0ad5917960c ARM/ARM64: arch-timer: fix arch_timer_probed logic) +$ git merge clockevents/clockevents/next +Merge made by the 'recursive' strategy. +Merging edac/linux_next (fec53af531dd sb_edac: Fix typo computing number of banks) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (775c503f6567 mpc85xx_edac: Fix a typo in comments) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + drivers/edac/mce_amd_inj.c | 2 +- + drivers/edac/mpc85xx_edac.c | 2 +- + drivers/edac/mpc85xx_edac.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging irqchip/irqchip/for-next (97bf6af1f928 Linux 3.19-rc1) +$ git merge irqchip/irqchip/for-next +Already up-to-date. +Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) +$ git merge tiny/tiny/next +Already up-to-date. +Merging ftrace/for-next (d716ff71dd12 tracing: Remove taking of trace_types_lock in pipe files) +$ git merge ftrace/for-next +Merge made by the 'recursive' strategy. + kernel/trace/trace.c | 126 ++++++++++++++++++--------------------------------- + kernel/trace/trace.h | 1 + + 2 files changed, 44 insertions(+), 83 deletions(-) +Merging rcu/rcu/next (940c6c7fb5ec Documentation/memory-barriers.txt: Fix smp typo) +$ git merge rcu/rcu/next +Auto-merging lib/Kconfig.debug +Auto-merging init/Kconfig +Merge made by the 'recursive' strategy. + Documentation/RCU/stallwarn.txt | 16 +- + Documentation/RCU/trace.txt | 32 +- + Documentation/memory-barriers.txt | 33 +- + include/linux/compiler.h | 2 +- + include/linux/rculist.h | 16 +- + include/linux/rcupdate.h | 13 +- + include/linux/rcutiny.h | 45 ++- + include/linux/rcutree.h | 11 +- + include/linux/srcu.h | 14 +- + init/Kconfig | 3 - + kernel/cpu.c | 56 ++-- + kernel/rcu/rcu.h | 6 + + kernel/rcu/rcutorture.c | 66 ++-- + kernel/rcu/srcu.c | 2 +- + kernel/rcu/tiny.c | 113 +------ + kernel/rcu/tiny_plugin.h | 9 +- + kernel/rcu/tree.c | 341 +++++++++++++++------ + kernel/rcu/tree.h | 62 +--- + kernel/rcu/tree_plugin.h | 271 +++++----------- + kernel/rcu/tree_trace.c | 8 +- + lib/Kconfig.debug | 2 +- + tools/testing/selftests/rcutorture/bin/cpus2use.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 18 ++ + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 9 +- + .../selftests/rcutorture/bin/parse-build.sh | 20 +- + .../selftests/rcutorture/bin/parse-console.sh | 2 +- + 26 files changed, 591 insertions(+), 581 deletions(-) +Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) +$ git merge uprobes/for-next +Already up-to-date. +Merging kvm/linux-next (2c4aa55a6af0 Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into HEAD) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (05971120fca4 arm/arm64: KVM: Require in-kernel vgic for the arch timers) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (476ce5ef09b2 KVM: PPC: Book3S: Enable in-kernel XICS emulation by default) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1) +$ git merge oprofile/for-next +Already up-to-date. +Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work) +$ git merge fw-nohz/nohz/next +Already up-to-date. +Merging xen-tip/linux-next (2e917175e1ef xen: Speed up set_phys_to_machine() by using read-only mappings) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (bfaa047a9415 Merge branch 'for-3.18-fixes' into for-next) +$ git merge percpu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (008847f66c38 workqueue: allow rescuer thread to do more work.) +$ git merge workqueues/for-next +Already up-to-date. +Merging drivers-x86/for-next (200db647112d platform/x86/acerhdf: Still depends on THERMAL) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries) +$ git merge chrome-platform/for-next +Already up-to-date. +Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away) +$ git merge sysctl/master +Already up-to-date. +Merging regmap/for-next (270ded427d7b Merge remote-tracking branch 'regmap/topic/core' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/internal.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging hsi/for-next (67e9a2ce6e07 hsi: nokia-modem: fix uninitialized device pointer) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/clients/nokia-modem.c | 1 + + 1 file changed, 1 insertion(+) +Merging leds/for-next (d5a570782795 leds: Don't allow brightness values greater than max_brightness) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/leds/common.txt | 16 ++++++++++++++++ + drivers/leds/leds.h | 3 ++- + 2 files changed, 18 insertions(+), 1 deletion(-) +Merging ipmi/for-next (1421c935df15 ipmi: Fix compile warning with tv_usec) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_ssif.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging driver-core/driver-core-next (b7392d2247cf Linux 3.19-rc2) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (b7392d2247cf Linux 3.19-rc2) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (b7392d2247cf Linux 3.19-rc2) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (b7392d2247cf Linux 3.19-rc2) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (b7392d2247cf Linux 3.19-rc2) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging staging/staging-next (b7392d2247cf Linux 3.19-rc2) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (b7392d2247cf Linux 3.19-rc2) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging cgroup/for-next (eeecbd197151 cgroup: implement cgroup_get_e_css()) +$ git merge cgroup/for-next +Already up-to-date. +Merging scsi/for-next (6bf850aa7ff6 Merge branch 'fixes' into for-next) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/3w-9xxx.c | 3 +- + drivers/scsi/constants.c | 28 +++++++- + drivers/scsi/mpt2sas/mpt2sas_base.c | 8 +-- + drivers/scsi/mpt3sas/mpt3sas_base.c | 8 +-- + drivers/scsi/scsi_debug.c | 128 +++++++++++++++++++++++++++++++++++- + 5 files changed, 162 insertions(+), 13 deletions(-) +Merging target-updates/for-next (ae450e246e85 target: Allow AllRegistrants to re-RESERVE existing reservation) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS) +$ git merge writeback/writeback-for-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (96dfdff694ae pinctrl: rockchip: Fix enable/disable/mask/unmask) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/pinctrl-rockchip.c | 57 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 54 insertions(+), 3 deletions(-) +Merging vhost/linux-next (5d9a07b0de51 vhost: relax used address alignment) +$ git merge vhost/linux-next +Already up-to-date. +Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6) +$ git merge remoteproc/for-next +Already up-to-date. +Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (170680abd1eb gpio: mcp23s08: fix up compilation error) +$ git merge gpio/for-next +Already up-to-date. +Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters order consistent in func declaration and definition) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (39e046f2c1dd pwm: atmel-hlcdc: add at91sam9x5 and sama5d3 errata handling) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldoc warning) +$ git merge dma-buf/for-next +Merge made by the 'recursive' strategy. +Merging userns/for-next (db86da7cb76f userns: Unbreak the unprivileged remount tests) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (17150fef4ab1 ktest: Add back "tail -1" to kernelrelease make) +$ git merge ktest/for-next +Already up-to-date. +Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge signal/for-next +Already up-to-date. +Merging clk/clk-next (f1e9203e2366 clk: samsung: Fix Exynos 5420 pinctrl setup and clock disable failure due to domain being gated) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) +$ git merge random/dev +Already up-to-date. +Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) +$ git merge lzo-update/lzo-update +Auto-merging lib/lzo/lzo1x_decompress_safe.c +Merge made by the 'recursive' strategy. + lib/lzo/lzo1x_decompress_safe.c | 4 ++++ + lib/lzo/lzodefs.h | 6 ++++++ + 2 files changed, 10 insertions(+) +Merging aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0) +$ git merge aio/master +Already up-to-date. +Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) +$ git merge llvmlinux/for-next +Merge made by the 'recursive' strategy. +Merging documentation/for-next (0415447aa3b4 Documentation: fix broken v4l-utils URL) +$ git merge documentation/for-next +Already up-to-date. +Merging kselftest/next (97bf6af1f928 Linux 3.19-rc1) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (45446a99cef6 staging: media: lirc: Replace timeval with ktime_t in lirc_parallel.c) +$ git merge y2038/y2038 +Resolved 'drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c' using previous resolution. +Resolved 'drivers/staging/ft1000/ft1000-usb/ft1000_debug.c' using previous resolution. +Resolved 'drivers/staging/media/lirc/lirc_sasem.c' using previous resolution. +Auto-merging kernel/cpuset.c +Auto-merging drivers/staging/media/lirc/lirc_serial.c +Auto-merging drivers/staging/media/lirc/lirc_sasem.c +CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_sasem.c +Auto-merging drivers/staging/media/lirc/lirc_parallel.c +Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0436facab224] Merge remote-tracking branch 'y2038/y2038' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 6 +-- + drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 6 +-- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 6 +-- + drivers/staging/ft1000/ft1000.h | 4 +- + drivers/staging/gdm72xx/gdm_sdio.c | 13 +++--- + drivers/staging/gdm72xx/gdm_sdio.h | 4 +- + drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++---------- + drivers/staging/media/lirc/lirc_sasem.c | 20 +++++----- + drivers/staging/media/lirc/lirc_serial.c | 50 ++++++++---------------- + kernel/cpuset.c | 12 ++++-- + 10 files changed, 69 insertions(+), 87 deletions(-) +Merging luto-misc/next (bced35b65aef x86, traps: Add ist_begin_non_atomic and ist_end_non_atomic) +$ git merge luto-misc/next +Merge made by the 'recursive' strategy. + Documentation/x86/entry_64.txt | 18 ++++-- + Documentation/x86/x86_64/kernel-stacks | 8 ++- + arch/x86/include/asm/thread_info.h | 11 ++++ + arch/x86/include/asm/traps.h | 6 ++ + arch/x86/kernel/cpu/mcheck/mce.c | 5 ++ + arch/x86/kernel/cpu/mcheck/p5.c | 6 ++ + arch/x86/kernel/cpu/mcheck/winchip.c | 5 ++ + arch/x86/kernel/entry_64.S | 86 +++++++++++++------------- + arch/x86/kernel/irq_32.c | 13 +--- + arch/x86/kernel/traps.c | 108 +++++++++++++++++++++++++-------- + 10 files changed, 182 insertions(+), 84 deletions(-) +Merging access_once/linux-next (5de72a2247ac s390/kvm: REPLACE barrier fixup with READ_ONCE) +$ git merge access_once/linux-next +Already up-to-date. +Merging omap/for-next (b2776bf7149b Linux 3.18) +$ git merge omap/for-next +Already up-to-date. +Merging omap-pending/for-next (b2776bf7149b Linux 3.18) +$ git merge omap-pending/for-next +Already up-to-date. +Merging livepatching/for-next (700a3048aaa3 livepatch: samples: fix usage example comments) +$ git merge livepatching/for-next +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-kernel-livepatch | 44 ++ + Documentation/oops-tracing.txt | 2 + + Documentation/sysctl/kernel.txt | 1 + + MAINTAINERS | 15 + + arch/x86/Kconfig | 3 + + arch/x86/include/asm/livepatch.h | 42 + + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/livepatch.c | 90 +++ + include/linux/kernel.h | 1 + + include/linux/livepatch.h | 133 ++++ + kernel/Makefile | 1 + + kernel/livepatch/Kconfig | 18 + + kernel/livepatch/Makefile | 3 + + kernel/livepatch/core.c | 931 +++++++++++++++++++++++ + kernel/panic.c | 2 + + samples/Kconfig | 7 + + samples/Makefile | 2 +- + samples/livepatch/Makefile | 1 + + samples/livepatch/livepatch-sample.c | 91 +++ + 19 files changed, 1387 insertions(+), 1 deletion(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-livepatch + create mode 100644 arch/x86/include/asm/livepatch.h + create mode 100644 arch/x86/kernel/livepatch.c + create mode 100644 include/linux/livepatch.h + create mode 100644 kernel/livepatch/Kconfig + create mode 100644 kernel/livepatch/Makefile + create mode 100644 kernel/livepatch/core.c + create mode 100644 samples/livepatch/Makefile + create mode 100644 samples/livepatch/livepatch-sample.c +Merging akpm-current/current (350b61c87ab5 metag: Align thread_info::supervisor_stack) +$ git merge --no-ff akpm-current/current +Resolved 'fs/ocfs2/aops.c' using previous resolution. +Auto-merging mm/rmap.c +Auto-merging mm/page_alloc.c +Auto-merging mm/memory.c +Auto-merging mm/madvise.c +Auto-merging mm/huge_memory.c +CONFLICT (modify/delete): mm/fremap.c deleted in akpm-current/current and modified in HEAD. Version HEAD of mm/fremap.c left in tree. +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/linux/fs.h +Auto-merging fs/ocfs2/file.c +Auto-merging fs/ocfs2/dlm/dlmmaster.c +Auto-merging fs/ocfs2/aops.c +CONFLICT (content): Merge conflict in fs/ocfs2/aops.c +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/input/input.c +Auto-merging arch/xtensa/include/uapi/asm/mman.h +Auto-merging arch/x86/kernel/machine_kexec_64.c +Auto-merging arch/x86/include/asm/thread_info.h +Auto-merging arch/tile/kernel/signal.c +Auto-merging arch/arm64/include/asm/pgtable.h +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f mm/fremap.c +mm/fremap.c: needs merge +rm 'mm/fremap.c' +$ git commit -v -a +[master 9c1b3becd391] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/i2c/trivial-devices.txt | 2 +- + Documentation/filesystems/vfat.txt | 10 + + Documentation/leds/leds-class.txt | 3 - + Documentation/printk-formats.txt | 6 + + Documentation/vm/remap_file_pages.txt | 7 +- + arch/alpha/include/asm/thread_info.h | 5 - + arch/alpha/include/uapi/asm/mman.h | 1 + + arch/alpha/kernel/signal.c | 2 +- + arch/arc/include/asm/thread_info.h | 4 - + arch/arc/kernel/signal.c | 2 +- + arch/arm/include/asm/pgtable-3level.h | 1 + + arch/arm/include/asm/thread_info.h | 4 - + arch/arm/kernel/signal.c | 4 +- + arch/arm64/include/asm/pgtable.h | 2 + + arch/arm64/include/asm/thread_info.h | 4 - + arch/arm64/kernel/signal.c | 2 +- + arch/arm64/kernel/signal32.c | 4 +- + arch/avr32/include/asm/thread_info.h | 4 - + arch/avr32/kernel/asm-offsets.c | 1 - + arch/avr32/kernel/signal.c | 2 +- + arch/blackfin/include/asm/thread_info.h | 4 - + arch/blackfin/kernel/signal.c | 2 +- + arch/c6x/include/asm/thread_info.h | 4 - + arch/c6x/kernel/signal.c | 2 +- + arch/cris/arch-v10/kernel/signal.c | 2 +- + arch/cris/arch-v32/kernel/signal.c | 2 +- + arch/cris/include/asm/thread_info.h | 4 - + arch/frv/include/asm/thread_info.h | 4 - + arch/frv/kernel/asm-offsets.c | 1 - + arch/frv/kernel/signal.c | 2 +- + arch/hexagon/include/asm/thread_info.h | 4 - + arch/hexagon/kernel/signal.c | 2 +- + arch/ia64/include/asm/thread_info.h | 4 - + arch/ia64/kernel/signal.c | 2 +- + arch/m32r/include/asm/thread_info.h | 5 - + arch/m32r/kernel/signal.c | 2 +- + arch/m68k/include/asm/thread_info.h | 4 - + arch/m68k/kernel/signal.c | 4 +- + arch/metag/include/asm/thread_info.h | 6 +- + arch/metag/kernel/signal.c | 2 +- + arch/microblaze/include/asm/thread_info.h | 4 - + arch/microblaze/kernel/signal.c | 2 +- + arch/mips/include/asm/thread_info.h | 4 - + arch/mips/include/uapi/asm/mman.h | 1 + + arch/mips/kernel/asm-offsets.c | 1 - + arch/mips/kernel/signal.c | 2 +- + arch/mips/kernel/signal32.c | 2 +- + arch/mn10300/include/asm/thread_info.h | 4 - + arch/mn10300/kernel/asm-offsets.c | 1 - + arch/mn10300/kernel/signal.c | 2 +- + arch/openrisc/include/asm/thread_info.h | 4 - + arch/openrisc/kernel/signal.c | 2 +- + arch/parisc/include/asm/thread_info.h | 4 - + arch/parisc/include/uapi/asm/mman.h | 1 + + arch/parisc/kernel/signal.c | 2 +- + arch/powerpc/include/asm/pgtable-ppc64.h | 2 + + arch/powerpc/include/asm/thread_info.h | 4 - + arch/powerpc/kernel/signal_32.c | 4 +- + arch/powerpc/kernel/signal_64.c | 2 +- + arch/s390/include/asm/thread_info.h | 4 - + arch/s390/kernel/compat_signal.c | 2 +- + arch/s390/kernel/signal.c | 2 +- + arch/score/include/asm/thread_info.h | 4 - + arch/score/kernel/asm-offsets.c | 1 - + arch/score/kernel/signal.c | 2 +- + arch/sh/include/asm/thread_info.h | 4 - + arch/sh/kernel/asm-offsets.c | 1 - + arch/sh/kernel/signal_32.c | 4 +- + arch/sh/kernel/signal_64.c | 4 +- + arch/sparc/include/asm/pgtable_64.h | 9 + + arch/sparc/include/asm/thread_info_32.h | 6 - + arch/sparc/include/asm/thread_info_64.h | 12 +- + arch/sparc/kernel/signal32.c | 4 +- + arch/sparc/kernel/signal_32.c | 2 +- + arch/sparc/kernel/signal_64.c | 2 +- + arch/sparc/kernel/traps_64.c | 2 - + arch/tile/include/asm/thread_info.h | 4 - + arch/tile/kernel/signal.c | 2 +- + arch/um/include/asm/thread_info.h | 4 - + arch/unicore32/include/asm/thread_info.h | 4 - + arch/unicore32/kernel/signal.c | 2 +- + arch/x86/ia32/ia32_signal.c | 2 +- + arch/x86/include/asm/pgtable.h | 5 + + arch/x86/include/asm/thread_info.h | 4 - + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/signal.c | 2 +- + arch/x86/um/signal.c | 2 +- + arch/xtensa/include/asm/thread_info.h | 5 - + arch/xtensa/include/uapi/asm/mman.h | 1 + + arch/xtensa/kernel/signal.c | 2 +- + block/genhd.c | 2 +- + drivers/input/Kconfig | 9 + + drivers/input/Makefile | 3 + + drivers/input/input.c | 9 + + drivers/input/leds.c | 272 ++++++++++++++++ + drivers/leds/Kconfig | 3 - + drivers/misc/ti-st/st_core.c | 2 +- + drivers/rtc/rtc-isl12057.c | 324 ++++++++++++++++++- + drivers/tty/Kconfig | 4 + + drivers/tty/vt/keyboard.c | 110 +++++-- + fs/ext4/fsync.c | 5 +- + fs/fat/cache.c | 38 ++- + fs/fat/fat.h | 4 + + fs/fat/file.c | 62 ++++ + fs/fat/inode.c | 68 +++- + fs/mpage.c | 23 +- + fs/ocfs2/aops.c | 258 ++++++++++++++- + fs/ocfs2/dlm/dlmast.c | 6 +- + fs/ocfs2/dlm/dlmmaster.c | 10 - + fs/ocfs2/dlm/dlmthread.c | 10 + + fs/ocfs2/file.c | 108 +++---- + fs/ocfs2/file.h | 9 + + fs/ocfs2/inode.c | 10 +- + fs/ocfs2/inode.h | 2 + + fs/ocfs2/journal.c | 115 +++++-- + fs/ocfs2/journal.h | 5 + + fs/ocfs2/namei.c | 348 +++++++++++++++++++++ + fs/ocfs2/namei.h | 5 + + fs/ocfs2/ocfs2.h | 15 + + fs/ocfs2/ocfs2_fs.h | 5 +- + fs/ocfs2/ocfs2_trace.h | 3 + + fs/ocfs2/super.c | 2 + + fs/select.c | 2 +- + include/linux/crc64_ecma.h | 56 ++++ + include/linux/fs.h | 8 +- + include/linux/huge_mm.h | 4 + + include/linux/init_task.h | 3 + + include/linux/input.h | 28 ++ + include/linux/kexec.h | 2 + + include/linux/oom.h | 5 - + include/linux/rmap.h | 9 +- + include/linux/sched.h | 2 + + include/linux/string.h | 1 + + include/linux/vm_event_item.h | 1 + + include/uapi/asm-generic/mman-common.h | 1 + + init/Kconfig | 16 - + init/main.c | 5 - + kernel/compat.c | 5 +- + kernel/exit.c | 12 +- + kernel/futex.c | 2 +- + kernel/signal.c | 2 +- + kernel/time/alarmtimer.c | 2 +- + kernel/time/hrtimer.c | 2 +- + kernel/time/posix-cpu-timers.c | 3 +- + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 ++++++++++++++++++++ + lib/vsprintf.c | 20 +- + mm/Makefile | 2 +- + mm/fremap.c | 283 ----------------- + mm/huge_memory.c | 35 +++ + mm/madvise.c | 150 +++++++++ + mm/memory.c | 2 + + mm/memory_hotplug.c | 11 +- + mm/mmap.c | 69 ++++ + mm/nommu.c | 8 - + mm/page_alloc.c | 95 +++--- + mm/page_isolation.c | 7 +- + mm/rmap.c | 46 ++- + mm/util.c | 30 ++ + mm/vmscan.c | 64 +++- + mm/vmstat.c | 1 + + 162 files changed, 2693 insertions(+), 784 deletions(-) + create mode 100644 drivers/input/leds.c + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c + delete mode 100644 mm/fremap.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/gpio/gpio-zevio.c: fix build +Applying: drivers/w1/w1_int.c: call put_device if device_register fails +Applying: mm: add strictlimit knob +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + e86bed5fa4c7...0f32ca56bddb akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (0f32ca56bddb mm: add strictlimit knob) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 +++++++ + drivers/gpio/gpio-zevio.c | 4 ++++ + drivers/w1/w1_int.c | 3 +-- + mm/backing-dev.c | 35 +++++++++++++++++++++++++++++++ + 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..82c37e0249a6 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing jdelvare-hwmon based on 3.17 +Unchanged quilt series jdelvare-hwmon diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..0182e6e96183 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20150105 |