Re: linux-next: manual merge of the pci tree with the pci-current tree

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

From: Jesse Barnes

Subject: Re: linux-next: manual merge of the pci tree with the pci-current tree

Date: Friday, March 26, 2010 - 9:03 am

On Fri, 26 Mar 2010 13:48:36 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

quoted text> Hi Jesse,
> 
> On Thu, 25 Mar 2010 19:10:49 -0700 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> >
> > Time to rebase my -next branch onto my for-linus branch again I guess.
> 
> Any reason you wouldn't just merge your for-linus branch into your -next branch?

I don't like to end up with a bunch of merges, so I generally just
rebase my -next branch as necessary.

-- 
Jesse Barnes, Intel Open Source Technology Center
--
unsubscribe noticeTo unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:

linux-next: manual merge of the pci tree with the pci-curr ..., Stephen Rothwell, (Thu Mar 25, 5:57 pm)

Re: linux-next: manual merge of the pci tree with the pci- ..., Jesse Barnes, (Thu Mar 25, 7:10 pm)

Re: linux-next: manual merge of the pci tree with the pci- ..., Stephen Rothwell, (Thu Mar 25, 7:48 pm)

Re: linux-next: manual merge of the pci tree with the pci- ..., Bjorn Helgaas, (Fri Mar 26, 7:43 am)

Re: linux-next: manual merge of the pci tree with the pci- ..., Jesse Barnes, (Fri Mar 26, 9:03 am)


linux-kernel:
Fortier,Vincent [Montreal]	2.6.21.5 june 30th to july 1st date hang?
Jeff Dike	[ PATCH 2/6 ] UML - Formatting fixes around os_{read_write}_file callers
Liam Girdwood	[PATCH 07/13] regulator: regulator test harness
Oleg Nesterov	Re: Getting the new RxRPC patches upstream
Stefan Seyfried	Re: 2.6.19-rc5: grub is much slower resuming from suspend-to-disk than in 2.6.18
linux-netdev:
Arnaud Ebalard	Re: [REGRESSION,BISECTED] MIPv6 support broken by f4f914b58019f0
Jan Engelhardt	Re: [PATCH iptables] extension: add xt_cpu match
Jarek Poplawski	Re: [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock().
Sebastian Andrzej Siewior	[PATCH 8/8] net/emergency: remove locking from reycling pool if emergncy pools are...
David Miller	Re: [PATCH] qlcnic: dont assume NET_IP_ALIGN is 2
git:
Jakub Narebski	Re: git on MacOSX and files with decomposed utf-8 file names
Brandon Casey	Re: Thunderbird and patches (was Re: [PATCH v2] Enable setting attach as the def...
Christian Couder	[PATCH 1/3] rev-parse: add test script for "--verify"
Ramkumar Ramachandra	Re: [GSoC update] git-remote-svn: The final one
Junio C Hamano	Re: git-rm isn't the inverse action of git-add
openbsd-misc:
Joachim Schipper	Re: UVC Webcams
Florin Andrei	SOLVED [was: firewall is very slow, something's wrong]
Todd Alan Smith	Re: Microsoft gets the Most Secure Operating Systems award
Neal Hogan	Re: Need Advice: Thinkpad T60 or T61?
Sam Fourman Jr.	Re: Real men don't attack straw men
git-commits-head:
Linux Kernel Mailing List	ACPI: Disable ARB_DISABLE on platforms where it is not needed
Linux Kernel Mailing List	m68knommu: add read_barrier_depends() and irqs_disabled_flags()
Linux Kernel Mailing List	[MTD] Add mtd panic_write function pointer
Linux Kernel Mailing List	[ARM] pxa: remove duplicate select statements from Kconfig
Linux Kernel Mailing List	mlx4_core: Don't read reserved fields in mlx4_QUERY_ADAPTER()