Subject: Re: linux-next: Tree for May 20(dvb-usb)

From: Xiong Zhou <[email-masked]>
Date: Mon, 20 May 2013 19:04:12 +0800 (CST)

randconfig build error:

drivers/built-in.o: In function `dibusb_dib3000mc_tuner_attach':
drivers/media/usb/dvb-usb/dibusb-common.c:322: undefined reference to `dib3000mc_get_tuner_i2c_master'
drivers/media/usb/dvb-usb/dibusb-common.c:330: undefined reference to `dib3000mc_set_config'
drivers/built-in.o: In function `dibusb_dib3000mc_frontend_attach':
drivers/media/usb/dvb-usb/dibusb-common.c:271: undefined reference to `dib3000mc_pid_parse'
drivers/media/usb/dvb-usb/dibusb-common.c:272: undefined reference to `dib3000mc_pid_control'
drivers/built-in.o: In function `tfe8096p_tuner_attach':
drivers/media/usb/dvb-usb/dib0700_devices.c:2035: undefined reference to `dib8096p_get_i2c_tuner'
drivers/media/usb/dvb-usb/dib0700_devices.c:2041: undefined reference to `dib8000_set_gpio'
drivers/built-in.o: In function `dib80xx_tuner_sleep':
drivers/media/usb/dvb-usb/dib0700_devices.c:1169: undefined reference to `dib8000_set_gpio'
drivers/built-in.o: In function `dib80xx_tuner_reset':
drivers/media/usb/dvb-usb/dib0700_devices.c:1164: undefined reference to `dib8000_set_gpio'
drivers/built-in.o: In function `dib8090_get_adc_power':
drivers/media/usb/dvb-usb/dib0700_devices.c:1431: undefined reference to `dib8000_get_adc_power'
drivers/built-in.o: In function `dib8096p_agc_startup':
drivers/media/usb/dvb-usb/dib0700_devices.c:1986: undefined reference to `dib8000_set_wbd_ref'
drivers/media/usb/dvb-usb/dib0700_devices.c:1993: undefined reference to `dib8000_update_pll'
drivers/media/usb/dvb-usb/dib0700_devices.c:1994: undefined reference to `dib8000_ctrl_timf'
drivers/built-in.o: In function `tfe8096p_frontend_attach':
drivers/media/usb/dvb-usb/dib0700_devices.c:2024: undefined reference to `dib8000_i2c_enumeration'
drivers/built-in.o: In function `stk809x_frontend_attach':
drivers/media/usb/dvb-usb/dib0700_devices.c:1655: undefined reference to `dib8000_i2c_enumeration'
drivers/built-in.o: In function `stk807xpvr_frontend_attach1':
drivers/media/usb/dvb-usb/dib0700_devices.c:1323: undefined reference to `dib8000_i2c_enumeration'
drivers/built-in.o: In function `stk807xpvr_frontend_attach0':
drivers/media/usb/dvb-usb/dib0700_devices.c:1312: undefined reference to `dib8000_i2c_enumeration'
drivers/built-in.o: In function `stk807x_frontend_attach':
drivers/media/usb/dvb-usb/dib0700_devices.c:1282: undefined reference to `dib8000_i2c_enumeration'
drivers/built-in.o: In function `nim8096md_tuner_attach':
drivers/media/usb/dvb-usb/dib0700_devices.c:1666: undefined reference to `dib8000_get_slave_frontend'
drivers/media/usb/dvb-usb/dib0700_devices.c:1669: undefined reference to `dib8000_get_i2c_master'
drivers/media/usb/dvb-usb/dib0700_devices.c:1675: undefined reference to `dib8000_get_i2c_master'
drivers/built-in.o: In function `dib809x_tuner_attach':
drivers/media/usb/dvb-usb/dib0700_devices.c:1628: undefined reference to `dib8000_get_i2c_master'
drivers/built-in.o: In function `dib807x_tuner_attach':
drivers/media/usb/dvb-usb/dib0700_devices.c:1234: undefined reference to `dib8000_get_i2c_master'
drivers/built-in.o: In function `dib8096_set_param_override':
drivers/media/usb/dvb-usb/dib0700_devices.c:1554: undefined reference to `dib8000_set_gpio'
drivers/media/usb/dvb-usb/dib0700_devices.c:1571: undefined reference to `dib8000_update_pll'
drivers/media/usb/dvb-usb/dib0700_devices.c:1585: undefined reference to `dib8000_update_pll'
drivers/media/usb/dvb-usb/dib0700_devices.c:1587: undefined reference to `dib8000_ctrl_timf'
drivers/media/usb/dvb-usb/dib0700_devices.c:1592: undefined reference to `dib8000_set_wbd_ref'
drivers/media/usb/dvb-usb/dib0700_devices.c:1614: undefined reference to `dib8000_pwm_agc_reset'
drivers/media/usb/dvb-usb/dib0700_devices.c:1615: undefined reference to `dib8000_set_tune_state'
drivers/media/usb/dvb-usb/dib0700_devices.c:1557: undefined reference to `dib8000_set_gpio'
drivers/built-in.o: In function `nim8096md_frontend_attach':
drivers/media/usb/dvb-usb/dib0700_devices.c:1706: undefined reference to `dib8000_i2c_enumeration'
drivers/media/usb/dvb-usb/dib0700_devices.c:1713: undefined reference to `dib8000_set_slave_frontend'
drivers/built-in.o: In function `dib807x_set_param_override':
drivers/media/usb/dvb-usb/dib0700_devices.c:1215: undefined reference to `dib0070_wbd_offset'
drivers/media/usb/dvb-usb/dib0700_devices.c:1226: undefined reference to `dib8000_set_wbd_ref'
drivers/built-in.o: In function `dib7770_set_param_override':
drivers/media/usb/dvb-usb/dib0700_devices.c:845: undefined reference to `dib0070_wbd_offset'
drivers/built-in.o: In function `dib7070_set_param_override':
drivers/media/usb/dvb-usb/dib0700_devices.c:821: undefined reference to `dib0070_wbd_offset'
drivers/built-in.o: In function `stk80xx_pid_filter':
drivers/media/usb/dvb-usb/dib0700_devices.c:1255: undefined reference to `dib8000_pid_filter'
drivers/built-in.o: In function `stk80xx_pid_filter_ctrl':
drivers/media/usb/dvb-usb/dib0700_devices.c:1261: undefined reference to `dib8000_pid_filter_ctrl'
drivers/built-in.o: In function `bristol_tuner_attach':
drivers/media/usb/dvb-usb/dib0700_devices.c:121: undefined reference to `dib3000mc_get_tuner_i2c_master'
drivers/built-in.o: In function `bristol_frontend_attach':
drivers/media/usb/dvb-usb/dib0700_devices.c:98: undefined reference to `dib3000mc_i2c_enumeration'
drivers/built-in.o: In function `az6027_frontend_attach':
drivers/media/usb/dvb-usb/az6027.c:916: undefined reference to `stb6100_attach'
drivers/built-in.o: In function `dib01x0_pmu_update':
drivers/media/usb/dvb-usb/dib0700_devices.c:2079: undefined reference to `dibx000_i2c_set_speed'
drivers/built-in.o:(.rodata+0x24870): undefined reference to `dib8096p_tuner_sleep'
drivers/built-in.o:(.rodata+0x24874): undefined reference to `dib8096p_tuner_sleep'
drivers/built-in.o:(.data+0x3470c): undefined reference to `dib0070_ctrl_agc_filter'
drivers/built-in.o:(.data+0x34738): undefined reference to `dib0070_ctrl_agc_filter'
make: *** [vmlinux] Error 1

