diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-02-22 17:30:43 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-02-22 17:30:43 +1100 |
| commit | 53e418f1e9f4d409cee84e573e510877e343ce38 (patch) | |
| tree | c946cbc2e9c2d17e3a45734e1d434cc6cd0de545 | |
| parent | 4bced7b0b2181861d152665ef122b42e2f0e7852 (diff) | |
Add linux-next specific files for 20150222next-20150222
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 208 | ||||
| -rw-r--r-- | Next/Trees | 210 | ||||
| -rw-r--r-- | Next/merge.log | 2460 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 2881 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..19d2dc270764 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,208 @@ +Name SHA1 +---- ---- +origin 93aaa830fc173560505c3411806509299d8871ce +fixes b94d525e58dc9638dd3f98094cb468bcfb262039 +kbuild-current a16c5f99a28c9945165c46da27fff8e6f26f8736 +arc-current 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd +arm-current 8e64806672466392acf19e14427d1c29df3e58b9 +m68k-current 4436820a98cdaf497a874323095e328831030956 +metag-fixes ffe6902b66aaa4ca6694bc19639259c16d84ddb1 +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-merge 31345e1a071e4e5f2fa8b6be5ca7d1cbce20cfca +powerpc-merge-mpe c59c961ca511dc7ee2f4f7e9c224d16f5c76ca6e +sparc 66d0f7ec9f1038452178b1993fc07fd96d30fd38 +net ddede6d536d70c4ef2193ca14208db90740fcd22 +ipsec ac37e2515c1a89c477459a2020b6bfdedabdb91b +sound-current 3cd1ce0420ce89937bef9096d5bdb13fbdf0f8b0 +pci-current feb28979c137ba3f649ad36fc27c85c64c111f78 +wireless-drivers aeb2d2a4c0ae1739a6e1782bd8c1c96aee8db4e1 +driver-core.current 26bc420b59a38e4e6685a73345a0def461136dce +tty.current ec6f34e5b552fb0a52e6aae1a5afbbb1605cc6cc +usb.current e36f014edff70fc02b3d3d79cead1d58f289332e +usb-gadget-fixes f5af19d10d151c5a2afae3306578f485c244db25 +usb-serial-fixes a6f0331236fa75afba14bbcf6668d42cebb55c43 +staging.current 3d883483dc0a7261d73d8b1857a7387a1dd99eee +char-misc.current e36f014edff70fc02b3d3d79cead1d58f289332e +input-current 4c971aa78314253cce914ed29e3d90df3326d646 +crypto-current 96692a7305c49845e3cbf5a60cfcb207c5dc4030 +ide f96fe225677b3efb74346ebd56fafe3997b02afa +devicetree-current 6b1271de3723a7957c7cc6a7f36ea114f557e730 +rr-fixes f476893459318cb2eff3ecd2a05d4ceacf82e73e +vfio-fixes 7c2e211f3c95b91912a92a8c6736343690042e2e +kselftest-fixes f5db310d77ef1742e40bfc303b8625584c55f9e3 +drm-intel-fixes bfa76d49576599a4b9f9b7a71f23d73d6dcff735 +asm-generic 643165c8bbc8617d8222cb50c89e34fe64d226cf +arc 06f34e1c28f3608b0ce5b310e41102d3fe7b65a1 +arm df9ab9771c64f5229843bfe2a20fe0ee6ac59fc1 +arm-perf 97bf6af1f928216fd6c5a66e8a57bfa95a659672 +arm-soc d88d6cfc912e9e54f9ec0337a84691436c654077 +bcm2835 b2776bf7149bddd1f4161f14f79520f17fc1d71d +berlin 8553bf8fd181df974bc4e028c9f880a62829783e +cortex-m e799b6f37e6ccd7b97e3e2df62a30f1c5b211290 +imx-mxs 395ae1400a359cc04016ccf6e9ba83283c61509b +keystone b17275a4a6cc61e0b7da40558ff5c7250fb80917 +mvebu feeddcd9c17ba304745d241643b30e0a427433ed +omap 5cb1e109eee0ca238673b2e7ecf1484cecc72907 +omap-pending 30aa18d3bea5f9470af5aa48ab8df88bde97c795 +renesas b2cb094d275eca6883c01cd65d9df597049795a7 +samsung aeb011501873355fb618828aac6a21c04b251614 +sunxi 16e8c17e18d60d8dd0e2d5ecc261dfc9db0963e6 +tegra 794345d409ad2ab082ebdff4c26b9487434f5a58 +arm64 d476d94f180af3f0fca77394651d4a98f4df1c54 +blackfin 275f5a8573e7832d0cf344a1b29da357c7038870 +c6x ae72758f1dd93bd367dc7719702f24a9bfb3bad9 +cris 9987c19ed9a71693bf3efce2957666b2513a5252 +hexagon 8914d7e857807e1e60975000cba3750c9b2643e8 +ia64 a6b8978c54b771308f6f1692b9735ac0bb087cc2 +m68k 4436820a98cdaf497a874323095e328831030956 +m68knommu 21b30ca5da14613dcf8fd8350ecdb0d5d245e814 +metag f93125ae17d1d259b5aba84016db260903822194 +microblaze a01d37d914f98c430854bbae2402e6f51d9a8d0b +mips 64b139f97c01f3624b3f0a4e84f65b0c2bf2ebda +nios2 d16d2be111a61baf3a4696f07bfc7a8e36697cec +parisc-hd bfa76d49576599a4b9f9b7a71f23d73d6dcff735 +powerpc d557b09800dab5dd6804e5b79324069abcf0be11 +powerpc-mpe a6130ed253a931d2169c26ab0958d81b0dce4d6e +fsl 0dc294f717d41bfbafc746a7a96a7bc0f114c20c +mpc5xxx 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025 +s390 42d19952a90d20db0407c9162cba8e3641487efd +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile 740e1433f50e6d0f1c4705c1a963645072f5a74c +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa 1f2fdbd0078cb2ad4251768e8c0e0bb652a2cbd6 +btrfs a742994aa2e271eb8cd8e043d276515ec858ed73 +ceph 388cfdc9bc19cc189b86770dba55910018e8e0fc +cifs 0a545e3a74940679aa47449348556f440066495e +ecryptfs e7a823be2adc2c8617bead1376194a399143e4ed +ext3 6981498d7956e3177b6f74926aa4a5c2a45b4edb +ext4 6f30b7e37a8239f9d27db626a1d3427bc7951908 +f2fs db3ecdee1cf0538f11832f7ef66945c4dd903918 +fscache 1a8ed18fb7db48c916c2ccd484e04bd4dd737834 +fuse 9759bd51899458af4f4bcc11046f01285642ca10 +gfs2 278702074ff77b1a3fa2061267997095959f5e2c +jfs 648695c74811f09a8ad80d7c3be72b8169589a64 +nfs 71a097c6de9a49afd0f96b3ecef70c4eb04efde7 +nfsd a1d1e9be5a1dafe0ddc2181a9201c2ae29c71eff +overlayfs 4330397e4e8a662f36d101659e2a59ce32e76ff4 +squashfs 62421645bb702c077ee5a462815525106cb53bcf +v9fs f15844e0777fec936f87a87f97394f83911dacd3 +ubifs 8168b9bba6a88fe8a81be5b5f0937faeb3f6775d +xfs 781355c6e5ae87908de27dec3380a34918c33eee +file-locks b2b89ebfc0f0287e20516a5443d93af309b800cf +vfs a3959d2909f8409dd27253c449bd0ded408413ff +pci cb8e92d8e4d9f8562071b6ab39e1b837e9e7af39 +hid 870fd0f5df4e131467612cc46db46fc3b69fd706 +i2c bf6d5cb39e9da5ffbd021f61a8b1afc4f1b9eb7c +jdelvare-hwmon 26bc420b59a38e4e6685a73345a0def461136dce +hwmon-staging dd378b1bcaa0ef5b14cca1e52b58ef9a3279fd8b +v4l-dvb 48b777c0833bc7392679405539bb5d3ed0900828 +kbuild 8d18d1d514d16ec3e017d493d211e58cd0db37fa +kconfig bfa76d49576599a4b9f9b7a71f23d73d6dcff735 +libata d85aa1624b055cf65d3accfc607eaaa94f87709f +pm 62b2412da1ccf0f08d16b84dfd73fdbfd3100d90 +idle 210109f4a19ad6a0a883d9bfc763228ac65a6671 +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +thermal 4531fa1684bb883ee01f1a182900b1e15d461b34 +thermal-soc 6c247393cfdd6695717f80ff31f9fd9af8c2c525 +ieee1394 d71e6a11737f4b3d857425a1d6f893231cbd1296 +dlm 2ab4bd8ea3a6954bc79a9bbeb291cd6c2d6213a7 +swiotlb 8e0629c1d4ce86ce7d98ca8756f42769bb17a3c8 +slave-dma 9ad1a1b57012a22a01e85057c8063db82ffbc60f +net-next bb39b7433d1c652b3699a7b335e0ad91181b2b05 +ipsec-next ff660f75be36e6db75d45dc742a4a468c5a9c20d +wireless-drivers-next d53071143aa5a7cb37cf7db8101042e700b5413f +bluetooth 03f310efd4b19ddc2cca15ae67f48295554adbfe +infiniband 147d1da951cf067badb7d3585002e1eb46719f83 +mtd eb928d40a93f73dd5bdad62c2d363df296ff94ea +l2-mtd eb928d40a93f73dd5bdad62c2d363df296ff94ea +crypto db71f29a1c327f3824c1c0919937965b36d67b80 +drm 45ee2dbc65cbf6910892c480e6f428be342fa733 +drm-panel 23923ebaac52884829118a4ff2e963ec61136d45 +drm-intel 96abd10ecc2e9ab5c8060697ce721683f387c64e +drm-tegra 07d05cbf60ed8f06c61484d3d85c06c1aa7edf38 +drm-misc eb2ed66fe56f30c6ea841ac11681a2f51049b221 +sound 3cd1ce0420ce89937bef9096d5bdb13fbdf0f8b0 +sound-asoc 9c208ed74c76bc85a8714a4c99535afdd460c1f1 +modules 9cc019b8c94fa59e02fd82f15f7b7d689e35c190 +virtio 5b40a7daf51812b35cf05d1601a779a7043f8414 +input 290b799c390d77d27effee3ce312203aaa32ee74 +block 434c264781668a38a6779202b792f7d95a77a12b +device-mapper 3712600cfae001329b6e36b6652c5dcce4b663f0 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh 802ea9d8645d33d24b7b4cd4537c14f3e698bde0 +kgdb dd8f30cc0550f36861ddfa42c27cc5c580b0bf8c +md 26ac107378c4742978216be1005b7291b799c7b2 +mfd 0a65fbf64dad890d9dd60ab1dc0ebdb9fb0a9e33 +backlight 1926469377bb20d20662fc505b6b36f43b412381 +battery 9e23e22cd61adff1b908dd376b958a491f2f5378 +omap_dss2 d6c2152b3efd73be265f426b5a1bb50ec436d999 +regulator 264d8de777a4370733b635cd19133fa0d7bf83c8 +security 04f81f0154e4bf002be6f4d85668ce1257efa4d9 +integrity 7bea7ff67e0cbb30f53ebee7194e238491ddeaab +selinux 6eb4e2b41b264f57ee02d16ee61683952945484d +lblnet b2776bf7149bddd1f4161f14f79520f17fc1d71d +watchdog b08c144e3a1089cdb725e393fa4f68f83a73e31b +iommu a20cc76b9efae10c20123049df361adcd7f0e0b3 +dwmw2-iommu 1860e379875dfe7271c649058aeddffe5afd9d0d +vfio 6140a8f5623820cec7f56c63444b9551d8d35775 +osd 1fa3a002b2546c42c343c77c144871285896ced5 +jc_docs 52e68924dfa8d9de5d82f6798352eecc5f03a97d +trivial edb0ec0725bb9797ded0deaf172a6795e43795c8 +audit 2fded7f44b8fcf79e274c3f0cfbd0298f95308f3 +devicetree fca8ba4ee24d17f8845ed1c8edcc3fd81c4650c2 +dt-rh 3c3c8e3618b018aee1dfd42343a74f3ab5ddf23c +mailbox 9f3e3cacb2ffdefe28c7cf490bf543e4dcb2770a +spi 4f16c3cd0b66822e288ffacc43111a3e61bcd033 +tip 3cf6be48c376657ffa54e9beb0c53805dd295648 +clockevents 4c8305221193e14752e0fa833a38f856bbe1d22b +edac fec53af531dd040e41fe358abe00b33747af2688 +edac-amd 30263b4052c6bf337641e24b64eaa87fe57adf8d +irqchip 91d1179212161f220938198b742c328ad38fd0a3 +tiny f114040e3ea6e07372334ade75d1ee0775c355e1 +ftrace c19565fc83e6cdb6da8eef166964c887e66e969f +rcu c0135d07b013fa8f7ba9ec91b4369c372e6a28cb +kvm 6557bada461afeaa920a189fae2cff7c8fdce39f +kvm-arm 4b990589952f0e30aa860184ac6c76219a74632e +kvm-ppc 2c4aa55a6af070262cca425745e8e54310e96b8d +kvms390 de8e5d744051568c8aad35c1c2dcf8fd137d10c9 +xen-tip a2e75bc2ee207351e6806e77a5379c6c1dd4598a +percpu 4c907baf36d8339f393bb576d0bab29194d0e6ad +workqueues b5b3ab523e31129f9291322a934b0730eaa06970 +drivers-x86 c57c0fa4bc9c2ad023674ef478c25719abaace7d +chrome-platform 5502486a2077e4280c618b82e8a77ed35932956f +regmap 48bbdbb173faf2c1659d21a3720768848651e414 +hsi f034125dfdae466b3e6ad155e722de48d64b82d4 +leds ffe2428614d2eab5399b9a934fcc614ab0d8bc53 +ipmi 43475c9dc47a00e42b031a9f257fdfd1975df129 +driver-core adf305f77878880fa5868a7179979da93be68d83 +tty c09babfab7ae8c7d79a5dce9d866fbb28b82dde4 +usb 4d4bac4499e9955521af80198063ef9c2f2bd634 +usb-gadget f5af19d10d151c5a2afae3306578f485c244db25 +usb-serial 3e264ffc831e70c4a3ecc8c2eeb5bfbc1c8a30d3 +staging 3d883483dc0a7261d73d8b1857a7387a1dd99eee +char-misc 5fb31cd839c21130c0b2524ceb9244e98dfe10e3 +cgroup 8abba61bcfd4e1cf122b3ba71cfef3dc026136ea +scsi cad8000836ef4ba85beb68d937763f9c767b38f9 +target-updates aa04dae454d087376d97f44710c4422df030a8f2 +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +pinctrl f724e05baaf0677151c339c0249a05876c779a1d +vhost ac26e40d1c8a9f1898939efa0e1e5681d422c2ec +remoteproc 9a3c4145af32125c5ee39c0272662b47307a8323 +rpmsg b1b9891441fa33fd0d49b5cb3aa7f04bca1cc1db +gpio d2bee67fadb65831837b0282267fb639dd656241 +dma-mapping dda02fd6278d9e995850b3c1dba484f17cbe4de4 +pwm b65af27ad89de60ca55721f9368b18d49ba1f269 +dma-buf 817bd7253291fc69d83d4340a7e186f3e6933169 +userns db86da7cb76f797a1a8b445166a15cb922c6ff85 +ktest 7c2c49eceb79eb4738f38a00270830057b5bfb76 +clk ec02ace8ca0a50eef430d3676de5c5fa978b0e29 +random 7185ad2672a7d50bc384de0e38d90b75d99f3d82 +aio 5f785de588735306ec4d7c875caf9d28481c8b21 +llvmlinux 25d4aee23af28a6ef04d70a1028c012665384df1 +kselftest 6ddf898c23d62c974e148efd9e509731324a167a +y2038 ed8c2241c1ae1b64e4a783ae7a2c685c93142a8d +luto-misc 188c901941efd43cbf21e8f4f9e9a276536b989c +access_once c5b19946eb76c67566aae6a84bf2b10ad59295ea +livepatching 0937e3b025f70e33f018aa55ee8d32b8731730a7 +akpm-current d07b956c650ad58a8ce00517515ebaf962e1f5c7 +akpm 9388210a3e8bd8760687b4c48cad6fb19811d040 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..f24be7b822bf --- /dev/null +++ b/Next/Trees @@ -0,0 +1,210 @@ +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-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +devicetree-current git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/merge +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +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 +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next +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 +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 +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git#master +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +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 +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-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 +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 +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.infradead.org/battery-2.6.git#master +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +selinux git git://git.infradead.org/users/pcmoore/selinux#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +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 +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/next +dt-rh git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next +tiny git git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux.git#tiny/next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/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 +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +clk git git://git.linaro.org/people/mturquette/linux.git#clk-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +aio git git://git.kvack.org/~bcrl/aio-next.git#master +llvmlinux git git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +access_once git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next +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..bcd2a56b15b3 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2460 @@ +$ date +Sunday 22 February 10:33:08 AEDT 2015 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 89d3fa45b4ad Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux +Merging origin/master (93aaa830fc17 Merge tag 'xfs-pnfs-for-linus-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs) +$ git merge origin/master +Updating 89d3fa45b4ad..93aaa830fc17 +Fast-forward + Documentation/DocBook/kgdb.tmpl | 6 +- + Documentation/clk.txt | 2 + + Documentation/device-mapper/dm-crypt.txt | 15 +- + .../devicetree/bindings/clock/exynos7-clock.txt | 15 + + .../bindings/clock/nvidia,tegra124-car.txt | 10 +- + .../devicetree/bindings/clock/qcom,lcc.txt | 21 + + .../devicetree/bindings/clock/qoriq-clock.txt | 5 +- + .../bindings/clock/renesas,cpg-mstp-clocks.txt | 1 + + .../bindings/clock/renesas,r8a73a4-cpg-clocks.txt | 33 + + .../clock/renesas,rcar-gen2-cpg-clocks.txt | 12 +- + Documentation/devicetree/bindings/clock/sunxi.txt | 43 +- + .../devicetree/bindings/clock/ti,cdce706.txt | 42 + + .../devicetree/bindings/clock/ti/fapll.txt | 33 + + .../devicetree/bindings/i2c/brcm,iproc-i2c.txt | 37 + + .../devicetree/bindings/i2c/i2c-mux-pca954x.txt | 3 + + .../devicetree/bindings/i2c/i2c-ocores.txt | 42 +- + Documentation/devicetree/bindings/i2c/i2c-rk3x.txt | 14 + + .../devicetree/bindings/i2c/trivial-devices.txt | 5 +- + .../devicetree/bindings/mmc/sunxi-mmc.txt | 8 +- + .../devicetree/bindings/thermal/exynos-thermal.txt | 21 + + .../devicetree/bindings/thermal/thermal.txt | 74 +- + Documentation/i2c/functionality | 2 +- + Documentation/input/alps.txt | 68 +- + Documentation/x86/zero-page.txt | 2 +- + MAINTAINERS | 14 +- + arch/arm/boot/dts/sun4i-a10.dtsi | 72 +- + arch/arm/boot/dts/sun5i-a10s.dtsi | 54 +- + arch/arm/boot/dts/sun5i-a13.dtsi | 44 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 86 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 72 +- + arch/arm/boot/dts/sun8i-a23.dtsi | 96 +- + arch/arm/mach-omap2/Makefile | 2 +- + arch/arm/mach-omap2/cclock3xxx_data.c | 3688 ---------------- + arch/arm/mach-omap2/clock.c | 16 - + arch/arm/mach-omap2/clock.h | 14 +- + arch/arm/mach-omap2/clock_common_data.c | 11 - + arch/arm/mach-omap2/dpll3xxx.c | 13 +- + arch/arm/mach-omap2/dpll44xx.c | 2 + + arch/arm/mach-omap2/io.c | 26 +- + arch/arm/mach-omap2/prm.h | 1 + + arch/arm/mach-omap2/prm_common.c | 11 + + arch/arm/mach-tegra/tegra.c | 2 - + arch/blackfin/mach-bf527/boards/ad7160eval.c | 15 +- + arch/blackfin/mach-bf527/boards/ezkit.c | 15 +- + arch/blackfin/mach-bf548/boards/ezkit.c | 7 +- + arch/blackfin/mach-bf609/boards/ezkit.c | 7 +- + arch/mips/alchemy/common/clock.c | 6 + + arch/powerpc/configs/corenet32_smp_defconfig | 1 + + arch/powerpc/configs/corenet64_smp_defconfig | 1 + + arch/powerpc/kernel/time.c | 5 + + arch/powerpc/platforms/512x/clock-commonclk.c | 11 +- + arch/s390/include/asm/topology.h | 24 +- + arch/s390/kernel/cache.c | 25 +- + arch/s390/kernel/early.c | 12 +- + arch/s390/kernel/setup.c | 1 - + arch/s390/kernel/smp.c | 54 +- + arch/s390/kernel/topology.c | 134 +- + arch/s390/kernel/vdso64/clock_gettime.S | 6 +- + arch/s390/mm/mmap.c | 5 +- + arch/x86/Kconfig | 16 + + arch/x86/Kconfig.debug | 13 + + arch/x86/boot/compressed/Makefile | 1 + + arch/x86/boot/compressed/aslr.c | 34 +- + arch/x86/boot/compressed/efi_stub_64.S | 25 - + arch/x86/boot/compressed/efi_thunk_64.S | 196 + + arch/x86/boot/compressed/misc.c | 3 +- + arch/x86/boot/compressed/misc.h | 6 +- + arch/x86/include/asm/apic.h | 8 + + arch/x86/include/asm/imr.h | 60 + + arch/x86/include/asm/page_types.h | 2 + + arch/x86/include/asm/pgtable.h | 6 +- + arch/x86/include/asm/spinlock.h | 90 +- + arch/x86/include/uapi/asm/bootparam.h | 1 + + arch/x86/kernel/acpi/boot.c | 5 + + arch/x86/kernel/cpu/microcode/intel.c | 5 + + arch/x86/kernel/cpu/microcode/intel_early.c | 6 +- + arch/x86/kernel/irq.c | 3 + + arch/x86/kernel/kprobes/core.c | 2 +- + arch/x86/kernel/kvm.c | 13 +- + arch/x86/kernel/module.c | 10 +- + arch/x86/kernel/setup.c | 22 +- + arch/x86/kernel/uprobes.c | 153 +- + arch/x86/mm/init.c | 28 +- + arch/x86/mm/mmap.c | 6 +- + arch/x86/platform/Makefile | 1 + + arch/x86/platform/efi/efi_stub_64.S | 161 - + arch/x86/platform/efi/efi_thunk_64.S | 121 +- + arch/x86/platform/intel-quark/Makefile | 2 + + arch/x86/platform/intel-quark/imr.c | 661 +++ + arch/x86/platform/intel-quark/imr_selftest.c | 129 + + arch/x86/xen/spinlock.c | 13 +- + block/blk-throttle.c | 3 + + drivers/acpi/acpi_lpss.c | 21 +- + drivers/acpi/ec.c | 4 +- + drivers/acpi/resource.c | 2 +- + drivers/acpi/video.c | 9 + + drivers/block/nvme-core.c | 496 ++- + drivers/block/nvme-scsi.c | 96 +- + drivers/block/rbd.c | 193 +- + drivers/char/ipmi/ipmi_devintf.c | 6 +- + drivers/char/ipmi/ipmi_msghandler.c | 102 +- + drivers/char/ipmi/ipmi_si_intf.c | 121 +- + drivers/char/ipmi/ipmi_ssif.c | 6 +- + drivers/clk/Kconfig | 18 +- + drivers/clk/Makefile | 4 +- + drivers/clk/at91/clk-programmable.c | 2 + + drivers/clk/bcm/clk-kona.c | 2 + + drivers/clk/clk-asm9260.c | 348 ++ + drivers/clk/clk-cdce706.c | 700 +++ + drivers/clk/clk-composite.c | 29 +- + drivers/clk/clk-divider.c | 228 +- + drivers/clk/clk-gate.c | 18 +- + drivers/clk/clk-mux.c | 16 + + drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} | 178 +- + drivers/clk/clk.c | 1009 +++-- + drivers/clk/clk.h | 24 +- + drivers/clk/clkdev.c | 110 +- + drivers/clk/hisilicon/clk-hi3620.c | 2 + + drivers/clk/mmp/clk-mix.c | 2 + + drivers/clk/pxa/Makefile | 1 + + drivers/clk/pxa/clk-pxa.c | 2 +- + drivers/clk/pxa/clk-pxa3xx.c | 364 ++ + drivers/clk/qcom/Kconfig | 18 + + drivers/clk/qcom/Makefile | 4 + + drivers/clk/qcom/clk-pll.c | 1 + + drivers/clk/qcom/clk-rcg.c | 10 +- + drivers/clk/qcom/clk-rcg2.c | 6 + + drivers/clk/qcom/clk-regmap-divider.c | 70 + + drivers/clk/qcom/clk-regmap-divider.h | 29 + + drivers/clk/qcom/clk-regmap-mux.c | 59 + + drivers/clk/qcom/clk-regmap-mux.h | 29 + + drivers/clk/qcom/gcc-ipq806x.c | 12 + + drivers/clk/qcom/lcc-ipq806x.c | 473 ++ + drivers/clk/qcom/lcc-msm8960.c | 585 +++ + drivers/clk/rockchip/clk-rk3288.c | 48 +- + drivers/clk/samsung/clk-exynos-audss.c | 32 +- + drivers/clk/samsung/clk-exynos3250.c | 217 +- + drivers/clk/samsung/clk-exynos4.c | 10 +- + drivers/clk/samsung/clk-exynos4415.c | 216 +- + drivers/clk/samsung/clk-exynos7.c | 408 +- + drivers/clk/samsung/clk.c | 13 +- + drivers/clk/samsung/clk.h | 3 +- + drivers/clk/shmobile/Makefile | 2 + + drivers/clk/shmobile/clk-div6.c | 18 +- + drivers/clk/shmobile/clk-r8a73a4.c | 241 + + drivers/clk/shmobile/clk-rcar-gen2.c | 88 + + drivers/clk/st/clk-flexgen.c | 39 +- + drivers/clk/st/clkgen-mux.c | 14 +- + drivers/clk/sunxi/Makefile | 1 + + drivers/clk/sunxi/clk-factors.c | 12 +- + drivers/clk/sunxi/clk-factors.h | 7 +- + drivers/clk/sunxi/clk-mod0.c | 224 +- + drivers/clk/sunxi/clk-sun6i-ar100.c | 2 + + drivers/clk/sunxi/clk-sun8i-mbus.c | 13 +- + drivers/clk/sunxi/clk-sun9i-core.c | 119 +- + drivers/clk/sunxi/clk-sun9i-mmc.c | 219 + + drivers/clk/sunxi/clk-sunxi.c | 262 +- + drivers/clk/tegra/Makefile | 1 + + drivers/clk/tegra/clk-id.h | 2 - + drivers/clk/tegra/clk-periph.c | 14 +- + drivers/clk/tegra/clk-pll.c | 18 +- + drivers/clk/tegra/clk-tegra-periph.c | 18 +- + drivers/clk/tegra/clk-tegra114.c | 10 +- + drivers/clk/tegra/clk-tegra124.c | 168 +- + drivers/clk/tegra/clk.c | 7 +- + drivers/clk/ti/Makefile | 8 +- + drivers/clk/ti/clk-3xxx-legacy.c | 4653 ++++++++++++++++++++ + drivers/clk/ti/clk-3xxx.c | 8 +- + drivers/clk/ti/clk-44xx.c | 2 +- + drivers/clk/ti/clk-54xx.c | 2 +- + drivers/clk/ti/clk-7xx.c | 2 +- + drivers/clk/ti/clk-816x.c | 53 + + drivers/clk/ti/clk.c | 127 + + drivers/clk/ti/clock.h | 172 + + drivers/clk/ti/composite.c | 48 +- + drivers/clk/ti/divider.c | 132 +- + drivers/clk/ti/dpll.c | 121 +- + drivers/clk/ti/fapll.c | 410 ++ + drivers/clk/ti/gate.c | 163 +- + drivers/clk/ti/interface.c | 98 +- + drivers/clk/ti/mux.c | 70 +- + drivers/clk/ux500/clk-prcc.c | 1 - + drivers/clk/ux500/clk-prcmu.c | 1 - + drivers/clk/zynq/clkc.c | 1 + + drivers/cpufreq/Kconfig.arm | 44 +- + drivers/cpufreq/Kconfig.powerpc | 2 +- + drivers/cpufreq/Makefile | 9 +- + drivers/cpufreq/exynos-cpufreq.c | 33 +- + drivers/cpufreq/s3c2416-cpufreq.c | 4 +- + drivers/cpufreq/s3c24xx-cpufreq.c | 10 +- + drivers/cpuidle/cpuidle-powernv.c | 84 +- + drivers/firmware/efi/libstub/efi-stub-helper.c | 16 +- + drivers/i2c/busses/Kconfig | 22 +- + drivers/i2c/busses/Makefile | 2 + + drivers/i2c/busses/i2c-bcm-iproc.c | 461 ++ + drivers/i2c/busses/i2c-cadence.c | 189 +- + drivers/i2c/busses/i2c-designware-baytrail.c | 160 + + drivers/i2c/busses/i2c-designware-core.c | 83 +- + drivers/i2c/busses/i2c-designware-core.h | 12 + + drivers/i2c/busses/i2c-designware-pcidrv.c | 41 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 20 +- + drivers/i2c/busses/i2c-imx.c | 33 +- + drivers/i2c/busses/i2c-ocores.c | 91 +- + drivers/i2c/busses/i2c-pmcmsp.c | 7 - + drivers/i2c/busses/i2c-rk3x.c | 99 +- + drivers/i2c/busses/i2c-tegra.c | 2 + + drivers/i2c/i2c-core.c | 162 +- + drivers/i2c/muxes/i2c-mux-pca954x.c | 11 +- + drivers/infiniband/core/ucma.c | 3 + + drivers/infiniband/core/umem_odp.c | 3 +- + drivers/infiniband/core/uverbs.h | 1 + + drivers/infiniband/core/uverbs_cmd.c | 158 +- + drivers/infiniband/core/uverbs_main.c | 1 + + drivers/infiniband/hw/cxgb4/ev.c | 9 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 29 +- + drivers/infiniband/hw/ipath/ipath_kernel.h | 3 - + drivers/infiniband/hw/ipath/ipath_wc_ppc64.c | 13 - + drivers/infiniband/hw/ipath/ipath_wc_x86_64.c | 15 - + drivers/infiniband/hw/mlx4/cm.c | 2 +- + drivers/infiniband/hw/mlx4/cq.c | 7 +- + drivers/infiniband/hw/mlx4/main.c | 11 +- + drivers/infiniband/hw/mlx4/qp.c | 6 +- + drivers/infiniband/hw/mlx5/main.c | 4 +- + drivers/infiniband/hw/mlx5/mr.c | 1 + + drivers/infiniband/hw/ocrdma/ocrdma.h | 38 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 38 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.h | 6 + + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 312 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.h | 2 + + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 12 +- + drivers/infiniband/hw/ocrdma/ocrdma_sli.h | 68 +- + drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 241 + + drivers/infiniband/hw/ocrdma/ocrdma_stats.h | 6 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 183 +- + drivers/infiniband/hw/qib/qib.h | 16 +- + drivers/infiniband/hw/qib/qib_common.h | 4 +- + drivers/infiniband/hw/qib/qib_debugfs.c | 1 - + drivers/infiniband/hw/qib/qib_diag.c | 9 +- + drivers/infiniband/hw/qib/qib_driver.c | 5 +- + drivers/infiniband/hw/qib/qib_eeprom.c | 198 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 26 +- + drivers/infiniband/hw/qib/qib_fs.c | 9 +- + drivers/infiniband/hw/qib/qib_iba6120.c | 15 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 14 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 52 +- + drivers/infiniband/hw/qib/qib_init.c | 12 +- + drivers/infiniband/hw/qib/qib_intr.c | 1 - + drivers/infiniband/hw/qib/qib_keys.c | 4 +- + drivers/infiniband/hw/qib/qib_mad.c | 20 +- + drivers/infiniband/hw/qib/qib_mmap.c | 2 +- + drivers/infiniband/hw/qib/qib_mr.c | 10 +- + drivers/infiniband/hw/qib/qib_pcie.c | 10 +- + drivers/infiniband/hw/qib/qib_qp.c | 8 +- + drivers/infiniband/hw/qib/qib_qsfp.c | 13 +- + drivers/infiniband/hw/qib/qib_rc.c | 4 +- + drivers/infiniband/hw/qib/qib_ruc.c | 8 +- + drivers/infiniband/hw/qib/qib_sd7220.c | 9 +- + drivers/infiniband/hw/qib/qib_sysfs.c | 28 +- + drivers/infiniband/hw/qib/qib_twsi.c | 5 +- + drivers/infiniband/hw/qib/qib_tx.c | 1 + + drivers/infiniband/hw/qib/qib_ud.c | 2 +- + drivers/infiniband/hw/qib/qib_user_sdma.c | 8 +- + drivers/infiniband/hw/qib/qib_verbs.c | 15 +- + drivers/infiniband/hw/qib/qib_verbs_mcast.c | 4 +- + drivers/infiniband/hw/qib/qib_wc_x86_64.c | 7 +- + drivers/infiniband/ulp/iser/iscsi_iser.h | 4 +- + drivers/infiniband/ulp/iser/iser_initiator.c | 16 +- + drivers/infiniband/ulp/iser/iser_memory.c | 9 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 27 +- + drivers/infiniband/ulp/isert/ib_isert.c | 46 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 4 +- + drivers/input/joystick/adi.c | 3 +- + drivers/input/keyboard/pxa27x_keypad.c | 4 +- + drivers/input/misc/bfin_rotary.c | 208 +- + drivers/input/misc/soc_button_array.c | 2 +- + drivers/input/mouse/alps.c | 516 ++- + drivers/input/mouse/alps.h | 65 +- + drivers/input/mouse/cypress_ps2.c | 5 - + drivers/input/mouse/cypress_ps2.h | 5 - + drivers/input/mouse/focaltech.c | 10 - + drivers/input/mouse/focaltech.h | 1 - + drivers/input/mouse/psmouse-base.c | 6 +- + drivers/input/mouse/synaptics.c | 10 - + drivers/input/mouse/synaptics.h | 1 - + drivers/md/dm-crypt.c | 392 +- + drivers/md/dm-io.c | 6 + + drivers/md/dm-raid1.c | 9 + + drivers/md/dm-snap.c | 4 +- + drivers/md/dm.c | 27 +- + drivers/md/persistent-data/dm-space-map-disk.c | 4 +- + drivers/mmc/host/sunxi-mmc.c | 63 +- + drivers/platform/x86/Kconfig | 25 + + drivers/pnp/resource.c | 6 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 +- + drivers/target/iscsi/iscsi_target.c | 105 +- + drivers/target/iscsi/iscsi_target_auth.c | 2 +- + drivers/target/iscsi/iscsi_target_configfs.c | 17 +- + drivers/target/iscsi/iscsi_target_datain_values.c | 2 +- + drivers/target/iscsi/iscsi_target_device.c | 2 +- + drivers/target/iscsi/iscsi_target_erl0.c | 6 +- + drivers/target/iscsi/iscsi_target_erl1.c | 2 +- + drivers/target/iscsi/iscsi_target_erl2.c | 2 +- + drivers/target/iscsi/iscsi_target_login.c | 4 +- + drivers/target/iscsi/iscsi_target_nego.c | 2 +- + drivers/target/iscsi/iscsi_target_nodeattrib.c | 2 +- + drivers/target/iscsi/iscsi_target_parameters.c | 2 +- + drivers/target/iscsi/iscsi_target_seq_pdu_list.c | 2 +- + drivers/target/iscsi/iscsi_target_stat.c | 4 +- + drivers/target/iscsi/iscsi_target_tmr.c | 2 +- + drivers/target/iscsi/iscsi_target_tpg.c | 2 +- + drivers/target/iscsi/iscsi_target_tq.c | 30 +- + drivers/target/iscsi/iscsi_target_util.c | 12 +- + drivers/target/iscsi/iscsi_target_util.h | 1 - + drivers/target/target_core_file.c | 5 + + drivers/target/target_core_iblock.c | 5 + + drivers/target/target_core_pr.c | 25 +- + drivers/target/target_core_sbc.c | 140 +- + drivers/target/target_core_spc.c | 2 +- + drivers/thermal/of-thermal.c | 3 + + drivers/thermal/rockchip_thermal.c | 36 +- + drivers/thermal/samsung/Kconfig | 9 - + drivers/thermal/samsung/Makefile | 2 - + drivers/thermal/samsung/exynos_thermal_common.c | 427 -- + drivers/thermal/samsung/exynos_thermal_common.h | 106 - + drivers/thermal/samsung/exynos_tmu.c | 553 ++- + drivers/thermal/samsung/exynos_tmu.h | 77 +- + drivers/thermal/samsung/exynos_tmu_data.c | 264 -- + drivers/vfio/pci/vfio_pci.c | 21 +- + drivers/vfio/pci/vfio_pci_intrs.c | 60 +- + drivers/vfio/pci/vfio_pci_private.h | 1 + + drivers/vfio/vfio.c | 119 +- + drivers/vfio/vfio_iommu_type1.c | 80 +- + drivers/vhost/scsi.c | 1068 ++--- + fs/binfmt_elf.c | 5 +- + fs/btrfs/backref.c | 28 +- + fs/btrfs/backref.h | 3 - + fs/btrfs/btrfs_inode.h | 3 + + fs/btrfs/ctree.c | 55 +- + fs/btrfs/ctree.h | 39 +- + fs/btrfs/delayed-inode.c | 38 +- + fs/btrfs/dev-replace.c | 25 +- + fs/btrfs/disk-io.c | 102 +- + fs/btrfs/disk-io.h | 6 +- + fs/btrfs/extent-tree.c | 250 +- + fs/btrfs/extent_io.c | 87 +- + fs/btrfs/extent_io.h | 65 +- + fs/btrfs/free-space-cache.c | 13 +- + fs/btrfs/inode-item.c | 9 +- + fs/btrfs/inode.c | 156 +- + fs/btrfs/qgroup.c | 3 +- + fs/btrfs/raid56.c | 103 +- + fs/btrfs/raid56.h | 11 +- + fs/btrfs/reada.c | 19 +- + fs/btrfs/relocation.c | 12 +- + fs/btrfs/scrub.c | 309 +- + fs/btrfs/send.c | 9 +- + fs/btrfs/super.c | 6 - + fs/btrfs/sysfs.c | 10 +- + fs/btrfs/tests/extent-buffer-tests.c | 2 +- + fs/btrfs/tests/extent-io-tests.c | 3 +- + fs/btrfs/tests/inode-tests.c | 4 +- + fs/btrfs/tests/qgroup-tests.c | 23 +- + fs/btrfs/transaction.c | 27 +- + fs/btrfs/transaction.h | 7 + + fs/btrfs/tree-log.c | 234 +- + fs/btrfs/volumes.c | 242 +- + fs/btrfs/volumes.h | 18 +- + fs/ceph/acl.c | 14 - + fs/ceph/addr.c | 19 +- + fs/ceph/caps.c | 127 +- + fs/ceph/dir.c | 33 +- + fs/ceph/file.c | 37 +- + fs/ceph/inode.c | 41 +- + fs/ceph/mds_client.c | 127 +- + fs/ceph/mds_client.h | 2 + + fs/ceph/snap.c | 54 +- + fs/ceph/super.c | 4 + + fs/ceph/super.h | 5 +- + fs/nfs/callback_proc.c | 2 + + fs/nfs/callback_xdr.c | 8 +- + fs/nfs/delegation.c | 4 - + fs/nfs/direct.c | 2 +- + fs/nfs/filelayout/filelayout.c | 53 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 43 +- + fs/nfs/inode.c | 1 - + fs/nfs/internal.h | 13 + + fs/nfs/nfs4proc.c | 75 +- + fs/nfs/nfs4session.c | 2 +- + fs/nfs/nfs4session.h | 6 + + fs/nfs/nfs4xdr.c | 32 +- + fs/nfs/pnfs.h | 4 + + fs/nfs/pnfs_nfs.c | 30 + + fs/nfs/write.c | 16 +- + fs/xfs/Makefile | 1 + + fs/xfs/xfs_export.c | 6 + + fs/xfs/xfs_file.c | 14 +- + fs/xfs/xfs_fsops.c | 6 + + fs/xfs/xfs_ioctl.c | 9 +- + fs/xfs/xfs_iops.c | 13 +- + fs/xfs/xfs_iops.h | 1 + + fs/xfs/xfs_mount.h | 11 + + fs/xfs/xfs_pnfs.c | 322 ++ + fs/xfs/xfs_pnfs.h | 18 + + include/dt-bindings/clock/alphascale,asm9260.h | 97 + + include/dt-bindings/clock/exynos4.h | 7 +- + include/dt-bindings/clock/exynos7-clk.h | 88 +- + include/dt-bindings/clock/qcom,gcc-ipq806x.h | 1 - + include/dt-bindings/clock/qcom,lcc-ipq806x.h | 30 + + include/dt-bindings/clock/qcom,lcc-msm8960.h | 50 + + include/dt-bindings/clock/tegra124-car-common.h | 345 ++ + include/dt-bindings/clock/tegra124-car.h | 345 +- + .../thermal/thermal_exynos.h} | 20 +- + include/linux/ceph/ceph_fs.h | 37 +- + include/linux/ceph/libceph.h | 3 +- + include/linux/ceph/messenger.h | 4 +- + include/linux/ceph/mon_client.h | 9 +- + include/linux/clk-private.h | 220 - + include/linux/clk-provider.h | 58 +- + include/linux/clk.h | 45 + + include/linux/clk/tegra.h | 2 - + include/linux/clk/ti.h | 25 + + include/linux/compiler.h | 6 +- + include/linux/i2c.h | 4 - + include/linux/kdb.h | 8 +- + include/linux/nfs_fs.h | 1 - + include/linux/nfs_xdr.h | 19 +- + include/linux/nvme.h | 9 +- + .../linux/platform_data}/bfin_rotary.h | 1 + + include/linux/sched.h | 10 +- + include/linux/sunrpc/metrics.h | 7 +- + include/linux/vfio.h | 2 + + .../target/iscsi/iscsi_target_core.h | 14 + + .../target/iscsi/iscsi_target_stat.h | 0 + include/target/iscsi/iscsi_transport.h | 2 +- + include/target/target_core_base.h | 2 +- + include/uapi/linux/btrfs.h | 3 +- + include/uapi/linux/nvme.h | 26 +- + include/uapi/linux/vfio.h | 1 + + include/uapi/rdma/ib_user_verbs.h | 23 + + kernel/debug/debug_core.c | 19 +- + kernel/debug/kdb/kdb_io.c | 46 +- + kernel/debug/kdb/kdb_main.c | 16 +- + kernel/debug/kdb/kdb_private.h | 4 +- + kernel/locking/rtmutex.c | 3 +- + kernel/printk/printk.c | 2 +- + kernel/rcu/tree_plugin.h | 1 + + kernel/sched/auto_group.c | 6 +- + kernel/sched/completion.c | 19 +- + kernel/sched/core.c | 113 +- + kernel/sched/deadline.c | 33 +- + kernel/sched/sched.h | 76 + + kernel/time/ntp.c | 10 +- + net/ceph/ceph_common.c | 16 +- + net/ceph/ceph_strings.c | 14 - + net/ceph/debugfs.c | 2 - + net/ceph/messenger.c | 14 +- + net/ceph/mon_client.c | 139 +- + net/ceph/osd_client.c | 31 +- + net/sunrpc/backchannel_rqst.c | 5 +- + sound/core/seq/seq_midi_emul.c | 3 + + sound/pci/hda/hda_tegra.c | 4 +- + sound/pci/hda/patch_realtek.c | 1 + + sound/pci/rme9652/hdspm.c | 6 + + sound/soc/intel/sst-haswell-pcm.c | 3 +- + sound/usb/clock.c | 5 + + sound/usb/line6/driver.c | 14 +- + sound/usb/line6/driver.h | 8 +- + sound/usb/quirks.c | 8 + + sound/usb/quirks.h | 2 + + 469 files changed, 22481 insertions(+), 11521 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,lcc.txt + create mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a73a4-cpg-clocks.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti,cdce706.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/fapll.txt + create mode 100644 Documentation/devicetree/bindings/i2c/brcm,iproc-i2c.txt + delete mode 100644 arch/arm/mach-omap2/cclock3xxx_data.c + create mode 100644 arch/x86/boot/compressed/efi_thunk_64.S + create mode 100644 arch/x86/include/asm/imr.h + create mode 100644 arch/x86/platform/intel-quark/Makefile + create mode 100644 arch/x86/platform/intel-quark/imr.c + create mode 100644 arch/x86/platform/intel-quark/imr_selftest.c + create mode 100644 drivers/clk/clk-asm9260.c + create mode 100644 drivers/clk/clk-cdce706.c + rename drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} (59%) + create mode 100644 drivers/clk/pxa/clk-pxa3xx.c + create mode 100644 drivers/clk/qcom/clk-regmap-divider.c + create mode 100644 drivers/clk/qcom/clk-regmap-divider.h + create mode 100644 drivers/clk/qcom/clk-regmap-mux.c + create mode 100644 drivers/clk/qcom/clk-regmap-mux.h + create mode 100644 drivers/clk/qcom/lcc-ipq806x.c + create mode 100644 drivers/clk/qcom/lcc-msm8960.c + create mode 100644 drivers/clk/shmobile/clk-r8a73a4.c + create mode 100644 drivers/clk/sunxi/clk-sun9i-mmc.c + create mode 100644 drivers/clk/ti/clk-3xxx-legacy.c + create mode 100644 drivers/clk/ti/clk-816x.c + create mode 100644 drivers/clk/ti/clock.h + create mode 100644 drivers/clk/ti/fapll.c + create mode 100644 drivers/i2c/busses/i2c-bcm-iproc.c + create mode 100644 drivers/i2c/busses/i2c-designware-baytrail.c + delete mode 100644 drivers/thermal/samsung/exynos_thermal_common.c + delete mode 100644 drivers/thermal/samsung/exynos_thermal_common.h + delete mode 100644 drivers/thermal/samsung/exynos_tmu_data.c + create mode 100644 fs/xfs/xfs_pnfs.c + create mode 100644 fs/xfs/xfs_pnfs.h + create mode 100644 include/dt-bindings/clock/alphascale,asm9260.h + create mode 100644 include/dt-bindings/clock/qcom,lcc-ipq806x.h + create mode 100644 include/dt-bindings/clock/qcom,lcc-msm8960.h + create mode 100644 include/dt-bindings/clock/tegra124-car-common.h + rename include/{linux/clk/sunxi.h => dt-bindings/thermal/thermal_exynos.h} (54%) + delete mode 100644 include/linux/clk-private.h + rename {arch/blackfin/include/asm => include/linux/platform_data}/bfin_rotary.h (99%) + rename {drivers => include}/target/iscsi/iscsi_target_core.h (98%) + rename {drivers => include}/target/iscsi/iscsi_target_stat.h (100%) +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 +Already up-to-date. +Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (8e6480667246 ARM: 8299/1: mm: ensure local active ASID is marked as allocated on rollover) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (4436820a98cd m68k/defconfig: Enable Ethernet bridging) +$ 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 (c59c961ca511 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +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 (ddede6d536d7 net: dsa: bcm_sf2: fix 64-bits register reads) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/Kconfig | 2 +- + drivers/net/appletalk/Kconfig | 2 +- + drivers/net/dsa/bcm_sf2.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c | 57 +++--- + drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h | 6 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 246 +++++++++++++++----------- + drivers/net/ethernet/smsc/smc91x.c | 2 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +- + drivers/net/phy/phy.c | 23 ++- + drivers/net/usb/plusb.c | 5 + + include/linux/netdevice.h | 1 + + include/net/caif/cfpkt.h | 2 +- + lib/rhashtable.c | 33 ++-- + lib/test_rhashtable.c | 8 +- + net/caif/cffrml.c | 2 +- + net/caif/cfpkt_skbuff.c | 6 +- + net/core/ethtool.c | 1 + + net/core/gen_stats.c | 15 +- + net/core/skbuff.c | 5 +- + net/ipv4/ip_fragment.c | 2 +- + net/netfilter/ipvs/ip_vs_ctl.c | 2 +- + net/netfilter/nft_compat.c | 12 +- + net/netfilter/xt_recent.c | 11 +- + net/netfilter/xt_socket.c | 21 ++- + net/openvswitch/datapath.c | 45 ++++- + net/openvswitch/vport.h | 2 + + net/sched/ematch.c | 1 + + 27 files changed, 331 insertions(+), 185 deletions(-) +Merging ipsec/master (ac37e2515c1a xfrm: release dst_orig in case of error in xfrm_lookup()) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/dst.h | 1 + + net/ipv4/xfrm4_output.c | 2 +- + net/ipv6/xfrm6_output.c | 2 +- + net/ipv6/xfrm6_policy.c | 1 + + net/xfrm/xfrm_policy.c | 12 ++++++------ + 5 files changed, 10 insertions(+), 8 deletions(-) +Merging sound-current/for-linus (3cd1ce0420ce ALSA: usb: Fix support for Denon DA-300USB DAC (ID 154e:1003)) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (feb28979c137 of/pci: Remove duplicate kfree in of_pci_get_host_bridge_resources()) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-drivers/master (aeb2d2a4c0ae rtlwifi: Remove logging statement that is no longer needed) +$ git merge wireless-drivers/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (26bc420b59a3 Linux 3.19-rc6) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (ec6f34e5b552 Linux 3.19-rc5) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (e36f014edff7 Linux 3.19-rc7) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (f5af19d10d15 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (a6f0331236fa USB: cp210x: add ID for RUGGEDCOM USB Serial Console) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (3d883483dc0a Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (e36f014edff7 Linux 3.19-rc7) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (4c971aa78314 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (96692a7305c4 crypto: tcrypt - do not allocate iv on stack for aead speed tests) +$ 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 devicetree-current/devicetree/merge (6b1271de3723 of/unittest: Overlays with sub-devices tests) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (f47689345931 lguest: update help text.) +$ git merge rr-fixes/fixes +Merge made by the 'recursive' strategy. + arch/x86/lguest/Kconfig | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging vfio-fixes/for-linus (7c2e211f3c95 vfio-pci: Fix the check on pci device type in vfio_pci_probe()) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (f5db310d77ef selftests/vm: fix link error for transhuge-stress test) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (bfa76d495765 Linux 3.19) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (06f34e1c28f3 ARC: fix page address calculation if PAGE_OFFSET != LINUX_LINK_BASE) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (df9ab9771c64 Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Already up-to-date. +Merging arm-perf/for-next/perf (97bf6af1f928 Linux 3.19-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (d88d6cfc912e ARM: mm: Remove Kconfig symbol CACHE_PL310) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm-cygnus.dtsi | 20 ++++++++++++++++++++ + arch/arm/boot/dts/bcm63138.dtsi | 5 +++-- + arch/arm/mach-at91/Kconfig | 1 - + arch/arm/mach-at91/generic.h | 8 ++++---- + arch/arm/mach-bcm/Kconfig | 4 ++-- + arch/arm/mach-davinci/Kconfig | 2 ++ + arch/arm/mach-davinci/mux.c | 4 ++-- + arch/arm/mach-ixp4xx/include/mach/io.h | 19 +++++++++++++------ + arch/arm/mach-mvebu/system-controller.c | 2 +- + arch/arm/mach-prima2/Kconfig | 1 - + arch/arm/mach-rockchip/Kconfig | 1 + + arch/arm/mach-rockchip/pm.h | 6 ++++++ + arch/arm/mach-sti/Kconfig | 1 + + arch/arm/mach-vexpress/Kconfig | 1 + + arch/arm/mm/Kconfig | 7 ------- + 15 files changed, 56 insertions(+), 26 deletions(-) +Merging bcm2835/for-next (b2776bf7149b Linux 3.18) +$ git merge bcm2835/for-next +Already up-to-date. +Merging berlin/berlin/for-next (8553bf8fd181 Merge branch 'berlin/dt' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M) +$ git merge cortex-m/for-next +Auto-merging arch/arm/boot/compressed/head.S +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 imx-mxs/for-next (395ae1400a35 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +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 mvebu/for-next (feeddcd9c17b Merge branch 'mvebu/dt' into mvebu/for-next) +$ git merge mvebu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (5cb1e109eee0 Merge tag 'omap-for-v3.20/dt-pt3-v2' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. +Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) +$ git merge omap-pending/for-next +Merge made by the 'recursive' strategy. +Merging renesas/next (b2cb094d275e Merge branch 'heads/soc-fixes-for-v3.19' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + drivers/sh/pm_runtime.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging samsung/for-next (aeb011501873 Merge branch 'v3.20-samsung-defconfig-2' into for-next) +$ git merge samsung/for-next +Auto-merging arch/arm/boot/dts/exynos4412-odroid-common.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 14 +++++++ + arch/arm/boot/dts/exynos5250-snow.dts | 56 +++++++++++++++++++++++-- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 31 +++++++++++++- + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 17 ++++++++ + arch/arm/configs/exynos_defconfig | 4 +- + 5 files changed, 116 insertions(+), 6 deletions(-) +Merging sunxi/sunxi/for-next (16e8c17e18d6 Merge branch 'sunxi/clocks-for-3.20' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. +Merging tegra/for-next (794345d409ad Merge branch for-3.20/arm64 into for-next) +$ git merge tegra/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (d476d94f180a arm64: compat: Remove incorrect comment in compat_siginfo) +$ 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 +Auto-merging arch/blackfin/mach-bf609/boards/ezkit.c +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 (9987c19ed9a7 CRIS: Whitespace cleanup) +$ git merge cris/for-next +Already up-to-date. +Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (a6b8978c54b7 pstore: Fix sprintf format specifier in pstore_dump()) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (4436820a98cd m68k/defconfig: Enable Ethernet bridging) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (21b30ca5da14 arch: m68k: 68360: config: Remove unused function) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (a01d37d914f9 microblaze: Remove *.dtb files in make clean) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (64b139f97c01 MIPS: OCTEON: irq: add CIB and other fixes) +$ git merge mips/mips-for-linux-next +Recorded preimage for 'arch/mips/include/asm/pgtable-bits.h' +Recorded preimage for 'arch/mips/mm/tlb-r4k.c' +Resolved 'arch/mips/kernel/elf.c' using previous resolution. +Resolved 'arch/mips/pci/pci-bcm1480.c' using previous resolution. +Resolved 'arch/mips/pci/pci-octeon.c' using previous resolution. +Resolved 'arch/mips/pci/pcie-octeon.c' using previous resolution. +Auto-merging kernel/sys.c +Auto-merging drivers/irqchip/irq-mips-gic.c +Auto-merging arch/mips/pci/pcie-octeon.c +CONFLICT (content): Merge conflict in arch/mips/pci/pcie-octeon.c +Auto-merging arch/mips/pci/pci-octeon.c +CONFLICT (content): Merge conflict in arch/mips/pci/pci-octeon.c +Auto-merging arch/mips/pci/pci-bcm1480.c +CONFLICT (content): Merge conflict in arch/mips/pci/pci-bcm1480.c +Auto-merging arch/mips/mm/tlb-r4k.c +CONFLICT (content): Merge conflict in arch/mips/mm/tlb-r4k.c +Auto-merging arch/mips/mm/fault.c +Auto-merging arch/mips/kernel/traps.c +Auto-merging arch/mips/kernel/process.c +Auto-merging arch/mips/kernel/elf.c +CONFLICT (content): Merge conflict in arch/mips/kernel/elf.c +Auto-merging arch/mips/kernel/asm-offsets.c +Auto-merging arch/mips/include/asm/thread_info.h +Removing arch/mips/include/asm/siginfo.h +Auto-merging arch/mips/include/asm/pgtable.h +Auto-merging arch/mips/include/asm/pgtable-bits.h +CONFLICT (content): Merge conflict in arch/mips/include/asm/pgtable-bits.h +Auto-merging arch/mips/include/asm/octeon/octeon.h +Auto-merging arch/mips/include/asm/mipsregs.h +Auto-merging arch/mips/include/asm/fpu.h +Auto-merging arch/mips/boot/elf2ecoff.c +Auto-merging arch/mips/alchemy/common/clock.c +Auto-merging arch/mips/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/mips/include/asm/pgtable-bits.h'. +Recorded resolution for 'arch/mips/mm/tlb-r4k.c'. +[master 1466b71ccf26] Merge remote-tracking branch 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/mips/cavium/cib.txt | 43 + + arch/mips/Kconfig | 73 +- + arch/mips/Kconfig.debug | 13 - + arch/mips/Makefile | 55 +- + arch/mips/alchemy/common/clock.c | 27 +- + arch/mips/alchemy/common/setup.c | 4 +- + arch/mips/bcm3384/irq.c | 2 +- + arch/mips/boot/Makefile | 49 +- + arch/mips/boot/elf2ecoff.c | 4 - + arch/mips/cavium-octeon/csrc-octeon.c | 11 +- + arch/mips/cavium-octeon/dma-octeon.c | 4 +- + .../cavium-octeon/executive/cvmx-helper-board.c | 2 +- + arch/mips/cavium-octeon/octeon-irq.c | 1094 ++++++--- + arch/mips/cavium-octeon/setup.c | 56 +- + arch/mips/configs/malta_qemu_32r6_defconfig | 193 ++ + arch/mips/fw/arc/misc.c | 26 +- + arch/mips/include/asm/Kbuild | 1 + + arch/mips/include/asm/asmmacro.h | 18 +- + arch/mips/include/asm/atomic.h | 42 +- + arch/mips/include/asm/bitops.h | 64 +- + arch/mips/include/asm/checksum.h | 45 +- + arch/mips/include/asm/cmpxchg.h | 34 +- + arch/mips/include/asm/compiler.h | 24 +- + arch/mips/include/asm/cpu-features.h | 28 +- + arch/mips/include/asm/cpu-info.h | 5 + + arch/mips/include/asm/cpu-type.h | 7 + + arch/mips/include/asm/cpu.h | 11 +- + arch/mips/include/asm/edac.h | 4 +- + arch/mips/include/asm/elf.h | 10 +- + arch/mips/include/asm/fpu.h | 3 +- + arch/mips/include/asm/futex.h | 24 +- + arch/mips/include/asm/gio_device.h | 2 - + arch/mips/include/asm/hazards.h | 9 +- + arch/mips/include/asm/irqflags.h | 7 +- + arch/mips/include/asm/local.h | 5 +- + .../asm/mach-cavium-octeon/kernel-entry-init.h | 64 +- + arch/mips/include/asm/mach-cavium-octeon/war.h | 3 + + .../include/asm/mach-pmcs-msp71xx/msp_regops.h | 24 +- + arch/mips/include/asm/mips-r2-to-r6-emul.h | 96 + + arch/mips/include/asm/mipsregs.h | 4 + + arch/mips/include/asm/mmu.h | 3 + + arch/mips/include/asm/mmu_context.h | 9 +- + arch/mips/include/asm/module.h | 4 + + arch/mips/include/asm/octeon/cvmx-cmd-queue.h | 2 +- + arch/mips/include/asm/octeon/cvmx-rst-defs.h | 306 +++ + arch/mips/include/asm/octeon/octeon-model.h | 107 +- + arch/mips/include/asm/octeon/octeon.h | 148 +- + arch/mips/include/asm/pci.h | 2 + + arch/mips/include/asm/pgtable-bits.h | 83 +- + arch/mips/include/asm/pgtable.h | 46 +- + arch/mips/include/asm/processor.h | 19 +- + arch/mips/include/asm/prom.h | 7 - + arch/mips/include/asm/ptrace.h | 4 +- + arch/mips/include/asm/r4kcache.h | 150 +- + arch/mips/include/asm/sgialib.h | 8 +- + arch/mips/include/asm/siginfo.h | 29 - + arch/mips/include/asm/spinlock.h | 55 +- + arch/mips/include/asm/spram.h | 4 +- + arch/mips/include/asm/stackframe.h | 8 +- + arch/mips/include/asm/switch_to.h | 9 +- + arch/mips/include/asm/thread_info.h | 2 +- + arch/mips/include/uapi/asm/inst.h | 24 +- + arch/mips/include/uapi/asm/siginfo.h | 11 +- + arch/mips/kernel/Makefile | 3 +- + arch/mips/kernel/asm-offsets.c | 2 + + arch/mips/kernel/branch.c | 288 ++- + arch/mips/kernel/cevt-r4k.c | 8 +- + arch/mips/kernel/cps-vec.S | 16 +- + arch/mips/kernel/cpu-bugs64.c | 11 +- + arch/mips/kernel/cpu-probe.c | 33 +- + arch/mips/kernel/elf.c | 301 ++- + arch/mips/kernel/entry.S | 23 +- + arch/mips/kernel/genex.S | 2 +- + arch/mips/kernel/idle.c | 1 + + arch/mips/kernel/mips-r2-to-r6-emul.c | 2378 ++++++++++++++++++++ + arch/mips/kernel/mips_ksyms.c | 12 + + arch/mips/kernel/octeon_switch.S | 218 +- + arch/mips/kernel/proc.c | 8 +- + arch/mips/kernel/process.c | 96 + + arch/mips/kernel/r4k_fpu.S | 12 +- + arch/mips/kernel/r4k_switch.S | 14 +- + arch/mips/kernel/spram.c | 1 + + arch/mips/kernel/syscall.c | 2 +- + arch/mips/kernel/traps.c | 60 +- + arch/mips/kernel/unaligned.c | 390 +++- + arch/mips/lib/Makefile | 1 + + arch/mips/lib/memcpy.S | 23 + + arch/mips/lib/memset.S | 47 + + arch/mips/lib/mips-atomic.c | 2 +- + arch/mips/math-emu/cp1emu.c | 169 +- + arch/mips/mm/c-r4k.c | 6 +- + arch/mips/mm/fault.c | 29 +- + arch/mips/mm/page.c | 30 +- + arch/mips/mm/sc-mips.c | 4 +- + arch/mips/mm/tlb-r4k.c | 7 +- + arch/mips/mm/tlbex.c | 7 +- + arch/mips/mm/uasm-mips.c | 32 + + arch/mips/mm/uasm.c | 15 +- + arch/mips/pci/pci-bcm1480.c | 4 +- + arch/mips/pci/pci-octeon.c | 4 +- + arch/mips/pci/pcie-octeon.c | 12 +- + arch/mips/sgi-ip22/ip22-gio.c | 24 - + arch/mips/sgi-ip27/ip27-reset.c | 7 +- + arch/mips/sgi-ip32/ip32-reset.c | 7 +- + drivers/irqchip/irq-mips-gic.c | 8 - + include/linux/irqchip/mips-gic.h | 1 - + include/uapi/linux/prctl.h | 5 + + kernel/sys.c | 12 + + 108 files changed, 6451 insertions(+), 1114 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/cavium/cib.txt + create mode 100644 arch/mips/configs/malta_qemu_32r6_defconfig + create mode 100644 arch/mips/include/asm/mips-r2-to-r6-emul.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-rst-defs.h + delete mode 100644 arch/mips/include/asm/siginfo.h + create mode 100644 arch/mips/kernel/mips-r2-to-r6-emul.c +Merging nios2/nios2-next (d16d2be111a6 nios2: add kgdb support) +$ git merge nios2/nios2-next +Already up-to-date. +Merging parisc-hd/for-next (bfa76d495765 Linux 3.19) +$ 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 (a6130ed253a9 cxl: Add missing return statement after handling AFU errror) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (0dc294f717d4 powerpc/mm: bail out early when flushing TLB page) +$ 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 (42d19952a90d s390/traps: panic() instead of die() on translation exception) +$ git merge s390/features +Recorded preimage for 'arch/s390/kernel/early.c' +Auto-merging arch/s390/pci/pci.c +Removing arch/s390/math-emu/math.c +Removing arch/s390/math-emu/Makefile +Removing arch/s390/lib/ucmpdi2.c +Removing arch/s390/lib/qrnnd.S +Removing arch/s390/lib/mem32.S +Removing arch/s390/lib/div64.c +Auto-merging arch/s390/kernel/signal.c +Removing arch/s390/kernel/relocate_kernel64.S +Removing arch/s390/kernel/reipl64.S +Auto-merging arch/s390/kernel/module.c +Removing arch/s390/kernel/head31.S +Removing arch/s390/kernel/entry64.S +Auto-merging arch/s390/kernel/early.c +CONFLICT (content): Merge conflict in arch/s390/kernel/early.c +Auto-merging arch/s390/include/asm/thread_info.h +Removing arch/s390/boot/compressed/head31.S +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/s390/kernel/early.c'. +[master 16196c40298d] Merge remote-tracking branch 's390/features' +$ git diff -M --stat --summary HEAD^.. + arch/s390/Kbuild | 1 - + arch/s390/Kconfig | 69 +- + arch/s390/Makefile | 14 +- + arch/s390/boot/compressed/Makefile | 12 +- + arch/s390/boot/compressed/{head64.S => head.S} | 0 + arch/s390/boot/compressed/head31.S | 51 - + arch/s390/boot/compressed/vmlinux.lds.S | 5 - + arch/s390/crypto/crypt_s390.h | 8 +- + arch/s390/hypfs/hypfs_diag0c.c | 4 - + arch/s390/include/asm/appldata.h | 24 - + arch/s390/include/asm/atomic.h | 95 - + arch/s390/include/asm/bitops.h | 28 - + arch/s390/include/asm/cmpxchg.h | 7 +- + arch/s390/include/asm/cputime.h | 26 - + arch/s390/include/asm/ctl_reg.h | 14 +- + arch/s390/include/asm/elf.h | 4 - + arch/s390/include/asm/idals.h | 16 - + arch/s390/include/asm/jump_label.h | 12 +- + arch/s390/include/asm/lowcore.h | 159 -- + arch/s390/include/asm/mman.h | 2 +- + arch/s390/include/asm/mmu_context.h | 4 - + arch/s390/include/asm/percpu.h | 4 - + arch/s390/include/asm/perf_event.h | 3 - + arch/s390/include/asm/pgalloc.h | 24 - + arch/s390/include/asm/pgtable.h | 123 +- + arch/s390/include/asm/processor.h | 66 +- + arch/s390/include/asm/ptrace.h | 4 - + arch/s390/include/asm/qdio.h | 10 - + arch/s390/include/asm/runtime_instr.h | 10 +- + arch/s390/include/asm/rwsem.h | 81 - + arch/s390/include/asm/setup.h | 35 - + arch/s390/include/asm/sfp-util.h | 10 - + arch/s390/include/asm/sparsemem.h | 9 - + arch/s390/include/asm/switch_to.h | 21 +- + arch/s390/include/asm/thread_info.h | 9 - + arch/s390/include/asm/tlb.h | 4 - + arch/s390/include/asm/tlbflush.h | 7 - + arch/s390/include/asm/types.h | 17 - + arch/s390/include/asm/unistd.h | 8 - + arch/s390/include/asm/vdso.h | 2 - + arch/s390/kernel/Makefile | 22 +- + arch/s390/kernel/asm-offsets.c | 4 - + arch/s390/kernel/base.S | 76 - + arch/s390/kernel/cpcmd.c | 10 - + arch/s390/kernel/diag.c | 15 - + arch/s390/kernel/dis.c | 48 +- + arch/s390/kernel/dumpstack.c | 26 +- + arch/s390/kernel/early.c | 69 - + arch/s390/kernel/entry.S | 1005 ++++++----- + arch/s390/kernel/entry64.S | 1059 ----------- + arch/s390/kernel/head.S | 49 - + arch/s390/kernel/head31.S | 106 -- + arch/s390/kernel/head_kdump.S | 8 - + arch/s390/kernel/ipl.c | 2 - + arch/s390/kernel/module.c | 12 - + arch/s390/kernel/nmi.c | 92 +- + arch/s390/kernel/pgm_check.S | 22 +- + arch/s390/kernel/process.c | 29 +- + arch/s390/kernel/ptrace.c | 46 +- + arch/s390/kernel/reipl.S | 133 +- + arch/s390/kernel/reipl64.S | 155 -- + arch/s390/kernel/relocate_kernel.S | 63 +- + arch/s390/kernel/relocate_kernel64.S | 121 -- + arch/s390/kernel/sclp.S | 10 - + arch/s390/kernel/setup.c | 72 - + arch/s390/kernel/signal.c | 10 - + arch/s390/kernel/smp.c | 33 - + arch/s390/kernel/sys_s390.c | 49 - + arch/s390/kernel/syscalls.S | 716 ++++---- + arch/s390/kernel/traps.c | 155 +- + arch/s390/kernel/vdso.c | 16 +- + arch/s390/kernel/vmlinux.lds.S | 7 - + arch/s390/lib/Makefile | 3 +- + arch/s390/lib/div64.c | 147 -- + arch/s390/lib/mem32.S | 92 - + arch/s390/lib/qrnnd.S | 78 - + arch/s390/lib/uaccess.c | 136 +- + arch/s390/lib/ucmpdi2.c | 26 - + arch/s390/math-emu/Makefile | 7 - + arch/s390/math-emu/math.c | 2255 ------------------------ + arch/s390/mm/dump_pagetables.c | 24 +- + arch/s390/mm/extmem.c | 14 - + arch/s390/mm/fault.c | 36 - + arch/s390/mm/gup.c | 4 - + arch/s390/mm/init.c | 5 - + arch/s390/mm/mem_detect.c | 4 - + arch/s390/mm/mmap.c | 25 - + arch/s390/mm/pageattr.c | 2 +- + arch/s390/mm/pgtable.c | 8 - + arch/s390/mm/vmem.c | 10 +- + arch/s390/oprofile/Makefile | 2 +- + arch/s390/oprofile/init.c | 11 - + arch/s390/pci/pci.c | 3 +- + drivers/s390/block/dasd.c | 2 - + drivers/s390/block/dasd_diag.h | 42 - + drivers/s390/block/dasd_eckd.c | 6 - + drivers/s390/block/dasd_fba.c | 2 - + drivers/s390/char/Kconfig | 2 +- + drivers/s390/char/sclp_sdias.c | 4 - + drivers/s390/char/zcore.c | 32 - + drivers/s390/cio/cio.c | 2 - + drivers/s390/cio/qdio.h | 7 - + drivers/s390/cio/qdio_setup.c | 3 - + drivers/s390/crypto/ap_bus.c | 24 +- + drivers/s390/net/ctcm_mpc.c | 12 - + 105 files changed, 1213 insertions(+), 7059 deletions(-) + rename arch/s390/boot/compressed/{head64.S => head.S} (100%) + delete mode 100644 arch/s390/boot/compressed/head31.S + delete mode 100644 arch/s390/kernel/entry64.S + delete mode 100644 arch/s390/kernel/head31.S + delete mode 100644 arch/s390/kernel/reipl64.S + delete mode 100644 arch/s390/kernel/relocate_kernel64.S + delete mode 100644 arch/s390/lib/div64.c + delete mode 100644 arch/s390/lib/mem32.S + delete mode 100644 arch/s390/lib/qrnnd.S + delete mode 100644 arch/s390/lib/ucmpdi2.c + delete mode 100644 arch/s390/math-emu/Makefile + delete mode 100644 arch/s390/math-emu/math.c +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (740e1433f50e tile: change MAINTAINERS website from tilera.com to ezchip.com) +$ git merge tile/master +Already up-to-date. +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (1f2fdbd0078c xtensa: disable link optimization) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (a742994aa2e2 Btrfs: don't remove extents and xattrs when logging new names) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (388cfdc9bc19 libceph: require cephx message signature by default) +$ git merge ceph/master +Recorded preimage for 'fs/ceph/inode.c' +Recorded preimage for 'include/linux/ceph/libceph.h' +Recorded preimage for 'net/ceph/ceph_common.c' +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/ceph_common.c +CONFLICT (content): Merge conflict in net/ceph/ceph_common.c +Auto-merging net/ceph/auth_x.c +CONFLICT (content): Merge conflict in net/ceph/auth_x.c +Auto-merging include/linux/ceph/libceph.h +CONFLICT (content): Merge conflict in include/linux/ceph/libceph.h +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 +Auto-merging fs/ceph/inode.c +CONFLICT (content): Merge conflict in fs/ceph/inode.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/ceph/inode.c'. +Recorded resolution for 'include/linux/ceph/libceph.h'. +Recorded resolution for 'net/ceph/ceph_common.c'. +[master d02256f18f89] Merge remote-tracking branch 'ceph/master' +$ git diff -M --stat --summary HEAD^.. +Merging cifs/for-next (0a545e3a7494 [SMB3] Update negotiate protocol for SMB3.1 dialect) +$ git merge cifs/for-next +Auto-merging fs/cifs/connect.c +Merge made by the 'recursive' strategy. + fs/cifs/Kconfig | 9 ++++++++ + fs/cifs/cifsglob.h | 7 ++++++ + fs/cifs/connect.c | 10 +++++++++ + fs/cifs/smb2ops.c | 25 ++++++++++++++++++++- + fs/cifs/smb2pdu.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++--- + fs/cifs/smb2pdu.h | 50 +++++++++++++++++++++++++++++++++++------- + 6 files changed, 153 insertions(+), 12 deletions(-) +Merging ecryptfs/next (e7a823be2adc Merge tag 'linux-kselftest-3.19-rc-5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next (6981498d7956 udf: remove bool assignment to 0/1) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (6f30b7e37a82 ext4: fix indirect punch hole corruption) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/indirect.c +Auto-merging fs/ext4/ext4.h +Merge made by the 'recursive' strategy. + fs/ext4/ext4.h | 18 +++++++-- + fs/ext4/indirect.c | 105 ++++++++++++++++++++++++++++++++++++----------------- + fs/ext4/inode.c | 7 ++++ + fs/ext4/super.c | 31 +++++++--------- + fs/jbd2/recovery.c | 3 ++ + 5 files changed, 108 insertions(+), 56 deletions(-) +Merging f2fs/dev (db3ecdee1cf0 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) +$ git merge f2fs/dev +Already up-to-date. +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 bf9bba9dd199] Merge remote-tracking branch 'fscache/fscache' +$ git diff -M --stat --summary HEAD^.. +Merging fuse/for-next (9759bd518994 fuse: add memory barrier to INIT) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master (278702074ff7 GFS2: Fix crash during ACL deletion in acl max entry check in gfs2_set_acl()) +$ git merge gfs2/master +Already up-to-date. +Merging jfs/jfs-next (648695c74811 jfs: Deletion of an unnecessary check before the function call "unload_nls") +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (71a097c6de9a NFSv4.1: Clean up bind_conn_to_session) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (a1d1e9be5a1d svcrpc: fix memory leak in gssp_accept_sec_context_upcall) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + net/sunrpc/auth_gss/gss_rpc_upcall.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging overlayfs/overlayfs-next (4330397e4e8a ovl: discard independent cursor in readdir()) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/overlayfs/readdir.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.txt | 28 ++ + 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 | 181 +++++----- + fs/overlayfs/super.c | 564 +++++++++++++++++++++----------- + 7 files changed, 517 insertions(+), 319 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 (8168b9bba6a8 UBI: block: Fix checking for NULL instead of IS_ERR()) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (781355c6e5ae xfs: recall pNFS layouts on conflicting access) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (b2b89ebfc0f0 Merge tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linux) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (a3959d2909f8 trylock_super(): replacement for grab_super_passive()) +$ git merge vfs/for-next +Recorded preimage for 'drivers/infiniband/hw/qib/qib_fs.c' +Recorded preimage for 'fs/nfs/filelayout/filelayout.c' +Recorded preimage for 'fs/nfs/flexfilelayout/flexfilelayout.c' +Recorded preimage for 'fs/nfs/write.c' +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/xfs/xfs_ioctl.c +Auto-merging fs/xfs/xfs_export.c +Auto-merging fs/nfs/write.c +CONFLICT (content): Merge conflict in fs/nfs/write.c +Auto-merging fs/nfs/pnfs.h +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/flexfilelayout/flexfilelayout.c +CONFLICT (content): Merge conflict in fs/nfs/flexfilelayout/flexfilelayout.c +Auto-merging fs/nfs/filelayout/filelayout.c +CONFLICT (content): Merge conflict in fs/nfs/filelayout/filelayout.c +Auto-merging fs/nfs/direct.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/cifs/smb2ops.c +Auto-merging fs/cifs/file.c +Auto-merging fs/ceph/super.c +Auto-merging fs/ceph/mds_client.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/ceph/file.c +Auto-merging fs/ceph/dir.c +Auto-merging fs/ceph/caps.c +Auto-merging fs/btrfs/tree-log.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/inode.c +Auto-merging drivers/infiniband/hw/qib/qib_fs.c +CONFLICT (content): Merge conflict in drivers/infiniband/hw/qib/qib_fs.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/infiniband/hw/qib/qib_fs.c'. +Recorded resolution for 'fs/nfs/filelayout/filelayout.c'. +Recorded resolution for 'fs/nfs/flexfilelayout/flexfilelayout.c'. +Recorded resolution for 'fs/nfs/write.c'. +[master 75f39f87b56b] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/ia64/kernel/perfmon.c | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 22 +-- + arch/s390/hypfs/inode.c | 71 +++++---- + drivers/base/devtmpfs.c | 32 ++-- + drivers/infiniband/hw/ipath/ipath_fs.c | 16 +- + drivers/infiniband/hw/qib/qib_fs.c | 20 +-- + drivers/oprofile/oprofilefs.c | 16 +- + drivers/staging/lustre/lustre/llite/dcache.c | 26 ++-- + drivers/staging/lustre/lustre/llite/file.c | 24 +-- + .../staging/lustre/lustre/llite/llite_internal.h | 6 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 6 +- + drivers/staging/lustre/lustre/llite/llite_nfs.c | 6 +- + drivers/staging/lustre/lustre/llite/namei.c | 30 ++-- + drivers/staging/lustre/lustre/llite/statahead.c | 28 ++-- + drivers/staging/lustre/lustre/llite/symlink.c | 2 +- + drivers/staging/lustre/lustre/llite/xattr.c | 8 +- + drivers/usb/gadget/legacy/inode.c | 2 +- + fs/9p/acl.c | 4 +- + fs/9p/vfs_dentry.c | 4 +- + fs/9p/vfs_inode.c | 36 ++--- + fs/9p/vfs_inode_dotl.c | 16 +- + fs/9p/vfs_super.c | 8 +- + fs/adfs/inode.c | 2 +- + fs/affs/amigaffs.c | 8 +- + fs/affs/inode.c | 2 +- + fs/affs/namei.c | 10 +- + fs/afs/dir.c | 42 +++--- + fs/afs/inode.c | 4 +- + fs/afs/mntpt.c | 8 +- + fs/afs/super.c | 2 +- + fs/aio.c | 6 +- + fs/autofs4/autofs_i.h | 4 +- + fs/autofs4/expire.c | 2 +- + fs/autofs4/inode.c | 6 +- + fs/autofs4/root.c | 20 +-- + fs/autofs4/symlink.c | 2 +- + fs/autofs4/waitq.c | 4 +- + fs/bad_inode.c | 147 ------------------ + fs/befs/linuxvfs.c | 4 +- + fs/bfs/dir.c | 8 +- + fs/binfmt_misc.c | 16 +- + fs/block_dev.c | 2 +- + fs/btrfs/export.c | 6 +- + fs/btrfs/file.c | 2 +- + fs/btrfs/inode.c | 30 ++-- + fs/btrfs/ioctl.c | 26 ++-- + fs/btrfs/super.c | 8 +- + fs/btrfs/tree-log.c | 14 +- + fs/btrfs/xattr.c | 16 +- + fs/cachefiles/daemon.c | 4 +- + fs/cachefiles/interface.c | 4 +- + fs/cachefiles/namei.c | 16 +- + fs/cachefiles/rdwr.c | 2 +- + fs/ceph/caps.c | 2 +- + fs/ceph/debugfs.c | 2 +- + fs/ceph/dir.c | 62 ++++---- + fs/ceph/export.c | 28 ++-- + fs/ceph/file.c | 4 +- + fs/ceph/inode.c | 50 +++--- + fs/ceph/mds_client.c | 24 +-- + fs/ceph/super.c | 4 +- + fs/ceph/xattr.c | 16 +- + fs/cifs/cifs_dfs_ref.c | 2 +- + fs/cifs/cifsfs.c | 2 +- + fs/cifs/cifssmb.c | 4 +- + fs/cifs/dir.c | 8 +- + fs/cifs/file.c | 48 +++--- + fs/cifs/inode.c | 32 ++-- + fs/cifs/link.c | 12 +- + fs/cifs/misc.c | 2 +- + fs/cifs/readdir.c | 4 +- + fs/cifs/smb1ops.c | 2 +- + fs/cifs/smb2file.c | 4 +- + fs/cifs/smb2misc.c | 4 +- + fs/cifs/smb2ops.c | 10 +- + fs/cifs/xattr.c | 22 +-- + fs/coda/cache.c | 4 +- + fs/coda/dir.c | 24 +-- + fs/coda/inode.c | 6 +- + fs/coda/pioctl.c | 2 +- + fs/coda/upcall.c | 4 +- + fs/configfs/configfs_internal.h | 3 +- + fs/configfs/dir.c | 140 ++++++++--------- + fs/configfs/file.c | 28 ++-- + fs/configfs/inode.c | 26 ++-- + fs/coredump.c | 2 +- + fs/dcache.c | 37 ++++- + fs/debugfs/file.c | 2 +- + fs/debugfs/inode.c | 64 ++++---- + fs/devpts/inode.c | 16 +- + fs/ecryptfs/crypto.c | 4 +- + fs/ecryptfs/dentry.c | 6 +- + fs/ecryptfs/file.c | 4 +- + fs/ecryptfs/inode.c | 168 ++++++++++----------- + fs/ecryptfs/kthread.c | 2 +- + fs/ecryptfs/main.c | 6 +- + fs/ecryptfs/mmap.c | 2 +- + fs/efivarfs/inode.c | 4 +- + fs/efivarfs/super.c | 2 +- + fs/efs/namei.c | 4 +- + fs/exofs/dir.c | 4 +- + fs/exofs/inode.c | 2 +- + fs/exofs/namei.c | 10 +- + fs/exofs/super.c | 2 +- + fs/exofs/symlink.c | 2 +- + fs/exportfs/expfs.c | 2 +- + fs/ext2/dir.c | 2 +- + fs/ext2/ialloc.c | 2 +- + fs/ext2/inode.c | 2 +- + fs/ext2/namei.c | 14 +- + fs/ext2/symlink.c | 2 +- + fs/ext2/xattr.c | 4 +- + fs/ext2/xattr_security.c | 4 +- + fs/ext2/xattr_trusted.c | 4 +- + fs/ext2/xattr_user.c | 4 +- + fs/ext3/ialloc.c | 2 +- + fs/ext3/inode.c | 2 +- + fs/ext3/namei.c | 34 ++--- + fs/ext3/super.c | 6 +- + fs/ext3/symlink.c | 2 +- + fs/ext3/xattr.c | 10 +- + fs/ext3/xattr_security.c | 4 +- + fs/ext3/xattr_trusted.c | 4 +- + fs/ext3/xattr_user.c | 4 +- + fs/ext4/fsync.c | 2 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/inline.c | 4 +- + fs/ext4/inode.c | 4 +- + fs/ext4/migrate.c | 2 +- + fs/ext4/namei.c | 34 ++--- + fs/ext4/super.c | 6 +- + fs/ext4/symlink.c | 2 +- + fs/ext4/xattr.c | 10 +- + fs/ext4/xattr_security.c | 4 +- + fs/ext4/xattr_trusted.c | 4 +- + fs/ext4/xattr_user.c | 4 +- + fs/f2fs/f2fs.h | 2 +- + fs/f2fs/file.c | 4 +- + fs/f2fs/namei.c | 18 +-- + fs/f2fs/xattr.c | 10 +- + fs/fat/file.c | 4 +- + fs/fat/namei_msdos.c | 8 +- + fs/fat/namei_vfat.c | 14 +- + fs/fat/nfs.c | 4 +- + fs/freevxfs/vxfs_immed.c | 2 +- + fs/fs-writeback.c | 6 +- + fs/fuse/control.c | 6 +- + fs/fuse/dir.c | 62 ++++---- + fs/fuse/inode.c | 4 +- + fs/gfs2/dentry.c | 12 +- + fs/gfs2/dir.c | 2 +- + fs/gfs2/export.c | 8 +- + fs/gfs2/inode.c | 34 ++--- + fs/gfs2/ops_fstype.c | 8 +- + fs/gfs2/super.c | 2 +- + fs/gfs2/xattr.c | 6 +- + fs/hfs/attr.c | 6 +- + fs/hfs/dir.c | 8 +- + fs/hfs/inode.c | 2 +- + fs/hfs/sysdep.c | 2 +- + fs/hfsplus/dir.c | 14 +- + fs/hfsplus/inode.c | 2 +- + fs/hfsplus/ioctl.c | 2 +- + fs/hfsplus/xattr.c | 4 +- + fs/hfsplus/xattr.h | 4 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hpfs/inode.c | 2 +- + fs/hpfs/namei.c | 8 +- + fs/hppfs/hppfs.c | 24 +-- + fs/hugetlbfs/inode.c | 4 +- + fs/inode.c | 6 +- + fs/internal.h | 2 +- + fs/isofs/export.c | 2 +- + fs/jffs2/dir.c | 54 +++---- + fs/jffs2/fs.c | 2 +- + fs/jffs2/security.c | 4 +- + fs/jffs2/super.c | 6 +- + fs/jffs2/symlink.c | 2 +- + fs/jffs2/xattr.c | 2 +- + fs/jffs2/xattr_trusted.c | 4 +- + fs/jffs2/xattr_user.c | 4 +- + fs/jfs/file.c | 2 +- + fs/jfs/namei.c | 18 +-- + fs/jfs/symlink.c | 2 +- + fs/jfs/xattr.c | 12 +- + fs/kernfs/dir.c | 2 +- + fs/kernfs/inode.c | 8 +- + fs/libfs.c | 28 ++-- + fs/logfs/dir.c | 14 +- + fs/logfs/file.c | 2 +- + fs/minix/dir.c | 4 +- + fs/minix/file.c | 2 +- + fs/minix/inode.c | 4 +- + fs/minix/namei.c | 10 +- + fs/namei.c | 2 +- + fs/namespace.c | 10 +- + fs/ncpfs/dir.c | 48 +++--- + fs/ncpfs/inode.c | 6 +- + fs/ncpfs/ioctl.c | 8 +- + fs/ncpfs/ncplib_kernel.c | 2 +- + fs/ncpfs/symlink.c | 2 +- + fs/nfs/dir.c | 56 +++---- + fs/nfs/direct.c | 4 +- + fs/nfs/getroot.c | 4 +- + fs/nfs/inode.c | 18 +-- + fs/nfs/namespace.c | 10 +- + fs/nfs/nfs3acl.c | 2 +- + fs/nfs/nfs3proc.c | 12 +- + fs/nfs/nfs4client.c | 2 +- + fs/nfs/nfs4file.c | 4 +- + fs/nfs/nfs4namespace.c | 4 +- + fs/nfs/nfs4proc.c | 60 ++++---- + fs/nfs/nfs4state.c | 4 +- + fs/nfs/nfs4trace.h | 4 +- + fs/nfs/pagelist.c | 2 +- + fs/nfs/pnfs.h | 4 +- + fs/nfs/proc.c | 4 +- + fs/nfs/read.c | 2 +- + fs/nfs/super.c | 6 +- + fs/nfs/symlink.c | 2 +- + fs/nfs/unlink.c | 20 +-- + fs/nfs/write.c | 8 +- + fs/nfsd/export.c | 4 +- + fs/nfsd/nfs2acl.c | 8 +- + fs/nfsd/nfs3acl.c | 8 +- + fs/nfsd/nfs3proc.c | 6 +- + fs/nfsd/nfs3xdr.c | 16 +- + fs/nfsd/nfs4acl.c | 4 +- + fs/nfsd/nfs4proc.c | 8 +- + fs/nfsd/nfs4recover.c | 26 ++-- + fs/nfsd/nfs4state.c | 4 +- + fs/nfsd/nfs4xdr.c | 10 +- + fs/nfsd/nfsfh.c | 28 ++-- + fs/nfsd/nfsfh.h | 6 +- + fs/nfsd/nfsproc.c | 4 +- + fs/nfsd/nfsxdr.c | 2 +- + fs/nfsd/vfs.c | 70 ++++----- + fs/nfsd/xdr4.h | 2 +- + fs/nilfs2/dir.c | 2 +- + fs/nilfs2/inode.c | 2 +- + fs/nilfs2/namei.c | 18 +-- + fs/nilfs2/super.c | 6 +- + fs/notify/fanotify/fanotify.c | 6 +- + fs/nsfs.c | 4 +- + fs/ntfs/inode.c | 2 +- + fs/ntfs/namei.c | 4 +- + fs/ocfs2/dcache.c | 14 +- + fs/ocfs2/dir.h | 2 +- + fs/ocfs2/dlmfs/dlmfs.c | 4 +- + fs/ocfs2/export.c | 2 +- + fs/ocfs2/file.c | 8 +- + fs/ocfs2/inode.c | 2 +- + fs/ocfs2/namei.c | 14 +- + fs/ocfs2/refcounttree.c | 10 +- + fs/ocfs2/xattr.c | 22 +-- + fs/omfs/dir.c | 10 +- + fs/omfs/file.c | 2 +- + fs/overlayfs/dir.c | 6 +- + fs/pipe.c | 2 +- + fs/posix_acl.c | 18 ++- + fs/proc/base.c | 32 ++-- + fs/proc/fd.c | 6 +- + fs/proc/generic.c | 6 +- + fs/proc/namespaces.c | 4 +- + fs/proc/proc_net.c | 2 +- + fs/proc/proc_sysctl.c | 12 +- + fs/proc/root.c | 2 +- + fs/proc/self.c | 2 +- + fs/proc/thread_self.c | 2 +- + fs/pstore/inode.c | 10 +- + fs/qnx6/inode.c | 2 +- + fs/quota/dquot.c | 10 +- + fs/ramfs/file-nommu.c | 2 +- + fs/reiserfs/dir.c | 4 +- + fs/reiserfs/inode.c | 2 +- + fs/reiserfs/namei.c | 12 +- + fs/reiserfs/super.c | 4 +- + fs/reiserfs/xattr.c | 130 ++++++++-------- + fs/reiserfs/xattr.h | 2 +- + fs/reiserfs/xattr_security.c | 10 +- + fs/reiserfs/xattr_trusted.c | 10 +- + fs/reiserfs/xattr_user.c | 4 +- + fs/squashfs/export.c | 2 +- + fs/squashfs/xattr.c | 8 +- + fs/super.c | 40 +++-- + fs/sysv/dir.c | 4 +- + fs/sysv/file.c | 2 +- + fs/sysv/itree.c | 2 +- + fs/sysv/namei.c | 10 +- + fs/sysv/symlink.c | 2 +- + fs/ubifs/dir.c | 14 +- + fs/ubifs/file.c | 4 +- + fs/ubifs/journal.c | 4 +- + fs/ubifs/xattr.c | 10 +- + fs/udf/file.c | 2 +- + fs/udf/namei.c | 16 +- + fs/ufs/dir.c | 2 +- + fs/ufs/namei.c | 10 +- + fs/ufs/super.c | 4 +- + fs/ufs/symlink.c | 2 +- + fs/ufs/truncate.c | 2 +- + fs/xfs/xfs_export.c | 2 +- + fs/xfs/xfs_filestream.c | 2 +- + fs/xfs/xfs_ioctl.c | 20 +-- + fs/xfs/xfs_ioctl32.c | 12 +- + fs/xfs/xfs_iops.c | 18 +-- + fs/xfs/xfs_super.c | 2 +- + fs/xfs/xfs_xattr.c | 6 +- + include/linux/dcache.h | 120 ++++++++++++++- + include/trace/events/btrfs.h | 4 +- + include/trace/events/ext3.h | 16 +- + include/trace/events/ext4.h | 16 +- + ipc/mqueue.c | 22 +-- + ipc/shm.c | 2 +- + kernel/audit_watch.c | 2 +- + kernel/relay.c | 4 +- + kernel/trace/trace.c | 8 +- + kernel/trace/trace_events.c | 4 +- + kernel/trace/trace_uprobe.c | 2 +- + mm/shmem.c | 34 ++--- + net/socket.c | 6 +- + net/sunrpc/rpc_pipe.c | 32 ++-- + security/apparmor/apparmorfs.c | 2 +- + security/apparmor/include/apparmor.h | 4 +- + security/apparmor/lsm.c | 20 +-- + security/apparmor/path.c | 2 +- + security/inode.c | 20 +-- + security/selinux/hooks.c | 8 +- + security/selinux/selinuxfs.c | 2 +- + security/smack/smack_lsm.c | 4 +- + security/smack/smackfs.c | 2 +- + security/tomoyo/file.c | 4 +- + 332 files changed, 1933 insertions(+), 1977 deletions(-) +Merging pci/next (cb8e92d8e4d9 Merge branch 'pci/misc' into next) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (870fd0f5df4e Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid) +$ git merge hid/for-next +Already up-to-date. +Merging i2c/i2c/for-next (bf6d5cb39e9d Merge branch 'i2c/for-3.20' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/i2c/i2c-core.c | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) +Merging jdelvare-hwmon/master (26bc420b59a3 Linux 3.19-rc6) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (dd378b1bcaa0 hwmon: (tmp102) add hibernation callbacks) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (48b777c0833b Merge branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + drivers/media/usb/gspca/topro.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging kbuild/for-next (8d18d1d514d1 Merge branch 'kbuild/kconfig' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging lib/Kconfig.debug +Auto-merging init/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/lto-build | 173 +++++++++++++++++++++++++++++++++++++++++++++++ + Makefile | 19 +++++- + arch/x86/Kconfig | 2 +- + init/Kconfig | 73 ++++++++++++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.lto | 84 +++++++++++++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/link-vmlinux.sh | 2 +- + 9 files changed, 356 insertions(+), 8 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto +Merging kconfig/for-next (bfa76d495765 Linux 3.19) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (d85aa1624b05 Merge branch 'for-3.19-fixes' into for-next) +$ git merge libata/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging pm/linux-next (62b2412da1cc Merge branch 'pm-cpuidle' into linux-next) +$ git merge pm/linux-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging idle/next (210109f4a19a Merge branches 'turbostat', 'sfi' and 'cpuidle' into release) +$ git merge idle/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging thermal/next (4531fa1684bb thermal: exynos: fix: Check if data->tmu_read callback is present before read) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (6c247393cfdd thermal: exynos: Add TMU support for Exynos7 SoC) +$ git merge thermal-soc/next +Already up-to-date. +Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs) +$ 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 (9ad1a1b57012 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging net-next/master (bb39b7433d1c sunvnet: failed trigger should not cause BUG_ON()) +$ git merge net-next/master +Auto-merging arch/powerpc/net/bpf_jit_asm.S +Merge made by the 'recursive' strategy. + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/asm-compat.h | 4 + + arch/powerpc/include/asm/ppc-opcode.h | 2 + + arch/powerpc/net/Makefile | 2 +- + arch/powerpc/net/bpf_jit.h | 64 ++++- + arch/powerpc/net/{bpf_jit_64.S => bpf_jit_asm.S} | 70 +++--- + arch/powerpc/net/bpf_jit_comp.c | 46 ++-- + drivers/net/bonding/bond_main.c | 6 +- + drivers/net/dsa/mv88e6171.c | 18 +- + drivers/net/dsa/mv88e6352.c | 77 +----- + drivers/net/dsa/mv88e6xxx.c | 53 ++++ + drivers/net/dsa/mv88e6xxx.h | 6 + + drivers/net/ethernet/altera/altera_tse_main.c | 20 +- + drivers/net/ethernet/broadcom/Kconfig | 8 +- + drivers/net/ethernet/broadcom/bnx2.c | 14 +- + drivers/net/ethernet/broadcom/bnx2.h | 4 +- + drivers/net/ethernet/broadcom/bnx2_fw.h | 4 +- + drivers/net/ethernet/broadcom/cnic.c | 6 +- + drivers/net/ethernet/broadcom/cnic_if.h | 8 +- + drivers/net/ethernet/cadence/macb.c | 18 +- + drivers/net/ethernet/cadence/macb.h | 15 +- + drivers/net/ethernet/emulex/benet/be.h | 40 +++ + drivers/net/ethernet/emulex/benet/be_main.c | 294 +++++++++++++++-------- + drivers/net/ethernet/sun/sunvnet.c | 2 + + drivers/net/usb/hso.c | 13 +- + drivers/net/usb/r8152.c | 131 +++++++--- + include/linux/igmp.h | 2 + + net/batman-adv/gateway_client.c | 19 +- + net/ipv4/igmp.c | 52 ++-- + net/ipv4/tcp_cong.c | 2 +- + 30 files changed, 655 insertions(+), 347 deletions(-) + rename arch/powerpc/net/{bpf_jit_64.S => bpf_jit_asm.S} (76%) +Merging ipsec-next/master (ff660f75be36 Merge branch 'stmmac-pci') +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-drivers-next/master (d53071143aa5 Merge ath-next from ath.git) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (03f310efd4b1 Bluetooth: Remove unnecessary queue_monitor_skb() function) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/ath3k.c | 1 + + drivers/bluetooth/btmrvl_drv.h | 1 + + drivers/bluetooth/btmrvl_main.c | 14 +++ + drivers/bluetooth/btusb.c | 120 ++++++++++++------ + drivers/net/ieee802154/at86rf230.c | 2 +- + include/linux/ieee802154.h | 12 +- + include/net/bluetooth/hci_core.h | 144 ++++++++-------------- + include/net/mac802154.h | 9 +- + net/6lowpan/Kconfig | 57 ++++++++- + net/6lowpan/Makefile | 13 +- + net/6lowpan/iphc.c | 200 +++++------------------------- + net/6lowpan/nhc.c | 241 +++++++++++++++++++++++++++++++++++++ + net/6lowpan/nhc.h | 146 ++++++++++++++++++++++ + net/6lowpan/nhc_dest.c | 28 +++++ + net/6lowpan/nhc_fragment.c | 27 +++++ + net/6lowpan/nhc_hop.c | 27 +++++ + net/6lowpan/nhc_ipv6.c | 27 +++++ + net/6lowpan/nhc_mobility.c | 27 +++++ + net/6lowpan/nhc_routing.c | 27 +++++ + net/6lowpan/nhc_udp.c | 157 ++++++++++++++++++++++++ + net/bluetooth/Kconfig | 8 ++ + net/bluetooth/Makefile | 3 +- + net/bluetooth/a2mp.c | 44 +++---- + net/bluetooth/a2mp.h | 8 -- + net/bluetooth/hci_conn.c | 20 ++- + net/bluetooth/hci_core.c | 48 +++++--- + net/bluetooth/hci_debugfs.h | 22 ++++ + net/bluetooth/hci_event.c | 38 +++--- + net/bluetooth/hci_sock.c | 41 ++----- + net/bluetooth/l2cap_core.c | 40 +++++- + net/bluetooth/mgmt.c | 16 ++- + net/bluetooth/sco.c | 21 +++- + net/bluetooth/smp.c | 24 ++-- + net/ieee802154/6lowpan/core.c | 6 +- + net/ieee802154/core.c | 1 + + 35 files changed, 1174 insertions(+), 446 deletions(-) + create mode 100644 net/6lowpan/nhc.c + create mode 100644 net/6lowpan/nhc.h + create mode 100644 net/6lowpan/nhc_dest.c + create mode 100644 net/6lowpan/nhc_fragment.c + create mode 100644 net/6lowpan/nhc_hop.c + create mode 100644 net/6lowpan/nhc_ipv6.c + create mode 100644 net/6lowpan/nhc_mobility.c + create mode 100644 net/6lowpan/nhc_routing.c + create mode 100644 net/6lowpan/nhc_udp.c +Merging infiniband/for-next (147d1da951cf Merge branches 'core', 'cxgb4', 'iser', 'mlx4', 'mlx5', 'ocrdma', 'odp', 'qib' and 'srp' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging mtd/master (eb928d40a93f Merge JFFS2 updates from David Woodhouse) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (eb928d40a93f Merge JFFS2 updates from David Woodhouse) +$ git merge l2-mtd/master +Already up-to-date. +Merging crypto/master (db71f29a1c32 crypto: testmgr - mark rfc4106(gcm(aes)) as fips_allowed) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (45ee2dbc65cb Merge branch 'drm-next-3.20' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (23923ebaac52 drm: Remove unused DRM_MODE_OBJECT_BRIDGE) +$ git merge drm-panel/drm/panel/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/bridge/Kconfig | 11 + + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/ps8622.c | 684 +++++++++++++++++++++++++++++++++++++++ + drivers/gpu/drm/bridge/ptn3460.c | 2 +- + include/drm/drm_crtc.h | 1 - + 5 files changed, 697 insertions(+), 2 deletions(-) + create mode 100644 drivers/gpu/drm/bridge/ps8622.c +Merging drm-intel/for-linux-next (96abd10ecc2e Merge branch 'drm-next-3.20' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (07d05cbf60ed drm/tegra: dc: Move more code into ->init()) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/dc.c | 79 ++++++++++++++++++++++---------------------- + drivers/gpu/drm/tegra/hdmi.c | 8 +++++ + 2 files changed, 48 insertions(+), 39 deletions(-) +Merging drm-misc/topic/core-stuff (eb2ed66fe56f drm/irq: Don't disable vblank interrupts when already disabled) +$ git merge drm-misc/topic/core-stuff +Already up-to-date. +Merging sound/for-next (3cd1ce0420ce ALSA: usb: Fix support for Denon DA-300USB DAC (ID 154e:1003)) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (9c208ed74c76 Merge remote-tracking branches 'asoc/fix/rsnd', 'asoc/fix/rt5670' and 'asoc/fix/samsung' into asoc-linus) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + sound/soc/cirrus/Kconfig | 2 +- + sound/soc/codecs/Kconfig | 2 +- + sound/soc/codecs/max98357a.c | 12 +++++++++++- + sound/soc/codecs/rt5670.c | 6 ++++++ + sound/soc/fsl/fsl_ssi.c | 11 +++++++---- + sound/soc/intel/sst/sst.c | 4 ++++ + sound/soc/omap/omap-hdmi-audio.c | 3 +++ + sound/soc/samsung/Kconfig | 10 +++++----- + sound/soc/sh/rcar/core.c | 4 ++-- + 9 files changed, 40 insertions(+), 14 deletions(-) +Merging modules/modules-next (9cc019b8c94f module: Replace over-engineered nested sleep) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (5b40a7daf518 virtio: don't set VIRTIO_CONFIG_S_DRIVER_OK twice.) +$ git merge virtio/virtio-next +Already up-to-date. +Merging input/next (290b799c390d Input: psmouse - use IS_ENABLED instead of homegrown code) +$ git merge input/next +Already up-to-date. +Merging block/for-next (434c26478166 Merge branch 'for-3.20/core' into for-next) +$ git merge block/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (3712600cfae0 dm cache policy mq: try not to writeback data that changed in the last second) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-cache-policy-mq.c | 250 +++++++++++++++++++++++++++---------- + drivers/md/dm-log-userspace-base.c | 84 +++++++------ + 2 files changed, 228 insertions(+), 106 deletions(-) +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 (802ea9d8645d Merge tag 'dm-3.20-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge mmc-uh/next +Already up-to-date. +Merging kgdb/kgdb-next (dd8f30cc0550 kgdb, docs: Fix <para> pdfdocs build errors) +$ git merge kgdb/kgdb-next +Already up-to-date. +Merging md/for-next (26ac107378c4 md/raid5: Fix livelock when array is both resyncing and degraded.) +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-mfd-next (0a65fbf64dad mfd: intel_soc_pmic: Add missing error check for devm_kzalloc) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (1926469377bb backlight: da9052_bl: Terminate da9052_wled_ids array with empty element) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/88pm860x_bl.c | 5 +---- + drivers/video/backlight/da9052_bl.c | 1 + + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging battery/master (9e23e22cd61a power: ltc2941-battery-gauge: Fix typo in conversion formula (58 instead of 85)) +$ git merge battery/master +Merge made by the 'recursive' strategy. + drivers/power/ltc2941-battery-gauge.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging omap_dss2/for-next (d6c2152b3efd Merge branches '3.20/fbdev' and '3.20/omapdss' into for-next) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (264d8de777a4 Merge remote-tracking branches 'regulator/fix/da9210' and 'regulator/fix/rk808' into regulator-linus) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/da9210-regulator.c | 9 +++++++++ + drivers/regulator/rk808-regulator.c | 8 ++++++++ + 2 files changed, 17 insertions(+) +Merging security/next (04f81f0154e4 cipso: don't use IPCB() to locate the CIPSO IP option) +$ git merge security/next +Already up-to-date. +Merging integrity/next (7bea7ff67e0c ima: /proc/keys is now mandatory) +$ git merge integrity/next +Merge made by the 'recursive' strategy. +Merging selinux/next (6eb4e2b41b26 SELinux: fix error code in policydb_init()) +$ git merge selinux/next +Already up-to-date. +Merging lblnet/next (b2776bf7149b Linux 3.18) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (b08c144e3a10 watchdog: bcm47xx_wdt.c: allow enabling on BCM5301X arch) +$ git merge watchdog/master +Resolved 'drivers/watchdog/Makefile' using previous resolution. +Auto-merging drivers/watchdog/Makefile +CONFLICT (content): Merge conflict in drivers/watchdog/Makefile +Auto-merging drivers/watchdog/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 83cd2c54a7da] Merge remote-tracking branch 'watchdog/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/watchdog/mt7621-wdt.txt | 12 ++ + drivers/watchdog/Kconfig | 7 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/mt7621_wdt.c | 186 +++++++++++++++++++++ + 4 files changed, 206 insertions(+) + create mode 100644 Documentation/devicetree/bindings/watchdog/mt7621-wdt.txt + create mode 100644 drivers/watchdog/mt7621_wdt.c +Merging iommu/next (a20cc76b9efa Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', '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 (6140a8f56238 vfio-pci: Add device request interface) +$ 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 (52e68924dfa8 Documentation: Fix the wrong command `echo -1 > set_ftrace_pid` for cleaning the filter.) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (edb0ec0725bb kexec, Kconfig: spell "architecture" properly) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (2fded7f44b8f audit: remove vestiges of vers_ops) +$ git merge audit/next +Already up-to-date. +Merging devicetree/devicetree/next (fca8ba4ee24d of/unittest: Remove obsolete code) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (3c3c8e3618b0 Merge remote-tracking branch 'grant/devicetree/next' into for-next) +$ 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 (4f16c3cd0b66 Merge remote-tracking branch 'spi/fix/ti-qspi' into spi-linus) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + drivers/spi/spi-ti-qspi.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) +Merging tip/auto-latest (3cf6be48c376 Merge branch 'timers/core') +$ git merge tip/auto-latest +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging clockevents/clockevents/next (4c8305221193 clocksource: Driver for Conexant Digicolor SoC timer) +$ git merge clockevents/clockevents/next +Resolved 'arch/arm/mach-rockchip/Kconfig' using previous resolution. +Resolved 'drivers/clocksource/Kconfig' using previous resolution. +Resolved 'drivers/clocksource/rockchip_timer.c' using previous resolution. +Auto-merging drivers/clocksource/rockchip_timer.c +CONFLICT (add/add): Merge conflict in drivers/clocksource/rockchip_timer.c +Auto-merging drivers/clocksource/Kconfig +CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig +Auto-merging arch/arm/mach-rockchip/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-rockchip/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 81bb5f71cd7a] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. +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 (30263b4052c6 EDAC, mv64x60_edac: Fix an error code in probe()) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (91d117921216 irqchip: atmel-aic-common: Prevent clobbering of priority when changing IRQ type) +$ 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 (c19565fc83e6 Merge branch 'for-next/ftrace/core' into trace/for-next) +$ git merge ftrace/for-next +Recorded preimage for 'fs/debugfs/inode.c' +Recorded preimage for 'kernel/trace/trace.c' +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging kernel/trace/trace_events.c +Auto-merging kernel/trace/trace.c +CONFLICT (content): Merge conflict in kernel/trace/trace.c +Auto-merging fs/debugfs/inode.c +CONFLICT (content): Merge conflict in fs/debugfs/inode.c +Auto-merging fs/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/debugfs/inode.c'. +Recorded resolution for 'kernel/trace/trace.c'. +[master 5419cba02ebe] Merge remote-tracking branch 'ftrace/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/Makefile | 1 + + fs/tracefs/Makefile | 4 + + fs/tracefs/inode.c | 644 +++++++++++++++++++++++++++++++++++ + include/linux/tracefs.h | 45 +++ + include/uapi/linux/magic.h | 2 + + kernel/trace/ftrace.c | 22 +- + kernel/trace/trace.c | 187 +++++----- + kernel/trace/trace.h | 2 +- + kernel/trace/trace_events.c | 32 +- + kernel/trace/trace_functions_graph.c | 7 +- + kernel/trace/trace_kprobe.c | 10 +- + kernel/trace/trace_probe.h | 2 +- + kernel/trace/trace_stat.c | 10 +- + 13 files changed, 826 insertions(+), 142 deletions(-) + create mode 100644 fs/tracefs/Makefile + create mode 100644 fs/tracefs/inode.c + create mode 100644 include/linux/tracefs.h +Merging rcu/rcu/next (c0135d07b013 rcu: Clear need_qs flag to prevent splat) +$ git merge rcu/rcu/next +Already up-to-date. +Merging kvm/linux-next (6557bada461a KVM: ia64: drop kvm.h from installed user headers) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (4b990589952f KVM: Remove unused config symbol) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (2c4aa55a6af0 Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into HEAD) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (de8e5d744051 KVM: Disable compat ioctl for s390) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (a2e75bc2ee20 xenbus: Add proper handling of XS_ERROR from Xenbus for transactions.) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (4c907baf36d8 percpu_ref: implement percpu_ref_is_dying()) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (b5b3ab523e31 Merge branch 'for-3.19-fixes' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (c57c0fa4bc9c toshiba_acpi: Cleanup GPL header) +$ 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 regmap/for-next (48bbdbb173fa Merge remote-tracking branch 'regmap/fix/irq' into regmap-linus) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-irq.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging hsi/for-next (f034125dfdae HSI: nokia-modem: fix error return code) +$ 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 (ffe2428614d2 leds: flash: remove stray include directive) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/leds-pwm.c | 3 --- + include/linux/led-class-flash.h | 1 - + 2 files changed, 4 deletions(-) +Merging ipmi/for-next (43475c9dc47a ipmi: Use is_visible callback for conditional sysfs entries) +$ git merge ipmi/for-next +Recorded preimage for 'drivers/char/ipmi/ipmi_msghandler.c' +Recorded preimage for 'drivers/char/ipmi/ipmi_si_intf.c' +Auto-merging drivers/char/ipmi/ipmi_si_intf.c +CONFLICT (content): Merge conflict in drivers/char/ipmi/ipmi_si_intf.c +Auto-merging drivers/char/ipmi/ipmi_msghandler.c +CONFLICT (content): Merge conflict in drivers/char/ipmi/ipmi_msghandler.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/char/ipmi/ipmi_msghandler.c'. +Recorded resolution for 'drivers/char/ipmi/ipmi_si_intf.c'. +[master 34965c8c0368] Merge remote-tracking branch 'ipmi/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging driver-core/driver-core-next (adf305f77878 sysfs: fix warning when creating a sysfs group without attributes) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (c09babfab7ae serial: 8250: Fix UART_BUG_TXEN workaround) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (4d4bac4499e9 Merge tag 'usb-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (f5af19d10d15 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (3e264ffc831e USB: mos7840: remove unused code) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging staging/staging-next (3d883483dc0a Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (5fb31cd839c2 coresight: fix function etm_writel_cp14() parameter order) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging cgroup/for-next (8abba61bcfd4 Merge branch 'for-3.19-fixes' into for-next) +$ git merge cgroup/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (cad8000836ef Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/sg.c +Auto-merging drivers/scsi/be2iscsi/be_main.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/scsi/am53c974.c | 6 ------ + drivers/scsi/be2iscsi/be_main.c | 1 - + drivers/scsi/hpsa.c | 4 +--- + drivers/scsi/sg.c | 40 +++++++++++++++++++++++++++++++++------- + drivers/scsi/wd719x.c | 1 + + 6 files changed, 36 insertions(+), 18 deletions(-) +Merging target-updates/for-next (aa04dae454d0 target: Set LBPWS10 bit in Logical Block Provisioning EVPD) +$ 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 pinctrl/for-next (f724e05baaf0 sh-pfc: emev2 - Fix mangled author name) +$ git merge pinctrl/for-next +Already up-to-date. +Merging vhost/linux-next (ac26e40d1c8a vhost/net: fix up num_buffers endian-ness) +$ git merge vhost/linux-next +Resolved 'drivers/vhost/net.c' using previous resolution. +Auto-merging drivers/vhost/net.c +CONFLICT (content): Merge conflict in drivers/vhost/net.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master df46e4c57f56] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. +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 (d2bee67fadb6 gpiolib: of: allow of_gpiochip_find_and_xlate to find more than one chip per node) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpiolib-of.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) +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 (b65af27ad89d pwm: tegra: Use NSEC_PER_SEC) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (817bd7253291 dma-buf: cleanup dma_buf_export() to make it easily extensible) +$ git merge dma-buf/for-next +Auto-merging drivers/staging/android/ion/ion.c +Auto-merging drivers/media/v4l2-core/videobuf2-vmalloc.c +Auto-merging drivers/gpu/drm/tegra/gem.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_dmabuf.c +Merge made by the 'recursive' strategy. + Documentation/dma-buf-sharing.txt | 23 +++++++------ + drivers/dma-buf/dma-buf.c | 47 ++++++++++++-------------- + drivers/dma-buf/fence.c | 3 ++ + drivers/dma-buf/reservation.c | 5 +-- + drivers/gpu/drm/armada/armada_gem.c | 10 ++++-- + drivers/gpu/drm/drm_prime.c | 12 ++++--- + drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 9 +++-- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 10 ++++-- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 9 ++++- + drivers/gpu/drm/tegra/gem.c | 10 ++++-- + drivers/gpu/drm/ttm/ttm_object.c | 9 +++-- + drivers/gpu/drm/udl/udl_dmabuf.c | 9 ++++- + drivers/media/v4l2-core/videobuf2-dma-contig.c | 8 ++++- + drivers/media/v4l2-core/videobuf2-dma-sg.c | 8 ++++- + drivers/media/v4l2-core/videobuf2-vmalloc.c | 8 ++++- + drivers/staging/android/ion/ion.c | 9 +++-- + include/linux/dma-buf.h | 34 +++++++++++++++---- + 17 files changed, 158 insertions(+), 65 deletions(-) +Merging userns/for-next (db86da7cb76f userns: Unbreak the unprivileged remount tests) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (7c2c49eceb79 ktest: Place quotes around item variable) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (ec02ace8ca0a clk: Only recalculate the rate if needed) +$ 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 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 kselftest/next (6ddf898c23d6 selftests/exec: Check if the syscall exists and bail if not) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/vm/Makefile +Auto-merging tools/testing/selftests/exec/execveat.c +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 14 +++++- + tools/testing/selftests/Makefile | 54 +++++++++++++++++++++- + tools/testing/selftests/breakpoints/Makefile | 19 +++++++- + tools/testing/selftests/cpu-hotplug/Makefile | 14 +++++- + .../{on-off-test.sh => cpu-on-off-test.sh} | 0 + tools/testing/selftests/efivarfs/Makefile | 16 ++++++- + tools/testing/selftests/exec/execveat.c | 10 +++- + tools/testing/selftests/firmware/Makefile | 43 ++++++++++------- + tools/testing/selftests/ftrace/Makefile | 13 +++++- + tools/testing/selftests/ipc/Makefile | 19 +++++++- + tools/testing/selftests/kcmp/Makefile | 13 +++++- + tools/testing/selftests/memfd/Makefile | 17 +++++-- + tools/testing/selftests/memory-hotplug/Makefile | 14 +++++- + .../{on-off-test.sh => mem-on-off-test.sh} | 0 + tools/testing/selftests/mount/Makefile | 12 ++++- + tools/testing/selftests/mqueue/Makefile | 18 ++++++-- + tools/testing/selftests/net/Makefile | 20 ++++++-- + tools/testing/selftests/ptrace/Makefile | 16 +++++-- + tools/testing/selftests/size/Makefile | 12 ++++- + tools/testing/selftests/sysctl/Makefile | 17 ++++++- + tools/testing/selftests/timers/Makefile | 12 ++++- + tools/testing/selftests/user/Makefile | 12 ++++- + tools/testing/selftests/vm/Makefile | 11 ++++- + 23 files changed, 326 insertions(+), 50 deletions(-) + rename tools/testing/selftests/cpu-hotplug/{on-off-test.sh => cpu-on-off-test.sh} (100%) + rename tools/testing/selftests/memory-hotplug/{on-off-test.sh => mem-on-off-test.sh} (100%) +Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump) +$ git merge y2038/y2038 +Auto-merging kernel/cpuset.c +Auto-merging fs/coredump.c +Auto-merging drivers/staging/media/lirc/lirc_serial.c +Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +Merge made by the 'recursive' strategy. + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 +- + drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 4 +- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 4 +- + drivers/staging/ft1000/ft1000.h | 4 +- + drivers/staging/gdm72xx/gdm_sdio.c | 13 +++--- + drivers/staging/gdm72xx/gdm_sdio.h | 4 +- + drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++---------- + drivers/staging/media/lirc/lirc_sasem.c | 20 +++++----- + drivers/staging/media/lirc/lirc_serial.c | 50 ++++++++---------------- + fs/coredump.c | 8 ++-- + kernel/cpuset.c | 12 ++++-- + 11 files changed, 68 insertions(+), 90 deletions(-) +Merging luto-misc/next (188c901941ef Merge branch 'leds-fixes-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) +$ git merge luto-misc/next +Already up-to-date. +Merging access_once/linux-next (c5b19946eb76 kernel: Fix sparse warning for ACCESS_ONCE) +$ git merge access_once/linux-next +Already up-to-date. +Merging livepatching/for-next (0937e3b025f7 livepatch: simplify disable error path) +$ git merge livepatching/for-next +Merge made by the 'recursive' strategy. + arch/x86/include/asm/livepatch.h | 4 +-- + include/linux/livepatch.h | 8 ++--- + kernel/livepatch/core.c | 67 ++++++++++------------------------------ + 3 files changed, 23 insertions(+), 56 deletions(-) +Merging akpm-current/current (d07b956c650a scripts/gdb: Add infrastructure) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'arch/x86/include/asm/pgtable.h' +Recorded preimage for 'fs/affs/namei.c' +Recorded preimage for 'fs/notify/fanotify/fanotify.c' +Recorded preimage for 'fs/proc/generic.c' +Resolved 'Documentation/kasan.txt' using previous resolution. +Resolved 'arch/mips/include/asm/pgtable-bits.h' using previous resolution. +Resolved 'arch/powerpc/kernel/time.c' using previous resolution. +Resolved 'arch/x86/Kconfig' using previous resolution. +Resolved 'drivers/block/zram/zram_drv.c' using previous resolution. +Resolved 'drivers/rtc/Makefile' using previous resolution. +Resolved 'include/linux/mm.h' using previous resolution. +Resolved 'init/Kconfig' using previous resolution. +Resolved 'kernel/fork.c' using previous resolution. +Resolved 'lib/Makefile' using previous resolution. +Resolved 'mm/slab_common.c' using previous resolution. +Resolved 'mm/slub.c' using previous resolution. +Resolved 'mm/swap.c' using previous resolution. +Resolved 'mm/vmscan.c' using previous resolution. +Resolved 'scripts/Makefile.kasan' using previous resolution. +Resolved 'scripts/module-common.lds' using previous resolution. +Auto-merging scripts/module-common.lds +CONFLICT (content): Merge conflict in scripts/module-common.lds +Auto-merging scripts/Makefile.kasan +CONFLICT (add/add): Merge conflict in scripts/Makefile.kasan +Auto-merging mm/vmstat.c +Auto-merging mm/vmscan.c +CONFLICT (content): Merge conflict in mm/vmscan.c +Auto-merging mm/util.c +Auto-merging mm/swap.c +CONFLICT (content): Merge conflict in mm/swap.c +Auto-merging mm/slub.c +CONFLICT (content): Merge conflict in mm/slub.c +Auto-merging mm/slab_common.c +CONFLICT (content): Merge conflict in mm/slab_common.c +Auto-merging mm/rmap.c +Auto-merging mm/memory.c +Auto-merging mm/madvise.c +Auto-merging mm/huge_memory.c +CONFLICT (modify/delete): mm/filemap_xip.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of mm/filemap_xip.c left in tree. +Auto-merging lib/vsprintf.c +Auto-merging lib/Makefile +CONFLICT (content): Merge conflict in lib/Makefile +Auto-merging lib/Kconfig +Auto-merging kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merging init/Kconfig +CONFLICT (content): Merge conflict in init/Kconfig +Auto-merging include/linux/string.h +Auto-merging include/linux/rtc.h +Auto-merging include/linux/rmap.h +Auto-merging include/linux/mm.h +CONFLICT (content): Merge conflict in include/linux/mm.h +Auto-merging include/linux/kexec.h +Auto-merging include/linux/huge_mm.h +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/proc/generic.c +CONFLICT (content): Merge conflict in fs/proc/generic.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/notify/fanotify/fanotify.c +CONFLICT (content): Merge conflict in fs/notify/fanotify/fanotify.c +Auto-merging fs/fat/inode.c +Auto-merging fs/fat/file.c +Auto-merging fs/ext4/fsync.c +Auto-merging fs/affs/namei.c +CONFLICT (content): Merge conflict in fs/affs/namei.c +Auto-merging drivers/rtc/interface.c +Auto-merging drivers/rtc/Makefile +CONFLICT (content): Merge conflict in drivers/rtc/Makefile +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/input/input.c +Auto-merging drivers/block/zram/zram_drv.c +CONFLICT (content): Merge conflict in drivers/block/zram/zram_drv.c +Auto-merging arch/x86/include/asm/pgtable.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging arch/sparc/include/asm/pgtable_64.h +Auto-merging arch/powerpc/kernel/time.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/time.c +Auto-merging arch/powerpc/include/asm/pgtable-ppc64.h +Auto-merging arch/mips/include/asm/pgtable-bits.h +CONFLICT (content): Merge conflict in arch/mips/include/asm/pgtable-bits.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm/include/asm/pgtable-3level.h +Auto-merging Documentation/kasan.txt +CONFLICT (add/add): Merge conflict in Documentation/kasan.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f mm/filemap_xip.c +mm/filemap_xip.c: needs merge +rm 'mm/filemap_xip.c' +$ git commit -v -a +Recorded resolution for 'arch/x86/include/asm/pgtable.h'. +Recorded resolution for 'fs/affs/namei.c'. +Recorded resolution for 'fs/notify/fanotify/fanotify.c'. +Recorded resolution for 'fs/proc/generic.c'. +[master 6236469e3a57] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/vfat.txt | 10 + + Documentation/leds/leds-class.txt | 3 - + Documentation/printk-formats.txt | 6 + + arch/alpha/include/uapi/asm/mman.h | 1 + + arch/arm/include/asm/pgtable-3level.h | 1 + + arch/arm64/include/asm/pgtable.h | 2 + + arch/mips/include/uapi/asm/mman.h | 1 + + arch/parisc/include/uapi/asm/mman.h | 1 + + arch/powerpc/include/asm/pgtable-ppc64.h | 2 + + arch/sparc/include/asm/pgtable_64.h | 9 + + arch/x86/include/asm/pgtable.h | 5 + + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/xtensa/include/uapi/asm/mman.h | 1 + + 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/rtc/class.c | 24 +++ + drivers/rtc/interface.c | 13 +- + drivers/tty/Kconfig | 4 + + drivers/tty/vt/keyboard.c | 110 +++++++--- + fs/ext4/fsync.c | 5 +- + fs/fat/cache.c | 79 ++++--- + fs/fat/dir.c | 2 +- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 61 ++++++ + fs/fat/inode.c | 75 ++++++- + fs/mpage.c | 23 ++- + fs/ocfs2/aops.c | 21 +- + fs/ocfs2/dlm/dlmmaster.c | 10 - + fs/ocfs2/dlm/dlmthread.c | 10 + + fs/proc/task_mmu.c | 4 +- + include/linux/crc64_ecma.h | 56 +++++ + include/linux/huge_mm.h | 4 + + include/linux/input.h | 28 +++ + include/linux/kexec.h | 2 + + include/linux/rmap.h | 9 +- + include/linux/rtc.h | 4 + + include/linux/string.h | 1 + + include/linux/vm_event_item.h | 1 + + include/uapi/asm-generic/mman-common.h | 1 + + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 +++++++++++++++++++++++++++++++ + lib/vsprintf.c | 20 +- + mm/huge_memory.c | 35 ++++ + mm/madvise.c | 150 ++++++++++++++ + mm/memory.c | 1 + + mm/memory_hotplug.c | 11 +- + mm/page_isolation.c | 7 +- + mm/rmap.c | 46 ++++- + mm/slub.c | 2 + + mm/util.c | 30 +++ + mm/vmscan.c | 115 ++++++++--- + mm/vmstat.c | 1 + + 57 files changed, 1514 insertions(+), 147 deletions(-) + create mode 100644 drivers/input/leds.c + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c +$ git am -3 ../patches/0001-fix-bad-merge-in-akpm-current.patch +Applying: fix bad merge in akpm-current +$ git reset HEAD^ +Unstaged changes after reset: +M mm/slub.c +$ git add -A . +$ git commit -v -a --amend +[master 23e0f10b209d] Merge branch 'akpm-current/current' + Date: Sun Feb 22 16:54:19 2015 +1100 +$ git am -3 ../patches/0001-fix-another-bad-merge-in-akpm-current.patch +Applying: fix another bad merge in akpm-current +$ git reset HEAD^ +Unstaged changes after reset: +M mm/memory.c +$ git add -A . +$ git commit -v -a --amend +[master 07075c8ebe69] Merge branch 'akpm-current/current' + Date: Sun Feb 22 16:54:19 2015 +1100 +$ 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: ocfs2: use 64bit variables to track heartbeat time +Applying: lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text +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 + + afa33b6144b2...9388210a3e8b akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (9388210a3e8b mm: add strictlimit knob) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 +++++ + drivers/w1/w1_int.c | 3 +- + fs/ocfs2/cluster/heartbeat.c | 49 ++++++------------------------- + lib/Kconfig | 5 ++-- + mm/backing-dev.c | 35 ++++++++++++++++++++++ + 5 files changed, 55 insertions(+), 45 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..5c79a75dfd20 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing jdelvare-hwmon based on 3.19-rc6 +Unchanged quilt series jdelvare-hwmon diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..91fd278dd9e7 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20150222 |