* 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
* Re: currently missing kernel devel trees
From: Phillip Lougher @ 2011-11-02 17:32 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <CAB3woddd=1Ps8HR4SPAOQxoxCnGLFDrjRN6KPJUFkpzmACXf4w@mail.gmail.com>
On Fri, Oct 14, 2011 at 2:03 AM, Phillip Lougher
<phillip.lougher@gmail.com> wrote:
>> squashfs
>
> git://gitorious.org/squashfs-linux-next/squashfs-linux-next.git master
>
Can you please update to pull from
git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git master
Thanks
Phillip
^ permalink raw reply
* Re: linux-next: build failure after merge of the watchdog tree
From: Wim Van Sebroeck @ 2011-11-02 16:43 UTC (permalink / raw)
To: Mark Brown, Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20111101120206.GB10029@opensource.wolfsonmicro.com>
Hi Marc, Stephen,
> On Tue, Nov 01, 2011 at 04:37:48PM +1100, Stephen Rothwell wrote:
>
> > drivers/watchdog/wm831x_wdt.c: In function 'wm831x_wdt_start':
> > drivers/watchdog/wm831x_wdt.c:56:40: error: 'struct watchdog_device' has no member named 'priv'
> > drivers/watchdog/wm831x_wdt.c: In function 'wm831x_wdt_stop':
>
> Wim, it looks from this error like you've applied the original version of
> this I sent on 20th July against the then current API, not the updated
> version I sent on 25th July (which was resent on 4th October) after you
> revised the API.
Yes indeed. I know I compile tested your second patch, but with all the changing of systems I screwed up and indeed used the first patch :-(.
Anyway, I corrected it.
Thanks,
Wim.
^ permalink raw reply
* linux-next: Tree for Nov 2
From: Stephen Rothwell @ 2011-11-02 5:54 UTC (permalink / raw)
To: linux-next; +Cc: LKML, Linus
[-- Attachment #1: Type: text/plain, Size: 25642 bytes --]
Hi all,
The linux-next tree on github is no longer being updated and will be
removed soon.
The patch is still absent.
Changes since 20111101:
I reverted a commit from Linus' tree to fix a regression with hvc_console
and added a patch for a network driver build problem.
The crypot-current and crypto trees lost their build failure.
The ext3 tree gained a conflict against Linus' tree.
The bjdooks-i2c tree gained a conflict against Linus' tree.
The sound tree lost its build failure.
The watchdog tree still has its build failure so I used the version from
next-20111025.
The edac tree lost its build failure and conflict.
The tmem tree gained a conflict against Linus' tree.
I dropped some patches from the akpm tree that appeared in Linus' 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/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
Merging fixes/master
Merging kbuild-current/rc-fixes
Merging arm-current/fixes
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/merge
Merging sparc/master
Merging scsi-rc-fixes/master
Merging net/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging arm-lpae/for-next
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
Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
Merging at91/at91-next
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
Merging i.MX/for-next
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
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging xilinx/arm-next
Merging blackfin/for-linus
Merging c6x/for-linux-next
Merging cris/for-next
Merging quilt/hexagon
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
Merging m68k/for-next
Merging m68knommu/for-next
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
Merging mips/mips-for-linux-next
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
Merging parisc/for-next
Merging powerpc/next
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
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc-next/master
Merging tile/master
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
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
CONFLICT (content): Merge conflict in fs/udf/udfdecl.h
Merging ext4/dev
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
CONFLICT (content): Merge conflict in fs/gfs2/file.c
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/file.c
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
Merging omfs/for-next
Merging squashfs/master
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
CONFLICT (add/add): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
CONFLICT (content): Merge conflict in Documentation/PCI/pci.txt
Merging docs/docs-move
Merging v4l-dvb/master
Merging kbuild/for-next
CONFLICT (content): Merge conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig
Merging kconfig/for-next
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/acpi
Merging idle-test/idle-test
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging dlm/next
Merging swiotlb/master
CONFLICT (content): Merge conflict in drivers/xen/swiotlb-xen.c
Merging ibft/master
Merging scsi/master
Merging target-updates/for-next
Merging target-merge/for-next-merge
Merging slave-dma/next
Merging async_tx/next
Merging net-next/master
Merging wireless/master
Merging bluetooth/master
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_sock.c
Merging mtd/master
Merging l2-mtd/master
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
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging input-mt/next
Merging lsm/for-next
Merging block/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
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging mmc/mmc-next
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
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
Merging drm/drm-next
Merging fbdev/fbdev-next
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging regulator/for-next
Merging security/next
Merging selinux/master
Merging lblnet/master
Merging watchdog/linux-next
$ git reset --hard HEAD^
Merging refs/next/20111025/watchdog
Merging bdev/master
Merging dwmw2-iommu/master
Merging iommu/next
Merging cputime/cputime
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
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging pm/linux-next
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging edac/linux_next
Merging edac-amd/for-next
Merging devicetree/devicetree/next
Merging spi/spi/next
Merging gpio/gpio/next
Merging tip/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
Merging kmemleak/kmemleak
Merging kvm/kvm-updates/3.2
Merging oprofile/for-next
Merging xen/upstream/xen
CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
Merging xen-two/linux-next
Merging xen-pvhvm/linux-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging namespace/master
Merging regmap/for-next
Merging driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
Merging staging/staging-next
Merging bkl-config/config
Merging tmem/tmem
CONFLICT (content): Merge conflict in mm/swapfile.c
Merging writeback/writeback-for-next
Merging arm-dt/devicetree/arm-next
Merging hwspinlock/linux-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/hwspinlock.c
Merging pinctrl/for-next
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
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
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: readlinkat: ensure we return ENOENT for the empty pathname for normal lookups
Applying: readlinkat-ensure-we-return-enoent-for-the-empty-pathname-for-normal-lookups-fix
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: drivers/watchdog/w83627hf_wdt.c: implement WDIOC_GETTIMELEFT ioctl support
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: thp: tail page refcounting fix
Applying: powerpc: remove superfluous PageTail checks on the pte gup_fast
Applying: powerpc: get_hugepte() don't put_page() the wrong page
Applying: powerpc: gup_hugepte() avoid to free the head page too many times
Applying: powerpc: gup_hugepte() support THP based tail recounting
Applying: powerpc: gup_huge_pmd() return 0 if pte changes
Applying: s390: gup_huge_pmd() support THP tail recounting
Applying: s390: gup_huge_pmd() return 0 if pte changes
Applying: sparc: gup_pte_range() support THP based tail recounting
Applying: thp: share get_huge_page_tail()
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: binfmt_elf: fix PIE execution with randomization disabled
Applying: ramfs: remove module leftovers
Applying: init/do_mounts_rd.c: fix ramdisk identification for padded cramfs
Applying: oprofilefs: handle zero-length writes
Applying: drivers/rtc/class.c: convert idr to ida and use ida_simple_get()
Applying: rtc: add initial support for mcp7941x parts
Applying: drivers/rtc/rtc-mc13xxx.c: move probe and remove callbacks to .init.text and .exit.text
Applying: minix: describe usage of different magic numbers
Applying: isofs: add readpages support
Applying: hfs: fix hfs_find_init() sb->ext_tree NULL ptr oops
Applying: cgroups: more safe tasklist locking in cgroup_attach_proc
Applying: cgroups: don't attach task to subsystem if migration failed
Applying: cgroup/kmemleak: Annotate alloc_page() for cgroup allocations
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: memcg: rename mem variable to memcg
Applying: memcg: fix oom schedule_timeout()
Applying: memcg: replace ss->id_lock with a rwlock
Applying: memcg: do not expose uninitialized mem_cgroup_per_node to world
Applying: memcg: skip scanning active lists based on individual size
Applying: memcg-skip-scanning-active-lists-based-on-individual-size-fix
Applying: memcg: close race between charge and putback
Applying: memcg: Fix race condition in memcg_check_events() with this_cpu usage
Applying: mm/page_cgroup.c: quiet sparse noise
Applying: cpusets: avoid looping when storing to mems_allowed if one node remains set
Applying: procfs: report EISDIR when reading sysctl dirs in proc
Applying: proc: fix races against execve() of /proc/PID/fd**
Applying: proc-fix-races-against-execve-of-proc-pid-fd-fix
Applying: proc: force dcache drop on unauthorized access
Applying: ipc/sem.c: fix return code race with semop vs. semop +semctl(IPC_RMID)
Applying: ipc/sem.c: handle spurious wakeups
Applying: ipc/sem.c: remove private structures from public header file
Applying: include/linux/sem.h: make sysv_sem empty if SYSVIPC is disabled
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: init: add root=PARTUUID=UUID/PARTNROFF=%d support
Applying: init-add-root=partuuid=uuid-partnroff=%d-support-fix
Applying: drivers/rapidio/rio-scan.c: use discovered bit to test if enumeration is complete
Applying: arch/powerpc/sysdev/fsl_rio.c: release rapidio port I/O region resource if port failed to initialize
Applying: RapidIO: add mport driver for Tsi721 bridge
Applying: RapidIO: Tsi721 driver - fixes for the initial release
Applying: RapidIO: fix potential null deref in rio_setup_device()
Applying: drivers/net/rionet.c: fix ethernet address macros for LE platforms
Applying: RapidIO: documentation update
Applying: sysctl: add support for poll()
Applying: sysctl-add-support-for-poll-fix
Applying: sysctl: make CONFIG_SYSCTL_SYSCALL default to n
Applying: include/linux/dma-mapping.h: add dma_zalloc_coherent()
Applying: pps: default echo function
Applying: pps: new client driver using GPIO
Applying: pps-new-client-driver-using-gpio-fix
Applying: pps gpio client: add missing dependency
Applying: w1: ds2760 and ds2780, use ida for id and ida_simple_get() to get it
Applying: drivers/power/ds2780_battery.c: create central point for calling w1 interface
Applying: drivers/power/ds2780_battery.c: add a nolock function to w1 interface
Applying: drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal
Applying: drivers/w1/w1_int.c: multiple masters used same init_name
Applying: w1: disable irqs in critical section
Applying: drivers/misc/vmw_balloon.c: determine page allocation flag can_sleep outside loop
Applying: drivers/misc/vmw_balloon.c: fix typo in code comment
Applying: aio: allocate kiocbs in batches
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
Applying: net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.c
[master c821cb3] Revert "hvc_console: display printk messages on console."
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (net tree related)
From: David Miller @ 2011-11-02 5:50 UTC (permalink / raw)
To: sfr; +Cc: netdev, linux-next, linux-kernel, eric.dumazet
In-Reply-To: <20111102163708.75d719e765dea20e0c4c5a04@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 2 Nov 2011 16:37:08 +1100
> Subject: [PATCH] net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.c
>
> Commit 9e903e085262 ("net: add skb frag size accessors") used frag_size
> instead of skb_frag_size in this file.
>
> Fixes this build error:
>
> drivers/net/ethernet/xilinx/ll_temac_main.c: In function 'temac_start_xmit':
> drivers/net/ethernet/xilinx/ll_temac_main.c:717:3: error: implicit declaration of function 'frag_size' [-Werror=implicit-function-declaration]
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Applied, thanks!
^ permalink raw reply
* linux-next: build failure after merge of the final tree (net tree related)
From: Stephen Rothwell @ 2011-11-02 5:37 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, Eric Dumazet
[-- Attachment #1: Type: text/plain, Size: 2019 bytes --]
Hi all,
[I thought I had reported this, but it was a similar problem in another
driver.]
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/net/ethernet/xilinx/ll_temac_main.c: In function 'temac_start_xmit':
drivers/net/ethernet/xilinx/ll_temac_main.c:717:3: error: implicit declaration of function 'frag_size' [-Werror=implicit-function-declaration]
Caused by commit 9e903e085262 ("net: add skb frag size accessors").
I have added this patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 2 Nov 2011 16:31:37 +1100
Subject: [PATCH] net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.c
Commit 9e903e085262 ("net: add skb frag size accessors") used frag_size
instead of skb_frag_size in this file.
Fixes this build error:
drivers/net/ethernet/xilinx/ll_temac_main.c: In function 'temac_start_xmit':
drivers/net/ethernet/xilinx/ll_temac_main.c:717:3: error: implicit declaration of function 'frag_size' [-Werror=implicit-function-declaration]
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/net/ethernet/xilinx/ll_temac_main.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 4d1658e..caf3659 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -716,8 +716,8 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
cur_p = &lp->tx_bd_v[lp->tx_bd_tail];
cur_p->phys = dma_map_single(ndev->dev.parent,
skb_frag_address(frag),
- frag_size(frag), DMA_TO_DEVICE);
- cur_p->len = frag_size(frag);
+ skb_frag_size(frag), DMA_TO_DEVICE);
+ cur_p->len = skb_frag_size(frag);
cur_p->app0 = 0;
frag++;
}
--
1.7.7
--
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
* linux-next: manual merge of the tmem tree with Linus' tree
From: Stephen Rothwell @ 2011-11-02 3:53 UTC (permalink / raw)
To: Dan Magenheimer; +Cc: linux-next, linux-kernel, David Rientjes, Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 975 bytes --]
Hi Dan,
Today's linux-next merge of the tmem tree got a conflict in mm/swapfile.c
between commit 43362a4977e3 ("oom: fix race while temporarily setting
current's oom_score_adj") from Linus' tree and commit 6ce5607c1edf ("mm:
frontswap: core swap subsystem hooks and headers") from the tmem 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 mm/swapfile.c
index c9d6540,9d79741..0000000
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@@ -1616,8 -1637,8 +1637,8 @@@ SYSCALL_DEFINE1(swapoff, const char __u
spin_unlock(&swap_lock);
oom_score_adj = test_set_oom_score_adj(OOM_SCORE_ADJ_MAX);
- err = try_to_unuse(type);
+ err = try_to_unuse(type, false, 0); /* force all pages to be unused */
- test_set_oom_score_adj(oom_score_adj);
+ compare_swap_oom_score_adj(OOM_SCORE_ADJ_MAX, oom_score_adj);
if (err) {
/*
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the bjdooks-i2c tree with Linus' tree
From: Yong Zhang @ 2011-11-02 2:28 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Ben Dooks, linux-next, linux-kernel
In-Reply-To: <20111102122221.9040e7a07bb0e3e2c46a5188@canb.auug.org.au>
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.
Thanks,
Yong
^ permalink raw reply
* Re: [PATCH -next] ext4: fix printk format warning in page-io
From: Ted Ts'o @ 2011-11-02 1:59 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, Linus, Andreas Dilger,
linux-ext4, Andrew Morton
In-Reply-To: <4EB08189.2@xenotime.net>
On Tue, Nov 01, 2011 at 04:32:25PM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> Fix printk format warning:
>
> fs/ext4/page-io.c:108:5: warning: format '%d' expects type 'int', but argument 6 has type 'ssize_t'
>
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
> Cc: "Theodore Ts'o" <tytso@mit.edu>
> Cc: Andreas Dilger <adilger.kernel@dilger.ca>
> Cc: linux-ext4@vger.kernel.org
Thanks, I'll get this fixed before I send my pull request.
- Ted
^ permalink raw reply
* linux-next: manual merge of the bjdooks-i2c tree with Linus' tree
From: Stephen Rothwell @ 2011-11-02 1:22 UTC (permalink / raw)
To: Ben Dooks; +Cc: linux-next, linux-kernel, Yong Zhang
[-- Attachment #1: Type: text/plain, Size: 540 bytes --]
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.
--
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
* linux-next: manual merge of the ext3 tree with Linus' tree
From: Stephen Rothwell @ 2011-11-02 0:59 UTC (permalink / raw)
To: Jan Kara; +Cc: linux-next, linux-kernel, Joe Perches
[-- Attachment #1: Type: text/plain, Size: 1518 bytes --]
Hi Jan,
Today's linux-next merge of the ext3 tree got a conflict in
fs/udf/udfdecl.h between commit b9075fa968a0 ("treewide: use __printf not
__attribute__((format(printf,...)))") from Linus' tree and commit
7e273e3b41e3 ("udf: Promote some debugging messages to udf_error") from
the ext3 tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/udf/udfdecl.h
index dc8a8dc,79aae3f..0000000
--- a/fs/udf/udfdecl.h
+++ b/fs/udf/udfdecl.h
@@@ -16,6 -18,21 +18,21 @@@
#define UDF_PREALLOCATE
#define UDF_DEFAULT_PREALLOC_BLOCKS 8
-__attribute__((format(printf, 3, 4)))
-extern void _udf_err(struct super_block *sb, const char *function,
- const char *fmt, ...);
++extern __printf(3, 4) void _udf_err(struct super_block *sb,
++ const char *function,
++ const char *fmt, ...);
+ #define udf_err(sb, fmt, ...) \
+ _udf_err(sb, __func__, fmt, ##__VA_ARGS__)
+
-__attribute__((format(printf, 3, 4)))
-extern void _udf_warn(struct super_block *sb, const char *function,
- const char *fmt, ...);
++extern __printf(3, 4) void _udf_warn(struct super_block *sb,
++ const char *function,
++ const char *fmt, ...);
+ #define udf_warn(sb, fmt, ...) \
+ _udf_warn(sb, __func__, fmt, ##__VA_ARGS__)
+
+ #define udf_info(fmt, ...) \
+ pr_info("INFO " fmt, ##__VA_ARGS__)
+
#undef UDFFS_DEBUG
#ifdef UDFFS_DEBUG
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for Nov 1 (ata/libata-sff.c)
From: Randy Dunlap @ 2011-11-01 23:48 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, Linus, linux-ide@vger.kernel.org, Jeff Garzik
In-Reply-To: <20111101205323.c12f2f940f23febba8ab8989@canb.auug.org.au>
On 11/01/2011 02:53 AM, Stephen Rothwell wrote:
> Hi all,
When ATA_SFF is enabled but ATA_BMDMA is not enabled:
drivers/ata/libata-sff.c: In function 'ata_pci_init_one':
drivers/ata/libata-sff.c:2538:3: error: implicit declaration of function 'ata_pci_bmdma_prepare_host'
drivers/ata/libata-sff.c:2549:40: error: 'ata_bmdma_interrupt' undeclared (first use in this function)
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* [PATCH -next] ext4: fix printk format warning in page-io
From: Randy Dunlap @ 2011-11-01 23:32 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, Linus, Theodore Ts'o, Andreas Dilger,
linux-ext4, Andrew Morton
In-Reply-To: <20111101205323.c12f2f940f23febba8ab8989@canb.auug.org.au>
From: Randy Dunlap <rdunlap@xenotime.net>
Fix printk format warning:
fs/ext4/page-io.c:108:5: warning: format '%d' expects type 'int', but argument 6 has type 'ssize_t'
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Andreas Dilger <adilger.kernel@dilger.ca>
Cc: linux-ext4@vger.kernel.org
---
fs/ext4/page-io.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- next-2011-1101.orig/fs/ext4/page-io.c
+++ next-2011-1101/fs/ext4/page-io.c
@@ -104,7 +104,7 @@ int ext4_end_io_nolock(ext4_io_end_t *io
ext4_msg(inode->i_sb, KERN_EMERG,
"failed to convert unwritten extents to written "
"extents -- potential data loss! "
- "(inode %lu, offset %llu, size %d, error %d)",
+ "(inode %lu, offset %llu, size %zd, error %d)",
inode->i_ino, offset, size, ret);
}
^ permalink raw reply
* [PATCH -next] platform/X86: fix dell-laptop function prototypes
From: Randy Dunlap @ 2011-11-01 21:53 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Linus, Andrew Morton, Matthew Garrett
In-Reply-To: <20111101205323.c12f2f940f23febba8ab8989@canb.auug.org.au>
From: Randy Dunlap <rdunlap@xenotime.net>
Fix build warnings:
drivers/platform/x86/dell-laptop.c:592:13: warning: function declaration isn't a prototype
drivers/platform/x86/dell-laptop.c:599:13: warning: function declaration isn't a prototype
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Matthew Garrett <mjg@redhat.com>
---
drivers/platform/x86/dell-laptop.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- next-2011-1101.orig/drivers/platform/x86/dell-laptop.c
+++ next-2011-1101/drivers/platform/x86/dell-laptop.c
@@ -589,14 +589,14 @@ static const struct backlight_ops dell_o
.update_status = dell_send_intensity,
};
-static void touchpad_led_on()
+static void touchpad_led_on(void)
{
int command = 0x97;
char data = 1;
i8042_command(&data, command | 1 << 12);
}
-static void touchpad_led_off()
+static void touchpad_led_off(void)
{
int command = 0x97;
char data = 2;
^ permalink raw reply
* [PATCH -next] staging: slicoss depends on NET
From: Randy Dunlap @ 2011-11-01 21:43 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, Linus, Greg KH, Andrew Morton, Lior Dotan,
Christopher Harrer
In-Reply-To: <20111101205323.c12f2f940f23febba8ab8989@canb.auug.org.au>
From: Randy Dunlap <rdunlap@xenotime.net>
The slicoss driver uses network interfaces so it should depend
on NET. Fixes the following build errors:
ERROR: "eth_change_mtu" [drivers/staging/slicoss/slicoss.ko] undefined!
ERROR: "eth_validate_addr" [drivers/staging/slicoss/slicoss.ko] undefined!
ERROR: "register_netdev" [drivers/staging/slicoss/slicoss.ko] undefined!
ERROR: "alloc_etherdev_mqs" [drivers/staging/slicoss/slicoss.ko] undefined!
ERROR: "__netif_schedule" [drivers/staging/slicoss/slicoss.ko] undefined!
ERROR: "netif_rx" [drivers/staging/slicoss/slicoss.ko] undefined!
ERROR: "eth_type_trans" [drivers/staging/slicoss/slicoss.ko] undefined!
ERROR: "skb_put" [drivers/staging/slicoss/slicoss.ko] undefined!
ERROR: "skb_pull" [drivers/staging/slicoss/slicoss.ko] undefined!
ERROR: "__alloc_skb" [drivers/staging/slicoss/slicoss.ko] undefined!
ERROR: "free_netdev" [drivers/staging/slicoss/slicoss.ko] undefined!
ERROR: "unregister_netdev" [drivers/staging/slicoss/slicoss.ko] undefined!
ERROR: "consume_skb" [drivers/staging/slicoss/slicoss.ko] undefined!
ERROR: "dev_kfree_skb_irq" [drivers/staging/slicoss/slicoss.ko] undefined!
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Lior Dotan <liodot@gmail.com>
Cc: Christopher Harrer <charrer@alacritech.com>
---
drivers/staging/slicoss/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- next-2011-1101.orig/drivers/staging/slicoss/Kconfig
+++ next-2011-1101/drivers/staging/slicoss/Kconfig
@@ -1,6 +1,6 @@
config SLICOSS
tristate "Alacritech Gigabit IS-NIC support"
- depends on PCI && X86
+ depends on PCI && X86 && NET
default n
help
This driver supports Alacritech's IS-NIC gigabit ethernet cards.
^ permalink raw reply
* Re: linux-next: build failure after merge of the edac tree
From: Mauro Carvalho Chehab @ 2011-11-01 13:00 UTC (permalink / raw)
To: Borislav Petkov
Cc: Stephen Rothwell, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
In-Reply-To: <20111101125454.GA21877@aftab>
Em 01-11-2011 10:54, Borislav Petkov escreveu:
> On Tue, Nov 01, 2011 at 07:58:02AM -0400, Mauro Carvalho Chehab wrote:
>> Sorry, it were caused by a bad merge conflict resolution. The include
>> isn't need anymore.
>>
>> The MAINTAINERS fix is indeed needed.
>>
>>> I have used the version of the edac tree from next-20111025 for today.
>>
>> I'm fixing both issues for tomorrow's next.
>
> Btw, you're sending those to Linus soon, right?
Yes, likely tomorrow, if no surprises at linux-next merge arise.
>
> Thanks.
>
^ permalink raw reply
* Re: linux-next: build failure after merge of the edac tree
From: Borislav Petkov @ 2011-11-01 12:54 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Stephen Rothwell, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
In-Reply-To: <4EAFDECA.3040007@redhat.com>
On Tue, Nov 01, 2011 at 07:58:02AM -0400, Mauro Carvalho Chehab wrote:
> Sorry, it were caused by a bad merge conflict resolution. The include
> isn't need anymore.
>
> The MAINTAINERS fix is indeed needed.
>
> > I have used the version of the edac tree from next-20111025 for today.
>
> I'm fixing both issues for tomorrow's next.
Btw, you're sending those to Linus soon, right?
Thanks.
--
Regards/Gruss,
Boris.
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
GM: Alberto Bozzo
Reg: Dornach, Landkreis Muenchen
HRB Nr. 43632 WEEE Registernr: 129 19551
^ permalink raw reply
* Re: linux-next: build failure after merge of the watchdog tree
From: Mark Brown @ 2011-11-01 12:02 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Wim Van Sebroeck, linux-next, linux-kernel
In-Reply-To: <20111101163748.26d5f1264b56961e36ff0ced@canb.auug.org.au>
On Tue, Nov 01, 2011 at 04:37:48PM +1100, Stephen Rothwell wrote:
> drivers/watchdog/wm831x_wdt.c: In function 'wm831x_wdt_start':
> drivers/watchdog/wm831x_wdt.c:56:40: error: 'struct watchdog_device' has no member named 'priv'
> drivers/watchdog/wm831x_wdt.c: In function 'wm831x_wdt_stop':
Wim, it looks from this error like you've applied the original version of
this I sent on 20th July against the then current API, not the updated
version I sent on 25th July (which was resent on 4th October) after you
revised the API.
^ 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