* Re: Changed location for arm-lpae/for-next
From: Stephen Rothwell @ 2011-11-03 10:45 UTC (permalink / raw)
To: Catalin Marinas; +Cc: linux-next, LKML, Russell King
In-Reply-To: <CAHkRjk4ow5EZyqj3j6yDocsX5BPjDQvrqX1enPfyDt5kp=qxaQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 525 bytes --]
Hi Catalin,
On Thu, 3 Nov 2011 10:29:24 +0000 Catalin Marinas <catalin.marinas@arm.com> wrote:
>
> I now got my kernel.org account back and I plan to remove the github
> tree. You can get the above branches from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux.git for-next
> git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux.git kmemleak
OK, I have switched back to these.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: Changed location for arm-lpae/for-next
From: Catalin Marinas @ 2011-11-03 10:29 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Russell King
In-Reply-To: <20111006095625.c4814b818efdc61842451625@canb.auug.org.au>
Hi Stephen,
On 5 October 2011 23:56, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> On Wed, 5 Oct 2011 18:04:56 +0100 Catalin Marinas <catalin.marinas@arm.com> wrote:
>> I created two branches on github,
>> the first one for LPAE and the other for kmemleak:
>>
>> git://github.com/cmarinas/linux.git for-next
>
> I have switched to that from today.
>
>> git://github.com/cmarinas/linux.git kmemleak
>
> And added that from today as well.
I now got my kernel.org account back and I plan to remove the github
tree. You can get the above branches from:
git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux.git for-next
git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux.git kmemleak
(the first one contains the ARM LPAE patches)
Thanks.
--
Catalin
^ permalink raw reply
* Re: linux-next: build failure after merge of the crypto-current tree
From: Luis Henriques @ 2011-11-03 10:15 UTC (permalink / raw)
To: Herbert Xu; +Cc: Steffen Klassert, Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20111103061628.GA12678@gondor.apana.org.au>
On Thu, Nov 03, 2011 at 05:16:28PM +1100, Herbert Xu wrote:
> On Thu, Nov 03, 2011 at 06:58:24AM +0100, Steffen Klassert wrote:
> > On Thu, Nov 03, 2011 at 10:39:36AM +1100, Herbert Xu wrote:
> > > On Wed, Nov 02, 2011 at 08:09:13PM +0000, Luis Henriques wrote:
> > > >
> > > > I'm not sure if this is related, but I am currently unable to build mainline
> > > > kernel when disabling CONFIG_NET. This seems to be due to the patch serie:
> > > >
> > > > http://news.gmane.org/gmane.linux.kernel.cryptoapi/cutoff=6228
> > > >
> > > > For instance, commit 6ad414fe710d4fd3a8c8c6c2ad8fefcfcc207968 adds a dependency
> > > > over function nla_put(), which is only defined when CONFIG_NET is enabled.
> > >
> > > Indeed, I missed the dependency in the report functions which
> > > is built even when CRYPTO_USER is turned off.
> > >
> > > Does this patch fix the problem for you?
> > >
> >
> > Hm, did you forget to add the patch to the mail?
>
> Probably :)
>
> diff --git a/crypto/Kconfig b/crypto/Kconfig
> index 527a857..cdba95c 100644
> --- a/crypto/Kconfig
> +++ b/crypto/Kconfig
> @@ -38,6 +38,7 @@ config CRYPTO_ALGAPI
>
> config CRYPTO_ALGAPI2
> tristate
> + select NLATTR
>
> config CRYPTO_AEAD
> tristate
No, this did not solved the problem; build still fails. The problem is
that, in lib/nlattr.c, we have:
#ifdef CONFIG_NET
...
EXPORT_SYMBOL(nla_put);
...
#endif
So, I still have an undefined reference to nla_put.
BTW, I'm not talking about the -next tree, so this problem may or may not
be the same one reported by Stephen.
Cheers,
--
Luis Henriques
^ permalink raw reply
* Re: linux-next: Tree for Nov 3
From: Sedat Dilek @ 2011-11-03 7:29 UTC (permalink / raw)
To: Stephen Rothwell, Christoph Hellwig; +Cc: linux-next, LKML, Linus, Nick Piggin
In-Reply-To: <20111103172036.0795ce9559ab2dbfd5740a26@canb.auug.org.au>
On Thu, Nov 3, 2011 at 7:20 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> The linux-next tree on github is no longer being updated and will be
> removed soon.
>
> The patch is still absent from kernel.org.
>
> The summary at the end now has a "git -1 --oneline" appended to the lines
> indicating which tree is being merged. This was suggested by Mauro
> Chehab as an aid to maintainers so that they can easily tell which version
> of their tree was merged. Comments welcome.
>
> Changes since 20111102:
>
> Renamed trees:
> wireless -> wireless-next
> wireless-current -> wireless
>
Whuzzz up with VFS tree(s)?
[1] and [2] lists:
vfs git
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next
vfs-scale git
git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin.git#vfs-scale-working
Isn't vfs-scale [2] done?
I have so long not heard or read from Nick Piggin (vfs-scale), I hope
he is well.
Christoph take over as interim VFS stuff from Al (hope he is well,
too) and I have seen his and pending stuff from FS folk was merged
into Linus-tree.
Christoph, your for-next GIT branch [3] is dedicated for linux-next (v3.3)?
- Sedat -
[1] http://git.us.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=blob;f=Next/Trees#l89
[2] http://git.us.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=blob;f=Next/Trees#l90
[3] http://git.kernel.org/?p=linux/kernel/git/hch/vfs-queue.git;a=shortlog;h=refs/heads/for-next
^ permalink raw reply
* linux-next: Tree for Nov 3
From: Stephen Rothwell @ 2011-11-03 6:20 UTC (permalink / raw)
To: linux-next; +Cc: LKML, Linus
[-- Attachment #1: Type: text/plain, Size: 33624 bytes --]
Hi all,
The linux-next tree on github is no longer being updated and will be
removed soon.
The patch is still absent from kernel.org.
The summary at the end now has a "git -1 --oneline" appended to the lines
indicating which tree is being merged. This was suggested by Mauro
Chehab as an aid to maintainers so that they can easily tell which version
of their tree was merged. Comments welcome.
Changes since 20111102:
Renamed trees:
wireless -> wireless-next
wireless-current -> wireless
My fixes tree contains:
Revert "hvc_console: display printk messages on console."
The pci-current and pci trees gained a build failure so I used the
versions from next-20111102.
The ext3 tree lost its conflict.
The watchdog tree lost its build failure.
The kvmtool tree gained a conflict against the kbuild tree.
I dropped some patches from the akpm tree that appeared in other trees.
----------------------------------------------------------------------------
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/v2.6/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
and sparc64 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 197 trees (counting Linus' and 27 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.
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 sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (43672a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/linux-dm)
Merging fixes/master (956e850 Revert "hvc_console: display printk messages on console.")
Merging kbuild-current/rc-fixes (322a8b0 Linux 3.1-rc1)
Merging arm-current/fixes (1bf1aac Merge branch 'samsung-fixes-4' of git://github.com/kgene/linux-samsung)
Merging m68k-current/for-linus (4b7cecc m68k/mac: Remove mac_irq_{en,dis}able() wrappers)
Merging powerpc-merge/merge (0c81e4b powerpc/p1023rds: Fix the error of bank-width of nor flash)
Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries)
Merging sparc/master (51ce185 sparc: Hook up process_vm_{readv,writev} syscalls.)
Merging scsi-rc-fixes/master (3ee72ca Merge git://github.com/davem330/net)
Merging net/master (2edcd4c net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.c)
Merging sound-current/for-linus (8128c9f Merge branch 'topic/hda' into for-linus)
Merging pci-current/for-linus (571eba1 PCI: Fix compile errors with PCI_ATS and !PCI_IOV)
$ git reset --hard HEAD^
Merging refs/next/20111102/pci-current
Merging wireless/master (f956c34 iwlwifi: don't perform "echo test" when cmd queue stuck)
Merging driver-core.current/driver-core-linus (094803e Merge branch 'akpm' (Andrew's incoming))
Merging tty.current/tty-linus (094803e Merge branch 'akpm' (Andrew's incoming))
Merging usb.current/usb-linus (094803e Merge branch 'akpm' (Andrew's incoming))
Merging staging.current/staging-linus (094803e Merge branch 'akpm' (Andrew's incoming))
Merging cpufreq-current/fixes (2f84dd7 autofs4: fix debug printk warning uncovered by cleanup)
Merging input-current/for-linus (6ad390a Merge branch 'next' into for-linus)
Merging md-current/for-linus (7fcc7c8 md/raid10: Fix bug when activating a hot-spare.)
Merging audit-current/for-linus (def5754 Audit: remove spaces from audit_log_d_path)
Merging crypto-current/master (fb223c3 crypto: user - Fix rwsem leak in crypto_user)
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (21d41f2 sh: fix the compile error in setup-sh7757.c)
Merging rmobile-current/rmobile-fixes-for-linus (a408bae ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support)
Merging devicetree-current/devicetree/merge (ed5f886 dt: add empty of_alias_get_id() for non-dt builds)
Merging spi-current/spi/merge (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
Merging arm/for-next (49eaa32 Merge branch 'devel-stable' into for-linus)
Merging arm-lpae/for-next (3c31119 fixup! ARM: pgtable: switch to use pgtable-nopud.h)
CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
CONFLICT (content): Merge conflict in arch/arm/kernel/sleep.S
CONFLICT (content): Merge conflict in arch/arm/kernel/head.S
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable-hwdef.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/page.h
Merging arm-soc/for-next (a238f82 Merge branch 'next/devel2' into for-next)
CONFLICT (content): Merge conflict in arch/arm/plat-omap/devices.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Makefile
Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
Merging at91/at91-next (bcdbf16 hw_random: add driver for atmel true hardware random number generator)
CONFLICT (content): Merge conflict in drivers/ata/pata_at91.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging i.MX/for-next (5788f4d Merge branches 'imx-fixes', 'imx-cleanup' and 'imx-features' into master)
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/hardware.h
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/mm.c
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/devices-imx53.h
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/clock-mx51-mx53.c
Merging linux-spec/for-next (5111711 Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux)
Merging omap/for-next (322a8b0 Linux 3.1-rc1)
Merging pxa/for-next (19d6c13 [ARM] pxa/hx4700: actually use platform_lcd driver)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging s5p/for-next (ad97e8e ARM: SAMSUNG: Add lookup of sdhci-s3c clocks using generic names)
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/Kconfig
Merging tegra/for-next (80d0a76 Merge branches 'for-3.2/cleanup' and 'for-3.2/features' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (e114599 Blackfin: add serial TX IRQ in individual platform resource)
Merging c6x/for-linux-next (2141355 C6X: MAINTAINERS)
Merging cris/for-next (ea78f5b CRIS: Update documentation)
Merging quilt/hexagon (8e116d1 Add extra arch overrides to asm-generic/checksum.h)
CONFLICT (add/add): Merge conflict in arch/hexagon/mm/strnlen_user.S
CONFLICT (add/add): Merge conflict in arch/hexagon/mm/pgalloc.c
CONFLICT (add/add): Merge conflict in arch/hexagon/mm/Makefile
CONFLICT (add/add): Merge conflict in arch/hexagon/lib/memset.S
CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/vmlinux.lds.S
CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/vm_vectors.S
CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/vdso.c
CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/kgdb.c
CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/hexagon_ksyms.c
CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/head.S
CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/Makefile
CONFLICT (add/add): Merge conflict in arch/hexagon/include/asm/vdso.h
CONFLICT (add/add): Merge conflict in arch/hexagon/include/asm/timex.h
CONFLICT (add/add): Merge conflict in arch/hexagon/include/asm/Kbuild
CONFLICT (add/add): Merge conflict in arch/hexagon/Makefile
Merging ia64/next (0f6a1c0 Pull misc-3.2 into next branch)
Merging m68k/for-next (4b7cecc m68k/mac: Remove mac_irq_{en,dis}able() wrappers)
Merging m68knommu/for-next (0ada06b m68k: drop unused Kconfig symbols)
CONFLICT (content): Merge conflict in arch/m68k/kernel/Makefile
CONFLICT (add/add): Merge conflict in arch/m68k/Kconfig.devices
CONFLICT (add/add): Merge conflict in arch/m68k/Kconfig.bus
Merging microblaze/next (094803e Merge branch 'akpm' (Andrew's incoming))
Merging mips/mips-for-linux-next (3ba1e54 MIPS: O32: Provide definition of registers ta0 .. ta3.)
CONFLICT (content): Merge conflict in sound/mips/Kconfig
CONFLICT (content): Merge conflict in drivers/video/Kconfig
CONFLICT (content): Merge conflict in drivers/mmc/host/au1xmmc.c
CONFLICT (content): Merge conflict in drivers/ide/Kconfig
CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/db1x00/platform.c
Merging openrisc/for-upstream (b6fd41e Linux 3.1-rc6)
Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls)
Merging powerpc/next (7680057 powerpc: Don't try OPAL takeover on old 970 blades)
CONFLICT (content): Merge conflict in drivers/tty/serial/8250.c
CONFLICT (content): Merge conflict in arch/powerpc/kernel/udbg.c
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/udbg.h
CONFLICT (modify/delete): arch/powerpc/configs/40x/hcu4_defconfig deleted in powerpc/next and modified in HEAD. Version HEAD of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
$ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
Merging 4xx/next (9fcd768 powerpc/40x: Remove obsolete HCU4 board)
Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries)
Merging galak/next (1661e5b powerpc/cpm: Clear muram before it is in use.)
Merging s390/features (0d7c7ff [S390] add support for physical memory > 4TB)
Merging sh/sh-latest (b9a3acf Merge branch 'sh/stable-updates' into sh-latest)
Merging rmobile/rmobile-latest (b58c580 Merge branch 'rmobile-fixes-for-linus' into rmobile-latest)
Merging sparc-next/master (3ee72ca Merge git://github.com/davem330/net)
Merging tile/master (0124538 nfs: fix a couple of minor portability issues)
CONFLICT (content): Merge conflict in arch/tile/lib/atomic_asm_32.S
CONFLICT (content): Merge conflict in arch/tile/kernel/intvec_32.S
Merging unicore32/unicore32 (10967fd arch/unicore32: do not use EXTRA_AFLAGS or EXTRA_CFLAGS)
Merging xtensa/master (29aced6 xtensa: remove defining register numbers)
Merging ceph/for-next (3395734 libceph: fix double-free of page vector)
Merging cifs/master (9ef5992 cifs: Assume passwords are encoded according to iocharset (try #2))
Merging configfs/linux-next (420118c configfs: Rework configfs_depend_item() locking and make lockdep happy)
Merging ecryptfs/next (985ca0e ecryptfs: Make inode bdi consistent with superblock bdi)
Merging ext3/for_next (ed47a7d udf: Cleanup metadata flags handling)
Merging ext4/dev (f2a4452 jbd2: Unify log messages in jbd2 code)
Merging fatfs/master (710d440 fat: fat16 support maximum 4GB file/vol size as WinXP or 7.)
Merging fuse/for-next (c2183d1 fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message)
Merging gfs2/master (809a4fa GFS2: Move readahead of metadata during deallocation into its own function)
CONFLICT (content): Merge conflict in fs/gfs2/file.c
Merging hfsplus/for-next (6596528 hfsplus: ensure bio requests are not smaller than the hardware sectors)
Merging jfs/next (1c8007b jfs: flush journal completely before releasing metadata inodes)
Merging logfs/master (51b3089 Merge branch 'master' of github.com:prasad-joshi/logfs)
CONFLICT (content): Merge conflict in fs/logfs/file.c
Merging nfs/linux-next (e414966 NFS: Remove no-op less-than-zero checks on unsigned variables.)
Merging nfsd/nfsd-next (fc0d14f nfsd4: typo logical vs bitwise negate in nfsd4_decode_share_access)
Merging nilfs2/for-next (93ee7a9 Linux 3.1-rc2)
Merging ocfs2/linux-next (c849cc2 ocfs2: make direntry invalid when deleting it)
CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (7657cac Squashfs: Add an option to set dev block size to 4K)
Merging v9fs/for-next (14211d0 9p: fix 9p.txt to advertise msize instead of maxdata)
Merging ubifs/linux-next (a7fb948 UBI: do not link debug messages when debugging is disabled)
Merging xfs/master (9e4c109 xfs: add AIL pushing tracepoints)
Merging vfs/for-next (206b1d0 Fix POSIX ACL permission check)
Merging vfs-scale/vfs-scale-working (32385c7 kernel: fix hlist_bl again)
Merging pci/linux-next (6f3baa2 PCI: Fix PRI and PASID consistency)
$ git reset --hard HEAD^
Merging refs/next/20111102/pci
Merging hid/for-next (31dced4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging quilt/i2c (839d881 Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging)
Merging bjdooks-i2c/next-i2c (f8420b7 fixup merge)
CONFLICT (add/add): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c
Merging quilt/jdelvare-hwmon (a1933c5 hwmon: Use i2c_smbus_{read,write}_word_swapped)
Merging hwmon-staging/hwmon-next (c5794cf hwmon: (w83627ehf) Better fix for negative temperature values)
Merging quilt/kernel-doc (b814f03 Documentation/PCI/pci.txt: fix a reference doc name)
CONFLICT (content): Merge conflict in Documentation/PCI/pci.txt
Merging docs/docs-move (c6f211c Merge ra.kernel.org:/pub/scm/linux/kernel/git/rdunlap/linux-docs into docs-move)
Merging v4l-dvb/master (76ba028 Merge /home/v4l/v4l/patchwork)
CONFLICT (content): Merge conflict in drivers/staging/Makefile
Merging kbuild/for-next (57b742f Merge branch 'kbuild/kbuild' into kbuild/for-next)
CONFLICT (content): Merge conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (a0da191 pata_efar: fix register naming used in efar_set_piomode())
Merging infiniband/for-next (504255f Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'fdr', 'ipath', 'ipoib', 'misc', 'mlx4', 'misc', 'nes', 'qib' and 'xrc' into for-next)
Merging acpi/acpi (38c0a0c Merge branches 'apei', 'bz-13195' and 'doc' into acpi)
Merging idle-test/idle-test (a0bfa13 cpuidle: stop depending on pm_idle)
Merging powertools/tools-test (d30c4b7 tools/power turbostat: fit output into 80 columns on snb-ep)
Merging cpupowerutils/master (498ca79 cpupower: use man(1) when calling "cpupower help subcommand")
Merging ieee1394/for-next (a572e68 firewire: ohci: fix isochronous DMA synchronization)
Merging ubi/linux-next (93ee7a9 Linux 3.1-rc2)
Merging dlm/next (c3b92c8 Linux 3.1)
Merging swiotlb/master (25b84fa swiotlb: Export io_tlb_nslabs as swiotlb_nslabs and use it.)
CONFLICT (content): Merge conflict in drivers/xen/swiotlb-xen.c
Merging ibft/master (f1b1e06 iscsi-ibft: Fix compile warning introduced by 'iscsi_ibft: iscsi_ibft_find unused variable i')
Merging scsi/master (99a700b [SCSI] mv_sas: OCZ RevoDrive3 & zDrive R4 support)
Merging target-updates/for-next (2235007 target: add back error handling in transport_complete_task)
Merging target-merge/for-next-merge (e0d85e5 ib_srpt: Initial SRP Target merge for v3.2-rc1)
Merging slave-dma/next (4598fc2 dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle)
Merging async_tx/next (21ef4b8 dmaengine: use DEFINE_IDR for static initialization)
Merging net-next/master (8b3408f dp83640: free packet queues on remove)
Merging wireless-next/master (8b3408f dp83640: free packet queues on remove)
Merging bluetooth/master (693ff2d Bluetooth: Fix hidp_get_connection())
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_sock.c
Merging mtd/master (3f30310 Merge git://git.infradead.org/mtd-2.6)
Merging l2-mtd/master (48e546b mtd: tests: annotate as DANGEROUS in Kconfig)
CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
CONFLICT (modify/delete): arch/arm/mach-at91/board-usb-a9260.c deleted in HEAD and modified in l2-mtd/master. Version l2-mtd/master of arch/arm/mach-at91/board-usb-a9260.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9m10g45ek.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9g20ek.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-rm9200dk.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-neocore926.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-afeb-9260v1.c
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c
Merging crypto/master (ea8bdfc crypto: user - Add dependency on NET)
Merging sound/for-next (0a842b6 Merge branch 'fix/hda' into for-next)
Merging sound-asoc/for-next (86f14df ASoC: Update git repository URL)
Merging cpufreq/next (5aace58 [CPUFREQ] ARM Exynos4210 PM/Suspend compatibility with different bootloaders)
Merging quilt/rr (dfb79dc module: Enable dynamic debugging regardless of taint)
Merging input/next (fb6c721 Input: tca8418_keypad - initial driver release)
Merging input-mt/next (02f8c6a Linux 3.0)
Merging lsm/for-next (ca05a99 capabilities: remain source compatible with 32-bit raw legacy capability support.)
Merging block/for-next (a2da998 Merge branch 'for-3.2/core' into for-next)
CONFLICT (content): Merge conflict in drivers/staging/zram/zram_drv.c
CONFLICT (content): Merge conflict in drivers/md/raid5.c
CONFLICT (content): Merge conflict in drivers/md/raid10.c
CONFLICT (content): Merge conflict in drivers/md/raid1.c
CONFLICT (content): Merge conflict in drivers/md/raid0.c
CONFLICT (content): Merge conflict in drivers/md/multipath.c
CONFLICT (content): Merge conflict in drivers/md/md.h
CONFLICT (content): Merge conflict in drivers/md/md.c
CONFLICT (content): Merge conflict in drivers/md/linear.c
CONFLICT (content): Merge conflict in drivers/md/faulty.c
Merging quilt/device-mapper (0daefd7 When devices in a RAID array are not in-sync, they are supposed to be reported as such in the status output as an 'a' character, which means "alive, but not in-sync". But when the entire array is rebuilt 'A' is being used, which is incorrect. This patch corrects this to 'a'.)
CONFLICT (add/add): Merge conflict in Documentation/device-mapper/thin-provisioning.txt
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (74411c0 smc91c92_cs.c: fix bogus compiler warning)
Merging battery/master (85b5fbf power_supply: Fix sysfs format warning)
Merging mmc/mmc-next (d517455 mmc: omap_hsmmc: fix missing parenthesis in pr_info)
Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack())
Merging slab/for-next (e24daf8 Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (6e86841 Linux 2.6.27-rc1)
Merging md/for-next (e0b361a Merge branch 'block-3.1' into for-next)
Merging mfd/for-next (b958f7a mfd: Fix missing abx500 header file updates)
CONFLICT (content): Merge conflict in drivers/mfd/wm831x-spi.c
CONFLICT (content): Merge conflict in arch/arm/mach-u300/include/mach/irqs.h
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3beagle.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-mx31moboard.c
Merging hdlc/hdlc-next (4a6908a Linux 2.6.28)
Merging drm/drm-next (1717c0e Revert "drm/ttm: add a way to bo_wait for either the last read or last write")
Merging fbdev/fbdev-next (b57287b video: platinumfb: Add __devexit_p at necessary place)
Merging viafb/viafb-next (4ce36bb viafb: replace strict_strtoul to kstrto* and check return value)
Merging omap_dss2/for-next (3e28189 OMAPDSS: picodlp: add missing #include <linux/module.h>)
Merging regulator/for-next (89efed4 regulator: max8649 Convert max8649 to use regmap api)
Merging security/next (59df316 TOMOYO: Fix interactive judgment functionality.)
Merging selinux/master (ded5098 SELinux: skip file_name_trans_write() when policy downgraded.)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/linux-next (134edca Merge branch 'fixes' into linux-next)
Merging bdev/master (feaf384 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (1abb4ba Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu/fault-reporting' and 'api/iommu-ops-per-bus' into next)
Merging cputime/cputime (f611671 [S390] cputime: add sparse checking and cleanup)
CONFLICT (content): Merge conflict in kernel/sched_stats.h
CONFLICT (content): Merge conflict in include/asm-generic/cputime.h
CONFLICT (content): Merge conflict in fs/proc/stat.c
Merging osd/linux-next (dde406e pnfs-obj: Support for RAID5 read-4-write interface.)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging nommu/master (0ce790e Linux 2.6.39-rc1)
Merging trivial/for-next (59e5253 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial)
Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path)
Merging pm/linux-next (a7521c1 PM / QoS: Remove redundant check)
Merging apm/for-next (73692d9 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared)
Merging irda/for-next (94d57c4 enic: Update MAINTAINERS)
Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver)
Merging edac-amd/for-next (1f6189e amd64_edac: Cleanup return type of amd64_determine_edac_cap())
Merging devicetree/devicetree/next (ae97159 of_mdio: Don't phy_scan_fixups() twice)
Merging spi/spi/next (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
Merging gpio/gpio/next (d92ef29 h8300: Move gpio.h to gpio-internal.h)
Merging tip/auto-latest (e471db8 Merge branch 'perf/core' into auto-latest)
CONFLICT (content): Merge conflict in drivers/char/random.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/amd.c
Merging rcu/rcu/next (afe24b1 rcu: Move propagation of ->completed from rcu_start_gp() to rcu_report_qs_rsp())
Merging kmemleak/kmemleak (614d29d kmemleak: Handle percpu memory allocation)
Merging kvm/kvm-updates/3.2 (a3e06bb KVM: emulate lapic tsc deadline timer for guest)
Merging oprofile/for-next (4167ab9 Merge branch 'core' of git://amd64.org/linux/rric into perf/core)
Merging xen/upstream/xen (ec8161f Merge branch 'upstream/microcode' into upstream/xen)
CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
Merging xen-two/linux-next (9d5ae84 Merge branch 'stable/vmalloc-3.2' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (bc499f9 percpu: rename pcpu_mem_alloc to pcpu_mem_zalloc)
Merging workqueues/for-next (9c5a2ba workqueue: separate out drain_workqueue() from destroy_workqueue())
Merging sfi/sfi-test (5b026c4 SFI: use ioremap_cache() instead of ioremap())
Merging asm-generic/next (35dbc0e asm-generic/io.h: allow people to override individual funcs)
Merging drivers-x86/linux-next (15b956a acer-wmi: support Lenovo ideapad S205 wifi switch)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (c2f5631 sysctl: remove impossible condition check)
Merging namespace/master (7e05c93 proc: Fix the proc access checks to namespace files.)
Merging regmap/for-next (a084481 regmap: Prepare LZO cache for variable block sizes)
Merging driver-core/driver-core-next (094803e Merge branch 'akpm' (Andrew's incoming))
Merging tty/tty-next (094803e Merge branch 'akpm' (Andrew's incoming))
Merging usb/usb-next (094803e Merge branch 'akpm' (Andrew's incoming))
Merging staging/staging-next (094803e Merge branch 'akpm' (Andrew's incoming))
Merging bkl-config/config (4ba8216 BKL: That's all, folks)
Merging tmem/tmem (665c1e6 mm: cleancache: Use __read_mostly as appropiate.)
CONFLICT (content): Merge conflict in mm/swapfile.c
Merging writeback/writeback-for-next (ea7bf1d Merge branch 'requeue-io-wait' into writeback-for-next)
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/hwspinlock.c
Merging pinctrl/for-next (ab872c8 pinctrl/sirf: fix sirfsoc_get_group_pins prototype)
CONFLICT (content): Merge conflict in arch/arm/mach-u300/core.c
CONFLICT (content): Merge conflict in arch/arm/mach-u300/Kconfig
Merging moduleh/for-sfr (67b8499 Revert "tracing: Include module.h in define_trace.h")
CONFLICT (content): Merge conflict in include/linux/dmaengine.h
CONFLICT (modify/delete): drivers/mfd/ab3550-core.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/mfd/ab3550-core.c left in tree.
CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/dibx000_common.c
$ git rm -f drivers/mfd/ab3550-core.c
Applying: arm: Add export.h to recently added files for EXPORT_SYMBOL
Applying: powerpc/powernv: include export.h in hvc_opal.h for THIS_MODULE
Applying: drivers/md: change module.h -> export.h in persistent-data/dm-*
Applying: device-mapper: dm-bufio.c needs to include module.h
Applying: device-mapper: using EXPORT_SYBOL in dm-space-map-checker.c needs export.h
Merging kvmtool/master (3b08ed0 config: Add 'make kvmconfig')
CONFLICT (content): Merge conflict in scripts/kconfig/Makefile
CONFLICT (content): Merge conflict in include/net/9p/9p.h
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: drm: fix kconfig unmet dependency warning
Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: x86: fix mmap random address range
Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map
Applying: vrtc: change its year offset from 1960 to 1972
Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms
Applying: mrst: battery fixes
Applying: drivers/power/intel_mid_battery.c: fix build
Applying: x86,mrst: add mapping for bma023
Applying: arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
Applying: arch/x86/kernel/ptrace.c: quiet sparse noise
Applying: arch/x86/mm/pageattr.c: quiet sparse noise; local functions should be static
Applying: x86: tlb flush avoid superflous leave_mm()
Applying: x86: reduce clock calibration time during slave cpu startup
Applying: x86-reduce-clock-calibration-time-during-slave-cpu-startup-fix
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: arm, exec: remove redundant set_fs(USER_DS)
Applying: audit: always follow va_copy() with va_end()
Applying: btrfs: don't dereference extent_mapping if NULL
Applying: ceph/mds_client.c: quiet sparse noise
Applying: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
Applying: devtmpfsd: fix task state handling
Applying: drivers/gpu/vga/vgaarb.c: add missing kfree
Applying: drm: avoid switching to text console if there is no panic timeout
Applying: hrtimers: Special-case zero length sleeps
Applying: ia64, exec: remove redundant set_fs(USER_DS)
Applying: brlocks/lglocks: clean up code
Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes
Applying: ipc/mqueue: cleanup definition names and locations
Applying: ipc/mqueue: switch back to using non-max values on create
Applying: ipc/mqueue: enforce hard limits
Applying: ipc/mqueue: update maximums for the mqueue subsystem
Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-fix
Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes
Applying: unicore32, exec: remove redundant set_fs(USER_DS)
Applying: drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt()
Applying: debugobjects: extend debugobjects to assert that an object is initialized
Applying: kernel/timer.c: use debugobjects to catch deletion of uninitialized timers
Applying: ext4: use proper little-endian bitops
Applying: ocfs2: avoid unaligned access to dqc_bitmap
Applying: parisc, exec: remove redundant set_fs(USER_DS)
Applying: drivers/firmware/dmi_scan.c: make dmi_name_in_vendors more focused
Applying: scsi: fix a header to include linux/types.h
Applying: drivers/scsi/megaraid.c: fix sparse warnings
Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()
Applying: drivers/scsi/osd/osd_uld.c: use ida_simple_get() to handle id
Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user()
Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock
Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements
Applying: loop: prevent information leak after failed read
Applying: loop: cleanup set_status interface
Applying: loop-cleanup-set_status-interface-checkpatch-fixes
Applying: cciss: auto engage SCSI mid layer at driver load time
Applying: block: avoid unnecessary plug list flush
Applying: block: add missed trace_block_plug
Applying: include/linux/bio.h: use a static inline function for bio_integrity_clone()
Applying: bio: change some signed vars to unsigned
Applying: paride: fix potential information leak in pg_read()
Applying: slab: add taint flag outputting to debug paths.
Applying: slub: add taint flag outputting to debug paths
Applying: drivers/tty/serial/pch_uart.c: add console support
Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
Applying: vmscan: fix initial shrinker size handling
Applying: vmscan: use atomic-long for shrinker batching
Applying: vmscan-use-atomic-long-for-shrinker-batching-fix
Applying: vmscan: promote shared file mapped pages
Applying: vmscan: activate executable pages after first usage
Applying: mm: add free_hot_cold_page_list() helper
Applying: mm: fix page-faults detection in swap-token logic
Applying: mm: add extra free kbytes tunable
Applying: mm-add-extra-free-kbytes-tunable-update
Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
Applying: mm: add vm_area_add_early()
Applying: selinuxfs: remove custom hex_to_bin()
Applying: include/linux/security.h: fix security_inode_init_security() arg
Applying: hpet: factor timer allocate from open
Applying: intel_idle: fix API misuse
Applying: intel_idle: disable auto_demotion for hotplugged CPUs
Applying: poll: add poll_requested_events() function
Applying: lib/crc: add slice by 8 algorithm to crc32.c
Applying: lib-crc-add-slice-by-8-algorithm-to-crc32c-fix
Applying: epoll: limit paths
Applying: init/do_mounts_rd.c: fix ramdisk identification for padded cramfs
Applying: oprofilefs: handle zero-length writes
Applying: cgroups: add res_counter_write_u64() API
Applying: cgroups: new resource counter inheritance API
Applying: cgroups: add previous cgroup in can_attach_task/attach_task callbacks
Applying: cgroups: new cancel_attach_task() subsystem callback
Applying: cgroups: ability to stop res charge propagation on bounded ancestor
Applying: cgroups: add res counter common ancestor searching
Applying: res_counter: allow charge failure pointer to be null
Applying: cgroups: pull up res counter charge failure interpretation to caller
Applying: cgroups: allow subsystems to cancel a fork
Applying: cgroups: add a task counter subsystem
Applying: cgroups: ERR_PTR needs err.h
Applying: proc: force dcache drop on unauthorized access
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: fs/direct-io.c: salcuate fs_count correctly in get_more_blocks()
Applying: vfs: cache request_queue in struct block_device
Applying: dio: optimize cache misses in the submission path
Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes
Applying: dio: using prefetch requires including prefetch.h
Applying: ramoops: update parameters only after successful init
Merging akpm (11a2f1f ramoops: update parameters only after successful init)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the crypto-current tree
From: Herbert Xu @ 2011-11-03 6:16 UTC (permalink / raw)
To: Steffen Klassert
Cc: Luis Henriques, Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20111103055824.GC22141@secunet.com>
On Thu, Nov 03, 2011 at 06:58:24AM +0100, Steffen Klassert wrote:
> On Thu, Nov 03, 2011 at 10:39:36AM +1100, Herbert Xu wrote:
> > On Wed, Nov 02, 2011 at 08:09:13PM +0000, Luis Henriques wrote:
> > >
> > > I'm not sure if this is related, but I am currently unable to build mainline
> > > kernel when disabling CONFIG_NET. This seems to be due to the patch serie:
> > >
> > > http://news.gmane.org/gmane.linux.kernel.cryptoapi/cutoff=6228
> > >
> > > For instance, commit 6ad414fe710d4fd3a8c8c6c2ad8fefcfcc207968 adds a dependency
> > > over function nla_put(), which is only defined when CONFIG_NET is enabled.
> >
> > Indeed, I missed the dependency in the report functions which
> > is built even when CRYPTO_USER is turned off.
> >
> > Does this patch fix the problem for you?
> >
>
> Hm, did you forget to add the patch to the mail?
Probably :)
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 527a857..cdba95c 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -38,6 +38,7 @@ config CRYPTO_ALGAPI
config CRYPTO_ALGAPI2
tristate
+ select NLATTR
config CRYPTO_AEAD
tristate
Cheers,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply related
* Re: linux-next: build failure after merge of the crypto-current tree
From: Steffen Klassert @ 2011-11-03 5:58 UTC (permalink / raw)
To: Herbert Xu; +Cc: Luis Henriques, Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20111102233936.GA10058@gondor.apana.org.au>
On Thu, Nov 03, 2011 at 10:39:36AM +1100, Herbert Xu wrote:
> On Wed, Nov 02, 2011 at 08:09:13PM +0000, Luis Henriques wrote:
> >
> > I'm not sure if this is related, but I am currently unable to build mainline
> > kernel when disabling CONFIG_NET. This seems to be due to the patch serie:
> >
> > http://news.gmane.org/gmane.linux.kernel.cryptoapi/cutoff=6228
> >
> > For instance, commit 6ad414fe710d4fd3a8c8c6c2ad8fefcfcc207968 adds a dependency
> > over function nla_put(), which is only defined when CONFIG_NET is enabled.
>
> Indeed, I missed the dependency in the report functions which
> is built even when CRYPTO_USER is turned off.
>
> Does this patch fix the problem for you?
>
Hm, did you forget to add the patch to the mail?
^ permalink raw reply
* linux-next: manual merge of the kvmtool tree with the kbuild tree
From: Stephen Rothwell @ 2011-11-03 5:31 UTC (permalink / raw)
To: Pekka Enberg
Cc: linux-next, linux-kernel, Sasha Levin, Arnaud Lacombe,
Michal Marek
[-- Attachment #1: Type: text/plain, Size: 1479 bytes --]
Hi all,
Today's linux-next merge of the kvmtool tree got a conflict in
scripts/kconfig/Makefile between commit f597a718296e
("kconfig/streamline_config.pl: directly access LSMOD from the
environment") from the kbuild tree and commit 3b08ed02633d ("config: Add
'make kvmconfig'") from the kvmtool tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc scripts/kconfig/Makefile
index ba573fe,65580c2..0000000
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@@ -33,9 -33,21 +33,13 @@@ silentoldconfig: $(obj)/con
$(Q)mkdir -p include/generated
$< --$@ $(Kconfig)
+ kvmconfig:
+ $(Q)$(CONFIG_SHELL) $(srctree)/scripts/config -e KVMTOOL_TEST_ENABLE
+ @echo 'Kernel configuration modified to run as KVM guest.'
+
-# if no path is given, then use src directory to find file
-ifdef LSMOD
-LSMOD_F := $(LSMOD)
-ifeq ($(findstring /,$(LSMOD)),)
- LSMOD_F := $(objtree)/$(LSMOD)
-endif
-endif
-
-localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
+localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
$(Q)mkdir -p include/generated
- $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
+ $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config
$(Q)if [ -f .config ]; then \
cmp -s .tmp.config .config || \
(mv -f .config .config.old.1; \
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the pci-current tree
From: Stephen Rothwell @ 2011-11-03 5:19 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Randy Dunlap, Paul Gortmaker
In-Reply-To: <20111103143256.216308862667829a1fccfdf2@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 798 bytes --]
Hi all,
On Thu, 3 Nov 2011 14:32:56 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 3 Nov 2011 12:53:25 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the pci-current tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/pci/ats.c:13:26: fatal error: linux/export.h: No such file or directory
> >
> > Caused by commit 571eba1b8aa9 ("PCI: Fix compile errors with PCI_ATS and !
> > PCI_IOV").
>
> I have added that patch as a merge fix where I merge the module.h split
> up tree. (Included below for Paul's benefit.)
Actually, this was already in the moduleh tree. Sorry for the noise.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the pci-current tree
From: Stephen Rothwell @ 2011-11-03 3:32 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Randy Dunlap, Paul Gortmaker
In-Reply-To: <20111103125325.c1e20275e3a68498465b5ddf@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1641 bytes --]
Hi Jesse,
On Thu, 3 Nov 2011 12:53:25 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the pci-current tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/pci/ats.c:13:26: fatal error: linux/export.h: No such file or directory
>
> Caused by commit 571eba1b8aa9 ("PCI: Fix compile errors with PCI_ATS and !
> PCI_IOV").
I have added that patch as a merge fix where I merge the module.h split
up tree. (Included below for Paul's benefit.)
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Mon, 31 Oct 2011 10:31:01 -0700
Subject: [PATCH] PCI: Fix compile errors with PCI_ATS and !PCI_IOV
For linux-next (where the module-split tree is being worked),
drivers/pci/ats.c also needs to include <linux/export.h> to fix build
warnings:
drivers/pci/ats.c:96:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/pci/ats.c:127:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
etc.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
drivers/pci/ats.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/pci/ats.c b/drivers/pci/ats.c
index f727a09..7ec56fb 100644
--- a/drivers/pci/ats.c
+++ b/drivers/pci/ats.c
@@ -10,6 +10,7 @@
* PASID support added by Joerg Roedel <joerg.roedel@amd.com>
*/
+#include <linux/export.h>
#include <linux/pci-ats.h>
#include <linux/pci.h>
--
1.7.7.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
* Re: linux-next: build failure after merge of the pci-current tree
From: Stephen Rothwell @ 2011-11-03 3:22 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Randy Dunlap
In-Reply-To: <20111103125325.c1e20275e3a68498465b5ddf@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 493 bytes --]
Hi Jesse,
On Thu, 3 Nov 2011 12:53:25 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the pci-current tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/pci/ats.c:13:26: fatal error: linux/export.h: No such file or directory
So this affected the pci tree as well. So I have used the pci tree from
next-20111102.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the pci-current tree
From: Stephen Rothwell @ 2011-11-03 2:37 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Randy Dunlap
In-Reply-To: <20111102190436.5b4c805a@jbarnes-desktop>
[-- Attachment #1: Type: text/plain, Size: 503 bytes --]
Hi Jesse,
On Wed, 2 Nov 2011 19:04:36 -0700 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> Oh I thought Randy said this stuff was in -next already... Sorry for
> the trouble.
It is in -next, but merged way after your tree is merged. You can't
depend on stuff in -next in your trees ... This sort of fix needs to be
carried in -next itself until the bits get merged by Linus.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the arm-soc tree with the arm tree
From: David Brown @ 2011-11-03 2:22 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, Linus, Stephen Boyd, linux-next, linux-kernel,
David Brown, Russell King
In-Reply-To: <20111103130924.5811caec6db378f467006fc3@canb.auug.org.au>
On Thu, Nov 03, 2011 at 01:09:24PM +1100, Stephen Rothwell wrote:
> Hi Arnd,
>
> On Tue, 13 Sep 2011 11:55:33 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Sun, 11 Sep 2011 19:18:53 -0700 Stephen Boyd <sboyd@codeaurora.org> wrote:
> > >
> > > The device tree machine description also needs to have the .fixup and
> > > .reserve callbacks added to it so that the device tree machines boot
> > > properly. Perhaps the soc tree needs to pull in Russell's tree at some
> > > point to resolve this subtle logical conflict or when the trees are
> > > merged together someone will need to do an evil merge and add the
> > > callbacks in the merge commit.
> >
> > Ah, right. I have added this merge fixup for today and can carry it as
> > necessary.
>
> I am still applying this patch to the arm-soc merge. I assume that it is
> needed in Linus' tree now.
I can look more into this tomorrow. When I was testing linux-next
last week, the fixups weren't working with device tree anyway, so I
might need to come up with another solution.
The fixups are called with the ATAGS, which aren't available with DT.
The meminfo is passed to the fixup, but it hasn't been initialized
from the old ATAG information, so there isn't anything to fix up.
I think I'm just going to have to convince our bootloader people to
actually pass in the right memory information in the first place.
David
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 13 Sep 2011 11:51:48 +1000
> Subject: [PATCH] arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/arm/mach-msm/board-msm8x60.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
> index 328df27..4ad2afb 100644
> --- a/arch/arm/mach-msm/board-msm8x60.c
> +++ b/arch/arm/mach-msm/board-msm8x60.c
> @@ -153,6 +153,8 @@ MACHINE_END
> #ifdef CONFIG_OF
> /* TODO: General device tree support for all MSM. */
> DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
> + .fixup = msm8x60_fixup,
> + .reserve = msm8x60_reserve,
> .map_io = msm8x60_map_io,
> .init_irq = msm8x60_init_irq,
> .init_machine = msm8x60_dt_init,
> --
> 1.7.5.4
>
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply
* Re: linux-next: manual merge of the arm-soc tree with the arm tree
From: Stephen Rothwell @ 2011-11-03 2:09 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Linus, Stephen Boyd, linux-next, linux-kernel, David Brown,
Russell King
In-Reply-To: <20110913115533.403d4fe6d961ccc8ba9b58b7@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1782 bytes --]
Hi Arnd,
On Tue, 13 Sep 2011 11:55:33 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Sun, 11 Sep 2011 19:18:53 -0700 Stephen Boyd <sboyd@codeaurora.org> wrote:
> >
> > The device tree machine description also needs to have the .fixup and
> > .reserve callbacks added to it so that the device tree machines boot
> > properly. Perhaps the soc tree needs to pull in Russell's tree at some
> > point to resolve this subtle logical conflict or when the trees are
> > merged together someone will need to do an evil merge and add the
> > callbacks in the merge commit.
>
> Ah, right. I have added this merge fixup for today and can carry it as
> necessary.
I am still applying this patch to the arm-soc merge. I assume that it is
needed in Linus' tree now.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Sep 2011 11:51:48 +1000
Subject: [PATCH] arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/arm/mach-msm/board-msm8x60.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index 328df27..4ad2afb 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -153,6 +153,8 @@ MACHINE_END
#ifdef CONFIG_OF
/* TODO: General device tree support for all MSM. */
DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
+ .fixup = msm8x60_fixup,
+ .reserve = msm8x60_reserve,
.map_io = msm8x60_map_io,
.init_irq = msm8x60_init_irq,
.init_machine = msm8x60_dt_init,
--
1.7.5.4
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
* Re: linux-next: build failure after merge of the pci-current tree
From: Jesse Barnes @ 2011-11-03 2:04 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Randy Dunlap
In-Reply-To: <20111103125325.c1e20275e3a68498465b5ddf@canb.auug.org.au>
On Thu, 3 Nov 2011 12:53:25 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Jesse,
>
> After merging the pci-current tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/pci/ats.c:13:26: fatal error: linux/export.h: No such file or directory
>
> Caused by commit 571eba1b8aa9 ("PCI: Fix compile errors with PCI_ATS and !
> PCI_IOV").
>
> You didn't build this, right? :-( linux/export.h does not yet exist in
> Linus' tree ... I have used the pci-current tree from next-20111102 for
> today.
Oh I thought Randy said this stuff was in -next already... Sorry for
the trouble.
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply
* linux-next: build failure after merge of the pci-current tree
From: Stephen Rothwell @ 2011-11-03 1:53 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Randy Dunlap
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
Hi Jesse,
After merging the pci-current tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/pci/ats.c:13:26: fatal error: linux/export.h: No such file or directory
Caused by commit 571eba1b8aa9 ("PCI: Fix compile errors with PCI_ATS and !
PCI_IOV").
You didn't build this, right? :-( linux/export.h does not yet exist in
Linus' tree ... I have used the pci-current tree from next-20111102 for
today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the logfs tree with Linus' tree
From: Jörn Engel @ 2011-11-03 1:25 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Prasad Joshi, linux-next, linux-kernel, Josef Bacik, Al Viro
In-Reply-To: <20111103120257.c0c13ebacc8d245ca75edbf1@canb.auug.org.au>
On Thu, 3 November 2011 12:02:57 +1100, Stephen Rothwell wrote:
> On Wed, 2 Nov 2011 20:00:46 +0100 Jörn Engel <joern@logfs.org> wrote:
> > On Tue, 1 November 2011 14:10:00 +1100, Stephen Rothwell wrote:
> > >
> > > Today's linux-next merge of the logfs tree got a conflict in
> > > fs/logfs/file.c between commit 02c24a82187d ("fs: push i_mutex and
> > > filemap_write_and_wait down into ->fsync() handlers") from Linus' tree
> > > and commit 39da12ef4bbe ("logfs: take write mutex lock during fsync and
> > > sync") from the logfs tree.
> > >
> > > I have no idea what needs to be done here. I fixed it like below to make
> > > it build, but a better fix is needed.
> >
> > From a code perspective your fix below is correct, to the best of my
> > judgement. I'm less sure what to do from a git perspective.
> > Explicitly tell Linus about it in the logfs pull request?
>
> I was concered about the locking order (or if both locks were needed at
> all). And, yes, tell Linus.
Locking order should be fine. Whether both locks are needed is a
valid question. I suspect the answer is yes.
Jörn
--
Simplicity is prerequisite for reliability.
-- Edsger W. Dijkstra
^ permalink raw reply
* Re: ASoC and regmap trees have moved back to kernel.org
From: Stephen Rothwell @ 2011-11-03 1:21 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-next, linux-kernel, alsa-devel
In-Reply-To: <20111102214402.GA31393@sirena.org.uk>
[-- Attachment #1: Type: text/plain, Size: 677 bytes --]
Hi Mark,
On Wed, 2 Nov 2011 21:44:02 +0000 Mark Brown <broonie@opensource.wolfsonmicro.com> wrote:
>
> Please update my git trees in -next to use kernel.org again:
>
> ASoC:
> git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
>
> regmap:
> git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git for-next
I have switched to those now.
> Please leave the regulator tree where it is for now, Liam's kernel.org
> account will hopefully be being restored shortly so he can take that
> over again.
No worries.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: currently missing kernel devel trees
From: Stephen Rothwell @ 2011-11-03 1:18 UTC (permalink / raw)
To: Phillip Lougher; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <CAB3wodfhuucag7QtdToGa5Y-6c9QA3_CMLg1kRHBOeoQRhymjw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 365 bytes --]
Hi Phillip,
On Wed, 2 Nov 2011 17:32:52 +0000 Phillip Lougher <phillip.lougher@gmail.com> wrote:
>
> Can you please update to pull from
>
> git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git master
I have switched to that now.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the logfs tree with Linus' tree
From: Stephen Rothwell @ 2011-11-03 1:02 UTC (permalink / raw)
To: Jörn Engel
Cc: Prasad Joshi, linux-next, linux-kernel, Josef Bacik, Al Viro
In-Reply-To: <20111102190046.GB3485@logfs.org>
[-- Attachment #1: Type: text/plain, Size: 1028 bytes --]
Hi Jörn,
On Wed, 2 Nov 2011 20:00:46 +0100 Jörn Engel <joern@logfs.org> wrote:
>
> On Tue, 1 November 2011 14:10:00 +1100, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the logfs tree got a conflict in
> > fs/logfs/file.c between commit 02c24a82187d ("fs: push i_mutex and
> > filemap_write_and_wait down into ->fsync() handlers") from Linus' tree
> > and commit 39da12ef4bbe ("logfs: take write mutex lock during fsync and
> > sync") from the logfs tree.
> >
> > I have no idea what needs to be done here. I fixed it like below to make
> > it build, but a better fix is needed.
>
> From a code perspective your fix below is correct, to the best of my
> judgement. I'm less sure what to do from a git perspective.
> Explicitly tell Linus about it in the logfs pull request?
I was concered about the locking order (or if both locks were needed at
all). And, yes, tell Linus.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the crypto-current tree
From: Herbert Xu @ 2011-11-02 23:39 UTC (permalink / raw)
To: Luis Henriques
Cc: Stephen Rothwell, linux-next, linux-kernel, Steffen Klassert
In-Reply-To: <20111102200900.GA3454@hades>
On Wed, Nov 02, 2011 at 08:09:13PM +0000, Luis Henriques wrote:
>
> I'm not sure if this is related, but I am currently unable to build mainline
> kernel when disabling CONFIG_NET. This seems to be due to the patch serie:
>
> http://news.gmane.org/gmane.linux.kernel.cryptoapi/cutoff=6228
>
> For instance, commit 6ad414fe710d4fd3a8c8c6c2ad8fefcfcc207968 adds a dependency
> over function nla_put(), which is only defined when CONFIG_NET is enabled.
Indeed, I missed the dependency in the report functions which
is built even when CRYPTO_USER is turned off.
Does this patch fix the problem for you?
Thanks,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply
* ASoC and regmap trees have moved back to kernel.org
From: Mark Brown @ 2011-11-02 21:44 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, alsa-devel
Hi Stephen,
Please update my git trees in -next to use kernel.org again:
ASoC:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
regmap:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git for-next
Please leave the regulator tree where it is for now, Liam's kernel.org
account will hopefully be being restored shortly so he can take that
over again.
Thanks,
Mark
^ permalink raw reply
* Re: linux-next: build failure after merge of the crypto-current tree
From: Luis Henriques @ 2011-11-02 20:09 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Herbert Xu, Steffen Klassert
In-Reply-To: <20111101115851.2e37ac680db78bdba0661691@canb.auug.org.au>
Hi,
In gmane.linux.kernel, you wrote:
> --Signature=_Tue__1_Nov_2011_11_58_51_+1100_R__G+wW+4zIqxa7J
> Content-Type: text/plain; charset=US-ASCII
> Content-Disposition: inline
> Content-Transfer-Encoding: quoted-printable
>
> Hi Herbert,
>
> After merging the crypto-current tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
I'm not sure if this is related, but I am currently unable to build mainline
kernel when disabling CONFIG_NET. This seems to be due to the patch serie:
http://news.gmane.org/gmane.linux.kernel.cryptoapi/cutoff=6228
For instance, commit 6ad414fe710d4fd3a8c8c6c2ad8fefcfcc207968 adds a dependency
over function nla_put(), which is only defined when CONFIG_NET is enabled.
Cheers,
--
Luis Henriques
^ permalink raw reply
* Re: linux-next: manual merge of the logfs tree with Linus' tree
From: Jörn Engel @ 2011-11-02 19:00 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Prasad Joshi, linux-next, linux-kernel, Josef Bacik, Al Viro
In-Reply-To: <20111101141000.3531dbfbf0490c6d3521d6b6@canb.auug.org.au>
On Tue, 1 November 2011 14:10:00 +1100, Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the logfs tree got a conflict in
> fs/logfs/file.c between commit 02c24a82187d ("fs: push i_mutex and
> filemap_write_and_wait down into ->fsync() handlers") from Linus' tree
> and commit 39da12ef4bbe ("logfs: take write mutex lock during fsync and
> sync") from the logfs tree.
>
> I have no idea what needs to be done here. I fixed it like below to make
> it build, but a better fix is needed.
From a code perspective your fix below is correct, to the best of my
judgement. I'm less sure what to do from a git perspective.
Explicitly tell Linus about it in the logfs pull request?
> diff --cc fs/logfs/file.c
> index b548c87,f85d603..0000000
> --- a/fs/logfs/file.c
> +++ b/fs/logfs/file.c
> @@@ -219,20 -219,13 +219,22 @@@ long logfs_ioctl(struct file *file, uns
> }
> }
>
> -int logfs_fsync(struct file *file, int datasync)
> +int logfs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
> {
> struct super_block *sb = file->f_mapping->host->i_sb;
> + struct inode *inode = file->f_mapping->host;
> + int ret;
> +
> + ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
> + if (ret)
> + return ret;
>
> + mutex_lock(&inode->i_mutex);
> + logfs_get_wblocks(sb, NULL, WF_LOCK);
> logfs_write_anchor(sb);
> + logfs_put_wblocks(sb, NULL, WF_LOCK);
> + mutex_unlock(&inode->i_mutex);
> +
> return 0;
> }
>
Jörn
--
You can take my soul, but not my lack of enthusiasm.
-- Wally
^ permalink raw reply
* Re: linux-next: manual merge of the bjdooks-i2c tree with Linus' tree
From: Ben Dooks @ 2011-11-02 17:46 UTC (permalink / raw)
To: Yong Zhang; +Cc: Stephen Rothwell, Ben Dooks, linux-next, linux-kernel
In-Reply-To: <20111102022850.GA5875@zhy>
On Wed, Nov 02, 2011 at 10:28:50AM +0800, Yong Zhang wrote:
> On Wed, Nov 02, 2011 at 12:22:21PM +1100, Stephen Rothwell wrote:
> > Hi Ben,
> >
> > Today's linux-next merge of the bjdooks-i2c tree got a conflict in
> > drivers/i2c/busses/i2c-designware-platdrv.c between commit 4311051c358a
> > ("i2c: irq: Remove IRQF_DISABLED") from Linus' tree and commit
> > f8420b7bf6ce ("fixup merge") from the bjdooks-i2c tree.
> >
> > I fixed it up (by removing the IRQF_DISABLED flag) but this change should
> > probably be sent to Linus as it appears to have been fixed up incorrectly
> > there.
>
> Yeah, we should remove that flag. And that is what commit 4311051c358a
> want to achieve.
Unfortunately there was a merge conflict. I thought it got fixed, but
seems not. I will sort out fixing it later.
--
Large Hadron Colada: A large Pina Colada that makes the universe disappear.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox