* linux-next: Tree for July 1 @ 2011-07-01 6:05 Stephen Rothwell 2011-07-01 22:43 ` linux-next: Tree for July 1 (staging/comedi) Randy Dunlap 0 siblings, 1 reply; 5+ messages in thread From: Stephen Rothwell @ 2011-07-01 6:05 UTC (permalink / raw) To: linux-next; +Cc: LKML [-- Attachment #1: Type: text/plain, Size: 10174 bytes --] Hi all, Changes since 20110630: New tree: akpm (a subset of mmotm - Andrew can now start eating again :-)) The powerpc tree gained another build failure so I used the version from next-20110630. The security-testing tree lost its bad merge. The kvm tree lost its conflict. The akpm tree gained two build failures for which I revertd a commit and applied a patch. ---------------------------------------------------------------------------- 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 195 trees (counting Linus' and 28 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/fixes Merging kbuild-current/rc-fixes Merging arm-current/master Merging m68k-current/for-linus Merging powerpc-merge/merge Merging 52xx-and-virtex-current/powerpc/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 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-curent/master Merging dwmw2/master Merging sh-current/sh-fixes-for-linus Merging rmobile-current/rmobile-fixes-for-linus Merging fbdev-current/fbdev-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/include/asm/pgalloc.h CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h CONFLICT (content): Merge conflict in arch/arm/mm/context.c CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c CONFLICT (content): Merge conflict in arch/arm/mm/proc-v7.S Merging at91/at91-next Merging davinci/davinci-next Merging i.MX/for-next CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices/platform-imx-dma.c Merging linux-spec/for-next Merging msm/for-next Merging omap/for-next Merging pxa/for-next Merging samsung/next-samsung Merging s5p/for-next Merging tegra/for-next Merging ux500-core/ux500-core Merging xilinx/arm-next Merging blackfin/for-linus Merging cris/for-next Merging ia64/test Merging m68k/for-next Merging m68knommu/for-next Merging microblaze/next Merging mips/mips-for-linux-next Merging parisc/for-next Merging powerpc/next $ git reset --hard HEAD^ Merging refs/next/20110630/powerpc [master f16ca91] Revert "powerpc/pseries: Move hvsi support into a library" 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/master Merging tile/master Merging unicore32/unicore32 Merging xtensa/master CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig Merging ceph/for-next CONFLICT (content): Merge conflict in fs/ceph/export.c Merging cifs/master Merging configfs/linux-next Merging ecryptfs/next Merging ext3/for_next Merging ext4/dev Merging fatfs/master Merging fuse/for-next Merging gfs2/master Merging hfsplus/for-next Merging jfs/next Merging logfs/master CONFLICT (content): Merge conflict in fs/logfs/logfs.h Merging nfs/linux-next Merging nfsd/nfsd-next Merging nilfs2/for-next Merging ocfs2/linux-next Merging omfs/for-next Merging squashfs/master Merging udf/for_next 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 of-pci/of-pci Merging hid/for-next Merging quilt/i2c Merging bjdooks-i2c/next-i2c Merging quilt/jdelvare-hwmon Merging hwmon-staging/hwmon-next Merging quilt/kernel-doc Merging docs/docs-move Merging v4l-dvb/master Merging kbuild/for-next Merging kconfig/for-next Merging ide/master Merging libata/NEXT CONFLICT (content): Merge conflict in drivers/ata/libahci.c Merging infiniband/for-next Merging acpi/test Merging idle-test/idle-test CONFLICT (content): Merge conflict in arch/x86/kernel/process.c Merging powertools/tools-test Merging cpupowerutils/master Merging ieee1394/for-next Merging ubi/linux-next Merging dlm/next Merging swiotlb/master Merging ibft/master Merging scsi/master Merging slave-dma/next Merging async_tx/next Merging net/master CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-tx.c CONFLICT (content): Merge conflict in drivers/scsi/bnx2fc/bnx2fc.h CONFLICT (content): Merge conflict in drivers/scsi/bnx2fc/bnx2fc_fcoe.c Merging wireless/master Merging bluetooth/master Merging mtd/master Merging l2-mtd/master 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 block/blk-throttle.c Merging quilt/device-mapper Merging embedded/master Merging firmware/master Merging pcmcia/master Merging battery/master Merging leds/for-mm CONFLICT (content): Merge conflict in drivers/leds/Kconfig Merging backlight/for-mm Merging mmc/mmc-next CONFLICT (delete/modify): drivers/mmc/host/sdhci-of-core.c deleted in mmc/mmc-next and modified in HEAD. Version HEAD of drivers/mmc/host/sdhci-of-core.c left in tree. $ git rm -f drivers/mmc/host/sdhci-of-core.c Merging kgdb/kgdb-next Merging slab/for-next Merging uclinux/for-next Merging md/for-next Merging mfd/for-next Merging hdlc/hdlc-next Merging drm/drm-next Merging fbdev/master Merging viafb/viafb-next Merging omap_dss2/for-next Merging voltage/for-next Merging security-testing/next Merging selinux/master Merging lblnet/master Merging agp/agp-next Merging watchdog/master Merging bdev/master Merging dwmw2-iommu/master Merging cputime/cputime Merging osd/linux-next Merging jc_docs/docs-next Merging nommu/master Merging trivial/for-next CONFLICT (delete/modify): arch/arm/mach-ep93xx/dma-m2p.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-ep93xx/dma-m2p.c left in tree. CONFLICT (content): Merge conflict in drivers/mtd/maps/pxa2xx-flash.c $ git rm -f arch/arm/mach-ep93xx/dma-m2p.c Merging audit/for-next Merging suspend/linux-next Merging apm/for-next Merging fsnotify/for-next Merging irda/for-next Merging i7core_edac/linux_next Merging i7300_edac/linux_next Merging devicetree/devicetree/next Merging spi/spi/next Merging gpio/gpio/next CONFLICT (content): Merge conflict in arch/arm/mach-ep93xx/Makefile CONFLICT (content): Merge conflict in drivers/gpio/Makefile CONFLICT (content): Merge conflict in drivers/gpio/gpio-ep93xx.c Merging tip/auto-latest Merging rcu/rcu/next Merging kvm/linux-next Merging oprofile/for-next Merging ptrace/ptrace Merging xen/upstream/xen Merging xen-two/linux-next Merging xen-pvhvm/linux-next Merging edac-amd/for-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 driver-core/driver-core-next Merging tty/tty-next Merging usb/usb-next CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Merging staging/staging-next CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt CONFLICT (content): Merge conflict in drivers/staging/brcm80211/Kconfig CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_linux.c CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_sdio.c CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_iw.c CONFLICT (content): Merge conflict in drivers/staging/usbip/userspace/src/utils.h Merging bkl-config/config Merging tmem/linux-next Merging writeback/next Merging arm-dt/devicetree/arm-next Merging scsi-post-merge/merge-base:master Merging akpm [master 1cc19eb] Revert "It is not necessary to share the same notifier.h." Applying: backlight: make some varibales static [-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: Tree for July 1 (staging/comedi) 2011-07-01 6:05 linux-next: Tree for July 1 Stephen Rothwell @ 2011-07-01 22:43 ` Randy Dunlap 2011-07-01 22:46 ` Greg KH 0 siblings, 1 reply; 5+ messages in thread From: Randy Dunlap @ 2011-07-01 22:43 UTC (permalink / raw) To: Stephen Rothwell, gregkh, driverdevel Cc: linux-next, LKML, Ian Abbott, Frank Mori Hess On Fri, 1 Jul 2011 16:05:23 +1000 Stephen Rothwell wrote: > Hi all, > > Changes since 20110630: drivers/staging/comedi/drivers/ni_labpc.c: In function 'labpc_common_attach': drivers/staging/comedi/drivers/ni_labpc.c:602: error: implicit declaration of function 'request_dma' drivers/staging/comedi/drivers/ni_labpc.c:608: error: implicit declaration of function 'claim_dma_lock' drivers/staging/comedi/drivers/ni_labpc.c:611: error: implicit declaration of function 'release_dma_lock' drivers/staging/comedi/drivers/ni_labpc.c: In function 'labpc_common_detach': drivers/staging/comedi/drivers/ni_labpc.c:803: error: implicit declaration of function 'free_dma' on x86_64 when CONFIG_ISA_DMA_API is not enabled. Since that driver handles both ISA and PCI devices, and the PCI parts are conditional, I guess that the ISA parts also need to be made conditional. --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: Tree for July 1 (staging/comedi) 2011-07-01 22:43 ` linux-next: Tree for July 1 (staging/comedi) Randy Dunlap @ 2011-07-01 22:46 ` Greg KH 2011-07-02 18:44 ` [PATCH -next] staging: fix comedi NI labpc driver build when ISA_DMA_API is not enabled Randy Dunlap 0 siblings, 1 reply; 5+ messages in thread From: Greg KH @ 2011-07-01 22:46 UTC (permalink / raw) To: Randy Dunlap Cc: Stephen Rothwell, driverdevel, linux-next, LKML, Ian Abbott, Frank Mori Hess On Fri, Jul 01, 2011 at 03:43:27PM -0700, Randy Dunlap wrote: > On Fri, 1 Jul 2011 16:05:23 +1000 Stephen Rothwell wrote: > > > Hi all, > > > > Changes since 20110630: > > > drivers/staging/comedi/drivers/ni_labpc.c: In function 'labpc_common_attach': > drivers/staging/comedi/drivers/ni_labpc.c:602: error: implicit declaration of function 'request_dma' > drivers/staging/comedi/drivers/ni_labpc.c:608: error: implicit declaration of function 'claim_dma_lock' > drivers/staging/comedi/drivers/ni_labpc.c:611: error: implicit declaration of function 'release_dma_lock' > drivers/staging/comedi/drivers/ni_labpc.c: In function 'labpc_common_detach': > drivers/staging/comedi/drivers/ni_labpc.c:803: error: implicit declaration of function 'free_dma' > > > on x86_64 when CONFIG_ISA_DMA_API is not enabled. > > Since that driver handles both ISA and PCI devices, > and the PCI parts are conditional, I guess that the ISA parts also > need to be made conditional. Ick. Care to make a patch? thanks, greg k-h ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH -next] staging: fix comedi NI labpc driver build when ISA_DMA_API is not enabled 2011-07-01 22:46 ` Greg KH @ 2011-07-02 18:44 ` Randy Dunlap 2011-07-02 21:07 ` Greg KH 0 siblings, 1 reply; 5+ messages in thread From: Randy Dunlap @ 2011-07-02 18:44 UTC (permalink / raw) To: Greg KH Cc: driverdevel, Stephen Rothwell, Frank Mori Hess, LKML, Ian Abbott, linux-next On Fri, 1 Jul 2011 15:46:04 -0700 Greg KH wrote: > Ick. > Care to make a patch? I'd rather that someone who has a strong interest in comedi (or NI labpc) do that, but here it is anyway. --- From: Randy Dunlap <randy.dunlap@oracle.com> Fix ni_labpc.c to build when CONFIG_ISA_DMA_API is not enabled. This is a driver that supports both ISA and PCI devices. It now builds when for PCI-only support or for both ISA and PCI device support. (It does not support ISA-only without PCI.) Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> --- drivers/staging/comedi/drivers/ni_labpc.c | 36 ++++++++++++++++++-- 1 file changed, 33 insertions(+), 3 deletions(-) --- linux-next-20110701.orig/drivers/staging/comedi/drivers/ni_labpc.c +++ linux-next-20110701/drivers/staging/comedi/drivers/ni_labpc.c @@ -213,8 +213,10 @@ static int labpc_attach(struct comedi_de static int labpc_cancel(struct comedi_device *dev, struct comedi_subdevice *s); static irqreturn_t labpc_interrupt(int irq, void *d); static int labpc_drain_fifo(struct comedi_device *dev); +#ifdef CONFIG_ISA_DMA_API static void labpc_drain_dma(struct comedi_device *dev); static void handle_isa_dma(struct comedi_device *dev); +#endif static void labpc_drain_dregs(struct comedi_device *dev); static int labpc_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_cmd *cmd); @@ -238,9 +240,9 @@ static int labpc_eeprom_write_insn(struc struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); -static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd); static void labpc_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd); #ifdef CONFIG_COMEDI_PCI +static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd); static int labpc_find_device(struct comedi_device *dev, int bus, int slot); #endif static int labpc_dio_mem_callback(int dir, int port, int data, @@ -527,7 +529,10 @@ int labpc_common_attach(struct comedi_de { struct comedi_subdevice *s; int i; - unsigned long dma_flags, isr_flags; + unsigned long isr_flags; +#ifdef CONFIG_ISA_DMA_API + unsigned long dma_flags; +#endif short lsb, msb; printk(KERN_ERR "comedi%d: ni_labpc: %s, io 0x%lx", dev->minor, @@ -587,6 +592,7 @@ int labpc_common_attach(struct comedi_de } dev->irq = irq; +#ifdef CONFIG_ISA_DMA_API /* grab dma channel */ if (dma_chan > 3) { printk(KERN_ERR " invalid dma channel %u\n", dma_chan); @@ -610,6 +616,7 @@ int labpc_common_attach(struct comedi_de set_dma_mode(devpriv->dma_chan, DMA_MODE_READ); release_dma_lock(dma_flags); } +#endif dev->board_name = thisboard->name; @@ -724,9 +731,15 @@ static int labpc_attach(struct comedi_de /* get base address, irq etc. based on bustype */ switch (thisboard->bustype) { case isa_bustype: +#ifdef CONFIG_ISA_DMA_API iobase = it->options[0]; irq = it->options[1]; dma_chan = it->options[2]; +#else + printk(KERN_ERR " this driver has not been built with ISA DMA " + "support.\n"); + return -EINVAL; +#endif break; case pci_bustype: #ifdef CONFIG_COMEDI_PCI @@ -797,10 +810,12 @@ int labpc_common_detach(struct comedi_de if (dev->subdevices) subdev_8255_cleanup(dev, dev->subdevices + 2); +#ifdef CONFIG_ISA_DMA_API /* only free stuff if it has been allocated by _attach */ kfree(devpriv->dma_buffer); if (devpriv->dma_chan) free_dma(devpriv->dma_chan); +#endif if (dev->irq) free_irq(dev->irq, dev); if (thisboard->bustype == isa_bustype && dev->iobase) @@ -1135,7 +1150,9 @@ static int labpc_ai_cmdtest(struct comed static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) { int channel, range, aref; +#ifdef CONFIG_ISA_DMA_API unsigned long irq_flags; +#endif int ret; struct comedi_async *async = s->async; struct comedi_cmd *cmd = &async->cmd; @@ -1182,6 +1199,7 @@ static int labpc_ai_cmd(struct comedi_de devpriv->write_byte(INIT_A1_BITS, dev->iobase + COUNTER_A_CONTROL_REG); +#ifdef CONFIG_ISA_DMA_API /* figure out what method we will use to transfer data */ if (devpriv->dma_chan && /* need a dma channel allocated */ /* @@ -1193,7 +1211,9 @@ static int labpc_ai_cmd(struct comedi_de thisboard->bustype == isa_bustype) { xfer = isa_dma_transfer; /* pc-plus has no fifo-half full interrupt */ - } else if (thisboard->register_layout == labpc_1200_layout && + } else +#endif + if (thisboard->register_layout == labpc_1200_layout && /* wake-end-of-scan should interrupt on fifo not empty */ (cmd->flags & TRIG_WAKE_EOS) == 0 && /* make sure we are taking more than just a few points */ @@ -1317,6 +1337,7 @@ static int labpc_ai_cmd(struct comedi_de labpc_clear_adc_fifo(dev); +#ifdef CONFIG_ISA_DMA_API /* set up dma transfer */ if (xfer == isa_dma_transfer) { irq_flags = claim_dma_lock(); @@ -1340,6 +1361,7 @@ static int labpc_ai_cmd(struct comedi_de devpriv->command3_bits |= DMA_EN_BIT | DMATC_INTR_EN_BIT; } else devpriv->command3_bits &= ~DMA_EN_BIT & ~DMATC_INTR_EN_BIT; +#endif /* enable error interrupts */ devpriv->command3_bits |= ERR_INTR_EN_BIT; @@ -1426,6 +1448,7 @@ static irqreturn_t labpc_interrupt(int i return IRQ_HANDLED; } +#ifdef CONFIG_ISA_DMA_API if (devpriv->current_transfer == isa_dma_transfer) { /* * if a dma terminal count of external stop trigger @@ -1437,6 +1460,7 @@ static irqreturn_t labpc_interrupt(int i handle_isa_dma(dev); } } else +#endif labpc_drain_fifo(dev); if (devpriv->status1_bits & TIMER_BIT) { @@ -1509,6 +1533,7 @@ static int labpc_drain_fifo(struct comed return 0; } +#ifdef CONFIG_ISA_DMA_API static void labpc_drain_dma(struct comedi_device *dev) { struct comedi_subdevice *s = dev->read_subdev; @@ -1571,13 +1596,16 @@ static void handle_isa_dma(struct comedi /* clear dma tc interrupt */ devpriv->write_byte(0x1, dev->iobase + DMATC_CLEAR_REG); } +#endif /* makes sure all data acquired by board is transferred to comedi (used * when acquisition is terminated by stop_src == TRIG_EXT). */ static void labpc_drain_dregs(struct comedi_device *dev) { +#ifdef CONFIG_ISA_DMA_API if (devpriv->current_transfer == isa_dma_transfer) labpc_drain_dma(dev); +#endif labpc_drain_fifo(dev); } @@ -1769,6 +1797,7 @@ static int labpc_eeprom_write_insn(struc return 1; } +#ifdef CONFIG_ISA_DMA_API /* utility function that suggests a dma transfer size in bytes */ static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd) { @@ -1792,6 +1821,7 @@ static unsigned int labpc_suggest_transf return size; } +#endif /* figures out what counter values to use based on command */ static void labpc_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd) ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH -next] staging: fix comedi NI labpc driver build when ISA_DMA_API is not enabled 2011-07-02 18:44 ` [PATCH -next] staging: fix comedi NI labpc driver build when ISA_DMA_API is not enabled Randy Dunlap @ 2011-07-02 21:07 ` Greg KH 0 siblings, 0 replies; 5+ messages in thread From: Greg KH @ 2011-07-02 21:07 UTC (permalink / raw) To: Randy Dunlap Cc: Ian Abbott, Frank Mori Hess, Stephen Rothwell, driverdevel, linux-next, LKML On Sat, Jul 02, 2011 at 11:44:36AM -0700, Randy Dunlap wrote: > On Fri, 1 Jul 2011 15:46:04 -0700 Greg KH wrote: > > > > Ick. > > Care to make a patch? > > I'd rather that someone who has a strong interest in comedi (or NI labpc) > do that, but here it is anyway. Thanks, I'll queue it up next week. greg k-h ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-07-02 21:09 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-07-01 6:05 linux-next: Tree for July 1 Stephen Rothwell 2011-07-01 22:43 ` linux-next: Tree for July 1 (staging/comedi) Randy Dunlap 2011-07-01 22:46 ` Greg KH 2011-07-02 18:44 ` [PATCH -next] staging: fix comedi NI labpc driver build when ISA_DMA_API is not enabled Randy Dunlap 2011-07-02 21:07 ` Greg KH
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).