Commit 58dc0ef3 authored by Matthias Maennich's avatar Matthias Maennich
Browse files

ANDROID: Remove out-of-tree difference in fsnotify.h

commit dd5c9369 ("Merge 7e634208 ("Merge tag 'acpi-5.7-rc1-2' of
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into
android-mainline") introduced a difference to the upstream tree by
discarding all changes done in include/linux/fsnotify.h.

This can be seen when comparing the difference that should have been
introduced by the merge (diff between the upstream merges)

  $ git diff 5364abc5..7e634208 -- include/linux/fsnotify.h
    1 file changed, 58 insertions(+), 80 deletions(-)

... and the actual difference introduced ...

  $ git diff dd5c9369^1..dd5c9369 -- include/linux/fsnotify.h
    <empty>

This reverts the out-of-tree difference.

Fixes: dd5c9369 ("Merge 7e634208 ("Merge tag 'acpi-5.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm"

) into android-mainline")
Signed-off-by: default avatarMatthias Maennich <maennich@google.com>
Change-Id: Ia213ac6464adf95644e572c734edd7c728140a45
parent 5ff417aa
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment