* Re: linux-next: manual merge of the staging tree with the net tree
From: Arend van Spriel @ 2011-10-13 9:08 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Miller, netdev@vger.kernel.org, Jiri Pirko, Eliad Peller,
John W. Linville
In-Reply-To: <20111013164353.09c495e1b63d23e380cca1f7@canb.auug.org.au>
[-- Attachment #1.1: Type: text/plain, Size: 537 bytes --]
On 10/13/2011 07:43 AM, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflicts in
> drivers/staging/brcm80211/brcmfmac/dhd_linux.c and
> drivers/staging/brcm80211/brcmsmac/mac80211_if.c between commits from the
> net-next tree and commit fc2d6e573be6 ("staging: brcm80211: remove
> brcm80211 driver from the staging tree") from the staging tree.
>
> The latter removed the files, so I did that
Great. The move to drivers/net/wireless has completed. Thanks for this.
Gr. AvS
[-- Attachment #1.2: 0xB5E1A116.asc --]
[-- Type: application/pgp-keys, Size: 3165 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 900 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the gpio tree
From: Tomoya MORINAGA @ 2011-10-13 8:22 UTC (permalink / raw)
To: Grant Likely
Cc: Nobuhiro Iwamatsu, Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20111013035714.GD15829@ponder.secretlab.ca>
(2011/10/13 12:57), Grant Likely wrote:
> I've temporarily pushed out a commit that makes the pch and ml_ioh
> bool instead of tristate. If that other patch gets acked by Thomas,
> then I should probably take it through the gpio tree.
Let me clarify your intention.
Does previous patch for generic-chip posted by Nobuhiro enable
pch/ml_ioh gpio driver works on both module and built-in ?
If yes, why do you need to change tristate to bool ?
--
tomoya
ROHM Co., Ltd.
^ permalink raw reply
* linux-m68k.git is back
From: Geert Uytterhoeven @ 2011-10-13 7:22 UTC (permalink / raw)
To: Linux/m68k, linux-kernel, Stephen Rothwell; +Cc: Linux-Next
Hi all,
linux-m68k.git is back, in the usual place:
http://git.kernel.org/?p=linux/kernel/git/geert/linux-m68k.git
Interesting branches:
- master: main development, containing accepted changesets,
- m68k-queue: (almost) identical to master, but nice changesets
rebased on top of
the latest v* tag (incl. release candidates) from Linus (I don't
follow stable),
- for-linus: What I will ask Linus to pull in this merge window,
- for-next: What's destined for the next merge window,
- for-*: What's destined for a specific merge window. The latest overlap with
for-linus/for-next,
- m68k-v*: State of m68k-queue when v* was current.
master and m68k-v* are never rebased. m68k-queue and for-* are rebased when a
new v* comes out.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply
* linux-next: Tree for Oct 13
From: Stephen Rothwell @ 2011-10-13 7:16 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 40621 bytes --]
Hi all,
The linux-next tree is still available from
git://github.com/sfrothwell/linux-next.git as a temporary measure while
the kernel.org servers are unavailable.
It may also turn up on git.kernel.org (depending on the mirroring). The
patch is still absent, however.
Tomorrow will be the last linux-next release before (probably) November
1st (and therefore presumably the merge window for v3.2).
Changes since 20111012:
The arm-soc tree lost a conflict, but gained more against the arm tree.
The xfs tree lost its conflicts.
The wireless tree lost its build failure.
The gpio tree still has its build failure so I used the version from
next-20111005.
The staging tree gained conflicts agains the net-next and fbdev trees.
The moduleh tree gained conflicts agains the staging, and s5p trees.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 201 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
CONFLICT (content): Merge conflict in arch/arm/plat-omap/Kconfig
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/gpio.h
CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-seaboard.h
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-paz00.h
CONFLICT (modify/delete): arch/arm/mach-nuc93x/Makefile.boot deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-nuc93x/Makefile.boot left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/gpio.h
CONFLICT (content): Merge conflict in arch/arm/mach-ep93xx/Makefile.boot
CONFLICT (modify/delete): arch/arm/mach-at91/board-usb-a9260.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-at91/board-usb-a9260.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/kernel/smp.c
CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug
CONFLICT (content): Merge conflict in arch/arm/Kconfig
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c arch/arm/mach-nuc93x/Makefile.boot
Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
Merging at91/at91-next
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c
Merging davinci/davinci-next
Merging i.MX/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/mm.c
Merging linux-spec/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/Kconfig
Merging tegra/for-next
Merging xilinx/arm-next
Merging blackfin/for-linus
Merging c6x/for-linux-next
Merging cris/for-next
Merging quilt/hexagon
Merging ia64/next
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging openrisc/for-upstream
Merging parisc/for-next
Merging powerpc/next
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
Merging unicore32/unicore32
Merging xtensa/master
Merging ceph/for-next
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
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 hid/for-next
CONFLICT (content): Merge conflict in drivers/hid/hid-wacom.c
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 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
Merging ibft/master
Merging scsi/master
Merging iscsi-target/for-next
Merging slave-dma/next
Merging async_tx/next
Merging net-next/master
CONFLICT (content): Merge conflict in drivers/s390/cio/qdio_main.c
CONFLICT (modify/delete): arch/powerpc/configs/40x/hcu4_defconfig deleted in HEAD and modified in net-next/master. Version net-next/master of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
$ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
Merging wireless/master
Applying: net: wireless: brcm80211: include module.h
Merging bluetooth/master
CONFLICT (content): Merge conflict in net/bluetooth/smp.c
CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
CONFLICT (content): Merge conflict in net/bluetooth/hci_core.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
CONFLICT (content): Merge conflict in sound/mips/Kconfig
CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/db1x00/platform.c
CONFLICT (content): Merge conflict in arch/arm/plat-omap/devices.c
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
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 (content): Merge conflict in drivers/mmc/host/au1xmmc.c
CONFLICT (content): Merge conflict in drivers/mmc/core/sd.c
CONFLICT (content): Merge conflict in drivers/mmc/core/core.c
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-u300/include/mach/irqs.h
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-mx31moboard.c
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/fbdev-next
CONFLICT (content): Merge conflict in drivers/video/Kconfig
Merging viafb/viafb-next
Merging omap_dss2/for-next
CONFLICT (modify/delete): drivers/video/omap/lcd_overo.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_overo.c left in tree.
CONFLICT (modify/delete): drivers/video/omap/lcd_ldp.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_ldp.c left in tree.
CONFLICT (modify/delete): drivers/video/omap/lcd_apollon.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_apollon.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-rx51.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-ldp.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-h4.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-apollon.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-4430sdp.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-2430sdp.c
$ git rm -f drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c drivers/video/omap/lcd_overo.c
Merging regulator/for-next
Applying: regulator: using module related services requires module.h
Merging security/next
CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging iommu/next
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in drivers/net/Kconfig
CONFLICT (modify/delete): arch/arm/mach-nuc93x/time.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-nuc93x/time.c left in tree.
CONFLICT (content): Merge conflict in Documentation/PCI/pci.txt
$ git rm -f arch/arm/mach-nuc93x/time.c
Merging audit/for-next
Merging pm/linux-next
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ap4evb.c
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging edac/linux_next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
Merging edac-amd/for-next
Merging devicetree/devicetree/next
Merging spi/spi/next
Merging gpio/gpio/next
$ git reset --hard HEAD^
Merging refs/next/20111005/gpio
Merging tip/auto-latest
CONFLICT (content): Merge conflict in drivers/iommu/Makefile
Merging rcu/rcu/next
Merging kmemleak/kmemleak
Merging kvm/kvm-updates/3.2
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen/upstream/xen
Merging xen-two/linux-next
CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
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
CONFLICT (content): Merge conflict in drivers/mfd/wm831x-spi.c
Merging driver-core/driver-core-next
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices.c
Merging tty/tty-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
Merging usb/usb-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Makefile
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/staging/zram/zram_drv.c
CONFLICT (content): Merge conflict in drivers/staging/xgifb/XGI_main_26.c
CONFLICT (modify/delete): drivers/staging/rtl8192e/r8192E_core.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8192e/r8192E_core.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/hv/Makefile
CONFLICT (content): Merge conflict in drivers/staging/et131x/et1310_tx.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc.c
CONFLICT (modify/delete): drivers/staging/brcm80211/brcmsmac/mac80211_if.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/brcm80211/brcmsmac/mac80211_if.c left in tree.
CONFLICT (modify/delete): drivers/staging/brcm80211/brcmfmac/dhd_linux.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/brcm80211/brcmfmac/dhd_linux.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/misc/altera-stapl/altera.c
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in drivers/Kconfig
$ git rm -f drivers/staging/brcm80211/brcmfmac/dhd_linux.c drivers/staging/brcm80211/brcmsmac/mac80211_if.c drivers/staging/rtl8192e/r8192E_core.c
Merging bkl-config/config
Merging tmem/tmem
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 sound/soc/soc-io.c
CONFLICT (content): Merge conflict in include/linux/dmaengine.h
CONFLICT (modify/delete): drivers/staging/iio/industrialio-ring.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/staging/iio/industrialio-ring.c left in tree.
CONFLICT (modify/delete): drivers/staging/brcm80211/brcmfmac/dhd_sdio.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/staging/brcm80211/brcmfmac/dhd_sdio.c left in tree.
CONFLICT (modify/delete): drivers/staging/brcm80211/brcmfmac/dhd_linux.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/staging/brcm80211/brcmfmac/dhd_linux.c left in tree.
CONFLICT (modify/delete): drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c left in tree.
CONFLICT (modify/delete): drivers/staging/brcm80211/brcmfmac/bcmsdh.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/staging/brcm80211/brcmfmac/bcmsdh.c left in tree.
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/dibx000_common.c
CONFLICT (modify/delete): arch/arm/plat-samsung/dev-wdt.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-samsung/dev-wdt.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-samsung/dev-usb.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-samsung/dev-usb.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-samsung/dev-ts.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-samsung/dev-ts.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-samsung/dev-rtc.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-samsung/dev-rtc.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-samsung/dev-pwm.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-samsung/dev-pwm.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-samsung/dev-nand.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-samsung/dev-nand.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-samsung/dev-ide.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-samsung/dev-ide.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-samsung/dev-asocdma.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-samsung/dev-asocdma.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-samsung/dev-adc.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-samsung/dev-adc.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-s5p/dev-onenand.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-s5p/dev-onenand.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-s5p/dev-ehci.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-s5p/dev-ehci.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-s3c24xx/devs.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-s3c24xx/devs.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/mm.c
$ git rm -f drivers/staging/iio/industrialio-ring.c
$ git rm -f drivers/staging/brcm80211/brcmfmac/bcmsdh.c drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c drivers/staging/brcm80211/brcmfmac/dhd_linux.c drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
$ git rm -f arch/arm/plat-s3c24xx/devs.c arch/arm/plat-s5p/dev-ehci.c arch/arm/plat-s5p/dev-onenand.c arch/arm/plat-samsung/dev-adc.c arch/arm/plat-samsung/dev-asocdma.c arch/arm/plat-samsung/dev-ide.c arch/arm/plat-samsung/dev-nand.c arch/arm/plat-samsung/dev-pwm.c arch/arm/plat-samsung/dev-rtc.c arch/arm/plat-samsung/dev-ts.c arch/arm/plat-samsung/dev-usb.c arch/arm/plat-samsung/dev-wdt.c
Applying: block/bsg-lib.c: change module.h -> export.h in power/common.c
Applying: mmc: using module_param requires the inclusion of moduleparam.h
Applying: NFC: use of module facilities requires the inclusion of module.h
Applying: arm: Add export.h to recently added files for EXPORT_SYMBOL
CONFLICT (modify/delete): arch/arm/plat-s5p/dev-tv.c deleted in HEAD and modified in arm: Add export.h to recently added files for EXPORT_SYMBOL. Version arm: Add export.h to recently added files for EXPORT_SYMBOL of arch/arm/plat-s5p/dev-tv.c left in tree.
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: PM QoS: include export.h in qos.c for EXPORT_SYMBOL
Applying: net: Add export.h to nfc/nci/core.c
Applying: scsi: Add export.h to drivers/scsi/libsas/sas_host_smp.c
Applying: drivers/md: change module.h -> export.h in persistent-data/dm-*
Applying: drivers/net: Add module.h to wireless/ath/ath6kl/sdio.c
Applying: drivers/net: wireless/ath/ath5k/debug.c does not need module.h
Applying: drivers/bcma: driver_chipcommon_pmu.c needs export.h for EXPORT_SYMBOL
Applying: drivers/base: change module.h -> export.h in power/common.c
Applying: drivers/base: Add export.h to regmap/regcache.c
Applying: pinctrl: EXPORT_SYMBOL needs export.h
Applying: ath6kl: THIS_MODULES needs export.h
Applying: ath6kl: module_param needs the inclusion of moduleparam.h
Applying: rtlwifi: use of module_param requires the inclusion of moduleparam.h
Applying: staging: Add export.h to recently added files for EXPORT_SYMBOL
Applying: x86: Add export.h to arch/x86/kernel/cpu/perf_event_intel.c
Applying: x86, nmi: include export.h for EXPORT_SYMBOL
Applying: net: wireless; brcm80211: add export.h
CONFLICT (content): Merge conflict in drivers/net/wireless/brcm80211/brcmutil/wifi.c
Applying: net: wireless; brcm80211: add 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: include/linux/dmar.h: forward-declare struct acpi_dmar_header
Applying: drivers/net/ethernet/i825xx/3c505.c: fix build with dynamic debug
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: x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode
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: hp_accel: Add a new PNP id
Applying: hp_accel: Add axis-mapping for HP ProBook / EliteBook
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: 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: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
Applying: drivers/gpu/vga/vgaarb.c: add missing kfree
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-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/sd.c: use ida_simple_get() and ida_simple_remove() in place of boilerplate code
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: add half second delay to PCI PM reset code
Applying: cciss: auto engage SCSI mid layer at driver load time
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: Cross Memory Attach
Applying: cross-memory-attach-update
Applying: cross-memory-attach-v4
Applying: mm: compaction: trivial clean up in acct_isolated()
Applying: mm: change isolate mode from #define to bitwise type
Applying: mm-change-isolate-mode-from-define-to-bitwise-type-fix
Applying: mm: compaction: make isolate_lru_page() filter-aware
Applying: mm-compaction-make-isolate_lru_page-filter-aware-fix
Applying: mm: zone_reclaim: make isolate_lru_page() filter-aware
Applying: mm-zone_reclaim-make-isolate_lru_page-filter-aware-fix
Applying: mm: migration: clean up unmap_and_move()
Applying: radix_tree: clean away saw_unset_tag leftovers
Applying: vmscan: add block plug for page reclaim
Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
Applying: mm/page-writeback.c: document bdi_min_ratio
Applying: oom: avoid killing kthreads if they assume the oom killed thread's mm
Applying: oom: remove oom_disable_count
Applying: oom: fix race while temporarily setting current's oom_score_adj
Applying: tmpfs: add "tmpfs" to the Kconfig prompt to make it obvious.
Applying: mm: output a list of loaded modules when we hit bad_page()
Applying: mm: vmscan: drop nr_force_scan[] from get_scan_count
Applying: mm: distinguish between mlocked and pinned pages
Applying: mm: add comments to explain mm_struct fields
Applying: mm-add-comments-to-explain-mm_struct-fields-fix
Applying: mm: vmscan: do not writeback filesystem pages in direct reclaim
Applying: mm: vmscan: remove dead code related to lumpy reclaim waiting on pages under writeback
Applying: xfs: warn if direct reclaim tries to writeback pages
Applying: ext4: warn if direct reclaim tries to writeback pages
Applying: mm: vmscan: do not writeback filesystem pages in kswapd except in high priority
Applying: mm: vmscan: throttle reclaim if encountering too many dirty pages under writeback
Applying: mm-vmscan-throttle-reclaim-if-encountering-too-many-dirty-pages-under-writeback-update
Applying: mm: vmscan: immediately reclaim end-of-LRU dirty pages when writeback completes
Applying: vmscan: count pages into balanced for zone with good watermark
Applying: mm/debug-pagealloc.c: use plain __ratelimit() instead of printk_ratelimit()
Applying: lib/string.c: introduce memchr_inv()
Applying: lib-stringc-introduce-memchr_inv-fix-kernel-doc-for-memchr_inv
Applying: mm/debug-pagealloc.c: use memchr_inv
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: mm: avoid null pointer access in vm_struct via /proc/vmallocinfo
Applying: vmscan: promote shared file mapped pages
Applying: vmscan: activate executable pages after first usage
Applying: memblock: add memblock_start_of_DRAM()
Applying: memblock: add NO_BOOTMEM config symbol
Applying: mremap: check for overflow using deltas
Applying: mremap: avoid sending one IPI per page
Applying: thp: mremap support and TLB optimization
Applying: thp-mremap-support-and-tlb-optimization-fix
Applying: thp-mremap-support-and-tlb-optimization-fix-fix
Applying: thp-mremap-support-and-tlb-optimization-fix-fix-fix
Applying: include/asm-generic/page.h: calculate virt_to_page and page_to_virt via predefined macro
Applying: mm: iov_iter: have iov_iter_advance() decrement nr_segs appropriately
Applying: mm: neaten warn_alloc_failed
Applying: mm-neaten-warn_alloc_failed-fix
Applying: debug-pagealloc: add support for highmem pages
Applying: debug-pagealloc-add-support-for-highmem-pages-fix
Applying: kswapd: avoid unnecessary rebalance after an unsuccessful balancing
Applying: mm: add free_hot_cold_page_list() helper
Applying: mm/memblock.c: small function definition fixes
Applying: mm: compaction: compact unevictable pages
Applying: mm-compaction-compact-unevictable-pages-checkpatch-fixes
Applying: mm: compaction: accounting fix
Applying: kswapd: assign new_order and new_classzone_idx after wakeup in sleeping
Applying: mm: fix page-faults detection in swap-token logic
Applying: mm/vmalloc.c: report more vmalloc failures
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: thp-tail-page-refcounting-fix-6
Applying: ksm: fix the comment of try_to_unmap_one()
Applying: mm-add-comment-explaining-task-state-setting-in-bdi_forker_thread-fix
Applying: vmscan: fix shrinker callback bug in fs/super.c
Applying: mm/mmap.c: eliminate the ret variable from mm_take_all_locks()
Applying: mm-mmapc-eliminate-the-ret-variable-from-mm_take_all_locks-fix
Applying: fs/buffer.c: add device information for error output in __find_get_block_slow()
Applying: HWPOISON: convert pr_debug()s to pr_info()s
Applying: mm: compaction: make compact_zone_order() static
Applying: mm: fix kunmap_high() comment
Applying: vmscan.c: fix invalid strict_strtoul() check in write_scan_unevictable_node()
Applying: mm: disable user interface to manually rescue unevictable pages
Applying: mm/memblock.c: quiet sparse noise
Applying: mm/thrash.c: quiet sparse noise
Applying: mm/mempolicy.c: quiet sparse noise
Applying: mm/huge_memory.c: quiet sparse noise
Applying: vmscan: add barrier to prevent evictable page in unevictable list
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: alpha: wire up accept4 syscall
Applying: alpha: wire up sendmmsg syscall
Applying: intel_idle: fix API misuse
Applying: intel_idle: disable auto_demotion for hotplugged CPUs
Applying: fs/pipe.c: add ->statfs callback for pipefs
Applying: lib/Kconfig.debug: fix help message for DEFAULT_HUNG_TASK_TIMEOUT
Applying: hwmon: convert idr to ida and use ida_simple interface
Applying: drivers/hwmon/hwmon.c: convert idr to ida and use ida_simple_get()
Applying: lis3lv02d: avoid divide by zero due to unchecked
Applying: lis3: update maintainer information
Applying: lis3: add support for HP EliteBook 2730p
Applying: lis3: add support for HP EliteBook 8540w
Applying: hp_accel: add HP ProBook 655x
Applying: lis3: free regulators if probe() fails
Applying: lis3: use consistent naming of variables
Applying: lis3: change exported function to use passed parameter
Applying: lis3: remove the references to the global variable in core driver
Applying: lis3-remove-the-references-to-the-global-variable-in-core-driver-fix
Applying: lis3lv02d: make regulator API usage unconditional
Applying: driver/misc/fsa9480.c fix potential null-pointer dereference
Applying: stop_machine: make stop_machine safe and efficient to call early
Applying: stop_machine-make-stop_machine-safe-and-efficient-to-call-early-v3.
Applying: watchdog: move watchdog_*_all_cpus under CONFIG_SYSCTL
Applying: dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions
Applying: dynamic_debug: remove num_enabled accounting
Applying: dynamic_debug: use a single printk() to emit messages
Applying: dynamic_debug: fix undefined reference to `__netdev_printk'
Applying: printk: add module parameter ignore_loglevel to control ignore_loglevel
Applying: printk: add ignore_loglevel as module parameter
Applying: printk: add console_suspend module parameter
Applying: printk: fix bounds checking for log_prefix
Applying: printk: remove bounds checking for log_prefix
Applying: treewide: use __printf not __attribute__((format(printf,...)))
Applying: treewide-use-__printf-not-__attribute__formatprintf-fix
Applying: treewide-use-__printf-not-__attribute__formatprintf-checkpatch-fixes
Applying: fs/namei.c: remove unused getname_flags()
Applying: poll: add poll_requested_events() function
Applying: MAINTAINERS: add new entry for ideapad-laptop
Applying: video/backlight: remove obsolete cleanup for clientdata
Applying: backlight: fix broken regulator API usage in l4f00242t03
Applying: drivers/video/backlight/l4f00242t03.c: use gpio_request_one() to simplify error handling
Applying: backlight: rename corgibl_limit_intensity() to genericbl_limit_intensity()
Applying: leds: Renesas TPU LED driver
Applying: leds-renesas-tpu-led-driver-v2-fix
Applying: drivers/leds/led-triggers.c: fix memory leak
Applying: drivers/leds/leds-lm3530.c: remove obsolete cleanup for clientdata
Applying: drivers/leds/leds-renesas-tpu.c: update driver to use workqueue
Applying: drivers/leds/leds-renesas-tpu.c: move Renesas TPU LED driver platform data
Applying: drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing
Applying: lib/kstrtox: common code between kstrto*() and simple_strto*() functions
Applying: lib/spinlock_debug.c: print owner on spinlock lockup
Applying: lib/bitmap.c: quiet sparse noise about address space
Applying: lib-bitmapc-quiet-sparse-noise-about-address-space-fix
Applying: lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef
Applying: lib/idr.c: fix comment for ida_get_new_above()
Applying: llist: using in_nmi requires including hardirq.h
Applying: llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
Applying: kernel.h/checkpatch: mark strict_strto<foo> and simple_strto<foo> as obsolete
Applying: lib/crc: add slice by 8 algorithm to crc32.c
Applying: lib-crc-add-slice-by-8-algorithm-to-crc32c-fix
Applying: epoll: fix spurious lockdep warnings
Applying: epoll: limit paths
Applying: binfmt_elf: fix PIE execution with randomization disabled
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: 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: 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: 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-introduce-shm_rmid_forced-sysctl-testing
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: sysctl: add support for poll()
Applying: sysctl-add-support-for-poll-fix
Applying: sysctl: make CONFIG_SYSCTL_SYSCALL default to n
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: aio: allocate kiocbs in batches
Applying: fs/direct-io.c: salcuate fs_count correctly in get_more_blocks()
Applying: dio: separate fields only used in the submission path from struct dio
Applying: dio-separate-fields-only-used-in-the-submission-path-from-struct-dio-checkpatch-fixes
Applying: dio: fix a wrong comment
Applying: dio: rearrange fields in dio/dio_submit to avoid holes
Applying: dio: use a slab cache for struct dio
Applying: dio: separate map_bh from dio
Applying: dio: inline the complete submission path
Applying: dio-inline-the-complete-submission-path-v2-checkpatch-fixes
Applying: dio: merge direct_io_walker() into __blockdev_direct_IO()
Applying: dio-merge-direct_io_walker-into-__blockdev_direct_io-checkpatch-fixes
Applying: dio: remove unnecessary dio argument from dio_pages_present()
Applying: dio: remove unused dio parameter from dio_bio_add_page()
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: ipc/mqueue: vlammoc requires vmalloc.h
Applying: cgroups: ERR_PTR needs err.h
Applying: include/linux/bio.h: use a static inline function for bio_integrity_clone()
Merging akpm
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* currently missing kernel devel trees
From: Stephen Rothwell @ 2011-10-13 6:43 UTC (permalink / raw)
To: LKML; +Cc: linux-next, Linus, Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 1184 bytes --]
Hi all,
With the mrege window approaching (sometime) I thought I would see how
many of the 200 odd trees that are included in linux-next are actually
currently inaccessible. The list below (of 63 trees) is a couple of days
out of date. These are the trees that were hosted on git.kernel.org that
have not popped up anywhere else (or, at least I have not been informed
is they have) nor been resurrected on kernel.org.
Some of these may be no longer useful (please tell me). Some may have no
commits for v3.2. But I bet that at leaset some do.
linux-spec
omap
pxa
blackfin
m68k
4xx
galak
sh
rmobile
tile
unicore32
xtensa
configfs
ecryptfs
ext3
fatfs
fuse
gfs2
hfsplus
jfs
logfs
nilfs2
omfs
squashfs
udf
vfs
vfs-scale
pci
i2c
jdelvare-hwmon
docs
kconfig
idle-test
powertools
cpupowerutils
dlm
swiotlb
ibft
iscsi-target
async_tx
bluetooth
cpufreq
input-mt
lsm
pcmcia
kgdb
uclinux
hdlc
drm
agp
watchdog
bdev
nommu
audit
irda
ptrace
sfi
asm-generic
drivers-x86
hwpoison
sysctl
namespace
bkl-config
--
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 moduleh tree with the tree
From: Stephen Rothwell @ 2011-10-13 6:31 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 422 bytes --]
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
arch/arm/plat-s5p/dev-tv.c between commits from the s5p tree and fixup
patch "arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch" from
the moduleh tree.
The file above has been removed, so I dropped that hunk from the patch.
--
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 moduleh tree with the s5p tree
From: Stephen Rothwell @ 2011-10-13 6:25 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Kukjin Kim
[-- Attachment #1: Type: text/plain, Size: 943 bytes --]
Hi Paul,
Today's linux-next merge of the moduleh tree got conflicts in
arch/arm/plat-s3c24xx/devs.c, arch/arm/plat-s5p/dev-ehci.c,
arch/arm/plat-s5p/dev-onenand.c, arch/arm/plat-samsung/dev-adc.c,
arch/arm/plat-samsung/dev-asocdma.c, arch/arm/plat-samsung/dev-ide.c,
arch/arm/plat-samsung/dev-nand.c, arch/arm/plat-samsung/dev-pwm.c,
arch/arm/plat-samsung/dev-rtc.c, arch/arm/plat-samsung/dev-ts.c,
arch/arm/plat-samsung/dev-usb.c and arch/arm/plat-samsung/dev-wdt.c
between commits from the s5p tree and commits 8d7f68e196ec ("arm: fix
implicit use of asm/sizes.h in plat-s5p/plat-samsung") and 1c28ea1c50da
("arm: Add export.h to ARM specific files as required") from the moduleh
tree.
The s5p tree commits effectively removed these files, so I did that.
Hopefully the fixups from the moduleh tree are no longer required or
covered by other changes.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with the staging tree
From: Stephen Rothwell @ 2011-10-13 6:20 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Arend van Spriel, Greg KH
[-- Attachment #1: Type: text/plain, Size: 584 bytes --]
Hi Paul,
Today's linux-next merge of the moduleh tree got conflicts in
drivers/staging/brcm80211/brcmfmac/bcmsdh.c,
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c,
drivers/staging/brcm80211/brcmfmac/dhd_linux.c and
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c between commit fc2d6e573be6
("staging: brcm80211: remove brcm80211 driver from the staging tree")
from the staging tree and commits from the moduleh tree.
The former removed the files, so I did that.
--
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 staging tree with the net tree
From: Greg KH @ 2011-10-13 6:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Arend van Spriel, David Miller, netdev,
Jiri Pirko, Eliad Peller, John W. Linville
In-Reply-To: <20111013164353.09c495e1b63d23e380cca1f7@canb.auug.org.au>
On Thu, Oct 13, 2011 at 04:43:53PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflicts in
> drivers/staging/brcm80211/brcmfmac/dhd_linux.c and
> drivers/staging/brcm80211/brcmsmac/mac80211_if.c between commits from the
> net-next tree and commit fc2d6e573be6 ("staging: brcm80211: remove
> brcm80211 driver from the staging tree") from the staging tree.
>
> The latter removed the files, so I did that
Wonderful, thanks for doing that.
greg
^ permalink raw reply
* linux-next: manual merge of the staging tree with the fbdev tree
From: Stephen Rothwell @ 2011-10-13 6:02 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Laurent Pinchart,
Florian Tobias Schandinat, linux-fbdev, Aaro Koskinen
[-- Attachment #1: Type: text/plain, Size: 1351 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/xgifb/XGI_main_26.c between commit 0d5c6ca30bb0
("staging: xgifb: use display information in info not in var for
panning") from the fbdev tree and commit fd26d42019cb ("staging: xgifb:
avoid direct references xgi_video_info") from the staging tree.
I fixed it up (I think - see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/xgifb/XGI_main_26.c
index f8b88ad,36db231..0000000
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@@ -1363,8 -1300,8 +1300,8 @@@ static int XGIfb_do_set_var(struct fb_v
return 0;
}
- #ifdef XGIFB_PAN
- static int XGIfb_pan_var(struct fb_var_screeninfo *var, struct fb_info *info)
+ static int XGIfb_pan_var(struct xgifb_video_info *xgifb_info,
- struct fb_var_screeninfo *var)
++ struct fb_var_screeninfo *var, struct fb_info *info)
{
unsigned int base;
@@@ -1686,7 -1634,7 +1624,7 @@@ static int XGIfb_pan_display(struct fb_
> info->var.yres_virtual)
return -EINVAL;
}
- err = XGIfb_pan_var(var, info);
- err = XGIfb_pan_var(xgifb_info, var);
++ err = XGIfb_pan_var(xgifb_info, var, info);
if (err < 0)
return err;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the staging tree with the net tree
From: Stephen Rothwell @ 2011-10-13 5:43 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Arend van Spriel, David Miller, netdev,
Jiri Pirko, Eliad Peller, John W. Linville
[-- Attachment #1: Type: text/plain, Size: 491 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflicts in
drivers/staging/brcm80211/brcmfmac/dhd_linux.c and
drivers/staging/brcm80211/brcmsmac/mac80211_if.c between commits from the
net-next tree and commit fc2d6e573be6 ("staging: brcm80211: remove
brcm80211 driver from the staging tree") from the staging tree.
The latter removed the files, so I did that
--
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 gpio tree
From: Grant Likely @ 2011-10-13 3:57 UTC (permalink / raw)
To: Tomoya MORINAGA
Cc: Nobuhiro Iwamatsu, Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <4E9551B8.4060601@dsn.lapis-semi.com>
On Wed, Oct 12, 2011 at 05:37:12PM +0900, Tomoya MORINAGA wrote:
> (2011/10/12 16:21), Nobuhiro Iwamatsu wrote:
> >This is a problem of generic-chip.
> >I created the patch and contributed the point to LKML.
> >He forgot to put you into CC, sorry.
> >
> >Please check LKML for subject of "[PATCH] irq: Add EXPORT_SYMBOL to
> >function of irq generic-chip".
> >
>
> OK,
> We will be able to use our GPIO driver with module soon.
> Good information.
I've temporarily pushed out a commit that makes the pch and ml_ioh
bool instead of tristate. If that other patch gets acked by Thomas,
then I should probably take it through the gpio tree.
g.
^ permalink raw reply
* Re: linux-next: build warnings after merge of the moduleh tree
From: Paul Gortmaker @ 2011-10-13 2:00 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Arend van Spriel, John W. Linville
In-Reply-To: <20111012173019.37dbde1f6797be48f8ad7c62@canb.auug.org.au>
On Wed, Oct 12, 2011 at 2:30 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Paul,
>
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) produced these warnings:
>
> drivers/net/wireless/brcm80211/brcmutil/wifi.c:43:1: warning: data definition has no type or storage class [enabled by default]
> drivers/net/wireless/brcm80211/brcmutil/wifi.c:43:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
> drivers/net/wireless/brcm80211/brcmutil/wifi.c:43:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/net/wireless/brcm80211/brcmutil/wifi.c:79:1: warning: data definition has no type or storage class [enabled by default]
> drivers/net/wireless/brcm80211/brcmutil/wifi.c:79:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
> drivers/net/wireless/brcm80211/brcmutil/wifi.c:79:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/net/wireless/brcm80211/brcmutil/wifi.c:136:1: warning: data definition has no type or storage class [enabled by default]
> drivers/net/wireless/brcm80211/brcmutil/wifi.c:136:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
> drivers/net/wireless/brcm80211/brcmutil/wifi.c:136:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c:348:1: warning: data definition has no type or storage class [enabled by default]
> drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c:348:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
> drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c:348:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c:363:1: warning: data definition has no type or storage class [enabled by default]
> drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c:363:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
> drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c:363:1: warning: parameter names (without types) in function declaration [enabled by default]
>
> Caused by commit 5b435de0d786 ("net: wireless: add brcm80211 drivers")
> from the wireless tree interacting with the module.h split up.
>
> I have added the following patch:
Thanks Stephen, added to the post merge queue with the other post-merge
wireless export.h additions.
Paul.
>
> From 9ea7a8cb92322497a92d464e6e40cd1da20fbcde Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 12 Oct 2011 17:22:53 +1100
> Subject: [PATCH] net: wireless; brcm80211: add export.h
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 1 +
> drivers/net/wireless/brcm80211/brcmutil/wifi.c | 2 ++
> 2 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> index bff9dcd..76c78fd 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> @@ -21,6 +21,7 @@
> #include <linux/pci_ids.h>
> #include <linux/sched.h>
> #include <linux/completion.h>
> +#include <linux/export.h>
> #include <linux/mmc/sdio.h>
> #include <linux/mmc/sdio_func.h>
> #include <linux/mmc/card.h>
> diff --git a/drivers/net/wireless/brcm80211/brcmutil/wifi.c b/drivers/net/wireless/brcm80211/brcmutil/wifi.c
> index 509e25c..5616fa8 100644
> --- a/drivers/net/wireless/brcm80211/brcmutil/wifi.c
> +++ b/drivers/net/wireless/brcm80211/brcmutil/wifi.c
> @@ -13,6 +13,8 @@
> * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
> * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> */
> +#include <linux/export.h>
> +
> #include <brcmu_wifi.h>
>
> /*
> --
> 1.7.6.3
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
^ permalink raw reply
* Re: linux-next: Tree for Oct 12 (sound/soc/codecs/wm1250-ev1)
From: Randy Dunlap @ 2011-10-13 0:46 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, alsa-devel, Liam Girdwood, Mark Brown
In-Reply-To: <20111012175425.a2e3e6e6a92265e433aeca25@canb.auug.org.au>
On 10/11/2011 11:54 PM, Stephen Rothwell wrote:
> Hi all,
>
> The linux-next tree is now available from
> git://github.com/sfrothwell/linux-next.git as a temporary measure while
> the kernel.org servers are unavailable.
>
> It may also turn up on git.kernel.org (depending on the mirroring). The
> patch is still absent, however.
When no GPIO kconfig options are enabled:
(not GPIOLIB, not GENERIC_GPIO):
sound/soc/codecs/wm1250-ev1.c:32:14: error: array type has incomplete element type
sound/soc/codecs/wm1250-ev1.c:126:18: warning: type defaults to 'int' in type name
sound/soc/codecs/wm1250-ev1.c:126:18: warning: type defaults to 'int' in type name
sound/soc/codecs/wm1250-ev1.c:126:18: error: negative width in bit-field '<anonymous>'
sound/soc/codecs/wm1250-ev1.c:134:42: warning: type defaults to 'int' in type name
sound/soc/codecs/wm1250-ev1.c:134:42: warning: type defaults to 'int' in type name
sound/soc/codecs/wm1250-ev1.c:134:42: error: negative width in bit-field '<anonymous>'
sound/soc/codecs/wm1250-ev1.c:155:34: warning: type defaults to 'int' in type name
sound/soc/codecs/wm1250-ev1.c:155:34: warning: type defaults to 'int' in type name
sound/soc/codecs/wm1250-ev1.c:155:34: error: negative width in bit-field '<anonymous>'
This was on an i386 build, but that shouldn't matter.
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: linux-next: manual merge of the arm-soc tree with the arm tree
From: Stephen Rothwell @ 2011-10-13 0:17 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-next, linux-kernel, Nicolas Pitre, Russell King
In-Reply-To: <20111013111137.4abf421857ff0ec7ac1edb41@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 996 bytes --]
Hi Arnd,
On Thu, 13 Oct 2011 11:11:37 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/Kconfig between commit d0ee9f404f42 ("ARM: limit CONFIG_HAVE_IDE
> to platforms that do") from the arm tree and commit 06a4eada6a73 ("ARM:
> switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H") from the arm-soc
> tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
This also affected arch/arm/plat-omap/Kconfig
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/plat-omap/Kconfig
index 5b605a9,6d49d2f1d..0000000
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@@ -14,7 -14,7 +14,8 @@@ config ARCH_OMAP
select CLKDEV_LOOKUP
select CLKSRC_MMIO
select GENERIC_IRQ_CHIP
+ select HAVE_IDE
+ select HAVE_MACH_MEMORY_H
help
"Systems based on omap7xx, omap15xx or omap16xx"
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the arm tree
From: Stephen Rothwell @ 2011-10-13 0:15 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-next, linux-kernel, Sascha Hauer, Russell King,
Nicolas Pitre
[-- Attachment #1: Type: text/plain, Size: 532 bytes --]
Hi Arnd,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-ep93xx/Makefile.boot between commit 86783a0c544d ("ARM:
7022/1: allow to detect conflicting zreladdrs") from the arm tree and
commit 758ab7e2046d ("ARM: mach-ep93xx: remove mach/memory.h and Kconfig
selection of SDRAM bank") from the arm-soc tree.
The latter commit just emptied the file (without deleteing it), so I did
that.
--
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 arm-soc tree with the arm tree
From: Stephen Rothwell @ 2011-10-13 0:11 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-next, linux-kernel, Nicolas Pitre, Russell King
[-- Attachment #1: Type: text/plain, Size: 2508 bytes --]
Hi Arnd,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/Kconfig between commit d0ee9f404f42 ("ARM: limit CONFIG_HAVE_IDE
to platforms that do") from the arm tree and commit 06a4eada6a73 ("ARM:
switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H") from the arm-soc
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 arch/arm/Kconfig
index bb2b5ba,c1c9dc0..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -212,11 -212,20 +212,24 @@@ config ARM_PATCH_PHYS_VIR
this feature (eg, building a kernel for a single machine) and
you need to shrink the kernel to the minimal size.
+ config NEED_MACH_MEMORY_H
+ bool
+ help
+ Select this when mach/memory.h is required to provide special
+ definitions for this platform. The need for mach/memory.h should
+ be avoided when possible.
+
+ config PHYS_OFFSET
+ hex "Physical address of main memory"
+ depends on !ARM_PATCH_PHYS_VIRT && !NEED_MACH_MEMORY_H
+ help
+ Please provide the physical address corresponding to the
+ location of main memory in your system.
+config GENERIC_BUG
+ def_bool y
+ depends on BUG
+
source "init/Kconfig"
source "kernel/Kconfig.freezer"
@@@ -386,7 -400,7 +404,8 @@@ config ARCH_FOOTBRIDG
select CPU_SA110
select FOOTBRIDGE
select GENERIC_CLOCKEVENTS
+ select HAVE_IDE
+ select NEED_MACH_MEMORY_H
help
Support for systems based on the DC21285 companion chip
("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
@@@ -675,7 -703,7 +710,8 @@@ config ARCH_RP
select NO_IOPORT
select ARCH_SPARSEMEM_ENABLE
select ARCH_USES_GETTIMEOFFSET
+ select HAVE_IDE
+ select NEED_MACH_MEMORY_H
help
On the Acorn Risc-PC, Linux can support the internal IDE disk and
CD-ROM interface, serial and parallel port, and the floppy drive.
@@@ -694,7 -722,7 +730,8 @@@ config ARCH_SA110
select HAVE_SCHED_CLOCK
select TICK_ONESHOT
select ARCH_REQUIRE_GPIOLIB
+ select HAVE_IDE
+ select NEED_MACH_MEMORY_H
help
Support for StrongARM 11x0 based boards.
@@@ -841,7 -873,7 +882,8 @@@ config ARCH_U30
select CLKDEV_LOOKUP
select HAVE_MACH_CLKDEV
select GENERIC_GPIO
+ select ARCH_REQUIRE_GPIOLIB
+ select NEED_MACH_MEMORY_H
help
Support for ST-Ericsson U300 series mobile platforms.
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for Oct 12
From: Sedat Dilek @ 2011-10-12 22:31 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Randy Dunlap, linux-next, LKML
In-Reply-To: <20111013092629.429358e7c3117ce18d12fd24@canb.auug.org.au>
On Thu, Oct 13, 2011 at 12:26 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Wed, 12 Oct 2011 08:26:05 -0700 Randy Dunlap <rdunlap@xenotime.net> wrote:
>>
>> eh? I can't find it on github or kernel.org. what gives?
>
> I was in a bit of a rush and forgot to push it to github, sorry about
> that. On the other hand, it has finally appeared on git.kernel.org. I
> have pushed it to github now as well.
>
Cool, [1] is back... my last linux-next kernel is from 31-Aug-2011.
Hope to see a new single patch with 13-Oct-2011 release @ [2].
- Sedat -
[1] http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=commitdiff;h=92ca51150965ddad03b86c6cfb64f08a2f608309
[2] http://www.kernel.org/pub/linux/kernel/v2.6/next/LATEST-IS-next-20110831
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
^ permalink raw reply
* Re: linux-next: Tree for Oct 12
From: Stephen Rothwell @ 2011-10-12 22:26 UTC (permalink / raw)
To: Randy Dunlap; +Cc: linux-next, LKML
In-Reply-To: <4E95B18D.9070806@xenotime.net>
[-- Attachment #1: Type: text/plain, Size: 449 bytes --]
Hi all,
On Wed, 12 Oct 2011 08:26:05 -0700 Randy Dunlap <rdunlap@xenotime.net> wrote:
>
> eh? I can't find it on github or kernel.org. what gives?
I was in a bit of a rush and forgot to push it to github, sorry about
that. On the other hand, it has finally appeared on git.kernel.org. I
have pushed it to github now as well.
--
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: Tree for Oct 12
From: Randy Dunlap @ 2011-10-12 15:26 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
In-Reply-To: <20111012175425.a2e3e6e6a92265e433aeca25@canb.auug.org.au>
On 10/11/11 23:54, Stephen Rothwell wrote:
> Hi all,
>
> The linux-next tree is now available from
> git://github.com/sfrothwell/linux-next.git as a temporary measure while
> the kernel.org servers are unavailable.
>
> It may also turn up on git.kernel.org (depending on the mirroring). The
> patch is still absent, however.
>
> Changes since 20111011:
eh? I can't find it on github or kernel.org. what gives?
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the pm tree
From: Greg KH @ 2011-10-12 14:53 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, MyungJoo Ham, Kyungmin Park,
Rafael J. Wysocki, K. Y. Srinivasan
In-Reply-To: <20111012162805.1056a7f7fe3f1140d767a601@canb.auug.org.au>
On Wed, Oct 12, 2011 at 04:28:05PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/Kconfig between commit a3c98b8b2ede ("PM: Introduce devfreq:
> generic DVFS framework with device-specific OPPs") from the pm tree and
> commit 46a971913611 ("Staging: hv: move hyperv code out of staging
> directory") from the staging tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
The fix for this, and the drivers/Makefile file look correct, thanks.
greg k-h
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the tip tree
From: Greg KH @ 2011-10-12 14:53 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, K. Y. Srinivasan, Haiyang Zhang,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
In-Reply-To: <20111012163452.7f1822bb8dca107daf26d28b@canb.auug.org.au>
On Wed, Oct 12, 2011 at 04:34:52PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/hv/Makefile between commit 6f4151c89b7d ("x86: Hyper-V:
> Integrate the clocksource with Hyper-V detection code") from the tip tree
> and commit 46a971913611 ("Staging: hv: move hyperv code out of staging
> directory") from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
The fix looks correct, thanks.
greg k-h
^ permalink raw reply
* Re: linux-next: Tree for Oct 11 (iio/resolver)
From: Jonathan Cameron @ 2011-10-12 8:58 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next-u79uwXL29TY76Z2rM5mHXA, LKML,
linux-iio-u79uwXL29TY76Z2rM5mHXA,
devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b@public.gmane.org, Greg KH
In-Reply-To: <4E94AADA.4080204-/UHa2rfvQTnk1uMJSBkQmQ@public.gmane.org>
On 10/11/11 21:45, Randy Dunlap wrote:
> On 10/11/11 02:11, Stephen Rothwell wrote:
>> Hi all,
>>
>> The linux-next tree is now available from
>> git://github.com/sfrothwell/linux-next.git as a temporary measure while
>> the kernel.org servers are unavailable.
>>
>> It may also turn up on git.kernel.org (depending on the mirroring). The
>> patch set is still absent, however.
>>
>> Changes since 20111007:
>
> When no GPIO support is enabled:
Thanks Randy. Fix is clearly to add the GENERIC_GPIO dependence which should always
have been there for this driver. Previously it was building a non working driver
as the stubs covered everything being used. I'll sort a patch shortly and chase down
if we have any others missing GENERIC_GPIO dependencies.
Jonathan
>
> drivers/staging/iio/resolver/ad2s1210.c:657:14: error: array type has incomplete element type
> drivers/staging/iio/resolver/ad2s1210.c:665:44: warning: type defaults to 'int' in type name
> drivers/staging/iio/resolver/ad2s1210.c:665:44: warning: type defaults to 'int' in type name
> drivers/staging/iio/resolver/ad2s1210.c:665:44: error: negative width in bit-field '<anonymous>'
> drivers/staging/iio/resolver/ad2s1210.c:671:14: error: array type has incomplete element type
> drivers/staging/iio/resolver/ad2s1210.c:679:34: warning: type defaults to 'int' in type name
> drivers/staging/iio/resolver/ad2s1210.c:679:34: warning: type defaults to 'int' in type name
> drivers/staging/iio/resolver/ad2s1210.c:679:34: error: negative width in bit-field '<anonymous>'
^ permalink raw reply
* Re: linux-next: build failure after merge of the gpio tree
From: Tomoya MORINAGA @ 2011-10-12 8:37 UTC (permalink / raw)
To: Nobuhiro Iwamatsu
Cc: Stephen Rothwell, Grant Likely, linux-next, linux-kernel
In-Reply-To: <CABMQnV+S2WbW0YZBiMXfs81b2dyLzj9wBxPmNuFrYErKfXsWtg@mail.gmail.com>
(2011/10/12 16:21), Nobuhiro Iwamatsu wrote:
> This is a problem of generic-chip.
> I created the patch and contributed the point to LKML.
> He forgot to put you into CC, sorry.
>
> Please check LKML for subject of "[PATCH] irq: Add EXPORT_SYMBOL to
> function of irq generic-chip".
>
OK,
We will be able to use our GPIO driver with module soon.
Good information.
thanks,
------
tomoya
ROHM Co., Ltd.
^ permalink raw reply
* Re: linux-next: build failure after merge of the gpio tree
From: Nobuhiro Iwamatsu @ 2011-10-12 7:21 UTC (permalink / raw)
To: Tomoya MORINAGA
Cc: Stephen Rothwell, Grant Likely, linux-next, linux-kernel,
Tomoya MORINAGA
In-Reply-To: <4E9525AC.9080909@dsn.lapis-semi.com>
Hi,
2011年10月12日14:29 Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com>:
> Hi, Stephen
>
> (2011/10/12 13:24), Stephen Rothwell wrote:
>>
>> Just try building gpio-pch and gpio-ml-ioh as modules ...
>> irq_setup_generic_chip() does not have an EXPORT_SYMBOL (and didn't in
>> v3.0 either).
>>
>
> Your report looks like the same as ours.
> In our develop environment,
> build becomes success only gpio-pch/gpio-ml-ioh is integrated as built-in.
> In case of integrated as modules, build becomes failure.
>
> I understood this behavior is specification/limitation of GPIO interrupt
> function.
> Is it true ?
>
This is a problem of generic-chip.
I created the patch and contributed the point to LKML.
He forgot to put you into CC, sorry.
Please check LKML for subject of "[PATCH] irq: Add EXPORT_SYMBOL to
function of irq generic-chip".
Best regards,
Nobuhiro
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
^ 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