config file attached.

On Mon, 20 May 2013, Stephen Rothwell wrote:

> Hi all,
> 
> Changes since 20130517:
> 
> The usb.current tree gained a conflict against Linus' tree.
> 
> The rr-fixes tree gained a build failure so I used the version from
> next-20130515.
> 
> The akpm tree gained conflicts against Linus' and the net-next tree.
> 
> ----------------------------------------------------------------------------
> 
> 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 Rothwell                    [email-masked]
> 
> $ git checkout master
> $ git reset --hard stable
> Merging origin/master (343cd4f Merge tag 'dm-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm)
> 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 (ff0102e net: irda: using kzalloc() instead of kmalloc() to avoid strncpy() issue.)
> Merging ipsec/master (da241ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
> Merging sound-current/for-linus (e6135fe ALSA: usb-audio: proc: use found syncmaxsize to determine feedback format)
> Merging pci-current/for-linus (3f327e3 PCI: acpiphp: Re-enumerate devices when host bridge receives Bus Check)
> Merging wireless/master (6bb4880 ath9k: fix draining aggregation tid buffers)
> Merging driver-core.current/driver-core-linus (f722406 Linux 3.10-rc1)
> Merging tty.current/tty-linus (f722406 Linux 3.10-rc1)
> Merging usb.current/usb-linus (7138143 USB: ftdi_sio: Add support for Newport CONEX motor drivers)
> CONFLICT (content): Merge conflict in drivers/usb/host/ohci-nxp.c
> Merging staging.current/staging-linus (642f2ec staging: dwc2: Fix dma-enabled platform devices using a default dma_mask)
> Merging char-misc.current/char-misc-linus (221ba15 Char: lp, protect LPGETSTATUS with port_mutex)
> 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 (d16ea2a virtio_console: fix uapi header)
> $ git reset --hard HEAD^
> Merging 20130515 version of rr-fixes
> 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 (fd5c9c3 ARC: Trim arcregs.h)
> Merging arm/for-next (47aa03d Merge branches 'fixes', 'misc' and 'mmci' into for-next)
> Merging arm-perf/for-next/perf (ab87304 Merge branches 'perf/fixes' and 'hw-breakpoint' into for-next/perf)
> Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
> Merging xilinx/arm-next (64e3fd3 arm: zynq: Add support for pmu)
> CONFLICT (content): Merge conflict in drivers/clocksource/tegra20_timer.c
> CONFLICT (content): Merge conflict in drivers/clocksource/Makefile
> CONFLICT (add/add): Merge conflict in arch/arm/mach-zynq/platsmp.c
> CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/v2m.c
> CONFLICT (content): Merge conflict in arch/arm/mach-spear/spear13xx.c
> CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c
> CONFLICT (content): Merge conflict in arch/arm/mach-highbank/highbank.c
> Merging arm64/upstream (3126976 arm64: debug: fix mdscr.ss check when enabling debug exceptions)
> Merging blackfin/blackfin-linus (5ae89ee bfin cache: dcplb map: add 16M dcplb map for BF60x)
> Merging c6x/for-linux-next (f934af0 add memory barrier to arch_local_irq_restore)
> Merging cris/for-next (32ade6a CRIS: Add kvm_para.h which includes generic file)
> Merging hexagon/linux-next (de44443 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD)
> Merging ia64/next (797f6a6 Add size restriction to the kdump documentation)
> Merging m68k/for-next (f722406 Linux 3.10-rc1)
> Merging m68knommu/for-next (2842e5b0 m68knommu: enable Timer on coldfire 532x)
> Merging metag/for-next (164c013 metag: defconfigs: increase log buffer 8KiB => 128KiB)
> Merging microblaze/next (972be32 microblaze: Initialize temp variable to remove compilation warning)
> Merging mips/mips-for-linux-next (f4ef27f Merge branch '3.10-fixes' into mips-for-linux-next)
> Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS)
> Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
> Merging parisc-hd/for-next (1c92ce8 parisc: use arch_spinlock_t instead of raw_spinlock_t in irqstacks)
> Merging powerpc/next (674825d Merge tag 'fixes-for-3.10-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen)
> Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
> Merging mpc5xxx/next (fdeaf0e powerpc/512x: add ifm ac14xx board)
> Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
> Merging s390/features (ba54229 s390/cio: add channel ID sysfs attribute)
> Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest)
> CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile
> Merging sparc-next/master (f8ce1fa Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux)
> Merging tile/master (9fc1894 arch/tile: Fix syscall return value passed to tracepoint)
> Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
> Merging xtensa/for_next (b341d84 xtensa: Switch to asm-generic/linkage.h)
> Merging btrfs/next (667e7d9 Btrfs: allow superblock mismatch from older mkfs)
> Merging ceph/testing (cb53a7e rbd: drop original request earlier for existence check)
> Merging cifs/for-next (c2b93e0 cifs: only set ops for inodes in I_NEW state)
> Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
> Merging ecryptfs/next (f6161aa Linux 3.9-rc2)
> Merging ext3/for_next (e162b2f jbd: use kmem_cache_zalloc instead of kmem_cache_alloc/memset)
> Merging ext4/dev (e2555fd jbd,jbd2: fix oops in jbd2_journal_put_journal_head())
> Merging f2fs/dev (f722406 Linux 3.10-rc1)
> Merging fuse/for-next (de82b92 fuse: allocate for_background dio requests based on io->async state)
> Merging gfs2/master (315debd GFS2: fix DLM depends to fix build errors)
> Merging jfs/jfs-next (73aaa22 jfs: fix a couple races)
> Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found)
> Merging nfs/linux-next (2aed8b4 SUNRPC: Convert auth_gss pipe detection to work in namespaces)
> Merging nfsd/nfsd-next (ba4e55b nfsd4: fix compile in !CONFIG_NFSD_V4_SECURITY_LABEL case)
> Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
> Merging omfs/for-next (976d167 Linux 3.1-rc9)
> Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
> Merging v9fs/for-next (c1be5a5 Linux 3.9)
> Merging ubifs/linux-next (c1be5a5 Linux 3.9)
> Merging xfs/for-next (f722406 Linux 3.10-rc1)
> Merging vfs/for-next (ac3e3c5 don't bother with deferred freeing of fdtables)
> Merging pci/next (f722406 Linux 3.10-rc1)
> Merging hid/for-next (f3d6ede Merge branch 'for-3.11/multitouch' into for-next)
> Merging i2c/i2c/for-next (e9b526f i2c: suppress lockdep warning on delete_device)
> Merging jdelvare-hwmon/master (1aaf6d3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
> Merging hwmon-staging/hwmon-next (d0a665e hwmon: (ds1621) Add ds1721 update interval sysfs attribute)
> Merging v4l-dvb/master (1d62caa Merge /home/v4l/v4l/patchwork)
> Merging kbuild/for-next (9639217 Merge branch 'kbuild/kbuild' into kbuild/for-next)
> Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
> Merging libata/for-next (d3f0718 Merge branch 'for-3.10-fixes' into for-next)
> Merging infiniband/for-next (f1258ea Merge branches 'misc' and 'mlx4' into for-next)
> Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block)
> Merging pm/linux-next (fe4ae24 Merge branch 'pnp-next' into linux-next)
> Merging idle/next (5c99726b Merge branch 'fspin' into next)
> Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
> Merging cpuidle/cpuidle-next (817c876 Merge branch 'pm-fixes-next' into fixes-next)
> CONFLICT (content): Merge conflict in drivers/base/power/qos.c
> CONFLICT (content): Merge conflict in drivers/acpi/processor_driver.c
> Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
> Merging thermal/next (9d47550 thermal: rcar: Fix typo in probe information message)
> Merging ieee1394/for-next (6fe9efb firewire: ohci: dump_stack() for PHY regs read/write failures)
> Merging ubi/linux-next (1557b9e UBI: do not abort init when ubi.mtd devices cannot be found)
> Merging dlm/next (9000831 dlm: avoid unnecessary posix unlock)
> Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
> Merging scsi/for-next (222ab59 [SCSI] ipr: Avoid target_destroy accessing memory after it was freed)
> Merging target-updates/for-next (04b59ba tcm_vhost: Enable VIRTIO_SCSI_F_HOTPLUG)
> Merging target-merge/for-next-merge (b8d26b3 iser-target: Add iSCSI Extensions for RDMA (iSER) target driver)
> Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
> Merging isci/all (6734092 isci: add a couple __iomem annotations)
> Merging slave-dma/next (9562f83 DMA: AT91: Get residual bytes in dma buffer)
> Merging dmaengine/next (41ef2d5 Linux 3.9-rc7)
> Merging net-next/master (3cc7587 Documentation/sysctl/net.txt: fix (attribute removal).)
> Merging ipsec-next/master (05600a7 xfrm_user: constify netlink dispatch table)
> Merging wireless-next/master (f722406 Linux 3.10-rc1)
> Merging bluetooth/master (26b5afc Bluetooth: Mgmt Device Found Event)
> Merging mtd/master (a637b0d Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd)
> Merging l2-mtd/master (fc228fa mtd: increase max OOB size to 744)
> Merging crypto/master (00db14e crypto: sahara - remove dependency on EXPERIMENTAL)
> Merging drm/drm-next (e9ced8e drm/radeon: restore nomodeset operation (v2))
> Merging drm-intel/for-linux-next (1ffc528 drm/i915: clear the stolen fb before resuming)
> Merging sound/for-next (e44007e ALSA: hda - add PCI IDs for Intel BayTrail)
> Merging sound-asoc/for-next (01e0d55 Merge remote-tracking branch 'asoc/topic/x86' into asoc-next)
> Merging modules/modules-next (d5fe85a Merge tag 'pm+acpi-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
> Merging virtio/virtio-next (d5fe85a Merge tag 'pm+acpi-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
> Merging input/next (d520145 Input: w90p910_keypad - remove redundant platform_set_drvdata())
> Merging input-mt/for-next (194664e Input: MT - handle semi-mt devices in core)
> Merging cgroup/for-next (e691100 Merge branch 'for-3.11' into for-next)
> Merging block/for-next (3ba25f6 Merge branch 'for-linus' into for-next)
> Merging device-mapper/master (11531a4 Fix detection of the need to resize the dm thin metadata device.)
> Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
> Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
> Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
> Merging mmc/mmc-next (f722406 Linux 3.10-rc1)
> Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command)
> Merging slab/for-next (8a965b3 mm, slab_common: Fix bootstrap creation of kmalloc caches)
> Merging uclinux/for-next (6dbe51c Linux 3.9-rc1)
> Merging md/for-next (ae59b84 dm-raid: silence compiler warning on rebuilds_per_group.)
> Merging mfd/master (43d61ee MAINTAINERS: Add Lee Jones as the MFD co-maintainer)
> CONFLICT (content): Merge conflict in drivers/mfd/intel_msic.c
> Merging battery/master (237a1b0 lp8788-charger: Fix kconfig dependency)
> Merging fbdev/fbdev-next (a49f0d1 Linux 3.8-rc1)
> Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
> Merging omap_dss2/for-next (e72b753 fbdev/ps3fb: fix compile warning)
> Merging regulator/for-next (0eeca66 Merge remote-tracking branch 'regulator/topic/isl6271a' into regulator-next)
> Merging security/next (4726e8f security: clarify cap_inode_getsecctx description)
> Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
> Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
> Merging watchdog/master (f722406 Linux 3.10-rc1)
> Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage)
> Merging iommu/next (0c4513b Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu', 'core' and 'arm/tegra' into next)
> Merging vfio/next (664e938 vfio: Set container device mode)
> Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error)
> Merging jc_docs/docs-next (5c050fb docs: update the development process document)
> Merging trivial/for-next (071361d mm: Convert print_symbol to %pSR)
> Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
> Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls)
> Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescence of IMC_DDRIO device)
> Merging edac-amd/for-next (9713fae EDAC: Merge mci.mem_is_per_rank with mci.csbased)
> Merging devicetree/devicetree/next (3132f62 Merge branch 'for-next' of git://sources.calxeda.com/kernel/linux into HEAD)
> Merging dt-rh/for-next (a2b9ea7 Documentation/devicetree: make semantic of initrd-end more explicit)
> Merging spi/spi/next (00ab539 spi/s3c64xx: let device core setup the default pin configuration)
> Merging spi-mb/for-next (027cc5a Merge remote-tracking branch 'spi/topic/sirf' into spi-next)
> Merging tip/auto-latest (57e87c1 Merge branch 'timers/urgent')
> Merging ftrace/for-next (4c69e6e tracepoints: Prevent null probe from being added)
> Merging rcu/rcu/next (4573e86 rcu: Switch to exedited grace periods for suspend as well as hibernation)
> Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
> Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
> Merging kvm/linux-next (f722406 Linux 3.10-rc1)
> Merging kvm-arm/kvm-arm-next (b8022d7 arm: kvm: arch_timer: use symbolic constants)
> CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c
> CONFLICT (content): Merge conflict in arch/arm/include/asm/kvm_host.h
> Merging kvm-ppc/kvm-ppc-next (5975a2e KVM: PPC: Book3S: Add API for in-kernel XICS emulation)
> Merging oprofile/for-next (f722406 Linux 3.10-rc1)
> Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work)
> Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
> Merging xen-two/linux-next (f722406 Linux 3.10-rc1)
> Merging xen-arm/linux-next (3cc8e40 xen/arm: rename xen_secondary_init and run it on every online cpu)
> Merging percpu/for-next (a1b2a55 percpu: add documentation on this_cpu operations)
> Merging workqueues/for-next (bbe2a23 Merge branch 'for-3.10-fixes' into for-next)
> Merging drivers-x86/linux-next (a1ec56e Add support for fan button on Ideapad Z580)
> Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
> Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
> Merging regmap/for-next (3615b6e Merge remote-tracking branch 'regmap/topic/debugfs' into regmap-next)
> Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
> Merging leds/for-next (34185fe leds: lp5562: Properly setup of_device_id table)
> Merging driver-core/driver-core-next (5240d58 sysfs: kill sysfs_sb declaration in fs/sysfs/inode.c.)
> Merging tty/tty-next (f722406 Linux 3.10-rc1)
> Merging usb/usb-next (f23eb0e usb: host: uhci-platform: Remove redundant platform_set_drvdata())
> Merging usb-gadget/next (added5f ARM: mxs_defconfig: add CONFIG_USB_PHY)
> Merging staging/staging-next (518d752 staging: fixed else format in ft1000_debug.c)
> CONFLICT (content): Merge conflict in drivers/staging/nvec/nvec_kbd.c
> Merging char-misc/char-misc-next (e7d87ca misc: ep93xx_pwm: remove unnecessary platform_set_drvdata())
> Merging bcon/master (e284f34 netconsole: s/syslogd/cancd/ in documentation)
> CONFLICT (content): Merge conflict in drivers/block/Kconfig
> Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
> Merging writeback/writeback-for-next (ed84825 Negative (setpoint-dirty) in bdi_position_ratio())
> Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
> Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
> Merging pinctrl/for-next (e5182b8 Merge branch 'devel' into for-next)
> Merging vhost/linux-next (0107b9b x86: uaccess s/might_sleep/might_fault/)
> CONFLICT (content): Merge conflict in drivers/vhost/test.c
> Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
> Merging remoteproc/for-next (b977785 remoteproc: fix kconfig dependencies for VIRTIO)
> Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO)
> Merging irqdomain/irqdomain/next (560aa53 irqdomain: document the simple domain first_irq)
> Merging gpio/gpio/next (08ffb22 gpio: grgpio: Add irq support)
> Merging gpio-lw/for-next (352a2d5 gpio/omap: ensure gpio context is initialised)
> Merging gen-gpio/for_next (f4c5405 gpio: update gpio Chinese documentation)
> Merging mailbox/dbx500-prcmu-mailbox (c497eba mailbox: fix invalid use of sizeof in mailbox_msg_send())
> Merging arm-soc/for-next (a0cdbee Merge branch 'fixes' into for-next)
> Merging bcm2835/for-next (ee8056f Merge branch 'for-3.11/defconfig' into for-next)
> Merging cortex/for-next (6fae9cd ARM: ARMv7-M: implement read_cpuid_ext)
> Merging ep93xx/ep93xx-for-next (7ec4429 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
> Merging imx-mxs/for-next (8fca022 Merge branch 'mxs/dt' into for-next)
> Merging ixp4xx/next (19f949f Linux 3.8)
> Merging msm/for-next (1df357a Merge branch 'msm-defconfig' into for-next)
> Merging mvebu/for-next (fe9f82d Merge branch 'mvebu/pcie' into for-next)
> Merging renesas/next (c482a65 Merge branch 'heads/soc-sh73a0' into next)
> CONFLICT (content): Merge conflict in drivers/pinctrl/sh-pfc/Kconfig
> CONFLICT (modify/delete): drivers/leds/leds-renesas-tpu.c deleted in renesas/next and modified in HEAD. Version HEAD of drivers/leds/leds-renesas-tpu.c left in tree.
> CONFLICT (content): Merge conflict in drivers/leds/Kconfig
> CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7740.c
> CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-lager.c
> CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-bockw.c
> CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-armadillo800eva.c
> $ git rm -f drivers/leds/leds-renesas-tpu.c
> Merging samsung/for-next (f722406 Linux 3.10-rc1)
> Merging tegra/for-next (b4dd876 Merge branch 'for-3.11/defconfig' into for-next)
> Merging dma-mapping/dma-mapping-next (c1be5a5 Linux 3.9)
> Merging pwm/for-next (c71a985 MAINTAINERS: Update PWM subsystem entry)
> Merging dma-buf/for-next (b89e356 dma-buf: Add debugfs support)
> Merging userns/for-next (78008c4 proc: Restrict mounting the proc filesystem)
> Merging ktest/for-next (df5f7c6 ktest: Reset grub menu cache with different machines)
> Merging signal/for-next (20b4fb4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
> Merging clk/clk-next (fa079b9 clk: sun5i: Add compatibles for Allwinner A13)
> Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock)
> Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
> Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6)
> Merging akpm-current/current (e0fd9af Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband)
> $ git checkout -b akpm remotes/origin/akpm/master
> Applying: drivers/block/xsysace.c: fix id with missing port-number
> Applying: rapidio: make enumeration/discovery configurable
> Applying: rapidio: add enumeration/discovery start from user space
> Applying: rapidio: documentation update for enumeration changes
> Applying: fat: fix possible overflow for fat_clusters
> Applying: wait: fix false timeouts when using wait_event_timeout()
> Applying: mm: mmu_notifier: re-fix freed page still mapped in secondary MMU
> Applying: mm-mmu_notifier-re-fix-freed-page-still-mapped-in-secondary-mmu-fix
> Applying: ocfs2: unlock rw lock if inode lock failed
> Applying: drivers/video: implement a simple framebuffer driver
> Applying: mm: memcg: remove incorrect VM_BUG_ON for swap cache pages in uncharge
> Applying: hfs: avoid crash in hfs_bnode_create
> Applying: CPU hotplug: provide a generic helper to disable/enable CPU hotplug
> Applying: cpu-hotplug-provide-a-generic-helper-to-disable-enable-cpu-hotplug-fix
> Applying: cpu-hotplug-provide-a-generic-helper-to-disable-enable-cpu-hotplug-fix-fix
> Applying: reboot: rigrate shutdown/reboot to boot cpu
> Applying: shm-fix-null-pointer-deref-when-userspace-specifies-invalid-hugepage-size-fix
> Applying: rapidio/tsi721: fix bug in MSI interrupt handling
> Applying: mm compaction: fix of improper cache flush in migration code
> Applying: kernel/audit_tree.c:audit_add_tree_rule(): protect `rule' from kill_rules()
> Applying: ipcsem-fix-semctl-getzcnt-fix
> Applying: ipcsem-fix-semctl-getncnt-fix
> Applying: MAINTAINERS: update Hyper-V file list
> Applying: kmsg: honor dmesg_restrict sysctl on /dev/kmsg
> Applying: kmsg-honor-dmesg_restrict-sysctl-on-dev-kmsg-fix
> Applying: drivers/char/random.c: fix priming of last_data
> Applying: random: fix accounting race condition with lockless irq entropy_count update
> Applying: sound/soc/codecs/si476x.c: don't use 0bNNN
> Applying: x86: make 'mem=' option to work for efi platform
> Applying: audit: fix mq_open and mq_unlink to add the MQ root as a hidden parent audit_names record
> Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress
> Applying: cyber2000fb: avoid palette corruption at higher clocks
> Applying: posix_cpu_timer: consolidate expiry time type
> Applying: posix_cpu_timers: consolidate timer list cleanups
> Applying: posix_cpu_timers: consolidate expired timers check
> Applying: selftests: add basic posix timers selftests
> Applying: posix-timers: correctly get dying task time sample in posix_cpu_timer_schedule()
> Applying: posix_timers: Fix racy timer delta caching on task exit
> Applying: drivers/infiniband/core/cm.c: convert to using idr_alloc_cyclic()
> Applying: configfs: use capped length for ->store_attribute()
> Applying: ipvs: change type of netns_ipvs->sysctl_sync_qlen_max
> Applying: lockdep: introduce lock_acquire_exclusive/shared helper macros
> Applying: lglock: update lockdep annotations to report recursive local locks
> Applying: block: restore /proc/partitions to not display non-partitionable removable devices
> Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic
> Applying: clear_refs: sanitize accepted commands declaration
> Applying: clear_refs: introduce private struct for mm_walk
> Applying: pagemap: introduce pagemap_entry_t without pmshift bits
> Applying: pagemap-introduce-pagemap_entry_t-without-pmshift-bits-v4
> Applying: mm: soft-dirty bits for user memory changes tracking
> Applying: pagemap: prepare to reuse constant bits with page-shift
> Applying: mm/thp: use the correct function when updating access flags
> Applying: mm, memcg: don't take task_lock in task_in_mem_cgroup
> Applying: mm: remove free_area_cache
> Applying: mm: remove compressed copy from zram in-memory
> Applying: mm-remove-compressed-copy-from-zram-in-memory-fix
> Applying: mm/page_alloc.c: fix watermark check in __zone_watermark_ok()
> Applying: include/linux/mmzone.h: cleanups
> Applying: include-linux-mmzoneh-cleanups-fix
> Applying: mm: memmap_init_zone() performance improvement
> Applying: drop_caches: add some documentation and info message
> Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev
> Applying: mm/dmapool.c: fix null dev in dma_pool_create()
> Applying: memcg: debugging facility to access dangling memcgs
> Applying: memcg-debugging-facility-to-access-dangling-memcgs-fix
> Applying: mm: add vm event counters for balloon pages compaction
> Applying: err.h: IS_ERR() can accept __user pointers
> Applying: dump_stack: serialize the output from dump_stack()
> Applying: dump_stack-serialize-the-output-from-dump_stack-fix
> Applying: panic: add cpu/pid to warn_slowpath_common in WARNING printk()s
> Applying: panic-add-cpu-pid-to-warn_slowpath_common-in-warning-printks-fix
> Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq
> Applying: backlight: atmel-pwm-bl: remove unnecessary platform_set_drvdata()
> Applying: backlight: ep93xx: remove unnecessary platform_set_drvdata()
> Applying: backlight: lp8788: remove unnecessary platform_set_drvdata()
> Applying: backlight: pcf50633: remove unnecessary platform_set_drvdata()
> Applying: drivers/leds/leds-ot200.c: fix error caused by shifted mask
> Applying: lib/bitmap.c: speed up bitmap_find_free_region
> Applying: lib-bitmapc-speed-up-bitmap_find_free_region-fix
> Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting
> Applying: init: remove permanent string buffer from do_one_initcall()
> Applying: autofs4: allow autofs to work outside the initial PID namespace
> Applying: autofs4: translate pids to the right namespace for the daemon
> Applying: rtc: rtc-88pm80x: remove unnecessary platform_set_drvdata()
> Applying: drivers/rtc/rtc-v3020.c: remove redundant goto
> Applying: drivers/rtc/interface.c: fix checkpatch errors
> Applying: drivers/rtc/rtc-at32ap700x.c: fix checkpatch error
> Applying: drivers/rtc/rtc-at91rm9200.c: include <linux/uaccess.h>
> Applying: drivers/rtc/rtc-cmos.c: fix whitespace related errors
> Applying: drivers/rtc/rtc-davinci.c: fix whitespace warning
> Applying: drivers/rtc/rtc-ds1305.c: add missing braces around sizeof
> Applying: drivers/rtc/rtc-ds1374.c: fix spacing related issues
> Applying: drivers/rtc/rtc-ds1511.c: fix issues related to spaces and braces
> Applying: drivers/rtc/rtc-ds3234.c: fix whitespace issue
> Applying: drivers/rtc/rtc-fm3130.c: fix whitespace related issue
> Applying: drivers/rtc/rtc-m41t80.c: fix spacing related issue
> Applying: drivers/rtc/rtc-max6902.c: remove unwanted spaces
> Applying: drivers/rtc/rtc-max77686.c: remove space before semicolon
> Applying: drivers/rtc/rtc-max8997.c: remove space before semicolon
> Applying: drivers/rtc/rtc-mpc5121.c: remove space before tab
> Applying: drivers/rtc/rtc-msm6242.c: use pr_warn
> Applying: drivers/rtc/rtc-mxc.c: fix checkpatch error
> Applying: drivers/rtc/rtc-omap.c: include <linux/io.h> instead of <asm/io.h>
> Applying: drivers/rtc/rtc-pcf2123.c: remove space before tabs
> Applying: drivers/rtc/rtc-pcf8583.c: move assignment outside if condition
> Applying: drivers/rtc/rtc-rs5c313.c: include <linux/io.h> instead of <asm/io.h>
> Applying: drivers/rtc/rtc-rs5c313.c: fix spacing related issues
> Applying: drivers/rtc/rtc-v3020.c: fix spacing issues
> Applying: drivers/rtc/rtc-vr41xx.c: fix spacing issues
> Applying: drivers/rtc/rtc-x1205.c: fix checkpatch issues
> Applying: rtc: rtc-88pm860x: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-ab3100: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-ab8500: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-at32ap700x: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-at91rm9200: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-at91sam9: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-au1xxx: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-bfin: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-bq4802: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-coh901331: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-da9052: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-da9055: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-davinci: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-dm355evm: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-ds1302: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-ep93xx: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-jz4740: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-lp8788: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-lpc32xx: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-ls1x: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-m48t59: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-max8925: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-max8998: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-mc13xxx: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-msm6242: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-mxc: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-nuc900: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-pcap: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-pm8xxx: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-s3c: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-sa1100: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-sh: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-spear: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-stmp3xxx: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-twl: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-vr41xx: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-vt8500: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-m48t86: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-puv3: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-rp5c01: remove unnecessary platform_set_drvdata()
> Applying: rtc: rtc-tile: remove unnecessary platform_set_drvdata()
> Applying: reiserfs: fix deadlock with nfs racing on create/lookup
> Applying: fat: additions to support fat_fallocate
> Applying: fat-additions-to-support-fat_fallocate-fix
> Applying: idr: print a stack dump after ida_remove warning
> Applying: idr-print-a-stack-dump-after-ida_remove-warning-fix
> Applying: mwave: fix info leak in mwave_ioctl()
> Applying: rapidio/switches: remove tsi500 driver
> Applying: drivers/parport/share.c: use kzalloc
> Applying: drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode
> Applying: drivers-w1-slaves-w1_ds2408c-add-magic-sequence-to-disable-p0-test-mode-fix
> Applying: relay: fix timer madness
> Applying: aio: reqs_active -> reqs_available
> Applying: aio: percpu reqs_available
> Applying: generic dynamic per cpu refcounting
> Applying: aio: percpu ioctx refcount
> Applying: aio: use xchg() instead of completion_lock
> Applying: block: prep work for batch completion
> CONFLICT (content): Merge conflict in fs/btrfs/volumes.c
> CONFLICT (content): Merge conflict in fs/btrfs/inode.c
> Applying: block-prep-work-for-batch-completion-fix-2
> Applying: block-prep-work-for-batch-completion-fix-3
> Applying: block-prep-work-for-batch-completion-fix-3-fix
> Applying: block-prep-work-for-batch-completion-fix-99
> Applying: block-aio-batch-completion-for-bios-kiocbs-fix
> Applying: block, aio: batch completion for bios/kiocbs
> Applying: virtio-blk: convert to batch completion
> Applying: mtip32xx: convert to batch completion
> Applying: aio: fix kioctx not being freed after cancellation at exit time
> Applying: lib: add weak clz/ctz functions
> Applying: decompressor: add LZ4 decompressor module
> Applying: lib: add support for LZ4-compressed kernel
> Applying: kbuild: fix for updated LZ4 tool with the new streaming format
> Applying: arm: add support for LZ4-compressed kernel
> Applying: arm: Remove enforced Os flag for LZ4 decompressor
> Applying: x86: add support for LZ4-compressed kernel
> Applying: x86, doc: Add LZ4 magic number for the new compression
> Applying: lib: add lz4 compressor module
> Applying: lib-add-lz4-compressor-module-fix
> Applying: crypto: add lz4 Cryptographic API
> Applying: crypto-add-lz4-cryptographic-api-fix
> Applying: scripts/sortextable.c: fix building on non-Linux systems
> Applying: seccomp: add generic code for jitted seccomp filters.
> Applying: ARM: net: bpf_jit: make code generation less dependent on struct sk_filter.
> Applying: ARM: bpf_jit: seccomp filtering: fixup merge conflict
> Applying: ARM: net: bpf_jit: add support for jitted seccomp filters.
> Applying: bpf: add comments explaining the schedule_work() operation
> CONFLICT (content): Merge conflict in arch/x86/net/bpf_jit_comp.c
> CONFLICT (content): Merge conflict in arch/sparc/net/bpf_jit_comp.c
> Merging akpm/master (dc222b2 bpf: add comments explaining the schedule_work() operation)
>