Re: linux-next: Tree for May 17
On Fri, 17 May 2019 02:43:08 PDT (-0700), ktk...@virtuozzo.com wrote: On 17.05.2019 12:41, Kirill Tkhai wrote: On 17.05.2019 07:21, Stephen Rothwell wrote: Hi all, Please do not add any v5.3 material to your linux-next included trees/branches until after v5.2-rc1 has been released. Changes since 20190516: The kvm tree gained conflicts against Linus' tree. Non-merge commits (relative to Linus' tree): 1023 1119 files changed, 27058 insertions(+), 7629 deletions(-) Binary file was added: ~/linux-next$ git log --oneline ./modules.builtin.modinfo 4cbb0d07b4d1 RISC-V: Support nr_cpus command line option. CC Palmer. Ya, sorry about that. It should have been fixed as of last night -- I must have just done something stupid.
Re: linux-next: Tree for May 17
Hi all, On Fri, 17 May 2019 12:43:08 +0300 Kirill Tkhai wrote: > > On 17.05.2019 12:41, Kirill Tkhai wrote: > > On 17.05.2019 07:21, Stephen Rothwell wrote: > >> Hi all, > >> > >> Please do not add any v5.3 material to your linux-next included > >> trees/branches until after v5.2-rc1 has been released. > >> > >> Changes since 20190516: > >> > >> The kvm tree gained conflicts against Linus' tree. > >> > >> Non-merge commits (relative to Linus' tree): 1023 > >> 1119 files changed, 27058 insertions(+), 7629 deletions(-) > > > > Binary file was added: > > > > ~/linux-next$ git log --oneline ./modules.builtin.modinfo > > 4cbb0d07b4d1 RISC-V: Support nr_cpus command line option. > > CC Palmer. It's been fixed in the risc-v tree since it was included in linux-next today. -- Cheers, Stephen Rothwell pgpp7R6twog8a.pgp Description: OpenPGP digital signature
Re: linux-next: Tree for May 17
On 17.05.2019 12:41, Kirill Tkhai wrote: > On 17.05.2019 07:21, Stephen Rothwell wrote: >> Hi all, >> >> Please do not add any v5.3 material to your linux-next included >> trees/branches until after v5.2-rc1 has been released. >> >> Changes since 20190516: >> >> The kvm tree gained conflicts against Linus' tree. >> >> Non-merge commits (relative to Linus' tree): 1023 >> 1119 files changed, 27058 insertions(+), 7629 deletions(-) > > Binary file was added: > > ~/linux-next$ git log --oneline ./modules.builtin.modinfo > 4cbb0d07b4d1 RISC-V: Support nr_cpus command line option. CC Palmer.
Re: linux-next: Tree for May 17
On 17.05.2019 07:21, Stephen Rothwell wrote: > Hi all, > > Please do not add any v5.3 material to your linux-next included > trees/branches until after v5.2-rc1 has been released. > > Changes since 20190516: > > The kvm tree gained conflicts against Linus' tree. > > Non-merge commits (relative to Linus' tree): 1023 > 1119 files changed, 27058 insertions(+), 7629 deletions(-) Binary file was added: ~/linux-next$ git log --oneline ./modules.builtin.modinfo 4cbb0d07b4d1 RISC-V: Support nr_cpus command line option. Kirill
Re: linux-next: Tree for May 17
On Fri, 17 May 2019 at 06:21, Stephen Rothwell wrote: > > Hi all, > > Please do not add any v5.3 material to your linux-next included > trees/branches until after v5.2-rc1 has been released. > > Changes since 20190516: > > The kvm tree gained conflicts against Linus' tree. When I built arm64 I saw this build failure: ../arch/arm64/kvm/../../../virt/kvm/kvm_main.c: In function ‘__kvm_map_gfn’: ../arch/arm64/kvm/../../../virt/kvm/kvm_main.c:1764:9: error: implicit declaration of function ‘memremap’; did you mean ‘memcmp’? [-Werror=implicit-function-declaration] hva = memremap(pfn_to_hpa(pfn), PAGE_SIZE, MEMREMAP_WB); ^~~~ memcmp ../arch/arm64/kvm/../../../virt/kvm/kvm_main.c:1764:46: error: ‘MEMREMAP_WB’ undeclared (first use in this function) hva = memremap(pfn_to_hpa(pfn), PAGE_SIZE, MEMREMAP_WB); ^~~ ../arch/arm64/kvm/../../../virt/kvm/kvm_main.c:1764:46: note: each undeclared identifier is reported only once for each function it appears in ../arch/arm64/kvm/../../../virt/kvm/kvm_main.c: In function ‘kvm_vcpu_unmap’: ../arch/arm64/kvm/../../../virt/kvm/kvm_main.c:1796:3: error: implicit declaration of function ‘memunmap’; did you mean ‘vm_munmap’? [-Werror=implicit-function-declaration] memunmap(map->hva); ^~~~ vm_munmap cc1: some warnings being treated as errors make[2]: *** [../scripts/Makefile.build:279: arch/arm64/kvm/../../../virt/kvm/kvm_main.o] Error 1 make[2]: Target '__build' not remade because of errors. make[1]: *** [/home/anders/src/kernel/next/Makefile:1071: arch/arm64/kvm] Error 2 is this something that should be added maybe? diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 8d83a787fd6b..5c5102799c2c 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -51,6 +51,7 @@ #include #include #include +#include #include #include Cheers, Anders > > Non-merge commits (relative to Linus' tree): 1023 > 1119 files changed, 27058 insertions(+), 7629 deletions(-) > > > > I have created today's linux-next tree at > git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git > (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you > are tracking the linux-next tree using git, you should not use "git pull" > to do so as that will try to merge the new linux-next release with the > old one. You should use "git fetch" and checkout or reset to the new > master. > > You can see which trees have been included by looking in the Next/Trees > file in the source. There are also quilt-import.log and merge.log > files in the Next directory. Between each merge, the tree was built > with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a > multi_v7_defconfig for arm and a native build of tools/perf. After > the final fixups (if any), I do an x86_64 modules_install followed by > builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), > ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc > and sparc64 defconfig. And finally, a simple boot test of the powerpc > pseries_le_defconfig kernel in qemu (with and without kvm enabled). > > Below is a summary of the state of the merge. > > I am currently merging 298 trees (counting Linus' and 69 trees of bug > fix patches pending for the current merge release). > > Stats about the size of the tree over time can be seen at > http://neuling.org/linux-next-size.html . > > Status of my local build tests will be at > http://kisskb.ellerman.id.au/linux-next . If maintainers want to give > advice about cross compilers/configs that work, we are always open to add > more builds. > > Thanks to Randy Dunlap for doing many randconfig builds. And to Paul > Gortmaker for triage and bug fixes. > > -- > Cheers, > Stephen Rothwell > > $ git checkout master > $ git reset --hard stable > Merging origin/master (01be377c6221 Merge tag 'media/v5.2-1' of > git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) > Merging fixes/master (2bbacd1a9278 Merge tag 'kconfig-v5.2' of > git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) > Merging kspp-gustavo/for-next/kspp (ccaa75187a5f memstick: mark expected > switch fall-throughs) > Merging kbuild-current/fixes (a2d635decbfa Merge tag 'drm-next-2019-05-09' of > git://anongit.freedesktop.org/drm/drm) > Merging arc-current/for-curr (308a06dc72c0 ARC: mm: do_page_fault refactor > #8: release mmap_sem sooner) > Merging arm-current/fixes (e17b1af96b2a ARM: 8857/1: efi: enable CP15 DMB > instructions before cleaning the cache) > Merging arm64-fixes/for-next/fixes (7a0a93c51799 arm64: vdso: Explicitly add > build-id option) > Merging m68k-current/for-linus (fdd20ec8786a Documentation/features/time: > Mark m68k having modern-timekeeping) > Merging powerpc-fixes/fixes (12f363511d47 powerpc/32s: Fix BATs setting with > CONFIG_STRICT_KERNEL_RWX) > Merging sparc/m
linux-next: Tree for May 17
Hi all, Please do not add any v5.3 material to your linux-next included trees/branches until after v5.2-rc1 has been released. Changes since 20190516: The kvm tree gained conflicts against Linus' tree. Non-merge commits (relative to Linus' tree): 1023 1119 files changed, 27058 insertions(+), 7629 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 298 trees (counting Linus' and 69 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (01be377c6221 Merge tag 'media/v5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) Merging fixes/master (2bbacd1a9278 Merge tag 'kconfig-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) Merging kspp-gustavo/for-next/kspp (ccaa75187a5f memstick: mark expected switch fall-throughs) Merging kbuild-current/fixes (a2d635decbfa Merge tag 'drm-next-2019-05-09' of git://anongit.freedesktop.org/drm/drm) Merging arc-current/for-curr (308a06dc72c0 ARC: mm: do_page_fault refactor #8: release mmap_sem sooner) Merging arm-current/fixes (e17b1af96b2a ARM: 8857/1: efi: enable CP15 DMB instructions before cleaning the cache) Merging arm64-fixes/for-next/fixes (7a0a93c51799 arm64: vdso: Explicitly add build-id option) Merging m68k-current/for-linus (fdd20ec8786a Documentation/features/time: Mark m68k having modern-timekeeping) Merging powerpc-fixes/fixes (12f363511d47 powerpc/32s: Fix BATs setting with CONFIG_STRICT_KERNEL_RWX) Merging sparc/master (63863ee8e2f6 Merge tag 'gcc-plugins-v5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/kees/linux) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (510e2ceda031 ipv6: fix src addr routing with the exception table) Merging bpf/master (d72386fe7a84 libbpf: move logging helpers into libbpf_internal.h) Merging ipsec/master (9b3040a6aafd ipv4: Define __ipv4_neigh_lookup_noref when CONFIG_INET is disabled) Merging netfilter/master (d4c26eb6e721 net: ethernet: stmmac: dwmac-sun8i: enable support of unicast filtering) Merging ipvs/master (b2e3d68d1251 netfilter: nft_compat: destroy function must not have side effects) Merging wireless-drivers/master (7a0f8ad5ff63 Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) Merging mac80211/master (933b40530b4b mac80211: remove set but not used variable 'old') Merging rdma-fixes/for-rc (2557fabd6e29 RDMA/hns: Bugfix for mapping user db) Merging sound-current/for-linus (56df90b631fc ALSA: hda/realtek - Fix for Lenovo B50-70 inverted internal microphone bug) Merging sound-asoc-fixes/for-linus (81566b4cbc5d Merge branch 'asoc-5.1' into asoc-linus) Merging regmap-fixes/for-linus (1d6106cafb37 Merge branch 'regmap-5.1' into regmap-linus) Merging regulator-fixes/for-linus (0d183fc1760f Merge branch 'regulator-5.1' into regulator-linus) Merging spi-fixes/for-linus (72e3b3285a43 Merge branch 'spi-5.1' into spi-linus) Merging pci-current/for-linus (9c9c5fc89b09 PCI/LINK: Add Kconfig option (default off)) Merging driver-core.current/driver-core-linus (83f3ef3de625 Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm) Merging tty.current/tty-linus (83f3ef3de625 Merge tag 'libnvdimm-fixes-5.2-rc1' of git://git.kernel.org/pub/scm/lin
Re: linux-next: Tree for May 17
On Tue, May 22, 2018 at 03:18:43PM +0100, Mark Brown wrote: > On Thu, May 17, 2018 at 05:06:56PM +1000, Stephen Rothwell wrote: > > > News: I will not be doing any linux-next releases between Friday 18 May > > and Friday 25 May inclusive. > > Just noticed this, I'm going to try to cover starting tomorrow. The > usual caveats about reduced service and reliability apply. This isn't going to happen for today, I ran into some scripting/infrastructure issues which effectively delayed the start of the build by about six hours. Those are fixed now so fingers crossed things should be fine tomorrow, I'll let the build run for a while longer today and report any further issues but there won't be a tree. signature.asc Description: PGP signature
Re: linux-next: Tree for May 17
On Thu, May 17, 2018 at 05:06:56PM +1000, Stephen Rothwell wrote: > News: I will not be doing any linux-next releases between Friday 18 May > and Friday 25 May inclusive. Just noticed this, I'm going to try to cover starting tomorrow. The usual caveats about reduced service and reliability apply. signature.asc Description: PGP signature
Re: linux-next: Tree for May 17 (drivers/pwm/pwm-stm32.c)
On 05/17/2018 12:06 AM, Stephen Rothwell wrote: > Hi all, > on x86_64: drivers/pwm/pwm-stm32.o: In function `stm32_pwm_raw_capture': pwm-stm32.c:(.text+0x53d): undefined reference to `stm32_timers_dma_burst_read' when COMPILE_TEST=y and MFD_STM32_TIMERS is not set. Any suggestions? thanks, -- ~Randy
Re: linux-next: Tree for May 17
On 17 May 2018 at 12:36, Stephen Rothwell wrote: > Hi all, > > News: I will not be doing any linux-next releases between Friday 18 May > and Friday 25 May inclusive. > > Changes since 20180516: > > New trees: devicetree-fixes > > The kbuild tree still had its build failure for which I applied a patch. > > The mvebu tree gained a conflict against the arm-soc tree. > > The renesas tree gained conflicts against the mvebu tree. > > The net-next tree gained a conflict against the vfs tree. > > The drm tree still had its build failure for which I applied a patch. > > The usb-gadget tree gained a conflict against the usb tree. > > The staging tree gained a conflict against the v4l-dvb tree. > > The akpm tree gained a conflict against the vfs tree. > > Non-merge commits (relative to Linus' tree): 7398 > 7852 files changed, 294207 insertions(+), 302289 deletions(-) > > > > I have created today's linux-next tree at > git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git > (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you > are tracking the linux-next tree using git, you should not use "git pull" > to do so as that will try to merge the new linux-next release with the > old one. You should use "git fetch" and checkout or reset to the new > master. > > You can see which trees have been included by looking in the Next/Trees > file in the source. There are also quilt-import.log and merge.log > files in the Next directory. Between each merge, the tree was built > with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a > multi_v7_defconfig for arm and a native build of tools/perf. After > the final fixups (if any), I do an x86_64 modules_install followed by > builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), > ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc > and sparc64 defconfig. And finally, a simple boot test of the powerpc > pseries_le_defconfig kernel in qemu (with and without kvm enabled). Linux-20180517 - arm64 build failed. Build failed for HiKey, Juno and dragonboard 410c. Build failed log: - CC [M] drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.o drivers/gpu/drm/rcar-du/rcar_du_vsp.c: In function 'rcar_du_vsp_plane_atomic_duplicate_state': drivers/gpu/drm/rcar-du/rcar_du_vsp.c:325:6: error: 'struct rcar_du_vsp_plane_state' has no member named 'alpha' copy->alpha = to_rcar_vsp_plane_state(plane->state)->alpha; ^~ drivers/gpu/drm/rcar-du/rcar_du_vsp.c:325:53: error: 'struct rcar_du_vsp_plane_state' has no member named 'alpha' copy->alpha = to_rcar_vsp_plane_state(plane->state)->alpha; ^~ scripts/Makefile.build:311: recipe for target 'drivers/gpu/drm/rcar-du/rcar_du_vsp.o' failed make[6]: *** [drivers/gpu/drm/rcar-du/rcar_du_vsp.o] Error 1 make[6]: *** Waiting for unfinished jobs CC [M] drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.o CC [M] net/bluetooth/mgmt_util.o scripts/Makefile.build:552: recipe for target 'drivers/gpu/drm/rcar-du' failed make[5]: *** [drivers/gpu/drm/rcar-du] Error 2 Complete log link: https://ci.linaro.org/job/openembedded-lkft-linux-next/DISTRO=rpb,MACHINE=juno,label=docker-stretch-amd64/263/console
Re: linux-next: Tree for May 17 (usb/gadget/udc/aspeed-vhub/)
On 05/17/2018 12:06 AM, Stephen Rothwell wrote: > > The usb-gadget tree gained a conflict against the usb tree. > on x86_64: drivers/usb/gadget/udc/aspeed-vhub/hub.o: In function `ast_vhub_std_hub_request': hub.c:(.text+0x3a7): undefined reference to `usb_gadget_get_string' CONFIG_LIB_USBCOMPOSITE is not enabled, hence usbstring.c is not built. Full randconfig file is attached. -- ~Randy # # Automatically generated file; DO NOT EDIT. # Linux/x86_64 4.17.0-rc5 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y CONFIG_OUTPUT_FORMAT="elf64-x86-64" CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_MMU=y CONFIG_ARCH_MMAP_RND_BITS_MIN=28 CONFIG_ARCH_MMAP_RND_BITS_MAX=32 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_ARCH_HAS_FILTER_PGPROT=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ZONE_DMA32=y CONFIG_AUDIT_ARCH=y CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_PGTABLE_LEVELS=4 CONFIG_CONSTRUCTORS=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y # # General setup # CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_COMPILE_TEST=y CONFIG_LOCALVERSION="" CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y CONFIG_HAVE_KERNEL_LZ4=y # CONFIG_KERNEL_GZIP is not set # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_LZMA is not set CONFIG_KERNEL_XZ=y # CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZ4 is not set CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y # CONFIG_CROSS_MEMORY_ATTACH is not set CONFIG_USELIB=y CONFIG_AUDIT=y CONFIG_HAVE_ARCH_AUDITSYSCALL=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y CONFIG_AUDIT_TREE=y # # IRQ subsystem # CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_IRQ_CHIP=y CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_SIM=y CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y CONFIG_GENERIC_IRQ_RESERVATION_MODE=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y # CONFIG_GENERIC_IRQ_DEBUGFS is not set CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y # # Timers subsystem # CONFIG_TICK_ONESHOT=y CONFIG_HZ_PERIODIC=y # CONFIG_NO_HZ_IDLE is not set # CONFIG_NO_HZ is not set CONFIG_HIGH_RES_TIMERS=y # # CPU/Task time and stats accounting # CONFIG_VIRT_CPU_ACCOUNTING=y # CONFIG_TICK_CPU_ACCOUNTING is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_IRQ_TIME_ACCOUNTING=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_TASKSTATS=y # CONFIG_TASK_DELAY_ACCT is not set CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_CPU_ISOLATION=y # # RCU Subsystem # CONFIG_TINY_RCU=y # CONFIG_RCU_EXPERT is not set CONFIG_SRCU=y CONFIG_TINY_SRCU=y CONFIG_TASKS_RCU=y CONFIG_CONTEXT_TRACKING=y # CONFIG_CONTEXT_TRACKING_FORCE is not set CONFIG_BUILD_BIN2C=y # CONFIG_IKCONFIG is not set CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_ARCH_SUPPORTS_INT128=y # CONFIG_CGROUPS is not set CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set # CONFIG_IPC_NS is not set # CONFIG_USER_NS is not set CONFIG_PID_NS=y # CONFIG_NET_NS is not set # CONFIG_SCHED_AUTOGROUP is not set CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" # CONFIG_RD_GZIP is not set # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set CONFIG_RD_XZ=y # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y CONFIG_HAVE_UID16=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_BPF=y CONFIG_EXPERT=y CONFIG_UID16=y CONFIG_MULTIUSER=y CONFIG_SGETMASK_SYSCALL=y CONFIG_SYSFS_SYSCALL=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_FHANDLE=y CONFIG_POSIX_TIMERS=y # CONFIG_PRINTK is not set CONFIG_BUG=y CONFIG_ELF_CORE=y # CONFIG_PCSPKR_PLATFORM is not set # CONFIG_BASE_FULL is not set CONFIG_FUTEX=y CONFIG_FUTEX_P
linux-next: Tree for May 17
Hi all, News: I will not be doing any linux-next releases between Friday 18 May and Friday 25 May inclusive. Changes since 20180516: New trees: devicetree-fixes The kbuild tree still had its build failure for which I applied a patch. The mvebu tree gained a conflict against the arm-soc tree. The renesas tree gained conflicts against the mvebu tree. The net-next tree gained a conflict against the vfs tree. The drm tree still had its build failure for which I applied a patch. The usb-gadget tree gained a conflict against the usb tree. The staging tree gained a conflict against the v4l-dvb tree. The akpm tree gained a conflict against the vfs tree. Non-merge commits (relative to Linus' tree): 7398 7852 files changed, 294207 insertions(+), 302289 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 277 trees (counting Linus' and 64 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (21b9f1c7e319 Merge tag 'afs-fixes-20180514' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs) Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) Merging kbuild-current/fixes (75bc37fefc44 Linux 4.17-rc4) Merging arc-current/for-curr (661e50bc8532 Linux 4.16-rc4) Merging arm-current/fixes (30cfae461581 ARM: replace unnecessary perl with sed and the shell $(( )) operator) Merging arm64-fixes/for-next/fixes (0583a4ef0598 arm64: capabilities: Add NVIDIA Denver CPU to bp_harden list) Merging m68k-current/for-linus (ecd685580c8f m68k/mac: Remove bogus "FIXME" comment) Merging powerpc-fixes/fixes (6c0a8f6b5a45 powerpc/pseries: Fix CONFIG_NUMA=n build) Merging sparc/master (fff75eb2a08c Merge tag 'errseq-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (7063efd33bb1 tuntap: fix use after free during release) Merging bpf/master (f3002c1374fb vmxnet3: use DMA memory barriers where required) Merging ipsec/master (d9f92772e8ec xfrm6: avoid potential infinite loop in _decode_session6()) Merging netfilter/master (9d6b4bfb59a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) Merging ipvs/master (2f99aa31cd7a netfilter: nf_tables: skip synchronize_rcu if transaction log is empty) Merging wireless-drivers/master (ebd27d3317c6 ssb: make SSB_PCICORE_HOSTMODE depend on SSB = y) Merging mac80211/master (914eac248d87 mac80211: use timeout from the AddBA response instead of the request) Merging rdma-fixes/for-rc (8e907ed48827 IB/umem: Use the correct mm during ib_umem_release) Merging sound-current/for-linus (c99f0802e42f ALSA: usb-audio: Use Class Specific EP for UAC3 devices.) Merging sound-asoc-fixes/for-linus (1ade2b2f9a3b Merge branch 'asoc-4.17' into asoc-linus) Merging regmap-fixes/for-linus (e37563bb6c59 Merge tag 'for-4.17-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) Merging regulator-fixes/for-linus (e37563bb6c59 Merge tag 'for-4.17-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) Merging spi-fixes/for-linus (c3317999e7ff Merge branch 'spi-4.17' into spi-linus) Merging pci-current/for-linus (0cf22d6b317c PCI: Add "PCIe" to pcie_print_link_status() messages)
linux-next: Tree for May 17
Hi all, Changes since 20170516: New trees: nand-fixes (yesterday) spi-nor-fixes The file-locks tree gained a build failure so I used the version from next-20170516. The netfilter tree gained a build failure for which I applied a fix patch. The sound tree gained a build failure so I used the version from next-20170516. The scsi-mkp tree gained a build failure so I used the version from next-20170516. Non-merge commits (relative to Linus' tree): 1206 1254 files changed, 34634 insertions(+), 21339 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig (with CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. Below is a summary of the state of the merge. I am currently merging 260 trees (counting Linus' and 40 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (b23afd384801 Merge tag 'pstore-v4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) Merging fixes/master (97da3854c526 Linux 4.11-rc3) Merging kbuild-current/fixes (2ea659a9ef48 Linux 4.12-rc1) Merging arc-current/for-curr (2ea659a9ef48 Linux 4.12-rc1) Merging arm-current/fixes (2ea659a9ef48 Linux 4.12-rc1) Merging m68k-current/for-linus (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions) Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) Merging powerpc-fixes/fixes (be5c5e843c4a powerpc/64: Fix HMI exception on LE with CONFIG_RELOCATABLE=y) Merging sparc/master (3c7f62212018 sparc64: fix fault handling in NGbzero.S and GENbzero.S) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (2432a3fb5cff mlx5e: add CONFIG_INET dependency) Merging ipsec/master (2c1497bbc8fd xfrm: Fix NETDEV_DOWN with IPSec offload) Merging netfilter/master (c953d6354820 ebtables: arpreply: Add the standard target sanity check) Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections) Merging wireless-drivers/master (d77facb88448 brcmfmac: use local iftype avoiding use-after-free of virtual interface) Merging mac80211/master (29cee56c0be4 Merge tag 'mac80211-for-davem-2017-05-08' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211) Merging sound-current/for-linus (fa16b69f1299 ALSA: hda - No loopback on ALC299 codec) Merging pci-current/for-linus (2ea659a9ef48 Linux 4.12-rc1) Merging driver-core.current/driver-core-linus (2ea659a9ef48 Linux 4.12-rc1) Merging tty.current/tty-linus (2ea659a9ef48 Linux 4.12-rc1) Merging usb.current/usb-linus (2ea659a9ef48 Linux 4.12-rc1) Merging usb-gadget-fixes/fixes (a351e9b9fc24 Linux 4.11) Merging usb-serial-fixes/usb-linus (b004ee894f53 USB: serial: ftdi_sio: add Olimex ARM-USB-TINY(H) PIDs) Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file) Merging phy/fixes (3f34d7fc76fa phy: Group vendor specific phy drivers) Merging staging.current/staging-linus (b72d7451209a staging: fsl-dpaa2/eth: add ETHERNET dependency) Merging char-misc.current/char-misc-linus (0d83539092dd uio: fix incorrect memory leak cleanup) Merging input-current/for-linus (3af9256150b3 Input: cros_ec_keyb - remove extraneous 'const') Merging crypto-current/master (929562b14478 crypto: stm32 - Fix OF module alias information) Merging ide/master (acfead32f3f9 ide: don't call memcpy with the same source and destination) Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6) Merging kselftest-fixes/fixes (2ea659a9ef48 Linux 4.12-rc1) Merging ba
Re: linux-next: Tree for May 17
Hi Stephen, On Mon, May 23, 2016 at 4:37 PM, Stephen Rothwell wrote: > Hi Xiong, > > On Mon, 23 May 2016 16:13:28 +0800 Xiong Zhou wrote: >> >> hi, >> >> On Tue, May 17, 2016 at 1:04 PM, Stephen Rothwell >> wrote: >> > >> > I have created today's linux-next tree at >> > git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git >> > (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you >> >> Patches after 0516 are not there. >> >> i'm chasing an oom issue between 0516 and 0518 trees while missed >> 0517 tag, so is the patch file the only way to get there trying 0517 tree? > > They are there, just the version numbering puts them out of order in the > page listing - they appear before patch-v4.6-rc1-next-20160327.gz Ya, my bad, i found them. > > All the (recent) tags are in the git tree as well, of course. Yes! git fetch -t saved my mess git repo. Thank you very much! -- Xiong > -- > Cheers, > Stephen Rothwell
Re: linux-next: Tree for May 17
Hi Xiong, On Mon, 23 May 2016 16:13:28 +0800 Xiong Zhou wrote: > > hi, > > On Tue, May 17, 2016 at 1:04 PM, Stephen Rothwell > wrote: > > > > I have created today's linux-next tree at > > git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git > > (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you > > Patches after 0516 are not there. > > i'm chasing an oom issue between 0516 and 0518 trees while missed > 0517 tag, so is the patch file the only way to get there trying 0517 tree? They are there, just the version numbering puts them out of order in the page listing - they appear before patch-v4.6-rc1-next-20160327.gz All the (recent) tags are in the git tree as well, of course. -- Cheers, Stephen Rothwell
Re: linux-next: Tree for May 17
hi, On Tue, May 17, 2016 at 1:04 PM, Stephen Rothwell wrote: > Hi all, > > Please do not add any v4.8 destined material to your linux-next included > branches until after v4.7-rc1 has been released. > > Changes since 20160516: > > The vfs tree gained a conflict against the ext4 tree. > > The net-next tree gained a conflict against the arm64 tree. > > The spi tree lost its build failure. > > Non-merge commits (relative to Linus' tree): 9737 > 8314 files changed, 424907 insertions(+), 177068 deletions(-) > > > > I have created today's linux-next tree at > git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git > (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you Patches after 0516 are not there. i'm chasing an oom issue between 0516 and 0518 trees while missed 0517 tag, so is the patch file the only way to get there trying 0517 tree?
linux-next: Tree for May 17
Hi all,
Please do not add any v4.8 destined material to your linux-next included
branches until after v4.7-rc1 has been released.
Changes since 20160516:
The vfs tree gained a conflict against the ext4 tree.
The net-next tree gained a conflict against the arm64 tree.
The spi tree lost its build failure.
Non-merge commits (relative to Linus' tree): 9737
8314 files changed, 424907 insertions(+), 177068 deletions(-)
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 235 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (cf6ed9a6682d Merge branch 'ras-core-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging fixes/master (b507146bb6b9 Merge branch 'linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on
module install)
Merging arc-current/for-curr (44549e8f5eea Linux 4.6-rc7)
Merging arm-current/fixes (ec953b70f368 ARM: 8573/1: domain: move
{set,get}_domain under config guard)
Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic
)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached
build errors)
Merging powerpc-fixes/fixes (b4c112114aab powerpc: Fix bad inline asm
constraint in create_zero_mask())
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (33656a1f2ee5 Merge branch 'for_linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs)
Merging net/master (2dcd0af568b0 Linux 4.6)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (f28f20da704d Merge
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging wireless-drivers/master (cbbba30f1ac9 Merge tag
'iwlwifi-for-kalle-2016-05-04' of
https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (e6436be21e77 mac80211: fix statistics leak if
dev_alloc_name() fails)
Merging sound-current/for-linus (a158f2b79ff1 Merge tag 'asoc-v4.7' of
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (9a2a5a638f8e PCI: Do not treat EPROBE_DEFER as
device attach failure)
Merging driver-core.current/driver-core-linus (c3b46c73264b Linux 4.6-rc4)
Merging tty.current/tty-linus (44549e8f5eea Linux 4.6-rc7)
Merging usb.current/usb-linus (44549e8f5eea Linux 4.6-rc7)
Merging usb-gadget-fixes/fixes (38740a5b87d5 usb: gadget: f_fs: Fix
use-after-free)
Merging usb-serial-fixes/usb-linus (74d2a91aec97 USB: serial: option: add even
more ZTE device ids)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg:
change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (44549e8f5eea Linux 4.6-rc7)
Merging char-misc.current/char-misc-linus (44549e8f5eea Linux 4.6-rc7)
Merging input-current/for-linus (c52c545ead97 Input: twl6040-vibra - fix DT
node memory management)
Merging crypto-current/master (256b1cfb9a34 crypto: qat - change the
adf_ctl_stop_devices to void)
Merging ide/master (1993b176a822 Merge
git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test
for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms
vs module insertion ra
linux-next: Tree for May 17
Hi all, Changes since 20130516: I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" as mentioned in the FAQ on the wiki (see below). You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. We are up to 226 trees (counting Linus' and 31 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do. Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (d5fe85a Merge tag 'pm+acpi-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) Merging fixes/master (0279b3c Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging kbuild-current/rc-fixes (f66ba56 package: Makefile: unbreak binrpm-pkg target) Merging arc-current/for-curr (81ec684 ARC: [mm] change semantics of __sync_icache_dcache() to inv d$ lines) Merging arm-current/fixes (6eabb33 ARM: 7720/1: ARM v6/v7 cmpxchg64 shouldn't clear upper 32 bits of the old/new value) Merging m68k-current/for-linus (f722406 Linux 3.10-rc1) Merging powerpc-merge/merge (e34166a powerpc: Set show_unhandled_signals to 1 by default) Merging sparc/master (de9c9f8 Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc) Merging net/master (b0ce350 bonding: allow TSO being set on bonding master) Merging ipsec/master (da241ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging sound-current/for-linus (436c4a0 ALSA: hda - Add headset mic support for another Dell machine) Merging pci-current/for-linus (f722406 Linux 3.10-rc1) Merging wireless/master (61f1598 Merge branch 'wireless') Merging driver-core.current/driver-core-linus (9affd6b arm: fix mismerge of arch/arm/mach-omap2/timer.c) Merging tty.current/tty-linus (f722406 Linux 3.10-rc1) Merging usb.current/usb-linus (98f541c USB: remove remaining instances of USB_SUSPEND) Merging staging.current/staging-linus (c2b62f6 staging: nvec: cleanup childs on remove) Merging char-misc.current/char-misc-linus (f722406 Linux 3.10-rc1) Merging input-current/for-linus (f0aacea Input: wacom - add a few new styli for Cintiq series) Merging md-current/for-linus (32f9f57 MD: ignore discard request for hard disks of hybid raid1/raid10 array) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (286233e crypto: caam - fix inconsistent assoc dma mapping direction) Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe()) Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff) Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) Merging irqdomain-current/irqdomain/merge (a0d271c Linux 3.6) Merging devicetree-current/devicetree/merge (ab28698 of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS) Merging spi-current/spi/merge (0d2d0cc spi/davinci: fix module build error) Merging gpio-current/gpio/merge (e97f9b5 gpio/gpio-ich: fix ichx_gpio_check_available() return what callers expect) Merging rr-fixes/fixes (e5c4b5d module: Add section ".ref.data" into kmemleak-scan-area.) Merging mfd-fixes/master (e9d7b4b mfd: db8500-prcmu: Update stored DSI PLL divider value) Merging vfio-fixes/for-linus (904c680 vfio-pci: Fix possible integer overflow) Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu) Merging arc/for-next (fd5c9c
