diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 3647 |
1 files changed, 3647 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..59e3ccc6229b --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3647 @@ +$ date -R +Thu, 04 Aug 2016 09:43:19 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at c8d0267efdb4 Merge tag 'pci-v4.8-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci +Merging origin/master (4620a06e4b3c shmem: Fix link error if huge pages support is disabled) +$ git merge origin/master +Updating c8d0267efdb4..4620a06e4b3c +Fast-forward + .mailmap | 2 + + Documentation/filesystems/nilfs2.txt | 3 +- + Documentation/filesystems/orangefs.txt | 50 +- + Documentation/ioctl/ioctl-number.txt | 2 +- + Documentation/kernel-parameters.txt | 7 + + Documentation/rapidio/mport_cdev.txt | 3 +- + Documentation/rapidio/rio_cm.txt | 119 + + Documentation/rapidio/tsi721.txt | 26 + + Documentation/sysctl/kernel.txt | 14 + + MAINTAINERS | 13 +- + Makefile | 1 - + arch/alpha/include/asm/thread_info.h | 27 - + arch/alpha/kernel/machvec_impl.h | 2 +- + arch/arc/mm/init.c | 2 +- + arch/arm/boot/dts/keystone.dtsi | 8 + + arch/arm/include/asm/kexec.h | 24 + + arch/arm/kernel/machine_kexec.c | 2 +- + arch/arm/kernel/setup.c | 39 +- + arch/arm/mach-integrator/impd1.c | 4 +- + arch/arm/mach-mv78xx0/common.c | 2 +- + arch/arm/mach-omap2/omap_device.c | 2 +- + arch/blackfin/mm/init.c | 2 +- + arch/hexagon/mm/init.c | 2 +- + arch/ia64/include/asm/thread_info.h | 28 - + arch/ia64/kernel/machine_kexec.c | 2 +- + arch/ia64/kernel/mca.c | 2 +- + arch/microblaze/include/asm/thread_info.h | 27 - + arch/microblaze/mm/init.c | 4 +- + arch/microblaze/mm/pgtable.c | 2 +- + arch/mips/mm/init.c | 2 +- + arch/mips/txx9/generic/pci.c | 2 +- + arch/nios2/mm/init.c | 2 +- + arch/openrisc/mm/ioremap.c | 4 +- + arch/powerpc/include/asm/mman.h | 8 +- + arch/powerpc/include/asm/thread_info.h | 25 - + arch/powerpc/lib/alloc.c | 2 +- + arch/powerpc/mm/pgtable_32.c | 2 +- + arch/powerpc/platforms/powermac/setup.c | 4 +- + arch/powerpc/platforms/ps3/device-init.c | 2 +- + arch/powerpc/sysdev/fsl_rio.c | 24 +- + arch/powerpc/sysdev/msi_bitmap.c | 2 +- + arch/score/mm/init.c | 2 +- + arch/sh/drivers/pci/pci.c | 4 +- + arch/sh/include/asm/thread_info.h | 26 - + arch/sh/mm/ioremap.c | 2 +- + arch/sparc/include/asm/thread_info_64.h | 24 - + arch/tile/include/asm/thread_info.h | 27 - + arch/x86/include/asm/thread_info.h | 24 - + arch/x86/mm/init.c | 4 +- + arch/x86/platform/efi/early_printk.c | 4 +- + arch/x86/xen/enlighten.c | 5 +- + drivers/acpi/osl.c | 5 +- + drivers/base/firmware_class.c | 183 +- + drivers/base/node.c | 2 +- + drivers/block/drbd/drbd_actlog.c | 1 - + drivers/block/drbd/drbd_int.h | 1 + + drivers/block/rbd.c | 15 +- + drivers/clk/clkdev.c | 4 +- + drivers/gpu/drm/drm_dp_helper.c | 32 + + drivers/gpu/drm/i915/i915_drv.h | 4 +- + drivers/gpu/drm/i915/intel_drv.h | 2 + + drivers/gpu/drm/i915/intel_psr.c | 19 +- + drivers/gpu/drm/i915/intel_sprite.c | 6 +- + drivers/memstick/core/ms_block.c | 17 +- + drivers/net/caif/caif_spi.c | 4 +- + drivers/net/dsa/b53/b53_mmap.c | 3 +- + drivers/net/dsa/bcm_sf2.c | 5 +- + drivers/net/ethernet/8390/ax88796.c | 3 +- + drivers/net/ethernet/altera/altera_tse_main.c | 1 + + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 1 + + drivers/net/ethernet/arc/emac_main.c | 15 +- + drivers/net/ethernet/aurora/nb8800.c | 2 + + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +- + drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 6 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 3 + + drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 4 +- + drivers/net/ethernet/dec/tulip/de4x5.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 9 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 7 +- + drivers/net/ethernet/marvell/mvneta.c | 1 + + drivers/net/ethernet/marvell/mvpp2.c | 2 + + drivers/net/ethernet/marvell/pxa168_eth.c | 1 + + drivers/net/ethernet/neterion/s2io.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 5 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 13 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 7 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_vf.c | 4 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 12 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h | 1 - + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 1 - + drivers/net/ethernet/realtek/8139too.c | 12 +- + drivers/net/ethernet/realtek/r8169.c | 37 +- + drivers/net/ethernet/renesas/ravb_main.c | 1 + + drivers/net/ethernet/renesas/sh_eth.c | 1 + + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 36 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 7 +- + drivers/net/ethernet/ti/cpsw.c | 19 +- + drivers/net/ethernet/ti/davinci_cpdma.c | 3 - + drivers/net/ethernet/ti/davinci_emac.c | 1 + + drivers/net/macsec.c | 16 +- + drivers/net/phy/mdio-xgene.c | 4 +- + drivers/net/phy/micrel.c | 4 +- + drivers/net/wan/fsl_ucc_hdlc.c | 3 +- + drivers/pci/xen-pcifront.c | 2 +- + drivers/rapidio/Kconfig | 9 + + drivers/rapidio/Makefile | 1 + + drivers/rapidio/devices/rio_mport_cdev.c | 6 +- + drivers/rapidio/devices/tsi721.c | 57 +- + drivers/rapidio/devices/tsi721.h | 2 +- + drivers/rapidio/devices/tsi721_dma.c | 27 +- + drivers/rapidio/rio-scan.c | 74 +- + drivers/rapidio/rio.c | 212 +- + drivers/rapidio/rio.h | 2 +- + drivers/rapidio/rio_cm.c | 2366 ++++++++++++++++++++ + drivers/rapidio/switches/Kconfig | 6 + + drivers/rapidio/switches/Makefile | 1 + + drivers/rapidio/switches/idt_gen2.c | 7 +- + drivers/rapidio/switches/idt_gen3.c | 382 ++++ + drivers/rapidio/switches/tsi57x.c | 26 +- + drivers/video/fbdev/bfin_adv7393fb.c | 2 + + drivers/video/fbdev/bfin_adv7393fb.h | 2 - + drivers/video/logo/logo.c | 4 +- + drivers/w1/masters/omap_hdq.c | 2 - + drivers/w1/slaves/w1_ds2406.c | 14 +- + drivers/w1/slaves/w1_ds2408.c | 14 +- + drivers/w1/slaves/w1_ds2413.c | 14 +- + drivers/w1/slaves/w1_ds2423.c | 14 +- + drivers/w1/slaves/w1_ds2431.c | 14 +- + drivers/w1/slaves/w1_ds2433.c | 14 +- + drivers/w1/slaves/w1_ds2760.c | 43 +- + drivers/w1/slaves/w1_ds2780.c | 39 +- + drivers/w1/slaves/w1_ds2781.c | 40 +- + drivers/w1/slaves/w1_ds28e04.c | 14 +- + drivers/w1/w1_family.h | 12 + + fs/binfmt_elf.c | 34 +- + fs/binfmt_em86.c | 3 +- + fs/ceph/addr.c | 77 +- + fs/ceph/cache.c | 2 +- + fs/ceph/caps.c | 873 ++++---- + fs/ceph/dir.c | 73 +- + fs/ceph/file.c | 77 +- + fs/ceph/inode.c | 40 +- + fs/ceph/ioctl.c | 30 +- + fs/ceph/mds_client.c | 358 +-- + fs/ceph/mds_client.h | 19 +- + fs/ceph/snap.c | 10 +- + fs/ceph/super.c | 43 +- + fs/ceph/super.h | 48 +- + fs/ceph/xattr.c | 101 +- + fs/exec.c | 9 +- + fs/inode.c | 2 +- + fs/nilfs2/alloc.c | 45 +- + fs/nilfs2/bmap.c | 4 +- + fs/nilfs2/bmap.h | 2 +- + fs/nilfs2/btnode.c | 4 +- + fs/nilfs2/btree.c | 61 +- + fs/nilfs2/btree.h | 2 +- + fs/nilfs2/cpfile.c | 23 +- + fs/nilfs2/cpfile.h | 3 +- + fs/nilfs2/dat.c | 19 +- + fs/nilfs2/dat.h | 1 + + fs/nilfs2/dir.c | 60 +- + fs/nilfs2/direct.c | 10 +- + fs/nilfs2/direct.h | 10 - + fs/nilfs2/gcinode.c | 9 +- + fs/nilfs2/ifile.c | 7 +- + fs/nilfs2/ifile.h | 1 - + fs/nilfs2/inode.c | 36 +- + fs/nilfs2/ioctl.c | 48 +- + fs/nilfs2/mdt.c | 6 +- + fs/nilfs2/namei.c | 6 +- + fs/nilfs2/nilfs.h | 48 +- + fs/nilfs2/page.c | 45 +- + fs/nilfs2/recovery.c | 72 +- + fs/nilfs2/segbuf.c | 6 +- + fs/nilfs2/segment.c | 61 +- + fs/nilfs2/segment.h | 1 - + fs/nilfs2/sufile.c | 44 +- + fs/nilfs2/sufile.h | 1 - + fs/nilfs2/super.c | 206 +- + fs/nilfs2/sysfs.c | 74 +- + fs/nilfs2/the_nilfs.c | 134 +- + fs/nilfs2/the_nilfs.h | 11 +- + fs/ocfs2/alloc.c | 37 + + fs/ocfs2/alloc.h | 2 + + fs/ocfs2/aops.c | 37 - + fs/ocfs2/dlm/dlmcommon.h | 2 + + fs/ocfs2/dlm/dlmmaster.c | 53 +- + fs/ocfs2/dlm/dlmrecovery.c | 29 +- + fs/ocfs2/dlm/dlmthread.c | 57 +- + fs/ocfs2/stack_user.c | 11 +- + fs/ocfs2/suballoc.c | 20 +- + fs/orangefs/dcache.c | 4 + + fs/orangefs/inode.c | 6 +- + fs/orangefs/namei.c | 12 + + fs/orangefs/orangefs-kernel.h | 6 +- + fs/orangefs/orangefs-mod.c | 2 + + fs/orangefs/orangefs-sysfs.c | 43 +- + fs/orangefs/orangefs-utils.c | 38 +- + fs/orangefs/protocol.h | 8 - + fs/proc/Makefile | 1 + + fs/proc/base.c | 7 +- + fs/proc/stat.c | 10 +- + fs/reiserfs/ibalance.c | 3 +- + include/acpi/acpi_io.h | 2 +- + include/drm/drm_dp_helper.h | 2 + + include/linux/capability.h | 1 + + include/linux/ceph/ceph_fs.h | 55 +- + include/linux/ceph/decode.h | 55 + + include/linux/ceph/libceph.h | 4 +- + include/linux/ceph/mon_client.h | 7 +- + include/linux/ceph/msgpool.h | 1 - + include/linux/ceph/osd_client.h | 1 + + include/linux/ceph/osdmap.h | 15 +- + include/linux/ceph/string_table.h | 62 + + include/linux/cpumask.h | 2 +- + include/linux/firmware.h | 8 + + include/linux/fs.h | 1 + + include/linux/init.h | 6 - + include/linux/ipc_namespace.h | 2 - + include/linux/kasan.h | 3 + + include/linux/kernel.h | 1 - + include/linux/kexec.h | 46 +- + include/linux/mman.h | 2 +- + include/linux/printk.h | 60 +- + include/linux/radix-tree.h | 2 +- + include/linux/ratelimit.h | 38 +- + include/linux/rio.h | 13 +- + include/linux/rio_ids.h | 2 + + include/linux/rio_regs.h | 167 +- + include/linux/sched.h | 63 + + include/linux/sysctl.h | 1 + + include/linux/thread_info.h | 41 - + include/net/net_namespace.h | 2 +- + include/net/sctp/constants.h | 2 +- + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/capability.h | 2 - + include/uapi/linux/nilfs2_api.h | 292 +++ + .../nilfs2_fs.h => uapi/linux/nilfs2_ondisk.h} | 328 +-- + include/uapi/linux/rio_cm_cdev.h | 78 + + include/uapi/linux/sysctl.h | 2 - + init/Kconfig | 8 +- + init/main.c | 8 +- + ipc/msg.c | 2 +- + ipc/msgutil.c | 2 - + ipc/namespace.c | 2 - + ipc/sem.c | 12 +- + kernel/configs/android-base.config | 152 ++ + kernel/configs/android-recommended.config | 121 + + kernel/exit.c | 2 +- + kernel/kexec.c | 3 +- + kernel/kexec_core.c | 69 +- + kernel/ksysfs.c | 6 +- + kernel/module.c | 1 + + kernel/panic.c | 13 +- + kernel/printk/internal.h | 16 +- + kernel/printk/nmi.c | 13 +- + kernel/printk/printk.c | 197 +- + kernel/relay.c | 34 +- + kernel/sysctl.c | 7 + + kernel/task_work.c | 10 +- + kernel/trace/Makefile | 4 + + kernel/trace/trace_events_hist.c | 14 +- + lib/Kconfig.debug | 11 + + lib/crc32.c | 16 +- + lib/iommu-helper.c | 3 +- + lib/radix-tree.c | 14 +- + lib/ratelimit.c | 10 +- + lib/ubsan.c | 2 +- + mm/hugetlb.c | 6 +- + mm/kasan/kasan.c | 65 +- + mm/kasan/kasan.h | 15 +- + mm/kasan/quarantine.c | 19 +- + mm/kasan/report.c | 85 +- + mm/memcontrol.c | 9 + + mm/memory.c | 3 + + mm/mmap.c | 8 +- + mm/page_alloc.c | 4 +- + mm/shmem.c | 3 +- + mm/slab.c | 6 +- + mm/slub.c | 1 + + mm/sparse-vmemmap.c | 2 +- + mm/sparse.c | 2 +- + mm/vmscan.c | 2 +- + net/ceph/Makefile | 2 +- + net/ceph/ceph_common.c | 2 + + net/ceph/ceph_fs.c | 30 +- + net/ceph/debugfs.c | 12 +- + net/ceph/mon_client.c | 4 +- + net/ceph/msgpool.c | 1 + + net/ceph/osd_client.c | 49 +- + net/ceph/osdmap.c | 58 +- + net/ceph/string_table.c | 111 + + net/ipv4/tcp_output.c | 3 +- + net/ipv6/addrconf.c | 3 +- + net/sctp/output.c | 3 +- + net/sctp/socket.c | 2 +- + net/sctp/ulpqueue.c | 4 +- + net/tipc/monitor.c | 2 +- + scripts/Makefile.lib | 2 +- + scripts/checkpatch.pl | 29 +- + scripts/get_maintainer.pl | 20 +- + scripts/recordmcount.c | 9 +- + tools/testing/radix-tree/linux/gfp.h | 2 +- + 309 files changed, 7571 insertions(+), 2980 deletions(-) + create mode 100644 Documentation/rapidio/rio_cm.txt + create mode 100644 drivers/rapidio/rio_cm.c + create mode 100644 drivers/rapidio/switches/idt_gen3.c + create mode 100644 include/linux/ceph/string_table.h + create mode 100644 include/uapi/linux/nilfs2_api.h + rename include/{linux/nilfs2_fs.h => uapi/linux/nilfs2_ondisk.h} (68%) + create mode 100644 include/uapi/linux/rio_cm_cdev.h + create mode 100644 kernel/configs/android-base.config + create mode 100644 kernel/configs/android-recommended.config + create mode 100644 net/ceph/string_table.c +Merging fixes/master (77a87824ed67 clocksource/drivers/clps_711x: fixup for "ARM: clps711x:) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (9bd54517ee86 arc: unwind: warn only once if DW2_UNWIND is disabled) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (f6492164ecb1 ARM: 8577/1: Fix Cortex-A15 798181 errata initialization) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-fixes/fixes (bad60e6f259a Merge tag 'powerpc-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (4620a06e4b3c shmem: Fix link error if huge pages support is disabled) +$ git merge sparc/master +Already up-to-date. +Merging net/master (7cf210dc2678 Merge branch 'qlcnic-fixes') +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 2 + + drivers/net/ethernet/broadcom/tg3.c | 5 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 4 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 2 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h | 9 +- + .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 95 +++++++++++++--------- + kernel/bpf/verifier.c | 3 +- + net/openvswitch/conntrack.c | 8 +- + 8 files changed, 68 insertions(+), 60 deletions(-) +Merging ipsec/master (6916fb3b10b3 xfrm: Ignore socket policies when rebuilding hash tables) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_policy.c | 4 ++++ + net/xfrm/xfrm_user.c | 13 ++++--------- + 2 files changed, 8 insertions(+), 9 deletions(-) +Merging netfilter/master (43dcff349f09 net: qlcnic: avoid superfluous assignement) +$ git merge netfilter/master +Already up-to-date. +Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes') +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (c37a54ac37e7 mac80211: mesh: flush stations before beacons are stopped) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + net/mac80211/mesh.c | 10 ++++++---- + net/mac80211/rx.c | 2 +- + net/wireless/chan.c | 1 + + 3 files changed, 8 insertions(+), 5 deletions(-) +Merging sound-current/for-linus (fd48331f9b71 ALSA: hda: add AMD Bonaire AZ PCI ID with proper driver caps) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/arm/Kconfig | 15 +++++++-------- + sound/pci/hda/hda_intel.c | 2 ++ + sound/pci/hda/patch_realtek.c | 31 +++++++++++++++++++++++++++++++ + 3 files changed, 40 insertions(+), 8 deletions(-) +Merging pci-current/for-linus (ef0dab4aae14 PCI: Fix unaligned accesses in VC code) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (523d939ef98f Linux 4.7) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (0e06f5c0deee Merge branch 'akpm' (patches from Andrew)) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (e65805251f2d Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (4c2e07c6a29e Linux 4.7-rc5) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging staging.current/staging-linus (0e06f5c0deee Merge branch 'akpm' (patches from Andrew)) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (0e06f5c0deee Merge branch 'akpm' (patches from Andrew)) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (080888286377 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (8cf740ae85df crypto: marvell - Don't copy IV vectors from the _process op for ciphers) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit) +$ git merge ide/master +Already up-to-date. +Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (ce7585f3c4d7 vfio/pci: Allow VPD short read) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (f80eb4289491 selftests/exec: Makefile is a run-time dependency, add it to the install list) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (5baaf3b9efe1 usb: dwc3: st: Use explicit reset_control_get_exclusive() API) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (ed2eebbd61af drm/i915: add missing condition for committing planes on crtc) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (3925a16ae980 ARC: mm: don't loose PTE_SPECIAL in pte_modify()) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (bf9cb4359182 Merge branches 'component', 'cpuidle', 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Resolved 'drivers/gpu/drm/msm/msm_drv.c' using previous resolution. +Resolved 'drivers/gpu/drm/rockchip/rockchip_drm_drv.c' using previous resolution. +Resolved 'drivers/gpu/drm/sti/sti_drv.c' using previous resolution. +Resolved 'drivers/iommu/mtk_iommu.c' using previous resolution. +Auto-merging drivers/iommu/mtk_iommu.c +CONFLICT (content): Merge conflict in drivers/iommu/mtk_iommu.c +Auto-merging drivers/gpu/drm/sti/sti_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/sti/sti_drv.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/rockchip/rockchip_drm_drv.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/armada/armada_drv.c +Auto-merging drivers/gpu/drm/arm/hdlcd_drv.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 130bcb5fea54] Merge remote-tracking branch 'arm/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/arm/hdlcd_drv.c | 10 ++++++++-- + drivers/gpu/drm/armada/armada_drv.c | 9 +++++++-- + drivers/gpu/drm/drm_of.c | 13 +++++++++---- + drivers/gpu/drm/msm/msm_drv.c | 17 ++++++++++------- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 13 ++++++++++--- + drivers/gpu/drm/sti/sti_drv.c | 9 +++++++-- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 9 +++++++-- + drivers/iommu/mtk_iommu.c | 13 ++++++++++--- + 8 files changed, 68 insertions(+), 25 deletions(-) +Merging arm-perf/for-next/perf (1a695a905c18 Linux 4.7-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (eae5b27ade3d arm-soc: document merges) +$ git merge arm-soc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm/arm-soc-for-next-contents.txt | 24 ++++++++++++++++++++++++ + arch/arm/configs/aspeed_g4_defconfig | 2 +- + arch/arm/configs/aspeed_g5_defconfig | 2 +- + arch/arm/mach-clps711x/Kconfig | 2 +- + arch/arm/mach-shmobile/platsmp.c | 3 +++ + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 3 +++ + 7 files changed, 34 insertions(+), 3 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (b55b87ac5976 Merge branch 'v4.7/clk' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Auto-merging drivers/clk/meson/gxbb.c +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm64/configs/defconfig | 2 ++ + drivers/clk/meson/gxbb.c | 9 +++++++++ + drivers/clk/meson/gxbb.h | 7 +++++-- + include/dt-bindings/clock/gxbb-clkc.h | 4 ++++ + 4 files changed, 20 insertions(+), 2 deletions(-) +Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (aa5c0a1e15c2 Merge branch anholt/bcm2835-dt-64-next into for-next) +$ git merge bcm2835/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging berlin/berlin/for-next (d433580f3b4e Merge branches 'berlin64/dt' and 'berlin/dt' into berlin/for-next) +$ git merge berlin/berlin/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/berlin2.dtsi | 2 -- + arch/arm/boot/dts/berlin2q.dtsi | 2 -- + arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 12 +++++++++--- + 3 files changed, 9 insertions(+), 7 deletions(-) +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (63a404a3f177 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 (eef6bb9fc17a Merge branch 'for_4.8/keystone' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (feaf6b0beba8 Merge branch 'mvebu/defconfig64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (370c3261ba8a Merge branch 'omap-for-v4.8/soc' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/dm814x-clocks.dtsi | 4 ++-- + arch/arm/mach-omap2/cm33xx.c | 6 ------ + arch/arm/mach-omap2/cminst44xx.c | 6 ------ + arch/arm/mach-omap2/omap_hwmod.c | 8 ++++++++ + arch/arm/mach-omap2/omap_hwmod.h | 4 ++++ + arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 2 ++ + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 12 ++++++++++++ + 7 files changed, 28 insertions(+), 14 deletions(-) +Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) +$ git merge omap-pending/for-next +Already up-to-date. +Merging qcom/for-next (289f9fb05d0c ARM: dts: msm8916: Add smsm and smp2p nodes) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/qcom/msm8916.dtsi | 82 +++++++++++++++++++++++++++++++++++ + 1 file changed, 82 insertions(+) +Merging renesas/next (314a0bb0dd88 Merge branch 'heads/soc-fixes-for-v4.8' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. +Merging rockchip/for-next (ebbfb5d5627d Merge branch 'v4.8-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm64/boot/dts/rockchip/rk3399.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/rockchip.txt | 4 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/rk3288-evb-act8846.dts | 4 + + arch/arm/boot/dts/rk3288-evb-rk808.dts | 4 + + arch/arm/boot/dts/rk3288-evb.dtsi | 45 ++- + arch/arm/boot/dts/rk3288-fennec.dts | 382 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 178 ++++++++++ + 7 files changed, 617 insertions(+), 1 deletion(-) + create mode 100644 arch/arm/boot/dts/rk3288-fennec.dts +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (253256f64294 Merge branch 'next/soc' into for-next) +$ git merge samsung-krzk/for-next +Resolved 'arch/arm/boot/dts/exynos5420.dtsi' using previous resolution. +Auto-merging arch/arm/boot/dts/exynos5420.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5420.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 50e4cfe7f334] Merge remote-tracking branch 'samsung-krzk/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging tegra/for-next (b551165a4593 Merge branch for-4.8/arm64/defconfig into for-next) +$ git merge tegra/for-next +Auto-merging drivers/i2c/i2c-core.c +Auto-merging Documentation/devicetree/bindings/i2c/i2c.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i2c/i2c.txt | 8 ++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 18 ++++++++++++++++++ + drivers/i2c/i2c-core.c | 10 ++++++++-- + 3 files changed, 34 insertions(+), 2 deletions(-) +Merging arm64/for-next/core (fd6380b75065 arm64: arm: Fix-up the removal of the arm64 regs_query_register_name() prototype) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Resolved 'arch/blackfin/mach-common/pm.c' using previous resolution. +Auto-merging arch/blackfin/mach-common/pm.c +CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f89239f71623] Merge remote-tracking branch 'blackfin/for-linus' +$ git diff -M --stat --summary HEAD^.. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + arch/h8300/include/asm/io.h | 2 ++ + 1 file changed, 2 insertions(+) +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (33688abb2802 Linux 4.7-rc4) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (fb2bb461e2d8 metag: Remove duplicate KERN_<LEVEL> prefix) +$ git merge metag/for-next +Auto-merging arch/metag/mm/fault.c +Merge made by the 'recursive' strategy. + arch/metag/include/asm/metag_mem.h | 2 +- + arch/metag/include/asm/metag_regs.h | 2 +- + arch/metag/kernel/cachepart.c | 2 +- + arch/metag/lib/divsi3.S | 4 ++-- + arch/metag/mm/fault.c | 2 +- + 5 files changed, 6 insertions(+), 6 deletions(-) +Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (4a89cf810130 Merge branch '4.7-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Auto-merging arch/mips/pistachio/init.c +Auto-merging arch/mips/pic32/pic32mzda/init.c +Auto-merging arch/mips/mm/uasm.c +Auto-merging arch/mips/mm/uasm-mips.c +Auto-merging arch/mips/mm/c-r4k.c +Auto-merging arch/mips/math-emu/cp1emu.c +Auto-merging arch/mips/kernel/traps.c +Auto-merging arch/mips/ath79/setup.c +Auto-merging arch/mips/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 10 + + arch/mips/Kconfig | 47 +-- + arch/mips/ath79/setup.c | 4 +- + arch/mips/bmips/setup.c | 4 +- + arch/mips/boot/compressed/decompress.c | 17 ++ + arch/mips/boot/compressed/head.S | 16 - + .../boot/dts/cavium-octeon/dlink_dsr-1000n.dts | 20 +- + arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts | 12 - + arch/mips/boot/tools/relocs_64.c | 19 +- + arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 2 +- + .../cavium-octeon/executive/cvmx-helper-board.c | 22 -- + arch/mips/cavium-octeon/octeon-irq.c | 14 +- + arch/mips/cavium-octeon/octeon-platform.c | 125 ++++---- + arch/mips/cavium-octeon/setup.c | 20 +- + arch/mips/cavium-octeon/smp.c | 1 + + arch/mips/cobalt/setup.c | 4 +- + arch/mips/configs/ath25_defconfig | 119 ++++++++ + arch/mips/configs/cavium_octeon_defconfig | 2 + + arch/mips/include/asm/bootinfo.h | 4 + + arch/mips/include/asm/dsemul.h | 92 ++++++ + arch/mips/include/asm/elf.h | 4 + + arch/mips/include/asm/fpu_emulator.h | 17 +- + arch/mips/include/asm/mach-cavium-octeon/irq.h | 2 - + .../include/asm/mach-cavium-octeon/mangle-port.h | 42 +-- + arch/mips/include/asm/mmu.h | 9 + + arch/mips/include/asm/mmu_context.h | 6 + + arch/mips/include/asm/msa.h | 2 + + arch/mips/include/asm/page.h | 44 ++- + arch/mips/include/asm/processor.h | 18 +- + arch/mips/include/asm/r4kcache.h | 4 + + arch/mips/include/asm/signal.h | 2 +- + arch/mips/include/asm/smp.h | 4 +- + arch/mips/include/uapi/asm/auxvec.h | 2 + + arch/mips/kernel/Makefile | 2 +- + arch/mips/kernel/cevt-r4k.c | 7 +- + arch/mips/kernel/csrc-r4k.c | 4 +- + arch/mips/kernel/elf.c | 19 ++ + arch/mips/kernel/head.S | 21 +- + arch/mips/kernel/mips-r2-to-r6-emul.c | 8 +- + arch/mips/kernel/process.c | 14 + + arch/mips/kernel/scall64-n32.S | 2 +- + arch/mips/kernel/scall64-o32.S | 2 +- + arch/mips/kernel/segment.c | 13 +- + arch/mips/kernel/setup.c | 4 + + arch/mips/kernel/signal.c | 8 + + arch/mips/kernel/signal32.c | 288 +----------------- + arch/mips/kernel/signal_o32.c | 285 ++++++++++++++++++ + arch/mips/kernel/smp-bmips.c | 1 + + arch/mips/kernel/smp-cps.c | 42 ++- + arch/mips/kernel/smp.c | 34 ++- + arch/mips/kernel/traps.c | 4 +- + arch/mips/kernel/vdso.c | 10 + + arch/mips/lantiq/irq.c | 31 +- + arch/mips/lantiq/prom.c | 4 +- + arch/mips/loongson64/loongson-3/hpet.c | 14 +- + arch/mips/loongson64/loongson-3/smp.c | 1 + + arch/mips/math-emu/cp1emu.c | 8 +- + arch/mips/math-emu/dsemul.c | 333 ++++++++++++++------- + arch/mips/mm/c-r4k.c | 284 ++++++++++++++---- + arch/mips/mm/sc-debugfs.c | 4 +- + arch/mips/mm/sc-rm7k.c | 2 +- + arch/mips/mm/tlbex.c | 2 +- + arch/mips/mm/uasm-mips.c | 2 +- + arch/mips/mm/uasm.c | 6 +- + arch/mips/net/bpf_jit.c | 2 +- + arch/mips/pic32/pic32mzda/init.c | 4 +- + arch/mips/pistachio/init.c | 25 -- + arch/mips/ralink/mt7620.c | 2 +- + drivers/ssb/driver_gpio.c | 22 +- + 69 files changed, 1418 insertions(+), 806 deletions(-) + create mode 100644 arch/mips/configs/ath25_defconfig + create mode 100644 arch/mips/include/asm/dsemul.h + create mode 100644 arch/mips/kernel/signal_o32.c +Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target) +$ git merge nios2/for-next +Already up-to-date. +Merging parisc-hd/for-next (a549c45a22de parisc: Change structure intialisation to C99 style in iomap.c) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/hash.h | 146 +++++++++++++++++++++++++++++++++++++++++ + arch/parisc/kernel/firmware.c | 6 +- + arch/parisc/lib/iomap.c | 64 +++++++++--------- + 4 files changed, 182 insertions(+), 35 deletions(-) + create mode 100644 arch/parisc/include/asm/hash.h +Merging powerpc/next (a67ae75802f1 powerpc/ptrace: Enable support for Performance Monitor registers) +$ git merge powerpc/next +Auto-merging mm/hugetlb.c +Auto-merging arch/powerpc/kernel/idle_book3s.S +Auto-merging arch/powerpc/kernel/exceptions-64s.S +Auto-merging arch/powerpc/include/asm/mman.h +Merge made by the 'recursive' strategy. + arch/powerpc/Kconfig.debug | 19 + + arch/powerpc/include/asm/book3s/64/hugetlb-radix.h | 15 + + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 10 + + arch/powerpc/include/asm/book3s/64/mmu.h | 12 +- + arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 5 - + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 16 +- + arch/powerpc/include/asm/book3s/64/tlbflush.h | 27 +- + arch/powerpc/include/asm/cacheflush.h | 1 + + arch/powerpc/include/asm/cpu_has_feature.h | 53 + + arch/powerpc/include/asm/cputable.h | 15 +- + arch/powerpc/include/asm/cputime.h | 1 + + arch/powerpc/include/asm/dbell.h | 1 + + arch/powerpc/include/asm/dcr-native.h | 1 + + arch/powerpc/include/asm/hugetlb.h | 2 +- + arch/powerpc/include/asm/jump_label.h | 4 +- + arch/powerpc/include/asm/kvm_book3s_64.h | 3 +- + arch/powerpc/include/asm/mman.h | 1 + + arch/powerpc/include/asm/mmu.h | 98 +- + arch/powerpc/include/asm/reg.h | 9 - + arch/powerpc/include/asm/switch_to.h | 8 + + arch/powerpc/include/asm/time.h | 3 +- + arch/powerpc/include/asm/tlb.h | 13 + + arch/powerpc/include/asm/tlbflush.h | 1 - + arch/powerpc/include/asm/xor.h | 1 + + arch/powerpc/include/uapi/asm/elf.h | 5 + + arch/powerpc/kernel/align.c | 1 + + arch/powerpc/kernel/cputable.c | 37 + + arch/powerpc/kernel/entry_64.S | 2 +- + arch/powerpc/kernel/exceptions-64s.S | 8 +- + arch/powerpc/kernel/idle_book3s.S | 2 +- + arch/powerpc/kernel/irq.c | 1 + + arch/powerpc/kernel/paca.c | 2 +- + arch/powerpc/kernel/process.c | 21 + + arch/powerpc/kernel/prom.c | 17 +- + arch/powerpc/kernel/ptrace.c | 1740 ++++++++++++++++++-- + arch/powerpc/kernel/setup-common.c | 1 + + arch/powerpc/kernel/setup_32.c | 1 + + arch/powerpc/kernel/setup_64.c | 10 +- + arch/powerpc/kernel/smp.c | 1 + + arch/powerpc/lib/feature-fixups.c | 37 +- + arch/powerpc/mm/hash_native_64.c | 6 +- + arch/powerpc/mm/hash_utils_64.c | 53 +- + arch/powerpc/mm/hugetlbpage-radix.c | 39 +- + arch/powerpc/mm/init_64.c | 22 + + arch/powerpc/mm/pgtable-book3s64.c | 4 +- + arch/powerpc/mm/pgtable-radix.c | 3 +- + arch/powerpc/mm/pgtable.c | 2 +- + arch/powerpc/mm/tlb-radix.c | 90 +- + arch/powerpc/mm/tlb_hash32.c | 11 - + arch/powerpc/mm/tlb_nohash.c | 6 - + arch/powerpc/platforms/cell/pervasive.c | 1 + + arch/powerpc/xmon/ppc-dis.c | 1 + + include/uapi/linux/elf.h | 13 + + kernel/jump_label.c | 3 + + mm/hugetlb.c | 10 +- + 55 files changed, 2164 insertions(+), 305 deletions(-) + create mode 100644 arch/powerpc/include/asm/cpu_has_feature.h +Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (9f595fd8b548 powerpc/8xx: Force VIRT_IMMR_BASE to be a positive number) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (44cee85a8824 Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild) +$ git merge s390/features +Already up-to-date. +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 sh/for-next (04394bc3bd17 sh: use common clock framework with device tree boards) +$ git merge sh/for-next +Merge made by the 'recursive' strategy. + arch/sh/Kconfig | 34 +++++ + arch/sh/Makefile | 3 + + arch/sh/boards/Kconfig | 1 + + arch/sh/boards/board-secureedge5410.c | 3 +- + arch/sh/boards/of-generic.c | 15 ++- + arch/sh/boot/dts/Makefile | 3 + + arch/sh/drivers/heartbeat.c | 32 +---- + arch/sh/include/asm/atomic.h | 8 ++ + arch/sh/include/asm/barrier.h | 5 + + arch/sh/include/asm/bitops-cas.h | 93 +++++++++++++ + arch/sh/include/asm/bitops.h | 2 + + arch/sh/include/asm/cmpxchg-cas.h | 24 ++++ + arch/sh/include/asm/cmpxchg-xchg.h | 2 +- + arch/sh/include/asm/cmpxchg.h | 2 + + arch/sh/include/asm/futex-cas.h | 34 +++++ + arch/sh/include/asm/futex-irq.h | 86 ------------ + arch/sh/include/asm/futex-llsc.h | 41 ++++++ + arch/sh/include/asm/futex.h | 97 ++++++++------ + arch/sh/include/asm/processor.h | 2 +- + arch/sh/include/asm/spinlock-cas.h | 117 +++++++++++++++++ + arch/sh/include/asm/spinlock-llsc.h | 224 ++++++++++++++++++++++++++++++++ + arch/sh/include/asm/spinlock.h | 222 +------------------------------ + arch/sh/include/uapi/asm/cpu-features.h | 1 + + arch/sh/include/uapi/asm/sigcontext.h | 3 - + arch/sh/include/uapi/asm/unistd_32.h | 16 ++- + arch/sh/include/uapi/asm/unistd_64.h | 16 ++- + arch/sh/kernel/cpu/clock.c | 4 + + arch/sh/kernel/cpu/init.c | 6 +- + arch/sh/kernel/cpu/proc.c | 1 + + arch/sh/kernel/cpu/sh2/Makefile | 4 + + arch/sh/kernel/cpu/sh2/entry.S | 55 ++++++++ + arch/sh/kernel/cpu/sh2/probe.c | 36 ++++- + arch/sh/kernel/cpu/sh2/smp-j2.c | 138 ++++++++++++++++++++ + arch/sh/kernel/dwarf.c | 6 +- + arch/sh/kernel/head_32.S | 6 +- + arch/sh/kernel/setup.c | 6 +- + arch/sh/kernel/syscalls_32.S | 14 ++ + arch/sh/kernel/syscalls_64.S | 14 ++ + arch/sh/kernel/time.c | 3 +- + arch/sh/mm/Makefile | 3 +- + arch/sh/mm/asids-debugfs.c | 5 +- + arch/sh/mm/cache-j2.c | 58 +++++++++ + arch/sh/mm/cache.c | 13 +- + 43 files changed, 1059 insertions(+), 399 deletions(-) + create mode 100644 arch/sh/boot/dts/Makefile + create mode 100644 arch/sh/include/asm/bitops-cas.h + create mode 100644 arch/sh/include/asm/cmpxchg-cas.h + create mode 100644 arch/sh/include/asm/futex-cas.h + create mode 100644 arch/sh/include/asm/futex-llsc.h + create mode 100644 arch/sh/include/asm/spinlock-cas.h + create mode 100644 arch/sh/include/asm/spinlock-llsc.h + create mode 100644 arch/sh/kernel/cpu/sh2/smp-j2.c + create mode 100644 arch/sh/mm/cache-j2.c +Merging tile/master (74050a3188c8 tile-srom: avoid krealloc(... __GFP_ZERO) pattern) +$ git merge tile/master +Merge made by the 'recursive' strategy. + drivers/char/tile-srom.c | 28 +++++++++++++++------------- + 1 file changed, 15 insertions(+), 13 deletions(-) +Merging uml/linux-next (8a545f185145 hostfs: Freeing an ERR_PTR in hostfs_fill_sb_common()) +$ git merge uml/linux-next +Auto-merging arch/um/Kconfig.common +Merge made by the 'recursive' strategy. + arch/um/Kconfig.common | 5 +++-- + arch/um/include/asm/irqflags.h | 18 +++++++----------- + arch/um/kernel/Makefile | 5 +++++ + arch/um/kernel/initrd.c | 2 -- + arch/um/kernel/um_arch.c | 8 ++++---- + arch/um/os-Linux/Makefile | 3 +++ + arch/um/os-Linux/signal.c | 5 +++-- + arch/x86/um/vdso/Makefile | 3 +++ + fs/hostfs/hostfs_kern.c | 7 ++++--- + 9 files changed, 32 insertions(+), 24 deletions(-) +Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted) +$ git merge unicore32/unicore32 +Merge made by the 'recursive' strategy. + arch/unicore32/include/asm/mmu_context.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging xtensa/for_next (9e8511ff7e3f Merge tag 'xtensa-for-next-20160731' of git://github.com/jcmvbkbc/linux-xtensa into for_next) +$ git merge xtensa/for_next +Auto-merging arch/xtensa/kernel/setup.c +Merge made by the 'recursive' strategy. + Documentation/xtensa/mmu.txt | 173 ++++++++++++++++--- + arch/xtensa/Kconfig | 90 ++++++++-- + arch/xtensa/boot/boot-elf/boot.lds.S | 2 +- + arch/xtensa/boot/boot-elf/bootstrap.S | 7 +- + arch/xtensa/boot/boot-uboot/Makefile | 10 +- + arch/xtensa/include/asm/bitops.h | 2 +- + arch/xtensa/include/asm/cacheasm.h | 11 +- + arch/xtensa/include/asm/fixmap.h | 5 + + arch/xtensa/include/asm/highmem.h | 5 + + arch/xtensa/include/asm/initialize_mmu.h | 44 +++-- + arch/xtensa/include/asm/kmem_layout.h | 74 ++++++++ + arch/xtensa/include/asm/page.h | 27 ++- + arch/xtensa/include/asm/pgtable.h | 7 +- + arch/xtensa/include/asm/processor.h | 2 +- + arch/xtensa/include/asm/sysmem.h | 21 +-- + arch/xtensa/include/asm/vectors.h | 67 +++----- + arch/xtensa/include/uapi/asm/types.h | 3 +- + arch/xtensa/include/uapi/asm/unistd.h | 15 +- + arch/xtensa/kernel/entry.S | 5 +- + arch/xtensa/kernel/head.S | 2 +- + arch/xtensa/kernel/setup.c | 48 +++--- + arch/xtensa/kernel/vmlinux.lds.S | 4 - + arch/xtensa/mm/init.c | 279 +++---------------------------- + 23 files changed, 448 insertions(+), 455 deletions(-) + create mode 100644 arch/xtensa/include/asm/kmem_layout.h +Merging befs/for-next (3e35c149e220 fs: befs: remove ret variable) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. + fs/befs/befs.h | 12 ----- + fs/befs/btree.c | 22 ++++----- + fs/befs/datastream.c | 24 ++++------ + fs/befs/io.c | 24 ---------- + fs/befs/io.h | 2 - + fs/befs/linuxvfs.c | 130 +++++++++++++++++++++++++-------------------------- + fs/befs/super.c | 2 +- + 7 files changed, 83 insertions(+), 133 deletions(-) +Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults) +$ git merge btrfs/next +Already up-to-date. +Merging btrfs-kdave/for-next (d84c090ad3e9 Fixup: fs_info/root cleanups and qgroups patches) +$ git merge btrfs-kdave/for-next +Resolved 'fs/btrfs/compression.c' using previous resolution. +Resolved 'fs/btrfs/extent_io.c' using previous resolution. +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/scrub.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.c +CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c +Auto-merging fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/disk-io.h +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/compression.c +CONFLICT (content): Merge conflict in fs/btrfs/compression.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5f6211cbd7c0] Merge remote-tracking branch 'btrfs-kdave/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/acl.c | 3 +- + fs/btrfs/async-thread.c | 31 ++- + fs/btrfs/async-thread.h | 6 +- + fs/btrfs/backref.c | 366 ++++++++++++++++++++++++++++++++- + fs/btrfs/compression.c | 10 +- + fs/btrfs/ctree.c | 91 +++++--- + fs/btrfs/ctree.h | 101 +++++---- + fs/btrfs/dedupe.h | 24 +++ + fs/btrfs/delayed-inode.c | 4 +- + fs/btrfs/delayed-ref.c | 17 +- + fs/btrfs/dev-replace.c | 4 +- + fs/btrfs/disk-io.c | 181 +++++++++++----- + fs/btrfs/disk-io.h | 5 +- + fs/btrfs/extent-tree.c | 137 +++++++----- + fs/btrfs/extent_io.c | 48 ++++- + fs/btrfs/extent_map.c | 2 +- + fs/btrfs/file-item.c | 9 +- + fs/btrfs/file.c | 20 +- + fs/btrfs/free-space-cache.c | 8 +- + fs/btrfs/free-space-tree.c | 16 +- + fs/btrfs/inode-map.c | 16 +- + fs/btrfs/inode.c | 264 ++++++++++++++---------- + fs/btrfs/ioctl.c | 40 ++-- + fs/btrfs/ordered-data.c | 2 +- + fs/btrfs/props.c | 6 +- + fs/btrfs/qgroup.c | 25 +-- + fs/btrfs/qgroup.h | 9 +- + fs/btrfs/relocation.c | 115 ++++++++++- + fs/btrfs/root-tree.c | 10 +- + fs/btrfs/scrub.c | 12 +- + fs/btrfs/send.c | 125 ++++++++++- + fs/btrfs/super.c | 218 +++++++++----------- + fs/btrfs/sysfs.c | 2 + + fs/btrfs/tests/btrfs-tests.c | 67 +++++- + fs/btrfs/tests/btrfs-tests.h | 36 +--- + fs/btrfs/tests/extent-buffer-tests.c | 23 ++- + fs/btrfs/tests/free-space-tests.c | 14 +- + fs/btrfs/tests/free-space-tree-tests.c | 18 +- + fs/btrfs/tests/inode-tests.c | 46 +++-- + fs/btrfs/tests/qgroup-tests.c | 23 ++- + fs/btrfs/transaction.c | 37 ++-- + fs/btrfs/transaction.h | 1 + + fs/btrfs/tree-log.c | 107 ++++++++-- + fs/btrfs/volumes.c | 138 ++++++++----- + include/trace/events/btrfs.h | 295 ++++++++++++++------------ + include/uapi/linux/btrfs.h | 2 +- + 46 files changed, 1871 insertions(+), 863 deletions(-) + create mode 100644 fs/btrfs/dedupe.h +Merging ceph/master (a0f2b6527541 ceph: fix symbol versioning for ceph_monc_do_statfs) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (8e1e83d23606 Move check for prefix path to within cifs_get_root()) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsfs.c | 29 ++++++++++++----------------- + fs/cifs/cifsproto.h | 2 +- + fs/cifs/connect.c | 31 +++++++++++++++++++++++++++++-- + 3 files changed, 42 insertions(+), 20 deletions(-) +Merging configfs/for-next (3dc3afadeb04 configfs: don't set buffer_needs_fill to zero if show() returns error) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (2bdcdbea80bd ecryptfs: don't allow mmap when the lower fs doesn't support it) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. +Merging ext3/for_next (e008bb6134a6 quota: use time64_t internally) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (7bc949164511 ext4: verify extent header depth) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (194dc870a589 Add braces to avoid "ambiguous ‘else’" compiler warnings) +$ git merge f2fs/dev +Already up-to-date. +Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) +$ git merge freevxfs/for-next +Already up-to-date. +Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew)) +$ git merge fscache/fscache +Already up-to-date. +Merging fuse/for-next (7244b9538994 f2fs: use filemap_check_errors()) +$ git merge fuse/for-next +Auto-merging fs/f2fs/node.c +Auto-merging fs/btrfs/tree-log.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ctree.h +Merge made by the 'recursive' strategy. + fs/btrfs/ctree.h | 1 - + fs/btrfs/inode.c | 15 --------------- + fs/btrfs/tree-log.c | 4 ++-- + fs/f2fs/node.c | 7 ++----- + 4 files changed, 4 insertions(+), 23 deletions(-) +$ git am -3 ../patches/0001-btrfs-merge-fix-for-mm-export-filemap_check_errors-t.patch +Applying: btrfs: merge fix for "mm: export filemap_check_errors() to modules" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/btrfs/file.c +$ git add -A . +$ git commit -v -a --amend +[master 7c66860b0b8f] Merge remote-tracking branch 'fuse/for-next' + Date: Thu Aug 4 10:30:09 2016 +1000 +Merging gfs2/for-next (47a9a5279468 GFS2: use BIT() macro) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 2 +- + fs/gfs2/bmap.c | 6 +++--- + fs/gfs2/dir.c | 20 ++++++++++---------- + fs/gfs2/glock.c | 2 +- + fs/gfs2/inode.h | 2 +- + fs/gfs2/ops_fstype.c | 8 ++++---- + fs/gfs2/quota.c | 4 ++-- + fs/gfs2/super.c | 2 +- + 8 files changed, 23 insertions(+), 23 deletions(-) +Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (1f4c17a03ba7 SUNRPC: Handle EADDRNOTAVAIL on connection failures) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + net/sunrpc/xprtsock.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging nfsd/nfsd-next (6446918f1956 nfsd: remove some dead code in nfsd_create_locked()) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/svc.c +Auto-merging include/linux/nfs_xdr.h +Auto-merging fs/nfsd/blocklayoutxdr.c +Auto-merging fs/nfsd/blocklayout.c +Auto-merging fs/Kconfig +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 6 ++ + fs/Kconfig | 6 ++ + fs/nfsd/Kconfig | 19 +++++ + fs/nfsd/Makefile | 1 + + fs/nfsd/blocklayout.c | 2 + + fs/nfsd/blocklayoutxdr.c | 4 +- + fs/nfsd/export.c | 14 +++- + fs/nfsd/export.h | 2 +- + fs/nfsd/flexfilelayout.c | 133 +++++++++++++++++++++++++++++ + fs/nfsd/flexfilelayoutxdr.c | 115 +++++++++++++++++++++++++ + fs/nfsd/flexfilelayoutxdr.h | 49 +++++++++++ + fs/nfsd/nfs3proc.c | 1 - + fs/nfsd/nfs4layouts.c | 16 +++- + fs/nfsd/nfs4proc.c | 48 +++++++++-- + fs/nfsd/nfs4state.c | 75 ++++++++++------- + fs/nfsd/nfs4xdr.c | 82 ++++++++---------- + fs/nfsd/nfsd.h | 5 ++ + fs/nfsd/nfsfh.c | 18 ++-- + fs/nfsd/nfsproc.c | 8 +- + fs/nfsd/nfsxdr.c | 2 +- + fs/nfsd/pnfs.h | 4 + + fs/nfsd/state.h | 1 + + fs/nfsd/vfs.c | 142 ++++++++++++++----------------- + fs/nfsd/vfs.h | 3 + + fs/nfsd/xdr4.h | 5 ++ + fs/xfs/Makefile | 3 +- + fs/xfs/xfs_export.c | 2 +- + fs/xfs/xfs_pnfs.h | 4 +- + include/linux/nfs4.h | 11 +++ + include/linux/nfs_xdr.h | 11 --- + include/linux/sunrpc/cache.h | 2 - + include/linux/sunrpc/svc.h | 17 +--- + include/linux/sunrpc/svc_xprt.h | 3 +- + include/trace/events/sunrpc.h | 118 ++++++++++++++++++++++---- + net/sunrpc/auth_gss/svcauth_gss.c | 5 +- + net/sunrpc/cache.c | 2 +- + net/sunrpc/svc.c | 6 -- + net/sunrpc/svc_xprt.c | 88 +++++++++---------- + net/sunrpc/svcsock.c | 163 +++++++++--------------------------- + 39 files changed, 785 insertions(+), 411 deletions(-) + create mode 100644 fs/nfsd/flexfilelayout.c + create mode 100644 fs/nfsd/flexfilelayoutxdr.c + create mode 100644 fs/nfsd/flexfilelayoutxdr.h +Merging orangefs/for-next (78fee0b6846f orangefs: fix namespace handling) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (b92a89750dba Revert "vfs: add lookup_hash() helper") +$ git merge overlayfs/overlayfs-next +Auto-merging include/linux/fsnotify.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/dcache.h +Auto-merging fs/namespace.c +Auto-merging fs/inode.c +Merge made by the 'recursive' strategy. + fs/inode.c | 38 ++++++++++++++++++++++++++++------ + fs/locks.c | 53 +++++++++++++++++++++++++++--------------------- + fs/namespace.c | 2 +- + fs/open.c | 17 +++++++++++++--- + fs/overlayfs/inode.c | 21 ------------------- + fs/overlayfs/super.c | 2 +- + include/linux/dcache.h | 5 +++-- + include/linux/fs.h | 16 +++++++++++++-- + include/linux/fsnotify.h | 14 ++++++++----- + include/uapi/linux/fs.h | 1 + + 10 files changed, 105 insertions(+), 64 deletions(-) +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (5d71afb00840 ubi: Use bitmaps in Fastmap self-check code) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/attach.c | 141 ++++++++++++++++++++++++++++++++++------------ + drivers/mtd/ubi/build.c | 13 +++-- + drivers/mtd/ubi/fastmap.c | 65 ++++++++++++++++----- + drivers/mtd/ubi/gluebi.c | 5 -- + drivers/mtd/ubi/io.c | 2 +- + drivers/mtd/ubi/ubi.h | 46 ++++++++++++++- + drivers/mtd/ubi/vmt.c | 25 +++++--- + drivers/mtd/ubi/wl.c | 41 +++++++++++--- + fs/ubifs/gc.c | 4 -- + fs/ubifs/super.c | 19 ++++--- + fs/ubifs/ubifs.h | 4 +- + fs/ubifs/xattr.c | 6 +- + 12 files changed, 278 insertions(+), 93 deletions(-) +Merging xfs/for-next (3481b6828523 xfs: move (and rename) the deferred bmap-free tracepoints) +$ git merge xfs/for-next +Auto-merging fs/xfs/xfs_stats.c +Auto-merging fs/xfs/Makefile +Merge made by the 'recursive' strategy. + fs/xfs/Makefile | 5 + + fs/xfs/libxfs/xfs_alloc.c | 149 +++- + fs/xfs/libxfs/xfs_alloc.h | 52 +- + fs/xfs/libxfs/xfs_alloc_btree.c | 12 - + fs/xfs/libxfs/xfs_attr.c | 71 +- + fs/xfs/libxfs/xfs_attr_leaf.c | 4 +- + fs/xfs/libxfs/xfs_attr_remote.c | 19 +- + fs/xfs/libxfs/xfs_bmap.c | 241 ++++--- + fs/xfs/libxfs/xfs_bmap.h | 54 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 32 +- + fs/xfs/libxfs/xfs_btree.c | 914 +++++++++++++++++++++---- + fs/xfs/libxfs/xfs_btree.h | 88 ++- + fs/xfs/libxfs/xfs_da_btree.c | 6 +- + fs/xfs/libxfs/xfs_da_btree.h | 4 +- + fs/xfs/libxfs/xfs_da_format.h | 1 + + fs/xfs/libxfs/xfs_defer.c | 463 +++++++++++++ + fs/xfs/libxfs/xfs_defer.h | 97 +++ + fs/xfs/libxfs/xfs_dir2.c | 15 +- + fs/xfs/libxfs/xfs_dir2.h | 8 +- + fs/xfs/libxfs/xfs_format.h | 131 +++- + fs/xfs/libxfs/xfs_fs.h | 1 + + fs/xfs/libxfs/xfs_ialloc.c | 23 +- + fs/xfs/libxfs/xfs_ialloc.h | 2 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 18 +- + fs/xfs/libxfs/xfs_inode_buf.c | 1 + + fs/xfs/libxfs/xfs_log_format.h | 63 +- + fs/xfs/libxfs/xfs_rmap.c | 1399 ++++++++++++++++++++++++++++++++++++++ + fs/xfs/libxfs/xfs_rmap.h | 209 ++++++ + fs/xfs/libxfs/xfs_rmap_btree.c | 511 ++++++++++++++ + fs/xfs/libxfs/xfs_rmap_btree.h | 61 ++ + fs/xfs/libxfs/xfs_sb.c | 9 + + fs/xfs/libxfs/xfs_shared.h | 2 + + fs/xfs/libxfs/xfs_trans_resv.c | 62 +- + fs/xfs/libxfs/xfs_trans_resv.h | 10 - + fs/xfs/libxfs/xfs_types.h | 4 +- + fs/xfs/xfs_bmap_util.c | 139 +--- + fs/xfs/xfs_bmap_util.h | 4 +- + fs/xfs/xfs_discard.c | 2 +- + fs/xfs/xfs_dquot.c | 13 +- + fs/xfs/xfs_error.h | 6 +- + fs/xfs/xfs_extfree_item.c | 69 ++ + fs/xfs/xfs_extfree_item.h | 3 + + fs/xfs/xfs_filestream.c | 3 +- + fs/xfs/xfs_fsops.c | 106 ++- + fs/xfs/xfs_inode.c | 99 +-- + fs/xfs/xfs_inode.h | 4 +- + fs/xfs/xfs_ioctl.c | 6 + + fs/xfs/xfs_iomap.c | 31 +- + fs/xfs/xfs_log_recover.c | 336 ++++++--- + fs/xfs/xfs_mount.c | 7 +- + fs/xfs/xfs_mount.h | 6 + + fs/xfs/xfs_ondisk.h | 3 + + fs/xfs/xfs_rmap_item.c | 536 +++++++++++++++ + fs/xfs/xfs_rmap_item.h | 95 +++ + fs/xfs/xfs_rtalloc.c | 11 +- + fs/xfs/xfs_stats.c | 1 + + fs/xfs/xfs_stats.h | 18 +- + fs/xfs/xfs_super.c | 30 +- + fs/xfs/xfs_symlink.c | 25 +- + fs/xfs/xfs_trace.c | 2 + + fs/xfs/xfs_trace.h | 374 ++++++++++ + fs/xfs/xfs_trans.h | 26 +- + fs/xfs/xfs_trans_extfree.c | 215 ++++-- + fs/xfs/xfs_trans_rmap.c | 271 ++++++++ + 64 files changed, 6267 insertions(+), 915 deletions(-) + create mode 100644 fs/xfs/libxfs/xfs_defer.c + create mode 100644 fs/xfs/libxfs/xfs_defer.h + create mode 100644 fs/xfs/libxfs/xfs_rmap.c + create mode 100644 fs/xfs/libxfs/xfs_rmap.h + create mode 100644 fs/xfs/libxfs/xfs_rmap_btree.c + create mode 100644 fs/xfs/libxfs/xfs_rmap_btree.h + create mode 100644 fs/xfs/xfs_rmap_item.c + create mode 100644 fs/xfs/xfs_rmap_item.h + create mode 100644 fs/xfs/xfs_trans_rmap.c +Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew)) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (38a8a5e62f9a Merge branch 'work.const-qstr' into for-next) +$ git merge vfs/for-next +Resolved 'fs/f2fs/dir.c' using previous resolution. +Resolved 'fs/f2fs/f2fs.h' using previous resolution. +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging include/linux/nfs_xdr.h +Auto-merging include/linux/dcache.h +Auto-merging fs/proc/proc_sysctl.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/nfs4_fs.h +Auto-merging fs/logfs/dir.c +Auto-merging fs/hfsplus/hfsplus_fs.h +Auto-merging fs/fuse/inode.c +Auto-merging fs/fuse/fuse_i.h +Auto-merging fs/fuse/dir.c +Auto-merging fs/fat/namei_vfat.c +Auto-merging fs/f2fs/f2fs.h +CONFLICT (content): Merge conflict in fs/f2fs/f2fs.h +Auto-merging fs/f2fs/dir.c +CONFLICT (content): Merge conflict in fs/f2fs/dir.c +Auto-merging fs/ext2/ext2.h +Auto-merging fs/dcache.c +Auto-merging fs/autofs4/waitq.c +Auto-merging fs/adfs/dir.c +Auto-merging drivers/staging/lustre/lustre/llite/statahead.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 39bb2c240fea] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/lustre/lustre/llite/statahead.c | 4 ++-- + fs/adfs/dir.c | 4 ++-- + fs/autofs4/root.c | 8 ++++---- + fs/autofs4/waitq.c | 4 ++-- + fs/dcache.c | 4 ++-- + fs/ext2/dir.c | 6 +++--- + fs/ext2/ext2.h | 4 ++-- + fs/f2fs/dir.c | 4 ++-- + fs/f2fs/f2fs.h | 4 ++-- + fs/fat/namei_vfat.c | 6 +++--- + fs/fuse/dir.c | 6 +++--- + fs/fuse/fuse_i.h | 4 ++-- + fs/fuse/inode.c | 8 ++------ + fs/hfs/catalog.c | 12 ++++++------ + fs/hfs/hfs_fs.h | 14 +++++++------- + fs/hfs/inode.c | 2 +- + fs/hfs/trans.c | 2 +- + fs/hfsplus/catalog.c | 12 ++++++------ + fs/hfsplus/hfsplus_fs.h | 10 +++++----- + fs/logfs/dir.c | 4 ++-- + fs/nfs/nfs3proc.c | 8 ++++---- + fs/nfs/nfs4_fs.h | 5 +++-- + fs/nfs/nfs4namespace.c | 4 ++-- + fs/nfs/nfs4proc.c | 16 ++++++++-------- + fs/nfs/proc.c | 8 ++++---- + fs/nfs/unlink.c | 2 +- + fs/ocfs2/dlm/dlmdomain.c | 4 +--- + fs/ocfs2/dlmfs/dlmfs.c | 4 ++-- + fs/ocfs2/dlmfs/userdlm.c | 2 +- + fs/ocfs2/dlmfs/userdlm.h | 2 +- + fs/proc/proc_sysctl.c | 2 +- + include/linux/dcache.h | 2 +- + include/linux/lsm_hooks.h | 2 +- + include/linux/nfs_xdr.h | 8 ++++---- + include/linux/security.h | 4 ++-- + security/security.c | 2 +- + security/selinux/hooks.c | 2 +- + 37 files changed, 97 insertions(+), 102 deletions(-) +$ git am -3 ../patches/0001-qstr-unconstify-fuse_reverse_inval_entry-parameter.patch +Applying: qstr: unconstify fuse_reverse_inval_entry parameter +$ git reset HEAD^ +Unstaged changes after reset: +M fs/fuse/dir.c +M fs/fuse/fuse_i.h +$ git add -A . +$ git commit -v -a --amend +[master 6cf819efedc1] Merge remote-tracking branch 'vfs/for-next' + Date: Thu Aug 4 10:46:14 2016 +1000 +Merging pci/next (9454c23852ca Merge branch 'pci/msi-affinity' into next) +$ git merge pci/next +Already up-to-date. +Merging pstore/for-next/pstore (fbe0d4109a0c ramoops: use persistent_ram_free() instead of kfree() for freeing prz) +$ git merge pstore/for-next/pstore +Auto-merging Documentation/devicetree/bindings/reserved-memory/ramoops.txt +Merge made by the 'recursive' strategy. + .../bindings/{misc => reserved-memory}/ramoops.txt | 8 ++--- + Documentation/ramoops.txt | 38 +++++++++++++++------- + drivers/of/platform.c | 20 ++++++++++-- + fs/pstore/ram.c | 29 ++++++----------- + 4 files changed, 59 insertions(+), 36 deletions(-) + rename Documentation/devicetree/bindings/{misc => reserved-memory}/ramoops.txt (86%) +Merging hid/for-next (de1bcd764ea0 Merge branch 'for-4.8/upstream' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (c35d490516e6 Merge branch 'i2c/for-4.8' into i2c/for-next) +$ git merge i2c/i2c/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging dmi/master (0deb6b2c087a dmi-id: don't free dev structure after calling device_register) +$ git merge dmi/master +Merge made by the 'recursive' strategy. + drivers/firmware/dmi-id.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging hwmon-staging/hwmon-next (1d3dd4ce210f Documentation: dtb: xgene: Add hwmon dts binding documentation) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (292eaf50c7df [media] cec: fix off-by-one memset) +$ git merge v4l-dvb/master +Recorded preimage for 'Documentation/DocBook/Makefile' +Auto-merging Makefile +Removing Documentation/DocBook/media_api.tmpl +Removing Documentation/DocBook/media/vbi_hsync.gif.b64 +Removing Documentation/DocBook/media/vbi_625.gif.b64 +Removing Documentation/DocBook/media/vbi_525.gif.b64 +Removing Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml +Removing Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml +Removing Documentation/DocBook/media/v4l/vidioc-subdev-g-frame-interval.xml +Removing Documentation/DocBook/media/v4l/vidioc-subdev-g-fmt.xml +Removing Documentation/DocBook/media/v4l/vidioc-subdev-g-crop.xml +Removing Documentation/DocBook/media/v4l/vidioc-subdev-enum-mbus-code.xml +Removing Documentation/DocBook/media/v4l/vidioc-subdev-enum-frame-size.xml +Removing Documentation/DocBook/media/v4l/vidioc-subdev-enum-frame-interval.xml +Removing Documentation/DocBook/media/v4l/vidioc-streamon.xml +Removing Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml +Removing Documentation/DocBook/media/v4l/vidioc-reqbufs.xml +Removing Documentation/DocBook/media/v4l/vidioc-querystd.xml +Removing Documentation/DocBook/media/v4l/vidioc-queryctrl.xml +Removing Documentation/DocBook/media/v4l/vidioc-querycap.xml +Removing Documentation/DocBook/media/v4l/vidioc-querybuf.xml +Removing Documentation/DocBook/media/v4l/vidioc-query-dv-timings.xml +Removing Documentation/DocBook/media/v4l/vidioc-qbuf.xml +Removing Documentation/DocBook/media/v4l/vidioc-prepare-buf.xml +Removing Documentation/DocBook/media/v4l/vidioc-overlay.xml +Removing Documentation/DocBook/media/v4l/vidioc-log-status.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-tuner.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-std.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-sliced-vbi-cap.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-selection.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-priority.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-parm.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-output.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-modulator.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-jpegcomp.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-input.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-frequency.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-fmt.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-enc-index.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-edid.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-crop.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-audioout.xml +Removing Documentation/DocBook/media/v4l/vidioc-g-audio.xml +Removing Documentation/DocBook/media/v4l/vidioc-expbuf.xml +Removing Documentation/DocBook/media/v4l/vidioc-enumstd.xml +Removing Documentation/DocBook/media/v4l/vidioc-enumoutput.xml +Removing Documentation/DocBook/media/v4l/vidioc-enuminput.xml +Removing Documentation/DocBook/media/v4l/vidioc-enumaudioout.xml +Removing Documentation/DocBook/media/v4l/vidioc-enumaudio.xml +Removing Documentation/DocBook/media/v4l/vidioc-enum-freq-bands.xml +Removing Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml +Removing Documentation/DocBook/media/v4l/vidioc-enum-frameintervals.xml +Removing Documentation/DocBook/media/v4l/vidioc-enum-fmt.xml +Removing Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml +Removing Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml +Removing Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml +Removing Documentation/DocBook/media/v4l/vidioc-dqevent.xml +Removing Documentation/DocBook/media/v4l/vidioc-decoder-cmd.xml +Removing Documentation/DocBook/media/v4l/vidioc-dbg-g-register.xml +Removing Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-info.xml +Removing Documentation/DocBook/media/v4l/vidioc-cropcap.xml +Removing Documentation/DocBook/media/v4l/vidioc-create-bufs.xml +Removing Documentation/DocBook/media/v4l/vbi_hsync.pdf +Removing Documentation/DocBook/media/v4l/vbi_625.pdf +Removing Documentation/DocBook/media/v4l/vbi_525.pdf +Removing Documentation/DocBook/media/v4l/v4l2grab.c.xml +Removing Documentation/DocBook/media/v4l/v4l2.xml +Removing Documentation/DocBook/media/v4l/subdev-image-processing-scaling-multi-source.svg +Removing Documentation/DocBook/media/v4l/subdev-image-processing-scaling-multi-source.dia +Removing Documentation/DocBook/media/v4l/subdev-image-processing-full.svg +Removing Documentation/DocBook/media/v4l/subdev-image-processing-full.dia +Removing Documentation/DocBook/media/v4l/subdev-image-processing-crop.svg +Removing Documentation/DocBook/media/v4l/subdev-image-processing-crop.dia +Removing Documentation/DocBook/media/v4l/subdev-formats.xml +Removing Documentation/DocBook/media/v4l/selections-common.xml +Removing Documentation/DocBook/media/v4l/selection-api.xml +Removing Documentation/DocBook/media/v4l/remote_controllers.xml +Removing Documentation/DocBook/media/v4l/planar-apis.xml +Removing Documentation/DocBook/media/v4l/pixfmt.xml +Removing Documentation/DocBook/media/v4l/pixfmt-z16.xml +Removing Documentation/DocBook/media/v4l/pixfmt-yvyu.xml +Removing Documentation/DocBook/media/v4l/pixfmt-yuyv.xml +Removing Documentation/DocBook/media/v4l/pixfmt-yuv444m.xml +Removing Documentation/DocBook/media/v4l/pixfmt-yuv422p.xml +Removing Documentation/DocBook/media/v4l/pixfmt-yuv422m.xml +Removing Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml +Removing Documentation/DocBook/media/v4l/pixfmt-yuv420.xml +Removing Documentation/DocBook/media/v4l/pixfmt-yuv411p.xml +Removing Documentation/DocBook/media/v4l/pixfmt-yuv410.xml +Removing Documentation/DocBook/media/v4l/pixfmt-y8i.xml +Removing Documentation/DocBook/media/v4l/pixfmt-y41p.xml +Removing Documentation/DocBook/media/v4l/pixfmt-y16.xml +Removing Documentation/DocBook/media/v4l/pixfmt-y16-be.xml +Removing Documentation/DocBook/media/v4l/pixfmt-y12i.xml +Removing Documentation/DocBook/media/v4l/pixfmt-y12.xml +Removing Documentation/DocBook/media/v4l/pixfmt-y10b.xml +Removing Documentation/DocBook/media/v4l/pixfmt-y10.xml +Removing Documentation/DocBook/media/v4l/pixfmt-vyuy.xml +Removing Documentation/DocBook/media/v4l/pixfmt-uyvy.xml +Removing Documentation/DocBook/media/v4l/pixfmt-uv8.xml +Removing Documentation/DocBook/media/v4l/pixfmt-srggb8.xml +Removing Documentation/DocBook/media/v4l/pixfmt-srggb12.xml +Removing Documentation/DocBook/media/v4l/pixfmt-srggb10p.xml +Removing Documentation/DocBook/media/v4l/pixfmt-srggb10dpcm8.xml +Removing Documentation/DocBook/media/v4l/pixfmt-srggb10alaw8.xml +Removing Documentation/DocBook/media/v4l/pixfmt-srggb10.xml +Removing Documentation/DocBook/media/v4l/pixfmt-sgrbg8.xml +Removing Documentation/DocBook/media/v4l/pixfmt-sgbrg8.xml +Removing Documentation/DocBook/media/v4l/pixfmt-sdr-ru12le.xml +Removing Documentation/DocBook/media/v4l/pixfmt-sdr-cu16le.xml +Removing Documentation/DocBook/media/v4l/pixfmt-sdr-cu08.xml +Removing Documentation/DocBook/media/v4l/pixfmt-sdr-cs14le.xml +Removing Documentation/DocBook/media/v4l/pixfmt-sdr-cs08.xml +Removing Documentation/DocBook/media/v4l/pixfmt-sbggr8.xml +Removing Documentation/DocBook/media/v4l/pixfmt-sbggr16.xml +Removing Documentation/DocBook/media/v4l/pixfmt-packed-yuv.xml +Removing Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml +Removing Documentation/DocBook/media/v4l/pixfmt-nv24.xml +Removing Documentation/DocBook/media/v4l/pixfmt-nv16m.xml +Removing Documentation/DocBook/media/v4l/pixfmt-nv16.xml +Removing Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml +Removing Documentation/DocBook/media/v4l/pixfmt-nv12m.xml +Removing Documentation/DocBook/media/v4l/pixfmt-nv12.xml +Removing Documentation/DocBook/media/v4l/pixfmt-m420.xml +Removing Documentation/DocBook/media/v4l/pixfmt-grey.xml +Removing Documentation/DocBook/media/v4l/pipeline.pdf +Removing Documentation/DocBook/media/v4l/media-types.xml +Removing Documentation/DocBook/media/v4l/media-ioc-setup-link.xml +Removing Documentation/DocBook/media/v4l/media-ioc-g-topology.xml +Removing Documentation/DocBook/media/v4l/media-ioc-enum-links.xml +Removing Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml +Removing Documentation/DocBook/media/v4l/media-ioc-device-info.xml +Removing Documentation/DocBook/media/v4l/media-func-open.xml +Removing Documentation/DocBook/media/v4l/media-func-ioctl.xml +Removing Documentation/DocBook/media/v4l/media-func-close.xml +Removing Documentation/DocBook/media/v4l/media-controller.xml +Removing Documentation/DocBook/media/v4l/lirc_device_interface.xml +Removing Documentation/DocBook/media/v4l/libv4l.xml +Removing Documentation/DocBook/media/v4l/keytable.c.xml +Removing Documentation/DocBook/media/v4l/io.xml +Removing Documentation/DocBook/media/v4l/gen-errors.xml +Removing Documentation/DocBook/media/v4l/func-write.xml +Removing Documentation/DocBook/media/v4l/func-select.xml +Removing Documentation/DocBook/media/v4l/func-read.xml +Removing Documentation/DocBook/media/v4l/func-poll.xml +Removing Documentation/DocBook/media/v4l/func-open.xml +Removing Documentation/DocBook/media/v4l/func-munmap.xml +Removing Documentation/DocBook/media/v4l/func-mmap.xml +Removing Documentation/DocBook/media/v4l/func-ioctl.xml +Removing Documentation/DocBook/media/v4l/func-close.xml +Removing Documentation/DocBook/media/v4l/fieldseq_tb.pdf +Removing Documentation/DocBook/media/v4l/fieldseq_bt.pdf +Removing Documentation/DocBook/media/v4l/fdl-appendix.xml +Removing Documentation/DocBook/media/v4l/driver.xml +Removing Documentation/DocBook/media/v4l/dev-teletext.xml +Removing Documentation/DocBook/media/v4l/dev-subdev.xml +Removing Documentation/DocBook/media/v4l/dev-sliced-vbi.xml +Removing Documentation/DocBook/media/v4l/dev-sdr.xml +Removing Documentation/DocBook/media/v4l/dev-rds.xml +Removing Documentation/DocBook/media/v4l/dev-raw-vbi.xml +Removing Documentation/DocBook/media/v4l/dev-radio.xml +Removing Documentation/DocBook/media/v4l/dev-overlay.xml +Removing Documentation/DocBook/media/v4l/dev-output.xml +Removing Documentation/DocBook/media/v4l/dev-osd.xml +Removing Documentation/DocBook/media/v4l/dev-event.xml +Removing Documentation/DocBook/media/v4l/dev-effect.xml +Removing Documentation/DocBook/media/v4l/dev-codec.xml +Removing Documentation/DocBook/media/v4l/dev-capture.xml +Removing Documentation/DocBook/media/v4l/crop.pdf +Removing Documentation/DocBook/media/v4l/controls.xml +Removing Documentation/DocBook/media/v4l/compat.xml +Removing Documentation/DocBook/media/v4l/common.xml +Removing Documentation/DocBook/media/v4l/cec-ioc-receive.xml +Removing Documentation/DocBook/media/v4l/cec-ioc-g-mode.xml +Removing Documentation/DocBook/media/v4l/cec-ioc-dqevent.xml +Removing Documentation/DocBook/media/v4l/cec-ioc-adap-g-phys-addr.xml +Removing Documentation/DocBook/media/v4l/cec-ioc-adap-g-log-addrs.xml +Removing Documentation/DocBook/media/v4l/cec-ioc-adap-g-caps.xml +Removing Documentation/DocBook/media/v4l/cec-func-poll.xml +Removing Documentation/DocBook/media/v4l/cec-func-open.xml +Removing Documentation/DocBook/media/v4l/cec-func-ioctl.xml +Removing Documentation/DocBook/media/v4l/cec-func-close.xml +Removing Documentation/DocBook/media/v4l/cec-api.xml +Removing Documentation/DocBook/media/v4l/capture.c.xml +Removing Documentation/DocBook/media/v4l/biblio.xml +Removing Documentation/DocBook/media/v4l/.gitignore +Removing Documentation/DocBook/media/typical_media_device.svg +Removing Documentation/DocBook/media/selection.png.b64 +Removing Documentation/DocBook/media/pipeline.png.b64 +Removing Documentation/DocBook/media/nv12mt_example.gif.b64 +Removing Documentation/DocBook/media/nv12mt.gif.b64 +Removing Documentation/DocBook/media/fieldseq_tb.gif.b64 +Removing Documentation/DocBook/media/fieldseq_bt.gif.b64 +Removing Documentation/DocBook/media/dvbstb.png.b64 +Removing Documentation/DocBook/media/dvb/video.xml +Removing Documentation/DocBook/media/dvb/net.xml +Removing Documentation/DocBook/media/dvb/intro.xml +Removing Documentation/DocBook/media/dvb/frontend_legacy_api.xml +Removing Documentation/DocBook/media/dvb/frontend.xml +Removing Documentation/DocBook/media/dvb/fe-set-voltage.xml +Removing Documentation/DocBook/media/dvb/fe-set-tone.xml +Removing Documentation/DocBook/media/dvb/fe-set-frontend-tune-mode.xml +Removing Documentation/DocBook/media/dvb/fe-read-status.xml +Removing Documentation/DocBook/media/dvb/fe-get-property.xml +Removing Documentation/DocBook/media/dvb/fe-get-info.xml +Removing Documentation/DocBook/media/dvb/fe-enable-high-lnb-voltage.xml +Removing Documentation/DocBook/media/dvb/fe-diseqc-send-master-cmd.xml +Removing Documentation/DocBook/media/dvb/fe-diseqc-send-burst.xml +Removing Documentation/DocBook/media/dvb/fe-diseqc-reset-overload.xml +Removing Documentation/DocBook/media/dvb/fe-diseqc-recv-slave-reply.xml +Removing Documentation/DocBook/media/dvb/examples.xml +Removing Documentation/DocBook/media/dvb/dvbstb.pdf +Removing Documentation/DocBook/media/dvb/dvbproperty.xml +Removing Documentation/DocBook/media/dvb/dvbapi.xml +Removing Documentation/DocBook/media/dvb/demux.xml +Removing Documentation/DocBook/media/dvb/ca.xml +Removing Documentation/DocBook/media/dvb/audio.xml +Removing Documentation/DocBook/media/dvb/.gitignore +Removing Documentation/DocBook/media/crop.gif.b64 +Removing Documentation/DocBook/media/constraints.png.b64 +Removing Documentation/DocBook/media/bayer.png.b64 +Removing Documentation/DocBook/media/Makefile +Removing Documentation/DocBook/media/.gitignore +Auto-merging Documentation/DocBook/Makefile +CONFLICT (content): Merge conflict in Documentation/DocBook/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/DocBook/Makefile'. +[master ee2a19764541] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/Makefile | 10 +- + Documentation/DocBook/media/.gitignore | 1 - + Documentation/DocBook/media/Makefile | 427 -- + Documentation/DocBook/media/bayer.png.b64 | 171 - + Documentation/DocBook/media/constraints.png.b64 | 59 - + Documentation/DocBook/media/crop.gif.b64 | 105 - + Documentation/DocBook/media/dvb/.gitignore | 1 - + Documentation/DocBook/media/dvb/audio.xml | 1314 ----- + Documentation/DocBook/media/dvb/ca.xml | 582 --- + Documentation/DocBook/media/dvb/demux.xml | 1162 ----- + Documentation/DocBook/media/dvb/dvbapi.xml | 156 - + Documentation/DocBook/media/dvb/dvbproperty.xml | 1680 ------ + Documentation/DocBook/media/dvb/dvbstb.pdf | Bin 1881 -> 0 bytes + Documentation/DocBook/media/dvb/examples.xml | 367 -- + .../media/dvb/fe-diseqc-recv-slave-reply.xml | 78 - + .../DocBook/media/dvb/fe-diseqc-reset-overload.xml | 51 - + .../DocBook/media/dvb/fe-diseqc-send-burst.xml | 89 - + .../media/dvb/fe-diseqc-send-master-cmd.xml | 72 - + .../media/dvb/fe-enable-high-lnb-voltage.xml | 61 - + Documentation/DocBook/media/dvb/fe-get-info.xml | 266 - + .../DocBook/media/dvb/fe-get-property.xml | 81 - + Documentation/DocBook/media/dvb/fe-read-status.xml | 107 - + .../media/dvb/fe-set-frontend-tune-mode.xml | 64 - + Documentation/DocBook/media/dvb/fe-set-tone.xml | 91 - + Documentation/DocBook/media/dvb/fe-set-voltage.xml | 69 - + Documentation/DocBook/media/dvb/frontend.xml | 269 - + .../DocBook/media/dvb/frontend_legacy_api.xml | 654 --- + Documentation/DocBook/media/dvb/intro.xml | 211 - + Documentation/DocBook/media/dvb/net.xml | 238 - + Documentation/DocBook/media/dvb/video.xml | 1968 ------- + Documentation/DocBook/media/dvbstb.png.b64 | 398 -- + Documentation/DocBook/media/fieldseq_bt.gif.b64 | 447 -- + Documentation/DocBook/media/fieldseq_tb.gif.b64 | 445 -- + Documentation/DocBook/media/nv12mt.gif.b64 | 37 - + Documentation/DocBook/media/nv12mt_example.gif.b64 | 121 - + Documentation/DocBook/media/pipeline.png.b64 | 213 - + Documentation/DocBook/media/selection.png.b64 | 206 - + .../DocBook/media/typical_media_device.svg | 28 - + Documentation/DocBook/media/v4l/.gitignore | 1 - + Documentation/DocBook/media/v4l/biblio.xml | 381 -- + Documentation/DocBook/media/v4l/capture.c.xml | 659 --- + Documentation/DocBook/media/v4l/cec-api.xml | 75 - + Documentation/DocBook/media/v4l/cec-func-close.xml | 64 - + Documentation/DocBook/media/v4l/cec-func-ioctl.xml | 78 - + Documentation/DocBook/media/v4l/cec-func-open.xml | 104 - + Documentation/DocBook/media/v4l/cec-func-poll.xml | 94 - + .../DocBook/media/v4l/cec-ioc-adap-g-caps.xml | 151 - + .../DocBook/media/v4l/cec-ioc-adap-g-log-addrs.xml | 329 -- + .../DocBook/media/v4l/cec-ioc-adap-g-phys-addr.xml | 86 - + .../DocBook/media/v4l/cec-ioc-dqevent.xml | 202 - + Documentation/DocBook/media/v4l/cec-ioc-g-mode.xml | 255 - + .../DocBook/media/v4l/cec-ioc-receive.xml | 274 - + Documentation/DocBook/media/v4l/common.xml | 1102 ---- + Documentation/DocBook/media/v4l/compat.xml | 2723 ---------- + Documentation/DocBook/media/v4l/controls.xml | 5505 -------------------- + Documentation/DocBook/media/v4l/crop.pdf | Bin 5846 -> 0 bytes + Documentation/DocBook/media/v4l/dev-capture.xml | 110 - + Documentation/DocBook/media/v4l/dev-codec.xml | 27 - + Documentation/DocBook/media/v4l/dev-effect.xml | 17 - + Documentation/DocBook/media/v4l/dev-event.xml | 43 - + Documentation/DocBook/media/v4l/dev-osd.xml | 149 - + Documentation/DocBook/media/v4l/dev-output.xml | 106 - + Documentation/DocBook/media/v4l/dev-overlay.xml | 368 -- + Documentation/DocBook/media/v4l/dev-radio.xml | 49 - + Documentation/DocBook/media/v4l/dev-raw-vbi.xml | 345 -- + Documentation/DocBook/media/v4l/dev-rds.xml | 196 - + Documentation/DocBook/media/v4l/dev-sdr.xml | 126 - + Documentation/DocBook/media/v4l/dev-sliced-vbi.xml | 706 --- + Documentation/DocBook/media/v4l/dev-subdev.xml | 478 -- + Documentation/DocBook/media/v4l/dev-teletext.xml | 29 - + Documentation/DocBook/media/v4l/driver.xml | 200 - + Documentation/DocBook/media/v4l/fdl-appendix.xml | 671 --- + Documentation/DocBook/media/v4l/fieldseq_bt.pdf | Bin 9185 -> 0 bytes + Documentation/DocBook/media/v4l/fieldseq_tb.pdf | Bin 9173 -> 0 bytes + Documentation/DocBook/media/v4l/func-close.xml | 62 - + Documentation/DocBook/media/v4l/func-ioctl.xml | 71 - + Documentation/DocBook/media/v4l/func-mmap.xml | 183 - + Documentation/DocBook/media/v4l/func-munmap.xml | 76 - + Documentation/DocBook/media/v4l/func-open.xml | 113 - + Documentation/DocBook/media/v4l/func-poll.xml | 142 - + Documentation/DocBook/media/v4l/func-read.xml | 181 - + Documentation/DocBook/media/v4l/func-select.xml | 130 - + Documentation/DocBook/media/v4l/func-write.xml | 128 - + Documentation/DocBook/media/v4l/gen-errors.xml | 77 - + Documentation/DocBook/media/v4l/io.xml | 1545 ------ + Documentation/DocBook/media/v4l/keytable.c.xml | 172 - + Documentation/DocBook/media/v4l/libv4l.xml | 160 - + .../DocBook/media/v4l/lirc_device_interface.xml | 255 - + .../DocBook/media/v4l/media-controller.xml | 105 - + .../DocBook/media/v4l/media-func-close.xml | 59 - + .../DocBook/media/v4l/media-func-ioctl.xml | 73 - + .../DocBook/media/v4l/media-func-open.xml | 94 - + .../DocBook/media/v4l/media-ioc-device-info.xml | 132 - + .../DocBook/media/v4l/media-ioc-enum-entities.xml | 180 - + .../DocBook/media/v4l/media-ioc-enum-links.xml | 160 - + .../DocBook/media/v4l/media-ioc-g-topology.xml | 391 -- + .../DocBook/media/v4l/media-ioc-setup-link.xml | 84 - + Documentation/DocBook/media/v4l/media-types.xml | 379 -- + Documentation/DocBook/media/v4l/pipeline.pdf | Bin 20276 -> 0 bytes + Documentation/DocBook/media/v4l/pixfmt-grey.xml | 62 - + Documentation/DocBook/media/v4l/pixfmt-m420.xml | 139 - + Documentation/DocBook/media/v4l/pixfmt-nv12.xml | 143 - + Documentation/DocBook/media/v4l/pixfmt-nv12m.xml | 153 - + Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml | 66 - + Documentation/DocBook/media/v4l/pixfmt-nv16.xml | 166 - + Documentation/DocBook/media/v4l/pixfmt-nv16m.xml | 170 - + Documentation/DocBook/media/v4l/pixfmt-nv24.xml | 121 - + .../DocBook/media/v4l/pixfmt-packed-rgb.xml | 937 ---- + .../DocBook/media/v4l/pixfmt-packed-yuv.xml | 236 - + Documentation/DocBook/media/v4l/pixfmt-sbggr16.xml | 83 - + Documentation/DocBook/media/v4l/pixfmt-sbggr8.xml | 67 - + .../DocBook/media/v4l/pixfmt-sdr-cs08.xml | 44 - + .../DocBook/media/v4l/pixfmt-sdr-cs14le.xml | 47 - + .../DocBook/media/v4l/pixfmt-sdr-cu08.xml | 44 - + .../DocBook/media/v4l/pixfmt-sdr-cu16le.xml | 46 - + .../DocBook/media/v4l/pixfmt-sdr-ru12le.xml | 40 - + Documentation/DocBook/media/v4l/pixfmt-sgbrg8.xml | 67 - + Documentation/DocBook/media/v4l/pixfmt-sgrbg8.xml | 67 - + Documentation/DocBook/media/v4l/pixfmt-srggb10.xml | 90 - + .../DocBook/media/v4l/pixfmt-srggb10alaw8.xml | 34 - + .../DocBook/media/v4l/pixfmt-srggb10dpcm8.xml | 28 - + .../DocBook/media/v4l/pixfmt-srggb10p.xml | 99 - + Documentation/DocBook/media/v4l/pixfmt-srggb12.xml | 90 - + Documentation/DocBook/media/v4l/pixfmt-srggb8.xml | 67 - + Documentation/DocBook/media/v4l/pixfmt-uv8.xml | 62 - + Documentation/DocBook/media/v4l/pixfmt-uyvy.xml | 120 - + Documentation/DocBook/media/v4l/pixfmt-vyuy.xml | 120 - + Documentation/DocBook/media/v4l/pixfmt-y10.xml | 79 - + Documentation/DocBook/media/v4l/pixfmt-y10b.xml | 43 - + Documentation/DocBook/media/v4l/pixfmt-y12.xml | 79 - + Documentation/DocBook/media/v4l/pixfmt-y12i.xml | 49 - + Documentation/DocBook/media/v4l/pixfmt-y16-be.xml | 81 - + Documentation/DocBook/media/v4l/pixfmt-y16.xml | 81 - + Documentation/DocBook/media/v4l/pixfmt-y41p.xml | 149 - + Documentation/DocBook/media/v4l/pixfmt-y8i.xml | 80 - + Documentation/DocBook/media/v4l/pixfmt-yuv410.xml | 133 - + Documentation/DocBook/media/v4l/pixfmt-yuv411p.xml | 147 - + Documentation/DocBook/media/v4l/pixfmt-yuv420.xml | 149 - + Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml | 162 - + Documentation/DocBook/media/v4l/pixfmt-yuv422m.xml | 166 - + Documentation/DocBook/media/v4l/pixfmt-yuv422p.xml | 153 - + Documentation/DocBook/media/v4l/pixfmt-yuv444m.xml | 177 - + Documentation/DocBook/media/v4l/pixfmt-yuyv.xml | 120 - + Documentation/DocBook/media/v4l/pixfmt-yvyu.xml | 120 - + Documentation/DocBook/media/v4l/pixfmt-z16.xml | 81 - + Documentation/DocBook/media/v4l/pixfmt.xml | 2003 ------- + Documentation/DocBook/media/v4l/planar-apis.xml | 62 - + .../DocBook/media/v4l/remote_controllers.xml | 320 -- + Documentation/DocBook/media/v4l/selection-api.xml | 317 -- + .../DocBook/media/v4l/selections-common.xml | 180 - + Documentation/DocBook/media/v4l/subdev-formats.xml | 4040 -------------- + .../media/v4l/subdev-image-processing-crop.dia | 614 --- + .../media/v4l/subdev-image-processing-crop.svg | 63 - + .../media/v4l/subdev-image-processing-full.dia | 1588 ------ + .../media/v4l/subdev-image-processing-full.svg | 163 - + ...ubdev-image-processing-scaling-multi-source.dia | 1152 ---- + ...ubdev-image-processing-scaling-multi-source.svg | 116 - + Documentation/DocBook/media/v4l/v4l2.xml | 728 --- + Documentation/DocBook/media/v4l/v4l2grab.c.xml | 164 - + Documentation/DocBook/media/v4l/vbi_525.pdf | Bin 3395 -> 0 bytes + Documentation/DocBook/media/v4l/vbi_625.pdf | Bin 3683 -> 0 bytes + Documentation/DocBook/media/v4l/vbi_hsync.pdf | Bin 7405 -> 0 bytes + .../DocBook/media/v4l/vidioc-create-bufs.xml | 158 - + Documentation/DocBook/media/v4l/vidioc-cropcap.xml | 166 - + .../DocBook/media/v4l/vidioc-dbg-g-chip-info.xml | 207 - + .../DocBook/media/v4l/vidioc-dbg-g-register.xml | 227 - + .../DocBook/media/v4l/vidioc-decoder-cmd.xml | 259 - + Documentation/DocBook/media/v4l/vidioc-dqevent.xml | 471 -- + .../DocBook/media/v4l/vidioc-dv-timings-cap.xml | 210 - + .../DocBook/media/v4l/vidioc-encoder-cmd.xml | 197 - + .../DocBook/media/v4l/vidioc-enum-dv-timings.xml | 128 - + .../DocBook/media/v4l/vidioc-enum-fmt.xml | 159 - + .../media/v4l/vidioc-enum-frameintervals.xml | 260 - + .../DocBook/media/v4l/vidioc-enum-framesizes.xml | 265 - + .../DocBook/media/v4l/vidioc-enum-freq-bands.xml | 175 - + .../DocBook/media/v4l/vidioc-enumaudio.xml | 76 - + .../DocBook/media/v4l/vidioc-enumaudioout.xml | 79 - + .../DocBook/media/v4l/vidioc-enuminput.xml | 316 -- + .../DocBook/media/v4l/vidioc-enumoutput.xml | 201 - + Documentation/DocBook/media/v4l/vidioc-enumstd.xml | 389 -- + Documentation/DocBook/media/v4l/vidioc-expbuf.xml | 205 - + Documentation/DocBook/media/v4l/vidioc-g-audio.xml | 172 - + .../DocBook/media/v4l/vidioc-g-audioout.xml | 138 - + Documentation/DocBook/media/v4l/vidioc-g-crop.xml | 129 - + Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml | 133 - + .../DocBook/media/v4l/vidioc-g-dv-timings.xml | 343 -- + Documentation/DocBook/media/v4l/vidioc-g-edid.xml | 173 - + .../DocBook/media/v4l/vidioc-g-enc-index.xml | 189 - + .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml | 456 -- + Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml | 459 -- + Documentation/DocBook/media/v4l/vidioc-g-fmt.xml | 204 - + .../DocBook/media/v4l/vidioc-g-frequency.xml | 148 - + Documentation/DocBook/media/v4l/vidioc-g-input.xml | 83 - + .../DocBook/media/v4l/vidioc-g-jpegcomp.xml | 175 - + .../DocBook/media/v4l/vidioc-g-modulator.xml | 252 - + .../DocBook/media/v4l/vidioc-g-output.xml | 85 - + Documentation/DocBook/media/v4l/vidioc-g-parm.xml | 314 -- + .../DocBook/media/v4l/vidioc-g-priority.xml | 135 - + .../DocBook/media/v4l/vidioc-g-selection.xml | 233 - + .../DocBook/media/v4l/vidioc-g-sliced-vbi-cap.xml | 255 - + Documentation/DocBook/media/v4l/vidioc-g-std.xml | 98 - + Documentation/DocBook/media/v4l/vidioc-g-tuner.xml | 594 --- + .../DocBook/media/v4l/vidioc-log-status.xml | 41 - + Documentation/DocBook/media/v4l/vidioc-overlay.xml | 74 - + .../DocBook/media/v4l/vidioc-prepare-buf.xml | 88 - + Documentation/DocBook/media/v4l/vidioc-qbuf.xml | 202 - + .../DocBook/media/v4l/vidioc-query-dv-timings.xml | 115 - + .../DocBook/media/v4l/vidioc-querybuf.xml | 106 - + .../DocBook/media/v4l/vidioc-querycap.xml | 350 -- + .../DocBook/media/v4l/vidioc-queryctrl.xml | 661 --- + .../DocBook/media/v4l/vidioc-querystd.xml | 85 - + Documentation/DocBook/media/v4l/vidioc-reqbufs.xml | 137 - + .../DocBook/media/v4l/vidioc-s-hw-freq-seek.xml | 188 - + .../DocBook/media/v4l/vidioc-streamon.xml | 136 - + .../v4l/vidioc-subdev-enum-frame-interval.xml | 151 - + .../media/v4l/vidioc-subdev-enum-frame-size.xml | 153 - + .../media/v4l/vidioc-subdev-enum-mbus-code.xml | 118 - + .../DocBook/media/v4l/vidioc-subdev-g-crop.xml | 158 - + .../DocBook/media/v4l/vidioc-subdev-g-fmt.xml | 177 - + .../media/v4l/vidioc-subdev-g-frame-interval.xml | 135 - + .../media/v4l/vidioc-subdev-g-selection.xml | 159 - + .../DocBook/media/v4l/vidioc-subscribe-event.xml | 130 - + Documentation/DocBook/media/vbi_525.gif.b64 | 84 - + Documentation/DocBook/media/vbi_625.gif.b64 | 90 - + Documentation/DocBook/media/vbi_hsync.gif.b64 | 43 - + Documentation/DocBook/media_api.tmpl | 121 - + Documentation/Makefile.sphinx | 1 - + Makefile | 2 +- + drivers/media/i2c/adv7180.c | 18 +- + drivers/media/i2c/adv7511.c | 24 +- + drivers/media/platform/vim2m.c | 15 +- + drivers/media/platform/vivid/vivid-cec.c | 10 - + drivers/media/v4l2-core/videobuf2-dma-contig.c | 2 +- + drivers/staging/media/Kconfig | 2 +- + drivers/staging/media/cec/cec-adap.c | 2 +- + 235 files changed, 49 insertions(+), 62566 deletions(-) + delete mode 100644 Documentation/DocBook/media/.gitignore + delete mode 100644 Documentation/DocBook/media/Makefile + delete mode 100644 Documentation/DocBook/media/bayer.png.b64 + delete mode 100644 Documentation/DocBook/media/constraints.png.b64 + delete mode 100644 Documentation/DocBook/media/crop.gif.b64 + delete mode 100644 Documentation/DocBook/media/dvb/.gitignore + delete mode 100644 Documentation/DocBook/media/dvb/audio.xml + delete mode 100644 Documentation/DocBook/media/dvb/ca.xml + delete mode 100644 Documentation/DocBook/media/dvb/demux.xml + delete mode 100644 Documentation/DocBook/media/dvb/dvbapi.xml + delete mode 100644 Documentation/DocBook/media/dvb/dvbproperty.xml + delete mode 100644 Documentation/DocBook/media/dvb/dvbstb.pdf + delete mode 100644 Documentation/DocBook/media/dvb/examples.xml + delete mode 100644 Documentation/DocBook/media/dvb/fe-diseqc-recv-slave-reply.xml + delete mode 100644 Documentation/DocBook/media/dvb/fe-diseqc-reset-overload.xml + delete mode 100644 Documentation/DocBook/media/dvb/fe-diseqc-send-burst.xml + delete mode 100644 Documentation/DocBook/media/dvb/fe-diseqc-send-master-cmd.xml + delete mode 100644 Documentation/DocBook/media/dvb/fe-enable-high-lnb-voltage.xml + delete mode 100644 Documentation/DocBook/media/dvb/fe-get-info.xml + delete mode 100644 Documentation/DocBook/media/dvb/fe-get-property.xml + delete mode 100644 Documentation/DocBook/media/dvb/fe-read-status.xml + delete mode 100644 Documentation/DocBook/media/dvb/fe-set-frontend-tune-mode.xml + delete mode 100644 Documentation/DocBook/media/dvb/fe-set-tone.xml + delete mode 100644 Documentation/DocBook/media/dvb/fe-set-voltage.xml + delete mode 100644 Documentation/DocBook/media/dvb/frontend.xml + delete mode 100644 Documentation/DocBook/media/dvb/frontend_legacy_api.xml + delete mode 100644 Documentation/DocBook/media/dvb/intro.xml + delete mode 100644 Documentation/DocBook/media/dvb/net.xml + delete mode 100644 Documentation/DocBook/media/dvb/video.xml + delete mode 100644 Documentation/DocBook/media/dvbstb.png.b64 + delete mode 100644 Documentation/DocBook/media/fieldseq_bt.gif.b64 + delete mode 100644 Documentation/DocBook/media/fieldseq_tb.gif.b64 + delete mode 100644 Documentation/DocBook/media/nv12mt.gif.b64 + delete mode 100644 Documentation/DocBook/media/nv12mt_example.gif.b64 + delete mode 100644 Documentation/DocBook/media/pipeline.png.b64 + delete mode 100644 Documentation/DocBook/media/selection.png.b64 + delete mode 100644 Documentation/DocBook/media/typical_media_device.svg + delete mode 100644 Documentation/DocBook/media/v4l/.gitignore + delete mode 100644 Documentation/DocBook/media/v4l/biblio.xml + delete mode 100644 Documentation/DocBook/media/v4l/capture.c.xml + delete mode 100644 Documentation/DocBook/media/v4l/cec-api.xml + delete mode 100644 Documentation/DocBook/media/v4l/cec-func-close.xml + delete mode 100644 Documentation/DocBook/media/v4l/cec-func-ioctl.xml + delete mode 100644 Documentation/DocBook/media/v4l/cec-func-open.xml + delete mode 100644 Documentation/DocBook/media/v4l/cec-func-poll.xml + delete mode 100644 Documentation/DocBook/media/v4l/cec-ioc-adap-g-caps.xml + delete mode 100644 Documentation/DocBook/media/v4l/cec-ioc-adap-g-log-addrs.xml + delete mode 100644 Documentation/DocBook/media/v4l/cec-ioc-adap-g-phys-addr.xml + delete mode 100644 Documentation/DocBook/media/v4l/cec-ioc-dqevent.xml + delete mode 100644 Documentation/DocBook/media/v4l/cec-ioc-g-mode.xml + delete mode 100644 Documentation/DocBook/media/v4l/cec-ioc-receive.xml + delete mode 100644 Documentation/DocBook/media/v4l/common.xml + delete mode 100644 Documentation/DocBook/media/v4l/compat.xml + delete mode 100644 Documentation/DocBook/media/v4l/controls.xml + delete mode 100644 Documentation/DocBook/media/v4l/crop.pdf + delete mode 100644 Documentation/DocBook/media/v4l/dev-capture.xml + delete mode 100644 Documentation/DocBook/media/v4l/dev-codec.xml + delete mode 100644 Documentation/DocBook/media/v4l/dev-effect.xml + delete mode 100644 Documentation/DocBook/media/v4l/dev-event.xml + delete mode 100644 Documentation/DocBook/media/v4l/dev-osd.xml + delete mode 100644 Documentation/DocBook/media/v4l/dev-output.xml + delete mode 100644 Documentation/DocBook/media/v4l/dev-overlay.xml + delete mode 100644 Documentation/DocBook/media/v4l/dev-radio.xml + delete mode 100644 Documentation/DocBook/media/v4l/dev-raw-vbi.xml + delete mode 100644 Documentation/DocBook/media/v4l/dev-rds.xml + delete mode 100644 Documentation/DocBook/media/v4l/dev-sdr.xml + delete mode 100644 Documentation/DocBook/media/v4l/dev-sliced-vbi.xml + delete mode 100644 Documentation/DocBook/media/v4l/dev-subdev.xml + delete mode 100644 Documentation/DocBook/media/v4l/dev-teletext.xml + delete mode 100644 Documentation/DocBook/media/v4l/driver.xml + delete mode 100644 Documentation/DocBook/media/v4l/fdl-appendix.xml + delete mode 100644 Documentation/DocBook/media/v4l/fieldseq_bt.pdf + delete mode 100644 Documentation/DocBook/media/v4l/fieldseq_tb.pdf + delete mode 100644 Documentation/DocBook/media/v4l/func-close.xml + delete mode 100644 Documentation/DocBook/media/v4l/func-ioctl.xml + delete mode 100644 Documentation/DocBook/media/v4l/func-mmap.xml + delete mode 100644 Documentation/DocBook/media/v4l/func-munmap.xml + delete mode 100644 Documentation/DocBook/media/v4l/func-open.xml + delete mode 100644 Documentation/DocBook/media/v4l/func-poll.xml + delete mode 100644 Documentation/DocBook/media/v4l/func-read.xml + delete mode 100644 Documentation/DocBook/media/v4l/func-select.xml + delete mode 100644 Documentation/DocBook/media/v4l/func-write.xml + delete mode 100644 Documentation/DocBook/media/v4l/gen-errors.xml + delete mode 100644 Documentation/DocBook/media/v4l/io.xml + delete mode 100644 Documentation/DocBook/media/v4l/keytable.c.xml + delete mode 100644 Documentation/DocBook/media/v4l/libv4l.xml + delete mode 100644 Documentation/DocBook/media/v4l/lirc_device_interface.xml + delete mode 100644 Documentation/DocBook/media/v4l/media-controller.xml + delete mode 100644 Documentation/DocBook/media/v4l/media-func-close.xml + delete mode 100644 Documentation/DocBook/media/v4l/media-func-ioctl.xml + delete mode 100644 Documentation/DocBook/media/v4l/media-func-open.xml + delete mode 100644 Documentation/DocBook/media/v4l/media-ioc-device-info.xml + delete mode 100644 Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml + delete mode 100644 Documentation/DocBook/media/v4l/media-ioc-enum-links.xml + delete mode 100644 Documentation/DocBook/media/v4l/media-ioc-g-topology.xml + delete mode 100644 Documentation/DocBook/media/v4l/media-ioc-setup-link.xml + delete mode 100644 Documentation/DocBook/media/v4l/media-types.xml + delete mode 100644 Documentation/DocBook/media/v4l/pipeline.pdf + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-grey.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-m420.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-nv12.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-nv12m.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-nv16.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-nv16m.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-nv24.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-packed-yuv.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-sbggr16.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-sbggr8.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-sdr-cs08.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-sdr-cs14le.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-sdr-cu08.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-sdr-cu16le.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-sdr-ru12le.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-sgbrg8.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-sgrbg8.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-srggb10.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-srggb10alaw8.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-srggb10dpcm8.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-srggb10p.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-srggb12.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-srggb8.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-uv8.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-uyvy.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-vyuy.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-y10.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-y10b.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-y12.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-y12i.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-y16-be.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-y16.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-y41p.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-y8i.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-yuv410.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-yuv411p.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-yuv420.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-yuv422m.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-yuv422p.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-yuv444m.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-yuyv.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-yvyu.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-z16.xml + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt.xml + delete mode 100644 Documentation/DocBook/media/v4l/planar-apis.xml + delete mode 100644 Documentation/DocBook/media/v4l/remote_controllers.xml + delete mode 100644 Documentation/DocBook/media/v4l/selection-api.xml + delete mode 100644 Documentation/DocBook/media/v4l/selections-common.xml + delete mode 100644 Documentation/DocBook/media/v4l/subdev-formats.xml + delete mode 100644 Documentation/DocBook/media/v4l/subdev-image-processing-crop.dia + delete mode 100644 Documentation/DocBook/media/v4l/subdev-image-processing-crop.svg + delete mode 100644 Documentation/DocBook/media/v4l/subdev-image-processing-full.dia + delete mode 100644 Documentation/DocBook/media/v4l/subdev-image-processing-full.svg + delete mode 100644 Documentation/DocBook/media/v4l/subdev-image-processing-scaling-multi-source.dia + delete mode 100644 Documentation/DocBook/media/v4l/subdev-image-processing-scaling-multi-source.svg + delete mode 100644 Documentation/DocBook/media/v4l/v4l2.xml + delete mode 100644 Documentation/DocBook/media/v4l/v4l2grab.c.xml + delete mode 100644 Documentation/DocBook/media/v4l/vbi_525.pdf + delete mode 100644 Documentation/DocBook/media/v4l/vbi_625.pdf + delete mode 100644 Documentation/DocBook/media/v4l/vbi_hsync.pdf + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-create-bufs.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-cropcap.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-info.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-dbg-g-register.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-decoder-cmd.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-dqevent.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-enum-fmt.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-enum-frameintervals.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-enum-freq-bands.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-enumaudio.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-enumaudioout.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-enuminput.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-enumoutput.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-enumstd.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-expbuf.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-audio.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-audioout.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-crop.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-edid.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-enc-index.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-fmt.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-frequency.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-input.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-jpegcomp.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-modulator.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-output.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-parm.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-priority.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-selection.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-sliced-vbi-cap.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-std.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-tuner.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-log-status.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-overlay.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-prepare-buf.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-qbuf.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-query-dv-timings.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-querybuf.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-querycap.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-queryctrl.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-querystd.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-reqbufs.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-streamon.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-subdev-enum-frame-interval.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-subdev-enum-frame-size.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-subdev-enum-mbus-code.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-subdev-g-crop.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-subdev-g-fmt.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-subdev-g-frame-interval.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml + delete mode 100644 Documentation/DocBook/media/vbi_525.gif.b64 + delete mode 100644 Documentation/DocBook/media/vbi_625.gif.b64 + delete mode 100644 Documentation/DocBook/media/vbi_hsync.gif.b64 + delete mode 100644 Documentation/DocBook/media_api.tmpl +Merging pm/linux-next (4cd5b4888a16 Merge branches 'pm-cpufreq' and 'pm-sleep' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + arch/x86/power/hibernate_64.c | 18 +++++++++--------- + arch/x86/power/hibernate_asm_64.S | 2 -- + drivers/acpi/button.c | 4 ++++ + drivers/base/power/opp/core.c | 31 +++++++++++++++++++------------ + drivers/base/power/wakeup.c | 18 +++++++----------- + drivers/cpufreq/Kconfig | 1 - + drivers/cpufreq/intel_pstate.c | 2 ++ + drivers/pnp/pnpbios/core.c | 1 + + 8 files changed, 42 insertions(+), 35 deletions(-) +Merging idle/next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge idle/next +Already up-to-date. +Merging thermal/next (36a671b45da8 Merge branches 'thermal-core' and 'thermal-intel' into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + drivers/thermal/clock_cooling.c | 1 + + drivers/thermal/fair_share.c | 2 ++ + drivers/thermal/gov_bang_bang.c | 2 ++ + drivers/thermal/intel_pch_thermal.c | 60 ++++++++++++++++++++++++++++++++++++- + drivers/thermal/power_allocator.c | 2 ++ + drivers/thermal/step_wise.c | 2 ++ + drivers/thermal/thermal_core.c | 10 +++++-- + drivers/thermal/thermal_hwmon.c | 2 ++ + 8 files changed, 77 insertions(+), 4 deletions(-) +Merging thermal-soc/next (9a1d2bd3e7fd Merge branch 'work-fixes' into work-next) +$ git merge thermal-soc/next +Recorded preimage for 'drivers/thermal/thermal_core.c' +Auto-merging drivers/thermal/thermal_core.c +CONFLICT (content): Merge conflict in drivers/thermal/thermal_core.c +Auto-merging drivers/thermal/gov_bang_bang.c +Auto-merging drivers/acpi/thermal.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/thermal/thermal_core.c'. +[master 35d726a46170] Merge remote-tracking branch 'thermal-soc/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/thermal/qcom-tsens.txt | 21 + + .../devicetree/bindings/thermal/thermal.txt | 10 +- + Documentation/thermal/sysfs-api.txt | 19 + + drivers/acpi/thermal.c | 1 - + drivers/platform/x86/acerhdf.c | 1 - + drivers/thermal/Kconfig | 5 + + drivers/thermal/Makefile | 4 +- + drivers/thermal/gov_bang_bang.c | 2 +- + drivers/thermal/imx_thermal.c | 1 - + drivers/thermal/of-thermal.c | 47 +- + drivers/thermal/qcom/Kconfig | 11 + + drivers/thermal/qcom/Makefile | 2 + + drivers/thermal/qcom/tsens-8916.c | 113 ++ + drivers/thermal/qcom/tsens-8960.c | 292 ++++ + drivers/thermal/qcom/tsens-8974.c | 244 ++++ + drivers/thermal/qcom/tsens-8996.c | 84 ++ + drivers/thermal/qcom/tsens-common.c | 141 ++ + drivers/thermal/qcom/tsens.c | 200 +++ + drivers/thermal/qcom/tsens.h | 94 ++ + drivers/thermal/rcar_thermal.c | 1 + + drivers/thermal/rockchip_thermal.c | 93 +- + drivers/thermal/thermal_core.c | 1396 +++++--------------- + drivers/thermal/thermal_core.h | 26 + + drivers/thermal/thermal_helpers.c | 174 +++ + drivers/thermal/thermal_sysfs.c | 855 ++++++++++++ + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 30 +- + include/linux/thermal.h | 28 +- + 27 files changed, 2779 insertions(+), 1116 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/qcom-tsens.txt + create mode 100644 drivers/thermal/qcom/Kconfig + create mode 100644 drivers/thermal/qcom/Makefile + create mode 100644 drivers/thermal/qcom/tsens-8916.c + create mode 100644 drivers/thermal/qcom/tsens-8960.c + create mode 100644 drivers/thermal/qcom/tsens-8974.c + create mode 100644 drivers/thermal/qcom/tsens-8996.c + create mode 100644 drivers/thermal/qcom/tsens-common.c + create mode 100644 drivers/thermal/qcom/tsens.c + create mode 100644 drivers/thermal/qcom/tsens.h + create mode 100644 drivers/thermal/thermal_helpers.c + create mode 100644 drivers/thermal/thermal_sysfs.c +$ git am -3 ../patches/0001-thermal-fix-up-for-fix-race-condition-when-updating-.patch +Applying: thermal: fix up for "fix race condition when updating cooling device" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/thermal/thermal_helpers.c +$ git add -A . +$ git commit -v -a --amend +[master 49d1a7ef3b6a] Merge remote-tracking branch 'thermal-soc/next' + Date: Thu Aug 4 11:18:43 2016 +1000 +$ git am -3 ../patches/0001-thermal-fix-up-for-bad-merge-of-drivers-thermal-ther.patch +Applying: thermal: fix up for bad merge of drivers/thermal/thermal_core.c +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/thermal/thermal_core.c +$ git add -A . +$ git commit -v -a --amend +[master dde6ead49f58] Merge remote-tracking branch 'thermal-soc/next' + Date: Thu Aug 4 11:18:43 2016 +1000 +Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (61fa0c294347 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + drivers/dma/ioat/init.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging net-next/master (bf0f500bd019 Merge tag 'trace-v4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error) +$ git merge ipsec-next/master +Already up-to-date. +Merging netfilter-next/master (6a492b0f23d2 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge netfilter-next/master +Already up-to-date. +Merging ipvs-next/master (ae9442f688c3 ipvs: Use IS_ERR_OR_NULL(svc) instead of IS_ERR(svc) || svc == NULL) +$ git merge ipvs-next/master +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_ctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging wireless-drivers-next/master (cb6a11518850 wlcore: spi: fix build warning caused by redundant variable) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (a92bcaae230c mac802154: use rate limited warnings for malformed frames) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + include/net/bluetooth/hci_core.h | 2 ++ + net/6lowpan/ndisc.c | 2 -- + net/bluetooth/af_bluetooth.c | 5 +++++ + net/bluetooth/leds.c | 27 +++++++++++++++++++++++++++ + net/bluetooth/leds.h | 10 ++++++++++ + net/mac802154/iface.c | 1 + + net/mac802154/rx.c | 9 +++++++-- + 7 files changed, 52 insertions(+), 4 deletions(-) +Merging mac80211-next/master (6a492b0f23d2 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge mac80211-next/master +Already up-to-date. +Merging rdma/for-next (fb92d8fb1b9c Merge branches 'cxgb4-4.8', 'mlx5-4.8' and 'fw-version' into k.o/for-4.8) +$ git merge rdma/for-next +Auto-merging include/linux/mlx5/qp.h +Auto-merging include/linux/mlx5/driver.h +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/mlx4/main.c +Auto-merging drivers/infiniband/hw/i40iw/i40iw_verbs.c +Auto-merging drivers/infiniband/core/verbs.c +Auto-merging drivers/infiniband/core/uverbs_cmd.c +Auto-merging drivers/infiniband/core/sysfs.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/device.c | 9 + + drivers/infiniband/core/sysfs.c | 15 +- + drivers/infiniband/core/uverbs.h | 13 + + drivers/infiniband/core/uverbs_cmd.c | 535 +++++++++++++++- + drivers/infiniband/core/uverbs_main.c | 38 ++ + drivers/infiniband/core/verbs.c | 163 ++++- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 27 +- + drivers/infiniband/hw/cxgb4/cm.c | 181 ++++-- + drivers/infiniband/hw/cxgb4/cq.c | 42 +- + drivers/infiniband/hw/cxgb4/device.c | 2 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 22 + + drivers/infiniband/hw/cxgb4/mem.c | 111 ++-- + drivers/infiniband/hw/cxgb4/provider.c | 31 +- + drivers/infiniband/hw/cxgb4/qp.c | 10 +- + drivers/infiniband/hw/hfi1/hfi.h | 2 + + drivers/infiniband/hw/hfi1/verbs.c | 15 + + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 24 +- + drivers/infiniband/hw/mlx4/main.c | 24 +- + drivers/infiniband/hw/mlx5/cq.c | 87 ++- + drivers/infiniband/hw/mlx5/main.c | 429 ++++++++++++- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 74 +++ + drivers/infiniband/hw/mlx5/mr.c | 4 + + drivers/infiniband/hw/mlx5/qp.c | 691 ++++++++++++++++++++- + drivers/infiniband/hw/mlx5/srq.c | 112 ++-- + drivers/infiniband/hw/mlx5/user.h | 88 ++- + drivers/infiniband/hw/mthca/mthca_provider.c | 24 +- + drivers/infiniband/hw/nes/nes_verbs.c | 33 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 19 +- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 16 + + drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 17 - + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 6 +- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/srq.c | 265 ++++---- + drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 4 + + include/linux/mlx5/cq.h | 2 + + include/linux/mlx5/driver.h | 6 +- + include/linux/mlx5/qp.h | 4 +- + include/linux/mlx5/srq.h | 25 + + include/rdma/ib_verbs.h | 102 ++- + include/uapi/rdma/ib_user_verbs.h | 95 +++ + 40 files changed, 2888 insertions(+), 481 deletions(-) +Merging rdma-leon/rdma-next (4c2e07c6a29e Linux 4.7-rc5) +$ git merge rdma-leon/rdma-next +Already up-to-date. +Merging rdma-leon-test/testing/rdma-next (92d21ac74a9e Linux 4.7-rc7) +$ git merge rdma-leon-test/testing/rdma-next +Already up-to-date. +Merging mtd/master (11e8a7f9aa94 Merge tag 'for-linus-20160801' into HEAD) +$ git merge mtd/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging l2-mtd/master (1dcff2e4ae72 mtd: spi-nor: don't build Cadence QuadSPI on non-ARM) +$ git merge l2-mtd/master +Already up-to-date. +Merging nand/nand/next (8490c03bd9d4 mtd: nand: jz4780: Update MODULE_AUTHOR email address) +$ git merge nand/nand/next +Already up-to-date. +Merging crypto/master (0f95e2ffc58f Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (dfd2e9ab6a7d drm/i915: Check PSR setup time vs. vblank length) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (9bb34c4c730d drm/panel: simple: Add support for Starry KR122EA0SRA panel) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (a7b4667a0002 drm/i915: Never fully mask the the EI up rps interrupt on SNB/IVB) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/intel_display.c | 10 +--------- + drivers/gpu/drm/i915/intel_pm.c | 3 ++- + 2 files changed, 3 insertions(+), 10 deletions(-) +Merging drm-tegra/drm/tegra/for-next (64ea25c3bc86 drm/tegra: sor: Reject HDMI 2.0 modes) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (12ae57aab438 drm/arm: mali-dp: Fix error return code in malidp_bind()) +$ git merge drm-misc/topic/drm-misc +Already up-to-date. +Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (0a677125d0ff drm/msm: Delete an unnecessary check before drm_gem_object_unreference()) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7) +$ git merge hdlcd/for-upstream/hdlcd +Already up-to-date. +Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver) +$ git merge mali-dp/for-upstream/mali-dp +Already up-to-date. +Merging sunxi/sunxi/for-next (25d6a931b3f3 Merge branches 'sunxi/clk-fixes-for-4.7', 'sunxi/defconfig-for-4.8', 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.8' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kbuild/for-next (f6830d5346c9 Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kspp/for-next/kspp (6fbe16013e52 Merge branch 'for-next/ro_after_init' into for-next/kspp) +$ git merge kspp/for-next/kspp +Resolved 'arch/arm64/include/asm/uaccess.h' using previous resolution. +Resolved 'arch/powerpc/Kconfig' using previous resolution. +Resolved 'arch/x86/kernel/x86_init.c' using previous resolution. +Resolved 'arch/x86/kvm/vmx.c' using previous resolution. +Resolved 'drivers/char/random.c' using previous resolution. +Resolved 'include/linux/thread_info.h' using previous resolution. +Resolved 'mm/page_alloc.c' using previous resolution. +Auto-merging net/core/dev.c +Auto-merging mm/slub.c +Auto-merging mm/slab.c +Auto-merging mm/page_alloc.c +CONFLICT (content): Merge conflict in mm/page_alloc.c +Auto-merging mm/Makefile +Auto-merging lib/random32.c +Auto-merging kernel/time/timer.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/fork.c +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/linux/thread_info.h +CONFLICT (content): Merge conflict in include/linux/thread_info.h +Auto-merging include/linux/slab.h +Auto-merging include/linux/random.h +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/init.h +Auto-merging include/linux/genhd.h +Auto-merging include/linux/compiler.h +Auto-merging fs/namespace.c +Auto-merging drivers/char/random.c +CONFLICT (content): Merge conflict in drivers/char/random.c +Auto-merging arch/x86/kvm/vmx.c +CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Auto-merging arch/x86/kernel/x86_init.c +CONFLICT (content): Merge conflict in arch/x86/kernel/x86_init.c +Auto-merging arch/x86/kernel/setup_percpu.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/reboot.c +Auto-merging arch/x86/kernel/paravirt.c +Auto-merging arch/x86/kernel/cpu/mtrr/main.c +Auto-merging arch/x86/kernel/cpu/common.c +Auto-merging arch/x86/kernel/apic/x2apic_uv_x.c +Auto-merging arch/x86/kernel/apic/x2apic_phys.c +Auto-merging arch/x86/kernel/apic/x2apic_cluster.c +Auto-merging arch/x86/kernel/apic/probe_32.c +Auto-merging arch/x86/kernel/apic/bigsmp_32.c +Auto-merging arch/x86/kernel/apic/apic_noop.c +Auto-merging arch/x86/kernel/apic/apic_flat_64.c +Auto-merging arch/x86/include/asm/uaccess.h +Auto-merging arch/x86/include/asm/thread_info.h +Auto-merging arch/x86/include/asm/fpu/xstate.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/lib/uaccess.c +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/kernel/Makefile +Auto-merging arch/powerpc/Kconfig +CONFLICT (content): Merge conflict in arch/powerpc/Kconfig +Auto-merging arch/ia64/Kconfig +Auto-merging arch/arm64/include/asm/uaccess.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/uaccess.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/kernel/cpuidle.c +Auto-merging arch/arm/include/asm/uaccess.h +Auto-merging arch/arm/Kconfig +Auto-merging Makefile +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0cc530c2e096] Merge remote-tracking branch 'kspp/for-next/kspp' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 5 + + Makefile | 7 - + arch/Kconfig | 32 ++ + arch/arm/Kconfig | 1 + + arch/arm/include/asm/uaccess.h | 11 +- + arch/arm/kernel/cpuidle.c | 2 +- + arch/arm/kernel/setup.c | 10 +- + arch/arm/kernel/smp.c | 2 +- + arch/arm/lib/delay.c | 2 +- + arch/arm/mm/mmu.c | 9 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/uaccess.h | 15 +- + arch/ia64/Kconfig | 1 + + arch/ia64/include/asm/uaccess.h | 18 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/uaccess.h | 21 +- + arch/powerpc/kernel/Makefile | 5 + + arch/s390/Kconfig | 1 + + arch/s390/lib/uaccess.c | 2 + + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/uaccess_32.h | 14 +- + arch/sparc/include/asm/uaccess_64.h | 11 +- + arch/x86/Kconfig | 2 + + arch/x86/include/asm/desc.h | 2 +- + arch/x86/include/asm/fpu/xstate.h | 3 +- + arch/x86/include/asm/thread_info.h | 44 ++ + arch/x86/include/asm/uaccess.h | 10 +- + arch/x86/include/asm/uaccess_32.h | 2 + + arch/x86/include/asm/uaccess_64.h | 2 + + arch/x86/kernel/apic/apic_flat_64.c | 6 +- + arch/x86/kernel/apic/apic_noop.c | 2 +- + arch/x86/kernel/apic/bigsmp_32.c | 2 +- + arch/x86/kernel/apic/msi.c | 2 +- + arch/x86/kernel/apic/probe_32.c | 4 +- + arch/x86/kernel/apic/x2apic_cluster.c | 2 +- + arch/x86/kernel/apic/x2apic_phys.c | 2 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 2 +- + arch/x86/kernel/cpu/common.c | 11 +- + arch/x86/kernel/cpu/mtrr/main.c | 4 +- + arch/x86/kernel/cpu/mtrr/mtrr.h | 2 +- + arch/x86/kernel/ksysfs.c | 2 +- + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kernel/paravirt.c | 2 +- + arch/x86/kernel/ptrace.c | 6 +- + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/setup.c | 4 +- + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/kernel/x86_init.c | 6 +- + arch/x86/kvm/svm.c | 2 +- + arch/x86/kvm/vmx.c | 2 +- + arch/x86/pci/pcbios.c | 7 +- + block/blk-softirq.c | 2 +- + drivers/char/random.c | 4 +- + fs/namespace.c | 1 + + include/linux/compiler-gcc.h | 7 + + include/linux/compiler.h | 4 + + include/linux/fdtable.h | 2 +- + include/linux/genhd.h | 2 +- + include/linux/init.h | 5 +- + include/linux/mmzone.h | 2 + + include/linux/random.h | 15 +- + include/linux/slab.h | 12 + + include/linux/thread_info.h | 24 ++ + init/Kconfig | 2 + + init/main.c | 1 + + kernel/fork.c | 7 +- + kernel/rcu/tiny.c | 2 +- + kernel/rcu/tree.c | 2 +- + kernel/sched/fair.c | 2 +- + kernel/softirq.c | 4 +- + kernel/time/timer.c | 2 +- + lib/irq_poll.c | 2 +- + lib/random32.c | 2 +- + mm/Makefile | 4 + + mm/page_alloc.c | 32 ++ + mm/slab.c | 30 ++ + mm/slub.c | 40 ++ + mm/usercopy.c | 268 ++++++++++++ + net/core/dev.c | 4 +- + scripts/Kbuild.include | 10 +- + scripts/Makefile.gcc-plugins | 45 +- + scripts/gcc-plugin.sh | 14 + + scripts/gcc-plugins/Makefile | 11 +- + scripts/gcc-plugins/latent_entropy_plugin.c | 639 ++++++++++++++++++++++++++++ + security/Kconfig | 28 ++ + 85 files changed, 1424 insertions(+), 120 deletions(-) + create mode 100644 mm/usercopy.c + create mode 100644 scripts/gcc-plugins/latent_entropy_plugin.c +Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (7fd1a44a9da2 Merge remote-tracking branch 'regmap/fix/cache' into regmap-linus) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regcache.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging sound/for-next (fd48331f9b71 ALSA: hda: add AMD Bonaire AZ PCI ID with proper driver caps) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (d9d16379b266 Merge remote-tracking branch 'asoc/topic/rt5659' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/rt5659.txt | 3 ++ + sound/soc/codecs/cs42l73.c | 4 +- + sound/soc/codecs/cs53l30.c | 8 ++-- + sound/soc/codecs/da7219-aad.c | 18 +++++++- + sound/soc/codecs/da7219.c | 18 +++++--- + sound/soc/codecs/rt5659.c | 24 ++++++++++ + sound/soc/codecs/rt5659.h | 1 + + sound/soc/generic/Makefile | 6 +-- + sound/soc/generic/simple-card-utils.c | 6 +++ + sound/soc/intel/skylake/bxt-sst.c | 28 ++++++++--- + sound/soc/intel/skylake/skl-messages.c | 38 +++++++++------ + sound/soc/intel/skylake/skl-pcm.c | 20 ++++++++ + sound/soc/intel/skylake/skl-sst-dsp.h | 5 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 23 +++++++++ + sound/soc/intel/skylake/skl-sst-ipc.h | 9 ++++ + sound/soc/intel/skylake/skl-sst-utils.c | 14 ++++-- + sound/soc/intel/skylake/skl-sst.c | 43 ++++++++++------- + sound/soc/intel/skylake/skl-topology.c | 54 ++++++++++++++++++++-- + sound/soc/intel/skylake/skl-topology.h | 2 +- + sound/soc/intel/skylake/skl-tplg-interface.h | 12 +++++ + sound/soc/intel/skylake/skl.h | 2 + + sound/soc/sh/rcar/src.c | 6 ++- + sound/soc/soc-dapm.c | 10 ++++ + 23 files changed, 286 insertions(+), 68 deletions(-) +Merging modules/modules-next (49aadcf1b6f4 extable.h: add stddef.h so "NULL" definition is not implicit) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Auto-merging kernel/jump_label.c +Auto-merging include/uapi/linux/elf.h +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 3 + + Documentation/module-signing.txt | 6 ++ + include/linux/extable.h | 32 ++++++++++ + include/linux/module.h | 37 +++-------- + include/uapi/linux/elf.h | 1 + + kernel/jump_label.c | 5 +- + kernel/livepatch/core.c | 2 +- + kernel/module.c | 121 +++++++++++++++++++++++++++++------- + 8 files changed, 155 insertions(+), 52 deletions(-) + create mode 100644 include/linux/extable.h +Merging input/next (a485cb037fe6 Input: add driver for SiS 9200 family I2C touchscreen controllers) +$ git merge input/next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/rotary-encoder.txt | 4 + + .../bindings/input/touchscreen/silead_gsl1680.txt | 36 ++ + .../bindings/input/touchscreen/sis_i2c.txt | 33 ++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/input/joystick/xpad.c | 43 ++ + drivers/input/keyboard/cros_ec_keyb.c | 19 +- + drivers/input/misc/rotary_encoder.c | 23 +- + drivers/input/mouse/elan_i2c_core.c | 79 ++- + drivers/input/mouse/elantech.c | 8 +- + drivers/input/rmi4/rmi_bus.c | 5 +- + drivers/input/serio/i8042.c | 16 +- + drivers/input/serio/libps2.c | 10 +- + drivers/input/touchscreen/Kconfig | 24 + + drivers/input/touchscreen/Makefile | 2 + + drivers/input/touchscreen/ili210x.c | 2 +- + drivers/input/touchscreen/silead.c | 568 +++++++++++++++++++++ + drivers/input/touchscreen/sis_i2c.c | 413 +++++++++++++++ + include/linux/i8042.h | 6 - + include/linux/serio.h | 24 +- + 19 files changed, 1246 insertions(+), 70 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/sis_i2c.txt + create mode 100644 drivers/input/touchscreen/silead.c + create mode 100644 drivers/input/touchscreen/sis_i2c.c +Merging block/for-next (b013517951a1 Merge branch 'for-4.8/core' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. +Merging lightnvm/for-next (191d684c5d4f Merge branch 'for-4.8/drivers' into for-next) +$ git merge lightnvm/for-next +Already up-to-date. +Merging device-mapper/for-next (b2a4872a4528 dm raid: constructor fails on non-zero incompat_features) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-flakey.c | 23 +++++++++++++++-------- + drivers/md/dm-mpath.c | 24 ++++++++++++++++++++---- + drivers/md/dm-raid.c | 3 ++- + drivers/md/dm-rq.c | 20 +++++++++++++++++++- + drivers/md/dm.c | 14 +++++++------- + 5 files changed, 63 insertions(+), 21 deletions(-) +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc-uh/next (6ea625794518 mmc: rtsx_pci: Remove deprecated create_singlethread_workqueue) +$ git merge mmc-uh/next +Already up-to-date. +Merging md/for-next (ff00d3b4e5e4 raid5: fix incorrectly counter of conf->empty_inactive_list_nr) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/raid10.c | 4 ++-- + drivers/md/raid5.c | 12 ++++++++++++ + 2 files changed, 14 insertions(+), 2 deletions(-) +Merging mfd/for-mfd-next (f37be01e6dc6 mfd: qcom_rpm: Parametrize also ack selector size) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (602553073892 backlight: lp855x: Add enable regulator) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (4fcd504edbf7 power: reset: add reboot mode driver) +$ git merge battery/master +Already up-to-date. +Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (a485f5fc8c8e Merge remote-tracking branches 'regulator/topic/qcom-spmi', 'regulator/topic/rn5t618', 'regulator/topic/tps65218' and 'regulator/topic/twl' into regulator-next) +$ git merge regulator/for-next +Already up-to-date. +Merging security/next (7616ac70d1bb apparmor: fix SECURITY_APPARMOR_HASH_DEFAULT parameter handling) +$ git merge security/next +Already up-to-date. +Merging integrity/next (56078b570983 module: Fully remove the kernel_module_from_file hook) +$ git merge integrity/next +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Merge made by the 'recursive' strategy. + include/linux/lsm_hooks.h | 1 - + include/linux/security.h | 1 - + 2 files changed, 2 deletions(-) +Merging keys/keys-next (05638c9bc586 Merge branch 'keys-asym-keyctl' into keys-next) +$ git merge keys/keys-next +Auto-merging crypto/asymmetric_keys/pkcs7_verify.c +Auto-merging Documentation/crypto/asymmetric-keys.txt +Merge made by the 'recursive' strategy. + Documentation/crypto/asymmetric-keys.txt | 26 ++- + Documentation/security/keys.txt | 217 ++++++++++++++++++++ + certs/Kconfig | 18 ++ + certs/Makefile | 6 + + certs/blacklist.c | 174 ++++++++++++++++ + certs/blacklist.h | 3 + + certs/blacklist_hashes.c | 6 + + certs/blacklist_nohashes.c | 5 + + crypto/asymmetric_keys/Kconfig | 10 + + crypto/asymmetric_keys/Makefile | 13 ++ + crypto/asymmetric_keys/asymmetric_keys.h | 3 + + crypto/asymmetric_keys/asymmetric_type.c | 59 +++++- + crypto/asymmetric_keys/pkcs7_parser.c | 1 + + crypto/asymmetric_keys/pkcs7_parser.h | 1 + + crypto/asymmetric_keys/pkcs7_verify.c | 32 ++- + crypto/asymmetric_keys/pkcs8.asn1 | 24 +++ + crypto/asymmetric_keys/pkcs8_parser.c | 184 +++++++++++++++++ + crypto/asymmetric_keys/public_key.c | 195 ++++++++++++++++-- + crypto/asymmetric_keys/signature.c | 95 +++++++++ + crypto/asymmetric_keys/x509_cert_parser.c | 21 +- + crypto/asymmetric_keys/x509_parser.h | 1 + + crypto/asymmetric_keys/x509_public_key.c | 15 ++ + include/crypto/public_key.h | 14 +- + include/keys/asymmetric-subtype.h | 9 + + include/keys/system_keyring.h | 12 ++ + include/linux/key-type.h | 11 + + include/linux/keyctl.h | 46 +++++ + include/uapi/linux/keyctl.h | 30 +++ + security/keys/Makefile | 1 + + security/keys/compat.c | 18 ++ + security/keys/internal.h | 39 ++++ + security/keys/keyctl.c | 24 +++ + security/keys/keyctl_pkey.c | 323 ++++++++++++++++++++++++++++++ + 33 files changed, 1584 insertions(+), 52 deletions(-) + create mode 100644 certs/blacklist.c + create mode 100644 certs/blacklist.h + create mode 100644 certs/blacklist_hashes.c + create mode 100644 certs/blacklist_nohashes.c + create mode 100644 crypto/asymmetric_keys/pkcs8.asn1 + create mode 100644 crypto/asymmetric_keys/pkcs8_parser.c + create mode 100644 include/linux/keyctl.h + create mode 100644 security/keys/keyctl_pkey.c +Merging selinux/next (3f09354ac84c netlabel: Implement CALIPSO config functions for SMACK.) +$ git merge selinux/next +Already up-to-date. +Merging tpmdd/next (82cc1a49b635 tpm: Add TPM 2.0 support to the Nuvoton i2c driver (NPCT6xx family)) +$ git merge tpmdd/next +Already up-to-date. +Merging watchdog/master (1ac06563434e watchdog: gpio_wdt: Fix missing platform_set_drvdata() in gpio_wdt_probe()) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (f360d3241f55 Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm/rockchip', 'arm/smmu' and 'core' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (0991bbdbf5b8 vfio: platform: check reset call return code during release) +$ git merge vfio/next +Already up-to-date. +Merging jc_docs/docs-next (09c3bcce7c3f Documenation: update cgroup's document path) +$ git merge jc_docs/docs-next +Auto-merging Documentation/vm/unevictable-lru.txt +Auto-merging Documentation/vm/page_migration +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/cgroup-v1/memcg_test.txt +Auto-merging Documentation/Makefile.sphinx +Merge made by the 'recursive' strategy. + Documentation/Makefile.sphinx | 4 ++-- + Documentation/cgroup-v1/cgroups.txt | 4 ++-- + Documentation/cgroup-v1/cpusets.txt | 2 +- + Documentation/cgroup-v1/memcg_test.txt | 4 ++-- + Documentation/filesystems/tmpfs.txt | 2 +- + Documentation/kernel-parameters.txt | 4 ++-- + Documentation/kernel-per-CPU-kthreads.txt | 2 +- + Documentation/scheduler/sched-deadline.txt | 2 +- + Documentation/scheduler/sched-design-CFS.txt | 2 +- + Documentation/scheduler/sched-rt-group.txt | 2 +- + Documentation/vm/numa | 4 ++-- + Documentation/vm/numa_memory_policy.txt | 2 +- + Documentation/vm/page_migration | 2 +- + Documentation/vm/unevictable-lru.txt | 2 +- + Documentation/x86/x86_64/fake-numa-for-cpusets | 4 ++-- + 15 files changed, 21 insertions(+), 21 deletions(-) +Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (43761473c254 audit: fix a double fetch in audit_log_single_execve_arg()) +$ git merge audit/next +Already up-to-date. +Merging devicetree/for-next (e973f4ec130a xtensa: Partially Revert "xtensa: Remove unnecessary of_platform_populate with default match table") +$ git merge devicetree/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (a68b216676e8 mailbox: Fix format and type mismatches in Broadcom PDC driver) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (914a58c1a1b4 Merge remote-tracking branch 'spi/topic/pic32-sqi' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + drivers/spi/spi-img-spfi.c | 2 -- + drivers/spi/spi-mt65xx.c | 1 - + drivers/spi/spi-pic32-sqi.c | 6 ++---- + drivers/spi/spi-qup.c | 1 - + 4 files changed, 2 insertions(+), 8 deletions(-) +Merging tip/auto-latest (4960be97f652 Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Resolved 'arch/x86/include/asm/thread_info.h' using previous resolution. +Resolved 'arch/x86/lib/csum-wrappers_64.c' using previous resolution. +Auto-merging arch/x86/lib/csum-wrappers_64.c +CONFLICT (content): Merge conflict in arch/x86/lib/csum-wrappers_64.c +Auto-merging arch/x86/kernel/ptrace.c +Auto-merging arch/x86/include/asm/thread_info.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/thread_info.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 603f57012ba0] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + arch/x86/entry/common.c | 6 +++++- + arch/x86/entry/entry_64.S | 3 +-- + arch/x86/entry/syscalls/syscall_32.tbl | 2 +- + arch/x86/entry/vdso/vdso2c.h | 6 ++++++ + arch/x86/events/core.c | 11 +++++++---- + arch/x86/include/asm/syscall.h | 5 +---- + arch/x86/include/asm/thread_info.h | 3 +++ + arch/x86/kernel/ptrace.c | 15 +++++++++------ + arch/x86/kernel/signal.c | 26 ++++++++++++++++++++++++-- + drivers/clocksource/arm_arch_timer.c | 26 +++++++++++++++++++++++--- + kernel/events/core.c | 2 +- + kernel/futex.c | 23 ++++++++++++++++++++++- + 12 files changed, 103 insertions(+), 25 deletions(-) +Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (a67adb32d941 ARM: dts: Add Arria10 Ethernet EDAC devicetree entry) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (77d50b17c990 Merge branch 'irqchip/misc' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ftrace/for-next (78aebca2c955 printk, tracing: Avoiding unneeded blank lines) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (5bc94664884a rcu: Avoid redundant quiescent-state chasing) +$ git merge rcu/rcu/next +Resolved 'kernel/rcu/tree.c' using previous resolution. +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/core.c +Auto-merging kernel/rcu/tree_exp.h +Auto-merging kernel/rcu/tree.c +CONFLICT (content): Merge conflict in kernel/rcu/tree.c +Auto-merging kernel/cpu.c +Auto-merging include/linux/rcupdate.h +Auto-merging include/linux/list.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f2fdea51f237] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + .../Design/Expedited-Grace-Periods/ExpRCUFlow.svg | 830 +++++++++++++++++++++ + .../Expedited-Grace-Periods/ExpSchedFlow.svg | 826 ++++++++++++++++++++ + .../Expedited-Grace-Periods.html | 476 ++++++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel0.svg | 275 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel1.svg | 275 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel2.svg | 287 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel3.svg | 323 ++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel4.svg | 323 ++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel5.svg | 335 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel6.svg | 335 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel7.svg | 347 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel8.svg | 311 ++++++++ + Documentation/RCU/torture.txt | 15 - + include/linux/list.h | 7 +- + include/linux/rcupdate.h | 1 + + kernel/cpu.c | 1 + + kernel/rcu/Makefile | 3 +- + kernel/rcu/rcutorture.c | 7 +- + kernel/rcu/tree.c | 47 +- + kernel/rcu/tree.h | 1 + + kernel/rcu/tree_exp.h | 124 +-- + kernel/rcu/tree_plugin.h | 1 + + kernel/rcu/tree_trace.c | 7 +- + kernel/rcu/update.c | 3 +- + kernel/rcu/waketorture.c | 537 +++++++++++++ + kernel/sched/core.c | 7 + + kernel/torture.c | 27 +- + lib/Kconfig.debug | 20 + + .../selftests/rcutorture/bin/kvm-recheck-wake.sh | 39 + + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- + .../selftests/rcutorture/configs/wake/CFLIST | 1 + + .../selftests/rcutorture/configs/wake/CFcommon | 2 + + tools/testing/selftests/rcutorture/configs/wake/SH | 19 + + .../selftests/rcutorture/configs/wake/SH.boot | 1 + + .../testing/selftests/rcutorture/configs/wake/STI | 19 + + .../selftests/rcutorture/configs/wake/STI.boot | 1 + + .../rcutorture/configs/wake/ver_functions.sh | 43 ++ + 38 files changed, 5782 insertions(+), 98 deletions(-) + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpRCUFlow.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel0.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel1.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel2.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel3.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel4.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel5.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel6.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel7.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel8.svg + create mode 100644 kernel/rcu/waketorture.c + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-wake.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFLIST + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFcommon + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/ver_functions.sh +Merging kvm/linux-next (23528bb21ee2 KVM: PPC: Introduce KVM_CAP_PPC_HTM) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (89581f06b2bc arm64: KVM: Set cpsr before spsr on fault injection) +$ git merge kvm-arm/next +Resolved 'Documentation/virtual/kvm/api.txt' using previous resolution. +Resolved 'virt/kvm/irqchip.c' using previous resolution. +Auto-merging virt/kvm/irqchip.c +CONFLICT (content): Merge conflict in virt/kvm/irqchip.c +Auto-merging virt/kvm/arm/vgic/vgic-init.c +Auto-merging include/uapi/linux/kvm.h +Auto-merging include/linux/kvm_host.h +Auto-merging Documentation/virtual/kvm/api.txt +CONFLICT (content): Merge conflict in Documentation/virtual/kvm/api.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9dd75983d5f8] Merge remote-tracking branch 'kvm-arm/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virtual/kvm/api.txt | 34 +++++++++-- + arch/arm/kvm/Kconfig | 2 + + arch/arm/kvm/Makefile | 1 + + arch/arm/kvm/irq.h | 19 +++++++ + arch/arm64/kvm/Kconfig | 2 + + arch/arm64/kvm/Makefile | 1 + + arch/arm64/kvm/inject_fault.c | 12 ++-- + arch/arm64/kvm/irq.h | 19 +++++++ + arch/x86/kvm/irq.h | 3 + + include/kvm/arm_vgic.h | 7 +++ + include/linux/kvm_host.h | 12 +++- + include/uapi/linux/kvm.h | 5 +- + virt/kvm/arm/vgic/vgic-init.c | 4 ++ + virt/kvm/arm/vgic/vgic-irqfd.c | 116 ++++++++++++++++++++++++++++++++------ + virt/kvm/arm/vgic/vgic.c | 7 --- + virt/kvm/irqchip.c | 28 +++++---- + 16 files changed, 220 insertions(+), 52 deletions(-) + create mode 100644 arch/arm/kvm/irq.h + create mode 100644 arch/arm64/kvm/irq.h +Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvm-ppc-paulus/kvm-ppc-next (93d17397e4e2 KVM: PPC: Book3S HV: Save/restore TM state in H_CEDE) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (9acc317b183f KVM: s390: let ptff intercepts result in cc=3) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (d34c30cc1fa8 xen: add static initialization of steal_clock op to xen_time_ops) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (d945b5e9f0e3 workqueue: Fix setting affinity of unbound worker threads) +$ git merge workqueues/for-next +Already up-to-date. +Merging drivers-x86/for-next (c37636b450ae dell-wmi: Ignore WMI event 0xe00e) +$ git merge drivers-x86/for-next +Merge made by the 'recursive' strategy. + drivers/platform/x86/dell-wmi.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. +Merging hsi/for-next (9c99e5e51988 HSI: omap_ssi: drop pm_runtime_irq_safe) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (5706c01fcfb3 leds: is31fl32xx: define complete i2c_device_id table) +$ git merge leds/for-next +Already up-to-date. +Merging ipmi/for-next (92cad0931b08 ipmi: remove trydefaults parameter and default init) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. +Merging driver-core/driver-core-next (523d939ef98f Linux 4.7) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (0e06f5c0deee Merge branch 'akpm' (patches from Andrew)) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (0bf048abebb6 staging: emxx_udc: allow modular build) +$ git merge usb/usb-next +Removing drivers/usb/serial/ti_usb_3410_5052.h +Merge made by the 'recursive' strategy. + drivers/staging/emxx_udc/Kconfig | 2 +- + drivers/staging/emxx_udc/emxx_udc.c | 36 ++++- + drivers/usb/serial/cp210x.c | 4 +- + drivers/usb/serial/generic.c | 18 ++- + drivers/usb/serial/option.c | 3 + + drivers/usb/serial/ti_usb_3410_5052.c | 271 ++++++++++++++++++++++++++++++---- + drivers/usb/serial/ti_usb_3410_5052.h | 259 -------------------------------- + 7 files changed, 293 insertions(+), 300 deletions(-) + delete mode 100644 drivers/usb/serial/ti_usb_3410_5052.h +Merging usb-gadget/next (15e4292a2d21 usb: renesas_usbhs: protect the CFIFOSEL setting in usbhsg_ep_enable()) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (3161da970d38 USB: serial: use variable for status) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (229d43daf8ed usb: chipidea: imx: set over current polarity per dts setting) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 2 ++ + .../devicetree/bindings/usb/usbmisc-imx.txt | 1 + + drivers/usb/chipidea/ci_hdrc_imx.c | 3 +++ + drivers/usb/chipidea/ci_hdrc_imx.h | 1 + + drivers/usb/chipidea/udc.c | 9 +++------ + drivers/usb/chipidea/usbmisc_imx.c | 22 +++++++++++++++++----- + 6 files changed, 27 insertions(+), 11 deletions(-) +Merging staging/staging-next (0e06f5c0deee Merge branch 'akpm' (patches from Andrew)) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (0e06f5c0deee Merge branch 'akpm' (patches from Andrew)) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (356d95190d84 extcon: Fix compile time warning) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-adc-jack.c | 27 ++++++++++--------- + drivers/extcon/extcon-arizona.c | 13 ++++++---- + drivers/extcon/extcon-gpio.c | 2 +- + drivers/extcon/extcon.c | 47 ++++------------------------------ + include/linux/extcon.h | 30 ---------------------- + include/linux/extcon/extcon-adc-jack.h | 4 +-- + 6 files changed, 31 insertions(+), 92 deletions(-) +Merging cgroup/for-next (1cab4a96cab6 Merge branch 'for-4.8' into for-next) +$ git merge cgroup/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (c8e18acccb9b ipr: Fix error return code in ipr_probe_ioa()) +$ git merge scsi/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/scsi/cxlflash/main.c | 10 ++++++++- + drivers/scsi/fcoe/fcoe.c | 52 +++++++++++++++++++++++++++++++++++++++++-- + drivers/scsi/fcoe/fcoe.h | 1 + + drivers/scsi/ipr.c | 10 +++++++++ + drivers/scsi/ipr.h | 1 + + drivers/scsi/lpfc/lpfc_scsi.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 15 +++++-------- + 8 files changed, 79 insertions(+), 13 deletions(-) +Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation") +$ git merge target-updates/for-next +Auto-merging include/scsi/viosrp.h +Auto-merging drivers/target/target_core_iblock.c +Auto-merging drivers/scsi/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 10 +- + drivers/scsi/Kconfig | 17 + + drivers/scsi/Makefile | 1 + + drivers/scsi/ibmvscsi/ibmvfc.h | 2 +- + drivers/scsi/ibmvscsi/ibmvscsi.h | 2 +- + drivers/scsi/ibmvscsi_tgt/Makefile | 3 + + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 4087 ++++++++++++++++++++++ + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h | 346 ++ + drivers/scsi/ibmvscsi_tgt/libsrp.c | 427 +++ + drivers/scsi/ibmvscsi_tgt/libsrp.h | 123 + + drivers/target/iscsi/iscsi_target.c | 22 +- + drivers/target/iscsi/iscsi_target_login.c | 5 +- + drivers/target/target_core_device.c | 8 +- + drivers/target/target_core_file.c | 5 +- + drivers/target/target_core_iblock.c | 3 +- + drivers/target/target_core_internal.h | 1 + + drivers/target/target_core_sbc.c | 2 +- + drivers/target/target_core_transport.c | 94 +- + drivers/target/tcm_fc/tfc_sess.c | 2 + + {drivers/scsi/ibmvscsi => include/scsi}/viosrp.h | 13 +- + include/target/target_core_backend.h | 2 +- + include/target/target_core_base.h | 1 + + include/target/target_core_fabric.h | 1 - + 23 files changed, 5110 insertions(+), 67 deletions(-) + create mode 100644 drivers/scsi/ibmvscsi_tgt/Makefile + create mode 100644 drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c + create mode 100644 drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h + create mode 100644 drivers/scsi/ibmvscsi_tgt/libsrp.c + create mode 100644 drivers/scsi/ibmvscsi_tgt/libsrp.h + rename {drivers/scsi/ibmvscsi => include/scsi}/viosrp.h (92%) +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging libata/for-next (737bee9308c4 libata-scsi: better style in ata_msense_*()) +$ git merge libata/for-next +Already up-to-date. +Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) +$ git merge binfmt_misc/for-next +Auto-merging fs/open.c +Auto-merging fs/internal.h +Auto-merging fs/binfmt_misc.c +Merge made by the 'recursive' strategy. + Documentation/binfmt_misc.txt | 7 +++++++ + fs/binfmt_misc.c | 41 +++++++++++++++++++++++++++++++++++++++-- + fs/internal.h | 1 + + fs/open.c | 20 ++++++++++++++++++++ + 4 files changed, 67 insertions(+), 2 deletions(-) +Merging pinctrl/for-next (9573e7923007 pinctrl: fix pincontrol definition for marvell) +$ git merge pinctrl/for-next +Already up-to-date. +Merging vhost/linux-next (b226acab2f6a VSOCK: Use kvfree()) +$ git merge vhost/linux-next +Auto-merging include/uapi/linux/Kbuild +Auto-merging drivers/virtio/virtio_balloon.c +Auto-merging drivers/vhost/net.c +Auto-merging drivers/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 13 + + drivers/Makefile | 1 + + drivers/misc/mic/Kconfig | 4 + + drivers/net/caif/Kconfig | 2 +- + drivers/vhost/Kconfig | 18 +- + drivers/vhost/Kconfig.vringh | 5 + + drivers/vhost/Makefile | 4 + + drivers/vhost/net.c | 67 +- + drivers/vhost/vhost.c | 927 +++++++++++++++---- + drivers/vhost/vhost.h | 64 +- + drivers/vhost/vsock.c | 719 +++++++++++++++ + drivers/virtio/virtio_balloon.c | 2 + + drivers/virtio/virtio_ring.c | 15 +- + include/linux/virtio_config.h | 13 + + include/linux/virtio_vsock.h | 154 ++++ + include/net/af_vsock.h | 6 + + .../trace/events/vsock_virtio_transport_common.h | 144 +++ + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/vhost.h | 33 + + include/uapi/linux/virtio_config.h | 10 +- + include/uapi/linux/virtio_ids.h | 1 + + include/uapi/linux/virtio_vsock.h | 94 ++ + net/vmw_vsock/Kconfig | 20 + + net/vmw_vsock/Makefile | 6 + + net/vmw_vsock/af_vsock.c | 25 +- + net/vmw_vsock/virtio_transport.c | 624 +++++++++++++ + net/vmw_vsock/virtio_transport_common.c | 992 +++++++++++++++++++++ + net/vmw_vsock/vmci_transport.c | 2 + + 28 files changed, 3765 insertions(+), 201 deletions(-) + create mode 100644 drivers/vhost/Kconfig.vringh + create mode 100644 drivers/vhost/vsock.c + create mode 100644 include/linux/virtio_vsock.h + create mode 100644 include/trace/events/vsock_virtio_transport_common.h + create mode 100644 include/uapi/linux/virtio_vsock.h + create mode 100644 net/vmw_vsock/virtio_transport.c + create mode 100644 net/vmw_vsock/virtio_transport_common.c +Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias) +$ git merge remoteproc/for-next +Merge made by the 'recursive' strategy. +Merging rpmsg/for-next (e937b335a738 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging gpio/for-next (7a73f0695d66 ARM: do away with final ARCH_REQUIRE_GPIOLIB) +$ git merge gpio/for-next +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + Documentation/gpio/board.txt | 6 +++--- + Documentation/gpio/gpio-legacy.txt | 16 ++++------------ + arch/arm64/Kconfig | 1 - + arch/arm64/Kconfig.platforms | 12 ++++++------ + arch/blackfin/Kconfig | 2 +- + drivers/gpio/Kconfig | 21 --------------------- + 6 files changed, 14 insertions(+), 44 deletions(-) +Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (53de7c26ded7 Merge branch 'for-4.8/regulator' into for-next) +$ git merge pwm/for-next +Resolved 'Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt' using previous resolution. +Removing drivers/pwm/pwm-tipwmss.h +Auto-merging Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9eebc021317e] Merge remote-tracking branch 'pwm/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-pwm | 9 + + .../devicetree/bindings/pwm/brcm,iproc-pwm.txt | 21 ++ + .../devicetree/bindings/pwm/google,cros-ec-pwm.txt | 23 ++ + .../devicetree/bindings/pwm/nvidia,tegra20-pwm.txt | 12 +- + .../devicetree/bindings/pwm/renesas,pwm-rcar.txt | 1 + + .../devicetree/bindings/pwm/st,stmpe-pwm.txt | 18 ++ + .../bindings/regulator/pwm-regulator.txt | 19 ++ + drivers/platform/chrome/cros_ec_proto.c | 17 ++ + drivers/pwm/Kconfig | 26 +- + drivers/pwm/Makefile | 3 + + drivers/pwm/core.c | 27 ++ + drivers/pwm/pwm-atmel.c | 30 +- + drivers/pwm/pwm-bcm-iproc.c | 277 ++++++++++++++++++ + drivers/pwm/pwm-cros-ec.c | 260 +++++++++++++++++ + drivers/pwm/pwm-lpc32xx.c | 7 + + drivers/pwm/pwm-lpss-pci.c | 1 + + drivers/pwm/pwm-lpss.c | 26 +- + drivers/pwm/pwm-rockchip.c | 178 +++++++++--- + drivers/pwm/pwm-stmpe.c | 319 +++++++++++++++++++++ + drivers/pwm/pwm-tegra.c | 69 +++-- + drivers/pwm/pwm-tiecap.c | 37 +-- + drivers/pwm/pwm-tiehrpwm.c | 38 +-- + drivers/pwm/pwm-tipwmss.c | 49 ---- + drivers/pwm/pwm-tipwmss.h | 39 --- + drivers/pwm/sysfs.c | 17 ++ + drivers/regulator/pwm-regulator.c | 162 ++++++++--- + include/linux/mfd/cros_ec.h | 15 + + include/linux/mfd/cros_ec_commands.h | 31 ++ + include/linux/pwm.h | 113 +++++++- + 29 files changed, 1561 insertions(+), 283 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/brcm,iproc-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/st,stmpe-pwm.txt + create mode 100644 drivers/pwm/pwm-bcm-iproc.c + create mode 100644 drivers/pwm/pwm-cros-ec.c + create mode 100644 drivers/pwm/pwm-stmpe.c + delete mode 100644 drivers/pwm/pwm-tipwmss.h +Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files) +$ git merge dma-buf/for-next +Resolved 'drivers/dma-buf/Kconfig' using previous resolution. +Auto-merging drivers/dma-buf/Kconfig +CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 649a957a690b] Merge remote-tracking branch 'dma-buf/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging userns/for-next (aeaa4a79ff6a fs: Call d_automount with the filesystems creds) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (2dcd0af568b0 Linux 4.6) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (d22527fed2f0 Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes) +$ git merge random/dev +Already up-to-date. +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (d78388dbec25 selftests: media_tests add a new video device test) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID) +$ git merge y2038/y2038 +Merge made by the 'recursive' strategy. + fs/afs/main.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging luto-misc/next (2dcd0af568b0 Linux 4.6) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (b562e44f507e Linux 4.5) +$ git merge borntraeger/linux-next +Already up-to-date. +Merging livepatching/for-next (523d939ef98f Linux 4.7) +$ git merge livepatching/for-next +Already up-to-date. +Merging coresight/next (27ee11458de3 coresight: tmc: Delete an unnecessary check before the function call "kfree") +$ git merge coresight/next +Auto-merging drivers/hwtracing/coresight/coresight-etm4x.c +Auto-merging drivers/hwtracing/coresight/coresight-etm3x.c +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etb10.c | 26 +++----- + drivers/hwtracing/coresight/coresight-etm3x.c | 25 ++++---- + drivers/hwtracing/coresight/coresight-etm4x.c | 51 +++++---------- + drivers/hwtracing/coresight/coresight-funnel.c | 20 +++--- + drivers/hwtracing/coresight/coresight-priv.h | 8 ++- + .../coresight/coresight-replicator-qcom.c | 18 ++---- + drivers/hwtracing/coresight/coresight-replicator.c | 20 ++---- + drivers/hwtracing/coresight/coresight-stm.c | 44 +++++++++---- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 4 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 12 +++- + drivers/hwtracing/coresight/coresight-tmc.c | 74 ++++++++++------------ + drivers/hwtracing/coresight/coresight-tmc.h | 4 +- + drivers/hwtracing/coresight/coresight-tpiu.c | 18 ++---- + drivers/hwtracing/coresight/coresight.c | 27 ++++---- + drivers/hwtracing/coresight/of_coresight.c | 3 +- + 15 files changed, 168 insertions(+), 186 deletions(-) +Merging rtc/rtc-next (6f367788d633 rtc: rv8803: Clear V1F when setting the time) +$ git merge rtc/rtc-next +Resolved 'arch/x86/platform/efi/efi_64.c' using previous resolution. +Removing include/linux/ds17287rtc.h +Auto-merging drivers/rtc/rtc-mc146818-lib.c +Removing drivers/char/genrtc.c +Auto-merging drivers/char/Makefile +Auto-merging drivers/char/Kconfig +Auto-merging arch/x86/platform/efi/efi_64.c +CONFLICT (content): Merge conflict in arch/x86/platform/efi/efi_64.c +Auto-merging arch/x86/platform/efi/efi.c +Auto-merging arch/x86/kernel/hpet.c +Removing arch/x86/include/asm/rtc.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/sh/kernel/time.c +Removing arch/sh/include/asm/mc146818rtc.h +Auto-merging arch/powerpc/platforms/Kconfig +Auto-merging arch/powerpc/kernel/time.c +Removing arch/powerpc/include/asm/rtc.h +Auto-merging arch/parisc/kernel/time.c +Removing arch/parisc/include/asm/rtc.h +Removing arch/parisc/include/asm/mc146818rtc.h +Removing arch/m68k/include/asm/rtc.h +Removing arch/ia64/include/asm/mc146818rtc.h +Removing arch/h8300/include/asm/mc146818rtc.h +Removing arch/frv/include/asm/mc146818rtc.h +Removing arch/alpha/include/asm/rtc.h +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master dc3e362cb6a0] Merge remote-tracking branch 'rtc/rtc-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 4 + + arch/alpha/include/asm/rtc.h | 1 - + arch/alpha/kernel/core_marvel.c | 1 - + arch/alpha/kernel/rtc.c | 6 +- + arch/arm/mach-ep93xx/ts72xx.c | 2 +- + arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- + arch/arm/mach-pxa/cm-x270.c | 2 +- + arch/arm/mach-pxa/cm-x300.c | 2 +- + arch/arm/mach-pxa/em-x270.c | 2 +- + arch/frv/include/asm/mc146818rtc.h | 16 - + arch/h8300/include/asm/mc146818rtc.h | 9 - + arch/ia64/include/asm/mc146818rtc.h | 10 - + arch/m68k/amiga/config.c | 1 - + arch/m68k/apollo/config.c | 1 - + arch/m68k/bvme6000/config.c | 1 - + arch/m68k/hp300/config.c | 2 +- + arch/m68k/include/asm/rtc.h | 79 --- + arch/m68k/kernel/time.c | 48 +- + arch/m68k/mac/config.c | 3 +- + arch/m68k/mac/misc.c | 1 - + arch/m68k/mvme147/config.c | 1 - + arch/m68k/mvme16x/config.c | 1 - + arch/m68k/q40/config.c | 2 +- + arch/m68k/sun3/config.c | 1 - + arch/m68k/sun3/intersil.c | 2 +- + arch/m68k/sun3x/time.c | 2 +- + arch/mips/sgi-ip22/ip22-reset.c | 2 +- + arch/mips/sni/time.c | 1 - + arch/mn10300/Kconfig | 4 +- + arch/mn10300/include/asm/rtc-regs.h | 4 +- + arch/mn10300/include/asm/rtc.h | 2 - + arch/mn10300/kernel/rtc.c | 104 +--- + arch/mn10300/proc-mn103e010/proc-init.c | 3 + + arch/mn10300/proc-mn2ws0050/proc-init.c | 1 + + arch/parisc/include/asm/mc146818rtc.h | 9 - + arch/parisc/include/asm/rtc.h | 131 ----- + arch/parisc/kernel/time.c | 36 +- + arch/powerpc/include/asm/rtc.h | 78 --- + arch/powerpc/kernel/time.c | 29 +- + arch/powerpc/platforms/Kconfig | 11 + + arch/powerpc/platforms/ps3/time.c | 2 +- + arch/sh/include/asm/mc146818rtc.h | 7 - + arch/sh/include/asm/rtc.h | 11 - + arch/sh/kernel/time.c | 33 +- + arch/sparc/include/asm/io_32.h | 10 - + arch/x86/Kconfig | 1 + + arch/x86/include/asm/mc146818rtc.h | 1 - + arch/x86/include/asm/rtc.h | 1 - + arch/x86/kernel/hpet.c | 3 +- + arch/x86/kernel/nmi.c | 1 + + arch/x86/kernel/rtc.c | 3 +- + arch/x86/platform/efi/efi.c | 1 - + arch/x86/platform/efi/efi_64.c | 1 + + arch/x86/platform/intel-mid/intel_mid_vrtc.c | 1 + + drivers/acpi/acpi_cmos_rtc.c | 2 +- + drivers/base/power/trace.c | 6 +- + drivers/char/Kconfig | 28 +- + drivers/char/Makefile | 1 - + drivers/char/genrtc.c | 539 --------------------- + drivers/rtc/Kconfig | 26 +- + drivers/rtc/Makefile | 2 + + drivers/rtc/interface.c | 32 +- + drivers/rtc/rtc-abx80x.c | 12 +- + drivers/rtc/rtc-asm9260.c | 1 - + drivers/rtc/rtc-at91sam9.c | 1 + + drivers/rtc/rtc-cmos.c | 17 +- + drivers/rtc/rtc-da9052.c | 1 + + drivers/rtc/rtc-da9055.c | 1 + + drivers/rtc/rtc-davinci.c | 2 + + drivers/rtc/rtc-ds1286.c | 2 +- + drivers/rtc/rtc-ds1305.c | 7 - + drivers/rtc/rtc-ds1307.c | 33 +- + drivers/rtc/rtc-ds1343.c | 6 - + drivers/rtc/rtc-ds1685.c | 53 +- + drivers/rtc/rtc-ds2404.c | 2 +- + drivers/rtc/rtc-ds3232.c | 6 - + drivers/rtc/rtc-efi.c | 6 + + drivers/rtc/rtc-generic.c | 36 +- + drivers/rtc/rtc-hym8563.c | 5 +- + drivers/rtc/rtc-isl12057.c | 33 +- + drivers/rtc/rtc-m41t80.c | 34 +- + drivers/rtc/rtc-m48t86.c | 2 +- + drivers/rtc/rtc-max6916.c | 164 +++++++ + .../rtc.h => drivers/rtc/rtc-mc146818-lib.c | 69 +-- + drivers/rtc/rtc-mrst.c | 10 +- + drivers/rtc/rtc-pcf2123.c | 4 +- + drivers/rtc/rtc-pcf85063.c | 59 ++- + drivers/rtc/rtc-pcf8563.c | 5 +- + drivers/rtc/rtc-rc5t583.c | 1 + + drivers/rtc/rtc-rs5c372.c | 6 - + drivers/rtc/rtc-rv8803.c | 205 +++++--- + drivers/rtc/rtc-rx8010.c | 8 +- + drivers/rtc/rtc-rx8025.c | 5 - + drivers/rtc/rtc-s35390a.c | 157 ++++-- + drivers/rtc/rtc-s3c.c | 16 +- + drivers/rtc/rtc-sh.c | 42 +- + drivers/rtc/rtc-tegra.c | 6 - + drivers/rtc/rtc-v3020.c | 2 +- + include/linux/ds17287rtc.h | 66 --- + include/linux/mc146818rtc.h | 5 + + include/linux/{ => platform_data}/rtc-ds2404.h | 0 + .../linux/{m48t86.h => platform_data/rtc-m48t86.h} | 0 + include/linux/{ => platform_data}/rtc-v3020.h | 0 + include/linux/{ => rtc}/ds1286.h | 0 + tools/testing/selftests/timers/rtctest.c | 13 +- + 105 files changed, 850 insertions(+), 1582 deletions(-) + delete mode 100644 arch/alpha/include/asm/rtc.h + delete mode 100644 arch/frv/include/asm/mc146818rtc.h + delete mode 100644 arch/h8300/include/asm/mc146818rtc.h + delete mode 100644 arch/ia64/include/asm/mc146818rtc.h + delete mode 100644 arch/m68k/include/asm/rtc.h + delete mode 100644 arch/parisc/include/asm/mc146818rtc.h + delete mode 100644 arch/parisc/include/asm/rtc.h + delete mode 100644 arch/powerpc/include/asm/rtc.h + delete mode 100644 arch/sh/include/asm/mc146818rtc.h + delete mode 100644 arch/x86/include/asm/rtc.h + delete mode 100644 drivers/char/genrtc.c + create mode 100644 drivers/rtc/rtc-max6916.c + rename include/asm-generic/rtc.h => drivers/rtc/rtc-mc146818-lib.c (76%) + delete mode 100644 include/linux/ds17287rtc.h + rename include/linux/{ => platform_data}/rtc-ds2404.h (100%) + rename include/linux/{m48t86.h => platform_data/rtc-m48t86.h} (100%) + rename include/linux/{ => platform_data}/rtc-v3020.h (100%) + rename include/linux/{ => rtc}/ds1286.h (100%) +Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) +$ git merge hwspinlock/for-next +Already up-to-date. +Merging nvdimm/libnvdimm-for-next (0606263f24f3 Merge branch 'for-4.8/libnvdimm' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) +$ git merge dax-misc/dax-misc +Already up-to-date. +Merging akpm-current/current (bde7eb3642c2 ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'kernel/jump_label.c' +Auto-merging net/wireless/chan.c +Auto-merging kernel/jump_label.c +CONFLICT (content): Merge conflict in kernel/jump_label.c +Auto-merging include/rdma/ib_verbs.h +Removing include/linux/dma-attrs.h +Auto-merging drivers/media/v4l2-core/videobuf2-dma-contig.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging arch/x86/kernel/signal.c +Auto-merging arch/powerpc/include/asm/jump_label.h +Auto-merging arch/mips/net/bpf_jit.c +Auto-merging arch/mips/mm/tlbex.c +Auto-merging arch/mips/math-emu/cp1emu.c +Auto-merging arch/mips/kernel/smp-cps.c +Auto-merging arch/mips/kernel/signal.c +Auto-merging arch/mips/kernel/mips-r2-to-r6-emul.c +Auto-merging arch/mips/kernel/elf.c +Auto-merging arch/mips/include/asm/signal.h +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'kernel/jump_label.c'. +[master 6cdcd45461f6] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/DMA-API.txt | 33 +- + Documentation/DMA-attributes.txt | 2 +- + Kbuild | 12 +- + MAINTAINERS | 12 +- + arch/alpha/include/asm/dma-mapping.h | 2 - + arch/alpha/kernel/pci-noop.c | 2 +- + arch/alpha/kernel/pci_iommu.c | 12 +- + arch/arc/mm/dma.c | 12 +- + arch/arm/common/dmabounce.c | 4 +- + arch/arm/include/asm/dma-mapping.h | 13 +- + arch/arm/include/asm/page.h | 2 + + arch/arm/include/asm/xen/page-coherent.h | 16 +- + arch/arm/kernel/vmlinux.lds.S | 2 +- + arch/arm/mm/dma-mapping.c | 129 ++++---- + arch/arm/xen/mm.c | 8 +- + arch/arm64/mm/dma-mapping.c | 66 ++-- + arch/avr32/mm/dma-coherent.c | 12 +- + arch/blackfin/kernel/dma-mapping.c | 8 +- + arch/c6x/include/asm/dma-mapping.h | 4 +- + arch/c6x/kernel/dma.c | 9 +- + arch/c6x/mm/dma-coherent.c | 4 +- + arch/cris/arch-v32/drivers/pci/dma.c | 9 +- + arch/frv/mb93090-mb00/pci-dma-nommu.c | 8 +- + arch/frv/mb93090-mb00/pci-dma.c | 9 +- + arch/h8300/kernel/dma.c | 8 +- + arch/hexagon/include/asm/dma-mapping.h | 1 - + arch/hexagon/kernel/dma.c | 8 +- + arch/ia64/hp/common/sba_iommu.c | 22 +- + arch/ia64/include/asm/machvec.h | 1 - + arch/ia64/kernel/Makefile | 8 +- + arch/ia64/kernel/pci-swiotlb.c | 4 +- + arch/ia64/sn/pci/pci_dma.c | 22 +- + arch/m68k/kernel/dma.c | 12 +- + arch/metag/kernel/dma.c | 16 +- + arch/microblaze/include/asm/dma-mapping.h | 1 - + arch/microblaze/kernel/dma.c | 12 +- + arch/mips/cavium-octeon/dma-octeon.c | 8 +- + arch/mips/include/asm/mips-cm.h | 2 +- + arch/mips/include/asm/pgtable.h | 16 +- + arch/mips/include/asm/seccomp.h | 4 +- + arch/mips/include/asm/signal.h | 4 +- + arch/mips/include/asm/syscall.h | 2 +- + arch/mips/include/asm/uaccess.h | 2 +- + arch/mips/jz4740/setup.c | 2 +- + arch/mips/kernel/cpu-bugs64.c | 6 +- + arch/mips/kernel/elf.c | 4 +- + arch/mips/kernel/mips-cm.c | 2 +- + arch/mips/kernel/mips-r2-to-r6-emul.c | 34 +- + arch/mips/kernel/pm-cps.c | 4 +- + arch/mips/kernel/signal.c | 10 +- + arch/mips/kernel/smp-cps.c | 4 +- + arch/mips/kernel/unaligned.c | 10 +- + arch/mips/loongson64/common/dma-swiotlb.c | 10 +- + arch/mips/math-emu/cp1emu.c | 6 +- + arch/mips/mm/dma-default.c | 20 +- + arch/mips/mm/tlbex.c | 10 +- + arch/mips/mti-malta/malta-dtshim.c | 4 +- + arch/mips/mti-malta/malta-memory.c | 2 +- + arch/mips/mti-malta/malta-setup.c | 2 +- + arch/mips/net/bpf_jit.c | 4 +- + arch/mips/netlogic/common/nlm-dma.c | 4 +- + arch/mn10300/mm/dma-alloc.c | 8 +- + arch/nios2/mm/dma-mapping.c | 12 +- + arch/openrisc/kernel/dma.c | 21 +- + arch/parisc/kernel/pci-dma.c | 18 +- + arch/powerpc/include/asm/dma-mapping.h | 7 +- + arch/powerpc/include/asm/iommu.h | 10 +- + arch/powerpc/include/asm/jump_label.h | 1 + + arch/powerpc/kernel/dma-iommu.c | 12 +- + arch/powerpc/kernel/dma.c | 18 +- + arch/powerpc/kernel/ibmebus.c | 12 +- + arch/powerpc/kernel/iommu.c | 12 +- + arch/powerpc/kernel/vio.c | 12 +- + arch/powerpc/platforms/cell/iommu.c | 28 +- + arch/powerpc/platforms/pasemi/iommu.c | 2 +- + arch/powerpc/platforms/powernv/npu-dma.c | 8 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 4 +- + arch/powerpc/platforms/powernv/pci.c | 2 +- + arch/powerpc/platforms/powernv/pci.h | 2 +- + arch/powerpc/platforms/ps3/system-bus.c | 18 +- + arch/powerpc/platforms/pseries/iommu.c | 6 +- + arch/powerpc/sysdev/dart_iommu.c | 2 +- + arch/s390/include/asm/dma-mapping.h | 1 - + arch/s390/pci/pci_dma.c | 23 +- + arch/sh/include/asm/dma-mapping.h | 4 +- + arch/sh/kernel/dma-nommu.c | 4 +- + arch/sh/mm/consistent.c | 4 +- + arch/sparc/kernel/iommu.c | 12 +- + arch/sparc/kernel/ioport.c | 24 +- + arch/sparc/kernel/pci_sun4v.c | 12 +- + arch/sparc/kernel/vmlinux.lds.S | 7 + + arch/tile/kernel/pci-dma.c | 28 +- + arch/tile/kernel/vmlinux.lds.S | 12 + + arch/um/Makefile | 2 +- + arch/unicore32/mm/dma-swiotlb.c | 4 +- + arch/x86/include/asm/dma-mapping.h | 5 +- + arch/x86/include/asm/elf.h | 4 +- + arch/x86/include/asm/fpu/internal.h | 16 +- + arch/x86/include/asm/mmu_context.h | 2 +- + arch/x86/include/asm/swiotlb.h | 4 +- + arch/x86/include/asm/xen/page-coherent.h | 9 +- + arch/x86/kernel/amd_gart_64.c | 20 +- + arch/x86/kernel/apic/apic.c | 2 +- + arch/x86/kernel/apic/vector.c | 2 +- + arch/x86/kernel/fpu/signal.c | 12 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/pci-calgary_64.c | 14 +- + arch/x86/kernel/pci-dma.c | 4 +- + arch/x86/kernel/pci-nommu.c | 4 +- + arch/x86/kernel/pci-swiotlb.c | 4 +- + arch/x86/kernel/signal.c | 14 +- + arch/x86/pci/sta2x11-fixup.c | 2 +- + arch/x86/pci/vmd.c | 16 +- + arch/x86/um/shared/sysdep/kernel-offsets.h | 2 +- + arch/x86/um/user-offsets.c | 4 +- + arch/xtensa/kernel/pci-dma.c | 12 +- + block/Kconfig | 13 - + block/genhd.c | 2 +- + drivers/firmware/broadcom/bcm47xx_sprom.c | 2 +- + drivers/fpga/Kconfig | 1 + + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 12 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 20 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 13 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.h | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 13 +- + .../gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c | 13 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 17 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 2 +- + drivers/infiniband/core/umem.c | 7 +- + drivers/iommu/amd_iommu.c | 12 +- + drivers/iommu/dma-iommu.c | 8 +- + drivers/iommu/intel-iommu.c | 12 +- + drivers/irqchip/irq-mips-gic.c | 2 +- + drivers/media/dvb-frontends/cxd2841er.c | 10 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 4 - + drivers/media/platform/sti/bdisp/bdisp-hw.c | 26 +- + drivers/media/v4l2-core/videobuf2-dma-contig.c | 28 +- + drivers/media/v4l2-core/videobuf2-dma-sg.c | 21 +- + drivers/media/v4l2-core/videobuf2-vmalloc.c | 2 +- + drivers/misc/mic/host/mic_boot.c | 20 +- + drivers/mtd/bcm47xxpart.c | 2 +- + drivers/net/wireless/ath/ath10k/debug.c | 12 +- + drivers/net/wireless/ath/ath10k/mac.c | 10 +- + drivers/net/wireless/ath/ath10k/wmi.c | 2 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 +- + drivers/net/wireless/ath/ath9k/common-spectral.c | 6 +- + drivers/net/wireless/ath/ath9k/init.c | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 12 +- + drivers/net/wireless/ath/ath9k/recv.c | 2 +- + drivers/net/wireless/ath/dfs_pattern_detector.c | 2 +- + drivers/net/wireless/ath/regd.c | 4 +- + drivers/parisc/ccio-dma.c | 16 +- + drivers/parisc/sba_iommu.c | 16 +- + drivers/pci/ecam.c | 2 +- + drivers/remoteproc/qcom_q6v5_pil.c | 7 +- + drivers/tty/serial/ar933x_uart.c | 4 +- + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 12 +- + drivers/video/fbdev/omap2/omapfb/omapfb.h | 3 +- + drivers/xen/swiotlb-xen.c | 14 +- + fs/block_dev.c | 6 +- + fs/compat.c | 14 - + fs/proc/base.c | 44 ++- + include/linux/bitmap.h | 7 +- + include/linux/compat.h | 1 - + include/linux/crc64_ecma.h | 56 ++++ + include/linux/dma-attrs.h | 71 ----- + include/linux/dma-iommu.h | 6 +- + include/linux/dma-mapping.h | 128 +++++--- + include/linux/dynamic_debug.h | 60 +++- + include/linux/fence.h | 2 +- + include/linux/jump_label.h | 46 +-- + include/linux/kbuild.h | 2 +- + include/linux/kexec.h | 2 + + include/linux/memcontrol.h | 15 + + include/linux/oom.h | 43 +-- + include/linux/swiotlb.h | 10 +- + include/linux/ww_mutex.h | 4 +- + include/media/videobuf2-core.h | 6 +- + include/media/videobuf2-dma-contig.h | 2 - + include/rdma/ib_verbs.h | 17 +- + include/trace/events/zsmalloc.h | 76 +++++ + include/xen/swiotlb-xen.h | 12 +- + ipc/msg.c | 5 +- + kernel/jump_label.c | 53 ++++ + kernel/ptrace.c | 4 +- + kernel/seccomp.c | 6 +- + kernel/sysctl.c | 10 - + kernel/watchdog.c | 1 - + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 +++++++++++++++++++++ + lib/dma-noop.c | 9 +- + lib/dynamic_debug.c | 7 + + lib/swiotlb.c | 13 +- + mm/Kconfig | 1 + + mm/memcontrol.c | 171 ++++++----- + mm/oom_kill.c | 200 ++++++------ + mm/page_owner.c | 2 +- + mm/vmstat.c | 2 +- + mm/zsmalloc.c | 27 +- + net/wireless/chan.c | 2 +- + samples/kprobes/jprobe_example.c | 6 +- + samples/kprobes/kprobe_example.c | 29 +- + samples/kprobes/kretprobe_example.c | 14 +- + scripts/mod/Makefile | 11 +- + 207 files changed, 1805 insertions(+), 1329 deletions(-) + create mode 100644 include/linux/crc64_ecma.h + delete mode 100644 include/linux/dma-attrs.h + create mode 100644 include/trace/events/zsmalloc.h + create mode 100644 lib/crc64_ecma.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression +Applying: ipc/sem.c: fix complex_count vs. simple op race +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 323511bf0ead...e3beace70ad7 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (e3beace70ad7 ipc/sem.c: fix complex_count vs. simple op race) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +- + include/linux/sem.h | 1 + + ipc/sem.c | 138 +++++++++++++++---------- + 3 files changed, 85 insertions(+), 57 deletions(-) |