From: Dominik Brodowski <linux@dominikbrodowski•net>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Alan Cox <alan@lxorguk•ukuu.org.uk>,
Jonathan Corbet <corbet@lwn•net>,
linux-next@vger•kernel.org
Subject: Re: linux-next: manual merge of pcmcia tree
Date: Mon, 16 Jun 2008 10:57:54 +0200 [thread overview]
Message-ID: <20080616085754.GA24149@isilmar.linta.de> (raw)
In-Reply-To: <20080616184943.e369cf84.sfr@canb.auug.org.au>
Hi Stephen,
On Mon, Jun 16, 2008 at 06:49:43PM +1000, Stephen Rothwell wrote:
> On Mon, 16 Jun 2008 10:12:58 +0200 Dominik Brodowski <linux@dominikbrodowski•net> wrote:
> >
> > On Mon, Jun 16, 2008 at 05:51:26PM +1000, Stephen Rothwell wrote:
> > > Today's linux-next merge of the pcmcia tree got a conflict in
> > > drivers/char/pcmcia/cm4000_cs.c between commit
> > > d30f1f9e1f5391a649a4e2ad442c0b76f4e44c32 ("cm40x0: cdev lock_kernel()
> > > pushdown") from the bkl-removal tree and commit
> > > 5316046340ca74e0d327a88aa719fa0b2481a7ff ("pcmcia: switch cm4000_cs.c to
> > > unlocked_ioctl") from the pcmcia tree.
> > >
> > > It was just overlapping replacement of includes, so I did the obvious
> > > fixup.
> >
> > @Stephen: many thanks!
> >
> > @Alan,@Jonathan: since this is the same patch, just a different title --
> > shall it be removed from one of our trees?
>
> Those patches are not identical ... the first does _open, the second does
> _ioctl. The only overlap in the includes at the top.
Uh, right. Sorry. If the other patch shall be included in the pcmcia tree
instead of the blk-tree, just send it to me.
Best,
Dominik
next prev parent reply other threads:[~2008-06-16 8:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-16 7:51 linux-next: manual merge of pcmcia tree Stephen Rothwell
2008-06-16 8:12 ` Dominik Brodowski
2008-06-16 8:49 ` Stephen Rothwell
2008-06-16 8:57 ` Dominik Brodowski [this message]
2008-06-16 9:04 ` Stephen Rothwell
2008-06-16 9:05 ` Stephen Rothwell
2008-06-19 20:34 ` Jonathan Corbet
2008-06-20 17:43 ` Dominik Brodowski
2008-06-20 19:53 ` Jonathan Corbet
2008-06-21 3:37 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-06-23 7:32 Stephen Rothwell
2008-06-24 13:49 ` Dominik Brodowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080616085754.GA24149@isilmar.linta.de \
--to=linux@dominikbrodowski$(echo .)net \
--cc=alan@lxorguk$(echo .)ukuu.org.uk \
--cc=corbet@lwn$(echo .)net \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox