From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Kay Sievers <kay@vrfy•org>, Bjorn Helgaas <bhelgaas@google•com>
Subject: Re: linux-next: manual merge of the scsi-post-merge tree with the driver-core tree
Date: Thu, 10 May 2012 10:31:05 -0700 [thread overview]
Message-ID: <20120510173105.GA2531@kroah.com> (raw)
In-Reply-To: <20120510185746.1b7b8e582c0c968633b6e2f1@canb.auug.org.au>
On Thu, May 10, 2012 at 06:57:46PM +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> mm/page_alloc.c between commit 155cbfc802e4 ("mm: use KERN_CONT in printk()
> continuation lines") from the driver-core tree and commit "mm: print
> physical addresses consistently with other parts of kernel" from the akpm
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks good to me, thanks.
greg k-h
prev parent reply other threads:[~2012-05-10 17:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-10 8:57 linux-next: manual merge of the scsi-post-merge tree with the driver-core tree Stephen Rothwell
2012-05-10 9:09 ` Stephen Rothwell
2012-05-10 17:31 ` Greg KH [this message]
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=20120510173105.GA2531@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=bhelgaas@google$(echo .)com \
--cc=kay@vrfy$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--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