* Re: linux-next: manual merge of the lblnet tree
From: Paul Moore @ 2008-12-08 22:58 UTC (permalink / raw)
To: James Morris, Casey Schaufler; +Cc: Stephen Rothwell, linux-next, David Howells
In-Reply-To: <alpine.LRH.1.10.0812090815370.6220@tundra.namei.org>
On Monday 08 December 2008 4:16:24 pm James Morris wrote:
> On Mon, 8 Dec 2008, Paul Moore wrote:
> > James, is the security-testing tree rebased regularly or is
> > suitable to back a tree against?
>
> No, it doesn't get rebased.
Okay, experiment time. I think I managed to pull from all the right
spots, merge everything appropriately and end up with a security/
directory that builds so I pushed it back out to the lblnet-2.6_next
tree. I'm not quite sure the proper etiquette here but I had to fix
Casey's patch a bit since it would apply cleanly; Casey if you could
take a look I would appreciate it (it isn't exactly like what Stephen
posted earlier but it is pretty darn close).
> > If so, I can rebase the lblnet-2.6_next tree
> > against security-testing to resolve the conflict ...
>
> Ok, and I can carry your patches in there if necessary.
I would like to figure out to make this work as it is likely to happen
again at some point in the future, but if I can't get it working
quickly I may punt on it and ask you to pull in the patches.
--
paul moore
linux @ hp
^ permalink raw reply
* Re: linux-next: Tree for October 24 - powerpc - build failure with !CONFIG_BLK_DEV_IDEDMA_PMAC
From: Benjamin Herrenschmidt @ 2008-12-08 21:54 UTC (permalink / raw)
To: Kamalesh Babulal
Cc: Bartlomiej Zolnierkiewicz, Sergei Shtylyov, Stephen Rothwell,
linux-next, LKML, linux-ide
In-Reply-To: <1228773216.7101.39.camel@pasglop>
On Tue, 2008-12-09 at 08:53 +1100, Benjamin Herrenschmidt wrote:
> > > Seems like ppc people are either very busy or don't care... Oh well...
>
> Very busy will do it :-) Among others, having a second child is a hit on
> the hacking time !
>
> In any case, I think we should contemplate removing the config option
> alltogether and make DMA support built unconditionally to simplify the
> mess, don't you think ?
Which is just what the patch does .. :-)
So Ack.
Cheers,
Ben.
^ permalink raw reply
* Re: linux-next: Tree for October 24 - powerpc - build failure with !CONFIG_BLK_DEV_IDEDMA_PMAC
From: Benjamin Herrenschmidt @ 2008-12-08 21:53 UTC (permalink / raw)
To: Kamalesh Babulal
Cc: Bartlomiej Zolnierkiewicz, Sergei Shtylyov, Stephen Rothwell,
linux-next, LKML, linux-ide
In-Reply-To: <20081208090549.GA16544@linux.vnet.ibm.com>
> > Seems like ppc people are either very busy or don't care... Oh well...
Very busy will do it :-) Among others, having a second child is a hit on
the hacking time !
In any case, I think we should contemplate removing the config option
alltogether and make DMA support built unconditionally to simplify the
mess, don't you think ?
Cheers,
Ben.
> > From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> > Subject: [PATCH] ide: build-fix for CONFIG_BLK_DEV_IDEDMA_PMAC=n
> >
> > IDE pmac host driver build fails with CONFIG_BLK_DEV_IDEDMA_PMAC=n
> > as reported by Kamalesh:
> >
> > > drivers/ide/pmac.c: In function 'pmac_ide_set_pio_mode':
> > > drivers/ide/pmac.c:527: error: implicit declaration of function 'kauai_lookup_timing'
> > > drivers/ide/pmac.c:527: error: 'shasta_pio_timings' undeclared (first use in this function)
> > > drivers/ide/pmac.c:527: error: (Each undeclared identifier is reported only once
> > > drivers/ide/pmac.c:527: error: for each function it appears in.)
> > > drivers/ide/pmac.c:534: error: 'kauai_pio_timings' undeclared (first use in this function)
> > > drivers/ide/pmac.c: In function 'pmac_ide_do_resume':
> > > drivers/ide/pmac.c:914: error: 'IDE_WAKEUP_DELAY' undeclared (first use in this function)
> > > drivers/ide/pmac.c: At top level:
> > > drivers/ide/pmac.c:1007: error: 'pmac_ide_init_dma' undeclared here (not in a function)
> > > drivers/ide/pmac.c: In function 'pmac_ide_setup_device':
> > > drivers/ide/pmac.c:1107: error: 'IDE_WAKEUP_DELAY' undeclared (first use in this function)
> > > drivers/ide/pmac.c: In function 'pmac_ide_macio_attach':
> > > drivers/ide/pmac.c:1209: error: 'pmac_ide_hwif_t' has no member named 'dma_regs'
> > > drivers/ide/pmac.c:1210: error: 'pmac_ide_hwif_t' has no member named 'dma_regs'
> > > make[2]: *** [drivers/ide/pmac.o] Error 1
> >
> > Fix it by removing the superfluous config option.
>
> Thanks for the patch, it fixes the build failure.
> >
> > Reported-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
> > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> > Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
> > Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> > Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> > ---
> > drivers/ide/Kconfig | 14 +++-----------
> > drivers/ide/pmac.c | 30 +++---------------------------
> > 2 files changed, 6 insertions(+), 38 deletions(-)
> >
> > Index: b/drivers/ide/Kconfig
> > ===================================================================
> > --- a/drivers/ide/Kconfig
> > +++ b/drivers/ide/Kconfig
> > @@ -655,10 +655,12 @@ config BLK_DEV_CELLEB
> >
> > endif
> >
> > +# TODO: BLK_DEV_IDEDMA_PCI -> BLK_DEV_IDEDMA_SFF
> > config BLK_DEV_IDE_PMAC
> > tristate "PowerMac on-board IDE support"
> > depends on PPC_PMAC && IDE=y
> > select IDE_TIMINGS
> > + select BLK_DEV_IDEDMA_PCI
> > help
> > This driver provides support for the on-board IDE controller on
> > most of the recent Apple Power Macintoshes and PowerBooks.
> > @@ -675,16 +677,6 @@ config BLK_DEV_IDE_PMAC_ATA100FIRST
> > CD-ROM on hda. This option changes this to more natural hda for
> > hard disk and hdc for CD-ROM.
> >
> > -config BLK_DEV_IDEDMA_PMAC
> > - bool "PowerMac IDE DMA support"
> > - depends on BLK_DEV_IDE_PMAC
> > - select BLK_DEV_IDEDMA_PCI
> > - help
> > - This option allows the driver for the on-board IDE controller on
> > - Power Macintoshes and PowerBooks to use DMA (direct memory access)
> > - to transfer data to and from memory. Saying Y is safe and improves
> > - performance.
> > -
> > config BLK_DEV_IDE_AU1XXX
> > bool "IDE for AMD Alchemy Au1200"
> > depends on SOC_AU1200
> > @@ -903,7 +895,7 @@ config BLK_DEV_UMC8672
> > endif
> >
> > config BLK_DEV_IDEDMA
> > - def_bool BLK_DEV_IDEDMA_SFF || BLK_DEV_IDEDMA_PMAC || \
> > + def_bool BLK_DEV_IDEDMA_SFF || \
> > BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
> >
> > endif # IDE
> > Index: b/drivers/ide/pmac.c
> > ===================================================================
> > --- a/drivers/ide/pmac.c
> > +++ b/drivers/ide/pmac.c
> > @@ -66,7 +66,6 @@ typedef struct pmac_ide_hwif {
> > struct macio_dev *mdev;
> > u32 timings[4];
> > volatile u32 __iomem * *kauai_fcr;
> > -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
> > /* Those fields are duplicating what is in hwif. We currently
> > * can't use the hwif ones because of some assumptions that are
> > * beeing done by the generic code about the kind of dma controller
> > @@ -74,8 +73,6 @@ typedef struct pmac_ide_hwif {
> > */
> > volatile struct dbdma_regs __iomem * dma_regs;
> > struct dbdma_cmd* dma_table_cpu;
> > -#endif
> > -
> > } pmac_ide_hwif_t;
> >
> > enum {
> > @@ -222,8 +219,6 @@ static const char* model_name[] = {
> > #define KAUAI_FCR_UATA_RESET_N 0x00000002
> > #define KAUAI_FCR_UATA_ENABLE 0x00000001
> >
> > -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
> > -
> > /* Rounded Multiword DMA timings
> > *
> > * I gave up finding a generic formula for all controller
> > @@ -413,8 +408,6 @@ static int pmac_ide_build_dmatable(ide_d
> > static void pmac_ide_selectproc(ide_drive_t *drive);
> > static void pmac_ide_kauai_selectproc(ide_drive_t *drive);
> >
> > -#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
> > -
> > #define PMAC_IDE_REG(x) \
> > ((void __iomem *)((drive)->hwif->io_ports.data_addr + (x)))
> >
> > @@ -584,8 +577,6 @@ pmac_ide_set_pio_mode(ide_drive_t *drive
> > pmac_ide_do_update_timings(drive);
> > }
> >
> > -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
> > -
> > /*
> > * Calculate KeyLargo ATA/66 UDMA timings
> > */
> > @@ -786,7 +777,6 @@ set_timings_mdma(ide_drive_t *drive, int
> > drive->name, speed & 0xf, *timings);
> > #endif
> > }
> > -#endif /* #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC */
> >
> > static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed)
> > {
> > @@ -804,7 +794,6 @@ static void pmac_ide_set_dma_mode(ide_dr
> > tl[0] = *timings;
> > tl[1] = *timings2;
> >
> > -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
> > if (speed >= XFER_UDMA_0) {
> > if (pmif->kind == controller_kl_ata4)
> > ret = set_timings_udma_ata4(&tl[0], speed);
> > @@ -817,7 +806,7 @@ static void pmac_ide_set_dma_mode(ide_dr
> > ret = -1;
> > } else
> > set_timings_mdma(drive, pmif->kind, &tl[0], &tl[1], speed);
> > -#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
> > +
> > if (ret)
> > return;
> >
> > @@ -1008,9 +997,7 @@ static const struct ide_port_info pmac_p
> > .chipset = ide_pmac,
> > .tp_ops = &pmac_tp_ops,
> > .port_ops = &pmac_ide_port_ops,
> > -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
> > .dma_ops = &pmac_dma_ops,
> > -#endif
> > .host_flags = IDE_HFLAG_SET_PIO_MODE_KEEP_DMA |
> > IDE_HFLAG_POST_SET_MODE |
> > IDE_HFLAG_MMIO |
> > @@ -1182,7 +1169,7 @@ pmac_ide_macio_attach(struct macio_dev *
> > pmif->regbase = regbase;
> > pmif->irq = irq;
> > pmif->kauai_fcr = NULL;
> > -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
> > +
> > if (macio_resource_count(mdev) >= 2) {
> > if (macio_request_resource(mdev, 1, "ide-pmac (dma)"))
> > printk(KERN_WARNING "ide-pmac: can't request DMA "
> > @@ -1192,7 +1179,7 @@ pmac_ide_macio_attach(struct macio_dev *
> > pmif->dma_regs = ioremap(macio_resource_start(mdev, 1), 0x1000);
> > } else
> > pmif->dma_regs = NULL;
> > -#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
> > +
> > dev_set_drvdata(&mdev->ofdev.dev, pmif);
> >
> > memset(&hw, 0, sizeof(hw));
> > @@ -1300,9 +1287,7 @@ pmac_ide_pci_attach(struct pci_dev *pdev
> >
> > base = ioremap(rbase, rlen);
> > pmif->regbase = (unsigned long) base + 0x2000;
> > -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
> > pmif->dma_regs = base + 0x1000;
> > -#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
> > pmif->kauai_fcr = base;
> > pmif->irq = pdev->irq;
> >
> > @@ -1434,8 +1419,6 @@ out:
> > return error;
> > }
> >
> > -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
> > -
> > /*
> > * pmac_ide_build_dmatable builds the DBDMA command list
> > * for a transfer and sets the DBDMA channel to point to it.
> > @@ -1723,13 +1706,6 @@ static int __devinit pmac_ide_init_dma(i
> >
> > return 0;
> > }
> > -#else
> > -static int __devinit pmac_ide_init_dma(ide_hwif_t *hwif,
> > - const struct ide_port_info *d)
> > -{
> > - return -EOPNOTSUPP;
> > -}
> > -#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
> >
> > module_init(pmac_ide_probe);
> >
> > �
>
^ permalink raw reply
* Re: linux-next: manual merge of the lblnet tree
From: James Morris @ 2008-12-08 21:16 UTC (permalink / raw)
To: Paul Moore; +Cc: Stephen Rothwell, linux-next, David Howells, Casey Schaufler
In-Reply-To: <200812081441.12338.paul.moore@hp.com>
On Mon, 8 Dec 2008, Paul Moore wrote:
> James, is the security-testing tree rebased regularly or is suitable to
> back a tree against?
No, it doesn't get rebased.
> If so, I can rebase the lblnet-2.6_next tree
> against security-testing to resolve the conflict ...
Ok, and I can carry your patches in there if necessary.
--
James Morris
<jmorris@namei.org>
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree
From: David Miller @ 2008-12-08 20:35 UTC (permalink / raw)
To: greg; +Cc: sfr, linux-next, wangchen
In-Reply-To: <20081208151750.GE19711@kroah.com>
From: Greg KH <greg@kroah.com>
Date: Mon, 8 Dec 2008 07:17:50 -0800
> On Mon, Dec 08, 2008 at 08:34:03PM +1100, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the staging tree got a conflicts in
> > drivers/staging/wlan-ng/p80211netdev.c and
> > drivers/staging/wlan-ng/p80211wext.c between commit
> > 979123d5343b4fdcd4c682745b8a0be9b8fac248 ("staging-p80211: Kill directly
> > reference of netdev->priv") from the net tree and various commits from
> > the staging tree.
> >
> > I fixed it up (see below) and can carry the fixes as necessary. (In the
> > case of the second file, the latter removed the code that the former
> > modified.)
>
> Dave, can you just drop the patch from your queue? This should already
> be fixed up in the -next tree to not use the field you are wanting to
> remove, right? So you shouldn't get any build errors from what I can
> tell.
I'd have to revert, which is ugly, because I tend to never
rebase my tree as too many people depend upon it.
Do you _really_ want me to do that?
Because I have to do allmodconfig test builds _too_, and the build
will fail for me if I do these reverts which really would suck.
^ permalink raw reply
* Re: linux-next: manual merge of the lblnet tree
From: Jean Delvare @ 2008-12-08 20:19 UTC (permalink / raw)
To: Paul Moore; +Cc: Stephen Rothwell, linux-next, Hans de Goede
In-Reply-To: <200812081438.04489.paul.moore@hp.com>
On Mon, 8 Dec 2008 14:38:04 -0500, Paul Moore wrote:
> On Monday 08 December 2008 2:49:57 am Stephen Rothwell wrote:
> > Hi Paul,
> >
> > Today's linux-next merge of the lblnet tree got a conflict in
> > Documentation/feature-removal-schedule.txt between commit
> > 839361440c4cf848dddc5705fa4ac7c25d00dddf ("hwmon: Deprecate the
> > fscher and fscpos drivers") from the jdelvare-hwmon tree and commit
> > d45075ffb96a78c0f7137cfcec9fe816a6d23cfb ("selinux: Deprecate and
> > schedule the removal of the the compat_net functionality") from the
> > lblnet tree.
> >
> > Just overlapping additions. I fixed it up (see below) and can carry
> > it as necessary.
>
> Thanks. Other than pulling in the jdelvare-hwmon tree or moving the
> entry somewhere else in the file (not solving anything, just
> moving/delaying the problem) I'm not sure how to resolve the conflict.
> If you don't mind carrying your fix-up patch until the merge window
> opens that sounds like the best approach to me.
All in all I don't think it really matters.
Documentation/feature-removal-schedule.txt will always have conflicts
by design, but it's only a text file and if it isn't totally up-to-date
in linux-next, I doubt anybody cares. So I would vote for permanently
ignoring conflicts to this file.
--
Jean Delvare
^ permalink raw reply
* Re: linux-next: manual merge of the lblnet tree
From: Paul Moore @ 2008-12-08 19:41 UTC (permalink / raw)
To: Stephen Rothwell, James Morris; +Cc: linux-next, David Howells, Casey Schaufler
In-Reply-To: <20081208190708.1d2c37ec.sfr@canb.auug.org.au>
On Monday 08 December 2008 3:07:08 am Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the lblnet tree got a conflicts in
> security/smack/smack_lsm.c and security/smack/smackfs.c between
> commits 86a264abe542cfececb4df129bc45a0338d8cdb9 ("CRED: Wrap
> current->cred and a few other accessors") and
> d84f4f992cbd76e8f39c488cf0c5d123843923b1 ("CRED: Inaugurate COW
> credentials") from the security-testing tree and commit
> d936691ab765fbac809e9a05c7f0c36ce2c2119e ("smack: Add support for
> unlabeled network hosts and networks") from the lblnet tree.
>
> I fixed it up (see below) and can carry the fixes as necessary.
Thanks Stephen. It sounds like both David and Casey are okay with the
changes so I have no arguments with the fix-up patch.
James, is the security-testing tree rebased regularly or is suitable to
back a tree against? If so, I can rebase the lblnet-2.6_next tree
against security-testing to resolve the conflict ...
--
paul moore
linux @ hp
^ permalink raw reply
* Re: linux-next: manual merge of the lblnet tree
From: Paul Moore @ 2008-12-08 19:38 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Hans de Goede, Jean Delvare
In-Reply-To: <20081208184957.ae6f1726.sfr@canb.auug.org.au>
On Monday 08 December 2008 2:49:57 am Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the lblnet tree got a conflict in
> Documentation/feature-removal-schedule.txt between commit
> 839361440c4cf848dddc5705fa4ac7c25d00dddf ("hwmon: Deprecate the
> fscher and fscpos drivers") from the jdelvare-hwmon tree and commit
> d45075ffb96a78c0f7137cfcec9fe816a6d23cfb ("selinux: Deprecate and
> schedule the removal of the the compat_net functionality") from the
> lblnet tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry
> it as necessary.
Thanks. Other than pulling in the jdelvare-hwmon tree or moving the
entry somewhere else in the file (not solving anything, just
moving/delaying the problem) I'm not sure how to resolve the conflict.
If you don't mind carrying your fix-up patch until the merge window
opens that sounds like the best approach to me.
--
paul moore
linux @ hp
^ permalink raw reply
* Re: linux-next: ide tree build failure
From: Borislav Petkov @ 2008-12-08 17:49 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: Stephen Rothwell, linux-next
In-Reply-To: <200812081810.59270.bzolnier@gmail.com>
On Mon, Dec 8, 2008 at 6:10 PM, Bartlomiej Zolnierkiewicz
<bzolnier@gmail.com> wrote:
> On Monday 08 December 2008, Stephen Rothwell wrote:
>> Hi Bart,
>>
>> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>>
>> drivers/built-in.o: In function `.ide_cd_do_request':
>> ide-cd.c:(.text+0x11a97c): undefined reference to `.ide_cd_get_xferlen'
>> drivers/built-in.o:(.toc1+0x83b8): undefined reference to `ide_cd_expiry'
>
> I see, BLK_DEV_IDECD needs to select IDE_ATAPI now. I updated
> ide-atapi-accomodate-transfer-length-calculation-for-ide-cd.patch
> accordingly so ppc64_defconfing should build fine again.
Ups, sorry for that one.
--
Regards/Gruss,
Boris
^ permalink raw reply
* Re: linux-next: ide tree build failure
From: Bartlomiej Zolnierkiewicz @ 2008-12-08 17:10 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Borislav Petkov
In-Reply-To: <20081208131609.c6e0fd31.sfr@canb.auug.org.au>
On Monday 08 December 2008, Stephen Rothwell wrote:
> Hi Bart,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> drivers/built-in.o: In function `.ide_cd_do_request':
> ide-cd.c:(.text+0x11a97c): undefined reference to `.ide_cd_get_xferlen'
> drivers/built-in.o:(.toc1+0x83b8): undefined reference to `ide_cd_expiry'
I see, BLK_DEV_IDECD needs to select IDE_ATAPI now. I updated
ide-atapi-accomodate-transfer-length-calculation-for-ide-cd.patch
accordingly so ppc64_defconfing should build fine again.
Thanks,
Bart
^ permalink raw reply
* Re: linux-next: manual merge of the lblnet tree
From: Casey Schaufler @ 2008-12-08 16:09 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Paul Moore, linux-next, David Howells, James Morris, casey
In-Reply-To: <20081208190708.1d2c37ec.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the lblnet tree got a conflicts in
> security/smack/smack_lsm.c and security/smack/smackfs.c between commits
> 86a264abe542cfececb4df129bc45a0338d8cdb9 ("CRED: Wrap current->cred and a
> few other accessors") and d84f4f992cbd76e8f39c488cf0c5d123843923b1
> ("CRED: Inaugurate COW credentials") from the security-testing tree and
> commit d936691ab765fbac809e9a05c7f0c36ce2c2119e ("smack: Add support for
> unlabeled network hosts and networks") from the lblnet tree.
>
> I fixed it up (see below) and can carry the fixes as necessary.
>
I don't see any problems with the changes. Thank you.
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree
From: Greg KH @ 2008-12-08 15:17 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Wang Chen, David S. Miller
In-Reply-To: <20081208203403.320ea0bb.sfr@canb.auug.org.au>
On Mon, Dec 08, 2008 at 08:34:03PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflicts in
> drivers/staging/wlan-ng/p80211netdev.c and
> drivers/staging/wlan-ng/p80211wext.c between commit
> 979123d5343b4fdcd4c682745b8a0be9b8fac248 ("staging-p80211: Kill directly
> reference of netdev->priv") from the net tree and various commits from
> the staging tree.
>
> I fixed it up (see below) and can carry the fixes as necessary. (In the
> case of the second file, the latter removed the code that the former
> modified.)
Dave, can you just drop the patch from your queue? This should already
be fixed up in the -next tree to not use the field you are wanting to
remove, right? So you shouldn't get any build errors from what I can
tell.
thanks,
greg k-h
^ permalink raw reply
* Re: linux-next: staging tree build failure
From: Greg KH @ 2008-12-08 15:08 UTC (permalink / raw)
To: Dmitry Baryshkov; +Cc: Stephen Rothwell, linux-next
In-Reply-To: <493CF83A.7020908@gmail.com>
On Mon, Dec 08, 2008 at 01:34:34PM +0300, Dmitry Baryshkov wrote:
> Stephen Rothwell пишет:
>> Hi Greg,
>> Today's linux-next build (x86_64 allmodconfig) failed like this:
>> drivers/staging/agnx/xmit.c: In function 'fill_agnx_hdr':
>> drivers/staging/agnx/xmit.c:629: error: 'struct <anonymous>' has no member
>> named 'retry_limit'
>> drivers/staging/agnx/xmit.c:630: error: 'struct <anonymous>' has no member
>> named 'retry_limit'
>> drivers/staging/agnx/xmit.c: In function 'txm_power_set':
>> drivers/staging/agnx/xmit.c:652: error: 'struct ieee80211_tx_info' has no
>> member named 'tx_rate_idx'
>> drivers/staging/agnx/xmit.c:652: error: 'struct ieee80211_tx_info' has no
>> member named 'tx_rate_idx'
>> drivers/staging/agnx/xmit.c:652: error: 'struct ieee80211_tx_info' has no
>> member named 'tx_rate_idx'
>> drivers/staging/agnx/pci.c: In function 'agnx_config_interface':
>> drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no
>> member named 'ssid_len'
>> drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no
>> member named 'ssid'
>> drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no
>> member named 'ssid_len'
>> drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no
>> member named 'ssid_len'
>> drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no
>> member named 'ssid'
>> drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no
>> member named 'ssid_len'
>> drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no
>> member named 'ssid_len'
>> drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no
>> member named 'ssid'
>> drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no
>> member named 'ssid_len'
>> drivers/staging/agnx/pci.c:329: error: 'struct ieee80211_if_conf' has no
>> member named 'ssid'
>> drivers/staging/agnx/pci.c:329: error: 'struct ieee80211_if_conf' has no
>> member named 'ssid_len'
>> drivers/staging/agnx/pci.c:330: error: 'struct ieee80211_if_conf' has no
>> member named 'ssid_len'
>> drivers/staging/agnx/pci.c:331: error: 'struct ieee80211_if_conf' has no
>> member named 'ssid'
>> drivers/staging/agnx/pci.c:331: error: 'struct ieee80211_if_conf' has no
>> member named 'ssid_len'
>> drivers/staging/agnx/pci.c: At top level:
>> drivers/staging/agnx/pci.c:432: warning: initialization from incompatible
>> pointer type
>> drivers/staging/altpciechdma/altpciechdma.c: In function
>> 'ape_sg_to_chdma_table':
>> drivers/staging/altpciechdma/altpciechdma.c:430: warning: format '%08x'
>> expects type 'unsigned int', but argument 3 has type 'dma_addr_t'
>> drivers/staging/altpciechdma/altpciechdma.c:434: warning: format '%08x'
>> expects type 'unsigned int', but argument 3 has type 'dma_addr_t'
>> drivers/staging/altpciechdma/altpciechdma.c:450: warning: format '%08x'
>> expects type 'unsigned int', but argument 3 has type 'dma_addr_t'
>> drivers/staging/altpciechdma/altpciechdma.c:451: warning: format '%08x'
>> expects type 'unsigned int', but argument 3 has type 'dma_addr_t'
>> drivers/staging/altpciechdma/altpciechdma.c: In function 'dma_test':
>> drivers/staging/altpciechdma/altpciechdma.c:548: warning: assignment makes
>> integer from pointer without a cast
>> drivers/staging/altpciechdma/altpciechdma.c: In function 'probe':
>> drivers/staging/altpciechdma/altpciechdma.c:931: warning: label 'err_rev'
>> defined but not used
>> drivers/staging/altpciechdma/altpciechdma.c:914: warning: label 'err_cdev'
>> defined but not used
>> drivers/staging/altpciechdma/altpciechdma.c: At top level:
>> drivers/staging/altpciechdma/altpciechdma.c:416: warning:
>> 'ape_sg_to_chdma_table' defined but not used
>> Commit "STAGING: Move staging drivers back to staging-specific menu"
>> allowed them to build in the allmodconfig again. I have dropped the
>> staging tree for today.
>
> Damn. And w/o that commit staging drivers pollute the main drivers menu.
Very wierd. Dmitry, care to look into this today?
thanks,
greg k-h
^ permalink raw reply
* Re: linux-next: manual merge of the lblnet tree
From: David Howells @ 2008-12-08 10:46 UTC (permalink / raw)
To: Stephen Rothwell
Cc: dhowells, Paul Moore, linux-next, James Morris, Casey Schaufler
In-Reply-To: <20081208190708.1d2c37ec.sfr@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the lblnet tree got a conflicts in
> security/smack/smack_lsm.c and security/smack/smackfs.c between commits
> 86a264abe542cfececb4df129bc45a0338d8cdb9 ("CRED: Wrap current->cred and a
> few other accessors") and d84f4f992cbd76e8f39c488cf0c5d123843923b1
> ("CRED: Inaugurate COW credentials") from the security-testing tree and
> commit d936691ab765fbac809e9a05c7f0c36ce2c2119e ("smack: Add support for
> unlabeled network hosts and networks") from the lblnet tree.
>
> I fixed it up (see below) and can carry the fixes as necessary.
That looks reasonable, I think.
David
^ permalink raw reply
* Re: linux-next: staging tree build failure
From: Dmitry Baryshkov @ 2008-12-08 10:34 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Greg KH, linux-next
In-Reply-To: <20081208204303.3c99dfa4.sfr@canb.auug.org.au>
Stephen Rothwell пишет:
> Hi Greg,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> drivers/staging/agnx/xmit.c: In function 'fill_agnx_hdr':
> drivers/staging/agnx/xmit.c:629: error: 'struct <anonymous>' has no member named 'retry_limit'
> drivers/staging/agnx/xmit.c:630: error: 'struct <anonymous>' has no member named 'retry_limit'
> drivers/staging/agnx/xmit.c: In function 'txm_power_set':
> drivers/staging/agnx/xmit.c:652: error: 'struct ieee80211_tx_info' has no member named 'tx_rate_idx'
> drivers/staging/agnx/xmit.c:652: error: 'struct ieee80211_tx_info' has no member named 'tx_rate_idx'
> drivers/staging/agnx/xmit.c:652: error: 'struct ieee80211_tx_info' has no member named 'tx_rate_idx'
> drivers/staging/agnx/pci.c: In function 'agnx_config_interface':
> drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
> drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid'
> drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
> drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
> drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid'
> drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
> drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
> drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid'
> drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
> drivers/staging/agnx/pci.c:329: error: 'struct ieee80211_if_conf' has no member named 'ssid'
> drivers/staging/agnx/pci.c:329: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
> drivers/staging/agnx/pci.c:330: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
> drivers/staging/agnx/pci.c:331: error: 'struct ieee80211_if_conf' has no member named 'ssid'
> drivers/staging/agnx/pci.c:331: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
> drivers/staging/agnx/pci.c: At top level:
> drivers/staging/agnx/pci.c:432: warning: initialization from incompatible pointer type
> drivers/staging/altpciechdma/altpciechdma.c: In function 'ape_sg_to_chdma_table':
> drivers/staging/altpciechdma/altpciechdma.c:430: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'dma_addr_t'
> drivers/staging/altpciechdma/altpciechdma.c:434: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'dma_addr_t'
> drivers/staging/altpciechdma/altpciechdma.c:450: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'dma_addr_t'
> drivers/staging/altpciechdma/altpciechdma.c:451: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'dma_addr_t'
> drivers/staging/altpciechdma/altpciechdma.c: In function 'dma_test':
> drivers/staging/altpciechdma/altpciechdma.c:548: warning: assignment makes integer from pointer without a cast
> drivers/staging/altpciechdma/altpciechdma.c: In function 'probe':
> drivers/staging/altpciechdma/altpciechdma.c:931: warning: label 'err_rev' defined but not used
> drivers/staging/altpciechdma/altpciechdma.c:914: warning: label 'err_cdev' defined but not used
> drivers/staging/altpciechdma/altpciechdma.c: At top level:
> drivers/staging/altpciechdma/altpciechdma.c:416: warning: 'ape_sg_to_chdma_table' defined but not used
>
> Commit "STAGING: Move staging drivers back to staging-specific menu"
> allowed them to build in the allmodconfig again. I have dropped the
> staging tree for today.
>
Damn. And w/o that commit staging drivers pollute the main drivers menu.
--
With best wishes
Dmitry
^ permalink raw reply
* linux-next: Tree for December 8
From: Stephen Rothwell @ 2008-12-08 9:59 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8454 bytes --]
Hi all,
Changes since 20081204:
Today's tree fails the powerpc allyesconfig build.
Undropped tree:
sparc
xfs
crypto
backlight
Dropped trees (temporarily):
v4l-dvb (build problem)
ide (build problem)
semaphore-removal (due to unfixed conflicts against Linus' tree)
cpu_alloc (build problem)
perfmon3 (concerns from the x86 team)
staging (build failure)
The ide tree lost its conflict but gained a build problem and was dropped.
The net tree gained a conflict against the sparc tree.
The security-testing tree lost a conflict.
The lblnet tree gained a conflict against the jdelvare-hwmon and 2
conflicts against the security-testing tree.
The proc tree lost its 2 conflicts.
The staging tree gained 2 conflicts against the net tree and then a build
failure, so it was dropped.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-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,
44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
We are up to 127 trees (counting Linus' and 15 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 Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and 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 arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-2.6.26
Merging dwmw2/master
Merging arm/devel
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
Merging s390/features
CONFLICT (content): Merge conflict in drivers/char/Makefile
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
Merging xtensa/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in arch/powerpc/platforms/85xx/mpc85xx_mds.c
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
Merging ftrace/auto-ftrace-next
CONFLICT (content): Merge conflict in scripts/recordmcount.pl
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
Merging quilt/device-mapper
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
$ git reset --hard HEAD^
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
$ git reset --hard HEAD^
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
CONFLICT (content): Merge conflict in arch/x86/kernel/reboot.c
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (delete/modify): arch/sparc64/kernel/idprom.c deleted in HEAD and modified in net/master. Version net/master of arch/sparc64/kernel/idprom.c left in tree.
$ git rm -f arch/sparc64/kernel/idprom.c
Applying net: async_tx merge fix
Merging mtd/master
CONFLICT (content): Merge conflict in drivers/mtd/maps/physmap.c
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging cpufreq/next
Merging v9fs/for-next
Merging rr_cpumask/master
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
CONFLICT (content): Merge conflict in kernel/cpu.c
Merging cifs/master
CONFLICT (content): Merge conflict in fs/cifs/connect.c
Applying cifs: update for new IP4/6 address printing
Merging mmc/next
Created commit 7573047: Revert "ricoh_mmc: Use suspend/resume_noirq"
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging bkl-removal/bkl-removal
CONFLICT (content): Merge conflict in fs/ioctl.c
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/net/tg3.c
CONFLICT (content): Merge conflict in firmware/Makefile
CONFLICT (content): Merge conflict in firmware/WHENCE
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/mm/Makefile
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging generic-ipi/auto-generic-ipi-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
CONFLICT (content): Merge conflict in fs/cifs/cifs_fs_sb.h
CONFLICT (content): Merge conflict in fs/ocfs2/namei.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_cred.h
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_globals.h
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_ioctl.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_vnodeops.h
Merging lblnet/master
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (content): Merge conflict in security/smack/smack_lsm.c
CONFLICT (content): Merge conflict in security/smack/smackfs.c
Merging quilt/ttydev
CONFLICT (content): Merge conflict in drivers/net/slip.c
CONFLICT (content): Merge conflict in drivers/net/wan/x25_asy.c
CONFLICT (content): Merge conflict in drivers/net/wireless/strip.c
CONFLICT (content): Merge conflict in fs/devpts/inode.c
Merging agp/agp-next
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
Merging sparseirq/auto-sparseirq-next
Merging iommu/auto-iommu-next
Merging uwb/for-upstream
Merging watchdog/master
CONFLICT (content): Merge conflict in drivers/watchdog/iTCO_wdt.c
Merging proc/proc
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
CONFLICT (content): Merge conflict in kernel/sched.c
Merging osd/linux-next
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging trivial/for-next
Merging quilt/staging
CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211netdev.c
CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211wext.c
$ git reset --hard HEAD^
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: staging tree build failure
From: Stephen Rothwell @ 2008-12-08 9:43 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, Dmitry Baryshkov
[-- Attachment #1: Type: text/plain, Size: 3766 bytes --]
Hi Greg,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/staging/agnx/xmit.c: In function 'fill_agnx_hdr':
drivers/staging/agnx/xmit.c:629: error: 'struct <anonymous>' has no member named 'retry_limit'
drivers/staging/agnx/xmit.c:630: error: 'struct <anonymous>' has no member named 'retry_limit'
drivers/staging/agnx/xmit.c: In function 'txm_power_set':
drivers/staging/agnx/xmit.c:652: error: 'struct ieee80211_tx_info' has no member named 'tx_rate_idx'
drivers/staging/agnx/xmit.c:652: error: 'struct ieee80211_tx_info' has no member named 'tx_rate_idx'
drivers/staging/agnx/xmit.c:652: error: 'struct ieee80211_tx_info' has no member named 'tx_rate_idx'
drivers/staging/agnx/pci.c: In function 'agnx_config_interface':
drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid'
drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid'
drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid'
drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
drivers/staging/agnx/pci.c:329: error: 'struct ieee80211_if_conf' has no member named 'ssid'
drivers/staging/agnx/pci.c:329: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
drivers/staging/agnx/pci.c:330: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
drivers/staging/agnx/pci.c:331: error: 'struct ieee80211_if_conf' has no member named 'ssid'
drivers/staging/agnx/pci.c:331: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
drivers/staging/agnx/pci.c: At top level:
drivers/staging/agnx/pci.c:432: warning: initialization from incompatible pointer type
drivers/staging/altpciechdma/altpciechdma.c: In function 'ape_sg_to_chdma_table':
drivers/staging/altpciechdma/altpciechdma.c:430: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'dma_addr_t'
drivers/staging/altpciechdma/altpciechdma.c:434: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'dma_addr_t'
drivers/staging/altpciechdma/altpciechdma.c:450: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'dma_addr_t'
drivers/staging/altpciechdma/altpciechdma.c:451: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'dma_addr_t'
drivers/staging/altpciechdma/altpciechdma.c: In function 'dma_test':
drivers/staging/altpciechdma/altpciechdma.c:548: warning: assignment makes integer from pointer without a cast
drivers/staging/altpciechdma/altpciechdma.c: In function 'probe':
drivers/staging/altpciechdma/altpciechdma.c:931: warning: label 'err_rev' defined but not used
drivers/staging/altpciechdma/altpciechdma.c:914: warning: label 'err_cdev' defined but not used
drivers/staging/altpciechdma/altpciechdma.c: At top level:
drivers/staging/altpciechdma/altpciechdma.c:416: warning: 'ape_sg_to_chdma_table' defined but not used
Commit "STAGING: Move staging drivers back to staging-specific menu"
allowed them to build in the allmodconfig again. I have dropped the
staging tree for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: manual merge of the staging tree
From: Stephen Rothwell @ 2008-12-08 9:34 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, Wang Chen, David S. Miller
Hi Greg,
Today's linux-next merge of the staging tree got a conflicts in
drivers/staging/wlan-ng/p80211netdev.c and
drivers/staging/wlan-ng/p80211wext.c between commit
979123d5343b4fdcd4c682745b8a0be9b8fac248 ("staging-p80211: Kill directly
reference of netdev->priv") from the net tree and various commits from
the staging tree.
I fixed it up (see below) and can carry the fixes as necessary. (In the
case of the second file, the latter removed the code that the former
modified.)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/staging/wlan-ng/p80211netdev.c
index 2b705ea,0668471..0000000
--- a/drivers/staging/wlan-ng/p80211netdev.c
+++ b/drivers/staging/wlan-ng/p80211netdev.c
@@@ -696,8 -617,8 +617,8 @@@ static int p80211knetdev_do_ioctl(netde
{
int result = 0;
p80211ioctl_req_t *req = (p80211ioctl_req_t*)ifr;
- wlandevice_t *wlandev = (wlandevice_t*)dev->priv;
+ wlandevice_t *wlandev = dev->ml_priv;
- UINT8 *msgbuf;
+ u8 *msgbuf;
DBFENTER;
WLAN_LOG_DEBUG(2, "rx'd ioctl, cmd=%d, len=%d\n", cmd, req->len);
@@@ -833,7 -738,7 +738,7 @@@ static int p80211knetdev_set_mac_addres
resultcode->data = 0;
/* now fire the request */
- result = p80211req_dorequest(dev->ml_priv, (UINT8 *)&dot11req);
- result = p80211req_dorequest(dev->priv, (u8*)&dot11req);
++ result = p80211req_dorequest(dev->ml_priv, (u8*)&dot11req);
/* If the request wasn't successful, report an error and don't
* change the netdev address
@@@ -914,10 -819,8 +819,8 @@@ int wlan_setup(wlandevice_t *wlandev
WLAN_LOG_ERROR("Failed to alloc netdev.\n");
result = 1;
} else {
- memset( dev, 0, sizeof(netdevice_t));
- ether_setup(dev);
wlandev->netdev = dev;
- dev->priv = wlandev;
+ dev->ml_priv = wlandev;
dev->hard_start_xmit = p80211knetdev_hard_start_xmit;
dev->get_stats = p80211knetdev_get_stats;
#ifdef HAVE_PRIVATE_IOCTL
@@@ -1416,78 -1192,9 +1192,9 @@@ static int p80211_rx_typedrop( wlandevi
return drop;
}
- #ifdef CONFIG_HOTPLUG
- /* Notify userspace when a netdevice event occurs,
- * by running '/sbin/hotplug net' with certain
- * environment variables set.
- */
- int p80211_run_sbin_hotplug(wlandevice_t *wlandev, char *action)
- {
- char *argv[3], *envp[7], ifname[12 + IFNAMSIZ], action_str[32];
- char nsdname[32], wlan_wext[32];
- int i;
-
- if (wlandev) {
- sprintf(ifname, "INTERFACE=%s", wlandev->name);
- sprintf(nsdname, "NSDNAME=%s", wlandev->nsdname);
- } else {
- sprintf(ifname, "INTERFACE=null");
- sprintf(nsdname, "NSDNAME=null");
- }
-
- sprintf(wlan_wext, "WLAN_WEXT=%s", wlan_wext_write ? "y" : "");
- sprintf(action_str, "ACTION=%s", action);
-
- i = 0;
- argv[i++] = hotplug_path;
- argv[i++] = "wlan";
- argv[i] = NULL;
-
- i = 0;
- /* minimal command environment */
- envp [i++] = "HOME=/";
- envp [i++] = "PATH=/sbin:/bin:/usr/sbin:/usr/bin";
- envp [i++] = ifname;
- envp [i++] = action_str;
- envp [i++] = nsdname;
- envp [i++] = wlan_wext;
- envp [i] = NULL;
-
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,62))
- return call_usermodehelper(argv [0], argv, envp);
- #else
- return call_usermodehelper(argv [0], argv, envp, 0);
- #endif
- }
-
- #endif
-
-
- void p80211_suspend(wlandevice_t *wlandev)
- {
- DBFENTER;
-
- #ifdef CONFIG_HOTPLUG
- p80211_run_sbin_hotplug(wlandev, WLAN_HOTPLUG_SUSPEND);
- #endif
-
- DBFEXIT;
- }
-
- void p80211_resume(wlandevice_t *wlandev)
- {
- DBFENTER;
-
- #ifdef CONFIG_HOTPLUG
- p80211_run_sbin_hotplug(wlandev, WLAN_HOTPLUG_RESUME);
- #endif
-
- DBFEXIT;
- }
-
static void p80211knetdev_tx_timeout( netdevice_t *netdev)
{
- wlandevice_t *wlandev = (wlandevice_t*)netdev->priv;
+ wlandevice_t *wlandev = netdev->ml_priv;
DBFENTER;
if (wlandev->tx_timeout) {
diff --cc drivers/staging/wlan-ng/p80211wext.c
index b2c9ea2,44d43e3..0000000
--- a/drivers/staging/wlan-ng/p80211wext.c
+++ b/drivers/staging/wlan-ng/p80211wext.c
^ permalink raw reply
* Re: linux-next: trivial tree
From: Jiri Kosina @ 2008-12-08 9:22 UTC (permalink / raw)
To: Nick Andrew
Cc: Stephen Rothwell, linux-kernel, linux-next, Jesper Juhl,
Joe Perches
In-Reply-To: <20081205010421.GA31220@mail.local.tull.net>
On Fri, 5 Dec 2008, Nick Andrew wrote:
> > I have taken over trivial patches maintainership from Jesper.
> FYI, you might (still) have a patch in your tree from me called 'Tighten
> Use of Loose' which fixes spelling errors in a number of files across
> the repository. It's been a few months and I noticed it's not yet in
> Linus' repository, presumably due to it conflicting with functional
> changes done in the subsystems. So I've split it into one-patch-per-file
> now and I'll submit to the subsystem maintainers individually, with the
> help of Joe Perches' annotated MAINTAINERS file and email lookup script.
Hi Nick,
well, that patch didn't reach me yet. Jesper told me that he will
eventually flush his whole unprocessed queue (which probably contains also
the mentioned patch) my way, so that I can merge it, but that didn't
happen yet.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply
* Re: linux-next: Tree for October 24 - powerpc - build failure with !CONFIG_BLK_DEV_IDEDMA_PMAC
From: Kamalesh Babulal @ 2008-12-08 9:05 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz
Cc: benh, Sergei Shtylyov, Stephen Rothwell, linux-next, LKML,
linux-ide
In-Reply-To: <200812071527.52886.bzolnier@gmail.com>
* Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> [2008-12-07 15:27:52]:
> On Saturday 25 October 2008, Bartlomiej Zolnierkiewicz wrote:
> > On Saturday 25 October 2008, Benjamin Herrenschmidt wrote:
> > > On Sat, 2008-10-25 at 02:39 +0400, Sergei Shtylyov wrote:
> > > > >> Hm, looks like this configuration was never buildable --
> > > > #ifdef's are
> > > > >> missing and wrongly placed. CCing Ben Herrenschmidt...
> > > > >>
> > > > >
> > > > > What configuration ?
> > > > >
> > > >
> > > > See the subject.
> > >
> > > Ah ok. We should probably just remove the option...
> >
> > Fine with me. Anybody want an easy +1 patch-point? :)
>
> Seems like ppc people are either very busy or don't care... Oh well...
>
> From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> Subject: [PATCH] ide: build-fix for CONFIG_BLK_DEV_IDEDMA_PMAC=n
>
> IDE pmac host driver build fails with CONFIG_BLK_DEV_IDEDMA_PMAC=n
> as reported by Kamalesh:
>
> > drivers/ide/pmac.c: In function 'pmac_ide_set_pio_mode':
> > drivers/ide/pmac.c:527: error: implicit declaration of function 'kauai_lookup_timing'
> > drivers/ide/pmac.c:527: error: 'shasta_pio_timings' undeclared (first use in this function)
> > drivers/ide/pmac.c:527: error: (Each undeclared identifier is reported only once
> > drivers/ide/pmac.c:527: error: for each function it appears in.)
> > drivers/ide/pmac.c:534: error: 'kauai_pio_timings' undeclared (first use in this function)
> > drivers/ide/pmac.c: In function 'pmac_ide_do_resume':
> > drivers/ide/pmac.c:914: error: 'IDE_WAKEUP_DELAY' undeclared (first use in this function)
> > drivers/ide/pmac.c: At top level:
> > drivers/ide/pmac.c:1007: error: 'pmac_ide_init_dma' undeclared here (not in a function)
> > drivers/ide/pmac.c: In function 'pmac_ide_setup_device':
> > drivers/ide/pmac.c:1107: error: 'IDE_WAKEUP_DELAY' undeclared (first use in this function)
> > drivers/ide/pmac.c: In function 'pmac_ide_macio_attach':
> > drivers/ide/pmac.c:1209: error: 'pmac_ide_hwif_t' has no member named 'dma_regs'
> > drivers/ide/pmac.c:1210: error: 'pmac_ide_hwif_t' has no member named 'dma_regs'
> > make[2]: *** [drivers/ide/pmac.o] Error 1
>
> Fix it by removing the superfluous config option.
Thanks for the patch, it fixes the build failure.
>
> Reported-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> ---
> drivers/ide/Kconfig | 14 +++-----------
> drivers/ide/pmac.c | 30 +++---------------------------
> 2 files changed, 6 insertions(+), 38 deletions(-)
>
> Index: b/drivers/ide/Kconfig
> ===================================================================
> --- a/drivers/ide/Kconfig
> +++ b/drivers/ide/Kconfig
> @@ -655,10 +655,12 @@ config BLK_DEV_CELLEB
>
> endif
>
> +# TODO: BLK_DEV_IDEDMA_PCI -> BLK_DEV_IDEDMA_SFF
> config BLK_DEV_IDE_PMAC
> tristate "PowerMac on-board IDE support"
> depends on PPC_PMAC && IDE=y
> select IDE_TIMINGS
> + select BLK_DEV_IDEDMA_PCI
> help
> This driver provides support for the on-board IDE controller on
> most of the recent Apple Power Macintoshes and PowerBooks.
> @@ -675,16 +677,6 @@ config BLK_DEV_IDE_PMAC_ATA100FIRST
> CD-ROM on hda. This option changes this to more natural hda for
> hard disk and hdc for CD-ROM.
>
> -config BLK_DEV_IDEDMA_PMAC
> - bool "PowerMac IDE DMA support"
> - depends on BLK_DEV_IDE_PMAC
> - select BLK_DEV_IDEDMA_PCI
> - help
> - This option allows the driver for the on-board IDE controller on
> - Power Macintoshes and PowerBooks to use DMA (direct memory access)
> - to transfer data to and from memory. Saying Y is safe and improves
> - performance.
> -
> config BLK_DEV_IDE_AU1XXX
> bool "IDE for AMD Alchemy Au1200"
> depends on SOC_AU1200
> @@ -903,7 +895,7 @@ config BLK_DEV_UMC8672
> endif
>
> config BLK_DEV_IDEDMA
> - def_bool BLK_DEV_IDEDMA_SFF || BLK_DEV_IDEDMA_PMAC || \
> + def_bool BLK_DEV_IDEDMA_SFF || \
> BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
>
> endif # IDE
> Index: b/drivers/ide/pmac.c
> ===================================================================
> --- a/drivers/ide/pmac.c
> +++ b/drivers/ide/pmac.c
> @@ -66,7 +66,6 @@ typedef struct pmac_ide_hwif {
> struct macio_dev *mdev;
> u32 timings[4];
> volatile u32 __iomem * *kauai_fcr;
> -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
> /* Those fields are duplicating what is in hwif. We currently
> * can't use the hwif ones because of some assumptions that are
> * beeing done by the generic code about the kind of dma controller
> @@ -74,8 +73,6 @@ typedef struct pmac_ide_hwif {
> */
> volatile struct dbdma_regs __iomem * dma_regs;
> struct dbdma_cmd* dma_table_cpu;
> -#endif
> -
> } pmac_ide_hwif_t;
>
> enum {
> @@ -222,8 +219,6 @@ static const char* model_name[] = {
> #define KAUAI_FCR_UATA_RESET_N 0x00000002
> #define KAUAI_FCR_UATA_ENABLE 0x00000001
>
> -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
> -
> /* Rounded Multiword DMA timings
> *
> * I gave up finding a generic formula for all controller
> @@ -413,8 +408,6 @@ static int pmac_ide_build_dmatable(ide_d
> static void pmac_ide_selectproc(ide_drive_t *drive);
> static void pmac_ide_kauai_selectproc(ide_drive_t *drive);
>
> -#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
> -
> #define PMAC_IDE_REG(x) \
> ((void __iomem *)((drive)->hwif->io_ports.data_addr + (x)))
>
> @@ -584,8 +577,6 @@ pmac_ide_set_pio_mode(ide_drive_t *drive
> pmac_ide_do_update_timings(drive);
> }
>
> -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
> -
> /*
> * Calculate KeyLargo ATA/66 UDMA timings
> */
> @@ -786,7 +777,6 @@ set_timings_mdma(ide_drive_t *drive, int
> drive->name, speed & 0xf, *timings);
> #endif
> }
> -#endif /* #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC */
>
> static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed)
> {
> @@ -804,7 +794,6 @@ static void pmac_ide_set_dma_mode(ide_dr
> tl[0] = *timings;
> tl[1] = *timings2;
>
> -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
> if (speed >= XFER_UDMA_0) {
> if (pmif->kind == controller_kl_ata4)
> ret = set_timings_udma_ata4(&tl[0], speed);
> @@ -817,7 +806,7 @@ static void pmac_ide_set_dma_mode(ide_dr
> ret = -1;
> } else
> set_timings_mdma(drive, pmif->kind, &tl[0], &tl[1], speed);
> -#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
> +
> if (ret)
> return;
>
> @@ -1008,9 +997,7 @@ static const struct ide_port_info pmac_p
> .chipset = ide_pmac,
> .tp_ops = &pmac_tp_ops,
> .port_ops = &pmac_ide_port_ops,
> -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
> .dma_ops = &pmac_dma_ops,
> -#endif
> .host_flags = IDE_HFLAG_SET_PIO_MODE_KEEP_DMA |
> IDE_HFLAG_POST_SET_MODE |
> IDE_HFLAG_MMIO |
> @@ -1182,7 +1169,7 @@ pmac_ide_macio_attach(struct macio_dev *
> pmif->regbase = regbase;
> pmif->irq = irq;
> pmif->kauai_fcr = NULL;
> -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
> +
> if (macio_resource_count(mdev) >= 2) {
> if (macio_request_resource(mdev, 1, "ide-pmac (dma)"))
> printk(KERN_WARNING "ide-pmac: can't request DMA "
> @@ -1192,7 +1179,7 @@ pmac_ide_macio_attach(struct macio_dev *
> pmif->dma_regs = ioremap(macio_resource_start(mdev, 1), 0x1000);
> } else
> pmif->dma_regs = NULL;
> -#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
> +
> dev_set_drvdata(&mdev->ofdev.dev, pmif);
>
> memset(&hw, 0, sizeof(hw));
> @@ -1300,9 +1287,7 @@ pmac_ide_pci_attach(struct pci_dev *pdev
>
> base = ioremap(rbase, rlen);
> pmif->regbase = (unsigned long) base + 0x2000;
> -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
> pmif->dma_regs = base + 0x1000;
> -#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
> pmif->kauai_fcr = base;
> pmif->irq = pdev->irq;
>
> @@ -1434,8 +1419,6 @@ out:
> return error;
> }
>
> -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
> -
> /*
> * pmac_ide_build_dmatable builds the DBDMA command list
> * for a transfer and sets the DBDMA channel to point to it.
> @@ -1723,13 +1706,6 @@ static int __devinit pmac_ide_init_dma(i
>
> return 0;
> }
> -#else
> -static int __devinit pmac_ide_init_dma(ide_hwif_t *hwif,
> - const struct ide_port_info *d)
> -{
> - return -EOPNOTSUPP;
> -}
> -#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
>
> module_init(pmac_ide_probe);
>
>
--
Thanks & Regards,
Kamalesh Babulal,
Linux Technology Center,
IBM, ISTL.
^ permalink raw reply
* linux-next: manual merge of the lblnet tree
From: Stephen Rothwell @ 2008-12-08 8:07 UTC (permalink / raw)
To: Paul Moore; +Cc: linux-next, David Howells, James Morris, Casey Schaufler
Hi Paul,
Today's linux-next merge of the lblnet tree got a conflicts in
security/smack/smack_lsm.c and security/smack/smackfs.c between commits
86a264abe542cfececb4df129bc45a0338d8cdb9 ("CRED: Wrap current->cred and a
few other accessors") and d84f4f992cbd76e8f39c488cf0c5d123843923b1
("CRED: Inaugurate COW credentials") from the security-testing tree and
commit d936691ab765fbac809e9a05c7f0c36ce2c2119e ("smack: Add support for
unlabeled network hosts and networks") from the lblnet tree.
I fixed it up (see below) and can carry the fixes as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc security/smack/smack_lsm.c
index 8ad4816,06471e8..0000000
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@@ -2100,11 -2181,13 +2226,17 @@@ static int smack_setprocattr(struct tas
if (newsmack == NULL)
return -EINVAL;
+ /*
+ * No process is ever allowed the web ("@") label.
+ */
+ if (newsmack == smack_known_web.smk_known)
+ return -EPERM;
+
- p->security = newsmack;
+ new = prepare_creds();
+ if (!new)
+ return -ENOMEM;
+ new->security = newsmack;
+ commit_creds(new);
return size;
}
@@@ -2337,10 -2488,11 +2537,10 @@@ static void smack_sock_graft(struct soc
return;
ssp = sk->sk_security;
- ssp->smk_in = current->security;
- ssp->smk_out = current->security;
+ ssp->smk_in = ssp->smk_out = current_security();
ssp->smk_packet[0] = '\0';
- rc = smack_netlabel(sk);
+ rc = smack_netlabel(sk, SMACK_CIPSO_SOCKET);
if (rc != 0)
printk(KERN_WARNING "Smack: \"%s\" netlbl error %d.\n",
__func__, -rc);
diff --cc security/smack/smackfs.c
index ca257df,a75013f..0000000
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@@ -104,6 -107,24 +107,24 @@@ struct smk_list_entry *smack_list
#define SMK_ACCESSLEN (sizeof(SMK_ACCESS) - 1)
#define SMK_LOADLEN (SMK_LABELLEN + SMK_LABELLEN + SMK_ACCESSLEN)
+ /**
+ * smk_netlabel_audit_set - fill a netlbl_audit struct
+ * @nap: structure to fill
+ */
+ static void smk_netlabel_audit_set(struct netlbl_audit *nap)
+ {
+ nap->loginuid = audit_get_loginuid(current);
+ nap->sessionid = audit_get_sessionid(current);
- nap->secid = smack_to_secid(current->security);
++ nap->secid = smack_to_secid(current_security());
+ }
+
+ /*
+ * Values for parsing single label host rules
+ * "1.2.3.4 X"
+ * "192.168.138.129/32 abcdefghijklmnopqrstuvw"
+ */
+ #define SMK_NETLBLADDRMIN 9
+ #define SMK_NETLBLADDRMAX 42
/*
* Seq_file read operations for /smack/load
^ permalink raw reply
* linux-next: manual merge of the lblnet tree
From: Stephen Rothwell @ 2008-12-08 7:49 UTC (permalink / raw)
To: Paul Moore; +Cc: linux-next, Hans de Goede, Jean Delvare
Hi Paul,
Today's linux-next merge of the lblnet tree got a conflict in
Documentation/feature-removal-schedule.txt between commit
839361440c4cf848dddc5705fa4ac7c25d00dddf ("hwmon: Deprecate the fscher
and fscpos drivers") from the jdelvare-hwmon tree and commit
d45075ffb96a78c0f7137cfcec9fe816a6d23cfb ("selinux: Deprecate and
schedule the removal of the the compat_net functionality") from the
lblnet tree.
Just overlapping additions. I fixed it up (see below) and can carry it
as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc Documentation/feature-removal-schedule.txt
index ba66f38,6ae3e9b..0000000
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -339,8 -346,12 +339,20 @@@ Who: Jean Delvare <khali@linux-fr.org
---------------------------
+What: fscher and fscpos drivers
+When: June 2009
+Why: Deprecated by the new fschmd driver.
+Who: Hans de Goede <hdegoede@redhat.com>
+ Jean Delvare <khali@linux-fr.org>
++
++---------------------------
++
+ What: SELinux "compat_net" functionality
+ When: 2.6.30 at the earliest
+ Why: In 2.6.18 the Secmark concept was introduced to replace the "compat_net"
+ network access control functionality of SELinux. Secmark offers both
+ better performance and greater flexibility than the "compat_net"
+ mechanism. Now that the major Linux distributions have moved to
+ Secmark, it is time to deprecate the older mechanism and start the
+ process of removing the old code.
+ Who: Paul Moore <paul.moore@hp.com>
^ permalink raw reply
* Re: linux-next: manual merge of the net tree
From: David Miller @ 2008-12-08 7:26 UTC (permalink / raw)
To: sfr; +Cc: linux-next, johannes, sam
In-Reply-To: <20081208144851.c02cc7da.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 8 Dec 2008 14:48:51 +1100
> Today's linux-next merge of the net tree got a conflict in
> arch/sparc64/kernel/idprom.c between commit
> a88b5ba8bd8ac18aad65ee6c6a254e2e74876db3 (sparc,sparc64: unify kernel/"")
> from the sparc tree and commit 7c510e4b730a92cecf94ada45c989d8be0200d47
> ("net: convert more to %pM") from the net tree.
Thanks for reporting this.
> The former renamed the file while the latter modified it. I just deleted
> the renamed file for now, the %pM conversion can be done later.
Yes it's probably the best way to handle this for now.
^ permalink raw reply
* linux-next: manual merge of the net tree
From: Stephen Rothwell @ 2008-12-08 3:48 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, Johannes Berg, Sam Ravnborg
[-- Attachment #1: Type: text/plain, Size: 563 bytes --]
Hi Dave,
Today's linux-next merge of the net tree got a conflict in
arch/sparc64/kernel/idprom.c between commit
a88b5ba8bd8ac18aad65ee6c6a254e2e74876db3 (sparc,sparc64: unify kernel/"")
from the sparc tree and commit 7c510e4b730a92cecf94ada45c989d8be0200d47
("net: convert more to %pM") from the net tree.
The former renamed the file while the latter modified it. I just deleted
the renamed file for now, the %pM conversion can be done later.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: ide tree build failure
From: Stephen Rothwell @ 2008-12-08 2:16 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 439 bytes --]
Hi Bart,
Today's linux-next build (powerpc ppc64_defconfig) failed like this:
drivers/built-in.o: In function `.ide_cd_do_request':
ide-cd.c:(.text+0x11a97c): undefined reference to `.ide_cd_get_xferlen'
drivers/built-in.o:(.toc1+0x83b8): undefined reference to `ide_cd_expiry'
So I have dropped the ide tree for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ 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